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 'develop' into mergify/bp/develop/pr-30385

Browse Source
This commit is contained in:
Deepesh Garg
2022-04-09 19:57:59 +05:30
committed by GitHub
parent ec6f7040f4 2e00678c76
commit 02c6b898a6
59 changed files with 2919 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/v12_0/update_is_cancelled_field.py
View File

@@ -20,7 +20,7 @@ def execute():
"""
UPDATE `tab{doctype}`
SET is_cancelled = 0
where is_cancelled in ('', NULL, 'No')""".format(
where is_cancelled in ('', 'No') or is_cancelled is NULL""".format(
doctype=doctype
)
)

2
erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py
View File

@@ -10,7 +10,7 @@ def execute():
"""
UPDATE `tab{doctype}`
SET is_subcontracted = 0
where is_subcontracted in ('', NULL, 'No')""".format(
where is_subcontracted in ('', 'No') or is_subcontracted is null""".format(
doctype=doctype
)
)