Merge pull request #111 from leon-mbs/dev

4.6.1
leon-mbs · Sep 10, 2020 · 44448cf · 44448cf
2 parents 953ccb6 + 9f96d3c
commit 44448cf
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+### v4.6.1 (2020-09-02) 
+* Исправления и улучшения. 
+
+ Для  обновления  версии  обновить папки   app, templates, templates_ua  
+
 ### v4.6.0 (2020-08-02) 
 * Добавлен  модуль  поиска  автозапчастей  по  базе  аналогов TECDOC . 
 

diff --git a/www/app/pages/register/itemlist.php b/www/app/pages/register/itemlist.php
@@ -64,6 +64,7 @@ public function itemlistOnRow($row) {
         $store = $this->filter->searchstore->getValue();
         $row->add(new Label('itemname', $item->itemname));
         $row->add(new Label('code', $item->item_code));
+        $row->add(new Label('brand', $item->manufacturer));
         $row->add(new Label('msr', $item->msr));
 
         $qty = $item->getQuantity($store);

diff --git a/www/app/pages/report/price.php b/www/app/pages/report/price.php
@@ -87,6 +87,7 @@ private function generateReport() {
                 "code" => $item->item_code,
                 "name" => $item->itemname,
                 "cat" => $item->cat_name,
+                "brand" => $item->manufacturer,
                 "msr" => $item->msr,
                 "price1" => $isp1 ? $item->getPrice('price1') : "",
                 "price2" => $isp2 ? $item->getPrice('price2') : "",

diff --git a/www/app/pages/userlogin.php b/www/app/pages/userlogin.php
@@ -31,7 +31,7 @@ public function __construct() {
         $this->setError('');
 
 
-        $curver = 'v4.6.0';
+        $curver = 'v4.6.1';
         $this->_tvars['curversion'] = $curver;
 
         //проверка  новой версии        

diff --git a/www/templates/pages/register/itemlist.html b/www/templates/pages/register/itemlist.html
@@ -44,6 +44,7 @@ <h3>Товары на складе </h3>
 
                 <th>Артикул</th>
                 <th>Категория</th>
+                <th>Бренд</th>
                 <th>Ед.</th>
 
                 <th class="text-right  ">Мин. Кол.</th>
@@ -67,6 +68,7 @@ <h3>Товары на складе </h3>
 
                 <td zippy="code" class=" text-nowrap"></td>
                 <td zippy="cat_name"></td>
+                <td zippy="brand"></td>
                 <td zippy="msr"></td>
 
                 <td zippy="minqty" class="text-right  "></td>

diff --git a/www/templates/printforms/report/price.tpl b/www/templates/printforms/report/price.tpl
@@ -14,6 +14,7 @@
         <th>Код</th>
         <th>Ед.Изм.</th>
         <th>Категория</th>
+        <th>Бренд</th>
 
         <th>{{price1name}}</th>
         <th>{{price2name}}</th>
@@ -29,6 +30,7 @@
         <td>{{code}}</td>
         <td>{{msr}}</td>
         <td>{{cat}}</td>
+        <td>{{brand}}</td>
 
         <td align="right">{{price1}}</td>
         <td align="right">{{price2}}</td>

diff --git a/www/templates_ua/pages/register/itemlist.html b/www/templates_ua/pages/register/itemlist.html
@@ -44,6 +44,7 @@ <h3>Товари на складі </h3>
 
                 <th>Артикул</th>
                 <th>Категорія</th>
+                <th>Бренд</th>
                 <th>Од.</th>
 
                 <th class="text-right  ">Мін. Кіл.</th>
@@ -67,6 +68,7 @@ <h3>Товари на складі </h3>
 
                 <td zippy="code" class=" text-nowrap"></td>
                 <td zippy="cat_name"></td>
+                <td zippy="brand"></td>
                 <td zippy="msr"></td>
 
                 <td zippy="minqty" class="text-right  "></td>

diff --git a/www/templates_ua/printforms/report/price.tpl b/www/templates_ua/printforms/report/price.tpl
@@ -14,7 +14,7 @@
         <th>Код</th>
         <th>Од. вим.</th>
         <th>Категорія</th>
-
+        <th>Бренд</th>
         <th>{{price1name}}</th>
         <th>{{price2name}}</th>
         <th>{{price3name}}</th>
@@ -29,6 +29,7 @@
         <td>{{code}}</td>
         <td>{{msr}}</td>
         <td>{{cat}}</td>
+        <td>{{brand}}</td>
 
         <td align="right">{{price1}}</td>
         <td align="right">{{price2}}</td>