Merge lp:~openerp-dev/openobject-addons/6.1-opw-578771-mra into lp:openobject-addons/6.1

[Mustufa Rangwala (Open ERP)]

Hello,

Resolved issue on creating journal entries with account_analytic_plan module for analytic distribution field.

Regards,
Mustufa

[Vinay Rana (OpenERP) (vra-openerp)]

The fixes will solve the issue for journal value from context for Accounting/Journal Entries/Journal Entries menu, As the issue is reproducible with web client only.

review: Approve

[Vinay Rana (OpenERP) (vra-openerp)]

I have found another branch which is fixes this issue and propose previously.
the branch is https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-574812-skh/+merge/106186.

so I am rejecting this branch for removing duplication of fixes.

=== modified file 'account_analytic_plans/account_analytic_plans_view.xml'
--- account_analytic_plans/account_analytic_plans_view.xml	2011-05-31 21:55:34 +0000
+++ account_analytic_plans/account_analytic_plans_view.xml	2012-09-04 07:15:23 +0000
@@ -23,10 +23,10 @@
        <field name="inherit_id" ref="account.view_move_form"/>
        <field name="arch" type="xml">
            <xpath expr="/form/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/notebook/page/field[@name='line_id']/form/notebook/page/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>