mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-01 11:19:09 +00:00
[merge conflict]
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import webnotes, webnotes.utils, os
|
||||
from webnotes.modules.export_file import export_to_files
|
||||
|
||||
def execute():
|
||||
webnotes.reload_doc("core", "doctype", "file_data")
|
||||
@@ -71,4 +70,4 @@ def update_for_doc(doctype, doc):
|
||||
pass
|
||||
else:
|
||||
webnotes.conn.sql("""delete from `tabFile Data` where name=%s""",
|
||||
fileid)
|
||||
fileid)
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import webnotes
|
||||
|
||||
def execute():
|
||||
for dt, fieldname in \
|
||||
(("Journal Voucher Detail", "cost_center"),
|
||||
("Sales Taxes and Charges", "cost_center_other_charges"),
|
||||
("Purchase Taxes and Charges", "cost_center"), ("Delivery Note Item", "cost_center"),
|
||||
("Purchase Invoice Item", "cost_center"), ("Sales Invoice Item", "cost_center")):
|
||||
webnotes.conn.sql_ddl("""alter table `tab%s` alter `%s` drop default""" % (dt, fieldname))
|
||||
webnotes.reload_doc("Stock", "DocType", "Delivery Note Item")
|
||||
for dt in ("Journal Voucher Detail", "Sales Taxes and Charges",
|
||||
"Purchase Taxes and Charges", "Delivery Note Item",
|
||||
"Purchase Invoice Item", "Sales Invoice Item"):
|
||||
webnotes.conn.sql_ddl("""alter table `tab%s` alter `cost_center` drop default""" \
|
||||
% (dt,))
|
||||
webnotes.reload_doc(webnotes.conn.get_value("DocType", dt, "module"), "DocType", dt)
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
import webnotes
|
||||
|
||||
def execute():
|
||||
webnotes.reload_doc("Accounts", "DocType", "Sales Taxes and Charges")
|
||||
webnotes.conn.sql("""update `tabSales Taxes and Charges`
|
||||
set cost_center = cost_center_other_charges""")
|
||||
webnotes.conn.sql_ddl("""alter table `tabSales Taxes and Charges`
|
||||
drop column cost_center_other_charges""")
|
||||
|
||||
Reference in New Issue
Block a user