[MERGE] merge from same branch

bzr revid: mra@mra-laptop-20110421051522-2sas8btck974jirm
2011-04-21 10:45:22 +05:30
parent 2f9f8f1e4f 4d1f84ccac
commit bee4dc8551
1 changed files with 1 additions and 1 deletions
@@ -8,7 +8,7 @@
            <field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_tree"/>
            <field name="type">tree</field>
            <field name="arch" type="xml">
-                <field name="amount" position="after">
+                <field name="category_id" position="after">
                   <field name="analytic_account_id"/>
                   <field name="account_id" required="1"/>
                </field>