From 3aab6e6fa8c241770c78763d0b0db1ed4e1c9f33 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 18:38:52 +0530 Subject: [PATCH] fix: Percentage billing in Sales Order (#34606) * fix: Percentage billing in Sales Order (#34606) (cherry picked from commit 12ad2aa2e5f5f173c9f52c07fb95e00b069dd403) # Conflicts: # erpnext/controllers/status_updater.py * chore: resolve conflicts --------- Co-authored-by: Deepesh Garg --- erpnext/controllers/status_updater.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 23dad95fa0d8..30874f8160df 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -450,7 +450,7 @@ def _update_percent_field(self, args, update_modified=True): ifnull((select ifnull(sum(if(abs(%(target_ref_field)s) > abs(%(target_field)s), abs(%(target_field)s), abs(%(target_ref_field)s))), 0) / sum(abs(%(target_ref_field)s)) * 100 - from `tab%(target_dt)s` where parent="%(name)s" having sum(abs(%(target_ref_field)s)) > 0), 0), 6) + from `tab%(target_dt)s` where parent='%(name)s' and parenttype='%(target_parent_dt)s' having sum(abs(%(target_ref_field)s)) > 0), 0), 6) %(update_modified)s where name='%(name)s'""" % args