schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui

Browse Source
This commit is contained in:
Shivam Mishra
2020-11-12 11:32:59 +05:30
parent 2d1f8341f9 0ea0a7495c
commit bed717b442
375 changed files with 26443 additions and 9717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/hooks.py
View File

@@ -15,10 +15,10 @@ app_logo_url = "/assets/erpnext/images/erpnext-logo.svg"
develop_version = '13.x.x-develop'
app_include_js = "assets/js/erpnext.min.js"
app_include_css = "assets/css/erpnext.css"
web_include_js = "assets/js/erpnext-web.min.js"
web_include_css = "assets/css/erpnext-web.css"
app_include_js = "/assets/js/erpnext.min.js"
app_include_css = "/assets/css/erpnext.css"
web_include_js = "/assets/js/erpnext-web.min.js"
web_include_css = "/assets/css/erpnext-web.css"
doctype_js = {
"Address": "public/js/address.js",
@@ -283,7 +283,8 @@ doc_events = {
# to maintain data integrity we exempted payment entry. it will un-link when sales invoice get cancelled.
# if payment entry not in auto cancel exempted doctypes it will cancel payment entry.
auto_cancel_exempted_doctypes= [
"Payment Entry"
"Payment Entry",
"Inpatient Medication Entry"
]
scheduler_events = {