From fa490ef2f0d86af007ed2ba197a768f916416216 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 25 Oct 2023 19:46:51 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/controllers/stock_controller.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 261c7e990b7..a72cc667399 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -1057,8 +1057,3 @@ def create_item_wise_repost_entries(voucher_type, voucher_no, allow_zero_rate=Fa repost_entries.append(repost_entry) return repost_entries - - -@erpnext.allow_regional -def update_regional_gl_entries(gl_list, doc): - return