From 0e599c249669cd9b8c4127049d84e32fc58e9c9f Mon Sep 17 00:00:00 2001
From: "HOME\\leonm" <leon.mbs@gmail.com>
Date: Sun, 14 Mar 2021 22:09:09 +0200
Subject: [PATCH] hotfix

---
 www/app/pages/report/outcome.php              | 21 +------------------
 www/templates/printforms/report/outcome.tpl   |  5 +----
 www/templates_ua/pages/doc/ordercust.html     |  4 +++-
 .../printforms/report/outcome.tpl             |  5 +----
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/www/app/pages/report/outcome.php b/www/app/pages/report/outcome.php
index 0f90e6b6e..ca853c3e7 100644
--- a/www/app/pages/report/outcome.php
+++ b/www/app/pages/report/outcome.php
@@ -135,26 +135,7 @@ private function generateReport() {
             $br = " and d.branch_id in ({$brids}) ";
         }
 
-        // скидка
-
-        /*
-        $sql = "document_id in( select  d.document_id  from  
-               `documents_view` d  
-               where    d.state >3 and 
-                 d.`meta_name` in ('GoodsIssue', 'Order',  'POSCheck')
-               {$br}  {$u}     and  d.payamount >0 and  d.payamount <  d.amount 
-              AND DATE(d.document_date) >= " . $conn->DBDate($from) . "
-              AND DATE(d.document_date) <= " . $conn->DBDate($to) . ")";
-
-        $res = \App\Entity\Doc\Document::find($sql);
-        $disc = 0;
-        foreach ($res as $d) {
-            if ($d->headerdata['paydisc'] > 0) {
-
-                $disc += $d->headerdata['paydisc'];
-            }
-        }
-        */
+   
 
         $detail = array();
 
diff --git a/www/templates/printforms/report/outcome.tpl b/www/templates/printforms/report/outcome.tpl
index 5fc5009af..f0c0a8bef 100644
--- a/www/templates/printforms/report/outcome.tpl
+++ b/www/templates/printforms/report/outcome.tpl
@@ -42,10 +42,7 @@
     </tr>
     {{/_detail}}
     <tr><td colspan="3" align="right"><b>Всего:</b></td><td align="right" ><b>{{totsumma}}</b></td><td align="right" ><b><b>{{totnavar}}</b></b></td> </tr>
-    {{#isdisc}}
-    <tr><td colspan="3" align="right"><b>Общая скидка:</b></td><td align="right" ><b>{{disc}}</b></td><td align="right" ><b><b> </b></b></td> </tr>
-    
-    {{/isdisc}}
+  
 </table>
 {{/_type1}}
 {{#_type2}}
diff --git a/www/templates_ua/pages/doc/ordercust.html b/www/templates_ua/pages/doc/ordercust.html
index b7be860d5..6059ee544 100644
--- a/www/templates_ua/pages/doc/ordercust.html
+++ b/www/templates_ua/pages/doc/ordercust.html
@@ -44,7 +44,8 @@ <h3> Заявка постачальнику </h3>
                 <tr>
 
                     <th>Найменування</th>
-                    <th>Код</th>
+                    <th>Артикул</th>
+                    <th>Код постачальника</th>
                     <th>Од.</th>
                     <th  > </th>
                 <th class="text-right">Кіл.</th>
@@ -58,6 +59,7 @@ <h3> Заявка постачальнику </h3>
 
                     <td zippy="item"></td>
                     <td zippy="code"></td>
+                   <td zippy="custcode"></td>
                     <td zippy="msr"></td>
                 <td zippy="desc"  ></td>
              <td zippy="quantity" class="text-right"></td>
diff --git a/www/templates_ua/printforms/report/outcome.tpl b/www/templates_ua/printforms/report/outcome.tpl
index 9cd7dfbc5..a04f93bcc 100644
--- a/www/templates_ua/printforms/report/outcome.tpl
+++ b/www/templates_ua/printforms/report/outcome.tpl
@@ -43,10 +43,7 @@
     </tr>
     {{/_detail}}
     <tr><td colspan="3"></td><td align="right" ><b>{{totsumma}}</b></td><td align="right" ><b><b>{{totnavar}}</b></b></td> </tr>
-     {{#isdisc}}
-    <tr><td colspan="3" align="right"><b>Загальна знижка:</b></td><td align="right" ><b>{{disc}}</b></td><td align="right" ><b><b> </b></b></td> </tr>
-    
-    {{/isdisc}}   
+     
 </table>
 {{/_type1}}
 {{#_type2}}