Merge lp:~openerp-community/openobject-addons/fix-819242 into lp:openobject-addons/6.0

[Niels Huylebroeck]

[VO (ovailly)]

Bonjour,

je suis en congés jusqu'au mardi 16 août 2011.

Pour une urgence veuillez adresser votre demande sur les deux
boites Email suivantes :

<email address hidden>
<email address hidden>

Merci

Olivier vailly

[lp:~openerp-community/openobject-addons/fix-819242]

4741. By Niels Huylebroeck on 2011-08-01

Fix more of the same issues (base.group_analytic_accounting)

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

Unmerged revisions

4741. By Niels Huylebroeck on 2011-08-01

Fix more of the same issues (base.group_analytic_accounting)

4740. By Niels Huylebroeck on 2011-08-01

Fix wrong group usage on notebook page in account.move.line form view

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2011-07-01 08:55:01 +0000
+++ account/account_view.xml	2011-08-01 13:51:36 +0000
@@ -1114,7 +1114,7 @@
                             <separator string="Narration" colspan="4"/>
                             <field name="narration" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                         </page>
                     </notebook>
@@ -1161,7 +1161,7 @@
                             <field name="reconcile_partial_id"/>
                             <field name="state"/>
                         </page>
-                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
                             <field colspan="4" name="analytic_lines" nolabel="1" />
                         </page>
                     </notebook>
@@ -1409,7 +1409,7 @@
                                             <separator string="Narration" colspan="4"/>
                                             <field name="narration" colspan="4" nolabel="1"/>
                                         </page>
-                                        <page string="Analytic Lines" groups="base.group_analytic_accounting">
+                                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
                                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
                                         </page>
                                     </notebook>