fix in setup control and patch to fix existing docstatus problem
diff --git a/patches/october_2012/company_fiscal_year_docstatus_patch.py b/patches/october_2012/company_fiscal_year_docstatus_patch.py
new file mode 100644
index 0000000..34ec274
--- /dev/null
+++ b/patches/october_2012/company_fiscal_year_docstatus_patch.py
@@ -0,0 +1,7 @@
+import webnotes
+def execute():
+ webnotes.conn.sql("""update `tabCompany` set docstatus = 0
+ where docstatus is null""")
+
+ webnotes.conn.sql("""update `tabFiscal Year` set docstatus = 0
+ where docstatus is null""")
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 98842cc..15dc8a5 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -625,6 +625,10 @@
},
{
'patch_module': 'patches.october_2012',
+ 'patch_file': 'company_fiscal_year_docstatus_patch',
+ },
+ {
+ 'patch_module': 'patches.october_2012',
'patch_file': 'update_account_property',
},
{
diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py
index 33e2e83..b06fdca 100644
--- a/setup/doctype/setup_control/setup_control.py
+++ b/setup/doctype/setup_control/setup_control.py
@@ -192,10 +192,13 @@
rec = Document(d)
for fn in master_dict[d].keys():
rec.fields[fn] = master_dict[d][fn]
- # add blank fields
- for fn in rec.fields:
- if fn not in master_dict[d].keys()+['name','owner','doctype']:
- rec.fields[fn] = ''
+
+ # Note: I have no idea why this was there!
+ # # add blank fields
+ # for fn in rec.fields:
+ # if fn not in master_dict[d].keys()+['name','owner','doctype']:
+ # rec.fields[fn] = ''
+
rec_obj = get_obj(doc=rec)
rec_obj.doc.save(1)
if hasattr(rec_obj, 'on_update'):