odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] staging branch with misc fixes and improvements 

bzr revid: qdp-launchpad@openerp.com-20120727143029-4tjz9bzuutzd73hs
This commit is contained in:
Quentin (OpenERP) 2012-07-27 16:30:29 +02:00
parent 45951a0a49 922f565eb7
commit 43e8f7ce46
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp/mrp_view.xml
View File

@ -653,7 +653,7 @@
<sheet>
<label for="product_id" class="oe_edit_only"/>
<h1>
<field name="product_id" on_change="product_id_change(product_id)" domain="[('supply_method','=','produce')]" class="oe_inline"/>
<field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
</h1>
<label for="product_qty" class="oe_edit_only"/>
<h2>

10
addons/purchase/purchase_view.xml
View File

@ -196,7 +196,7 @@
</div>
<group>
<group>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" domain="[('supplier','=',True)]"/>
<field name="partner_ref"/>
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
</group>
@ -223,11 +223,11 @@
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<div class="oe_subtotal_footer_separator oe_inline">
<label for="amount_total"/>
<label for="amount_total"/>
<button name="button_dummy"
states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
</div>
<field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
<field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
</group>
<div class="oe_clear"/>
<label for="notes"/>
@ -245,7 +245,7 @@
<field name="invoice_method"/>
<field name="invoiced"/>
<field name="fiscal_position"/>
<!-- we do not need these fields anymore, the information is in open chatter -->
<!-- we do not need these fields anymore, the information is in open chatter -->
<field name="validator" groups="base.group_no_one"/>
<field name="date_approve" groups="base.group_no_one"/>
</group>

2
addons/stock/stock.py
View File

@ -619,7 +619,7 @@ class stock_picking(osv.osv):
'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Shipping type specify, goods coming in or going out."),
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."),
'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Keep empty if you produce at the location where the finished products are needed." \