schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor multi pos profile selection in the pos invoice (#11721)

Browse Source
This commit is contained in:
rohitwaghchaure
2017-11-28 16:11:15 +05:30
committed by Nabin Hait
parent 8d9edbf133
commit c037dc775e
12 changed files with 302 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,7 +322,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
project: item.project || me.frm.doc.project,
qty: item.qty || 1,
stock_qty: item.stock_qty,
conversion_factor: item.conversion_factor
conversion_factor: item.conversion_factor,
pos_profile: me.frm.doc.doctype == 'Sales Invoice' ? me.frm.doc.pos_profile : ''
}
},
@@ -891,7 +892,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
"name": me.frm.doc.name,
"is_return": cint(me.frm.doc.is_return),
"update_stock": in_list(['Sales Invoice', 'Purchase Invoice'], me.frm.doc.doctype) ? cint(me.frm.doc.update_stock) : 0,
"conversion_factor": me.frm.doc.conversion_factor
"conversion_factor": me.frm.doc.conversion_factor,
"pos_profile": me.frm.doc.doctype == 'Sales Invoice' ? me.frm.doc.pos_profile : ''
};
},