nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 02:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2019-04-11 12:32:43 +05:30
parent 89206e74d0 92b190febb
commit 65cca62ef9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/page/point_of_sale/point_of_sale.py
View File

@@ -49,7 +49,7 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
where where
i.disabled = 0 and i.has_variants = 0 and i.is_sales_item = 1 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 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, start=start,
page_length=page_length, page_length=page_length,
lft=lft, lft=lft,
@@ -83,7 +83,7 @@ def get_items(start, page_length, price_list, item_group, search_value="", pos_p
where where
i.disabled = 0 and i.has_variants = 0 and i.is_sales_item = 1 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 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), (start=start,page_length=page_length,lft=lft, rgt=rgt, condition=condition),
{ {
'price_list': price_list, 'price_list': price_list,