From 7fa3f3fe98d6fc355cd51595116e0cad32e555ed Mon Sep 17 00:00:00 2001 From: Rohan Date: Tue, 3 Sep 2019 14:16:12 +0530 Subject: [PATCH 1/3] fix: include start and end date for contract status (#18866) --- erpnext/crm/doctype/contract/contract.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/crm/doctype/contract/contract.py b/erpnext/crm/doctype/contract/contract.py index 64cc97b503..18444cc7e6 100644 --- a/erpnext/crm/doctype/contract/contract.py +++ b/erpnext/crm/doctype/contract/contract.py @@ -88,7 +88,7 @@ def get_status(start_date, end_date): end_date = getdate(end_date) now_date = getdate(nowdate()) - return "Active" if start_date < now_date < end_date else "Inactive" + return "Active" if start_date <= now_date <= end_date else "Inactive" def update_status_for_contracts(): From c174e4d01a1a6c6d2bd1d2353502d95ffccd5a37 Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Tue, 3 Sep 2019 14:17:41 +0530 Subject: [PATCH 2/3] fix: Default message from Payment Gateway Account not fetching (#18848) --- .../accounts/doctype/payment_request/payment_request.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js index a455e74940..e2510f675f 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.js +++ b/erpnext/accounts/doctype/payment_request/payment_request.js @@ -1,7 +1,6 @@ -cur_frm.add_fetch("payment_gateway", "payment_account", "payment_account") -cur_frm.add_fetch("payment_gateway", "payment_gateway", "payment_gateway") -cur_frm.add_fetch("payment_gateway", "message", "message") -cur_frm.add_fetch("payment_gateway", "payment_url_message", "payment_url_message") +cur_frm.add_fetch("payment_gateway_account", "payment_account", "payment_account") +cur_frm.add_fetch("payment_gateway_account", "payment_gateway", "payment_gateway") +cur_frm.add_fetch("payment_gateway_account", "message", "message") frappe.ui.form.on("Payment Request", "onload", function(frm, dt, dn){ if (frm.doc.reference_doctype) { From cb44f3a7c345ac42ba1631c7ebe41f26e5474973 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Tue, 3 Sep 2019 14:18:15 +0530 Subject: [PATCH 3/3] fix(purchase-invoice): add rounded total property setter for purchase invoice (#18841) --- erpnext/setup/doctype/global_defaults/global_defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.py b/erpnext/setup/doctype/global_defaults/global_defaults.py index a39e246c68..fa7bc504b6 100644 --- a/erpnext/setup/doctype/global_defaults/global_defaults.py +++ b/erpnext/setup/doctype/global_defaults/global_defaults.py @@ -58,7 +58,7 @@ class GlobalDefaults(Document): # Make property setters to hide rounded total fields for doctype in ("Quotation", "Sales Order", "Sales Invoice", "Delivery Note", - "Supplier Quotation", "Purchase Order"): + "Supplier Quotation", "Purchase Order", "Purchase Invoice"): make_property_setter(doctype, "base_rounded_total", "hidden", self.disable_rounded_total, "Check") make_property_setter(doctype, "base_rounded_total", "print_hide", 1, "Check")