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

fix: conflicts while merging brnach version-13 to develop

Browse Source
This commit is contained in:
Rohit Waghchaure
2021-08-17 10:53:19 +05:30
parent 39efc62b94 b27eeb54ae
commit eb1e3181a4
64 changed files with 1239 additions and 2830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/public/js/controllers/taxes_and_totals.js
View File

@@ -47,7 +47,10 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
if (in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype) && this.frm.doc.is_pos &&
this.frm.doc.is_return) {
this.update_paid_amount_for_return();
if (this.frm.doc.doctype == "Sales Invoice") {
this.set_total_amount_to_default_mop();
}
this.calculate_paid_amount();
}
// Sales person's commission
@@ -67,8 +70,6 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
calculate_discount_amount() {
if (frappe.meta.get_docfield(this.frm.doc.doctype, "discount_amount")) {
this.calculate_item_values();
this.calculate_net_total();
this.set_discount_amount();
this.apply_discount_amount();
}
@@ -734,7 +735,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
}
update_paid_amount_for_return() {
set_total_amount_to_default_mop() {
var grand_total = this.frm.doc.rounded_total || this.frm.doc.grand_total;
if(this.frm.doc.party_account_currency == this.frm.doc.currency) {
@@ -747,7 +748,6 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
precision("base_grand_total")
);
}
this.frm.doc.payments.find(pay => {
if (pay.default) {
pay.amount = total_amount_to_pay;