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

Merge branch 'version-13-hotfix' into item-card-group-links

Browse Source
This commit is contained in:
Marica
2021-12-22 13:25:18 +05:30
committed by GitHub
parent a6e7b43f0b dd01c0e854
commit 2777b501b5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,8 @@
"fieldname": "cost", "fieldname": "cost",
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
"label": "Cost" "label": "Cost",
"options": "currency"
}, },
{ {
"depends_on": "eval:doc.price_determination==\"Based On Price List\"", "depends_on": "eval:doc.price_determination==\"Based On Price List\"",
@@ -147,7 +148,7 @@
} }
], ],
"links": [], "links": [],
"modified": "2021-08-13 10:53:44.205774", "modified": "2021-12-10 15:24:15.794477",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Subscription Plan", "name": "Subscription Plan",

2
erpnext/hooks.py
View File

@@ -388,7 +388,7 @@ scheduler_events = {
"erpnext.healthcare.doctype.patient_appointment.patient_appointment.update_appointment_status", "erpnext.healthcare.doctype.patient_appointment.patient_appointment.update_appointment_status",
"erpnext.buying.doctype.supplier_quotation.supplier_quotation.set_expired_status", "erpnext.buying.doctype.supplier_quotation.supplier_quotation.set_expired_status",
"erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_auto_email", "erpnext.accounts.doctype.process_statement_of_accounts.process_statement_of_accounts.send_auto_email",
"erpnext.non_profit.doctype.membership.membership.set_expired_status" "erpnext.non_profit.doctype.membership.membership.set_expired_status",
"erpnext.hr.doctype.interview.interview.send_daily_feedback_reminder" "erpnext.hr.doctype.interview.interview.send_daily_feedback_reminder"
], ],
"daily_long": [ "daily_long": [