[Openerp-dev-gtk] [Merge] lp:~openerp-dev/openobject-addons/trunk-bug-717561-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Ashvin Rathod (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-717561-ara into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #717561 in OpenERP Addons: "removing account_analytic_plans breaks 
"journal items" view"
  https://bugs.launchpad.net/openobject-addons/+bug/717561

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-717561-ara/+merge/67498

Hello,

Fix: removing account_analytic_plans breaks "journal items" view

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-717561-ara/+merge/67498
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-717561-ara.

=== modified file 'account_analytic_plans/account_analytic_plans.py'
--- account_analytic_plans/account_analytic_plans.py	2011-07-01 23:41:24 +0000
+++ account_analytic_plans/account_analytic_plans.py	2011-07-11 07:13:29 +0000
@@ -367,6 +367,19 @@
         if context is None:
             context = {}
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        if view_type == 'tree':
+            _moves_fields = result['fields']
+            view_obj = etree.XML(result['arch'])
+
+            for node in view_obj.xpath("//field[@name='analytic_account_id']"):
+                view_obj.remove(node)
+
+            _moves_fields.update({
+               'analytics_id' : {'relation': 'account.analytic.plan.instance', 'type' : 'many2one', 'string' : 'Analytic Distribution'},
+               })
+            new_field = etree.Element("field", name="analytics_id", domain="[('parent_id','!=',False)]")
+            view_obj.insert(12, new_field)
+            result['arch'] = etree.tostring(view_obj)
         return result
 
 account_move_line()

=== 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	2011-07-11 07:13:29 +0000
@@ -31,15 +31,6 @@
        </field>
     </record>
 
-    <record id="account.journal_col11" model="account.journal.column">
-        <field eval="&quot;&quot;&quot;Analytic Distribution&quot;&quot;&quot;" name="name"/>
-        <field eval="11" name="sequence"/>
-        <field name="view_id" ref="account.account_journal_view"/>
-        <field eval="0" name="required"/>
-        <field eval="&quot;&quot;&quot;analytics_id&quot;&quot;&quot;" name="field"/>
-        <field eval="0" name="readonly"/>
-    </record>
-
     <record model="ir.ui.view" id="view_move_line_form_inherit">
         <field name="name">account.move.line.form.inherit</field>
         <field name="model">account.move.line</field>
@@ -65,19 +56,6 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_move_line_tree_inherit">
-        <field name="name">account.move.line.tree.inherit</field>
-        <field name="model">account.move.line</field>
-        <field name="type">tree</field>
-        <field name="priority">2</field>
-        <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>
-        </field>
-    </record>
-
 <!-- Replace analytic_id with analytics_id in account.invoice.line -->
 
     <record model="ir.ui.view" id="view_invoice_line_form_inherit">


_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp