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

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
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2011-07-22 13:42:35 +0000
+++ account/account_view.xml 2011-08-02 08:11:30 +0000
@@ -1102,7 +1102,7 @@
1102 <separator string="Internal Note" colspan="4"/>1102 <separator string="Internal Note" colspan="4"/>
1103 <field name="narration" colspan="4" nolabel="1"/>1103 <field name="narration" colspan="4" nolabel="1"/>
1104 </page>1104 </page>
1105 <page string="Analytic Lines" groups="base.group_analytic_accounting">1105 <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
1106 <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)}"/>1106 <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)}"/>
1107 </page>1107 </page>
1108 </notebook>1108 </notebook>
@@ -1149,7 +1149,7 @@
1149 <field name="reconcile_partial_id"/>1149 <field name="reconcile_partial_id"/>
1150 <field name="state"/>1150 <field name="state"/>
1151 </page>1151 </page>
1152 <page string="Analytic Lines" groups="base.group_analytic_accounting">1152 <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
1153 <field colspan="4" name="analytic_lines" nolabel="1" />1153 <field colspan="4" name="analytic_lines" nolabel="1" />
1154 </page>1154 </page>
1155 </notebook>1155 </notebook>
@@ -1397,7 +1397,7 @@
1397 <separator string="Internal Note" colspan="4"/>1397 <separator string="Internal Note" colspan="4"/>
1398 <field name="narration" colspan="4" nolabel="1"/>1398 <field name="narration" colspan="4" nolabel="1"/>
1399 </page>1399 </page>
1400 <page string="Analytic Lines" groups="base.group_analytic_accounting">1400 <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
1401 <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)}"/>1401 <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)}"/>
1402 </page>1402 </page>
1403 </notebook>1403 </notebook>

Subscribers

People subscribed via source and target branches

to all changes: