Merge lp:~openerp-dev/openobject-addons/trunk-bug-1075872-kbh into lp:openobject-addons

[Khushboo Bhatt(openerp)]

Hello,

 account_analytic_plans::
   I have fixed the error of journal_id in context.

Thanks,
KBH.

=== modified file 'account_analytic_plans/account_analytic_plans_view.xml'
--- account_analytic_plans/account_analytic_plans_view.xml	2012-09-26 07:22:39 +0000
+++ account_analytic_plans/account_analytic_plans_view.xml	2012-11-07 12:38:28 +0000
@@ -21,10 +21,10 @@
        <field name="inherit_id" ref="account.view_move_form"/>
        <field name="arch" type="xml">
            <xpath expr="/form/sheet/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
-               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+               <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
            </xpath>
            <xpath expr="/form/sheet/notebook/page/field[@name='line_id']/form/notebook/page/group/group/field[@name='analytic_account_id']" position="replace">
-               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+               <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
            </xpath>
        </field>
     </record>