Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into payment-reconc-party-validation-fix

Browse Source
This commit is contained in:
Afshan 2021-08-10 09:30:48 +05:30 committed by GitHub
commit a982a2a72e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/subscription_plan/subscription_plan.json
View File

@ -78,7 +78,7 @@
"label": "Cost" "label": "Cost"
}, },
{ {
"depends_on": "eval:doc.price_determination==\"Based on price list\"", "depends_on": "eval:doc.price_determination==\"Based On Price List\"",
"fieldname": "price_list", "fieldname": "price_list",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Price List", "label": "Price List",
@ -147,7 +147,7 @@
} }
], ],
"links": [], "links": [],
"modified": "2020-06-25 10:53:44.205774", "modified": "2021-08-09 10:53:44.205774",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Subscription Plan", "name": "Subscription Plan",

9
erpnext/support/doctype/service_level_agreement/service_level_agreement.py
View File

@ -281,15 +281,18 @@ def get_repeated(values):
def get_documents_with_active_service_level_agreement(): def get_documents_with_active_service_level_agreement():
if not frappe.cache().hget("service_level_agreement", "active"): sla_doctypes = frappe.cache().hget("service_level_agreement", "active")
set_documents_with_active_service_level_agreement()
return frappe.cache().hget("service_level_agreement", "active") if sla_doctypes is None:
return set_documents_with_active_service_level_agreement()
return sla_doctypes
def set_documents_with_active_service_level_agreement(): def set_documents_with_active_service_level_agreement():
active = [sla.document_type for sla in frappe.get_all("Service Level Agreement", fields=["document_type"])] active = [sla.document_type for sla in frappe.get_all("Service Level Agreement", fields=["document_type"])]
frappe.cache().hset("service_level_agreement", "active", active) frappe.cache().hset("service_level_agreement", "active", active)
return active
def apply(doc, method=None): def apply(doc, method=None):