[MERGE]:merged lp:~openerp-dev/openobject-addons/trunk-mrp-repair-apa-refactoring-sgo

bzr revid: apa@tinyerp.com-20120619130249-ng1bb2a29xoq7sd4
This commit is contained in:
Amit Patel (OpenERP)
2012-06-19 18:32:49 +05:30
+3 -3
View File
@@ -54,7 +54,7 @@
<group>
<group>
<field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
<field name="address_id" attrs="{'readonly':[('deliver_bool','=', False)]}"/>
<field name="address_id" attrs="{'readonly':[('deliver_bool','=', False)]}" groups="sale.group_delivery_invoice_address"/>
<field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)"/>
<field name="move_id" on_change="onchange_move_id(product_id, move_id)" context="{'default_product_id':product_id}"/>
</group>
@@ -128,7 +128,7 @@
<page string="Invoicing">
<group col="4">
<field name="invoice_method"/>
<field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')],'required':[('invoice_method','!=','none')]}"/>
<field name="partner_invoice_id" attrs="{'readonly':[('invoice_method','=', 'none')],'required':[('invoice_method','!=','none')]}" groups="sale.group_delivery_invoice_address"/>
</group>
<!-- <field name="invoice_id"/> -->
<field name="fees_lines">
@@ -167,7 +167,7 @@
<group col="4">
<field name="invoice_id"/>
<field name="picking_id"/>
<field name="location_id"/>
<field name="location_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
<field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>