fixed conflict in patches
diff --git a/patches/patch.py b/patches/patch.py
index c085504..88f4b53 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -291,8 +291,18 @@
ch.format = 'Delivery Note Packing List Wise'
ch.save(1)
elif patch_no == 353:
- reload_doc('hr', 'doctype', 'salary_manager')
+ reload_doc('core', 'doctype', 'doctype')
+ sql("update `tabDocType` set default_print_format = 'Standard' where name = 'Delivery Note'")
elif patch_no == 354:
+ reload_doc('stock', 'doctype', 'delivery_note')
+ reload_doc('stock', 'doctype', 'delivery_note_detail')
+ elif patch_no == 355:
+ sql("update `tabDocField` set print_hide =1 where fieldname in ('pack_no', 'pack_gross_wt', 'weight_uom', 'pack_nett_wt') and parent = 'Delivery Note Detail'")
+ elif patch_no == 356:
+ sql("update `tabDocField` set print_hide =1 where fieldname = 'print_packing_slip' and parent = 'Delivery Note'")
+ elif patch_no == 357:
+ reload_doc('hr', 'doctype', 'salary_manager')
+ elif patch_no == 358:
reload_doc('setup', 'doctype','features_setup')
reload_doc('stock','doctype','item')
sql("update tabDocField set label='Produced Qty',description='Updated after finished goods are transferred to FG Warehouse through Stock Entry' where parent='Production Order' and fieldname='produced_qty'")
@@ -302,18 +312,8 @@
for d in rs:
m.fields[d[0]] = 1
m.save()
- elif patch_no == 355:
+ elif patch_no == 359:
reload_doc('hr', 'doctype', 'salary_slip')
delete_doc('DocType', 'Salary Control Panel')
- elif patch_no == 356:
- reload_doc('core', 'doctype', 'doctype')
- sql("update `tabDocType` set default_print_format = 'Standard' where name = 'Delivery Note'")
- elif patch_no == 357:
- sql("delete from `tabDocField` where (fieldname in ('client_string', 'server_code_error', 'server_code_compiled', 'server_code', 'server_code_core', 'client_script', 'client_script_core', 'dt_template', 'change_log') or label = 'Template') and parent = 'DocType'")
- elif patch_no == 358:
- reload_doc('stock', 'doctype', 'delivery_note')
- reload_doc('stock', 'doctype', 'delivery_note_detail')
- elif patch_no == 359:
- sql("update `tabDocField` set print_hide =1 where fieldname in ('pack_no', 'pack_gross_wt', 'weight_uom', 'pack_nett_wt') and parent = 'Delivery Note Detail'")
elif patch_no == 360:
- sql("update `tabDocField` set print_hide =1 where fieldname = 'print_packing_slip' and parent = 'Delivery Note'")
+ sql("delete from `tabDocField` where (fieldname in ('client_string', 'server_code_error', 'server_code_compiled', 'server_code', 'server_code_core', 'client_script', 'client_script_core', 'dt_template', 'change_log') or label = 'Template') and parent = 'DocType'")