fixed merge conflict
This commit is contained in:
commit
65cca62ef9
@ -49,7 +49,7 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
|
||||
where
|
||||
i.disabled = 0 and i.has_variants = 0 and i.is_sales_item = 1
|
||||
and i.item_group in (select name from `tabItem Group` where lft >= {lft} and rgt <= {rgt})
|
||||
and {condition} limit {start}, {page_length}""".format(
|
||||
and {condition} order by idx desc limit {start}, {page_length}""".format(
|
||||
start=start,
|
||||
page_length=page_length,
|
||||
lft=lft,
|
||||
@ -83,7 +83,7 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
|
||||
where
|
||||
i.disabled = 0 and i.has_variants = 0 and i.is_sales_item = 1
|
||||
and i.item_group in (select name from `tabItem Group` where lft >= {lft} and rgt <= {rgt})
|
||||
and {condition} order by idx desc limit {start}, {page_length}""".format
|
||||
and {condition} order by idx desc limit {start}, {page_length} """.format
|
||||
(start=start,page_length=page_length,lft=lft, rgt=rgt, condition=condition),
|
||||
{
|
||||
'price_list': price_list,
|
||||
|
Loading…
x
Reference in New Issue
Block a user