Merge lp:~vauxoo/openobject-addons/7.0-purchase_requisition_analytic-dev-sabrina into lp:openobject-addons/7.0

[Sabrina Romero - http://www.vauxoo.com]

[IMP] Add analytic account on purchase requisition line, so the purchase order takes
the account analytic value from the purchase requisition.

Unmerged revisions

9201. By Sabrina Romero - http://www.vauxoo.com on 2013-06-06

[IMP] Add analytic account on purchase requisition line.

=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py	2012-12-20 11:47:30 +0000
+++ purchase_requisition/purchase_requisition.py	2013-06-06 08:13:30 +0000
@@ -159,6 +159,7 @@
                     'price_unit': seller_price,
                     'date_planned': date_planned,
                     'taxes_id': [(6, 0, taxes)],
+                    'account_analytic_id': line.account_analytic_id and line.account_analytic_id.id or False,
                 }, context=context)
                 
         return res
@@ -175,6 +176,7 @@
         'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure'),
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', help="The analytic account related to a sales order."),
         'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
     }
 
 
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml	2013-02-25 13:38:04 +0000
+++ purchase_requisition/purchase_requisition_view.xml	2013-06-06 08:13:30 +0000
@@ -63,12 +63,14 @@
                         <field name="line_ids">
                             <tree string="Products" editable="bottom">
                                 <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
+                                <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom_id" groups="product.group_uom"/>
                             </tree>
                             <form string="Products" version="7.0">
                                 <group>
                                     <field name="product_id" />
+                                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom_id" />
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>