[FIX] Fixed incorrect merge

bzr revid: niv@niv-laptop-20101018093758-j99jast7cjx934s2
This commit is contained in:
niv 2010-10-18 11:37:58 +02:00
parent ca672dc9e2
commit e5fb3a0780
1 changed files with 1 additions and 1 deletions

View File

@ -2415,7 +2415,7 @@
<group string="res_config_contents" position="replace">
<field name="company_id" widget="selection"/>
<field name ="code_digits" groups="base.group_extended"/>
<field name="chart_template_id" widget="selection"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
<field name ="seq_journal" groups="base.group_extended"/>
<field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>
<field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False)]"/>