Merge lp:~vauxoo/addons-vauxoo/account_analytic_for_analytics-dev-yani into lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa

[Yanina Aular (Vauxoo)]

Analytic Distribution name is changed

[Yanina Aular (Vauxoo) (yanina-aular)]

review: Approve

=== modified file 'purchase_requisition_line_plan/__openerp__.py'
--- purchase_requisition_line_plan/__openerp__.py	2014-06-27 13:36:27 +0000
+++ purchase_requisition_line_plan/__openerp__.py	2014-06-30 13:53:26 +0000
@@ -36,11 +36,10 @@
 the account analytic value from the purchase requisition.
 ''',
     'depends': [
-        'account_analytic_plans',
         'purchase_requisition',
         'purchase_requisition_line_view',
+        'purchase_analytic_plans',
         'pr_line_related_po_line',
-        'purchase_analytic_plans',
         ],
     'data': [
         'view/purchase_requisition_view.xml',

=== modified file 'purchase_requisition_line_plan/model/purchase_requisition.py'
--- purchase_requisition_line_plan/model/purchase_requisition.py	2014-06-13 13:25:35 +0000
+++ purchase_requisition_line_plan/model/purchase_requisition.py	2014-06-30 13:53:26 +0000
@@ -28,27 +28,15 @@
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 from openerp import tools
-
-class purchase_order_line(osv.Model):
-    _inherit = "purchase.order.line"
-
-    _columns = {
-        'account_analytic_plan_id': fields.many2one(
-            'account.analytic.plan.instance', 'Analytic Distribution',
-            help='This field is used to assign the selected'\
-                ' analytic account to the line of the purchase order'),
-            
-    }
-
     
 class purchase_requisition_line(osv.Model):
     _inherit = "purchase.requisition.line"
 
     _columns = {
-        'account_analytic_plan_id': fields.many2one(
+        'analytics_id': fields.many2one(
             'account.analytic.plan.instance', 'Analytic Distribution',
             help='This field is used to assign the selected'\
-                ' analytic account to the line of the purchase order'),
+                ' analytic distribution to the line of the purchase requisition'),
     }
 
 class purchase_requisition(osv.Model):
@@ -70,6 +58,6 @@
                 pol_ids = pol_obj.search(cr, uid, [('order_id','=',po_id)])
                 for pol_id in pol_ids:
                     pol_brw = pol_obj.browse(cr, uid, pol_id) 
-                    pol_obj.write(cr, uid, [pol_brw.id], {'account_analytic_plan_id':
-                        pol_brw.purchase_requisition_line_id.account_analytic_plan_id.id}, context=context)
+                    pol_obj.write(cr, uid, [pol_brw.id], {'analytics_id':
+                        pol_brw.purchase_requisition_line_id.analytics_id.id}, context=context)
         return res

=== modified file 'purchase_requisition_line_plan/view/purchase_requisition_view.xml'
--- purchase_requisition_line_plan/view/purchase_requisition_view.xml	2014-06-13 13:25:35 +0000
+++ purchase_requisition_line_plan/view/purchase_requisition_view.xml	2014-06-30 13:53:26 +0000
@@ -7,10 +7,10 @@
             <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='line_ids']//form//field[@name='product_qty']" position="after">
-                    <field name="account_analytic_plan_id"/>                                        
+                    <field name="analytics_id"/>                                        
                 </xpath>
                 <xpath expr="//field[@name='line_ids']//tree//field[@name='product_qty']" position="after">
-                    <field name="account_analytic_plan_id"/>                                        
+                    <field name="analytics_id"/>                                        
                 </xpath> 
             </field>
         </record> 
@@ -21,7 +21,7 @@
             <field name="inherit_id" ref="purchase_requisition_line_view.view_purchase_requisition_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='product_qty']" position="after">
-                    <field name="account_analytic_plan_id"/>                                        
+                    <field name="analytics_id"/>                                        
                 </xpath>
             </field>
         </record> 
@@ -32,7 +32,7 @@
             <field name="inherit_id" ref="purchase_requisition_line_view.view_purchase_requisition_line_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='product_qty']" position="after">
-                    <field name="account_analytic_plan_id" groups="purchase.group_analytic_accounting"/>                                        
+                    <field name="analytics_id" groups="purchase.group_analytic_accounting"/>                                        
                 </xpath>
             </field>
         </record>