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

fix: Customer based price_list in online POS

Browse Source
This commit is contained in:
deepeshgarg007 2019-01-25 16:41:01 +05:30
parent f74e28bc64
commit 49cca7ac76
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/transaction.js
View File

@ -477,7 +477,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var me = this;
var item = frappe.get_doc(cdt, cdn);
if (item.serial_no) {
if (item && item.serial_no) {
if (!item.item_code) {
this.frm.trigger("item_code", cdt, cdn);
}

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

@ -164,6 +164,12 @@ erpnext.pos.PointOfSale = class PointOfSale {
}
}
});
frappe.ui.form.on('Sales Invoice', 'selling_price_list', (frm) => {
if(this.items) {
this.items.reset_items();
}
})
}
toggle_editing(flag) {
@ -1384,6 +1390,7 @@ class POSItems {
}
get_items({start = 0, page_length = 40, search_value='', item_group=this.parent_item_group}={}) {
const price_list = this.frm.doc.selling_price_list;
return new Promise(res => {
frappe.call({
method: "erpnext.selling.page.point_of_sale.point_of_sale.get_items",
@ -1391,10 +1398,10 @@ class POSItems {
args: {
start,
page_length,
'price_list': this.frm.doc.selling_price_list,
price_list,
item_group,
search_value,
'pos_profile': this.frm.doc.pos_profile
pos_profile: this.frm.doc.pos_profile
}
}).then(r => {
// const { items, serial_no, batch_no } = r.message;