pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merged Somesh' branch for the fix of domain correction for Sale Order's 'Invoice On' Policy

Browse Source 
bzr revid: jvo@tinyerp.com-20110520094907-rkfwi7363x1xvdyn
This commit is contained in:
Jay Vora (OpenERP)
2011-05-20 15:19:07 +05:30
parent 8bb53eab88 1136c4f3b0
commit 512d87d5ae
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_view.xml
+1 -1
View File
@@ -421,7 +421,7 @@
<group col="2" colspan="2">
<group colspan="2" col="2">
<separator string="Accounts" colspan="4"/>
<field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="default_debit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group>
<group colspan="2" col="2">
addons/sale/sale_view.xml
+1 -2
View File
@@ -146,7 +146,6 @@
domain="[('product_id','=',product_id)]"
groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field colspan="4" name="name"/>
<field name="price_unit"/>
<field name="discount"/>
@@ -224,7 +223,7 @@
<field name="incoterm" widget="selection"/>
<field name="picking_policy" required="True"/>
<field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
<field name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
<field name="invoice_quantity" attrs="{'readonly':[('order_policy','in',['prepaid','picking'])]}"/>
</group>
<group colspan="2" col="2">
<separator string="References" colspan="2"/>