From bc2bc981524eb8aeda22df38bb6c7aed34743f28 Mon Sep 17 00:00:00 2001 From: marina Date: Mon, 5 May 2025 12:16:31 +0300 Subject: [PATCH] =?utf8?q?ERP-402=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?utf8?q?=D1=82=D1=8C=20=D0=B2=20=D0=9B=D0=9A=20=D0=A4=D0=BB=D0=BE=D1=80?= =?utf8?q?=D0=B8=D1=81=D1=82=D0=B0=20=D1=80=D0=B0=D1=81=D1=87=D1=91=D1=82?= =?utf8?q?=20=D0=BF=D1=80=D0=B5=D0=BC=D0=B8=D0=B8=20=D0=B7=D0=B0=20=D0=B0?= =?utf8?q?=D0=B2=D1=82=D0=BE=D1=80=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B1=D1=83?= =?utf8?q?=D0=BA=D0=B5=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/services/SalesService.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erp24/services/SalesService.php b/erp24/services/SalesService.php index 8948542b..bc8098b9 100755 --- a/erp24/services/SalesService.php +++ b/erp24/services/SalesService.php @@ -1359,7 +1359,7 @@ class SalesService FROM sales s LEFT JOIN sales_products sp ON sp.check_id = s.id LEFT JOIN products_1c p1 ON p1.id = sp.product_id - LEFT JOIN products_class pc ON p1.id = pc.category_id + LEFT JOIN products_class pc ON p1.parent_id = pc.category_id WHERE sp.seller_id IN (:admin_guid) AND (s.order_id = '' OR s.order_id = '0') AND pc.tip = :tip @@ -1418,7 +1418,7 @@ class SalesService FROM sales s LEFT JOIN sales_products sp ON sp.check_id = s.id LEFT JOIN products_1c p1 ON p1.id = sp.product_id - LEFT JOIN products_class pc ON p1.id = pc.category_id + LEFT JOIN products_class pc ON p1.parent_id = pc.category_id WHERE s.seller_id IN (:admin_guid) AND pc.tip = :tip AND s.date >= :date_from @@ -1432,7 +1432,6 @@ class SalesService ]); - $action = $command->getRawSql(); return $command->queryAll(); -- 2.39.5