← Back to branch summary

~vauxoo/addons-vauxoo/6.0-trunk

« back to all changes in this revision

Viewing changes to product_pricelist_date/patch/pricelist.patch

[ADD] [product_customs_rate] Add new module product_customs_rate

Show diffs side-by-side

added added

removed removed

Lines of Context:
product_pricelist_date/patch/pricelist.patch
1
 
=== modified file 'product/pricelist.py'
2
 
--- product/pricelist.py        2013-03-21 14:34:59 +0000
3
 
+++ product/pricelist.py        2013-04-10 01:08:59 +0000
4
 
@@ -154,14 +154,13 @@
5
 
         date = time.strftime('%Y-%m-%d')
6
 
         if 'date' in context:
7
 
             date = context['date']
8
 
-
9
 
         currency_obj = self.pool.get('res.currency')
10
 
         product_obj = self.pool.get('product.product')
11
 
         product_category_obj = self.pool.get('product.category')
12
 
         product_uom_obj = self.pool.get('product.uom')
13
 
         supplierinfo_obj = self.pool.get('product.supplierinfo')
14
 
         price_type_obj = self.pool.get('product.price.type')
15
 
-
16
 
+        product_pricelist_item_obj = self.pool.get('product.pricelist.item')
17
 
         # product.pricelist.version:
18
 
         if not pricelist_ids:
19
 
             pricelist_ids = self.pool.get('product.pricelist').search(cr, uid, [], context=context)
20
 
@@ -221,8 +220,9 @@
21
 
                         'AND price_version_id = %s '
22
 
                         'AND (min_quantity IS NULL OR min_quantity <= %s) '
23
 
                         'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
24
 
-                    'ORDER BY sequence',
25
 
-                    (tmpl_id, product_id) + partner_args + (pricelist_version_ids[0], qty))
26
 
+                        'AND i.date <= %s'
27
 
+                        'ORDER BY '+product_pricelist_item_obj._order,
28
 
+                    (tmpl_id, product_id) + partner_args + (pricelist_version_ids[0], qty, date))
29
 
                 res1 = cr.dictfetchall()
30
 
                 uom_price_already_computed = False
31
 
                 for res in res1:
32