From c44e39c3245d507d87cf7f95605ef3dbd40adcff Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Tue, 10 Dec 2024 08:54:23 +0200 Subject: [PATCH 01/10] fix html --- www/app/pages/base.php | 5 ++++- www/app/pages/service/armpos.php | 2 +- www/templates/apihelp.html | 14 +++++++----- www/templates/modules/hr/items.html | 4 ++-- www/templates/modules/hr/orders.html | 2 +- .../modules/issue/pages/projectlist.html | 2 +- www/templates/modules/np/options.html | 2 +- www/templates/modules/np/ttnlist.html | 2 +- www/templates/modules/ocstore/items.html | 4 ++-- www/templates/modules/ocstore/orders.html | 2 +- www/templates/modules/pu/items.html | 2 +- .../modules/shop/pages/catalog/cchat.html | 6 ++--- .../modules/shop/pages/catalog/menu.html | 2 +- www/templates/modules/wc/items.html | 2 +- www/templates/modules/wc/orders.html | 2 +- www/templates/pages/base.html | 6 ++--- www/templates/pages/crontab.html | 8 +++---- www/templates/pages/doc/goodsissue.html | 2 +- www/templates/pages/doc/officedoc.html | 9 +++++--- www/templates/pages/doc/order.html | 2 +- www/templates/pages/doc/ordercust.html | 2 +- www/templates/pages/doc/outcomeitem.html | 2 +- www/templates/pages/doc/poscheck.html | 2 +- www/templates/pages/doc/ttn.html | 2 +- www/templates/pages/notifylist.html | 2 +- www/templates/pages/options.html | 6 +++-- www/templates/pages/poslist.html | 2 +- www/templates/pages/reference/itemlist.html | 10 ++++----- .../pages/reference/salarytypelist.html | 2 +- www/templates/pages/register/custitems.html | 2 +- www/templates/pages/register/doclist.html | 4 ++-- www/templates/pages/register/itemlist.html | 4 ++-- www/templates/pages/register/orderlist.html | 22 +++++++++---------- www/templates/pages/register/paylist.html | 4 ++-- .../pages/register/prodproclist.html | 6 ++--- www/templates/pages/service/armfood.html | 4 ++-- www/templates/pages/service/discounts.html | 4 ++-- www/templates/pages/service/import.html | 2 +- www/templates/pages/subscribes.html | 16 +++++++------- www/templates/pages/systemlog.html | 2 +- www/templates/pages/update.html | 2 +- www/templates/printforms/cinfo.tpl | 2 +- www/templates/printforms/item_sticker.tpl | 6 ++--- www/templates/printforms/item_tag.tpl | 2 +- www/templates/printforms/report/balance.tpl | 2 +- .../printforms/report/compareact.tpl | 2 ++ www/templates/printforms/report/outcome.tpl | 8 +++---- www/templates/printforms/report/outfood.tpl | 4 ++-- .../printforms/report/paybalance.tpl | 2 +- www/templates/printforms/report/prod.tpl | 11 +++++----- .../printforms/report/prrodoclist.tpl | 4 ++-- www/templates/printforms/report/reserved.tpl | 1 + www/templates/widgets/itemlist.html | 2 +- www/templates/widgets/itemsel.html | 2 +- 54 files changed, 122 insertions(+), 108 deletions(-) diff --git a/www/app/pages/base.php b/www/app/pages/base.php index d6780ea17..420179269 100644 --- a/www/app/pages/base.php +++ b/www/app/pages/base.php @@ -315,9 +315,10 @@ public function setError($msg ) { System::setErrorMsg($msg); } - //вывод как bootstrap alert (для сообщений что могут вызвать ошибку javascript) + public function setErrorTopPage($msg) { $msg = str_replace("'", "`", $msg) ; + $msg = str_replace("\"", "`", $msg) ; System::setErrorMsg($msg, true); } @@ -339,8 +340,10 @@ public function setInfo($msg ) { System::setInfoMsg($msg); } + public function setInfoTopPage($msg) { $msg = str_replace("'", "`", $msg) ; + $msg = str_replace("\"", "`", $msg) ; System::setInfoMsg($msg, true); } diff --git a/www/app/pages/service/armpos.php b/www/app/pages/service/armpos.php index 1496a1d13..d9d2f1d38 100644 --- a/www/app/pages/service/armpos.php +++ b/www/app/pages/service/armpos.php @@ -1518,7 +1518,7 @@ public function OnOpenShift($sender) { } \App\Modules\PPO\PPOHelper::clearStat($this->pos->pos_id); - + //задача для автозакрытия if($this->pos->autoshift >0){ $task = new \App\Entity\CronTask() ; $task->tasktype = \App\Entity\CronTask::TYPE_AUTOSHIFT; diff --git a/www/templates/apihelp.html b/www/templates/apihelp.html index 2295d99be..cdc010be4 100644 --- a/www/templates/apihelp.html +++ b/www/templates/apihelp.html @@ -22,12 +22,14 @@

Формат обміну


Authorization: Bearer

{"jsonrpc": "2.0", "method": "echo", "params": {"say": "Привіт"}, "id": 1} +

+

Ідентифікатор запиту повертається у відповідь і може бути будь яким унікальним у випадку пакетного (batch) запиту, (сервер може бути асинхронним та повернути відповіді у довільному порядку). У випадку відсутності ідентифікатора вважається, що запит - це нотифікація і не потребує відповіді. @@ -37,15 +39,17 @@

Формат обміну


Відповідь має вигляд
{"jsonrpc": "2.0", "result": {"answer": "Привіт"}, "id": 1} +

+

Поля з довільним текстом (наприклад описи) повертаються закодованими в base64

-

+ Коди помилок @@ -73,7 +77,7 @@

Формат обміну

Хибна команда
-

+

Авторизація

Тип авторизації задається в налаштуваннях і може бути на основі JWT токена, Basic аутентифікації @@ -237,7 +241,7 @@

Контрагенти

"params": { "customer_id":"8", - "customer_name":"\"Рога&Копыта\"", + "customer_name":"\"Рога&Копыта\"", "phone":"0991111111", "email":"test@ukr.net", "city":"", @@ -489,8 +493,8 @@

Документи


mf - каса або банкiвський рахунок
branch_id - фiлiя (якщо увiмкнено) -
amount - сума. Якщо >0 створюєтся Прибутковий касовий ордер iнакше Видатковий касовий ордер -
customer_id - контрагент. Якщо задано i сума >0 то оплата вiд покупця. Якщо сума < 0 то оплата постачальнику +
amount - сума. Якщо >0 створюєтся Прибутковий касовий ордер iнакше Видатковий касовий ордер +
customer_id - контрагент. Якщо задано i сума >0 то оплата вiд покупця. Якщо сума < 0 то оплата постачальнику "params": { diff --git a/www/templates/modules/hr/items.html b/www/templates/modules/hr/items.html index 3bb3a5ae7..5d162c90f 100644 --- a/www/templates/modules/hr/items.html +++ b/www/templates/modules/hr/items.html @@ -4,10 +4,10 @@

Експорт товарів в магазин

-    Спецсимволи (типу & ' " `) +    Спецсимволи (типу & ' " `) в назвi або описi можуть викликати проблеми з вигрузкою -
Загрузити категорії +
Загрузити категорії
diff --git a/www/templates/modules/hr/orders.html b/www/templates/modules/hr/orders.html index 9910fd823..ace1b16a4 100644 --- a/www/templates/modules/hr/orders.html +++ b/www/templates/modules/hr/orders.html @@ -5,7 +5,7 @@

Імпорт замовлень

-
Загрузити статуси +
Загрузити статуси
diff --git a/www/templates/modules/issue/pages/projectlist.html b/www/templates/modules/issue/pages/projectlist.html index 17e5f7b10..fdfe2b9e9 100644 --- a/www/templates/modules/issue/pages/projectlist.html +++ b/www/templates/modules/issue/pages/projectlist.html @@ -183,7 +183,7 @@

Коментарі

Опис

-

+

diff --git a/www/templates/modules/np/options.html b/www/templates/modules/np/options.html index 47a254982..1001f19b6 100644 --- a/www/templates/modules/np/options.html +++ b/www/templates/modules/np/options.html @@ -84,7 +84,7 @@
Данi вiдправника за замовчуванням
- +
diff --git a/www/templates/modules/np/ttnlist.html b/www/templates/modules/np/ttnlist.html index abe4f15ed..202d73faf 100644 --- a/www/templates/modules/np/ttnlist.html +++ b/www/templates/modules/np/ttnlist.html @@ -31,7 +31,7 @@

Стан доставок

    Оновити - +
diff --git a/www/templates/modules/ocstore/items.html b/www/templates/modules/ocstore/items.html index 0a5cb863d..31ae010c4 100644 --- a/www/templates/modules/ocstore/items.html +++ b/www/templates/modules/ocstore/items.html @@ -4,10 +4,10 @@

Експорт товарів в магазин

-    Спецсимволи (типу & ' " `) +    Спецсимволи (типу & ' " `) в назвi або описi можуть викликати проблеми з вигрузкою -
Перевiрити з'єднання +
Перевiрити з'єднання
diff --git a/www/templates/modules/ocstore/orders.html b/www/templates/modules/ocstore/orders.html index 05ccb2fc2..1ba8082f7 100644 --- a/www/templates/modules/ocstore/orders.html +++ b/www/templates/modules/ocstore/orders.html @@ -6,7 +6,7 @@

Імпорт замовлень

- Перевiрити з'єднання + Перевiрити з'єднання
diff --git a/www/templates/modules/pu/items.html b/www/templates/modules/pu/items.html index 07132d471..a7abe8896 100644 --- a/www/templates/modules/pu/items.html +++ b/www/templates/modules/pu/items.html @@ -7,7 +7,7 @@

Експорт товарів в магазин

-    Спецсимволи (типу & ' " `) +    Спецсимволи (типу & ' " `) в назвi або описi може викликати проблеми з вигрузкою
diff --git a/www/templates/modules/shop/pages/catalog/cchat.html b/www/templates/modules/shop/pages/catalog/cchat.html index 0f78f5e28..2567633ab 100644 --- a/www/templates/modules/shop/pages/catalog/cchat.html +++ b/www/templates/modules/shop/pages/catalog/cchat.html @@ -40,7 +40,7 @@

Чат по замовленню {{document_number}} вiд {{document_date} {{#isseller}}
Продавець
-
{{msgdate}}
+
{{msgdate}}
@@ -67,8 +67,8 @@

Чат по замовленню {{document_number}} вiд {{document_date} {{/checked}} {{^checked}} - - {{/checked}} + + {{/checked}}

diff --git a/www/templates/modules/shop/pages/catalog/menu.html b/www/templates/modules/shop/pages/catalog/menu.html index 2be53742a..772cecdaa 100644 --- a/www/templates/modules/shop/pages/catalog/menu.html +++ b/www/templates/modules/shop/pages/catalog/menu.html @@ -81,7 +81,7 @@

{{smname}} {{#cats}}
-

{{cat_name}}

+

{{cat_name}}

ТТН Сума
{{#items}} diff --git a/www/templates/modules/wc/items.html b/www/templates/modules/wc/items.html index 66bd20abd..f716c394e 100644 --- a/www/templates/modules/wc/items.html +++ b/www/templates/modules/wc/items.html @@ -6,7 +6,7 @@

Експорт нових товарів

- Перевiрити з'єднання + Перевiрити з'єднання
diff --git a/www/templates/modules/wc/orders.html b/www/templates/modules/wc/orders.html index 4526d1035..25e63e623 100644 --- a/www/templates/modules/wc/orders.html +++ b/www/templates/modules/wc/orders.html @@ -6,7 +6,7 @@

Імпорт замовлень

- Перевiрити з'єднання + Перевiрити з'єднання
diff --git a/www/templates/pages/base.html b/www/templates/pages/base.html index 86edd1202..b99874655 100644 --- a/www/templates/pages/base.html +++ b/www/templates/pages/base.html @@ -1151,12 +1151,12 @@
Вiдправити повiдомлення
- - + +
- +
diff --git a/www/templates/pages/crontab.html b/www/templates/pages/crontab.html index fd5fd1864..56e04ee1c 100644 --- a/www/templates/pages/crontab.html +++ b/www/templates/pages/crontab.html @@ -32,12 +32,10 @@
Черга завдань
- + - - - + - diff --git a/www/templates/pages/doc/outcomeitem.html b/www/templates/pages/doc/outcomeitem.html index c28b83328..258ecc15e 100644 --- a/www/templates/pages/doc/outcomeitem.html +++ b/www/templates/pages/doc/outcomeitem.html @@ -100,7 +100,7 @@

Списання ТМЦ

- + diff --git a/www/templates/pages/doc/poscheck.html b/www/templates/pages/doc/poscheck.html index 13a385364..f00a3faed 100644 --- a/www/templates/pages/doc/poscheck.html +++ b/www/templates/pages/doc/poscheck.html @@ -44,7 +44,7 @@

Касовий чек

- +
diff --git a/www/templates/pages/doc/ttn.html b/www/templates/pages/doc/ttn.html index f162da35e..0e78fd217 100644 --- a/www/templates/pages/doc/ttn.html +++ b/www/templates/pages/doc/ttn.html @@ -16,7 +16,7 @@

Товарно-транспорта накладна

- +
diff --git a/www/templates/pages/notifylist.html b/www/templates/pages/notifylist.html index 8bd803e17..d7594563c 100644 --- a/www/templates/pages/notifylist.html +++ b/www/templates/pages/notifylist.html @@ -27,7 +27,7 @@

Повідомлення

diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html index 0532fd1ae..cfca52e7d 100644 --- a/www/templates/pages/options.html +++ b/www/templates/pages/options.html @@ -213,7 +213,7 @@

Підключення модулів

Вбудований ПРРО
CheckBox
ВчасноКаса - + @@ -234,6 +234,7 @@

Джерела продаж

 +
- +      diff --git a/www/templates/pages/doc/goodsissue.html b/www/templates/pages/doc/goodsissue.html index cd8ff6573..cdff8b320 100644 --- a/www/templates/pages/doc/goodsissue.html +++ b/www/templates/pages/doc/goodsissue.html @@ -79,7 +79,7 @@

Видаткова накладна

- +
diff --git a/www/templates/pages/doc/officedoc.html b/www/templates/pages/doc/officedoc.html index 0ccc63ae7..73bb8f1a1 100644 --- a/www/templates/pages/doc/officedoc.html +++ b/www/templates/pages/doc/officedoc.html @@ -178,7 +178,10 @@
 Право перегляду
- + + + +
@@ -196,7 +199,7 @@
 Право редагування
- +
 Мають пiдписати (затвердети)
@@ -214,7 +217,7 @@
 Мають пiдписати (затвердети)
- +
diff --git a/www/templates/pages/doc/order.html b/www/templates/pages/doc/order.html index 474fff020..0038511ff 100644 --- a/www/templates/pages/doc/order.html +++ b/www/templates/pages/doc/order.html @@ -80,7 +80,7 @@

Замовлення

- +
+
diff --git a/www/templates/pages/doc/ordercust.html b/www/templates/pages/doc/ordercust.html index 7795a9cbc..db97f7c75 100644 --- a/www/templates/pages/doc/ordercust.html +++ b/www/templates/pages/doc/ordercust.html @@ -82,7 +82,7 @@

Заявка постачальнику

    +    
Всього:Всього:    

-

+

Вiдповiсти
@@ -432,6 +433,7 @@

Курси валют

+
@@ -592,7 +594,7 @@

Громадське харчування

-
Доступ до сторiнки меню за адресою <адреса сайту>/menu. Детальнiше тут +
Доступ до сторiнки меню за адресою <адреса сайту>/menu. Детальнiше тут
Параметри нижче в основному для сторiнки меню
diff --git a/www/templates/pages/poslist.html b/www/templates/pages/poslist.html index 6b3ee5baa..4708a2d6f 100644 --- a/www/templates/pages/poslist.html +++ b/www/templates/pages/poslist.html @@ -77,7 +77,7 @@

Довідник кас (POS терміналів)

{{/usebranch}} diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html index 46cbd636f..ad96ada2d 100644 --- a/www/templates/pages/reference/itemlist.html +++ b/www/templates/pages/reference/itemlist.html @@ -95,7 +95,7 @@

Довідник номенклатури
- Додати новий + Додати новий
@@ -190,7 +190,7 @@

Довідник номенклатури          - перемiстити в + перемiстити в
@@ -375,7 +375,7 @@

Редагування

{{#manlist}} - {{/manlist}} @@ -737,12 +737,12 @@

Друк стікера

- + - +
Друк
diff --git a/www/templates/pages/reference/salarytypelist.html b/www/templates/pages/reference/salarytypelist.html index ec96c5738..a146286d3 100644 --- a/www/templates/pages/reference/salarytypelist.html +++ b/www/templates/pages/reference/salarytypelist.html @@ -145,7 +145,7 @@
Коди контексту

Формули зберігаються як налаштування, тобто може бути заданий алгоритм для будь якого типу бізнесу та/або будь якого законодавства будь якої країни.
Розрахунок може не працювати зза помилки в формулах, наприклад неіснуюча змінна або який спецсимвол. - помилки скрипта можна побачити в devtools (для хрома F12->console) + помилки скрипта можна побачити в devtools (для хрома F12->console)

diff --git a/www/templates/pages/register/custitems.html b/www/templates/pages/register/custitems.html index 7ce900001..26732519d 100644 --- a/www/templates/pages/register/custitems.html +++ b/www/templates/pages/register/custitems.html @@ -34,7 +34,7 @@

Товари у постачальникiв

- Додати + Додати Експорт у Excel Iмпорт Налаштування diff --git a/www/templates/pages/register/doclist.html b/www/templates/pages/register/doclist.html index 01e3bad78..08b822901 100644 --- a/www/templates/pages/register/doclist.html +++ b/www/templates/pages/register/doclist.html @@ -240,12 +240,12 @@

Журнал документів - + - +
Друк

diff --git a/www/templates/pages/register/itemlist.html b/www/templates/pages/register/itemlist.html index f4f0dcef8..5ba5b3237 100644 --- a/www/templates/pages/register/itemlist.html +++ b/www/templates/pages/register/itemlist.html @@ -274,12 +274,12 @@
Партiї облiку
- + - +
Друк
diff --git a/www/templates/pages/register/orderlist.html b/www/templates/pages/register/orderlist.html index aa862c9eb..360cf6871 100644 --- a/www/templates/pages/register/orderlist.html +++ b/www/templates/pages/register/orderlist.html @@ -219,7 +219,7 @@

Журнал замовлень

{{dnum}} {{dc}} {{dd}} - + {{/sitems}} @@ -312,11 +312,11 @@
Замовлення
class="fa fa-check-double "> - - - - - + + + + +
@@ -356,11 +356,11 @@
Чат з замовником
Перелiк товарiв - + + + +
{{item.itemname}} - {{item.item_code}} - {{item.quantity}} - {{item.price}} - + {{item.itemname}} {{item.item_code}} {{item.quantity}} {{item.price}}
diff --git a/www/templates/pages/register/paylist.html b/www/templates/pages/register/paylist.html index 4bd64336b..8deef0266 100644 --- a/www/templates/pages/register/paylist.html +++ b/www/templates/pages/register/paylist.html @@ -148,12 +148,12 @@

Журнал платежів

- + - +
Друк
diff --git a/www/templates/pages/register/prodproclist.html b/www/templates/pages/register/prodproclist.html index d7ae82465..89e97d20e 100644 --- a/www/templates/pages/register/prodproclist.html +++ b/www/templates/pages/register/prodproclist.html @@ -196,7 +196,7 @@
Запланована готова продукція
- + Скасувати    Зберегти @@ -229,9 +229,9 @@
Виробничі етапи
- + - + diff --git a/www/templates/pages/service/armfood.html b/www/templates/pages/service/armfood.html index 7c3445e1b..8783cd6ee 100644 --- a/www/templates/pages/service/armfood.html +++ b/www/templates/pages/service/armfood.html @@ -411,7 +411,7 @@
Кількість
- +
@@ -429,7 +429,7 @@
Кількість
- +
diff --git a/www/templates/pages/service/discounts.html b/www/templates/pages/service/discounts.html index 3368fd908..aa346a4d3 100644 --- a/www/templates/pages/service/discounts.html +++ b/www/templates/pages/service/discounts.html @@ -469,7 +469,7 @@

Новий промо код

- +
@@ -594,7 +594,7 @@
Додати (відняти) бонуси
-
+ diff --git a/www/templates/pages/service/import.html b/www/templates/pages/service/import.html index 25d3cdf8c..8a4c024b8 100644 --- a/www/templates/pages/service/import.html +++ b/www/templates/pages/service/import.html @@ -524,7 +524,7 @@

Імпорт контрагентів {{colemail}} {{colcity}} {{coladdress}} - + {{/list2}} diff --git a/www/templates/pages/subscribes.html b/www/templates/pages/subscribes.html index 3fd299a0e..aa6789ab4 100644 --- a/www/templates/pages/subscribes.html +++ b/www/templates/pages/subscribes.html @@ -202,7 +202,7 @@

Опис тегiв шаблонізатора


Для виведення списків, наприклад, позицій документа, потрібно додати інформацію мiж тегами - {#list} та {/list>} + {#list} та {/list>}
Всередині рядка списку допускаються наступні теги: @@ -217,16 +217,16 @@
Опис тегiв шаблонізатора
Наприклад:

- Привiт {customer_name}<br>
+ Привiт {customer_name}<br>
Ми впарили тобi наступне
- <table>
- <tr> <th>Товар</th> <th align="right" >Кiл. </th> </tr>
+ <table>
+ <tr> <th>Товар</th> <th align="right" >Кiл. </th> </tr>
{#list}
- <tr> <td>{item_name} </td> <td align="right" >{qty} </td></tr>
+ <tr> <td>{item_name} </td> <td align="right" >{qty} </td></tr>
{/list}
- </table><br>
- До сплати {forpay} чистоганом <br>
- Прайси за <a href="https://price.com/">посиланням</a><br>
+ </table><br>
+ До сплати {forpay} чистоганом <br>
+ Прайси за <a href="https://price.com/">посиланням</a><br>
Пока, лошара

diff --git a/www/templates/pages/systemlog.html b/www/templates/pages/systemlog.html index 1ec0a350c..ac79ea89e 100644 --- a/www/templates/pages/systemlog.html +++ b/www/templates/pages/systemlog.html @@ -30,7 +30,7 @@
Системнi повiдомлення

-

+

Нове diff --git a/www/templates/pages/update.html b/www/templates/pages/update.html index 51e928e95..f602c9e5d 100644 --- a/www/templates/pages/update.html +++ b/www/templates/pages/update.html @@ -62,7 +62,7 @@

Оновлення

    {{#list}} -
  • {{item}} +
  • {{item}}
    • {{/list}}

diff --git a/www/templates/printforms/cinfo.tpl b/www/templates/printforms/cinfo.tpl index d782ca93e..1291d59e5 100644 --- a/www/templates/printforms/cinfo.tpl +++ b/www/templates/printforms/cinfo.tpl @@ -39,7 +39,7 @@ {{#last}} Останній документ: {{last}} від {{lastdate}} на суму {{lastsum}}. Статус {{laststatus}} - Останні товари: + Останні товари: {{#goods}} diff --git a/www/templates/printforms/item_sticker.tpl b/www/templates/printforms/item_sticker.tpl index 382d10bcf..e3f3f5605 100644 --- a/www/templates/printforms/item_sticker.tpl +++ b/www/templates/printforms/item_sticker.tpl @@ -1,6 +1,6 @@ -
+
- {{/_detail}} +
+
@@ -22,7 +22,7 @@ diff --git a/www/templates/printforms/item_tag.tpl b/www/templates/printforms/item_tag.tpl index 48df71fdf..7d298fe10 100644 --- a/www/templates/printforms/item_tag.tpl +++ b/www/templates/printforms/item_tag.tpl @@ -1,6 +1,6 @@
{{name}}
- +
- {{^noshowpartion}} - - + + {{/noshowpartion}} @@ -483,8 +483,8 @@ {{^noshowpartion}} - - + + {{/noshowpartion}} diff --git a/www/templates/printforms/report/outfood.tpl b/www/templates/printforms/report/outfood.tpl index 27db1e055..b8bcf691c 100644 --- a/www/templates/printforms/report/outfood.tpl +++ b/www/templates/printforms/report/outfood.tpl @@ -29,7 +29,7 @@ - + {{#_detail}} @@ -63,7 +63,7 @@ - + {{#_detail2}} diff --git a/www/templates/printforms/report/paybalance.tpl b/www/templates/printforms/report/paybalance.tpl index 8499334b6..97a2d0f78 100644 --- a/www/templates/printforms/report/paybalance.tpl +++ b/www/templates/printforms/report/paybalance.tpl @@ -5,7 +5,7 @@ Прибутки та видатки - + - + {{#_detail}} @@ -76,7 +76,7 @@ - + {{#_detail2}} @@ -103,9 +103,10 @@ @@ -117,7 +118,7 @@ - + {{#_detail3}} diff --git a/www/templates/printforms/report/prrodoclist.tpl b/www/templates/printforms/report/prrodoclist.tpl index a0a0b41f6..3349c8a69 100644 --- a/www/templates/printforms/report/prrodoclist.tpl +++ b/www/templates/printforms/report/prrodoclist.tpl @@ -22,7 +22,7 @@ - + {{#detail}} @@ -48,7 +48,7 @@ - +
+
diff --git a/www/templates/printforms/report/balance.tpl b/www/templates/printforms/report/balance.tpl index 7ab0ce706..907612112 100644 --- a/www/templates/printforms/report/balance.tpl +++ b/www/templates/printforms/report/balance.tpl @@ -5,7 +5,7 @@ Управлiнський баланс - + {{/_detail}} + +
{{name}}
diff --git a/www/templates/printforms/report/compareact.tpl b/www/templates/printforms/report/compareact.tpl index 40f149556..847443699 100644 --- a/www/templates/printforms/report/compareact.tpl +++ b/www/templates/printforms/report/compareact.tpl @@ -39,3 +39,5 @@
diff --git a/www/templates/printforms/report/outcome.tpl b/www/templates/printforms/report/outcome.tpl index 0892918b7..721b24c49 100644 --- a/www/templates/printforms/report/outcome.tpl +++ b/www/templates/printforms/report/outcome.tpl @@ -107,8 +107,8 @@
{{totsumma}}{{totnavar}}{{totnavarproc}}{{totnavar}} {{totnavarproc}}
{{totsumma}}{{totnavar}}{{totnavarproc}}{{totnavar}} {{totnavarproc}} Кіл.
Кіл. На суму
diff --git a/www/templates/printforms/report/prod.tpl b/www/templates/printforms/report/prod.tpl index d34832d9e..9938b1db9 100644 --- a/www/templates/printforms/report/prod.tpl +++ b/www/templates/printforms/report/prod.tpl @@ -36,7 +36,7 @@ Сума
Сума

Готово до виробництва
- Напівфабрикати та готова продукція, які можуть бути виготовлені на {{currdate}}
відповідно до комплектів. + Напівфабрикати та готова продукція, які можуть бути виготовлені на {{currdate}} +
відповідно до комплектів. Якщо матеріал або комплектуючі входять
в кілька позицій, будуть показані всі варіанти. - +
Код Кіл.
ФН Тип Сума
diff --git a/www/templates/printforms/report/reserved.tpl b/www/templates/printforms/report/reserved.tpl index 0f7998d32..cfa7e312b 100644 --- a/www/templates/printforms/report/reserved.tpl +++ b/www/templates/printforms/report/reserved.tpl @@ -31,3 +31,4 @@
diff --git a/www/templates/widgets/itemlist.html b/www/templates/widgets/itemlist.html index 076bf558f..742172470 100644 --- a/www/templates/widgets/itemlist.html +++ b/www/templates/widgets/itemlist.html @@ -27,7 +27,7 @@
Вибiр ТМЦ
-
diff --git a/www/templates/widgets/itemsel.html b/www/templates/widgets/itemsel.html index 149b9e257..ac40b48c2 100644 --- a/www/templates/widgets/itemsel.html +++ b/www/templates/widgets/itemsel.html @@ -16,7 +16,7 @@ {{#manlist}} - {{/manlist}} From 9818655a9c99fadccbb993576412d1b8277384e6 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Tue, 10 Dec 2024 10:22:10 +0200 Subject: [PATCH 02/10] fix html --- www/templates/modules/hr/options.html | 4 +-- .../modules/issue/pages/projectlist.html | 2 +- www/templates/modules/ocstore/options.html | 4 +-- www/templates/modules/pu/options.html | 4 +-- .../modules/shop/pages/admin/custom.html | 4 +-- .../modules/shop/pages/admin/options.html | 8 ++--- .../modules/shop/pages/admin/productlist.html | 4 +-- .../modules/shop/pages/catalog/catalog.html | 2 +- .../modules/shop/pages/catalog/main.html | 2 +- .../modules/shop/pages/catalog/order.html | 2 +- .../modules/shop/pages/catalog/orderpay.html | 2 +- .../shop/pages/catalog/productview.html | 4 +-- www/templates/modules/vdoc/doclist.html | 2 +- www/templates/modules/wc/options.html | 4 +-- www/templates/pages/base.html | 20 +++++------ www/templates/pages/branchlist.html | 2 +- www/templates/pages/chat.html | 2 +- www/templates/pages/doc/calcsalary.html | 6 ++-- www/templates/pages/doc/goodsissue.html | 10 +++--- www/templates/pages/doc/goodsreceipt.html | 16 ++++----- www/templates/pages/doc/incomeitem.html | 8 ++--- www/templates/pages/doc/incomemoney.html | 2 +- www/templates/pages/doc/incomeservice.html | 12 +++---- www/templates/pages/doc/inventory.html | 4 +-- www/templates/pages/doc/invoice.html | 14 ++++---- www/templates/pages/doc/invoicecust.html | 10 +++--- www/templates/pages/doc/moveitem.html | 6 ++-- www/templates/pages/doc/movemoney.html | 2 +- www/templates/pages/doc/movepart.html | 4 +-- www/templates/pages/doc/officedoc.html | 6 ++-- www/templates/pages/doc/order.html | 12 +++---- www/templates/pages/doc/ordercust.html | 12 +++---- www/templates/pages/doc/orderfood.html | 10 +++--- www/templates/pages/doc/outcomeitem.html | 4 +-- www/templates/pages/doc/outcomemoney.html | 2 +- www/templates/pages/doc/outsalary.html | 2 +- www/templates/pages/doc/poscheck.html | 14 ++++---- www/templates/pages/doc/prodissue.html | 6 ++-- www/templates/pages/doc/prodreceipt.html | 8 ++--- www/templates/pages/doc/prodreturn.html | 6 ++-- www/templates/pages/doc/retcustissue.html | 8 ++--- www/templates/pages/doc/returnissue.html | 8 ++--- www/templates/pages/doc/serviceact.html | 14 ++++---- www/templates/pages/doc/task.html | 6 ++-- www/templates/pages/doc/transitem.html | 6 ++-- www/templates/pages/doc/ttn.html | 14 ++++---- www/templates/pages/doc/warranty.html | 8 ++--- www/templates/pages/firmlist.html | 2 +- www/templates/pages/jobs.html | 12 +++---- www/templates/pages/menulist.html | 4 +-- www/templates/pages/options.html | 36 +++++++++---------- www/templates/pages/poslist.html | 4 +-- .../pages/reference/categorylist.html | 6 ++-- .../pages/reference/contractlist.html | 11 +++--- .../pages/reference/customerlist.html | 8 ++--- .../pages/reference/employeelist.html | 4 +-- www/templates/pages/reference/eqlist.html | 2 +- www/templates/pages/reference/itemlist.html | 6 ++-- .../pages/reference/prodarealist.html | 2 +- .../pages/reference/salarytypelist.html | 6 ++-- .../pages/reference/servicelist.html | 4 +-- www/templates/pages/reference/storelist.html | 2 +- www/templates/pages/register/doclist.html | 4 +-- www/templates/pages/register/gilist.html | 6 ++-- www/templates/pages/register/itemlist.html | 2 +- www/templates/pages/register/paylist.html | 2 +- www/templates/pages/register/paytable.html | 10 +++--- .../pages/register/prodproclist.html | 10 +++--- www/templates/pages/register/serlist.html | 8 ++--- www/templates/pages/register/tasklist.html | 5 ++- www/templates/pages/roles.html | 2 +- www/templates/pages/service/armfood.html | 2 +- www/templates/pages/service/armpos.html | 14 ++++---- www/templates/pages/systemlog.html | 6 ++-- www/templates/pages/timesheet.html | 11 +++--- www/templates/pages/userlogin.html | 6 ++-- www/templates/pages/userprofile.html | 16 ++++----- www/templates/pages/users.html | 4 +-- www/templates/printforms/doc/goodsissue.tpl | 2 +- www/templates/printforms/doc/invoice.tpl | 6 ++-- www/templates/printforms/doc/serviceact.tpl | 2 +- .../printforms/report/compareact.tpl | 2 +- www/templates/printforms/report/custorder.tpl | 2 +- www/templates/printforms/report/emptask.tpl | 2 +- www/templates/printforms/report/income.tpl | 2 +- .../printforms/report/itemactivity.tpl | 2 +- www/templates/printforms/report/itemorder.tpl | 2 +- www/templates/printforms/report/noliq.tpl | 2 +- .../printforms/report/paybalance.tpl | 3 +- www/templates/printforms/report/reserved.tpl | 2 +- www/templates/widgets/itemsel.html | 2 +- 91 files changed, 280 insertions(+), 280 deletions(-) diff --git a/www/templates/modules/hr/options.html b/www/templates/modules/hr/options.html index a408499ae..095500ad4 100644 --- a/www/templates/modules/hr/options.html +++ b/www/templates/modules/hr/options.html @@ -25,7 +25,7 @@

Налаштування з'єднання

@@ -34,7 +34,7 @@

Налаштування з'єднання

Якщо оплата не на стороні IM diff --git a/www/templates/modules/issue/pages/projectlist.html b/www/templates/modules/issue/pages/projectlist.html index fdfe2b9e9..e7c789c2b 100644 --- a/www/templates/modules/issue/pages/projectlist.html +++ b/www/templates/modules/issue/pages/projectlist.html @@ -89,7 +89,7 @@

Проекти

- +
diff --git a/www/templates/modules/ocstore/options.html b/www/templates/modules/ocstore/options.html index 11d9f0151..b8631f45f 100644 --- a/www/templates/modules/ocstore/options.html +++ b/www/templates/modules/ocstore/options.html @@ -43,7 +43,7 @@

Налаштування підключення

Ціна для оновлення в магазині @@ -53,7 +53,7 @@

Налаштування підключення

Якщо оплата не на стороні IM diff --git a/www/templates/modules/pu/options.html b/www/templates/modules/pu/options.html index dcf85452c..d1c27e2fe 100644 --- a/www/templates/modules/pu/options.html +++ b/www/templates/modules/pu/options.html @@ -24,7 +24,7 @@

Налаштування з'єднання

@@ -33,7 +33,7 @@

Налаштування з'єднання

Якщо оплата не на стороні IM diff --git a/www/templates/modules/shop/pages/admin/custom.html b/www/templates/modules/shop/pages/admin/custom.html index 84f15965a..bb3a2a64b 100644 --- a/www/templates/modules/shop/pages/admin/custom.html +++ b/www/templates/modules/shop/pages/admin/custom.html @@ -68,14 +68,14 @@

Редагування сторiнки

- + Не включаючи адресу сайту. Допускаються тiльки латиничнi символи (наприклад: news, about_us, dostavka)
- + Номер порядку виводу в меню diff --git a/www/templates/modules/shop/pages/admin/options.html b/www/templates/modules/shop/pages/admin/options.html index 221d77df3..4c35e41df 100644 --- a/www/templates/modules/shop/pages/admin/options.html +++ b/www/templates/modules/shop/pages/admin/options.html @@ -40,7 +40,7 @@

Налаштування

Якщо оплата не на стороні IM
@@ -66,9 +66,9 @@

Налаштування

diff --git a/www/templates/modules/shop/pages/admin/productlist.html b/www/templates/modules/shop/pages/admin/productlist.html index 8f1df7494..49bc03188 100644 --- a/www/templates/modules/shop/pages/admin/productlist.html +++ b/www/templates/modules/shop/pages/admin/productlist.html @@ -102,9 +102,9 @@

Редагування

Оновити кастомні поля - +
- +
diff --git a/www/templates/modules/shop/pages/catalog/catalog.html b/www/templates/modules/shop/pages/catalog/catalog.html index 81bbbe9f5..965bebb28 100644 --- a/www/templates/modules/shop/pages/catalog/catalog.html +++ b/www/templates/modules/shop/pages/catalog/catalog.html @@ -65,7 +65,7 @@ {{#usefeedback}}
- +
diff --git a/www/templates/modules/shop/pages/catalog/main.html b/www/templates/modules/shop/pages/catalog/main.html index 59add096a..af1ca2cae 100644 --- a/www/templates/modules/shop/pages/catalog/main.html +++ b/www/templates/modules/shop/pages/catalog/main.html @@ -16,7 +16,7 @@
-
+
{{^nouseimages}} diff --git a/www/templates/modules/shop/pages/catalog/order.html b/www/templates/modules/shop/pages/catalog/order.html index 1cb0a7c36..689eeac6f 100644 --- a/www/templates/modules/shop/pages/catalog/order.html +++ b/www/templates/modules/shop/pages/catalog/order.html @@ -81,7 +81,7 @@

Оформлення замовлення

{{#usepayment}}
- +
+   {{/usefeedback}}
@@ -132,7 +132,7 @@
Вiдгуки
-     
: diff --git a/www/templates/modules/vdoc/doclist.html b/www/templates/modules/vdoc/doclist.html index 71946ba70..86cf4ccb7 100644 --- a/www/templates/modules/vdoc/doclist.html +++ b/www/templates/modules/vdoc/doclist.html @@ -73,7 +73,7 @@

Документи на вiдправку

Вiдправити в Вчасно - + diff --git a/www/templates/modules/wc/options.html b/www/templates/modules/wc/options.html index 517d1027b..048e180f6 100644 --- a/www/templates/modules/wc/options.html +++ b/www/templates/modules/wc/options.html @@ -42,7 +42,7 @@

Налаштування з'єднання

@@ -51,7 +51,7 @@

Налаштування з'єднання

Якщо оплата не на стороні IM diff --git a/www/templates/pages/base.html b/www/templates/pages/base.html index b99874655..caeadb272 100644 --- a/www/templates/pages/base.html +++ b/www/templates/pages/base.html @@ -368,7 +368,7 @@
    {{#items}}
  • - +

        {{name}}

     @@ -381,7 +381,7 @@ {{#items}}
  • - +

      {{name}}

     @@ -416,7 +416,7 @@
      {{#items}}
    • - +

          {{name}}

       @@ -429,7 +429,7 @@ {{#items}}
    • - +

        {{name}}

       @@ -464,7 +464,7 @@
        {{#items}}
      • - +

            {{name}}

         @@ -477,7 +477,7 @@ {{#items}}
      • - +

          {{name}}

         @@ -511,7 +511,7 @@
          {{#items}}
        • - +

              {{name}}

           @@ -524,7 +524,7 @@ {{#items}}
        • - +

            {{name}}

           @@ -561,7 +561,7 @@
            {{#items}}
          • - +

                {{name}}

             @@ -574,7 +574,7 @@ {{#items}}
          • - +

              {{name}}

             diff --git a/www/templates/pages/branchlist.html b/www/templates/pages/branchlist.html index 4c53b3c7a..393d96d42 100644 --- a/www/templates/pages/branchlist.html +++ b/www/templates/pages/branchlist.html @@ -29,7 +29,7 @@

            Перелік філій

            - +
            diff --git a/www/templates/pages/chat.html b/www/templates/pages/chat.html index 46e0ae75e..f284d1317 100644 --- a/www/templates/pages/chat.html +++ b/www/templates/pages/chat.html @@ -78,7 +78,7 @@

            Загальний чат

            - +
            diff --git a/www/templates/pages/doc/calcsalary.html b/www/templates/pages/doc/calcsalary.html index df7e849f4..782a62eb4 100644 --- a/www/templates/pages/doc/calcsalary.html +++ b/www/templates/pages/doc/calcsalary.html @@ -15,11 +15,11 @@

            Нарахування зарплати

            - +
            - +
            @@ -46,7 +46,7 @@

            Нарахування зарплати

            - + Кiлькiсть робочих днiв в мiсяцi
            diff --git a/www/templates/pages/doc/goodsissue.html b/www/templates/pages/doc/goodsissue.html index cdff8b320..4390214fa 100644 --- a/www/templates/pages/doc/goodsissue.html +++ b/www/templates/pages/doc/goodsissue.html @@ -12,7 +12,7 @@

            Видаткова накладна

            - +
            @@ -53,7 +53,7 @@

            Видаткова накладна

            - +
            @@ -302,14 +302,14 @@

            Введення товару

            {{/usesnumber}}
            -
            -
            @@ -338,7 +338,7 @@

             Новий покупець

            - +
            diff --git a/www/templates/pages/doc/goodsreceipt.html b/www/templates/pages/doc/goodsreceipt.html index e9cf32edb..0381db472 100644 --- a/www/templates/pages/doc/goodsreceipt.html +++ b/www/templates/pages/doc/goodsreceipt.html @@ -11,11 +11,11 @@

            Прибуткова накладна

            - +
            - +
            @@ -421,7 +421,7 @@

            Введення товару

            - +
            @@ -429,7 +429,7 @@

            Введення товару

            - +
            @@ -490,7 +490,7 @@

             Новий товар

            - +
            @@ -542,7 +542,7 @@

             Новий постачальник

            - +
            @@ -706,7 +706,7 @@

             Ввод за серійними номерами

            - + В довіднику номенклатури тре вказати що даний ТМЦ обліковується за серійним номером
            @@ -718,7 +718,7 @@

             Ввод за серійними номерами

            - +
            diff --git a/www/templates/pages/doc/incomeitem.html b/www/templates/pages/doc/incomeitem.html index a7e540f20..fb25845c3 100644 --- a/www/templates/pages/doc/incomeitem.html +++ b/www/templates/pages/doc/incomeitem.html @@ -15,7 +15,7 @@

            Оприбуткування ТМЦ

            - +
            @@ -162,12 +162,12 @@

            Введення товару

            + required pattern="[0-9,\.]+"/>
            -
            @@ -191,7 +191,7 @@

             Новий товар

            - +
            diff --git a/www/templates/pages/doc/incomemoney.html b/www/templates/pages/doc/incomemoney.html index aff70f2b2..dd6624ab9 100644 --- a/www/templates/pages/doc/incomemoney.html +++ b/www/templates/pages/doc/incomemoney.html @@ -16,7 +16,7 @@

            Прибутковий ордер

            - +
            diff --git a/www/templates/pages/doc/incomeservice.html b/www/templates/pages/doc/incomeservice.html index a866ad0ed..1fc75c297 100644 --- a/www/templates/pages/doc/incomeservice.html +++ b/www/templates/pages/doc/incomeservice.html @@ -17,7 +17,7 @@

            Отриманi послуги
            - +
            @@ -48,7 +48,7 @@

            Отриманi послуги
            - +
            @@ -244,7 +244,7 @@

            Редагування

            -
            @@ -263,7 +263,7 @@

             Новий контрагент

            - +
            @@ -293,9 +293,9 @@

             Новий контрагент

            - + - + diff --git a/www/templates/pages/doc/inventory.html b/www/templates/pages/doc/inventory.html index 827002bae..df03ad429 100644 --- a/www/templates/pages/doc/inventory.html +++ b/www/templates/pages/doc/inventory.html @@ -46,7 +46,7 @@

            Інвентаризація
            - +
            @@ -172,7 +172,7 @@

            Введення ТМЦ

            + required pattern="[0-9,\.]+"/>
            diff --git a/www/templates/pages/doc/invoice.html b/www/templates/pages/doc/invoice.html index eab40dc53..880e5b11a 100644 --- a/www/templates/pages/doc/invoice.html +++ b/www/templates/pages/doc/invoice.html @@ -62,11 +62,11 @@

            Рахунок-фактура

            - +
            - +
            @@ -210,13 +210,13 @@

            Редагування товару

            -
            - +
            @@ -243,13 +243,13 @@

            Редагування послуги

            -
            -
            @@ -272,7 +272,7 @@

             Новий контрагент

            - +
            diff --git a/www/templates/pages/doc/invoicecust.html b/www/templates/pages/doc/invoicecust.html index b001d447a..1f2d6663d 100644 --- a/www/templates/pages/doc/invoicecust.html +++ b/www/templates/pages/doc/invoicecust.html @@ -11,7 +11,7 @@

            Рахунок вхідний

            - +
            @@ -40,7 +40,7 @@

            Рахунок вхідний

            - +
            @@ -276,7 +276,7 @@

            Введення товару

            -
            @@ -284,7 +284,7 @@

            Введення товару

            -
            @@ -311,7 +311,7 @@

             Новий товар

            - +
            diff --git a/www/templates/pages/doc/moveitem.html b/www/templates/pages/doc/moveitem.html index f9d4cf43b..c021e05fb 100644 --- a/www/templates/pages/doc/moveitem.html +++ b/www/templates/pages/doc/moveitem.html @@ -41,7 +41,7 @@

            Перемiщення ТМЦ

            - +
            @@ -137,7 +137,7 @@

            Введення товару

            + required pattern="[0-9,\.]+"/>
            @@ -164,7 +164,7 @@

             Ввод за серійними номерами

            - +
            diff --git a/www/templates/pages/doc/movemoney.html b/www/templates/pages/doc/movemoney.html index 30710c3c8..4fb54d768 100644 --- a/www/templates/pages/doc/movemoney.html +++ b/www/templates/pages/doc/movemoney.html @@ -15,7 +15,7 @@

            Перемiщення коштiв

            - +
            diff --git a/www/templates/pages/doc/movepart.html b/www/templates/pages/doc/movepart.html index 03c54c5e6..6a196806e 100644 --- a/www/templates/pages/doc/movepart.html +++ b/www/templates/pages/doc/movepart.html @@ -15,7 +15,7 @@

            Перемiщення партiй ТМЦ

            - +
            @@ -39,7 +39,7 @@

            Перемiщення партiй ТМЦ

            - +
            diff --git a/www/templates/pages/doc/officedoc.html b/www/templates/pages/doc/officedoc.html index 73bb8f1a1..bcfb5ce7b 100644 --- a/www/templates/pages/doc/officedoc.html +++ b/www/templates/pages/doc/officedoc.html @@ -23,7 +23,7 @@
            - +
            @@ -31,7 +31,7 @@
            - +
            @@ -125,7 +125,7 @@

             Новий конрагент

            - +
            diff --git a/www/templates/pages/doc/order.html b/www/templates/pages/doc/order.html index 0038511ff..b7787f3d9 100644 --- a/www/templates/pages/doc/order.html +++ b/www/templates/pages/doc/order.html @@ -12,7 +12,7 @@

            Замовлення

            - +
            @@ -52,7 +52,7 @@

            Замовлення

            - +
            @@ -362,12 +362,12 @@

            Введення товару

            - +
            - +
            @@ -401,7 +401,7 @@

             Новий контрагент

            - +
            @@ -427,7 +427,7 @@

             Новий товар

            - +
            diff --git a/www/templates/pages/doc/ordercust.html b/www/templates/pages/doc/ordercust.html index db97f7c75..7b72df68a 100644 --- a/www/templates/pages/doc/ordercust.html +++ b/www/templates/pages/doc/ordercust.html @@ -14,7 +14,7 @@

            Заявка постачальнику

            - +
            @@ -39,7 +39,7 @@

            Заявка постачальнику

            - +
            @@ -131,7 +131,7 @@

            Введення товару

            -
            @@ -140,7 +140,7 @@

            Введення товару

            -
            @@ -181,7 +181,7 @@

             Новий товар

            - +
            @@ -223,7 +223,7 @@
             Новий постачальник
            - +
            diff --git a/www/templates/pages/doc/orderfood.html b/www/templates/pages/doc/orderfood.html index 989f37690..50850ae30 100644 --- a/www/templates/pages/doc/orderfood.html +++ b/www/templates/pages/doc/orderfood.html @@ -13,7 +13,7 @@

            Замовлення (Кафе)

            - +
            @@ -48,7 +48,7 @@

            Замовлення (Кафе)

            - +
            @@ -297,14 +297,14 @@

            Введення товару

            -
            -
            @@ -328,7 +328,7 @@

             Новий клієнт

            - +
            diff --git a/www/templates/pages/doc/outcomeitem.html b/www/templates/pages/doc/outcomeitem.html index 258ecc15e..9a52fa004 100644 --- a/www/templates/pages/doc/outcomeitem.html +++ b/www/templates/pages/doc/outcomeitem.html @@ -15,7 +15,7 @@

            Списання ТМЦ

            - +
            @@ -157,7 +157,7 @@

            Введення товару

            + required pattern="[0-9,\.]+"/>
            diff --git a/www/templates/pages/doc/outcomemoney.html b/www/templates/pages/doc/outcomemoney.html index aa3456279..5cf53e7ee 100644 --- a/www/templates/pages/doc/outcomemoney.html +++ b/www/templates/pages/doc/outcomemoney.html @@ -15,7 +15,7 @@

            Видатковий ордер

            - +
            diff --git a/www/templates/pages/doc/outsalary.html b/www/templates/pages/doc/outsalary.html index be026d9e7..561689738 100644 --- a/www/templates/pages/doc/outsalary.html +++ b/www/templates/pages/doc/outsalary.html @@ -15,7 +15,7 @@

            Виплата зарплати

            - +
            diff --git a/www/templates/pages/doc/poscheck.html b/www/templates/pages/doc/poscheck.html index f00a3faed..f4f414394 100644 --- a/www/templates/pages/doc/poscheck.html +++ b/www/templates/pages/doc/poscheck.html @@ -12,7 +12,7 @@

            Касовий чек

            - +
            @@ -40,7 +40,7 @@

            Касовий чек

            - +
            @@ -311,14 +311,14 @@

            Введення товару

            {{/usesnumber}}
            -
            -
            @@ -348,14 +348,14 @@

            Введення послуги

            -
            -
            @@ -378,7 +378,7 @@

             Новий контрагент

            - +
            diff --git a/www/templates/pages/doc/prodissue.html b/www/templates/pages/doc/prodissue.html index ee0cda3e7..75b77481b 100644 --- a/www/templates/pages/doc/prodissue.html +++ b/www/templates/pages/doc/prodissue.html @@ -12,7 +12,7 @@

            Списання на виробництво

            - +
            @@ -31,7 +31,7 @@

            Списання на виробництво

            - +
            @@ -128,7 +128,7 @@

            Введення ТМЦ

            {{/usesnumber}}
            -
            diff --git a/www/templates/pages/doc/prodreceipt.html b/www/templates/pages/doc/prodreceipt.html index 9ba77f61f..031f4e79d 100644 --- a/www/templates/pages/doc/prodreceipt.html +++ b/www/templates/pages/doc/prodreceipt.html @@ -11,7 +11,7 @@

            Оприбуткування з виробництва

            - +
            @@ -29,7 +29,7 @@

            Оприбуткування з виробництва

            - +
            @@ -134,14 +134,14 @@

            Введення ТМЦ

            {{/usesnumber}}
            -
            -
            diff --git a/www/templates/pages/doc/prodreturn.html b/www/templates/pages/doc/prodreturn.html index 0ca15c047..25b512b44 100644 --- a/www/templates/pages/doc/prodreturn.html +++ b/www/templates/pages/doc/prodreturn.html @@ -14,7 +14,7 @@

            Повернення з виробництва

            - +
            @@ -33,7 +33,7 @@

            Повернення з виробництва

            - +
            @@ -122,7 +122,7 @@

            Введення ТМЦ

            {{/usesnumber}}
            -
            diff --git a/www/templates/pages/doc/retcustissue.html b/www/templates/pages/doc/retcustissue.html index 978781597..ebacd19b6 100644 --- a/www/templates/pages/doc/retcustissue.html +++ b/www/templates/pages/doc/retcustissue.html @@ -12,7 +12,7 @@

            Повернення постачальнику

            - +
            @@ -42,7 +42,7 @@

            Повернення постачальнику

            - +
            @@ -170,13 +170,13 @@

            Введення товару

            -
            -
            diff --git a/www/templates/pages/doc/returnissue.html b/www/templates/pages/doc/returnissue.html index 75d1c5e01..ec4057594 100644 --- a/www/templates/pages/doc/returnissue.html +++ b/www/templates/pages/doc/returnissue.html @@ -12,7 +12,7 @@

            Повернення, накладна

            - +
            @@ -40,7 +40,7 @@

            Повернення, накладна

            - +
            @@ -192,13 +192,13 @@

            Введення товару

            -
            -
            diff --git a/www/templates/pages/doc/serviceact.html b/www/templates/pages/doc/serviceact.html index 7d262374b..5b7f17f4b 100644 --- a/www/templates/pages/doc/serviceact.html +++ b/www/templates/pages/doc/serviceact.html @@ -20,7 +20,7 @@

            Замовлення (послуги)
            - +
            @@ -71,11 +71,11 @@

            Замовлення (послуги)
            - +
            - +
            @@ -233,7 +233,7 @@
            Редагування
            -
            @@ -263,7 +263,7 @@
            Редагування
            - + Відкрити довідник
            Наявність: {{qtystock}} @@ -281,7 +281,7 @@
            Редагування
            -
            @@ -313,7 +313,7 @@
            Новий контрагент
            - +
            diff --git a/www/templates/pages/doc/task.html b/www/templates/pages/doc/task.html index 07380cd43..4d13091ad 100644 --- a/www/templates/pages/doc/task.html +++ b/www/templates/pages/doc/task.html @@ -22,7 +22,7 @@

            Наряд на виконання робіт
            - +
            @@ -37,9 +37,9 @@

            Наряд на виконання робіт
            - + : - +
            diff --git a/www/templates/pages/doc/transitem.html b/www/templates/pages/doc/transitem.html index 5731220b8..3e00b5f7f 100644 --- a/www/templates/pages/doc/transitem.html +++ b/www/templates/pages/doc/transitem.html @@ -15,7 +15,7 @@

            Перекомплектація (розфасовка)

            - +
            @@ -42,7 +42,7 @@

            Перекомплектація (розфасовка)

            + required pattern="[0-9,\.]+"/>
            @@ -61,7 +61,7 @@

            Перекомплектація (розфасовка)

            + required pattern="[0-9,\.]+"/>
            diff --git a/www/templates/pages/doc/ttn.html b/www/templates/pages/doc/ttn.html index 0e78fd217..26a2130e8 100644 --- a/www/templates/pages/doc/ttn.html +++ b/www/templates/pages/doc/ttn.html @@ -12,7 +12,7 @@

            Товарно-транспорта накладна

            - +
            @@ -60,7 +60,7 @@

            Товарно-транспорта накладна

            - +
            @@ -128,11 +128,11 @@

            Товарно-транспорта накладна

            - +
            - +
            @@ -249,14 +249,14 @@

            Введення товару

            {{/usesnumber}}
            -
            -
            @@ -285,7 +285,7 @@

             Новий покупець

            - +
            diff --git a/www/templates/pages/doc/warranty.html b/www/templates/pages/doc/warranty.html index 014102cdf..ca163aad2 100644 --- a/www/templates/pages/doc/warranty.html +++ b/www/templates/pages/doc/warranty.html @@ -13,11 +13,11 @@

            Гарантійний талон

            - +
            - +
            @@ -85,13 +85,13 @@

            Введення товару

            -
            -
            diff --git a/www/templates/pages/firmlist.html b/www/templates/pages/firmlist.html index 589f5da45..9d9ea8b3f 100644 --- a/www/templates/pages/firmlist.html +++ b/www/templates/pages/firmlist.html @@ -47,7 +47,7 @@

            Перелік компанiй

            - +
            diff --git a/www/templates/pages/jobs.html b/www/templates/pages/jobs.html index 6cd02639e..83a729764 100644 --- a/www/templates/pages/jobs.html +++ b/www/templates/pages/jobs.html @@ -67,15 +67,15 @@

            Мої завдання

            - +
            - +
            - +
            @@ -120,14 +120,14 @@

            Мої завдання

            - + : - +
            - +
            diff --git a/www/templates/pages/menulist.html b/www/templates/pages/menulist.html index d7ccff9d6..6df79e0ff 100644 --- a/www/templates/pages/menulist.html +++ b/www/templates/pages/menulist.html @@ -77,11 +77,11 @@
            Редагування пункту меню
            - +
            - +
            diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html index cfca52e7d..4b3873960 100644 --- a/www/templates/pages/options.html +++ b/www/templates/pages/options.html @@ -28,18 +28,18 @@

            Загальнi налаштування

            @@ -54,12 +54,12 @@

            Загальнi налаштування

            @@ -285,7 +285,7 @@

            Налаштування бізнес-процесів

            - + @@ -429,9 +429,9 @@

            Курси валют

            - - - + + + @@ -749,11 +749,11 @@

            Телеграм бот

            - +
            - +
            diff --git a/www/templates/pages/poslist.html b/www/templates/pages/poslist.html index 4708a2d6f..55c42b8a0 100644 --- a/www/templates/pages/poslist.html +++ b/www/templates/pages/poslist.html @@ -65,7 +65,7 @@

            Довідник кас (POS терміналів)

            - +
            @@ -200,7 +200,7 @@
            Завантаження ключа та сертифiкату
            - + Пароль не буде записаний в системi
            diff --git a/www/templates/pages/reference/categorylist.html b/www/templates/pages/reference/categorylist.html index 2de5013ec..118385e6c 100644 --- a/www/templates/pages/reference/categorylist.html +++ b/www/templates/pages/reference/categorylist.html @@ -83,7 +83,7 @@

            Категорії товарів
            - +
            @@ -93,7 +93,7 @@

            Категорії товарів
            Категорiя не повинна мати ТМЦ
            @@ -161,7 +161,7 @@

            - + Наприклад 5, -2, 3%, -0.5%. diff --git a/www/templates/pages/reference/contractlist.html b/www/templates/pages/reference/contractlist.html index 8e733c0f8..9218511fd 100644 --- a/www/templates/pages/reference/contractlist.html +++ b/www/templates/pages/reference/contractlist.html @@ -1,7 +1,8 @@ + Договори - Договори +
            @@ -87,18 +88,18 @@

            Договори

            - +
            - +
            - +
            - +
            diff --git a/www/templates/pages/reference/customerlist.html b/www/templates/pages/reference/customerlist.html index 1b1ce9e29..bc29b38c4 100644 --- a/www/templates/pages/reference/customerlist.html +++ b/www/templates/pages/reference/customerlist.html @@ -148,7 +148,7 @@

              Редагувати

            - + {{#leadmode}} Можна використати контакт як тимчасове ім'я {{/leadmode}} @@ -360,7 +360,7 @@
            Розклад подій
            - +
            @@ -399,7 +399,7 @@
            Коментарі
            -
            @@ -417,7 +417,7 @@
            Прикріплені файли
            - +
            diff --git a/www/templates/pages/reference/employeelist.html b/www/templates/pages/reference/employeelist.html index ba9dff1dc..4837a352d 100644 --- a/www/templates/pages/reference/employeelist.html +++ b/www/templates/pages/reference/employeelist.html @@ -66,7 +66,7 @@

            Довідник співробітників

            - +
            @@ -233,7 +233,7 @@
            Коментарі
            -
            diff --git a/www/templates/pages/reference/eqlist.html b/www/templates/pages/reference/eqlist.html index 386d3819e..f93206cde 100644 --- a/www/templates/pages/reference/eqlist.html +++ b/www/templates/pages/reference/eqlist.html @@ -72,7 +72,7 @@

            Редагування

            - +
            diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html index ad96ada2d..36091954a 100644 --- a/www/templates/pages/reference/itemlist.html +++ b/www/templates/pages/reference/itemlist.html @@ -375,7 +375,7 @@

            Редагування

            {{#manlist}} - + {{/manlist}} @@ -552,7 +552,7 @@

            - @@ -578,7 +578,7 @@

            - diff --git a/www/templates/pages/reference/prodarealist.html b/www/templates/pages/reference/prodarealist.html index a32f7975f..ea3de5bf5 100644 --- a/www/templates/pages/reference/prodarealist.html +++ b/www/templates/pages/reference/prodarealist.html @@ -27,7 +27,7 @@

            Виробничі дільниці

            - +
            diff --git a/www/templates/pages/reference/salarytypelist.html b/www/templates/pages/reference/salarytypelist.html index a146286d3..48b5e7637 100644 --- a/www/templates/pages/reference/salarytypelist.html +++ b/www/templates/pages/reference/salarytypelist.html @@ -50,16 +50,16 @@

            Довідник нарахувань та утримань

            - +
            - + До 10 символів. Використовується для заголовків таблиць у документах та звітах
            - + Тризначний код для використання у формулах. Колонки в документах та звітах будуть розміщені у порядку, заданому кодом.
            diff --git a/www/templates/pages/reference/servicelist.html b/www/templates/pages/reference/servicelist.html index e583d71fd..6fcf69e8e 100644 --- a/www/templates/pages/reference/servicelist.html +++ b/www/templates/pages/reference/servicelist.html @@ -74,7 +74,7 @@

            Послуги, роботи

            - +
            @@ -128,7 +128,7 @@

            - diff --git a/www/templates/pages/reference/storelist.html b/www/templates/pages/reference/storelist.html index c9af2875e..4713211cd 100644 --- a/www/templates/pages/reference/storelist.html +++ b/www/templates/pages/reference/storelist.html @@ -44,7 +44,7 @@

            Довідник складів

            - +
            {{#usebranch}}
            diff --git a/www/templates/pages/register/doclist.html b/www/templates/pages/register/doclist.html index 08b822901..79c29d879 100644 --- a/www/templates/pages/register/doclist.html +++ b/www/templates/pages/register/doclist.html @@ -122,7 +122,7 @@

            Журнал документів

            Експорт в Excel

            КодНазваКурс
            - + @@ -145,7 +145,7 @@

            Журнал документів

            - +
            Тип документа
            diff --git a/www/templates/pages/register/gilist.html b/www/templates/pages/register/gilist.html index 9755de76c..43d698479 100644 --- a/www/templates/pages/register/gilist.html +++ b/www/templates/pages/register/gilist.html @@ -342,9 +342,9 @@

            Створення експрес-накладної НП

            - - - + + +
            diff --git a/www/templates/pages/register/itemlist.html b/www/templates/pages/register/itemlist.html index 5ba5b3237..261ad683d 100644 --- a/www/templates/pages/register/itemlist.html +++ b/www/templates/pages/register/itemlist.html @@ -250,7 +250,7 @@
            Партiї облiку
            - +
            diff --git a/www/templates/pages/register/paylist.html b/www/templates/pages/register/paylist.html index 8deef0266..737da090e 100644 --- a/www/templates/pages/register/paylist.html +++ b/www/templates/pages/register/paylist.html @@ -127,7 +127,7 @@

            Журнал платежів

            - +
            diff --git a/www/templates/pages/register/paytable.html b/www/templates/pages/register/paytable.html index 77ad48c43..f3f9c2541 100644 --- a/www/templates/pages/register/paytable.html +++ b/www/templates/pages/register/paytable.html @@ -65,16 +65,16 @@

            Платіжний календар

            - +
            - +
            - +
            @@ -95,11 +95,11 @@

            Платіжний календар

            - +
            - +
            diff --git a/www/templates/pages/register/prodproclist.html b/www/templates/pages/register/prodproclist.html index 89e97d20e..c0121416a 100644 --- a/www/templates/pages/register/prodproclist.html +++ b/www/templates/pages/register/prodproclist.html @@ -139,7 +139,7 @@

            Редагування процесу

            - +
            @@ -243,7 +243,7 @@

            Редагування етапу

            - +
            @@ -254,11 +254,11 @@

            Редагування етапу

            - +
            - +
            @@ -283,7 +283,7 @@

            Редагування етапу

            -

            +

            diff --git a/www/templates/pages/register/serlist.html b/www/templates/pages/register/serlist.html index 964d3b876..3cdd7de5d 100644 --- a/www/templates/pages/register/serlist.html +++ b/www/templates/pages/register/serlist.html @@ -133,9 +133,9 @@

            Журнал послуг

             Коментар  Кiл. - +  Цiна - +   @@ -162,9 +162,9 @@

            Журнал послуг

            {{/usesnumberitem}}  Кiл. - +  Цiна - + diff --git a/www/templates/pages/register/tasklist.html b/www/templates/pages/register/tasklist.html index df0b5780d..765df1785 100644 --- a/www/templates/pages/register/tasklist.html +++ b/www/templates/pages/register/tasklist.html @@ -2,8 +2,7 @@ Журнал нарядів - - + @@ -156,7 +155,7 @@

            Журнал нарядів

            -
            +
            diff --git a/www/templates/pages/roles.html b/www/templates/pages/roles.html index 659f33a82..4dba16e87 100644 --- a/www/templates/pages/roles.html +++ b/www/templates/pages/roles.html @@ -34,7 +34,7 @@

            Редагування ролі

            - +
            diff --git a/www/templates/pages/service/armfood.html b/www/templates/pages/service/armfood.html index 8783cd6ee..c66ce4073 100644 --- a/www/templates/pages/service/armfood.html +++ b/www/templates/pages/service/armfood.html @@ -614,7 +614,7 @@

             Новий покупець

            - +
            diff --git a/www/templates/pages/service/armpos.html b/www/templates/pages/service/armpos.html index 42740497d..abde5ddb8 100644 --- a/www/templates/pages/service/armpos.html +++ b/www/templates/pages/service/armpos.html @@ -407,14 +407,14 @@

            Оформлення чеку

            - +
            - +
            @@ -508,7 +508,7 @@

            Введення товару

            - +
            {{#showscalebtn}}
            @@ -520,7 +520,7 @@

            Введення товару

            - +
            @@ -555,14 +555,14 @@

            Введення послуги

            -
            -
            @@ -680,7 +680,7 @@

             Новий контрагент

            - +
            diff --git a/www/templates/pages/systemlog.html b/www/templates/pages/systemlog.html index ac79ea89e..21c21896e 100644 --- a/www/templates/pages/systemlog.html +++ b/www/templates/pages/systemlog.html @@ -56,11 +56,11 @@
            Файловий лог
            - - 
                
+                    
+                 
                
               
                 
            
-                            
+
            diff --git a/www/templates/pages/timesheet.html b/www/templates/pages/timesheet.html index 416262902..274bc633a 100644 --- a/www/templates/pages/timesheet.html +++ b/www/templates/pages/timesheet.html @@ -2,8 +2,7 @@ Табель облiку робочого часу - - + @@ -119,14 +118,14 @@

            Новий запис

            - +
            -
            +
            -
            +
            @@ -137,7 +136,7 @@

            Новий запис

            - +
            diff --git a/www/templates/pages/userlogin.html b/www/templates/pages/userlogin.html index d540a304f..a41a43c86 100644 --- a/www/templates/pages/userlogin.html +++ b/www/templates/pages/userlogin.html @@ -51,17 +51,17 @@

            {{appname}}

            - +
            - +
            {{#capcha}}
            -
            diff --git a/www/templates/pages/userprofile.html b/www/templates/pages/userprofile.html index 7dd3bbb5a..c90b48259 100644 --- a/www/templates/pages/userprofile.html +++ b/www/templates/pages/userprofile.html @@ -19,28 +19,28 @@

            Мій профіль

            @@ -55,7 +55,7 @@

            Мій профіль

            @@ -181,7 +181,7 @@

            Принтер етикеток

            - Опис тут + Опис тут
            @@ -243,13 +243,13 @@

            Зміна пароля

            - + Перед введенням перевірте розкладку та регістр клавіатури
            - +
            diff --git a/www/templates/pages/users.html b/www/templates/pages/users.html index 456f732c1..85eb4c3bc 100644 --- a/www/templates/pages/users.html +++ b/www/templates/pages/users.html @@ -68,7 +68,7 @@

            Редагування користувача

            + required > Допускаються латинські букви, цифри і підкреслення
            @@ -79,7 +79,7 @@

            Редагування користувача

            diff --git a/www/templates/printforms/doc/goodsissue.tpl b/www/templates/printforms/doc/goodsissue.tpl index 79782a90a..90aae0469 100644 --- a/www/templates/printforms/doc/goodsissue.tpl +++ b/www/templates/printforms/doc/goodsissue.tpl @@ -190,7 +190,7 @@ {{#isstamp}} - + {{/isstamp}} {{^isstamp}} diff --git a/www/templates/printforms/doc/invoice.tpl b/www/templates/printforms/doc/invoice.tpl index 1bd0bb811..9035afa2e 100644 --- a/www/templates/printforms/doc/invoice.tpl +++ b/www/templates/printforms/doc/invoice.tpl @@ -4,7 +4,7 @@ - + @@ -161,14 +161,14 @@ {{/payamount}} {{#isstamp}} - + {{/isstamp}} {{#issign}} - + {{/issign}} diff --git a/www/templates/printforms/doc/serviceact.tpl b/www/templates/printforms/doc/serviceact.tpl index 305e535e7..ef8066745 100644 --- a/www/templates/printforms/doc/serviceact.tpl +++ b/www/templates/printforms/doc/serviceact.tpl @@ -128,7 +128,7 @@ {{#isstamp}} - + {{/isstamp}} {{^isstamp}} diff --git a/www/templates/printforms/report/compareact.tpl b/www/templates/printforms/report/compareact.tpl index 847443699..7a32b848a 100644 --- a/www/templates/printforms/report/compareact.tpl +++ b/www/templates/printforms/report/compareact.tpl @@ -1,4 +1,4 @@ - +
            diff --git a/www/templates/printforms/report/custorder.tpl b/www/templates/printforms/report/custorder.tpl index 5efd55816..283a324d0 100644 --- a/www/templates/printforms/report/custorder.tpl +++ b/www/templates/printforms/report/custorder.tpl @@ -1,4 +1,4 @@ -
            +
            diff --git a/www/templates/printforms/report/emptask.tpl b/www/templates/printforms/report/emptask.tpl index 5afe6e0a0..b3dcef0a1 100644 --- a/www/templates/printforms/report/emptask.tpl +++ b/www/templates/printforms/report/emptask.tpl @@ -1,4 +1,4 @@ - +
            diff --git a/www/templates/printforms/report/income.tpl b/www/templates/printforms/report/income.tpl index 3cbf1e32d..c041f120f 100644 --- a/www/templates/printforms/report/income.tpl +++ b/www/templates/printforms/report/income.tpl @@ -1,4 +1,4 @@ - +
            diff --git a/www/templates/printforms/report/itemactivity.tpl b/www/templates/printforms/report/itemactivity.tpl index b86e18e43..0e6cf7411 100644 --- a/www/templates/printforms/report/itemactivity.tpl +++ b/www/templates/printforms/report/itemactivity.tpl @@ -1,4 +1,4 @@ -
            +
            diff --git a/www/templates/printforms/report/itemorder.tpl b/www/templates/printforms/report/itemorder.tpl index fee4e9b03..cb03eac8a 100644 --- a/www/templates/printforms/report/itemorder.tpl +++ b/www/templates/printforms/report/itemorder.tpl @@ -1,4 +1,4 @@ - +
            diff --git a/www/templates/printforms/report/noliq.tpl b/www/templates/printforms/report/noliq.tpl index db4a37c42..d76ecc804 100644 --- a/www/templates/printforms/report/noliq.tpl +++ b/www/templates/printforms/report/noliq.tpl @@ -1,4 +1,4 @@ - +
            - + @@ -93,6 +93,7 @@ {{#is3}} + diff --git a/www/templates/printforms/report/reserved.tpl b/www/templates/printforms/report/reserved.tpl index cfa7e312b..8a45a1897 100644 --- a/www/templates/printforms/report/reserved.tpl +++ b/www/templates/printforms/report/reserved.tpl @@ -1,4 +1,4 @@ -
            diff --git a/www/templates/printforms/report/paybalance.tpl b/www/templates/printforms/report/paybalance.tpl index 97a2d0f78..d18a43fc9 100644 --- a/www/templates/printforms/report/paybalance.tpl +++ b/www/templates/printforms/report/paybalance.tpl @@ -12,7 +12,7 @@ Перiод з {{datefrom}} по {{dateto}}
            Прибутки

            Деталiзацiя по ТМЦ
            +
            diff --git a/www/templates/widgets/itemsel.html b/www/templates/widgets/itemsel.html index ac40b48c2..723eb5b9f 100644 --- a/www/templates/widgets/itemsel.html +++ b/www/templates/widgets/itemsel.html @@ -16,7 +16,7 @@ {{#manlist}} - + {{/manlist}} From 8fb55bd7d6ec0f06c1339ffb5d75a1404c6be299 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Tue, 10 Dec 2024 12:27:25 +0200 Subject: [PATCH 03/10] =?UTF-8?q?fix=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80?= =?UTF-8?q?=D1=82=20=20=D0=B2=D1=8B=D0=BF=D0=B8=D1=81=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/pages/register/paylist.php | 38 +++++++++++++++-------- www/templates/pages/options.html | 26 ++++++++-------- www/templates/pages/poslist.html | 2 +- www/templates/pages/register/paylist.html | 1 + www/templates/pages/userprofile.html | 8 ++--- 5 files changed, 44 insertions(+), 31 deletions(-) diff --git a/www/app/pages/register/paylist.php b/www/app/pages/register/paylist.php index 6f1f5c8ee..8ff4c48e1 100644 --- a/www/app/pages/register/paylist.php +++ b/www/app/pages/register/paylist.php @@ -361,7 +361,9 @@ public function onPreview($sender) { $d['customer_name'] = $c->customer_name; $d['customer_id'] = $c->customer_id; } - $this->_importlist[] = $d; + if($d['sum'] != 0) { + $this->_importlist[] = $d; + } } @@ -382,23 +384,33 @@ public function biLoadOnClick($sender) { foreach($this->_importlist as $d){ if($d['date']==0) continue; if($d['sum']==0) continue; - if($d['sum']<0) continue; if(strlen($d['customer_name'])==0) continue; + if($d['sum']>0) { - $doc = Document::create('IncomeMoney'); - $doc->document_number= $doc->nextNumber(); - $doc->document_date = $d['date']; - $doc->customer_id = $d['customer_id']; - $doc->payed = 0; - $doc->amount = H::fa( $d['sum']); - $doc->payamount =H::fa( $d['sum']); + $doc = Document::create('IncomeMoney'); + $doc->payed = 0; + $doc->amount = H::fa( $d['sum']); + $doc->payamount =H::fa( $d['sum']); + $doc->headerdata['type'] = 1 ; + $doc->headerdata['detail'] = 1 ; + } + + if($d['sum']<0) { + + $doc = Document::create('OutcomeMoney'); + $doc->payed = 0; + $doc->amount = H::fa(0- $d['sum']); + $doc->payamount =H::fa(0- $d['sum']); + $doc->headerdata['type'] = 50 ; + $doc->headerdata['detail'] = 2 ; + } + $doc->notes = $d['tran'].' '.$d['notes'] ; $doc->headerdata['payment'] = $this->importform->bipayment->getValue() ; $doc->headerdata['paymentname'] = $this->importform->bipayment->getValueName() ; - $doc->headerdata['type'] = 1 ; - $doc->headerdata['detail'] = 1 ; - - + $doc->document_number= $doc->nextNumber(); + $doc->document_date = $d['date']; + $doc->customer_id = $d['customer_id']; $doc->save(); $doc->updateStatus(Document::STATE_NEW); $doc->updateStatus(Document::STATE_EXECUTED); diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html index 4b3873960..df18eda6c 100644 --- a/www/templates/pages/options.html +++ b/www/templates/pages/options.html @@ -152,44 +152,44 @@

            Підключення модулів

            - +
            - +
            - +
            - +
            - +
            - +
            - +
            - +
            @@ -198,7 +198,7 @@

            Підключення модулів

            - +
            @@ -210,9 +210,9 @@

            Підключення модулів

            - Вбудований ПРРО -
            CheckBox -
            ВчасноКаса + Вбудований ПРРО +
            CheckBox +
            ВчасноКаса             @@ -460,7 +460,7 @@

            Параметри для етикеток і цінників

            Перелік тегів шаблону Файл шаблону этикеток /templates/printforms/item_tag.tpl. (item_tag_ps.tpl для принт сервера) -
            Детально про роботу з принтерами тут             +
            Детально про роботу з принтерами тут
            diff --git a/www/templates/pages/poslist.html b/www/templates/pages/poslist.html index 55c42b8a0..2f52736b9 100644 --- a/www/templates/pages/poslist.html +++ b/www/templates/pages/poslist.html @@ -185,7 +185,7 @@

            Довідник кас (POS терміналів)

            Завантаження ключа та сертифiкату
            - Опис роботи з ключами тут + Опис роботи з ключами тут
            - Опис тут + Опис тут
            @@ -181,7 +181,7 @@

            Принтер етикеток

            - Опис тут + Опис тут @@ -220,7 +220,7 @@

            Принтер етикеток

            Електронні ваги

            - Мають бути реалізовані в POS сервері. Опис тут + Мають бути реалізовані в POS сервері. Опис тут
            From d5fea76a6c2ecf82a42867be1c7316631b649819 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Wed, 11 Dec 2024 12:39:29 +0200 Subject: [PATCH 04/10] fix --- www/app/pages/register/grlist.php | 11 ++++------- www/app/pages/register/stocklist.php | 22 +++++++++++++++++++-- www/templates/pages/register/stocklist.html | 7 ++++++- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/www/app/pages/register/grlist.php b/www/app/pages/register/grlist.php index 015dd2ba4..fb5a7f6be 100644 --- a/www/app/pages/register/grlist.php +++ b/www/app/pages/register/grlist.php @@ -41,7 +41,7 @@ public function __construct() { $this->filter->add(new TextInput('searchnumber')); $this->filter->add(new TextInput('searchtext')); - $this->filter->add(new DropDownChoice('status', array(0 => 'Відкриті', 1 => 'Не проведені', 2 => 'Не сплачені', 3 => 'Всі'), 0)); + $this->filter->add(new DropDownChoice('status', array(0 => 'Відкриті', 1 => 'Не сплачені', 2 => 'Всі'), 0)); $this->filter->add(new DropDownChoice('searchcomp', Firm::findArray('firm_name', 'disabled<>1', 'firm_name'), 0)); $this->filter->add(new DropDownChoice('fstore', \App\Entity\Store::getList(), 0)); $this->filter->add(new AutocompleteTextInput('searchcust'))->onText($this, 'OnAutoCustomer'); @@ -243,16 +243,13 @@ private function getWhere() { $status = $this->page->filter->status->getValue(); if ($status == 0) { - $where .= " and ( (payamount > 0 and payamount > payed) or (state <>" . Document::STATE_EXECUTED . ")) "; + $where .= " and state >3 and state not in(14,5,9 ) "; } - + if ($status == 1) { - $where .= " and state <>" . Document::STATE_EXECUTED; + $where .= " and state=". Document::STATE_WP; } if ($status == 2) { - $where .= " and (payamount > 0 and payamount > payed)"; - } - if ($status == 3) { } diff --git a/www/app/pages/register/stocklist.php b/www/app/pages/register/stocklist.php index 0c1873317..93c6a519c 100644 --- a/www/app/pages/register/stocklist.php +++ b/www/app/pages/register/stocklist.php @@ -12,6 +12,7 @@ use Zippy\Html\Form\AutocompleteTextInput; use Zippy\Html\Form\Date; use Zippy\Html\Form\DropDownChoice; +use Zippy\Html\Form\TextInput; use Zippy\Html\Form\Form; use Zippy\Html\Label; use Zippy\Html\Link\ClickLink; @@ -39,7 +40,9 @@ public function __construct() { $this->filter->add(new Date('to', time() + (1 * 24 * 3600))); $this->filter->add(new DropDownChoice('fstore', Store::getList(), H::getDefStore())); $this->filter->add(new AutocompleteTextInput('fitem'))->onText($this, 'OnAutoItem'); - + $this->filter->fitem->onChange($this, "onItem"); + $this->filter->add(new TextInput('fsnumber'))->setVisible(false); + $doclist = $this->add(new DataView('doclist', new StockListDataSource($this), $this, 'doclistOnRow')); $this->add(new Paginator('pag', $doclist)); @@ -83,7 +86,19 @@ public function OnAutoItem($sender) { } return $r; } + public function onItem($sender) { + $this->filter->fsnumber->setVisible(false); + + $item = Item::load($sender->getKey()); + if ($item != null) { + if ($item->useserial == 1) { + $this->filter->fsnumber->setVisible(true); + + } + + } + } //просмотр public function showOnClick($sender) { @@ -117,9 +132,12 @@ private function getWhere() { $store_id = $this->page->filter->fstore->getValue(); $item_id = $this->page->filter->fitem->getKey(); + $snumber = $this->page->filter->fsnumber->getText(); $where = " s.item_id = {$item_id} and date(d.document_date) >= " . $conn->DBDate($this->page->filter->from->getDate()) . " and date(d.document_date) <= " . $conn->DBDate($this->page->filter->to->getDate()); - + if (strlen($snumber) > 0) { + $where .= " and s.snumber=" . $conn->qstr($snumber); + } if ($store_id > 0) { $where .= " and s.store_id=" . $store_id; } diff --git a/www/templates/pages/register/stocklist.html b/www/templates/pages/register/stocklist.html index fcfeb83de..366b277e7 100644 --- a/www/templates/pages/register/stocklist.html +++ b/www/templates/pages/register/stocklist.html @@ -25,7 +25,12 @@

            Журнал руху ТМЦ

            - + {{#usesnumber}} + + + + {{/usesnumber}} + From c78a9b5312fc6630ffbf1d08e73f9bfa2030a933 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Wed, 11 Dec 2024 19:10:49 +0200 Subject: [PATCH 05/10] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BD=20=20?= =?UTF-8?q?=D1=84=D0=BB=D0=B0=D0=B3=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BE?= =?UTF-8?q?=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/entity/doc/ttn.php | 20 +------------------- www/app/entity/subscribe.php | 2 +- www/app/pages/doc/goodsissue.php | 14 ++------------ www/app/pages/doc/ttn.php | 15 ++------------- www/app/pages/options.php | 10 ++-------- www/app/pages/register/orderlist.php | 10 ++-------- www/templates/pages/options.html | 11 +---------- 7 files changed, 11 insertions(+), 71 deletions(-) diff --git a/www/app/entity/doc/ttn.php b/www/app/entity/doc/ttn.php index 65a3779c7..13e04481a 100644 --- a/www/app/entity/doc/ttn.php +++ b/www/app/entity/doc/ttn.php @@ -275,25 +275,7 @@ public function onState($state, $oldstate) { } } - $common = \App\System::getOptions("common"); - - if ($this->parent_id > 0) { - $order = Document::load($this->parent_id); - - $list = $order->getChildren('TTN'); - - if (count($list) == 1 && $common['numberttn'] <> 1) { //только эта ТТН - if ($state == Document::STATE_DELIVERED && ($order->state == Document::STATE_INSHIPMENT || $order->state == Document::STATE_READYTOSHIP || $order->state == Document::STATE_INPROCESS)) { - $order->updateStatus(Document::STATE_DELIVERED); - } - if ($state == Document::STATE_INSHIPMENT && ($order->state == Document::STATE_INPROCESS || $order->state == Document::STATE_READYTOSHIP)) { - $order->updateStatus(Document::STATE_INSHIPMENT); - } - if ($state == Document::STATE_READYTOSHIP && $order->state == Document::STATE_INPROCESS) { - $order->updateStatus(Document::STATE_READYTOSHIP); - } - } - } + } public function getRelationBased() { diff --git a/www/app/entity/subscribe.php b/www/app/entity/subscribe.php index dc18ca43f..2a2c686e5 100644 --- a/www/app/entity/subscribe.php +++ b/www/app/entity/subscribe.php @@ -296,7 +296,7 @@ private function sendmsg($text, $options=[]){ $ret = self::sendSMS($options['phone'], $text); } if (strlen($options['email']) > 0 && $this->msg_type == self::MSG_EMAIL) { - + // отправляем в очередь если включен планировщик if(System::useCron()) { $task = new \App\Entity\CronTask(); $task->tasktype=\App\Entity\CronTask::TYPE_SUBSEMAIL; diff --git a/www/app/pages/doc/goodsissue.php b/www/app/pages/doc/goodsissue.php index 8d938977c..150b8f3a8 100644 --- a/www/app/pages/doc/goodsissue.php +++ b/www/app/pages/doc/goodsissue.php @@ -193,20 +193,10 @@ public function __construct($docid = 0, $basedocid = 0) { //проверяем что уже есть отправка $list = $order->getChildren('TTN'); - if (count($list) > 0 && $common['numberttn'] <> 1) { - - $this->setError('У замовлення вже є відправки'); - App::Redirect("\\App\\Pages\\Register\\GIList"); - return; - } + $list = $order->getChildren('GoodsIssue'); - if (count($list) > 0 && $common['numberttn'] <> 1) { - - $this->setError('У замовлення вже є відправки'); - App::Redirect("\\App\\Pages\\Register\\GIList"); - return; - } + $this->docform->total->setText(H::fa($order->amount)); diff --git a/www/app/pages/doc/ttn.php b/www/app/pages/doc/ttn.php index 775bac194..9c100a65b 100644 --- a/www/app/pages/doc/ttn.php +++ b/www/app/pages/doc/ttn.php @@ -193,20 +193,9 @@ public function __construct($docid = 0, $basedocid = 0) { //проверяем что уже есть отправка $list = $order->getChildren('TTN'); - if (count($list) > 0 && $common['numberttn'] <> 1) { - - $this->setError('У замовлення вже є відправки'); - App::Redirect("\\App\\Pages\\Register\\GIList"); - return; - } + $list = $order->getChildren('GoodsIssue'); - - if (count($list) > 0 && $common['numberttn'] <> 1) { - - $this->setError('У замовлення вже є відправки'); - App::Redirect("\\App\\Pages\\Register\\GIList"); - return; - } + $this->docform->total->setText($order->amount); diff --git a/www/app/pages/options.php b/www/app/pages/options.php index 1a7274b3e..20eec489e 100644 --- a/www/app/pages/options.php +++ b/www/app/pages/options.php @@ -120,11 +120,7 @@ public function __construct() { $this->business->add(new CheckBox('useval')); $this->business->add(new CheckBox('printoutqrcode')); - - - $this->business->add(new CheckBox('numberttn')); - - + $this->business->add(new CheckBox('spreaddelivery')); $this->business->add(new CheckBox('baydelivery')); @@ -150,7 +146,7 @@ public function __construct() { $this->business->usesnumber->setValue($common['usesnumber']??0); - $this->business->numberttn->setChecked($common['numberttn']); + $this->business->spreaddelivery->setChecked($common['spreaddelivery']); $this->business->baydelivery->setChecked($common['baydelivery']); @@ -411,8 +407,6 @@ public function saveBusinessOnClick($sender) { $common['spreaddelivery'] = $this->business->spreaddelivery->isChecked() ? 1 : 0; $common['baydelivery'] = $this->business->baydelivery->isChecked() ? 1 : 0; - $common['numberttn'] = $this->business->numberttn->isChecked() ? 1 : 0; - System::setOptions("common", $common); diff --git a/www/app/pages/register/orderlist.php b/www/app/pages/register/orderlist.php index f942ce41f..a6a3d255d 100644 --- a/www/app/pages/register/orderlist.php +++ b/www/app/pages/register/orderlist.php @@ -521,19 +521,13 @@ public function updateStatusButtons() { $this->statuspan->resform->setVisible(false); } - if (count($list) > 0 && $common['numberttn'] <> 1) { - $this->statuspan->statusform->bttn->setVisible(false); - } + $list = $this->_doc->getChildren('GoodsIssue'); if(count($list)>0) { $this->statuspan->resform->setVisible(false); } - - if (count($list) > 0 && $common['numberttn'] <> 1) { - $this->statuspan->statusform->bgi->setVisible(false); - } - + if ($this->_doc->hasPayments()) { $this->statuspan->statusform->bpos->setVisible(false); diff --git a/www/templates/pages/options.html b/www/templates/pages/options.html index df18eda6c..1a726c5bf 100644 --- a/www/templates/pages/options.html +++ b/www/templates/pages/options.html @@ -366,16 +366,7 @@

            Налаштування бізнес-процесів

            {{/fiscal}} - - - - -
            - - - -
            +
            From 8a6bc53cfbf6047852edf6e78fb605ae238ef0a7 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Fri, 13 Dec 2024 06:27:32 +0200 Subject: [PATCH 06/10] =?UTF-8?q?=D0=BF=D0=BE=D1=8D=D1=82=D0=B0=D0=BF?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- www/app/entity/doc/order.php | 32 ++++++++- www/app/entity/doc/ordercust.php | 31 ++++++++ www/app/pages/doc/goodsissue.php | 10 +-- www/app/pages/doc/goodsreceipt.php | 43 +++++++---- www/app/pages/doc/ttn.php | 9 +-- www/app/pages/register/paylist.php | 14 +++- www/app/system.php | 12 +++- www/app/widgets/docview.php | 17 +++-- www/templates/pages/doc/outsalary.html | 8 ++- www/templates/pages/notifylist.html | 2 +- www/templates/pages/reference/itemlist.html | 4 +- www/templates/pages/register/paylist.html | 80 +++++++++++++++------ www/templates/widgets/docview.html | 5 +- 13 files changed, 199 insertions(+), 68 deletions(-) diff --git a/www/app/entity/doc/order.php b/www/app/entity/doc/order.php index b94a5149b..11c09e944 100644 --- a/www/app/entity/doc/order.php +++ b/www/app/entity/doc/order.php @@ -239,7 +239,6 @@ public function reserve() { } } - } //отмена резерва public function unreserve() { @@ -301,5 +300,34 @@ public function DoBalans() { } } - + /** + * список неотправленных позиций + * + */ + public function getNotSendedItem() { + $notsendqty=[]; + $sendqty=[]; + $notsend=0; + $docs= Document::find("state >=5 and meta_name in ('GoodsIssue','TTN') and parent_id=". $this->document_id); + foreach($docs as $d) { + foreach($d->unpackDetails('detaildata') as $item){ + if(!isset($sendqty[$item->item_id]) ) $sendqty[$item->item_id]=0; + + $sendqty[$item->item_id] += $item->quantity; + } + } + foreach($this->unpackDetails('detaildata') as $item){ + if(($sendqty[$item->item_id] ?? 0) ==0) { + $notsend=$item->quantity; + } else { + $notsend=$item->quantity - $sendqty[$item->item_id]; + } + if($notsend > 0) { + $notsendqty[$item->item_id] = $notsend; + } + + } + + return $notsendqty; + } } diff --git a/www/app/entity/doc/ordercust.php b/www/app/entity/doc/ordercust.php index 537b78518..a54534f81 100644 --- a/www/app/entity/doc/ordercust.php +++ b/www/app/entity/doc/ordercust.php @@ -59,4 +59,35 @@ public function getRelationBased() { return $list; } + + /** + * список неоприходованых позиций + * + */ + public function getNotReceivedItems() :array{ + $notrecqty=[]; + $recqty=[]; + $notrec=0; + $docs= Document::find("state >=5 and meta_name in ('GoodsReceipt') and parent_id=". $this->document_id); + foreach($docs as $d) { + foreach($d->unpackDetails('detaildata') as $item){ + if(!isset($recqty[$item->item_id]) ) $recqty[$item->item_id]=0; + + $recqty[$item->item_id] += $item->quantity; + } + } + foreach($this->unpackDetails('detaildata') as $item){ + if(($recqty[$item->item_id] ?? 0) ==0) { + $notrec=$item->quantity; + } else { + $notrec=$item->quantity - $recqty[$item->item_id]; + } + if($notrec > 0) { + $notrecqty[$item->item_id]= $notrec; + } + + } + + return $notrecqty; + } } diff --git a/www/app/pages/doc/goodsissue.php b/www/app/pages/doc/goodsissue.php index 150b8f3a8..079b6cecb 100644 --- a/www/app/pages/doc/goodsissue.php +++ b/www/app/pages/doc/goodsissue.php @@ -190,13 +190,9 @@ public function __construct($docid = 0, $basedocid = 0) { $notfound = array(); $order = $basedoc->cast(); - //проверяем что уже есть отправка - $list = $order->getChildren('TTN'); - - - $list = $order->getChildren('GoodsIssue'); - - + if($order->getNotSendedItem() > 0){ + $this->setWarn('Позиції по цьому замовленню вже відправлені') ; + } $this->docform->total->setText(H::fa($order->amount)); diff --git a/www/app/pages/doc/goodsreceipt.php b/www/app/pages/doc/goodsreceipt.php index 216186827..57c87f6d1 100644 --- a/www/app/pages/doc/goodsreceipt.php +++ b/www/app/pages/doc/goodsreceipt.php @@ -215,10 +215,24 @@ public function __construct($docid = 0, $basedocid = 0) { $this->docform->customer->setText($basedoc->customer_name); $this->docform->val->setValue(0); $this->docform->rate->setText(1); + $this->docform->basedoc->setText($basedoc->document_number); $order = $basedoc->cast(); - $this->docform->basedoc->setText($order->document_number); - $this->_itemlist = $basedoc->unpackDetails('detaildata'); + $nr=$order->getNotReceivedItems(); + if(count($nr)==0) { + $this->setWarn('Всі позиції вже доставлені') ; + } + $this->_itemlist = []; + + foreach($order->unpackDetails('detaildata') as $item){ + if($nr[$item->item_id] ??0 > 0 ) { + $item->quantity = $nr[$item->item_id] ; + $this->_itemlist[] = $item; + + } + + } + $this->CalcTotal(); $this->CalcPay(); } @@ -691,10 +705,7 @@ public function savedocOnClick($sender) { } $file = $this->docform->scan->getFile(); - if ($file['size'] > 10000000) { - $this->setError("Файл більше 10 МБ!"); - return; - } + if ($this->_doc->payed == 0) { $this->_doc->headerdata['payment'] = 0; @@ -733,16 +744,18 @@ public function savedocOnClick($sender) { } if ($this->_doc->parent_id > 0) { //закрываем заказ - if ($this->_doc->payamount > 0 && $this->_doc->payamount > $this->_doc->payed) { - - } else { $order = Document::load($this->_doc->parent_id); - if ($order->meta_name =="OrderCust" && $order->state == Document::STATE_INPROCESS) { - $order->updateStatus(Document::STATE_CLOSED); - - $this->setSuccess("Заявка {$order->document_number} закрита"); - } - } + + if ($order->meta_name =="OrderCust"){ + $order = $order->cast(); + $nr=$order->getNotReceivedItems(); + if(count($nr)==0){ // все доставлено + if($order->state == Document::STATE_INPROCESS || $order->state == Document::STATE_INSHIPMENT ) { + $order->updateStatus(Document::STATE_DELIVERED); + } + } + } + } //обновляем курс diff --git a/www/app/pages/doc/ttn.php b/www/app/pages/doc/ttn.php index 9c100a65b..36c2435df 100644 --- a/www/app/pages/doc/ttn.php +++ b/www/app/pages/doc/ttn.php @@ -190,15 +190,12 @@ public function __construct($docid = 0, $basedocid = 0) { $notfound = array(); $order = $basedoc->cast(); - //проверяем что уже есть отправка - $list = $order->getChildren('TTN'); - - - $list = $order->getChildren('GoodsIssue'); + if($order->getNotSendedItem() > 0){ + $this->setWarn('Позиції по цьому замовленню вже відправлені') ; + } $this->docform->total->setText($order->amount); - if($order->headerdata['store']>0) { $this->docform->store->setValue($order->headerdata['store']); diff --git a/www/app/pages/register/paylist.php b/www/app/pages/register/paylist.php index 8ff4c48e1..6535ad4a4 100644 --- a/www/app/pages/register/paylist.php +++ b/www/app/pages/register/paylist.php @@ -45,7 +45,8 @@ public function __construct() { $this->add(new Form('filter'))->onSubmit($this, 'filterOnSubmit'); $this->filter->add(new DropDownChoice('fmfund', \App\Entity\MoneyFund::getList(), 0)); $this->filter->add(new DropDownChoice('fuser', \App\Entity\User::findArray('username', 'disabled<>1', 'username'), 0)); - $this->filter->add(new Date('from', time())); + $this->filter->add(new DropDownChoice('fsort', [], 0)); + $this->filter->add(new Date('from', strtotime('-1 week'))); $this->filter->add(new Date('to', time())); $this->filter->add(new AutocompleteTextInput('fcustomer'))->onText($this, 'OnAutoCustomer'); @@ -503,9 +504,18 @@ public function getItemCount() { } public function getItems($start=-1, $count=-1, $sortfield = null, $asc = null) { + $sort = $this->page->filter->fsort->getValue(); + $order =" pl_id desc "; + if($sort==1) { + $order =" p.amount desc "; + } + if($sort==2) { + $order =" (0-p.amount) desc "; + } + $conn = \ZDB\DB::getConnect(); - $sql = "select p.*,d.customer_name,d.meta_id,d.document_date from documents_view d join paylist_view p on d.document_id = p.document_id where " . $this->getWhere() . " order by pl_id desc "; + $sql = "select p.*,d.customer_name,d.meta_id,d.document_date from documents_view d join paylist_view p on d.document_id = p.document_id where " . $this->getWhere() . " order by " . $order; if ($count > 0) { $limit =" limit {$start},{$count}"; diff --git a/www/app/system.php b/www/app/system.php index 17b6870ab..4b97de099 100644 --- a/www/app/system.php +++ b/www/app/system.php @@ -231,8 +231,8 @@ public static function checkIP() { /** - * проверка обновлений и ряа параметров настроек - * + * проверка обновлений и ряда параметров настроек + * вызывается раз в неделю */ public static function checkUpdate() { $options = System::getOptions("common"); @@ -257,6 +257,14 @@ public static function checkUpdate() { $n->save(); } + if(System::useCron() == false){ + $n = new \App\Entity\Notify(); + $n->user_id = $user->user_id; + $n->message = "Планувальник вимкнено. Деякі фонові завдання не будуть виконуватись " ; + $n->sender_id = \App\Entity\Notify::SYSTEM; + + $n->save(); + } } if($user->rolename=='admins' ){ diff --git a/www/app/widgets/docview.php b/www/app/widgets/docview.php index 4ad3f80ca..b0d1f6555 100644 --- a/www/app/widgets/docview.php +++ b/www/app/widgets/docview.php @@ -154,13 +154,14 @@ public function loaddata($arg, $post) { $ret['pdoc_id'] = 0; $ret['pdoc_name'] = 0; - $p = Document::load($doc->parent_id); - if($p instanceof Document) { - $ret['pdoc_id'] = $doc->parent_id; - $ret['pdoc_name'] = $p->meta_desc . ' ' . $p->document_number; + if($doc->parent_id >0){ + $p = Document::load($doc->parent_id); + if($p instanceof Document) { + $ret['pdoc_id'] = $doc->parent_id; + $ret['pdoc_name'] = $p->meta_desc . ' ' . $p->document_number. ' ' . $p->getStateName($p->state); + } } - $ret['reldocs'] = array(); return json_encode($ret, JSON_UNESCAPED_UNICODE); @@ -177,7 +178,11 @@ public function loadchilddocs($arg, $post) { $docs = array(); foreach($doc->getChildren() as $d) { - $docs[]=array('id'=>$d->document_id,'name'=>$d->meta_desc . ' ' . $d->document_number,'candel'=>($user->user_id == $d->user_id || $user->rolename =='admins')); + $docs[]=array('id'=>$d->document_id, + 'name'=>$d->meta_desc . ' ' . $d->document_number, + 'status'=>$d->getStateName($d->state), + 'candel'=>($user->user_id == $d->user_id || $user->rolename =='admins') + ); } diff --git a/www/templates/pages/doc/outsalary.html b/www/templates/pages/doc/outsalary.html index 561689738..16ce929eb 100644 --- a/www/templates/pages/doc/outsalary.html +++ b/www/templates/pages/doc/outsalary.html @@ -84,15 +84,17 @@

            Виплата зарплати

            nameНазва ТМЦ
            priceЦіна
            - + - diff --git a/www/templates/pages/notifylist.html b/www/templates/pages/notifylist.html index d7594563c..ca74d535a 100644 --- a/www/templates/pages/notifylist.html +++ b/www/templates/pages/notifylist.html @@ -28,7 +28,7 @@

            Повідомлення

               

            - Вiдповiсти + Відповісти diff --git a/www/templates/pages/reference/itemlist.html b/www/templates/pages/reference/itemlist.html index 36091954a..8ed896707 100644 --- a/www/templates/pages/reference/itemlist.html +++ b/www/templates/pages/reference/itemlist.html @@ -106,8 +106,8 @@

            Довідник номенклатури

            П I Б Сума
            - + + Нове
            - {{#useimages}} diff --git a/www/templates/pages/register/paylist.html b/www/templates/pages/register/paylist.html index 4d5281d47..2bae34c8e 100644 --- a/www/templates/pages/register/paylist.html +++ b/www/templates/pages/register/paylist.html @@ -11,31 +11,71 @@

            Журнал платежів

            - - - - - - - - - - - - +
            + + +
            +
            + + +
            + +
            +
            +
            +
            +
            + + +
            + - - - - - - - +
            +
            +
            +
            +
            + + +
            + +
            +
            +
            +
            +
            + + +
            + +
            +
            +
            +
            - +
            diff --git a/www/templates/widgets/docview.html b/www/templates/widgets/docview.html index ba203be0c..90d4e0e28 100644 --- a/www/templates/widgets/docview.html +++ b/www/templates/widgets/docview.html @@ -60,7 +60,7 @@
            -
            +
            +
            @@ -69,6 +69,7 @@
            {{item.name}} {{item.status}}
            @@ -76,7 +77,7 @@
            -
            +
            From da32b9fed6acafb706d5dc33b2becfeacd276197 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Sat, 14 Dec 2024 12:59:28 +0200 Subject: [PATCH 07/10] fix --- db/db.sql | 22 +++++++++++++--------- www/app/entity/category.php | 2 +- www/app/modules/wc/items.php | 4 +--- www/app/system.php | 2 +- www/index.php | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/db/db.sql b/db/db.sql index 8470e56d7..76c97d398 100644 --- a/db/db.sql +++ b/db/db.sql @@ -1576,15 +1576,19 @@ INSERT INTO saltypes (st_id, salcode, salname, salshortname, disabled) VALUES(7, INSERT INTO saltypes (st_id, salcode, salname, salshortname, disabled) VALUES(8, 300, 'ЕСВ', 'ЕСВ', 0); -INSERT INTO options (optname, optvalue) VALUES('api', 'YTozOntzOjM6ImV4cCI7czowOiIiO3M6Mzoia2V5IjtzOjQ6InRlc3QiO3M6NToiYXR5cGUiO3M6MToiMSI7fQ=='); -INSERT INTO options (optname, optvalue) VALUES('common', 'YTozOTp7czo5OiJxdHlkaWdpdHMiO3M6MToiMCI7czo4OiJhbWRpZ2l0cyI7czoxOiIwIjtzOjEwOiJkYXRlZm9ybWF0IjtzOjU6ImQubS5ZIjtzOjExOiJwYXJ0aW9udHlwZSI7czoxOiIxIjtzOjY6InBob25lbCI7czoyOiIxMCI7czo2OiJwcmljZTEiO3M6MTg6ItCg0L7Qt9C00YDRltCx0L3QsCI7czo2OiJwcmljZTIiO3M6MTI6ItCe0L/RgtC+0LLQsCI7czo2OiJwcmljZTMiO3M6MDoiIjtzOjY6InByaWNlNCI7czowOiIiO3M6NjoicHJpY2U1IjtzOjA6IiI7czo4OiJkZWZwcmljZSI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MDoiIjtzOjg6InRzX2JyZWFrIjtzOjI6IjYwIjtzOjg6InRzX3N0YXJ0IjtzOjU6IjA5OjAwIjtzOjY6InRzX2VuZCI7czo1OiIxODowMCI7czoxMToiY2hlY2tzbG9nYW4iO3M6MDoiIjtzOjExOiJhdXRvYXJ0aWNsZSI7aToxO3M6MTA6InVzZXNudW1iZXIiO3M6MToiMCI7czoxMDoidXNlc2Nhbm5lciI7aTowO3M6MTY6InVzZW1vYmlsZXNjYW5uZXIiO2k6MDtzOjk6InVzZWltYWdlcyI7aTowO3M6MTQ6InByaW50b3V0cXJjb2RlIjtpOjA7czoxNDoibm9jaGVja2FydGljbGUiO2k6MDtzOjE1OiJzaG93YWN0aXZldXNlcnMiO2k6MDtzOjg6InNob3djaGF0IjtpOjA7czoxMDoidXNlY2F0dHJlZSI7aTowO3M6OToidXNlYnJhbmNoIjtpOjA7czoxMDoibm9hbGxvd2ZpeiI7aTowO3M6MTA6ImFsbG93bWludXMiO2k6MDtzOjY6InVzZXZhbCI7aTowO3M6NjoiY2FwY2hhIjtpOjA7czo5OiJudW1iZXJ0dG4iO2k6MDtzOjk6InBheXR5cGVpbiI7czoxOiIwIjtzOjEwOiJwYXl0eXBlb3V0IjtzOjE6IjAiO3M6MTI6ImFsbG93bWludXNtZiI7aTowO3M6NzoiY2FzaGllciI7czowOiIiO3M6MTA6ImFjdHVhbGRhdGUiO2k6MTcwNDA2MDAwMDtzOjE0OiJzcHJlYWRkZWxpdmVyeSI7aTowO3M6MTE6ImJheWRlbGl2ZXJ5IjtpOjA7fQ=='); -INSERT INTO options (optname, optvalue) VALUES('discount', 'YToxODp7czo4OiJmaXJzdGJheSI7czoyOiIxMSI7czo2OiJib251czEiO3M6MzoiMS4xIjtzOjY6ImxldmVsMiI7czowOiIiO3M6NjoiYm9udXMyIjtzOjM6IjEuNCI7czo2OiJzdW1tYTEiO3M6MzoiMTAwIjtzOjY6InN1bW1hMiI7czo0OiIxMDAwIjtzOjY6ImJvbnVzMyI7czoxOiIzIjtzOjY6InN1bW1hMyI7czo0OiIzMDAwIjtzOjY6ImJvbnVzNCI7czoxOiI0IjtzOjY6InN1bW1hNCI7czo0OiI0MDAwIjtzOjU6ImRpc2MxIjtzOjE6IjEiO3M6MTA6ImRpc2NzdW1tYTEiO3M6MToiMCI7czo1OiJkaXNjMiI7czoxOiIzIjtzOjEwOiJkaXNjc3VtbWEyIjtzOjE6IjAiO3M6NToiZGlzYzMiO3M6MToiNyI7czoxMDoiZGlzY3N1bW1hMyI7czoxOiIwIjtzOjU6ImRpc2M0IjtzOjA6IiI7czoxMDoiZGlzY3N1bW1hNCI7czowOiIiO30='); -INSERT INTO options (optname, optvalue) VALUES('food', 'YToxNTp7czo4OiJ3b3JrdHlwZSI7czoxOiIyIjtzOjk6InByaWNldHlwZSI7czo2OiJwcmljZTEiO3M6ODoiZGVsaXZlcnkiO2k6MTtzOjY6InRhYmxlcyI7aToxO3M6NDoicGFjayI7aToxO3M6NDoibWVudSI7aToxO3M6NDoibmFtZSI7czo2OiJkZGRkZGQiO3M6NToicGhvbmUiO3M6ODoiNTU1NTU1NTUiO3M6NjoidGltZXBuIjtzOjI6IjExIjtzOjY6InRpbWVzYSI7czowOiIiO3M6NjoidGltZXN1IjtzOjA6IiI7czoxMjoiZm9vZGJhc2VtZW51IjtzOjE6IjAiO3M6MTY6ImZvb2RiYXNlbWVudW5hbWUiO3M6MDoiIjtzOjk6ImZvb2RtZW51MiI7czoxOiIwIjtzOjEyOiJmb29kbWVudW5hbWUiO3M6MDoiIjt9'); -INSERT INTO options (optname, optvalue) VALUES('printer', 'YTo3OntzOjg6InBtYXhuYW1lIjtzOjE6IjciO3M6OToicHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czoxMToiYmFyY29kZXR5cGUiO3M6NDoiQzEyOCI7czo2OiJwcHJpY2UiO2k6MTtzOjU6InBjb2RlIjtpOjE7czo4OiJwYmFyY29kZSI7aToxO3M6NzoicHFyY29kZSI7aTowO30='); -INSERT INTO options (optname, optvalue) VALUES('salary', 'YTo1OntzOjEzOiJjb2RlYmFzZWluY29tIjtzOjM6IjEwNSI7czoxMDoiY29kZXJlc3VsdCI7czozOiI5MDAiO3M6NDoiY2FsYyI7czoyMTk6InYyMDAgPSB2MTA1DQovL9C'); -INSERT INTO options (optname, optvalue) VALUES('shop', 'YToyMDp7czo3OiJkZWZjdXN0IjtzOjE6IjEiO3M6MTE6ImRlZmN1c3RuYW1lIjtzOjI5OiLQm9C10L7QvdC40LQg0JzQsNGA0YLRi9C90Y7QuiI7czo5OiJkZWZicmFuY2giO047czo5OiJvcmRlcnR5cGUiO3M6MToiMCI7czoxMjoiZGVmcHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czo1OiJlbWFpbCI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MTc6ItCd0LDRiCDQvNCw0LPQsNC3IjtzOjEyOiJjdXJyZW5jeW5hbWUiO3M6Njoi0YDRg9CxIjtzOjg6InVzZWxvZ2luIjtpOjA7czo5OiJ1c2VmaWx0ZXIiO2k6MDtzOjEzOiJjcmVhdGVuZXdjdXN0IjtpOjA7czoxMToidXNlZmVlZGJhY2siO2k6MDtzOjExOiJ1c2VtYWlucGFnZSI7aTowO3M6NzoiYWJvdXR1cyI7czoxNjoiUEhBK1BHSnlQand2Y0Q0PSI7czo3OiJjb250YWN0IjtzOjA6IiI7czo4OiJkZWxpdmVyeSI7czowOiIiO3M6NDoibmV3cyI7czowOiIiO3M6NToicGFnZXMiO2E6Mjp7czo0OiJuZXdzIjtPOjEyOiJBcHBcRGF0YUl0ZW0iOjI6e3M6MjoiaWQiO047czo5OiIAKgBmaWVsZHMiO2E6NDp7czo0OiJsaW5rIjtzOjQ6Im5ld3MiO3M6NToidGl0bGUiO3M6MTE6Imtra3JycnJycnJyIjtzOjU6Im9yZGVyIjtzOjE6IjIiO3M6NDoidGV4dCI7czoyNDoiUEhBK1pXVmxaV1ZsWldWbFBDOXdQZz09Ijt9fXM6ODoiYWJvdXRfdXMiO086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7TjtzOjk6IgAqAGZpZWxkcyI7YTo0OntzOjQ6ImxpbmsiO3M6ODoiYWJvdXRfdXMiO3M6NToidGl0bGUiO3M6OToi0J4g0L3QsNGBIjtzOjU6Im9yZGVyIjtzOjE6IjMiO3M6NDoidGV4dCI7czozMjoiUEhBK1BHSSswSjRnMEwzUXNOR0JQQzlpUGp3dmNEND0iO319fXM6NToicGhvbmUiO3M6MDoiIjtzOjEwOiJzYWxlc291cmNlIjtzOjE6IjAiO30='); -INSERT INTO options (optname, optvalue) VALUES('val', 'YToyOntzOjc6InZhbGxpc3QiO2E6MTp7aToxNjQyNjc1OTU1O086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7aToxNjQyNjc1OTU1O3M6OToiACoAZmllbGRzIjthOjM6e3M6NDoiY29kZSI7czozOiJVU0QiO3M6NDoibmFtZSI7czoxMDoi0JTQvtC70LDRgCI7czo0OiJyYXRlIjtzOjI6IjYwIjt9fX1zOjg6InZhbHByaWNlIjtpOjE7fQ=='); -INSERT INTO options (optname, optvalue) VALUES('version', '6.12.0'); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('api', 'YTozOntzOjM6ImV4cCI7czowOiIiO3M6Mzoia2V5IjtzOjQ6InRlc3QiO3M6NToiYXR5cGUiO3M6MToiMSI7fQ=='); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('common', 'YTo0Mjp7czo5OiJxdHlkaWdpdHMiO3M6MToiMCI7czo4OiJhbWRpZ2l0cyI7czoxOiIwIjtzOjEwOiJkYXRlZm9ybWF0IjtzOjU6ImQubS5ZIjtzOjExOiJwYXJ0aW9udHlwZSI7czoxOiIxIjtzOjY6InBob25lbCI7czoyOiIxMCI7czo2OiJwcmljZTEiO3M6MTg6ItCg0L7Qt9C00YDRltCx0L3QsCI7czo2OiJwcmljZTIiO3M6MTI6ItCe0L/RgtC+0LLQsCI7czo2OiJwcmljZTMiO3M6MDoiIjtzOjY6InByaWNlNCI7czowOiIiO3M6NjoicHJpY2U1IjtzOjA6IiI7czo4OiJkZWZwcmljZSI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MDoiIjtzOjg6InRzX2JyZWFrIjtzOjI6IjYwIjtzOjg6InRzX3N0YXJ0IjtzOjU6IjA5OjAwIjtzOjY6InRzX2VuZCI7czo1OiIxODowMCI7czoxMToiY2hlY2tzbG9nYW4iO3M6MDoiIjtzOjExOiJhdXRvYXJ0aWNsZSI7aToxO3M6MTA6InVzZXNudW1iZXIiO3M6MToiMCI7czoxMDoidXNlc2Nhbm5lciI7aTowO3M6MTY6InVzZW1vYmlsZXNjYW5uZXIiO2k6MDtzOjk6InVzZWltYWdlcyI7aTowO3M6MTQ6InByaW50b3V0cXJjb2RlIjtpOjA7czoxNDoibm9jaGVja2FydGljbGUiO2k6MDtzOjE1OiJzaG93YWN0aXZldXNlcnMiO2k6MDtzOjg6InNob3djaGF0IjtpOjA7czoxMDoidXNlY2F0dHJlZSI7aTowO3M6OToidXNlYnJhbmNoIjtpOjA7czoxMDoibm9hbGxvd2ZpeiI7aTowO3M6MTA6ImFsbG93bWludXMiO2k6MDtzOjY6InVzZXZhbCI7aTowO3M6NjoiY2FwY2hhIjtpOjA7czo5OiJudW1iZXJ0dG4iO2k6MDtzOjk6InBheXR5cGVpbiI7czoxOiIwIjtzOjEwOiJwYXl0eXBlb3V0IjtzOjE6IjAiO3M6MTI6ImFsbG93bWludXNtZiI7aTowO3M6NzoiY2FzaGllciI7czowOiIiO3M6MTA6ImFjdHVhbGRhdGUiO2k6MTcwNDA2MDAwMDtzOjE0OiJzcHJlYWRkZWxpdmVyeSI7aTowO3M6MTE6ImJheWRlbGl2ZXJ5IjtpOjA7czo4OiJub3VwZGF0ZSI7aTowO3M6NzoiY2hlY2tpcCI7aTowO3M6NjoiaXBsaXN0IjtzOjA6IiI7fQ=='); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('discount', 'YToxODp7czo4OiJmaXJzdGJheSI7czoyOiIxMSI7czo2OiJib251czEiO3M6MzoiMS4xIjtzOjY6ImxldmVsMiI7czowOiIiO3M6NjoiYm9udXMyIjtzOjM6IjEuNCI7czo2OiJzdW1tYTEiO3M6MzoiMTAwIjtzOjY6InN1bW1hMiI7czo0OiIxMDAwIjtzOjY6ImJvbnVzMyI7czoxOiIzIjtzOjY6InN1bW1hMyI7czo0OiIzMDAwIjtzOjY6ImJvbnVzNCI7czoxOiI0IjtzOjY6InN1bW1hNCI7czo0OiI0MDAwIjtzOjU6ImRpc2MxIjtzOjE6IjEiO3M6MTA6ImRpc2NzdW1tYTEiO3M6MToiMCI7czo1OiJkaXNjMiI7czoxOiIzIjtzOjEwOiJkaXNjc3VtbWEyIjtzOjE6IjAiO3M6NToiZGlzYzMiO3M6MToiNyI7czoxMDoiZGlzY3N1bW1hMyI7czoxOiIwIjtzOjU6ImRpc2M0IjtzOjA6IiI7czoxMDoiZGlzY3N1bW1hNCI7czowOiIiO30='); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('food', 'YToxNTp7czo4OiJ3b3JrdHlwZSI7czoxOiIyIjtzOjk6InByaWNldHlwZSI7czo2OiJwcmljZTEiO3M6ODoiZGVsaXZlcnkiO2k6MTtzOjY6InRhYmxlcyI7aToxO3M6NDoicGFjayI7aToxO3M6NDoibWVudSI7aToxO3M6NDoibmFtZSI7czo2OiJkZGRkZGQiO3M6NToicGhvbmUiO3M6ODoiNTU1NTU1NTUiO3M6NjoidGltZXBuIjtzOjI6IjExIjtzOjY6InRpbWVzYSI7czowOiIiO3M6NjoidGltZXN1IjtzOjA6IiI7czoxMjoiZm9vZGJhc2VtZW51IjtzOjE6IjAiO3M6MTY6ImZvb2RiYXNlbWVudW5hbWUiO3M6MDoiIjtzOjk6ImZvb2RtZW51MiI7czoxOiIwIjtzOjEyOiJmb29kbWVudW5hbWUiO3M6MDoiIjt9'); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('modules', 'YToxMjp7czo3OiJvY3N0b3JlIjtpOjA7czo0OiJzaG9wIjtpOjA7czoxMDoid29vY29tZXJjZSI7aTowO3M6MjoibnAiO2k6MDtzOjY6InByb211YSI7aTowO3M6ODoiaG9yb3Nob3AiO2k6MDtzOjQ6InZkb2MiO2k6MDtzOjU6Imlzc3VlIjtpOjA7czo0OiJub3RlIjtpOjA7czozOiJwcG8iO2k6MDtzOjg6ImNoZWNrYm94IjtpOjA7czo2OiJ2a2Fzc2EiO2k6MDt9'); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('printer', 'YTo3OntzOjg6InBtYXhuYW1lIjtzOjE6IjciO3M6OToicHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czoxMToiYmFyY29kZXR5cGUiO3M6NDoiQzEyOCI7czo2OiJwcHJpY2UiO2k6MTtzOjU6InBjb2RlIjtpOjE7czo4OiJwYmFyY29kZSI7aToxO3M6NzoicHFyY29kZSI7aTowO30='); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('salary', 'YTo1OntzOjEzOiJjb2RlYmFzZWluY29tIjtzOjM6IjEwNSI7czoxMDoiY29kZXJlc3VsdCI7czozOiI5MDAiO3M6NDoiY2FsYyI7czoyMTk6InYyMDAgPSB2MTA1DQovL9C'); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('shop', 'YToyMDp7czo3OiJkZWZjdXN0IjtzOjE6IjEiO3M6MTE6ImRlZmN1c3RuYW1lIjtzOjI5OiLQm9C10L7QvdC40LQg0JzQsNGA0YLRi9C90Y7QuiI7czo5OiJkZWZicmFuY2giO047czo5OiJvcmRlcnR5cGUiO3M6MToiMCI7czoxMjoiZGVmcHJpY2V0eXBlIjtzOjY6InByaWNlMSI7czo1OiJlbWFpbCI7czowOiIiO3M6ODoic2hvcG5hbWUiO3M6MTc6ItCd0LDRiCDQvNCw0LPQsNC3IjtzOjEyOiJjdXJyZW5jeW5hbWUiO3M6Njoi0YDRg9CxIjtzOjg6InVzZWxvZ2luIjtpOjA7czo5OiJ1c2VmaWx0ZXIiO2k6MDtzOjEzOiJjcmVhdGVuZXdjdXN0IjtpOjA7czoxMToidXNlZmVlZGJhY2siO2k6MDtzOjExOiJ1c2VtYWlucGFnZSI7aTowO3M6NzoiYWJvdXR1cyI7czoxNjoiUEhBK1BHSnlQand2Y0Q0PSI7czo3OiJjb250YWN0IjtzOjA6IiI7czo4OiJkZWxpdmVyeSI7czowOiIiO3M6NDoibmV3cyI7czowOiIiO3M6NToicGFnZXMiO2E6Mjp7czo0OiJuZXdzIjtPOjEyOiJBcHBcRGF0YUl0ZW0iOjI6e3M6MjoiaWQiO047czo5OiIAKgBmaWVsZHMiO2E6NDp7czo0OiJsaW5rIjtzOjQ6Im5ld3MiO3M6NToidGl0bGUiO3M6MTE6Imtra3JycnJycnJyIjtzOjU6Im9yZGVyIjtzOjE6IjIiO3M6NDoidGV4dCI7czoyNDoiUEhBK1pXVmxaV1ZsWldWbFBDOXdQZz09Ijt9fXM6ODoiYWJvdXRfdXMiO086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7TjtzOjk6IgAqAGZpZWxkcyI7YTo0OntzOjQ6ImxpbmsiO3M6ODoiYWJvdXRfdXMiO3M6NToidGl0bGUiO3M6OToi0J4g0L3QsNGBIjtzOjU6Im9yZGVyIjtzOjE6IjMiO3M6NDoidGV4dCI7czozMjoiUEhBK1BHSSswSjRnMEwzUXNOR0JQQzlpUGp3dmNEND0iO319fXM6NToicGhvbmUiO3M6MDoiIjtzOjEwOiJzYWxlc291cmNlIjtzOjE6IjAiO30='); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('sms', 'YToxMTp7czoxMjoic21zY2x1YnRva2VuIjtzOjA6IiI7czoxMjoic21zY2x1YmxvZ2luIjtzOjA6IiI7czoxMToic21zY2x1YnBhc3MiO3M6MDoiIjtzOjk6InNtc2NsdWJhbiI7czowOiIiO3M6MTA6InNtc2NsdWJ2YW4iO3M6MDoiIjtzOjEyOiJzbXNzZW15dG9rZW4iO3M6MDoiIjtzOjEyOiJzbXNzZW15ZGV2aWQiO3M6MDoiIjtzOjExOiJmbHlzbXNsb2dpbiI7czowOiIiO3M6MTA6ImZseXNtc3Bhc3MiO3M6MDoiIjtzOjg6ImZseXNtc2FuIjtzOjA6IiI7czo3OiJzbXN0eXBlIjtzOjE6IjAiO30='); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('val', 'YToyOntzOjc6InZhbGxpc3QiO2E6MTp7aToxNjQyNjc1OTU1O086MTI6IkFwcFxEYXRhSXRlbSI6Mjp7czoyOiJpZCI7aToxNjQyNjc1OTU1O3M6OToiACoAZmllbGRzIjthOjM6e3M6NDoiY29kZSI7czozOiJVU0QiO3M6NDoibmFtZSI7czoxMDoi0JTQvtC70LDRgCI7czo0OiJyYXRlIjtzOjI6IjYwIjt9fX1zOjg6InZhbHByaWNlIjtpOjE7fQ=='); +INSERT INTO `options` (`optname`, `optvalue`) VALUES('version', '6.12.0'); + + diff --git a/www/app/entity/category.php b/www/app/entity/category.php index 62aae6dc3..763be912a 100644 --- a/www/app/entity/category.php +++ b/www/app/entity/category.php @@ -22,7 +22,7 @@ protected function init() { protected function afterLoad() { - \App\Helper::log($this->detail); + $xml = @simplexml_load_string($this->detail); $this->price1 = (string)($xml->price1[0]); diff --git a/www/app/modules/wc/items.php b/www/app/modules/wc/items.php index 5d00e4efc..340854785 100644 --- a/www/app/modules/wc/items.php +++ b/www/app/modules/wc/items.php @@ -174,9 +174,7 @@ public function onUpdateQty($sender) { return; } $c = count($data); - - \App\Helper::log($page*$c); - + if ($c == 0) { break; } diff --git a/www/app/system.php b/www/app/system.php index 4b97de099..fcefc0957 100644 --- a/www/app/system.php +++ b/www/app/system.php @@ -236,7 +236,7 @@ public static function checkIP() { */ public static function checkUpdate() { $options = System::getOptions("common"); - if($options['noupdate']==1) { + if(($options['noupdate'] ??0)==1) { return; } $lastcheck=intval( \App\Helper::getKeyVal('lastchecksystem')) ; diff --git a/www/index.php b/www/index.php index 999d7b515..69dd54ed7 100644 --- a/www/index.php +++ b/www/index.php @@ -37,7 +37,7 @@ $app = new \App\Application(); $modules = \App\System::getOptions('modules'); - if ($modules['shop'] == 1 && \App\System::getOption('shop', 'usemainpage')==1) { + if (($modules['shop'] ??0)== 1 && \App\System::getOption('shop', 'usemainpage')==1) { $app->Run('\App\Modules\Shop\Pages\Catalog\Main' ); } else { $app->Run($mainpage); From 8f3926672bd885fdd1db67921a257b877cfd8d50 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Sat, 14 Dec 2024 16:57:47 +0200 Subject: [PATCH 08/10] fix speed --- www/app/modules/ocstore/orders.php | 2 +- www/app/modules/wc/orders.php | 2 +- www/app/pages/register/doclist.php | 4 ++-- www/app/pages/register/orderlist.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/www/app/modules/ocstore/orders.php b/www/app/modules/ocstore/orders.php index 864cf8a3a..1aee00aef 100644 --- a/www/app/modules/ocstore/orders.php +++ b/www/app/modules/ocstore/orders.php @@ -92,7 +92,7 @@ public function filterOnSubmit($sender) { foreach ($data['orders'] as $ocorder) { - $cnt = $conn->getOne("select count(*) from documents_view where (meta_name='Order' or meta_name='TTN') and content like '%{$ocorder['order_id']}%'") ; + $cnt = $conn->getOne("select count(*) from documents_view where (meta_name='Order' or meta_name='TTN') and content like '%{$ocorder['order_id']}%' and (CURRENT_DATE - INTERVAL 1 MONTH) < document_date ") ; if (intval($cnt) > 0) { //уже импортирован continue; diff --git a/www/app/modules/wc/orders.php b/www/app/modules/wc/orders.php index deb2af6ce..5ab18a97e 100644 --- a/www/app/modules/wc/orders.php +++ b/www/app/modules/wc/orders.php @@ -217,7 +217,7 @@ public function onImport($sender) { public function onRefresh($sender) { - $this->_eorders = Document::find("meta_name='Order' and content like '%0%' and state <> " . Document::STATE_NEW); + $this->_eorders = Document::find("meta_name='Order' and content like '%0%' and (CURRENT_DATE - INTERVAL 1 MONTH) < document_date and state <> " . Document::STATE_NEW); $this->updateform->orderslist->Reload(); } diff --git a/www/app/pages/register/doclist.php b/www/app/pages/register/doclist.php index 984f250d0..e12de5275 100644 --- a/www/app/pages/register/doclist.php +++ b/www/app/pages/register/doclist.php @@ -817,10 +817,10 @@ private function getWhere($usedate=true) { $filter = Filter::getFilter("doclist"); if($usedate == true ) { if($filter->from > 0) { - $where .= " and date(document_date) >= " . $conn->DBDate($filter->from) ; + $where .= " and document_date >= " . $conn->DBDate($filter->from) ; } if($filter->to > 0) { - $where .= " and date(document_date) <= " . $conn->DBDate($filter->to) ; + $where .= " and document_date <= " . $conn->DBDate($filter->to) ; } } diff --git a/www/app/pages/register/orderlist.php b/www/app/pages/register/orderlist.php index a6a3d255d..3b23d9fcb 100644 --- a/www/app/pages/register/orderlist.php +++ b/www/app/pages/register/orderlist.php @@ -951,7 +951,7 @@ private function getWhere() { $conn = \ZDB\DB::getConnect(); $filter=$this->page->listpanel->filter; - $where = " meta_name = 'Order' "; + $where = " meta_name = 'Order' and (CURRENT_DATE - INTERVAL 1 MONTH) < document_date "; $salesource =$filter->salesource->getValue(); if ($salesource > 0) { From be7ac1d1c2a66d6fba016ce4b4ca4a1c4123a5c2 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Sat, 14 Dec 2024 17:44:14 +0200 Subject: [PATCH 09/10] fix --- www/app/entity/entry.php | 4 ++-- www/app/entity/stock.php | 2 +- www/app/modules/shop/pages/admin/dashboard.php | 6 +++--- www/app/pages/register/officelist.php | 4 ++-- www/app/pages/report/balance.php | 2 +- www/app/pages/report/emptask.php | 4 ++-- www/app/pages/report/outfood.php | 6 +++--- www/app/pages/service/armfood.php | 2 +- www/app/pages/service/armpos.php | 2 +- www/app/pages/service/export.php | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/www/app/entity/entry.php b/www/app/entity/entry.php index 36fb54784..3928cc37c 100644 --- a/www/app/entity/entry.php +++ b/www/app/entity/entry.php @@ -78,7 +78,7 @@ public static function getQuantity($date = 0, $stock = 0, $customer = 0, $emp = $conn = \ZDB\DB::getConnect(); $where = " 1=1"; if ($date > 0) { - $where = $where . " date(document_date) <= " . $conn->DBDate($date); + $where = $where . " document_date <= " . $conn->DBDate($date); } if ($emp > 0) { @@ -109,7 +109,7 @@ public static function getAmount($date = 0, $stock = 0, $customer = 0, $emp = 0) $conn = \ZDB\DB::getConnect(); $where = " 1=1"; if ($date > 0) { - $where = $where . " and date(document_date) <= " . $conn->DBDate($date); + $where = $where . " and document_date <= " . $conn->DBDate($date); } if ($emp > 0) { diff --git a/www/app/entity/stock.php b/www/app/entity/stock.php index 4b0a4624a..5f696706c 100644 --- a/www/app/entity/stock.php +++ b/www/app/entity/stock.php @@ -118,7 +118,7 @@ public static function getQuantity($stock_id, $date = null) { $stock = Stock::load($stock_id); if ($date > 0) { $conn = \ZDB\DB::getConnect(); - $where = " stock_id = {$stock_id} and date(document_date) <= " . $conn->DBDate($date); + $where = " stock_id = {$stock_id} and document_date <= " . $conn->DBDate($date); $sql = " select coalesce(sum(quantity),0) AS quantity from entrylist_view where " . $where; return $conn->GetOne($sql); } else { diff --git a/www/app/modules/shop/pages/admin/dashboard.php b/www/app/modules/shop/pages/admin/dashboard.php index 7400ad6da..9e75edc5d 100644 --- a/www/app/modules/shop/pages/admin/dashboard.php +++ b/www/app/modules/shop/pages/admin/dashboard.php @@ -85,8 +85,8 @@ public function updateGraph() { $this->_tvars['ord'] = json_encode($ord); $sql = " content LIKE '%1%' " ; - $sql .= " and date(document_date) <= " . $conn->DBDAte(time()); - $sql .= " and date(document_date) > " . $conn->DBDAte(strtotime("- 30 day", time())); + $sql .= " and (document_date) <= " . $conn->DBDAte(time()); + $sql .= " and (document_date) > " . $conn->DBDAte(strtotime("- 30 day", time())); $items = array(); $cats = array(); @@ -151,7 +151,7 @@ public function updateGraph() { $sql = " state in (9,10,20) and content LIKE '%1%' - and date(document_date) <= {$to} and date(document_date) > {$from} " ; + and (document_date) <= {$to} and (document_date) > {$from} " ; $docs = \App\Entity\Doc\Document::find($sql); diff --git a/www/app/pages/register/officelist.php b/www/app/pages/register/officelist.php index eb6d852a7..3ed63893d 100644 --- a/www/app/pages/register/officelist.php +++ b/www/app/pages/register/officelist.php @@ -531,10 +531,10 @@ private function getWhere() { $to = $filterform->to->getDate(); if ($from > 0) { - $where .= " and date(document_date) >= " . $conn->DBDate($from); + $where .= " and document_date >= " . $conn->DBDate($from); } if ($to > 0) { - $where .= " and date(document_date) <= " . $conn->DBDate($to); + $where .= " and document_date <= " . $conn->DBDate($to); } diff --git a/www/app/pages/report/balance.php b/www/app/pages/report/balance.php index 4fadb8fd2..1f85a85f3 100644 --- a/www/app/pages/report/balance.php +++ b/www/app/pages/report/balance.php @@ -70,7 +70,7 @@ private function generateReport() { } $stview ="SELECT SUM( (SELECT COALESCE(SUM(quantity), 0) FROM entrylist_view - WHERE entrylist_view.stock_id = store_stock_view.stock_id and date(document_date) < {$dbdt} ) * partion) from store_stock_view "; + WHERE entrylist_view.stock_id = store_stock_view.stock_id and document_date < {$dbdt} ) * partion) from store_stock_view "; $sql = $stview. " where {$brst} item_type= ".Item::TYPE_MAT; $amat = doubleval($conn->GetOne($sql)) ; diff --git a/www/app/pages/report/emptask.php b/www/app/pages/report/emptask.php index 86e7027c4..56bd72995 100644 --- a/www/app/pages/report/emptask.php +++ b/www/app/pages/report/emptask.php @@ -59,8 +59,8 @@ private function generateReport() { $conn = \ZDB\DB::getConnect(); $where = " meta_name='Task' - AND DATE( document_date) >= " . $conn->DBDate($from) . " - AND DATE( document_date) <= " . $conn->DBDate($to) . " + AND document_date >= " . $conn->DBDate($from) . " + AND document_date <= " . $conn->DBDate($to) . " and state= " . Document::STATE_CLOSED; diff --git a/www/app/pages/report/outfood.php b/www/app/pages/report/outfood.php index be9842015..f5ee8fd08 100644 --- a/www/app/pages/report/outfood.php +++ b/www/app/pages/report/outfood.php @@ -67,10 +67,10 @@ private function generateReport() { if($rtype ==0) { $sql = " - SELECT DATE(document_date) AS dt,COUNT(*) AS qty FROM documents_view dv + SELECT document_date AS dt,COUNT(*) AS qty FROM documents_view dv WHERE dv.meta_name='OrderFood' AND state = 9 - AND DATE(dv.document_date) >= " . $conn->DBDate($from) . " - AND DATE(dv.document_date) <= " . $conn->DBDate($to) . " + AND dv.document_date >= " . $conn->DBDate($from) . " + AND dv.document_date <= " . $conn->DBDate($to) . " {$forbar} GROUP BY dt ORDER BY dt diff --git a/www/app/pages/service/armfood.php b/www/app/pages/service/armfood.php index 964506933..bef030b94 100644 --- a/www/app/pages/service/armfood.php +++ b/www/app/pages/service/armfood.php @@ -487,7 +487,7 @@ public function onDocRow($row) { public function updateorderlist($sender) { $conn = \ZDB\DB::getConnect(); - $where = " (state not in(9) or content like '%1%' ) and date(document_date) >= " . $conn->DBDate(strtotime('-1 week')) ; + $where = " (state not in(9) or content like '%1%' ) and document_date >= " . $conn->DBDate(strtotime('-1 week')) ; if ($sender instanceof Form) { $text = trim($sender->searchnumber->getText()); $cust = $sender->searchcust->getKey(); diff --git a/www/app/pages/service/armpos.php b/www/app/pages/service/armpos.php index d9d2f1d38..986db442d 100644 --- a/www/app/pages/service/armpos.php +++ b/www/app/pages/service/armpos.php @@ -1705,7 +1705,7 @@ public function onDocRow($row) { public function updatechecklist($sender) { $conn = \ZDB\DB::getConnect(); - $where = "meta_name='PosCheck' and date(document_date) >= " . $conn->DBDate(strtotime('-1 month')) ; + $where = "meta_name='PosCheck' and document_date >= " . $conn->DBDate(strtotime('-1 month')) ; if ($sender instanceof Form) { diff --git a/www/app/pages/service/export.php b/www/app/pages/service/export.php index f6ab06d22..36790630f 100644 --- a/www/app/pages/service/export.php +++ b/www/app/pages/service/export.php @@ -250,7 +250,7 @@ public function onDPreview($sender) { $conn = \ZDB\DB::getConnect(); - $sql = "meta_name='{$dt}' and date(document_date) >= " . $conn->DBDate($sender->dfrom->getDate()) . " and date(document_date) <= " . $conn->DBDate($sender->dto->getDate()); + $sql = "meta_name='{$dt}' and document_date >= " . $conn->DBDate($sender->dfrom->getDate()) . " and document_date <= " . $conn->DBDate($sender->dto->getDate()); $this->_docs = Document::find($sql); $this->dformlist->doclist->Reload(); } From d937c67454fec107e1e72f0a1feec49efe780c81 Mon Sep 17 00:00:00 2001 From: "leon.mbs@gmail.com" Date: Sun, 15 Dec 2024 08:00:17 +0200 Subject: [PATCH 10/10] 6.12.1 --- www/app/modules/note/entity/topic.php | 35 ++++++++++++++++++--------- www/app/system.php | 4 +-- www/composer.lock | 24 +++++++++--------- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/www/app/modules/note/entity/topic.php b/www/app/modules/note/entity/topic.php index f65ed1b8d..2537bc3b5 100644 --- a/www/app/modules/note/entity/topic.php +++ b/www/app/modules/note/entity/topic.php @@ -17,27 +17,40 @@ protected function init() { protected function beforeSave() { parent::beforeSave(); - //упаковываем данные в detail + + /* $this->content = ""; $this->detail = base64_encode($this->detail) ; $this->content .= "{$this->detail}"; $this->content .= "1"; $this->content .= "{$this->updatedon}"; $this->content .= ""; - - return true; + */ + + $content=[] ; + $content['detail'] =$this->detail ; + $content['updatedon'] =$this->updatedon ; + $this->content = serialize($content) ; + } protected function afterLoad() { - //распаковываем данные из detail - $xml = @simplexml_load_string($this->content); - - $this->detail = (string)($xml->detail[0]); - $this->isbasa64 = (int)($xml->isbasa64[0]); - if($this->isbasa64==1) { - $this->detail = base64_decode($this->detail) ; + + if(strpos($this->content,'') ===0 ) { + $xml = @simplexml_load_string($this->content); + + $this->detail = (string)($xml->detail[0]); + $this->isbasa64 = (int)($xml->isbasa64[0]); + if($this->isbasa64==1) { + $this->detail = base64_decode($this->detail) ; + } + $this->updatedon = (int)($xml->updatedon[0]); + } else { + $content = unserialize($this->content) ; + $this->updatedon = $content['updatedon'] ; + $this->detail = $content['detail'] ; } - $this->updatedon = (int)($xml->updatedon[0]); + parent::afterLoad(); } diff --git a/www/app/system.php b/www/app/system.php index fcefc0957..d6c698cb7 100644 --- a/www/app/system.php +++ b/www/app/system.php @@ -10,8 +10,8 @@ */ class System { - public const CURR_VERSION = "6.12.0"; - public const PREV_VERSION = "6.11.9"; + public const CURR_VERSION = "6.12.1"; + public const PREV_VERSION = "6.12.0"; public const REQUIRED_DB = "6.12.0"; private static $_options = array(); // для кеширования diff --git a/www/composer.lock b/www/composer.lock index 825af88ec..72b988295 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -516,16 +516,16 @@ }, { "name": "leon-mbs/ppolib", - "version": "1.5.7", + "version": "1.5.8", "source": { "type": "git", "url": "https://github.com/leon-mbs/ppolib.git", - "reference": "8a383bab5e2745d1ae5d9f045b521248f73b0617" + "reference": "d70d399fa69b1ceb4032a27e116c45b0b8caf0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/leon-mbs/ppolib/zipball/8a383bab5e2745d1ae5d9f045b521248f73b0617", - "reference": "8a383bab5e2745d1ae5d9f045b521248f73b0617", + "url": "https://api.github.com/repos/leon-mbs/ppolib/zipball/d70d399fa69b1ceb4032a27e116c45b0b8caf0b2", + "reference": "d70d399fa69b1ceb4032a27e116c45b0b8caf0b2", "shasum": "" }, "require": { @@ -546,9 +546,9 @@ "homepage": "https://github.com/leon-mbs/ppolib", "support": { "issues": "https://github.com/leon-mbs/ppolib/issues", - "source": "https://github.com/leon-mbs/ppolib/tree/1.5.7" + "source": "https://github.com/leon-mbs/ppolib/tree/1.5.8" }, - "time": "2024-12-11T00:08:13+00:00" + "time": "2024-12-13T11:17:28+00:00" }, { "name": "leon-mbs/zdb", @@ -1689,12 +1689,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "1fd8b74024b8938b25df3a9971c7ad9d57d4f592" + "reference": "233f7c395ac3b83e3c85aa304f3350bf8897aca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/1fd8b74024b8938b25df3a9971c7ad9d57d4f592", - "reference": "1fd8b74024b8938b25df3a9971c7ad9d57d4f592", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/233f7c395ac3b83e3c85aa304f3350bf8897aca5", + "reference": "233f7c395ac3b83e3c85aa304f3350bf8897aca5", "shasum": "" }, "conflict": { @@ -2018,6 +2018,7 @@ "laravel/fortify": "<1.11.1", "laravel/framework": "<6.20.45|>=7,<7.30.7|>=8,<8.83.28|>=9,<9.52.17|>=10,<10.48.23|>=11,<11.31", "laravel/laravel": ">=5.4,<5.4.22", + "laravel/pulse": "<1.3.1", "laravel/reverb": "<1.4", "laravel/socialite": ">=1,<2.0.10", "latte/latte": "<2.10.8", @@ -2243,6 +2244,7 @@ "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev", "shopxo/shopxo": "<=6.1", "showdoc/showdoc": "<2.10.4", + "shuchkin/simplexlsx": ">=1.0.12,<1.1.12", "silverstripe-australia/advancedreports": ">=1,<=2", "silverstripe/admin": "<1.13.19|>=2,<2.1.8", "silverstripe/assets": ">=1,<1.11.1", @@ -2280,7 +2282,7 @@ "snipe/snipe-it": "<=7.0.13", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", - "spatie/browsershot": "<3.57.4", + "spatie/browsershot": "<5.0.1", "spatie/image-optimizer": "<1.7.3", "spencer14420/sp-php-email-handler": "<1", "spipu/html2pdf": "<5.2.8", @@ -2531,7 +2533,7 @@ "type": "tidelift" } ], - "time": "2024-12-10T21:04:50+00:00" + "time": "2024-12-13T21:04:51+00:00" }, { "name": "sabberworm/php-css-parser",