From: Alexander Smirnov <fredeom@mail.ru>
Date: Wed, 26 Jun 2024 08:44:06 +0000 (+0300)
Subject: Поправил правый край выборки чеков до конца выбранного дня
X-Git-Tag: 1.3~44^2~2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=c78d8e4bbb5df21bc0f6334cbfc16b0ce115d860;p=erp24_rep%2Fyii-erp24%2F.git

Поправил правый край выборки чеков до конца выбранного дня
---

diff --git a/erp24/modul/orders/collation.php b/erp24/modul/orders/collation.php
index 33b2e7d9..0a155715 100644
--- a/erp24/modul/orders/collation.php
+++ b/erp24/modul/orders/collation.php
@@ -146,9 +146,9 @@ foreach($data as $row) {
 }    
     
 
-   
+
 $sql = "SELECT id, operation, summ, number, date, store_id_1c, order_id FROM sales WHERE date>='" . $delivery_date
-    . "'::date - INTERVAL '25 day' AND date<='" . $delivery_date . "' AND operation IN ('Возврат', 'Продажа') order by date DESC";
+    . "'::date - INTERVAL '20 day' AND date<='" . $delivery_date . " 23:59:59' AND operation IN ('Возврат', 'Продажа') order by date DESC";
 
 $checkarr= $db::getRows($sql);
 //$cheks_txt=";