Merge branch 'hotfix'
This commit is contained in:
commit
93f138eece
@ -5,7 +5,7 @@ import frappe
|
||||
from erpnext.hooks import regional_overrides
|
||||
from frappe.utils import getdate
|
||||
|
||||
__version__ = '10.1.1'
|
||||
__version__ = '10.1.2'
|
||||
|
||||
def get_default_company(user=None):
|
||||
'''Get default company for user'''
|
||||
|
@ -6,6 +6,10 @@ def execute():
|
||||
if not company:
|
||||
return
|
||||
|
||||
for doctype in ["Sales Invoice", "Delivery Note", "Purchase Invoice"]:
|
||||
frappe.db.sql("""delete from `tabCustom Field` where dt = %s
|
||||
and fieldname in ('port_code', 'shipping_bill_number', 'shipping_bill_date')""", doctype)
|
||||
|
||||
make_custom_fields()
|
||||
|
||||
frappe.db.sql("""
|
||||
@ -14,6 +18,4 @@ def execute():
|
||||
where fieldname = 'reason_for_issuing_document'
|
||||
""")
|
||||
|
||||
for doctype in ["Sales Invoice", "Delivery Note", "Purchase Invoice"]:
|
||||
frappe.db.sql("""delete from `tabCustom Field` where dt = %s
|
||||
and fieldname in ('port_code', 'shipping_bill_number', 'shipping_bill_date')""", doctype)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user