Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixed] Disocunt amount not working for POS

Browse Source
This commit is contained in:
Rohit Waghchaure 2017-09-27 12:16:58 +05:30
parent 45d45f4247
commit 87e994e0a2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/page/point_of_sale/point_of_sale.js
View File

@ -21,7 +21,9 @@ frappe.pages['point-of-sale'].on_page_load = function(wrapper) {
}; };
frappe.pages['point-of-sale'].refresh = function(wrapper) { frappe.pages['point-of-sale'].refresh = function(wrapper) {
cur_frm = wrapper.pos.frm; if (wrapper.pos) {
cur_frm = wrapper.pos.frm;
}
} }
erpnext.pos.PointOfSale = class PointOfSale { erpnext.pos.PointOfSale = class PointOfSale {
@ -742,7 +744,7 @@ class POSCart {
this.wrapper.find('.discount_amount').on('change', (e) => { this.wrapper.find('.discount_amount').on('change', (e) => {
frappe.model.set_value(this.frm.doctype, this.frm.docname, frappe.model.set_value(this.frm.doctype, this.frm.docname,
'discount_amount', e.target.value); 'discount_amount', flt(e.target.value));
this.frm.trigger('discount_amount') this.frm.trigger('discount_amount')
.then(() => { .then(() => {
let discount_wrapper = this.wrapper.find('.additional_discount_percentage'); let discount_wrapper = this.wrapper.find('.additional_discount_percentage');

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

@ -31,7 +31,7 @@ def get_items(start, page_length, price_list, item_group, search_value=""):
ON ON
(item_det.item_code=i.name or item_det.item_code=i.variant_of) (item_det.item_code=i.name or item_det.item_code=i.variant_of)
where where
i.disabled = 0 and i.has_variants = 0 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 (i.item_code like %(item_code)s and (i.item_code like %(item_code)s
or i.item_name like %(item_code)s or i.barcode like %(item_code)s) or i.item_name like %(item_code)s or i.barcode like %(item_code)s)