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

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
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py 2019-10-30 16:33:21 +0000
+++ bin/addons/sourcing/sale_order_line.py 2020-02-06 09:41:53 +0000
@@ -2113,10 +2113,10 @@
2113 line = self.browse(cr, uid, ids[0])2113 line = self.browse(cr, uid, ids[0])
21142114
2115 if product and type:2115 if product and type:
2116 seller = product_obj.browse(cr, uid, product).seller_id
2117 sellerId = (seller and (seller.supplier or seller.manufacturer or seller.transporter) and seller.id) or False
2118
2119 if l_type == 'make_to_order':2116 if l_type == 'make_to_order':
2117 seller = product_obj.browse(cr, uid, product).seller_id
2118 sellerId = (seller and (seller.supplier or seller.manufacturer or seller.transporter) and seller.id) or False
2119
2120 po_cft = 'po'2120 po_cft = 'po'
2121 if line and \2121 if line and \
2122 ((line.product_id and line.product_id.type in ('service', 'service_recep')) or \2122 ((line.product_id and line.product_id.type in ('service', 'service_recep')) or \
21232123
=== modified file 'bin/addons/sourcing/sourcing_view.xml'
--- bin/addons/sourcing/sourcing_view.xml 2019-06-05 08:58:40 +0000
+++ bin/addons/sourcing/sourcing_view.xml 2020-02-06 09:41:53 +0000
@@ -71,7 +71,7 @@
71 <field name="supplier" colspan="2"71 <field name="supplier" colspan="2"
72 domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft),('check_partner', '=', order_id), '|', '|', ('supplier', '=', 't'), ('manufacturer', '=', 't'), ('transporter', '=', 't')]"72 domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft),('check_partner', '=', order_id), '|', '|', ('supplier', '=', 't'), ('manufacturer', '=', 't'), ('transporter', '=', 't')]"
73 context="{'product_id': product_id, 'choose_supplier': True, 'uom': product_uom, 'product_qty': product_uom_qty}"73 context="{'product_id': product_id, 'choose_supplier': True, 'uom': product_uom, 'product_qty': product_uom_qty}"
74 attrs="{'readonly': ['|', ('po_cft', '=', 'cft'), ('state', '!=', 'validated')], 'invisible': [('type', '=', 'make_to_stock')]}"74 attrs="{'readonly': ['|', '|', ('po_cft', '=', 'cft'), ('state', '!=', 'validated'), ('type', '=', 'make_to_stock')]}"
75 on_change="onChangeSupplier(supplier, type)" />75 on_change="onChangeSupplier(supplier, type)" />
76 <field name="customer" invisible="1" />76 <field name="customer" invisible="1" />
77 <field name="estimated_delivery_date" />77 <field name="estimated_delivery_date" />

Subscribers

People subscribed via source and target branches