Merge branch 'master' into production
Conflicts:
patches/patch_list.py
production/doctype/bom_explosion_item/bom_explosion_item.txt
diff --git a/patches/december_2012/fix_default_print_format.py b/patches/december_2012/fix_default_print_format.py
new file mode 100644
index 0000000..e475122
--- /dev/null
+++ b/patches/december_2012/fix_default_print_format.py
@@ -0,0 +1,4 @@
+import webnotes
+def execute():
+ webnotes.conn.sql("""update `tabDocType` set default_print_format=null
+ where default_print_format='Standard'""")
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 5bb58b4..e985fa7 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -525,5 +525,8 @@
{
'patch_module': 'patches.december_2012',
'patch_file': 'production_cleanup',
+ {
+ 'patch_module': 'patches.december_2012',
+ 'patch_file': 'fix_default_print_format',
},
]
\ No newline at end of file