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

merge

Browse Source 
bzr revid: christophe@tinyerp.com-20080723163754-pbmazzq92oxvrcx3
This commit is contained in:
Christophe Simonis
2008-07-23 18:37:54 +02:00
parent ba0c939bb8 459dba840e
commit 4e60b94915
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+1
View File
@@ -1555,6 +1555,7 @@ class account_config_fiscalyear(osv.osv_memory):
'date_stop':end_date,
}
new_id=res_obj.create(cr, uid, vals, context=context)
res_obj.create_period(cr,uid,[new_id])
return {
'view_type': 'form',
"view_mode": 'form',
addons/account/account_view.xml
+3 -3
View File
@@ -579,7 +579,7 @@
<field name="active" select="2"/>
<field name="type"/>
<field name="applicable_type"/>
<field name="amount" select="2" states="{'type==percent': {'visible': 0}"/>
<field name="amount" select="2" attrs="{'readonly':[('type','=','none'),('type','=','code')]}"/>
<field groups="base.group_extended" name="include_base_amount"/>
<field groups="base.group_extended" name="domain"/>
<newline/>
@@ -607,9 +607,9 @@
</page>
<page groups="base.group_extended" string="Special Computation">
<separator colspan="4" string="Compute Code (if type=code)"/>
<field colspan="4" name="python_compute" nolabel="1"/>
<field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/>
<separator colspan="4" string="Applicable Code (if type=code)"/>
<field colspan="4" name="python_applicable" nolabel="1"/>
<field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/>
</page>
</notebook>
</form>
addons/product/product_view.xml
+4 -4
View File
@@ -40,10 +40,10 @@
<newline/>
<field name="categ_id" select="1"/>
<field name="type" select="2"/>
<field digits="(14, 3)" groups="base.group_extended" name="volume"/>
<field digits="(14, 3)" groups="base.group_extended" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
<newline/>
<field digits="(14, 3)" groups="base.group_extended" name="weight"/>
<field digits="(14, 3)" groups="base.group_extended" name="weight_net"/>
<field digits="(14, 3)" groups="base.group_extended" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" groups="base.group_extended" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
<field name="procure_method"/>
<field name="state" select="2"/>
<field name="uom_id"/>
@@ -54,7 +54,7 @@
<field name="supply_method"/>
<field name="active" select="2"/>
<newline/>
<field name="sale_delay"/>
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="sale_ok" select="2"/>
<field name="produce_delay"/>
<field name="purchase_ok" select="2"/>
addons/sale/sale_view.xml
+1 -1
View File
@@ -165,7 +165,7 @@
<field name="user_id"/>
<field name="order_policy"/>
<field groups="base.group_extended" name="origin"/>
<field groups="base.group_extended" name="invoice_quantity"/>
<field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','picking')]}"/>
<field name="client_order_ref"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>