Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait 2016-08-02 18:07:53 +05:30
commit 46f328cbda
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
__version__ = '7.0.17'
__version__ = '7.0.18'
def get_default_company(user=None):
'''Get default company for user'''

2
erpnext/patches.txt
View File

@ -307,4 +307,4 @@ erpnext.patches.v7_0.fix_nonwarehouse_ledger_gl_entries_for_transactions
erpnext.patches.v7_0.remove_old_earning_deduction_doctypes
erpnext.patches.v7_0.make_guardian
erpnext.patches.v7_0.update_refdoc_in_landed_cost_voucher
execute:frappe.db.sql("update `tabItem` set default_material_request_type= case when default_bom is not null then 'Manufacture' else 'Purchase' end")
erpnext.patches.v7_0.set_material_request_type_in_item

16
erpnext/patches/v7_0/set_material_request_type_in_item.py Normal file
View File

@ -0,0 +1,16 @@
from __future__ import unicode_literals
import frappe
def execute():
frappe.reload_doctype("Item")
if "default_bom" in frappe.db.get_table_columns("Item"):
frappe.db.sql("""update `tabItem`
set default_material_request_type = (
case
when (default_bom is not null and default_bom != '')
then 'Manufacture'
else 'Purchase'
end )""")
else:
frappe.db.sql("update tabItem set default_material_request_type='Purchase'")