nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Nabin Hait
2018-09-05 11:47:30 +05:30
parent 8f00db58bd 3cea3c46b6
commit 5122a8e0d7
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/account/account.json
View File

@@ -625,7 +625,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-07-08 09:47:04.287841", "modified": "2018-09-05 09:47:04.287841",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Account", "name": "Account",

3
erpnext/patches/v10_0/added_extra_gst_custom_field.py
View File

@@ -6,4 +6,7 @@ def execute():
if not company: if not company:
return return
frappe.reload_doc("hr", "doctype", "Employee Tax Exemption Declaration")
frappe.reload_doc("hr", "doctype", "Employee Tax Exemption Proof Submission")
make_custom_fields(update=False) make_custom_fields(update=False)

4
erpnext/patches/v11_0/create_department_records_for_each_company.py
View File

@@ -3,6 +3,8 @@ from frappe import _
from frappe.utils.nestedset import rebuild_tree from frappe.utils.nestedset import rebuild_tree
def execute(): def execute():
frappe.local.lang = frappe.db.get_default("lang") or 'en'
for doctype in ['department', 'leave_period', 'staffing_plan', 'job_opening', 'payroll_entry']: for doctype in ['department', 'leave_period', 'staffing_plan', 'job_opening', 'payroll_entry']:
frappe.reload_doc("hr", "doctype", doctype) frappe.reload_doc("hr", "doctype", doctype)
@@ -37,6 +39,8 @@ def execute():
update_instructors(comp_dict) update_instructors(comp_dict)
frappe.local.lang = 'en'
def update_records(doctype, comp_dict): def update_records(doctype, comp_dict):
when_then = [] when_then = []
for company in comp_dict: for company in comp_dict:

16
erpnext/patches/v11_0/refactor_erpnext_shopify.py
View File

@@ -21,9 +21,13 @@ def execute():
setup_app_type() setup_app_type()
def setup_app_type(): def setup_app_type():
shopify_settings = frappe.get_doc("Shopify Settings") try:
shopify_settings.app_type = 'Private' shopify_settings = frappe.get_doc("Shopify Settings")
shopify_settings.update_price_in_erpnext_price_list = 0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1 shopify_settings.app_type = 'Private'
shopify_settings.flags.ignore_mandatory = True shopify_settings.update_price_in_erpnext_price_list = 0 if getattr(shopify_settings, 'push_prices_to_shopify', None) else 1
shopify_settings.ignore_permissions = True shopify_settings.flags.ignore_mandatory = True
shopify_settings.save() shopify_settings.ignore_permissions = True
shopify_settings.save()
except Exception:
frappe.db.set_value("Shopify Shopify", None, "enable_shopify", 0)
frappe.log_error(frappe.get_traceback())

2
erpnext/patches/v11_0/update_department_lft_rgt.py
View File

@@ -10,7 +10,7 @@ def execute():
'doctype': 'Department', 'doctype': 'Department',
'department_name': _('All Departments'), 'department_name': _('All Departments'),
'is_group': 1 'is_group': 1
}).insert(ignore_permissions=True) }).insert(ignore_permissions=True, ignore_mandatory=True)
frappe.db.sql("""update `tabDepartment` set parent_department = '{0}' frappe.db.sql("""update `tabDepartment` set parent_department = '{0}'
where is_group = 0""".format(_('All Departments'))) where is_group = 0""".format(_('All Departments')))