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

fix: merge conflicts

Browse Source
This commit is contained in:
Subin Tom
2021-11-30 16:11:29 +05:30
parent b1c1b0ce49
commit 10c92c45d8
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,23 +265,14 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
me.frm.doc.net_total += item.net_amount;
me.frm.doc.base_net_total += item.base_net_amount;
});
}
calculate_shipping_charges() {
frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]);
<<<<<<< HEAD
<<<<<<< HEAD
},
=======
if(frappe.meta.get_docfield(this.frm.doc.doctype,"shipping_rule",this.frm.doc.name)) {
this.shipping_rule()
=======
calculate_shipping_charges: function() {
frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]);
if (frappe.meta.get_docfield(this.frm.doc.doctype, "shipping_rule", this.frm.doc.name)) {
this.shipping_rule();
>>>>>>> e7b4204c35 (fix: sider issues)
}
}
>>>>>>> c78b8b7897 (fix: Shipping Rule picking up old net_rate)
},
add_taxes_from_item_tax_template: function(item_tax_map) {
let me = this;

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

@@ -1067,14 +1067,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
method: "apply_shipping_rule",
}).fail(() => this.frm.set_value('shipping_rule', ''));
}
<<<<<<< HEAD
else {
me.calculate_taxes_and_totals();
}
},
=======
}
>>>>>>> c78b8b7897 (fix: Shipping Rule picking up old net_rate)
set_margin_amount_based_on_currency: function(exchange_rate) {
if (in_list(["Quotation", "Sales Order", "Delivery Note", "Sales Invoice", "Purchase Invoice", "Purchase Order", "Purchase Receipt"]), this.frm.doc.doctype) {