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

resolved merge conflicts

Browse Source
This commit is contained in:
Saurabh
2018-01-09 12:05:20 +05:30
parent d2d54826ab 471bc618b5
commit 892a7a6980
22 changed files with 359 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,7 +228,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
erpnext.hide_company();
this.set_dynamic_labels();
this.setup_sms();
},
apply_default_taxes: function() {
@@ -535,6 +534,32 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
},
due_date: function() {
// due_date is to be changed, payment terms template and/or payment schedule must
// be removed as due_date is automatically changed based on payment terms
if (this.frm.doc.due_date) {
if (this.frm.doc.payment_terms_template || this.frm.doc.payment_schedule.length) {
var message1 = "";
var message2 = "";
var final_message = "Please clear the ";
if (this.frm.doc.payment_terms_template) {
message1 = "selected Payment Terms Template";
final_message = final_message + message1;
}
if (this.frm.doc.payment_schedule.length) {
message2 = "Payment Schedule Table";
if (message1.length !== 0) message2 = " and " + message2;
final_message = final_message + message2;
}
frappe.msgprint(final_message);
}
}
},
recalculate_terms: function() {
const doc = this.frm.doc;
@@ -542,7 +567,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.payment_terms_template();
} else if (doc.payment_schedule) {
const me = this;
doc.payment_schedule.forEach(
function(term) {
if (term.payment_term) {