[merge]: merging with the same branch

bzr revid: rgo@tinyerp.com-20110607131508-d8c2qtwj02g7qc7w
2011-06-07 18:45:08 +05:30
parent 74b9c6aa19 0b4bb20a03
commit 663b5199cd
2 changed files with 2 additions and 1 deletions
@@ -222,7 +222,7 @@
            <field name="arch" type="xml">
                <form string="Budget Lines">
                    <field name="crossovered_budget_id"/>
-                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
+                    <field name="analytic_account_id" select="1"/>
                    <field name="general_budget_id" select="1"/>
                    <field name="date_from"/>
                    <field name="date_to"/>
@@ -9,5 +9,6 @@
    </record>
    <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
        <field name="name">Useability / Analytic Accounting</field>
+        <field name="users" eval="[(6,0,[ref('base.user_root')])]"/>
    </record>
 </data></openerp>