Unifield Server

Merge lp:~unifield-team/unifield-server/us-1285 into lp:unifield-server

  1. us-1285
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merge reported by: jftempo
Merged at revision: not available
Proposed branch: lp:~unifield-team/unifield-server/us-1285
Merge into: lp:unifield-server
Diff against target: 71 lines (+6/-12)
3 files modified
bin/addons/purchase_override/purchase.py (+2/-2)
bin/addons/supplier_catalogue/product.py (+2/-3)
bin/addons/supplier_catalogue/purchase.py (+2/-7)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1285
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+294394@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/purchase_override/purchase.py'
2--- bin/addons/purchase_override/purchase.py 2016-04-25 09:24:04 +0000
3+++ bin/addons/purchase_override/purchase.py 2016-05-11 15:59:16 +0000
4@@ -3673,9 +3673,9 @@
5 currency_id = self.pool.get('product.pricelist').browse(cr, uid, pricelist).currency_id.id
6 tmpl_id = self.pool.get('product.product').read(cr, uid, product, ['product_tmpl_id'])['product_tmpl_id'][0]
7 info_prices = []
8+ suppinfo_ids = self.pool.get('product.supplierinfo').search(cr, uid, [('name', '=', partner_id), ('product_id', '=', tmpl_id)], context=context)
9 domain = [('uom_id', '=', uom),
10- ('partner_id', '=', partner_id),
11- ('product_id', '=', tmpl_id),
12+ ('suppinfo_id', 'in', suppinfo_ids),
13 '|', ('valid_from', '<=', date_order),
14 ('valid_from', '=', False),
15 '|', ('valid_till', '>=', date_order),
16
17=== modified file 'bin/addons/supplier_catalogue/product.py'
18--- bin/addons/supplier_catalogue/product.py 2016-03-14 09:32:32 +0000
19+++ bin/addons/supplier_catalogue/product.py 2016-05-11 15:59:16 +0000
20@@ -294,11 +294,10 @@
21
22 partner_price = self.pool.get('pricelist.partnerinfo')
23 info_prices = []
24-
25+ suppinfo_ids = self.pool.get('product.supplierinfo').search(cr, uid, [('name', '=', partner_id), ('product_id', '=', product.product_tmpl_id.id)], context=context)
26 domain = [('min_quantity', '<=', product_qty),
27 ('uom_id', '=', product_uom_id),
28- ('partner_id', '=', partner_id),
29- ('product_id', '=', product.product_tmpl_id.id),
30+ ('suppinfo_id', 'in', suppinfo_ids),
31 '|', ('valid_from', '<=', order_date),
32 ('valid_from', '=', False),
33 '|', ('valid_till', '>=', order_date),
34
35=== modified file 'bin/addons/supplier_catalogue/purchase.py'
36--- bin/addons/supplier_catalogue/purchase.py 2012-12-19 15:40:46 +0000
37+++ bin/addons/supplier_catalogue/purchase.py 2016-05-11 15:59:16 +0000
38@@ -22,7 +22,6 @@
39 from osv import osv
40
41 from tools.translate import _
42-
43 class purchase_order_line(osv.osv):
44 _name = 'purchase.order.line'
45 _inherit = 'purchase.order.line'
46@@ -46,15 +45,12 @@
47 suppinfo_obj = self.pool.get('product.supplierinfo')
48 prod_obj = self.pool.get('product.product')
49 catalogue_obj = self.pool.get('supplier.catalogue')
50-
51 currency_id = self.pool.get('product.pricelist').browse(cr, uid, pricelist, context=context).currency_id.id
52-
53 info_prices = []
54-
55+ suppinfo_ids = self.pool.get('product.supplierinfo').search(cr, uid, [('name', '=', partner_id), ('product_id', '=', product_id.product_tmpl_id.id)], context=context)
56 domain = [('min_quantity', '<=', product_qty),
57 ('uom_id', '=', product_uom_id),
58- ('partner_id', '=', partner_id),
59- ('product_id', '=', product_id.product_tmpl_id.id),
60+ ('suppinfo_id', 'in', suppinfo_ids),
61 '|', ('valid_from', '<=', order_date),
62 ('valid_from', '=', False),
63 '|', ('valid_till', '>=', order_date),
64@@ -62,7 +58,6 @@
65
66 domain_cur = [('currency_id', '=', currency_id)]
67 domain_cur.extend(domain)
68-
69 info_prices = partner_price.search(cr, uid, domain_cur, order='sequence asc, min_quantity desc, id desc', limit=1, context=context)
70 if not info_prices:
71 info_prices = partner_price.search(cr, uid, domain, order='sequence asc, min_quantity desc, id desc', limit=1, context=context)

Subscribers

People subscribed via source and target branches

to all changes: