CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 14:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Afshan
2021-08-24 12:59:07 +05:30
committed by GitHub
parent d360819384
commit ac0800511d
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/pos_invoice/pos_invoice.js
View File

@@ -110,13 +110,8 @@ erpnext.selling.POSInvoiceController = erpnext.selling.SellingController.extend(
this.frm.refresh_field("base_paid_amount");
},
<<<<<<< HEAD
write_off_outstanding_amount_automatically: function() {
if(cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
=======
write_off_outstanding_amount_automatically() {
if (cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
>>>>>>> 332ac105b5 (refactor: use `read_only_depends_on` instead of code (#27008))
frappe.model.round_floats_in(this.frm.doc, ["grand_total", "paid_amount"]);
// this will make outstanding amount 0
this.frm.set_value("write_off_amount",

5
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -323,13 +323,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
this.frm.refresh_fields();
},
<<<<<<< HEAD
write_off_outstanding_amount_automatically: function() {
if(cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
=======
write_off_outstanding_amount_automatically() {
if (cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
>>>>>>> 332ac105b5 (refactor: use `read_only_depends_on` instead of code (#27008))
frappe.model.round_floats_in(this.frm.doc, ["grand_total", "paid_amount"]);
// this will make outstanding amount 0
this.frm.set_value("write_off_amount",