nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'theopen-institute-nepal-localization' into develop

Browse Source
This commit is contained in:
Nabin Hait
2018-03-09 13:11:19 +05:30
parent b4de7e3d07 096c05ca6f
commit 6d532a82ee
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/healthcare/doctype/physician/physician.json
View File

@@ -750,7 +750,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-01-19 15:25:43.166877", "modified": "2018-03-09 15:25:43.166877",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Healthcare", "module": "Healthcare",
"name": "Physician", "name": "Physician",

4
erpnext/hooks.py
View File

@@ -201,7 +201,7 @@ doc_events = {
"Sales Invoice": { "Sales Invoice": {
'validate': 'erpnext.regional.india.utils.set_place_of_supply', 'validate': 'erpnext.regional.india.utils.set_place_of_supply',
"on_submit": "erpnext.regional.france.utils.create_transaction_log", "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": { "Payment Entry": {
"on_submit": ["erpnext.regional.france.utils.create_transaction_log", "erpnext.accounts.doctype.payment_request.payment_request.make_status_as_paid"], "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': { 'Saudi Arabia': {
'erpnext.controllers.taxes_and_totals.update_itemised_tax_data': 'erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data' 'erpnext.controllers.taxes_and_totals.update_itemised_tax_data': 'erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data'
} }
} }

19
erpnext/patches/v10_0/remove_and_copy_fields_in_physician.py
View File

@@ -1,12 +1,13 @@
import frappe import frappe
def execute(): def execute():
if frappe.db.exists("DocType", "Physician"): if frappe.db.exists("DocType", "Physician"):
frappe.reload_doc("healthcare", "doctype", "physician") frappe.reload_doc("healthcare", "doctype", "physician")
frappe.reload_doc("healthcare", "doctype", "physician_service_unit_schedule") frappe.reload_doc("healthcare", "doctype", "physician_service_unit_schedule")
if frappe.db.has_column('Physician', 'physician_schedule'):
for doc in frappe.get_all('Physician'): if frappe.db.has_column('Physician', 'physician_schedule'):
_doc = frappe.get_doc('Physician', doc.name) for doc in frappe.get_all('Physician'):
if _doc.physician_schedule: _doc = frappe.get_doc('Physician', doc.name)
_doc.append('physician_schedules', {'schedule': _doc.physician_schedule}) if _doc.physician_schedule:
_doc.save() _doc.append('physician_schedules', {'schedule': _doc.physician_schedule})
_doc.save()

0
erpnext/regional/nepal/__init__.py Normal file
View File

13
erpnext/regional/nepal/utils.py Normal file
View 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)))

4
erpnext/tests/test_regional.py
View File

@@ -9,8 +9,8 @@ class TestInit(unittest.TestCase):
frappe.flags.country = 'India' frappe.flags.country = 'India'
self.assertEqual(test_method(), 'overridden') self.assertEqual(test_method(), 'overridden')
frappe.flags.country = 'Nepal' frappe.flags.country = 'Maldives'
self.assertEqual(test_method(), 'original') self.assertEqual(test_method(), 'original')
frappe.flags.country = 'France' frappe.flags.country = 'France'
self.assertEqual(test_method(), 'overridden') self.assertEqual(test_method(), 'overridden')