Odoo Addons (MOVED TO GITHUB)

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

  1. 7.0-purchase_requisition_analytic-dev-sabrina
  2. Merge into 7.0
Proposed by Sabrina Romero - http://www.vauxoo.com
Status: Needs review
Proposed branch: lp:~vauxoo/openobject-addons/7.0-purchase_requisition_analytic-dev-sabrina
Merge into: lp:openobject-addons/7.0
Diff against target: 38 lines (+4/-0)
2 files modified
purchase_requisition/purchase_requisition.py (+2/-0)
purchase_requisition/purchase_requisition_view.xml (+2/-0)
To merge this branch: bzr merge lp:~vauxoo/openobject-addons/7.0-purchase_requisition_analytic-dev-sabrina
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
OpenERP R&D Team Pending
Review via email: mp+167716@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Unmerged revisions

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

[IMP] Add analytic account on purchase requisition line.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase_requisition/purchase_requisition.py'
2--- purchase_requisition/purchase_requisition.py 2012-12-20 11:47:30 +0000
3+++ purchase_requisition/purchase_requisition.py 2013-06-06 08:13:30 +0000
4@@ -159,6 +159,7 @@
5 'price_unit': seller_price,
6 'date_planned': date_planned,
7 'taxes_id': [(6, 0, taxes)],
8+ 'account_analytic_id': line.account_analytic_id and line.account_analytic_id.id or False,
9 }, context=context)
10
11 return res
12@@ -175,6 +176,7 @@
13 'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure'),
14 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
15 'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
16+ 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', help="The analytic account related to a sales order."),
17 'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
18 }
19
20
21=== modified file 'purchase_requisition/purchase_requisition_view.xml'
22--- purchase_requisition/purchase_requisition_view.xml 2013-02-25 13:38:04 +0000
23+++ purchase_requisition/purchase_requisition_view.xml 2013-06-06 08:13:30 +0000
24@@ -63,12 +63,14 @@
25 <field name="line_ids">
26 <tree string="Products" editable="bottom">
27 <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
28+ <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>
29 <field name="product_qty"/>
30 <field name="product_uom_id" groups="product.group_uom"/>
31 </tree>
32 <form string="Products" version="7.0">
33 <group>
34 <field name="product_id" />
35+ <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>
36 <field name="product_qty"/>
37 <field name="product_uom_id" />
38 <field name="company_id" groups="base.group_multi_company" widget="selection"/>