Odoo Addons (MOVED TO GITHUB)

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

  1. fix-trunk-819242
  2. Merge into trunk
Proposed by Niels Huylebroeck
Status: Merged
Merge reported by: Fabien (Open ERP)
Merged at revision: not available
Proposed branch: lp:~openerp-community/openobject-addons/fix-trunk-819242
Merge into: lp:openobject-addons
Diff against target: 30 lines (+3/-3)
1 file modified
account/account_view.xml (+3/-3)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/fix-trunk-819242
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+70123@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_view.xml'
2--- account/account_view.xml 2011-07-22 13:42:35 +0000
3+++ account/account_view.xml 2011-08-02 08:11:30 +0000
4@@ -1102,7 +1102,7 @@
5 <separator string="Internal Note" 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@@ -1149,7 +1149,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@@ -1397,7 +1397,7 @@
23 <separator string="Internal Note" 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>

Subscribers

People subscribed via source and target branches

to all changes: