diff --git a/patches/patch.py b/patches/patch.py index 37bff245b90..8c4c9dd113c 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -252,6 +252,8 @@ def execute(patch_no): elif patch_no == 344: sql("delete from `tabDocFormat` where ifnull(format, '') = '' and parent = 'Delivery Note'") elif patch_no == 345: + # rerun 343 (merge confict) + reload_doc('stock','doctype','item_customer_detail') sql("delete from `tabModule Def Item` where display_name = 'Salary Slip Control Panel' and parent = 'HR'") reload_doc('hr','Module Def','HR') elif patch_no == 346: