Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-6497 into lp:unifield-server

  1. US-6497
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5609
Proposed branch: lp:~dorian-kemps/unifield-server/US-6497
Merge into: lp:unifield-server
Diff against target: 30 lines (+4/-4)
2 files modified
bin/addons/sourcing/sale_order_line.py (+3/-3)
bin/addons/sourcing/sourcing_view.xml (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6497
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+378645@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 2019-10-30 16:33:21 +0000
3+++ bin/addons/sourcing/sale_order_line.py 2020-02-06 09:41:53 +0000
4@@ -2113,10 +2113,10 @@
5 line = self.browse(cr, uid, ids[0])
6
7 if product and type:
8- seller = product_obj.browse(cr, uid, product).seller_id
9- sellerId = (seller and (seller.supplier or seller.manufacturer or seller.transporter) and seller.id) or False
10-
11 if l_type == 'make_to_order':
12+ seller = product_obj.browse(cr, uid, product).seller_id
13+ sellerId = (seller and (seller.supplier or seller.manufacturer or seller.transporter) and seller.id) or False
14+
15 po_cft = 'po'
16 if line and \
17 ((line.product_id and line.product_id.type in ('service', 'service_recep')) or \
18
19=== modified file 'bin/addons/sourcing/sourcing_view.xml'
20--- bin/addons/sourcing/sourcing_view.xml 2019-06-05 08:58:40 +0000
21+++ bin/addons/sourcing/sourcing_view.xml 2020-02-06 09:41:53 +0000
22@@ -71,7 +71,7 @@
23 <field name="supplier" colspan="2"
24 domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft),('check_partner', '=', order_id), '|', '|', ('supplier', '=', 't'), ('manufacturer', '=', 't'), ('transporter', '=', 't')]"
25 context="{'product_id': product_id, 'choose_supplier': True, 'uom': product_uom, 'product_qty': product_uom_qty}"
26- attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), ('state', '!=', 'validated')], 'invisible': [('type', '=', 'make_to_stock')]}"
27+ attrs="{'readonly': ['|', '|', ('po_cft', '=', 'cft'), ('state', '!=', 'validated'), ('type', '=', 'make_to_stock')]}"
28 on_change="onChangeSupplier(supplier, type)" />
29 <field name="customer" invisible="1" />
30 <field name="estimated_delivery_date" />

Subscribers

People subscribed via source and target branches