Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg 2022-03-27 19:18:32 +05:30
parent 19b1b1f4ba
commit fc09377de2
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,12 +694,8 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
this.calculate_outstanding_amount(update_paid_amount);
<<<<<<< HEAD
}
=======
this.calculate_write_off_amount();
},
>>>>>>> 2e33e748ea (fix: Client side changes for POS Write off amount)
}
is_internal_invoice() {
if (['Sales Invoice', 'Purchase Invoice'].includes(this.frm.doc.doctype)) {
@ -823,11 +819,7 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
this.frm.set_value('base_paid_amount', flt(base_paid_amount, precision("base_paid_amount")));
}
<<<<<<< HEAD
calculate_change_amount(){
=======
calculate_change_amount: function() {
>>>>>>> ed38679d22 (fix: Ignore for Purchase Invoices)
this.frm.doc.change_amount = 0.0;
this.frm.doc.base_change_amount = 0.0;
if(in_list(["Sales Invoice", "POS Invoice"], this.frm.doc.doctype)
@ -847,19 +839,9 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
}
<<<<<<< HEAD
calculate_write_off_amount(){
if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
=======
calculate_write_off_amount: function() {
if (this.frm.doc.write_off_outstanding_amount_automatically) {
<<<<<<< HEAD
>>>>>>> 2e33e748ea (fix: Client side changes for POS Write off amount)
this.frm.doc.write_off_amount = flt(this.frm.doc.grand_total - this.frm.doc.paid_amount
+ this.frm.doc.change_amount, precision("write_off_amount"));
=======
calculate_write_off_amount() {
if(this.frm.doc.paid_amount > this.frm.doc.grand_total) {
this.frm.doc.write_off_amount = flt(this.frm.doc.outstanding_amount, precision("write_off_amount"));
>>>>>>> 6a50f36b31 (test: test for auto write-off amount)
this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
precision("base_write_off_amount"));