Merge branch 'theopen-institute-nepal-localization' into develop
This commit is contained in:
commit
6d532a82ee
@ -750,7 +750,7 @@
|
||||
"issingle": 0,
|
||||
"istable": 0,
|
||||
"max_attachments": 0,
|
||||
"modified": "2018-01-19 15:25:43.166877",
|
||||
"modified": "2018-03-09 15:25:43.166877",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Physician",
|
||||
|
@ -201,7 +201,7 @@ doc_events = {
|
||||
"Sales Invoice": {
|
||||
'validate': 'erpnext.regional.india.utils.set_place_of_supply',
|
||||
"on_submit": "erpnext.regional.france.utils.create_transaction_log",
|
||||
"on_trash": "erpnext.regional.france.utils.check_deletion_permission"
|
||||
"on_trash": ["erpnext.regional.france.utils.check_deletion_permission", "erpnext.regional.nepal.utils.check_deletion_permission"]
|
||||
},
|
||||
"Payment Entry": {
|
||||
"on_submit": ["erpnext.regional.france.utils.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.make_status_as_paid"],
|
||||
@ -277,4 +277,4 @@ regional_overrides = {
|
||||
'Saudi Arabia': {
|
||||
'erpnext.controllers.taxes_and_totals.update_itemised_tax_data': 'erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data'
|
||||
}
|
||||
}
|
||||
}
|
@ -1,12 +1,13 @@
|
||||
import frappe
|
||||
|
||||
def execute():
|
||||
if frappe.db.exists("DocType", "Physician"):
|
||||
frappe.reload_doc("healthcare", "doctype", "physician")
|
||||
frappe.reload_doc("healthcare", "doctype", "physician_service_unit_schedule")
|
||||
if frappe.db.has_column('Physician', 'physician_schedule'):
|
||||
for doc in frappe.get_all('Physician'):
|
||||
_doc = frappe.get_doc('Physician', doc.name)
|
||||
if _doc.physician_schedule:
|
||||
_doc.append('physician_schedules', {'schedule': _doc.physician_schedule})
|
||||
_doc.save()
|
||||
if frappe.db.exists("DocType", "Physician"):
|
||||
frappe.reload_doc("healthcare", "doctype", "physician")
|
||||
frappe.reload_doc("healthcare", "doctype", "physician_service_unit_schedule")
|
||||
|
||||
if frappe.db.has_column('Physician', 'physician_schedule'):
|
||||
for doc in frappe.get_all('Physician'):
|
||||
_doc = frappe.get_doc('Physician', doc.name)
|
||||
if _doc.physician_schedule:
|
||||
_doc.append('physician_schedules', {'schedule': _doc.physician_schedule})
|
||||
_doc.save()
|
||||
|
0
erpnext/regional/nepal/__init__.py
Normal file
0
erpnext/regional/nepal/__init__.py
Normal file
13
erpnext/regional/nepal/utils.py
Normal file
13
erpnext/regional/nepal/utils.py
Normal file
@ -0,0 +1,13 @@
|
||||
# Copyright (c) 2018, Frappe Technologies and contributors
|
||||
# For license information, please see license.txt
|
||||
|
||||
import frappe
|
||||
from frappe import _
|
||||
from erpnext import get_region
|
||||
|
||||
def check_deletion_permission(doc, method):
|
||||
region = get_region()
|
||||
if region not in ["Nepal"]:
|
||||
return
|
||||
else:
|
||||
frappe.throw(_("Deletion is not permitted for country {0}".format(region)))
|
@ -9,8 +9,8 @@ class TestInit(unittest.TestCase):
|
||||
frappe.flags.country = 'India'
|
||||
self.assertEqual(test_method(), 'overridden')
|
||||
|
||||
frappe.flags.country = 'Nepal'
|
||||
frappe.flags.country = 'Maldives'
|
||||
self.assertEqual(test_method(), 'original')
|
||||
|
||||
frappe.flags.country = 'France'
|
||||
self.assertEqual(test_method(), 'overridden')
|
||||
self.assertEqual(test_method(), 'overridden')
|
Loading…
x
Reference in New Issue
Block a user