[FIX] product: sort pricelist items by sequence

The pricelist items should be sorted by sequence.

opw-660745
This commit is contained in:
Nicolas Martinelli
2016-01-08 10:44:52 +01:00
parent 44e65e72d3
commit 98e5673c90
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -148,7 +148,7 @@ class product_pricelist(osv.osv):
'AND (categ_id IS NULL OR categ_id = any(%s)) '
'AND (pricelist_id = %s) '
'AND ((i.date_start IS NULL OR i.date_start<=%s) AND (i.date_end IS NULL OR i.date_end>=%s))'
'ORDER BY applied_on, min_quantity desc',
'ORDER BY sequence, applied_on, min_quantity desc',
(prod_tmpl_ids, prod_ids, categ_ids, pricelist.id, date, date))
item_ids = [x[0] for x in cr.fetchall()]
@@ -251,7 +251,7 @@ class product_pricelist(osv.osv):
class product_pricelist_item(osv.osv):
_name = "product.pricelist.item"
_description = "Pricelist item"
_order = "applied_on, min_quantity desc"
_order = "sequence, applied_on, min_quantity desc"
def _check_recursion(self, cr, uid, ids, context=None):
for obj_list in self.browse(cr, uid, ids, context=context):
+1
View File
@@ -134,6 +134,7 @@
<separator string="Pricelist Items"/>
<field name="item_ids" nolabel="1" context="{'default_base':'list_price'}">
<tree string="Pricelist Items">
<field name="sequence" widget="handle"/>
<field name="name" string="Applicable On"/>
<field name="min_quantity"/>
<field name="date_start"/>