Merge lp:~openerp-dev/openobject-addons/6.1-opw-574812-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[FIX]account_analytic_plan : Error occurred journal_id not defined while creating the move line

Steps to reproduce:
Checked in web-client
1. Install account_analytic plan module.
2. Open Journal Entries from "Accounting/Journal Entries/Journal Entries"
3. Select Journal (eg: Cash) and create move line. Enter the value for required field such as, Name, Account and then select the Analytic Distribution.

Error Occurred:
ValueError: Error during evaluation of this context: "{'journal_id':journal_id}", message: "name 'journal_id' is not defined"

This branch fixes this issue.

Kindly review the branch and please share your views on it.

Thanks,
Somesh Khare

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

As I found duplicate fix which I approved previously https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-578771-mra/+merge/122623 which is not cover all xml code so this is better fix compare to MRA branch, as this fix is done previously so I am considering this one for approval.

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-574812-port-mma/+merge/132321 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6804. By Somesh Khare on 2012-05-17

[FIX]account_analytic_plan : Error occurred journal_id not defined while creating the move line(Case: Ref 574812)

=== 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-05-17 13:31: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>
@@ -47,7 +47,7 @@
         <field name="inherit_id" ref="account.view_move_line_form"/>
         <field name="arch" type="xml">
             <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"/>
             </field>
         </field>
     </record>
@@ -60,7 +60,7 @@
         <field name="inherit_id" ref="account.view_move_line_form2"/>
         <field name="arch" type="xml">
             <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"/>
             </field>
         </field>
     </record>
@@ -73,7 +73,7 @@
         <field name="inherit_id" ref="account.view_move_line_tree"/>
         <field name="arch" type="xml">
             <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"/>
             </field>
         </field>
     </record>