From cfa9d1adb7e5abdf9f9dd563322d47121e8004e0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 29 Jan 2018 16:07:21 +0530 Subject: [PATCH] Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685) * Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date * Payment Terms patch for credit days defined in customer group --- .../purchase_invoice/purchase_invoice.py | 2 +- .../doctype/sales_invoice/sales_invoice.py | 2 +- erpnext/accounts/party.py | 39 +++++-- .../buying/doctype/supplier/test_records.json | 1 - erpnext/controllers/accounts_controller.py | 4 +- erpnext/patches.txt | 2 +- ..._default_payment_terms_based_on_company.py | 37 +++++++ .../patches/v5_1/fix_credit_days_based_on.py | 9 -- .../change_default_customer_credit_days.py | 3 +- erpnext/public/js/controllers/transaction.js | 9 +- erpnext/setup/doctype/company/company.json | 101 ++++++------------ .../customer_group/customer_group.json | 41 ++----- 12 files changed, 118 insertions(+), 132 deletions(-) create mode 100644 erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py delete mode 100644 erpnext/patches/v5_1/fix_credit_days_based_on.py diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 07853d0e4a..28d51ce0c7 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -96,7 +96,7 @@ class PurchaseInvoice(BuyingController): if not self.credit_to: self.credit_to = get_party_account("Supplier", self.supplier, self.company) if not self.due_date: - self.due_date = get_due_date(self.posting_date, "Supplier", self.supplier) + self.due_date = get_due_date(self.posting_date, "Supplier", self.supplier, self.company) super(PurchaseInvoice, self).set_missing_values(for_validate) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index f6d43c7f70..b6c84052a6 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -237,7 +237,7 @@ class SalesInvoice(SellingController): if not self.debit_to: self.debit_to = get_party_account("Customer", self.customer, self.company) if not self.due_date and self.customer: - self.due_date = get_due_date(self.posting_date, "Customer", self.customer) + self.due_date = get_due_date(self.posting_date, "Customer", self.customer, self.company) super(SalesInvoice, self).set_missing_values(for_validate) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 7bccfe89f3..5237a71949 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -51,7 +51,7 @@ def _get_party_details(party=None, account=None, party_type="Customer", company= set_other_values(out, party, party_type) set_price_list(out, party, party_type, price_list) out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_type) - out["payment_terms_template"] = get_pyt_term_template(party.name, party_type) + out["payment_terms_template"] = get_pyt_term_template(party.name, party_type, company) if not out.get("currency"): out["currency"] = currency @@ -164,7 +164,7 @@ def set_account_and_due_date(party, account, party_type, company, posting_date, out = { party_type.lower(): party, account_fieldname : account, - "due_date": get_due_date(posting_date, party_type, party) + "due_date": get_due_date(posting_date, party_type, party, company) } return out @@ -267,12 +267,12 @@ def validate_party_accounts(doc): @frappe.whitelist() -def get_due_date(posting_date, party_type, party): +def get_due_date(posting_date, party_type, party, company=None): """Get due date from `Payment Terms Template`""" due_date = None if posting_date and party: due_date = posting_date - template_name = get_pyt_term_template(party, party_type) + template_name = get_pyt_term_template(party, party_type, company) if template_name: due_date = get_due_date_from_template(template_name, posting_date).strftime("%Y-%m-%d") else: @@ -305,12 +305,11 @@ def get_due_date_from_template(template_name, posting_date): return due_date - -def validate_due_date(posting_date, due_date, party_type, party): +def validate_due_date(posting_date, due_date, party_type, party, company=None): if getdate(due_date) < getdate(posting_date): frappe.throw(_("Due Date cannot be before Posting Date")) else: - default_due_date = get_due_date(posting_date, party_type, party) + default_due_date = get_due_date(posting_date, party_type, party, company) if not default_due_date: return @@ -360,14 +359,32 @@ def set_taxes(party, party_type, posting_date, company, customer_group=None, sup @frappe.whitelist() -def get_pyt_term_template(party_name, party_type): +def get_pyt_term_template(party_name, party_type, company=None): + if party_type not in ("Customer", "Supplier"): + return + template = None - if party_type in ('Customer', 'Supplier'): - template = frappe.db.get_value(party_type, party_name, fieldname='payment_terms') + if party_type == 'Customer': + customer = frappe.db.get_value("Customer", party_name, + fieldname=['payment_terms', "customer_group"], as_dict=1) + template = customer.payment_terms + + if not template and customer.customer_group: + template = frappe.db.get_value("Customer Group", + customer.customer_group, fieldname='payment_terms') + else: + supplier = frappe.db.get_value("Supplier", party_name, + fieldname=['payment_terms', "supplier_type"], as_dict=1) + template = supplier.payment_terms + + if not template and supplier.supplier_type: + template = frappe.db.get_value("Supplier Type", supplier.supplier_type, fieldname='payment_terms') + + if not template and company: + template = frappe.db.get_value("Company", company, fieldname='payment_terms') return template - def validate_party_frozen_disabled(party_type, party_name): if party_type and party_name: if party_type in ("Customer", "Supplier"): diff --git a/erpnext/buying/doctype/supplier/test_records.json b/erpnext/buying/doctype/supplier/test_records.json index 7479f55650..370ce8dad1 100644 --- a/erpnext/buying/doctype/supplier/test_records.json +++ b/erpnext/buying/doctype/supplier/test_records.json @@ -9,7 +9,6 @@ "doctype": "Supplier", "supplier_name": "_Test Supplier P", "supplier_type": "_Test Supplier Type", - "credit_days_based_on": "Fixed Days" }, { "doctype": "Supplier", diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index c7b520608e..b3672cbde3 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -135,9 +135,9 @@ class AccountsController(TransactionBase): if not self.due_date: frappe.throw(_("Due Date is mandatory")) - validate_due_date(self.posting_date, self.due_date, "Customer", self.customer) + validate_due_date(self.posting_date, self.due_date, "Customer", self.customer, self.company) elif self.doctype == "Purchase Invoice": - validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier) + validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier, self.company) def set_price_list_currency(self, buying_or_selling): if self.meta.get_field("posting_date"): diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 8fa382cf7f..3a18efc1a6 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -183,7 +183,6 @@ erpnext.patches.v5_0.index_on_account_and_gl_entry execute:frappe.db.sql("""delete from `tabProject Task`""") erpnext.patches.v5_0.update_item_desc_in_invoice erpnext.patches.v5_1.fix_against_account -erpnext.patches.v5_1.fix_credit_days_based_on execute:frappe.rename_doc("DocType", "Salary Manager", "Process Payroll", force=True) erpnext.patches.v5_1.rename_roles erpnext.patches.v5_1.default_bom @@ -487,3 +486,4 @@ erpnext.patches.v10_0.add_guardian_role_for_parent_portal erpnext.patches.v10_0.set_numeric_ranges_in_template_if_blank erpnext.patches.v10_0.update_assessment_plan erpnext.patches.v10_0.update_assessment_result +erpnext.patches.v10_0.set_default_payment_terms_based_on_company \ No newline at end of file diff --git a/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py b/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py new file mode 100644 index 0000000000..1b5963393a --- /dev/null +++ b/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py @@ -0,0 +1,37 @@ +from __future__ import unicode_literals +import frappe +from erpnext.patches.v8_10.change_default_customer_credit_days import make_payment_term, make_template + +def execute(): + for dt in ("Company", "Customer Group"): + frappe.reload_doc("setup", "doctype", frappe.scrub(dt)) + + credit_records = frappe.db.sql(""" + SELECT DISTINCT `credit_days`, `credit_days_based_on`, `name` + from `tab{0}` + where + ((credit_days_based_on='Fixed Days' or credit_days_based_on is null) and credit_days is not null) + or credit_days_based_on='Last Day of the Next Month' + """.format(dt), as_dict=1) + + for d in credit_records: + template = create_payment_terms_template(d) + + frappe.db.sql(""" + update `tab{0}` + set `payment_terms` = %s + where name = %s + """.format(dt), (template, d.name)) + +def create_payment_terms_template(data): + if data.credit_days_based_on == "Fixed Days": + pyt_template_name = 'Default Payment Term - N{0}'.format(data.credit_days) + else: + pyt_template_name = 'Default Payment Term - EO2M' + + if not frappe.db.exists("Payment Terms Template", pyt_template_name): + payment_term = make_payment_term(data.credit_days, data.credit_days_based_on) + template = make_template(payment_term) + else: + template = frappe.get_doc("Payment Terms Template", pyt_template_name) + return template \ No newline at end of file diff --git a/erpnext/patches/v5_1/fix_credit_days_based_on.py b/erpnext/patches/v5_1/fix_credit_days_based_on.py deleted file mode 100644 index 6df19f201a..0000000000 --- a/erpnext/patches/v5_1/fix_credit_days_based_on.py +++ /dev/null @@ -1,9 +0,0 @@ -from __future__ import unicode_literals - -import frappe - -def execute(): - for dt in ("Customer", "Customer Group", "Company"): - frappe.reload_doctype(dt, force=True) - frappe.db.sql("""update `tab{0}` set credit_days_based_on='Fixed Days' - where ifnull(credit_days, 0) > 0""".format(dt)) diff --git a/erpnext/patches/v8_10/change_default_customer_credit_days.py b/erpnext/patches/v8_10/change_default_customer_credit_days.py index 640c8aa752..eddafb5634 100644 --- a/erpnext/patches/v8_10/change_default_customer_credit_days.py +++ b/erpnext/patches/v8_10/change_default_customer_credit_days.py @@ -17,7 +17,8 @@ def execute(): SELECT DISTINCT `credit_days`, `credit_days_based_on`, `name` from `tab{0}` where - (credit_days_based_on='Fixed Days' and credit_days is not null) + ((credit_days_based_on='Fixed Days' or credit_days_based_on is null) + and credit_days is not null) or credit_days_based_on='Last Day of the Next Month' """.format(doctype)) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index d06a76a517..31488de237 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -523,7 +523,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ }, callback: function(r, rt) { if(r.message) { - me.frm.set_value("due_date", r.message); + me.frm.doc.due_date = r.message; + refresh_field("due_date"); frappe.ui.form.trigger(me.frm.doc.doctype, "currency"); me.recalculate_terms(); } @@ -538,7 +539,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ due_date: function() { // due_date is to be changed, payment terms template and/or payment schedule must // be removed as due_date is automatically changed based on payment terms - if (this.frm.doc.due_date) { + if (this.frm.doc.due_date && !this.frm.updating_party_details) { if (this.frm.doc.payment_terms_template || (this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length)) { var message1 = ""; @@ -555,11 +556,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ if (message1.length !== 0) message2 = " and " + message2; final_message = final_message + message2; } - frappe.msgprint(final_message); } - - } + } }, recalculate_terms: function() { diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index 9824c706cf..d444417b16 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -1180,6 +1180,35 @@ "set_only_once": 0, "unique": 0 }, + { + "allow_bulk_edit": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, + "fieldname": "column_break_26", + "fieldtype": "Column Break", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_standard_filter": 0, + "length": 0, + "no_copy": 0, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "read_only": 0, + "remember_last_selected_value": 0, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "set_only_once": 0, + "unique": 0 + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -1219,8 +1248,9 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "column_break_26", - "fieldtype": "Column Break", + "depends_on": "", + "fieldname": "payment_terms", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -1228,8 +1258,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, + "label": "Default Payment Terms Template", "length": 0, "no_copy": 0, + "options": "Payment Terms Template", "permlevel": 0, "precision": "", "print_hide": 0, @@ -1242,69 +1274,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "credit_days_based_on", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Credit Days Based On", - "length": 0, - "no_copy": 0, - "options": "\nFixed Days\nLast Day of the Next Month", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')", - "fieldname": "credit_days", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Credit Days", - "length": 0, - "no_copy": 0, - "oldfieldname": "credit_days", - "oldfieldtype": "Int", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -2052,7 +2021,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-12-07 18:40:24.646920", + "modified": "2018-01-29 12:40:24.646920", "modified_by": "Administrator", "module": "Setup", "name": "Company", diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json index 316f11badf..062a49a9ad 100644 --- a/erpnext/setup/doctype/customer_group/customer_group.json +++ b/erpnext/setup/doctype/customer_group/customer_group.json @@ -162,12 +162,14 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "credit_days_based_on", - "fieldtype": "Select", + "depends_on": "", + "fieldname": "payment_terms", + "fieldtype": "Link", "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, @@ -175,10 +177,10 @@ "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, - "label": "Credit Days Based On", + "label": "Default Payment Terms Template", "length": 0, "no_copy": 0, - "options": "\nFixed Days\nLast Day of the Next Month", + "options": "Payment Terms Template", "permlevel": 0, "precision": "", "print_hide": 0, @@ -191,35 +193,6 @@ "set_only_once": 0, "unique": 0 }, - { - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:doc.credit_days_based_on=='Fixed Days'", - "fieldname": "credit_days", - "fieldtype": "Int", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Credit Days", - "length": 0, - "no_copy": 0, - "permlevel": 1, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, { "allow_on_submit": 0, "bold": 0, @@ -411,7 +384,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-02-20 13:25:31.549874", + "modified": "2018-01-29 13:25:31.549874", "modified_by": "Administrator", "module": "Setup", "name": "Customer Group",