OpenERP Addons (modules)

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

Proposed by Niels Huylebroeck on 2011-08-01
Status: Needs review
Proposed branch: lp:~openerp-community/openobject-addons/fix-819242
Merge into: lp:openobject-addons/6.0
Diff against target: 30 lines (+3/-3) 1 file modified
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/fix-819242
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) 2011-08-01 Approve on 2011-08-02
qdp (OpenERP) 2011-08-02 Pending
Review via email: mp+70010@code.launchpad.net
To post a comment you must log in.
VO (ovailly) wrote :

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

4741. By Niels Huylebroeck on 2011-08-01

Fix more of the same issues (base.group_analytic_accounting)

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

Preview Diff

1=== modified file 'account/account_view.xml'
2--- account/account_view.xml 2011-07-01 08:55:01 +0000
3+++ account/account_view.xml 2011-08-01 13:51:36 +0000
4@@ -1114,7 +1114,7 @@
5 <separator string="Narration" colspan="4"/>
6 <field name="narration" colspan="4" nolabel="1"/>
7 </page>
8- <page string="Analytic Lines" groups="base.group_analytic_accounting">
9+ <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
10 <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)}"/>
11 </page>
12 </notebook>
13@@ -1161,7 +1161,7 @@
14 <field name="reconcile_partial_id"/>
15 <field name="state"/>
16 </page>
17- <page string="Analytic Lines" groups="base.group_analytic_accounting">
18+ <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
19 <field colspan="4" name="analytic_lines" nolabel="1" />
20 </page>
21 </notebook>
22@@ -1409,7 +1409,7 @@
23 <separator string="Narration" colspan="4"/>
24 <field name="narration" colspan="4" nolabel="1"/>
25 </page>
26- <page string="Analytic Lines" groups="base.group_analytic_accounting">
27+ <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
28 <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)}"/>
29 </page>
30 </notebook>