Merge lp:~julienmarchandise/unifield-server/US-5995 into lp:unifield-server

Proposed by jftempo
Status: Needs review
Proposed branch: lp:~julienmarchandise/unifield-server/US-5995
Merge into: lp:unifield-server
Diff against target: 15 lines (+5/-0)
1 file modified
bin/addons/sourcing/sale_order_line.py (+5/-0)
To merge this branch: bzr merge lp:~julienmarchandise/unifield-server/US-5995
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+374222@code.launchpad.net
To post a comment you must log in.
5495. By Julien Marchandise <email address hidden>

US-5995 : Maintain the price for uncodified product on PO-line created by OST

5496. By Julien Marchandise <email address hidden>

US-5995 : Maintain the price for uncodified product on PO-line created by OST

Unmerged revisions

5496. By Julien Marchandise <email address hidden>

US-5995 : Maintain the price for uncodified product on PO-line created by OST

5495. By Julien Marchandise <email address hidden>

US-5995 : Maintain the price for uncodified product on PO-line created by OST

5494. By Julien Marchandise <email address hidden>

US-5995 : Maintain the price on PO-line created by OST

5493. By Julien Marchandise <email address hidden>

US-5995 : Line by nomenclature : PO-line created by OST must keep the unit price set manually

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/sourcing/sale_order_line.py'
2--- bin/addons/sourcing/sale_order_line.py 2019-07-30 09:41:15 +0000
3+++ bin/addons/sourcing/sale_order_line.py 2019-10-16 15:42:23 +0000
4@@ -1694,6 +1694,11 @@
5 if price and company_currency_id != target_currency_id:
6 price = self.pool.get('res.currency').compute(cr, uid, company_currency_id, target_currency_id, price, round=False, context=context)
7
8+ if not price and sourcing_line.price_unit:
9+ price = sourcing_line.price_unit #US-5995
10+ if sourcing_line.currency_id.id != target_currency_id:
11+ price = self.pool.get('res.currency').compute(cr, uid, sourcing_line.currency_id.id, target_currency_id, price, round=False, context=context)
12+
13 pol_values = {
14 'order_id': po_to_use,
15 'product_id': sourcing_line.product_id.id or False,

Subscribers

People subscribed via source and target branches