Merge lp:~therp-nl/therp-backports/addons61-lp1075872-analytic_plan_fix_journal_reference into lp:therp-backports

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 6706
Proposed branch: lp:~therp-nl/therp-backports/addons61-lp1075872-analytic_plan_fix_journal_reference
Merge into: lp:therp-backports
Diff against target: 16 lines (+2/-2)
1 file modified
account_analytic_plans/account_analytic_plans_view.xml (+2/-2)
To merge this branch: bzr merge lp:~therp-nl/therp-backports/addons61-lp1075872-analytic_plan_fix_journal_reference
Reviewer Review Type Date Requested Status
Therp Pending
Review via email: mp+144454@code.launchpad.net

Description of the change

Backport of lp:~openerp-dev/openobject-addons/trunk-bug-1075872-kbh which is merged in openobject-addons 7.0

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_analytic_plans/account_analytic_plans_view.xml'
2--- account_analytic_plans/account_analytic_plans_view.xml 2011-05-31 21:55:34 +0000
3+++ account_analytic_plans/account_analytic_plans_view.xml 2013-01-23 09:22:24 +0000
4@@ -23,10 +23,10 @@
5 <field name="inherit_id" ref="account.view_move_form"/>
6 <field name="arch" type="xml">
7 <xpath expr="/form/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
8- <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
9+ <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
10 </xpath>
11 <xpath expr="/form/notebook/page/field[@name='line_id']/form/notebook/page/group/field[@name='analytic_account_id']" position="replace">
12- <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
13+ <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
14 </xpath>
15 </field>
16 </record>

Subscribers

People subscribed via source and target branches

to all changes: