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

Fixes #12810

Browse Source
This commit is contained in:
Saurabh 2018-02-08 00:22:53 +05:30
parent b553b7a69d
commit 056c1709c6
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -768,11 +768,19 @@ class POSCart {
return; return;
} }
const item_code = this.selected_item.attr('data-item-code'); if (this.selected_item.active_field == 'discount_percentage' && this.numpad.get_value() > cint(100)) {
const field = this.selected_item.active_field; frappe.show_alert({
const value = this.numpad.get_value(); indicator: 'red',
message: __('Discount amount cannot be greater than 100%')
});
this.numpad.reset_value();
} else {
const item_code = this.selected_item.attr('data-item-code');
const field = this.selected_item.active_field;
const value = this.numpad.get_value();
this.events.on_field_change(item_code, field, value); this.events.on_field_change(item_code, field, value);
}
} }
this.events.on_numpad(btn_value); this.events.on_numpad(btn_value);
@ -1588,4 +1596,4 @@ class Payment {
this.dialog.set_value("paid_amount", this.frm.doc.paid_amount); this.dialog.set_value("paid_amount", this.frm.doc.paid_amount);
this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount); this.dialog.set_value("outstanding_amount", this.frm.doc.outstanding_amount);
} }
} }