nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 23:18:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-03-13 17:53:02 +05:30
parent e07f9e6754
commit 9ffb4c5ca9
3 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/controllers/accounts_controller.py
View File

@@ -218,21 +218,6 @@ class AccountsController(TransactionBase):
)
if self.get("is_return") and self.get("return_against") and not self.get("is_pos"):
<<<<<<< HEAD
document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
frappe.msgprint(
_(
"{0} will be treated as a standalone {0}. If you want {1}'s outstanding to be updated, uncheck {2} checkbox. <br><br> Or you can use {3} tool to reconcile against {1} later."
).format(
document_type,
<<<<<<< HEAD
get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
=======
>>>>>>> adf13a19c4 (chore: update popup message)
get_link_to_form(self.doctype, self.get("return_against")),
frappe.bold("Update Outstanding for Self"),
get_link_to_form("Payment Reconciliation"),
=======
if self.get("update_outstanding_for_self"):
document_type = "Credit Note" if self.doctype == "Sales Invoice" else "Debit Note"
frappe.msgprint(
@@ -242,9 +227,8 @@ class AccountsController(TransactionBase):
frappe.bold(document_type),
get_link_to_form(self.doctype, self.get("return_against")),
frappe.bold("Update Outstanding for Self"),
get_link_to_form("Payment Reconciliation"),
get_link_to_form("Payment Reconciliation", "Payment Reconciliation"),
)
>>>>>>> 445d2acf50 (chore: better popup message)
)
pos_check_field = "is_pos" if self.doctype == "Sales Invoice" else "is_paid"