nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts and pass all parameters

Browse Source
This commit is contained in:
ruthra kumar
2025-05-06 14:12:44 +05:30
parent 4376fbc3ed
commit bd395e2406
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
erpnext/accounts/party.py
View File

@@ -597,26 +597,11 @@ def get_due_date_from_template(template_name, posting_date, bill_date):
def validate_due_date( def validate_due_date(
posting_date, due_date, party_type, party, company=None, bill_date=None, template_name=None posting_date, due_date, party_type, party, company=None, bill_date=None, template_name=None, doctype=None
): ):
if getdate(due_date) < getdate(posting_date): if getdate(due_date) < getdate(posting_date):
frappe.throw(_("Due Date cannot be before Posting / Supplier Invoice Date")) frappe.throw(_("Due Date cannot be before Posting / Supplier Invoice Date"))
else: else:
<<<<<<< HEAD
if not template_name:
return
default_due_date = get_due_date_from_template(template_name, posting_date, bill_date).strftime(
"%Y-%m-%d"
)
if not default_due_date:
return
if default_due_date != posting_date and getdate(due_date) > getdate(default_due_date):
is_credit_controller = (
frappe.db.get_single_value("Accounts Settings", "credit_controller") in frappe.get_roles()
=======
validate_due_date_with_template(posting_date, due_date, bill_date, template_name, doctype) validate_due_date_with_template(posting_date, due_date, bill_date, template_name, doctype)
@@ -637,18 +622,9 @@ def validate_due_date_with_template(posting_date, due_date, bill_date, template_
_("Note: Due Date exceeds allowed {0} credit days by {1} day(s)").format( _("Note: Due Date exceeds allowed {0} credit days by {1} day(s)").format(
party_type, date_diff(due_date, default_due_date) party_type, date_diff(due_date, default_due_date)
) )
>>>>>>> b6d9134014 (fix: show party type in due date exceeding message)
) )
if is_credit_controller: else:
msgprint( frappe.throw(_("Due Date cannot be after {0}").format(formatdate(default_due_date)))
_("Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s)").format(
date_diff(due_date, default_due_date)
)
)
else:
frappe.throw(
_("Due / Reference Date cannot be after {0}").format(formatdate(default_due_date))
)
@frappe.whitelist() @frappe.whitelist()

3
erpnext/controllers/accounts_controller.py
View File

@@ -684,7 +684,9 @@ class AccountsController(TransactionBase):
"Customer", "Customer",
self.customer, self.customer,
self.company, self.company,
None,
self.payment_terms_template, self.payment_terms_template,
self.doctype,
) )
elif self.doctype == "Purchase Invoice": elif self.doctype == "Purchase Invoice":
validate_due_date( validate_due_date(
@@ -695,6 +697,7 @@ class AccountsController(TransactionBase):
self.company, self.company,
self.bill_date, self.bill_date,
self.payment_terms_template, self.payment_terms_template,
self.doctype,
) )
def set_price_list_currency(self, buying_or_selling): def set_price_list_currency(self, buying_or_selling):