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

Merge branch 'develop' into payment-terms

Browse Source
This commit is contained in:
tunde
2017-09-08 09:59:13 +01:00
parent 4f4148b0da 9bc2b66e14
commit 199daf7ac5
29 changed files with 2425 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@
erpnext.TransactionController = erpnext.taxes_and_totals.extend({
setup: function() {
this._super();
frappe.flags.hide_serial_batch_dialog = false;
frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
var has_margin_field = frappe.meta.has_field(cdt, 'margin_type');
@@ -314,12 +315,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(!r.exc) {
me.frm.script_manager.trigger("price_list_rate", cdt, cdn);
me.toggle_conversion_factor(item);
if(show_batch_dialog) {
if(show_batch_dialog && !frappe.flags.hide_serial_batch_dialog) {
var d = locals[cdt][cdn];
$.each(r.message, function(k, v) {
if(!d[k]) d[k] = v;
});
erpnext.show_serial_batch_selector(me.frm, d);
erpnext.show_serial_batch_selector(me.frm, d, (item) => {
me.frm.script_manager.trigger('qty', item.doctype, item.name);
});
}
}
}
@@ -1153,7 +1157,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
});
erpnext.show_serial_batch_selector = function(frm, d) {
erpnext.show_serial_batch_selector = function(frm, d, callback, show_dialog) {
frappe.require("assets/erpnext/js/utils/serial_no_batch_selector.js", function() {
new erpnext.SerialNoBatchSelector({
frm: frm,
@@ -1162,6 +1166,7 @@ erpnext.show_serial_batch_selector = function(frm, d) {
type: "Warehouse",
name: d.warehouse
},
});
callback: callback
}, show_dialog);
});
}