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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-01-17 18:56:02 +05:30
parent 7030817bf2 a7bcf6791e
commit 570e29d5e7
14 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,7 +549,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
final_message = final_message + message1;
}
if (this.frm.doc.payment_schedule.length) {
if ((this.frm.doc.payment_schedule || []).length) {
message2 = "Payment Schedule Table";
if (message1.length !== 0) message2 = " and " + message2;
final_message = final_message + message2;
@@ -1262,11 +1262,13 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var me = this;
const doc = this.frm.doc;
if(doc.payment_terms_template && doc.doctype !== 'Delivery Note') {
var posting_date = doc.bill_date || doc.posting_date || doc.transaction_date;
frappe.call({
method: "erpnext.controllers.accounts_controller.get_payment_terms",
args: {
terms_template: doc.payment_terms_template,
posting_date: doc.posting_date || doc.transaction_date,
posting_date: posting_date,
grand_total: doc.rounded_total || doc.grand_total
},
callback: function(r) {