Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-4029 into lp:unifield-server

  1. us-4029
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4969
Proposed branch: lp:~mallorymarcot/unifield-server/us-4029
Merge into: lp:unifield-server
Diff against target: 19 lines (+3/-0)
1 file modified
bin/addons/sourcing/sale_order_line.py (+3/-0)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4029
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349158@code.launchpad.net
To post a comment you must log in.

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 2018-04-03 12:46:44 +0000
3+++ bin/addons/sourcing/sale_order_line.py 2018-07-09 08:36:28 +0000
4@@ -1688,6 +1688,7 @@
5 # attach new RfQ line:
6 price_unit = sourcing_line.price_unit if sourcing_line.price_unit > 0 else sourcing_line.product_id.standard_price
7 src_currency = sourcing_line.currency_id.id
8+
9 if price_unit and src_currency != target_currency_id:
10 price_unit = self.pool.get('res.currency').compute(cr, uid, src_currency, target_currency_id, price_unit, round=False, context=context)
11
12@@ -1740,6 +1741,8 @@
13 'original_uom': sourcing_line.original_uom.id,
14 })
15 self.pool.get('tender.line').create(cr, uid, tender_values, context=context)
16+ else:
17+ raise osv.except_osv(_('Error'), _('Line %s of order %s, please select a PO/CFT in the Order Sourcing Tool') % (sourcing_line.line_number, sourcing_line.order_id.name))
18
19 wf_service.trg_validate(uid, 'sale.order.line', sourcing_line.id, 'sourced', cr)
20

Subscribers

People subscribed via source and target branches