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

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-12-27 13:49:09 +05:30
parent d5f30202b4
commit ce7dc5ecb3
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@@ -366,15 +366,10 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
hide_fields(this.frm.doc);
if(cint(this.frm.doc.is_paid)) {
this.frm.set_value("allocate_advances_automatically", 0);
<<<<<<< HEAD
if(!this.frm.doc.company) {
this.frm.set_value("is_paid", 0)
=======
this.frm.set_value("payment_terms_template", "");
this.frm.set_value("payment_schedule", []);
if (!this.frm.doc.company) {
this.frm.set_value("is_paid", 0);
>>>>>>> e1fc239f3d (fix: clear payment schedule in purchase invoice for is_paid)
if(!this.frm.doc.company) {
this.frm.set_value("is_paid", 0)
frappe.msgprint(__("Please specify Company to proceed"));
}
}

9
erpnext/controllers/accounts_controller.py
View File

@@ -2203,18 +2203,9 @@ class AccountsController(TransactionBase):
frappe.throw(_("Rows with duplicate due dates in other rows were found: {0}").format(duplicates))
def validate_payment_schedule_amount(self):
<<<<<<< HEAD
<<<<<<< HEAD
if self.doctype == "Sales Invoice" and self.is_pos:
return
=======
>>>>>>> e1fc239f3d (fix: clear payment schedule in purchase invoice for is_paid)
=======
if (self.doctype == "Sales Invoice" and self.is_pos) or self.get("is_opening") == "Yes":
return
>>>>>>> 0589fa7f3e (refactor: early return is always better)
party_account_currency = self.get("party_account_currency")
if not party_account_currency:
party_type, party = self.get_party()