Merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pr_line_related_po-description-dev-julio into lp:addons-vauxoo/7.0

Proposed by Julio Serna-http://www.vauxoo.com
Status: Merged
Merged at revision: 1101
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pr_line_related_po-description-dev-julio
Merge into: lp:addons-vauxoo/7.0
Diff against target: 42 lines (+17/-3)
1 file modified
pr_line_related_po_line/model/purchase_order_line.py (+17/-3)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-addons-vauxoo-pr_line_related_po-description-dev-julio
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Pending
Moisés López - http://www.vauxoo.com Pending
Julio Serna-http://www.vauxoo.com Pending
Review via email: mp+226558@code.launchpad.net

Description of the change

Added function that to allow to create pruchase from requisition with description without product

To post a comment you must log in.
1078. By Julio Serna-http://www.vauxoo.com

[MERGE]

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pr_line_related_po_line/model/purchase_order_line.py'
2--- pr_line_related_po_line/model/purchase_order_line.py 2014-06-02 19:23:17 +0000
3+++ pr_line_related_po_line/model/purchase_order_line.py 2014-07-28 18:26:57 +0000
4@@ -72,7 +72,10 @@
5 res[requisition.id] = purchase_id
6 for line in requisition.line_ids:
7 product = line.product_id
8- seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
9+ if product:
10+ seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
11+ else:
12+ seller_price, qty, default_uom_po_id, date_planned = self._seller_details_without_product(cr, uid, line, supplier, context=context)
13 taxes_ids = product.supplier_taxes_id
14 taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
15 purchase_order_line.create(cr, uid, {
16@@ -80,9 +83,9 @@
17 #change
18 'purchase_requisition_line_id': line.id,
19 #end change
20- 'name': product.partner_ref,
21+ 'name': product and product.partner_ref or '',
22 'product_qty': qty,
23- 'product_id': product.id,
24+ 'product_id': product and product.id or False,
25 'product_uom': default_uom_po_id,
26 'price_unit': seller_price,
27 'date_planned': date_planned,
28@@ -90,3 +93,14 @@
29 }, context=context)
30
31 return res
32+
33+ def _seller_details_without_product(self, cr, uid, requisition_line, supplier, context=None):
34+ product = requisition_line.product_id
35+ default_uom_pol_id = self.pool.get('purchase.order.line')._get_uom_id(cr, uid, context=context)
36+ default_uom_po_id = requisition_line.product_uom_id and requisition_line.product_uom_id.id or default_uom_pol_id
37+ qty = requisition_line.product_qty
38+ seller_delay = 0.0
39+ seller_price = False
40+ seller_qty = False
41+ date_planned = self._planned_date(requisition_line.requisition_id, seller_delay)
42+ return seller_price, qty, default_uom_po_id, date_planned