From 8abbb0b5cfa77de2e330a8f91f81e4222a964b5f Mon Sep 17 00:00:00 2001 From: "HOME\\leonm" Date: Mon, 10 May 2021 22:41:37 +0300 Subject: [PATCH 1/5] hotfix --- db/temp.sql | 64 +---------------------------- db/update500to510.sql | 83 ++++++++++++++++++++++++++++++++++++++ www/app/entity/custacc.php | 35 ++++++++++++++++ 3 files changed, 119 insertions(+), 63 deletions(-) create mode 100644 db/update500to510.sql create mode 100644 www/app/entity/custacc.php diff --git a/db/temp.sql b/db/temp.sql index 347f06c74..9071976b3 100644 --- a/db/temp.sql +++ b/db/temp.sql @@ -1,66 +1,4 @@ - - - -ALTER TABLE `timesheet` ADD `branch_id` INT NULL ; - -alter VIEW `timesheet_view` AS - select - `t`.`time_id` AS `time_id`, - `t`.`emp_id` AS `emp_id`, - `t`.`description` AS `description`, - `t`.`t_start` AS `t_start`, - `t`.`t_end` AS `t_end`, - `t`.`t_type` AS `t_type`, - `t`.`t_break` AS `t_break`, - `e`.`emp_name` AS `emp_name`, - `b`.`branch_name` AS `branch_name`, - `e`.`disabled` AS `disabled`, - `t`.`branch_id` AS `branch_id` - from - `timesheet` `t` join `employees` `e` on `t`.`emp_id` = `e`.`employee_id` - left join branches b on t.branch_id = b.branch_id; - -ALTER TABLE `customers` ADD `country` VARCHAR(255) NULL ; - -ALTER VIEW `customers_view` AS - select - `customers`.`customer_id` AS `customer_id`, - `customers`.`customer_name` AS `customer_name`, - `customers`.`detail` AS `detail`, - `customers`.`email` AS `email`, - `customers`.`phone` AS `phone`, - `customers`.`status` AS `status`, - `customers`.`city` AS `city`, - `customers`.`leadsource` AS `leadsource`, - `customers`.`leadstatus` AS `leadstatus`, - `customers`.`country` AS `country`, - ( - select - count(0) - from - `messages` `m` - where - ((`m`.`item_id` = `customers`.`customer_id`) and (`m`.`item_type` = 2))) AS `mcnt`,( - select - count(0) - from - `files` `f` - where - ((`f`.`item_id` = `customers`.`customer_id`) and (`f`.`item_type` = 2))) AS `fcnt`,( - select - count(0) - from - `eventlist` `e` - where - ((`e`.`customer_id` = `customers`.`customer_id`) and (`e`.`eventdate` >= now()))) AS `ecnt` - from - `customers`; - - - - - - + /* diff --git a/db/update500to510.sql b/db/update500to510.sql new file mode 100644 index 000000000..c9b9017b3 --- /dev/null +++ b/db/update500to510.sql @@ -0,0 +1,83 @@ + + + +ALTER TABLE `timesheet` ADD `branch_id` INT NULL ; + +alter VIEW `timesheet_view` AS + select + `t`.`time_id` AS `time_id`, + `t`.`emp_id` AS `emp_id`, + `t`.`description` AS `description`, + `t`.`t_start` AS `t_start`, + `t`.`t_end` AS `t_end`, + `t`.`t_type` AS `t_type`, + `t`.`t_break` AS `t_break`, + `e`.`emp_name` AS `emp_name`, + `b`.`branch_name` AS `branch_name`, + `e`.`disabled` AS `disabled`, + `t`.`branch_id` AS `branch_id` + from + `timesheet` `t` join `employees` `e` on `t`.`emp_id` = `e`.`employee_id` + left join branches b on t.branch_id = b.branch_id; + +ALTER TABLE `customers` ADD `country` VARCHAR(255) NULL ; + +ALTER VIEW `customers_view` AS + select + `customers`.`customer_id` AS `customer_id`, + `customers`.`customer_name` AS `customer_name`, + `customers`.`detail` AS `detail`, + `customers`.`email` AS `email`, + `customers`.`phone` AS `phone`, + `customers`.`status` AS `status`, + `customers`.`city` AS `city`, + `customers`.`leadsource` AS `leadsource`, + `customers`.`leadstatus` AS `leadstatus`, + `customers`.`country` AS `country`, + ( + select + count(0) + from + `messages` `m` + where + ((`m`.`item_id` = `customers`.`customer_id`) and (`m`.`item_type` = 2))) AS `mcnt`,( + select + count(0) + from + `files` `f` + where + ((`f`.`item_id` = `customers`.`customer_id`) and (`f`.`item_type` = 2))) AS `fcnt`,( + select + count(0) + from + `eventlist` `e` + where + ((`e`.`customer_id` = `customers`.`customer_id`) and (`e`.`eventdate` >= now()))) AS `ecnt` + from + `customers`; + + +CREATE TABLE `custacc` ( + `ca_id` int(11) NOT NULL AUTO_INCREMENT, + `customer_id` int(11) NOT NULL, + `document_id` int(11) DEFAULT NULL, + `optype` int(11) DEFAULT '0', + + `amount` decimal(10,2) NOT NULL, + `createdon` date NOT NULL, + PRIMARY KEY (`ca_id`), + KEY `customer_id` (`customer_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE VIEW `custacc_view` AS + select + `c`.`ca_id` AS `ca_id`, + `c`.`customer_id` AS `customer_id`, + `c`.`document_id` AS `document_id`, + `c`.`optype` AS `optype`, + + `c`.`amount` AS `amount`, + `d`.`document_number` AS `document_number`, + `c`.`createdon` AS `createdon` + from + (`custacc` `c` join `documents` `d` on((`d`.`document_id` = `c`.`document_id`))); \ No newline at end of file diff --git a/www/app/entity/custacc.php b/www/app/entity/custacc.php new file mode 100644 index 000000000..f2de94faf --- /dev/null +++ b/www/app/entity/custacc.php @@ -0,0 +1,35 @@ +customer_id = 0; + $this->optype = 0; + + } + protected function afterLoad() { + $this->document_date = strtotime($this->document_date); + } + + public static function addEntry($customer_id,$amount,$document_id,$optype=0){ + $custacc = new CustAcc(); + $custacc->customer_id = $customer_id; + $custacc->optype = $optype; + $custacc->document_id = $document_id; + $custacc->createdon=time() ; + + $custacc->save(); + } +} From 32d9eb3413be041130d83c25042464eb2de5a059 Mon Sep 17 00:00:00 2001 From: "HOME\\leonm" Date: Wed, 12 May 2021 22:47:55 +0300 Subject: [PATCH 2/5] del --- db/update500to510.sql | 4 +- www/app/entity/doc/document.php | 4 +- www/app/entity/doc/goodsissue.php | 2 +- www/app/entity/doc/goodsreceipt.php | 2 +- www/app/entity/doc/orderfood.php | 2 +- www/app/entity/doc/poscheck.php | 4 +- www/app/entity/doc/retcustissue.php | 2 +- www/app/entity/doc/returnissue.php | 2 +- www/app/entity/doc/serviceact.php | 2 +- www/app/entity/doc/ttn.php | 2 +- www/app/entity/entry.php | 13 +--- www/app/pages/base.php | 18 +++-- www/app/pages/doc/warranty.php | 44 ++++++------ www/app/pages/options.php | 2 + www/app/pages/reference/customerlist.php | 68 +++++++++++-------- www/app/pages/register/stocklist.php | 6 +- www/app/pages/report/abc.php | 46 ++++++------- www/app/pages/report/outcome.php | 40 +++++------ www/app/pages/timesheet.php | 2 +- .../pages/reference/customerlist.html | 24 +++++-- www/templates/pages/report/abc.html | 2 +- www/templates/printforms/report/abc.tpl | 2 +- .../pages/reference/customerlist.html | 30 ++++++-- www/templates_ua/pages/report/abc.html | 2 +- www/templates_ua/printforms/report/abc.tpl | 2 +- 25 files changed, 181 insertions(+), 146 deletions(-) diff --git a/db/update500to510.sql b/db/update500to510.sql index c9b9017b3..8b105393e 100644 --- a/db/update500to510.sql +++ b/db/update500to510.sql @@ -1,8 +1,9 @@ - +ALTER TABLE `customers` ADD `country` VARCHAR(255) NULL ; ALTER TABLE `timesheet` ADD `branch_id` INT NULL ; + alter VIEW `timesheet_view` AS select `t`.`time_id` AS `time_id`, @@ -20,7 +21,6 @@ alter VIEW `timesheet_view` AS `timesheet` `t` join `employees` `e` on `t`.`emp_id` = `e`.`employee_id` left join branches b on t.branch_id = b.branch_id; -ALTER TABLE `customers` ADD `country` VARCHAR(255) NULL ; ALTER VIEW `customers_view` AS select diff --git a/www/app/entity/doc/document.php b/www/app/entity/doc/document.php index 2172ac9d3..fc808eae9 100644 --- a/www/app/entity/doc/document.php +++ b/www/app/entity/doc/document.php @@ -128,9 +128,7 @@ private function packData() { $this->content = "
"; foreach ($this->headerdata as $key => $value) { - if ($key > 0) { - continue; - } + if (strpos($value, '[CDATA[') !== false) { \App\System::setWarnMsg('CDATA в поле обьекта'); diff --git a/www/app/entity/doc/goodsissue.php b/www/app/entity/doc/goodsissue.php index 9c804b1bc..731ac5b74 100644 --- a/www/app/entity/doc/goodsissue.php +++ b/www/app/entity/doc/goodsissue.php @@ -132,7 +132,7 @@ public function Execute() { foreach ($listst as $st) { $sc = new Entry($this->document_id, 0 - $st->quantity * $st->partion, 0 - $st->quantity); $sc->setStock($st->stock_id); - $sc->setExtCode($item->price * $k - $st->partion); //Для АВС + // $sc->setExtCode($item->price * $k - $st->partion); //Для АВС $sc->setOutPrice($item->price * $k); $sc->save(); $amount += $item->price * $k * $st->quantity; diff --git a/www/app/entity/doc/goodsreceipt.php b/www/app/entity/doc/goodsreceipt.php index 936e34d4f..fcf46f22a 100644 --- a/www/app/entity/doc/goodsreceipt.php +++ b/www/app/entity/doc/goodsreceipt.php @@ -107,7 +107,7 @@ public function Execute() { $sc = new Entry($this->document_id, $item->price * $item->quantity, $item->quantity); $sc->setStock($stock->stock_id); - $sc->setExtCode($item->price); //Для АВС + // $sc->setExtCode($item->price); //Для АВС $sc->setOutPrice($item->price); $sc->save(); diff --git a/www/app/entity/doc/orderfood.php b/www/app/entity/doc/orderfood.php index 9151cbe0a..c16fa1578 100644 --- a/www/app/entity/doc/orderfood.php +++ b/www/app/entity/doc/orderfood.php @@ -171,7 +171,7 @@ public function Execute() { foreach ($listst as $st) { $sc = new Entry($this->document_id, 0 - $st->quantity * $st->partion, 0 - $st->quantity); $sc->setStock($st->stock_id); - $sc->setExtCode($item->price * $k - $st->partion); //Для АВС + // $sc->setExtCode($item->price * $k - $st->partion); //Для АВС $sc->setOutPrice($item->price * $k); $sc->save(); } diff --git a/www/app/entity/doc/poscheck.php b/www/app/entity/doc/poscheck.php index 995973b66..ef55b2a3b 100644 --- a/www/app/entity/doc/poscheck.php +++ b/www/app/entity/doc/poscheck.php @@ -186,7 +186,7 @@ public function Execute() { foreach ($listst as $st) { $sc = new Entry($this->document_id, 0 - $st->quantity * $st->partion, 0 - $st->quantity); $sc->setStock($st->stock_id); - $sc->setExtCode($item->price * $k - $st->partion); //Для АВС + // $sc->setExtCode($item->price * $k - $st->partion); //Для АВС $sc->setOutPrice($item->price * $k); $sc->save(); } @@ -214,7 +214,7 @@ public function Execute() { $sc = new Entry($this->document_id, 0 - ($ser->price * $k * $ser->quantity), 0); $sc->setService($ser->service_id); - $sc->setExtCode(0 - ($ser->price * $k)); //Для АВС + // $sc->setExtCode(0 - ($ser->price * $k)); //Для АВС $sc->setOutPrice(0 - $item->price * $k); $sc->save(); diff --git a/www/app/entity/doc/retcustissue.php b/www/app/entity/doc/retcustissue.php index a6c93423c..2dde08ea5 100644 --- a/www/app/entity/doc/retcustissue.php +++ b/www/app/entity/doc/retcustissue.php @@ -69,7 +69,7 @@ public function Execute() { foreach ($listst as $st) { $sc = new Entry($this->document_id, 0 - $st->quantity * $item->price, 0 - $st->quantity); $sc->setStock($st->stock_id); - $sc->setExtCode($item->price - $st->partion); //Для АВС + // $sc->setExtCode($item->price - $st->partion); //Для АВС $sc->setOutPrice($item->price); $sc->save(); } diff --git a/www/app/entity/doc/returnissue.php b/www/app/entity/doc/returnissue.php index 6b7b00a0c..7180cad0a 100644 --- a/www/app/entity/doc/returnissue.php +++ b/www/app/entity/doc/returnissue.php @@ -67,7 +67,7 @@ public function Execute() { $sc = new Entry($this->document_id, $item->amount, $item->quantity); $sc->setStock($stock->stock_id); - $sc->setExtCode(($item->price - $stock->partion)); //Для АВС + // $sc->setExtCode(($item->price - $stock->partion)); //Для АВС // $sc->setCustomer($this->customer_id); $sc->setOutPrice($item->price); $sc->save(); diff --git a/www/app/entity/doc/serviceact.php b/www/app/entity/doc/serviceact.php index fac25de03..c8eee7035 100644 --- a/www/app/entity/doc/serviceact.php +++ b/www/app/entity/doc/serviceact.php @@ -66,7 +66,7 @@ public function Execute() { $sc = new Entry($this->document_id, 0 - ($ser->price * $ser->quantity), $ser->quantity); $sc->setService($ser->service_id); - $sc->setExtCode($ser->price); //Для АВС + // $sc->setExtCode($ser->price); //Для АВС //$sc->setCustomer($this->customer_id); $sc->setOutPrice($item->price); $sc->save(); diff --git a/www/app/entity/doc/ttn.php b/www/app/entity/doc/ttn.php index e33cf09de..b4d84bb8f 100644 --- a/www/app/entity/doc/ttn.php +++ b/www/app/entity/doc/ttn.php @@ -198,7 +198,7 @@ public function Execute() { foreach ($listst as $st) { $sc = new Entry($this->document_id, 0 - $st->quantity * $st->partion, 0 - $st->quantity); $sc->setStock($st->stock_id); - $sc->setExtCode($item->price - $st->partion); //Для АВС + // $sc->setExtCode($item->price - $st->partion); //Для АВС $sc->setOutPrice($item->price); $sc->save(); } diff --git a/www/app/entity/entry.php b/www/app/entity/entry.php index 2569f8afa..2cc156b6d 100644 --- a/www/app/entity/entry.php +++ b/www/app/entity/entry.php @@ -22,15 +22,13 @@ public function __construct($document_id=0 , $amount = 0, $quantity = 0) { parent::__construct(); $this->document_id = $document_id; - $this->amount = $amount; + // $this->amount = $amount; $this->quantity = $quantity; } protected function init() { - - $this->extcode = 0; - + } protected function afterLoad() { @@ -50,12 +48,7 @@ public function setService($service_id) { $this->service_id = $service_id; } - //типы налогов, начислений удержаний, прочая вспомагтельная аналитика - public function setExtCode($code) { - - $this->extcode = $code; - } - + public function setOutPrice($price) { $this->outprice = $price; diff --git a/www/app/pages/base.php b/www/app/pages/base.php index 9fbfc2d3a..7387b6300 100644 --- a/www/app/pages/base.php +++ b/www/app/pages/base.php @@ -35,13 +35,7 @@ public function __construct($params = null) { $this->_tvars["useval"] = $options['useval'] == 1; $this->_tvars["usecattree"] = $options['usecattree'] == 1; $this->_tvars["usemobileprinter"] = $options['usemobileprinter'] == 1; - if (System::getSession()->defbranch > 0) { - $this->branch_id = System::getSession()->defbranch; - System::setBranch($this->branch_id); - } - if($this->branch_id==null) { - $this->branch_id =0; - } + $blist = array(); @@ -53,6 +47,16 @@ public function __construct($params = null) { $this->branch_id = array_pop($k); System::setBranch($this->branch_id); } + + //куки после логина + if (System::getSession()->defbranch > 0 && $this->branch_id == 0) { + $this->branch_id = System::getSession()->defbranch; + System::setBranch($this->branch_id); + } + if($this->branch_id==null) { + $this->branch_id =0; + } + } //форма филиалов $this->add(new \Zippy\Html\Form\Form('nbform')); diff --git a/www/app/pages/doc/warranty.php b/www/app/pages/doc/warranty.php index 73797c620..e6259f00f 100644 --- a/www/app/pages/doc/warranty.php +++ b/www/app/pages/doc/warranty.php @@ -73,26 +73,14 @@ public function __construct($docid = 0, $basedocid = 0) { if ($basedoc instanceof Document) { $this->_basedocid = $basedocid; $this->docform->customer->setText($basedoc->headerdata['customer_name']); + $this->_tovarlist = $basedoc->unpackDetails('detaildata'); if ($basedoc->meta_name == 'GoodsIssue') { - $this->_tovarlist = array(); - $itemlist = $basedoc->unpackDetails('detaildata'); - foreach ($itemlist as $it) { - - $this->_tovarlist[$it->item_id] = $it; - } - } - if ($basedoc->meta_name == 'TTN') { - - - $this->_tovarlist = $basedoc->unpackDetails('detaildata'); - } - if ($basedoc->meta_name == 'POSCheck') { - - - $this->_tovarlist = $basedoc->unpackDetails('detaildata'); + } - } + + + } } @@ -101,6 +89,7 @@ public function __construct($docid = 0, $basedocid = 0) { return; } } + } public function detailOnRow($row) { $item = $row->getDataItem(); @@ -120,10 +109,10 @@ public function deleteOnClick($sender) { if (false == \App\ACL::checkEditDoc($this->_doc)) { return; } - $tovar = $sender->owner->getDataItem(); - // unset($this->_tovarlist[$tovar->tovar_id]); - - $this->_tovarlist = array_diff_key($this->_tovarlist, array($tovar->item_id => $this->_tovarlist[$tovar->item_id])); + $item = $sender->owner->getDataItem(); + $this->_tovarlist = array_diff_key($this->_tovarlist, array($item->rowid => $this->_tovarlist[$item->rowid])); + + $this->docform->detail->Reload(); } @@ -139,7 +128,7 @@ public function editOnClick($sender) { $this->editdetail->editsn->setText($item->sn); $this->editdetail->setVisible(true); $this->docform->setVisible(false); - $this->_rowid = $item->item_id; + $this->_rowid = $item->rowid; } public function addrowOnClick($sender) { @@ -163,8 +152,17 @@ public function saverowOnClick($sender) { $item->price = $this->editdetail->editprice->getText(); $item->sn = $this->editdetail->editsn->getText(); $item->warranty = $this->editdetail->editwarranty->getText(); + + if ($this->_rowid > 0) { + $item->rowid = $this->_rowid; + } else { + $next = count($this->_tovarlist) > 0 ? max(array_keys($this->_tovarlist)) : 0; + $item->rowid = $next + 1; + } + $this->_tovarlist[$item->rowid] = $item; - $this->_tovarlist[$item->item_id] = $item; + $this->_rowid = 0; + $this->editdetail->setVisible(false); $this->docform->setVisible(true); $this->docform->detail->Reload(); diff --git a/www/app/pages/options.php b/www/app/pages/options.php index c6ff0885b..506303ccb 100644 --- a/www/app/pages/options.php +++ b/www/app/pages/options.php @@ -100,6 +100,7 @@ public function __construct() { $this->common->usesnumber->setChecked($common['usesnumber']); + $this->common->usemobileprinter->setChecked($common['usemobileprinter']); $this->common->showactiveusers->setChecked($common['showactiveusers']); $this->common->usecattree->setChecked($common['usecattree']); $this->common->usescanner->setChecked($common['usescanner']); @@ -265,6 +266,7 @@ public function saveCommonOnClick($sender) { $common['usescanner'] = $this->common->usescanner->isChecked() ? 1 : 0; $common['useimages'] = $this->common->useimages->isChecked() ? 1 : 0; + $common['usemobileprinter'] = $this->common->usemobileprinter->isChecked() ? 1 : 0; $common['showactiveusers'] = $this->common->showactiveusers->isChecked() ? 1 : 0; $common['usecattree'] = $this->common->usecattree->isChecked() ? 1 : 0; $common['usebranch'] = $this->common->usebranch->isChecked() ? 1 : 0; diff --git a/www/app/pages/reference/customerlist.php b/www/app/pages/reference/customerlist.php index 7197bf5f7..447c87b3d 100644 --- a/www/app/pages/reference/customerlist.php +++ b/www/app/pages/reference/customerlist.php @@ -54,17 +54,20 @@ public function __construct($id = 0 ) { $this->filter->add(new DropDownChoice('searchleadstatus', Customer::getLeadStatuses(), "0")); $this->add(new Panel('customertable'))->setVisible(true); - $this->customertable->add(new DataView('customerlist', new CustomerDataSource($this), $this, 'customerlistOnRow')); - $this->customertable->customerlist->setPageSize(Helper::getPG()); - $this->customertable->add(new \Zippy\Html\DataList\Paginator('pag', $this->customertable->customerlist)); - - $this->customertable->customerlist->Reload(); - $this->customertable->add(new SortLink("sortdoc", "docs", $this, "onSort")); - $this->customertable->add(new SortLink("sortname", "customer_name", $this, "onSort")); - $this->customertable->add(new SortLink("sortleadstatus", "leadstatus", $this, "onSort")); - - $this->customertable->add(new ClickLink('addnew'))->onClick($this, 'addOnClick'); - $this->customertable->add(new ClickLink('showstat'))->onClick($this, 'showStat'); + $this->customertable->add(new Form('listform')) ; + $this->customertable->listform->add(new DataView('customerlist', new CustomerDataSource($this), $this, 'customerlistOnRow')); + $this->customertable->listform->customerlist->setPageSize(Helper::getPG()); + $this->customertable->listform->add(new \Zippy\Html\DataList\Paginator('pag', $this->customertable->listform->customerlist)); + + $this->customertable->listform->customerlist->Reload(); + $this->customertable->listform->add(new SortLink("sortdoc", "docs", $this, "onSort")); + $this->customertable->listform->add(new SortLink("sortname", "customer_name", $this, "onSort")); + $this->customertable->listform->add(new SortLink("sortleadstatus", "leadstatus", $this, "onSort")); + + $this->customertable->listform->add(new ClickLink('addnew'))->onClick($this, 'addOnClick'); + $this->customertable->listform->add(new ClickLink('showstat'))->onClick($this, 'showStat'); + $this->customertable->listform->add(new SubmitLink('deleteall'))->onClick($this, 'OnDelAll'); + $this->add(new Panel('statpan'))->setVisible(false); $this->statpan->add(new ClickLink('closestat'))->onClick($this, 'closeStat'); @@ -158,12 +161,12 @@ public function OnLeadMode($sender) { $this->_tvars['leadmode'] = $sender->isChecked(); $this->filter->clean(); - $this->customertable->customerlist->Reload(); + $this->customertable->listform->customerlist->Reload(); } public function OnSearch($sender) { - $this->customertable->customerlist->Reload(); + $this->customertable->listform->customerlist->Reload(); $this->contentview->setVisible(false); } @@ -185,8 +188,9 @@ public function customerlistOnRow($row) { $row->add(new ClickLink('edit'))->onClick($this, 'editOnClick'); $row->add(new ClickLink('contentlist'))->onClick($this, 'editContentOnClick'); - $row->add(new ClickLink('delete'))->onClick($this, 'deleteOnClick'); - + + $row->add(new CheckBox('seldel', new \Zippy\Binding\PropertyBinding($item, 'seldel'))); + $row->setAttribute('style', $item->status == 1 ? 'color: #aaa' : null); if ($item->customer_id == $this->_customer->customer_id) { $row->setAttribute('class', 'table-success'); @@ -197,13 +201,13 @@ public function onSort($sender) { $sortfield = $sender->fileld; $sortdir = $sender->dir; - $this->customertable->sortdoc->Reset(); + $this->customertable->listform->sortdoc->Reset(); - $this->customertable->customerlist->setSorting($sortfield, $sortdir); + $this->customertable->listform->customerlist->setSorting($sortfield, $sortdir); $sender->fileld = $sortfield; $sender->dir = $sortdir; - $this->customertable->customerlist->Reload(); + $this->customertable->listform->customerlist->Reload(); } public function editOnClick($sender) { @@ -251,7 +255,7 @@ public function deleteOnClick($sender) { } - $this->customertable->customerlist->Reload(); + $this->customertable->listform->customerlist->Reload(); } public function addOnClick($sender) { @@ -342,7 +346,7 @@ public function saveOnClick($sender) { $this->_customer->save(); $this->customerdetail->setVisible(false); $this->customertable->setVisible(true); - $this->customertable->customerlist->Reload(); + $this->customertable->listform->customerlist->Reload(); } public function cancelOnClick($sender) { @@ -357,8 +361,8 @@ public function cancelOnClick($sender) { //просмотр контента public function editContentOnClick($sender) { $this->_customer = $sender->getOwner()->getDataItem(); - $this->customertable->customerlist->setSelectedRow($sender->getOwner()); - $this->customertable->customerlist->Reload(); + + $this->customertable->listform->customerlist->Reload(); $this->viewContent(); } @@ -407,7 +411,7 @@ public function OnFileSubmit($sender) { $this->contentview->addfileform->adddescfile->setText(''); $this->updateFiles(); $this->goAnkor('contentviewlink'); - $this->customertable->customerlist->Reload(false); + $this->customertable->listform->customerlist->Reload(false); } // обновление списка прикрепленных файлов @@ -432,7 +436,7 @@ public function deleteFileOnClick($sender) { $file = $sender->owner->getDataItem(); Helper::deleteFile($file->file_id); $this->updateFiles(); - $this->customertable->customerlist->Reload(false); + $this->customertable->listform->customerlist->Reload(false); } /** @@ -455,7 +459,7 @@ public function OnMsgSubmit($sender) { $this->contentview->addmsgform->addmsg->setText(''); $this->updateMessages(); $this->goAnkor('contentviewlink'); - $this->customertable->customerlist->Reload(false); + $this->customertable->listform->customerlist->Reload(false); } //список комментариев @@ -480,7 +484,7 @@ public function deleteMsgOnClick($sender) { $msg = $sender->owner->getDataItem(); \App\Entity\Message::delete($msg->message_id); $this->updateMessages(); - $this->customertable->customerlist->Reload(false); + $this->customertable->listform->customerlist->Reload(false); } public function OnEventSubmit($sender) { @@ -510,7 +514,7 @@ public function OnEventSubmit($sender) { $this->contentview->addeventform->clean(); $this->updateEvents(); $this->goAnkor('contentviewlink'); - $this->customertable->customerlist->Reload(false); + $this->customertable->listform->customerlist->Reload(false); } //список событий @@ -541,7 +545,7 @@ public function deleteEventOnClick($sender) { $event = $sender->owner->getDataItem(); \App\Entity\Event::delete($event->event_id); $this->updateEvents(); - $this->customertable->customerlist->Reload(false); + $this->customertable->listform->customerlist->Reload(false); } public function contrListOnRow(DataRow $row) { @@ -562,7 +566,7 @@ public function contractOnClick($sender) { public function OnSelStatus($sender) { $this->_customer->leadstatus = $sender->getValue(); $this->_customer->save(); - $this->customertable->customerlist->Reload(); + $this->customertable->listform->customerlist->Reload(); } public function onConvert($sender) { @@ -570,7 +574,7 @@ public function onConvert($sender) { $this->_tvars['leadmode'] = false; $this->filter->clean(); - $this->customertable->customerlist->Reload(); + $this->customertable->listform->customerlist->Reload(); $this->_customer->status = 0; $this->_customer->fromlead = 1; @@ -762,6 +766,10 @@ public function closeStat($sender) { $this->customertable->setVisible(true); $this->statpan->setVisible(false); } + public function OnDelAll($sender) { + + + } } diff --git a/www/app/pages/register/stocklist.php b/www/app/pages/register/stocklist.php index ea4df28cd..4ff29e76c 100644 --- a/www/app/pages/register/stocklist.php +++ b/www/app/pages/register/stocklist.php @@ -66,9 +66,9 @@ public function doclistOnRow(\Zippy\Html\DataList\DataRow $row) { $row->add(new Label('partion', H::fa($doc->partion))); $row->add(new Label('qty', H::fqty($doc->quantity))); - $price = $doc->quantity >= 0 ? '' : H::fa($doc->extcode + $doc->partion); + $price = $doc->quantity >= 0 ? H::fa($doc->outprice ) : ''; if ($doc->meta_name == 'ReturnIssue') { - $price = H::fa((0 - $doc->extcode) + $doc->partion); + $price = H::fa((0 - $doc->outprice) ); } $row->add(new Label('price', $price)); @@ -147,7 +147,7 @@ public function getItemCount() { public function getItems($start, $count, $sortfield = null, $asc = null) { $conn = \ZDB\DB::getConnect(); - $sql = "select e.extcode,e.entry_id, e.quantity, e.amount , d.document_id, d.document_number,d.document_date,s.partion,s.snumber from documents d "; + $sql = "select e.outprice,e.entry_id, e.quantity, e.amount , d.document_id, d.document_number,d.document_date,s.partion,s.snumber from documents d "; $sql .= " join `entrylist` e on d.`document_id` = e.`document_id` "; $sql .= " join `store_stock` s on s.`stock_id` = e.`stock_id` "; $sql .= " where " . $this->getWhere() . " order by entry_id "; diff --git a/www/app/pages/report/abc.php b/www/app/pages/report/abc.php index 9eb4c435f..9857386a0 100644 --- a/www/app/pages/report/abc.php +++ b/www/app/pages/report/abc.php @@ -32,14 +32,10 @@ public function __construct() { $this->typelist[4] = H::l('abc4'); $this->typelist[5] = H::l('abc5'); - $dt = new \Carbon\Carbon; - $dt->subMonth(); - $from = $dt->startOfMonth()->timestamp; - $to = $dt->endOfMonth()->timestamp; - + $this->add(new Form('filter'))->onSubmit($this, 'OnSubmit'); - $this->filter->add(new Date('from', $from)); - $this->filter->add(new Date('to', $to)); + $this->filter->add(new Date('from', time() - (7 * 24 * 3600))); + $this->filter->add(new Date('to', time())); $this->filter->add(new DropDownChoice('type', $this->typelist, 1)); $this->add(new Panel('detail'))->setVisible(false); @@ -81,19 +77,19 @@ private function generateReport() { $detail = array(); - if ($type == 1) { + if ($type == 1) { //Товары, прибыль $detail = $this->find1(); } - if ($type == 2) { + if ($type == 2) { //Поставщики, объем поставок $detail = $this->find2(); } - if ($type == 3) { + if ($type == 3) { //Покупатели, объем продаж" $detail = $this->find3(); } - if ($type == 4) { + if ($type == 4) { //Услуги, выручка $detail = $this->find4(); } - if ($type == 5) { + if ($type == 5) { //Покупатели, прибыль $detail = $this->find5(); } @@ -137,12 +133,12 @@ private function find1() { $list = array(); $conn = \ZDB\DB::getConnect(); $sql = "SELECT * FROM ( - SELECT items.itemname as name, SUM( ABS( extcode*quantity ) ) AS value + SELECT items.itemname as name, SUM( ABS( (outprice-partion )*quantity ) ) AS value FROM `entrylist_view` join items on entrylist_view.item_id = items.item_id join documents_view on entrylist_view.document_id = documents_view.document_id - WHERE extcode <>0 and meta_name in('GoodsIssue', 'POSCheck','ReturnIssue','TTN') + WHERE partion is not null and in('GoodsIssue', 'POSCheck','ReturnIssue','TTN') AND entrylist_view.document_date >= " . $conn->DBDate($this->filter->from->getDate()) . " AND entrylist_view.document_date <= " . $conn->DBDate($this->filter->to->getDate()) . " {$this->br} @@ -164,11 +160,11 @@ private function find2() { $list = array(); $conn = \ZDB\DB::getConnect(); $sql = "SELECT * FROM ( - SELECT customers.customer_name as name, SUM( ABS( entrylist_view.amount ) ) AS value + SELECT customers.customer_name as name, SUM( ABS( partion *quantity ) ) AS value FROM `entrylist_view` join customers on entrylist_view.customer_id = customers.customer_id join documents_view on entrylist_view.document_id = documents_view.document_id - WHERE entrylist_view.amount >0 and meta_name in('GoodsReceipt') + WHERE partion is not null and entrylist_view.quantity >0 and meta_name in('GoodsReceipt','RetCustIssue') AND entrylist_view.document_date >= " . $conn->DBDate($this->filter->from->getDate()) . " AND entrylist_view.document_date <= " . $conn->DBDate($this->filter->to->getDate()) . " AND customers.detail not like '%1%' @@ -179,7 +175,7 @@ private function find2() { $rs = $conn->Execute($sql); foreach ($rs as $row) { - $row['value'] = round($row['value'] / 1000); + $row['value'] = round($row['value'] ); $list[] = $row; } @@ -190,11 +186,11 @@ private function find3() { $list = array(); $conn = \ZDB\DB::getConnect(); $sql = "SELECT * FROM ( - SELECT customers.customer_name as name, SUM( ABS( entrylist_view.amount ) ) AS value + SELECT customers.customer_name as name, SUM( ABS( partion *quantity ) ) AS value FROM `entrylist_view` join customers on entrylist_view.customer_id = customers.customer_id join documents_view on entrylist_view.document_id = documents_view.document_id - WHERE entrylist_view.amount <0 and meta_name in('GoodsIssue','POSCheck','Order') + WHERE partion is not null and entrylist_view.quantity <0 and meta_name in('GoodsIssue', 'POSCheck','ReturnIssue','TTN' ) AND entrylist_view.document_date >= " . $conn->DBDate($this->filter->from->getDate()) . " AND entrylist_view.document_date <= " . $conn->DBDate($this->filter->to->getDate()) . " AND customers.detail not like '%1%' @@ -205,7 +201,7 @@ private function find3() { $rs = $conn->Execute($sql); foreach ($rs as $row) { - $row['value'] = round($row['value'] / 1000); + $row['value'] = round($row['value'] ); $list[] = $row; } @@ -216,12 +212,12 @@ private function find4() { $list = array(); $conn = \ZDB\DB::getConnect(); $sql = "SELECT * FROM ( - SELECT services.service_name as name, SUM( ABS( entrylist_view.amount ) ) AS value + SELECT services.service_name as name, SUM( ABS( entrylist_view.outprice ) ) AS value FROM `entrylist_view` join services on entrylist_view.service_id = services.service_id join documents_view on entrylist_view.document_id = documents_view.document_id - WHERE entrylist_view.amount>0 and meta_name in('ServiceAct') + WHERE partion is not null and entrylist_view.outprice>0 and meta_name in('ServiceAct') AND entrylist_view.document_date >= " . $conn->DBDate($this->filter->from->getDate()) . " AND entrylist_view.document_date <= " . $conn->DBDate($this->filter->to->getDate()) . " {$this->br} @@ -231,7 +227,7 @@ private function find4() { $rs = $conn->Execute($sql); foreach ($rs as $row) { - $row['value'] = round($row['value'] / 1000); + $row['value'] = round($row['value'] ); $list[] = $row; } @@ -242,11 +238,11 @@ private function find5() { $list = array(); $conn = \ZDB\DB::getConnect(); $sql = "SELECT * FROM ( - SELECT customers.customer_name as name, SUM( ABS( extcode*quantity ) ) AS value + SELECT customers.customer_name as name, SUM( ABS( (outprice-partion )*quantity ) ) AS value FROM `entrylist_view` join customers on entrylist_view.customer_id = customers.customer_id join documents_view on entrylist_view.document_id = documents_view.document_id - WHERE entrylist_view.amount <0 and meta_name in('GoodsIssue','POSCheck','TTN') + WHERE entrylist_view.quantity <0 and meta_name in('GoodsIssue', 'POSCheck','ReturnIssue','TTN' ) AND entrylist_view.document_date >= " . $conn->DBDate($this->filter->from->getDate()) . " AND entrylist_view.document_date <= " . $conn->DBDate($this->filter->to->getDate()) . " {$this->br} diff --git a/www/app/pages/report/outcome.php b/www/app/pages/report/outcome.php index c95b6d194..bb3344c54 100644 --- a/www/app/pages/report/outcome.php +++ b/www/app/pages/report/outcome.php @@ -165,13 +165,13 @@ private function generateReport() { $sql = ''; if ($type == 1 || $type == 6 || strlen($cat) > 0) { //по товарам $sql = " - select i.`itemname`,i.`item_code`,sum(0-e.`quantity`) as qty, sum(0-e.quantity*e.partion) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select i.`itemname`,i.`item_code`,sum(0-e.`quantity`) as qty, sum(0-e.quantity*e.partion) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e join `items_view` i on e.`item_id` = i.`item_id` join `documents_view` d on d.`document_id` = e.`document_id` - where e.`item_id` >0 and e.`quantity` <> 0 {$cat} {$cust} - and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN','OrderCust') + where e.partion is not null and e.`item_id` >0 and e.`quantity` <> 0 {$cat} {$cust} + and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN' ) {$br} {$u} AND DATE(e.document_date) >= " . $conn->DBDate($from) . " AND DATE(e.document_date) <= " . $conn->DBDate($to) . " @@ -182,13 +182,13 @@ private function generateReport() { if ($type == 2) { //по покупателям $empty = H::l("emptycust"); $sql = " - select coalesce(c.`customer_name`,'{$empty}') as itemname,c.`customer_id`, sum(0-e.quantity*e.partion) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select coalesce(c.`customer_name`,'{$empty}') as itemname,c.`customer_id`, sum(0-e.quantity*e.partion) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e left join `customers` c on c.`customer_id` = e.`customer_id` join `documents_view` d on d.`document_id` = e.`document_id` - where e.`quantity` <>0 - and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN','OrderCust') AND DATE(e.document_date) >= " . $conn->DBDate($from) . " + where e.partion is not null and e.`quantity` <>0 + and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN' ) AND DATE(e.document_date) >= " . $conn->DBDate($from) . " {$br} {$u} AND DATE(e.document_date) <= " . $conn->DBDate($to) . " AND c.detail not like '%1%' group by c.`customer_name`,c.`customer_id` @@ -197,7 +197,7 @@ private function generateReport() { } if ($type == 3) { //по датам $sql = " - select e.`document_date` as dt , sum(0-e.`amount`) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select e.`document_date` as dt , sum(0-e.quantity*e.partion) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e join `items` i on e.`item_id` = i.`item_id` @@ -213,7 +213,7 @@ private function generateReport() { if ($type == 4 || $type == 7) { //по сервисам $sql = " - select s.`service_name` as itemname, sum(0-e.`quantity`) as qty, sum(0-e.`amount`) as summa ,0 as navar + select s.`service_name` as itemname, sum(0-e.`quantity`) as qty, sum(0-e.`outprice`) as summa ,0 as navar from `entrylist_view` e join `services` s on e.`service_id` = s.`service_id` @@ -228,13 +228,13 @@ private function generateReport() { if ($type == 5 && strlen($cat) == 0) { //по категориях $sql = " - select i.`cat_name` as itemname,sum(0-e.`quantity`) as qty, sum(0- e.quantity*e.partion) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select i.`cat_name` as itemname,sum(0-e.`quantity`) as qty, sum(0- e.quantity*e.partion) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e join `items_view` i on e.`item_id` = i.`item_id` join `documents_view` d on d.`document_id` = e.`document_id` - where e.`item_id` >0 and e.`quantity` <>0 - and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN','OrderCust') + where e.partion is not null and e.`item_id` >0 and e.`quantity` <>0 + and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN' ) {$br} {$u} AND DATE(e.document_date) >= " . $conn->DBDate($from) . " AND DATE(e.document_date) <= " . $conn->DBDate($to) . " @@ -259,13 +259,13 @@ private function generateReport() { $sqlc = " - select coalesce(sum(0-e.`amount`) ,0) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select coalesce(sum(0-e.quantity*e.partion) ,0) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e join `documents_view` d on d.`document_id` = e.`document_id` - where e.`quantity` <>0 - and d.`meta_name` in ('GoodsIssue', 'ServiceAct' , 'POSCheck','ReturnIssue','TTN','OrderCust') + where e.partion is not null and e.`quantity` <>0 + and d.`meta_name` in ('GoodsIssue', 'ServiceAct' , 'POSCheck','ReturnIssue','TTN' ) {$br} {$u} AND DATE(e.document_date) >= " . $conn->DBDate($from) . " AND DATE(e.document_date) <= " . $conn->DBDate($to) . " and d.customer_id in({$custlist}) @@ -282,12 +282,12 @@ private function generateReport() { if ($type == 9) { //по компаниям $sql = " - select d.`firm_name` as itemname,sum(0-e.`quantity`) as qty, sum(0-e.`amount`) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select d.`firm_name` as itemname,sum(0-e.`quantity`) as qty, sum(0-e.quantity*e.partion) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e join `documents_view` d on d.`document_id` = e.`document_id` - where d.`firm_id` >0 and e.`quantity` <>0 + where e.partion is not null and d.`firm_id` >0 and e.`quantity` <>0 and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN') {$br} {$u} AND DATE(e.document_date) >= " . $conn->DBDate($from) . " @@ -298,7 +298,7 @@ private function generateReport() { } if ($type == 10) { //по складах $sql = " - select sr.`storename` as itemname,sum(0-e.`quantity`) as qty, sum(0-e.quantity*e.partion) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select sr.`storename` as itemname,sum(0-e.`quantity`) as qty, sum(0-e.quantity*e.partion) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e @@ -306,7 +306,7 @@ private function generateReport() { join `stores` sr on sr.`store_id` = st.`store_id` join `documents_view` d on d.`document_id` = e.`document_id` - where e.`quantity` <>0 + where e.partion is not null and e.`quantity` <>0 and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN') {$br} {$u} AND DATE(e.document_date) >= " . $conn->DBDate($from) . " @@ -319,13 +319,13 @@ private function generateReport() { if ($type == 11) { //по источникам $sql = " - select i.itemname, sum(0-e.`quantity`) as qty, sum(0-e.quantity*e.partion) as summa, sum(e.extcode*(0-e.`quantity`)) as navar + select i.itemname, sum(0-e.`quantity`) as qty, sum(0-e.quantity*e.partion) as summa, sum((e.outprice-e.partion )*(0-e.`quantity`)) as navar from `entrylist_view` e join `items` i on e.`item_id` = i.`item_id` join `documents_view` d on d.`document_id` = e.`document_id` - where e.`quantity` <>0 and ExtractValue(d.content, '//doc/header/salesource') = {$salesource} + where e.partion is not null and e.`quantity` <>0 and ExtractValue(d.content, '//doc/header/salesource') = {$salesource} and d.`meta_name` in ('GoodsIssue', 'POSCheck','ReturnIssue','TTN') {$br} {$u} AND DATE(e.document_date) >= " . $conn->DBDate($from) . " diff --git a/www/app/pages/timesheet.php b/www/app/pages/timesheet.php index 3d4ec07a0..a836bcf9e 100644 --- a/www/app/pages/timesheet.php +++ b/www/app/pages/timesheet.php @@ -286,7 +286,7 @@ public function listOnRow($row) { $row->add(new Label('lto', date('H:i', $item->t_end))); $row->add(new Label('ltypename', $tl[$item->t_type])); $row->add(new Label('ldesc', $item->description)); - $row->add(new Label('lbranch', $item->branch_name)); + $row->add(new Label('lbranch', $item->branch_id > 0 ? $item->branch_name :'')); $diff = $item->t_end - $item->t_start - ($item->t_break * 60); $diff = number_format($diff / 3600, 2, '.', ''); diff --git a/www/templates/pages/reference/customerlist.html b/www/templates/pages/reference/customerlist.html index 91d5b8098..13c58e143 100644 --- a/www/templates/pages/reference/customerlist.html +++ b/www/templates/pages/reference/customerlist.html @@ -64,10 +64,13 @@

Справочник контрагентов

{{/leadmode}} Добавить нового - +
- + + {{^leadmode}} {{/leadmode}} @@ -79,8 +82,9 @@

Справочник контрагентов

- + + @@ -96,13 +100,16 @@

Справочник контрагентов

+ +
Имя Имя Тел. E-MailДок.
   -   -   +
+
@@ -599,6 +606,13 @@
Редактирование состояний лидов
{{/leadmode}} + + diff --git a/www/templates/pages/report/abc.html b/www/templates/pages/report/abc.html index 568bfbfc7..b0ff57aca 100644 --- a/www/templates/pages/report/abc.html +++ b/www/templates/pages/report/abc.html @@ -31,7 +31,7 @@

АВС анализ

@@ -596,9 +607,20 @@
Редагуванняя станів лідів
}; + + {{/leadmode}} + + + diff --git a/www/templates_ua/pages/report/abc.html b/www/templates_ua/pages/report/abc.html index a2f1bc53a..5708b7400 100644 --- a/www/templates_ua/pages/report/abc.html +++ b/www/templates_ua/pages/report/abc.html @@ -31,7 +31,7 @@

АВС аналіз

-   Результат звіту в тисячах

+ Назва - Знач., Тис. + Знач. % From d0e6db1d5608f392ba14ebb9645f9079ae243c1f Mon Sep 17 00:00:00 2001 From: "HOME\\leonm" Date: Thu, 13 May 2021 23:50:58 +0300 Subject: [PATCH 3/5] fix barcode lib --- www/app/pages/base.php | 2 +- www/app/pages/reference/customerlist.php | 32 + www/app/pages/register/doclist.php | 7 + www/composer.json | 5 +- www/composer.lock | 1116 ++++++++++++++++-- www/templates/lang.json | 3 +- www/templates/pages/base.html | 7 +- www/templates/pages/register/doclist.html | 6 +- www/templates/printforms/item_tag.tpl | 2 +- www/templates_ua/lang.json | 3 +- www/templates_ua/pages/base.html | 7 +- www/templates_ua/pages/register/doclist.html | 7 +- www/templates_ua/printforms/item_tag.tpl | 2 +- 13 files changed, 1060 insertions(+), 139 deletions(-) diff --git a/www/app/pages/base.php b/www/app/pages/base.php index 7387b6300..701c153af 100644 --- a/www/app/pages/base.php +++ b/www/app/pages/base.php @@ -299,7 +299,7 @@ private function generateTosats() { if ($user->defmf == 0) { $this->_tvars["toasts"][] = array('title' => "title:\"" . Helper::l("nodefmf") . "\""); } - + if(count( $this->_tvars["toasts"])==0)$this->_tvars["toasts"][] = array('title' => ''); \App\Session::getSession()->toasts = true; } diff --git a/www/app/pages/reference/customerlist.php b/www/app/pages/reference/customerlist.php index 447c87b3d..43af69b9e 100644 --- a/www/app/pages/reference/customerlist.php +++ b/www/app/pages/reference/customerlist.php @@ -766,9 +766,41 @@ public function closeStat($sender) { $this->customertable->setVisible(true); $this->statpan->setVisible(false); } + public function OnDelAll($sender) { + if (false == \App\ACL::checkDelRef('CustomerList')) { + return; + } + $ids = array(); + foreach ( $this->customertable->listform->customerlist->getDataRows() as $row) { + $item = $row->getDataItem(); + if ($item->seldel == true) { + $ids[] = $item->customer_id; + } + } + if(count($ids)==0) return; + + $conn = \ZDB\DB::getConnect(); + $d=0;$u=0; + foreach($ids as $id) { + $sql = " select count(*) from documents where customer_id = {$id} "; + $cnt = $conn->GetOne($sql); + if($cnt >0) { + $u++; + $conn->Execute("update customers set status=1 where customer_id={$id}"); + } else { + $d++; + $conn->Execute("delete from customers where customer_id={$id}"); + + } + } + + $this->setSuccess("delcusts",$d,$u) ; + + $this->customertable->listform->customerlist->Reload(); + } } diff --git a/www/app/pages/register/doclist.php b/www/app/pages/register/doclist.php index 3b40cb144..519939c59 100644 --- a/www/app/pages/register/doclist.php +++ b/www/app/pages/register/doclist.php @@ -48,6 +48,7 @@ public function __construct($docid = 0) { $filter->page = 1; $filter->doctype = 0; $filter->customer = 0; + $filter->author = 0; $filter->customer_name = ''; $filter->searchnumber = ''; @@ -56,6 +57,7 @@ public function __construct($docid = 0) { $this->filter->add(new Date('from', $filter->from)); $this->filter->add(new Date('to', $filter->to)); $this->filter->add(new DropDownChoice('doctype', H::getDocTypes(), $filter->doctype)); + $this->filter->add(new DropDownChoice('author', \App\Entity\User::findArray('username','','username'), $filter->author)); $this->filter->add(new ClickLink('erase', $this, "onErase")); $this->filter->add(new AutocompleteTextInput('searchcust'))->onText($this, 'OnAutoCustomer'); @@ -126,6 +128,7 @@ public function filterOnSubmit($sender) { $filter->from = $this->filter->from->getDate(); $filter->to = $this->filter->to->getDate(true); $filter->doctype = $this->filter->doctype->getValue(); + $filter->author = $this->filter->author->getValue(); $filter->customer = $this->filter->searchcust->getKey(); $filter->customer_name = $this->filter->searchcust->getText(); @@ -428,6 +431,10 @@ private function getWhere() { $where .= " and customer_id ={$filter->customer} "; } + if ($filter->author > 0) { + $where .= " and user_id ={$filter->author} "; + } + $sn = $filter->searchnumber; diff --git a/www/composer.json b/www/composer.json index 20e9e67ab..84007ba12 100644 --- a/www/composer.json +++ b/www/composer.json @@ -17,8 +17,9 @@ "dompdf/dompdf": "v0.8.5", "firebase/php-jwt": "v5.0.0", "roave/security-advisories": "dev-master", - "picqer/php-barcode-generator": "v0.3", - + "picqer/php-barcode-generator": "v2.0.1", + "endroid/qr-code": "3.9.6", + "masterexploder/phpthumb" :"*", "lemmon/fetch" :"v0.3.0", "lis-dev/nova-poshta-api-2" :"0.1.6", diff --git a/www/composer.lock b/www/composer.lock index 70c67d831..ec504eefa 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e5b23d3c95bc1d93cb32c8a466076553", + "content-hash": "674b8c588a4ad21a9ddb5d0932de5e91", "packages": [ { "name": "adodb/adodb-php", @@ -116,6 +116,106 @@ }, "time": "2019-01-16T20:28:40+00:00" }, + { + "name": "bacon/bacon-qr-code", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/Bacon/BaconQrCode.git", + "reference": "3e9d791b67d0a2912922b7b7c7312f4b37af41e4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/3e9d791b67d0a2912922b7b7c7312f4b37af41e4", + "reference": "3e9d791b67d0a2912922b7b7c7312f4b37af41e4", + "shasum": "" + }, + "require": { + "dasprid/enum": "^1.0.3", + "ext-iconv": "*", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "phly/keep-a-changelog": "^1.4", + "phpunit/phpunit": "^7 | ^8 | ^9", + "squizlabs/php_codesniffer": "^3.4" + }, + "suggest": { + "ext-imagick": "to generate QR code images" + }, + "type": "library", + "autoload": { + "psr-4": { + "BaconQrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Ben Scholzen 'DASPRiD'", + "email": "mail@dasprids.de", + "homepage": "https://dasprids.de/", + "role": "Developer" + } + ], + "description": "BaconQrCode is a QR code generator for PHP.", + "homepage": "https://github.com/Bacon/BaconQrCode", + "support": { + "issues": "https://github.com/Bacon/BaconQrCode/issues", + "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.3" + }, + "time": "2020-10-30T02:02:47+00:00" + }, + { + "name": "dasprid/enum", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/DASPRiD/Enum.git", + "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2", + "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "^7 | ^8 | ^9", + "squizlabs/php_codesniffer": "^3.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "DASPRiD\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Ben Scholzen 'DASPRiD'", + "email": "mail@dasprids.de", + "homepage": "https://dasprids.de/", + "role": "Developer" + } + ], + "description": "PHP 7.1 enum implementation", + "keywords": [ + "enum", + "map" + ], + "support": { + "issues": "https://github.com/DASPRiD/Enum/issues", + "source": "https://github.com/DASPRiD/Enum/tree/1.0.3" + }, + "time": "2020-10-02T16:03:48+00:00" + }, { "name": "dompdf/dompdf", "version": "v0.8.5", @@ -186,6 +286,81 @@ }, "time": "2020-02-20T03:52:51+00:00" }, + { + "name": "endroid/qr-code", + "version": "3.9.6", + "source": { + "type": "git", + "url": "https://github.com/endroid/qr-code.git", + "reference": "9cdd4f5d609bfc8811ca4a62b4d23eb16976242f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/endroid/qr-code/zipball/9cdd4f5d609bfc8811ca4a62b4d23eb16976242f", + "reference": "9cdd4f5d609bfc8811ca4a62b4d23eb16976242f", + "shasum": "" + }, + "require": { + "bacon/bacon-qr-code": "^2.0", + "khanamiryan/qrcode-detector-decoder": "^1.0.2", + "myclabs/php-enum": "^1.5", + "php": ">=7.2", + "symfony/options-resolver": "^3.4||^4.4||^5.0", + "symfony/property-access": "^3.4||^4.4||^5.0" + }, + "require-dev": { + "endroid/quality": "^1.3.7", + "setasign/fpdf": "^1.8" + }, + "suggest": { + "ext-gd": "Required for generating PNG images", + "roave/security-advisories": "Avoids installation of package versions with vulnerabilities", + "setasign/fpdf": "Required to use the FPDF writer.", + "symfony/security-checker": "Checks your composer.lock for vulnerabilities" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Endroid\\QrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeroen van den Enden", + "email": "info@endroid.nl" + } + ], + "description": "Endroid QR Code", + "homepage": "https://github.com/endroid/qr-code", + "keywords": [ + "bundle", + "code", + "endroid", + "php", + "qr", + "qrcode" + ], + "support": { + "issues": "https://github.com/endroid/qr-code/issues", + "source": "https://github.com/endroid/qr-code/tree/3.9.6" + }, + "funding": [ + { + "url": "https://github.com/endroid", + "type": "github" + } + ], + "time": "2020-11-27T14:30:38+00:00" + }, { "name": "ezyang/htmlpurifier", "version": "v4.13.0", @@ -491,6 +666,61 @@ }, "time": "2021-04-26T09:17:50+00:00" }, + { + "name": "khanamiryan/qrcode-detector-decoder", + "version": "1.0.5.1", + "source": { + "type": "git", + "url": "https://github.com/khanamiryan/php-qrcode-detector-decoder.git", + "reference": "b96163d4f074970dfe67d4185e75e1f4541b30ca" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/b96163d4f074970dfe67d4185e75e1f4541b30ca", + "reference": "b96163d4f074970dfe67d4185e75e1f4541b30ca", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "^5.7 | ^7.5 | ^8.0 | ^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Zxing\\": "lib/" + }, + "files": [ + "lib/Common/customFunctions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT", + "Apache-2.0" + ], + "authors": [ + { + "name": "Ashot Khanamiryan", + "email": "a.khanamiryan@gmail.com", + "homepage": "https://github.com/khanamiryan", + "role": "Developer" + } + ], + "description": "QR code decoder / reader", + "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder/", + "keywords": [ + "barcode", + "qr", + "zxing" + ], + "support": { + "issues": "https://github.com/khanamiryan/php-qrcode-detector-decoder/issues", + "source": "https://github.com/khanamiryan/php-qrcode-detector-decoder/tree/1.0.5.1" + }, + "time": "2021-04-21T08:02:08+00:00" + }, { "name": "lemmon/fetch", "version": "v0.3.0", @@ -1584,23 +1814,29 @@ }, { "name": "picqer/php-barcode-generator", - "version": "v0.3", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/picqer/php-barcode-generator.git", - "reference": "2e4d5b1f7f04fdb348d0721ada65963dac6f0c0c" + "reference": "16c51a795454198500cdfb4f82de288945af3960" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/picqer/php-barcode-generator/zipball/2e4d5b1f7f04fdb348d0721ada65963dac6f0c0c", - "reference": "2e4d5b1f7f04fdb348d0721ada65963dac6f0c0c", + "url": "https://api.github.com/repos/picqer/php-barcode-generator/zipball/16c51a795454198500cdfb4f82de288945af3960", + "reference": "16c51a795454198500cdfb4f82de288945af3960", "shasum": "" }, "require": { - "php": ">=5.4.0" + "ext-mbstring": "*", + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "^5.3" + "phpunit/phpunit": "^8.5" + }, + "suggest": { + "ext-bcmath": "Barcode IMB (Intelligent Mail Barcode) needs bcmath extension", + "ext-gd": "For JPG and PNG generators, GD or Imagick is required", + "ext-imagick": "For JPG and PNG generators, GD or Imagick is required" }, "type": "library", "autoload": { @@ -1610,7 +1846,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPLv3" + "LGPL-3.0-or-later" ], "authors": [ { @@ -1620,11 +1856,12 @@ }, { "name": "Casper Bakker", - "email": "info@picqer.com" + "email": "info@picqer.com", + "homepage": "https://picqer.com" } ], "description": "An easy to use, non-bloated, barcode generator in PHP. Creates SVG, PNG, JPG and HTML images from the most used 1D barcode standards.", - "homepage": "http://github.com/picqer/php-barcode-generator", + "homepage": "https://github.com/picqer/php-barcode-generator", "keywords": [ "CODABAR", "Code11", @@ -1651,9 +1888,9 @@ ], "support": { "issues": "https://github.com/picqer/php-barcode-generator/issues", - "source": "https://github.com/picqer/php-barcode-generator/tree/v0.3" + "source": "https://github.com/picqer/php-barcode-generator/tree/master" }, - "time": "2019-01-12T09:29:34+00:00" + "time": "2020-01-28T13:00:23+00:00" }, { "name": "psr/http-client", @@ -1966,12 +2203,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "07314cf15422b2e162d591fe8ef2b850612b808f" + "reference": "630d41ce85b7af3598a7d2c07952739da298ecc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/07314cf15422b2e162d591fe8ef2b850612b808f", - "reference": "07314cf15422b2e162d591fe8ef2b850612b808f", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/630d41ce85b7af3598a7d2c07952739da298ecc6", + "reference": "630d41ce85b7af3598a7d2c07952739da298ecc6", "shasum": "" }, "conflict": { @@ -2019,8 +2256,8 @@ "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", "dolibarr/dolibarr": "<11.0.4", "dompdf/dompdf": ">=0.6,<0.6.2", - "drupal/core": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", - "drupal/drupal": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", + "drupal/core": ">=7,<7.80|>=8,<8.9.14|>=9,<9.0.12|>=9.1,<9.1.7", + "drupal/drupal": ">=7,<7.80|>=8,<8.9.14|>=9,<9.0.12|>=9.1,<9.1.7", "dweeves/magmi": "<=0.7.24", "endroid/qr-code-bundle": "<3.4.2", "enshrined/svg-sanitize": "<0.13.1", @@ -2079,6 +2316,7 @@ "laravel/framework": "<6.20.26|>=7,<8.40", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "league/commonmark": "<0.18.3", + "lexik/jwt-authentication-bundle": ">=2,<2.10.7|>=2.11,<2.11.3", "librenms/librenms": "<21.1", "livewire/livewire": ">2.2.4,<2.2.6", "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3", @@ -2199,20 +2437,21 @@ "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", + "symfony/maker-bundle": ">=1.27,<1.31.1", "symfony/mime": ">=4.3,<4.3.8", "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/polyfill": ">=1,<1.10", "symfony/polyfill-php55": ">=1,<1.10", "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=4.4,<4.4.7|>=5,<5.0.7", + "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", - "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.37|>=3,<3.3.17|>=3.4,<3.4.7|>=4,<4.0.7", + "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", - "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", + "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8", "symfony/serializer": ">=2,<2.0.11", - "symfony/symfony": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5", + "symfony/symfony": ">=2,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", @@ -2312,7 +2551,7 @@ "type": "tidelift" } ], - "time": "2021-05-06T19:08:33+00:00" + "time": "2021-05-12T16:13:16+00:00" }, { "name": "sabberworm/php-css-parser", @@ -2364,43 +2603,35 @@ "time": "2020-06-01T09:10:00+00:00" }, { - "name": "symfony/polyfill-intl-idn", - "version": "v1.22.1", + "name": "symfony/deprecation-contracts", + "version": "v2.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" - }, - "suggest": { - "ext-intl": "For best performance" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "2.4-dev" }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ - "bootstrap.php" + "function.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2409,30 +2640,18 @@ ], "authors": [ { - "name": "Laurent Bassin", - "email": "laurent@bassin.info" - }, - { - "name": "Trevor Rowbotham", - "email": "trevor.rowbotham@pm.me" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "idn", - "intl", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" }, "funding": [ { @@ -2448,47 +2667,35 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "name": "symfony/options-resolver", + "version": "v5.2.4", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", + "reference": "5d0f633f9bbfcf7ec642a2b5037268e61b0a62ce", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php73": "~1.0", + "symfony/polyfill-php80": "^1.15" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.22-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + "Symfony\\Component\\OptionsResolver\\": "" }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2497,26 +2704,23 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", + "description": "Provides an improved replacement for the array_replace PHP function", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" + "config", + "configuration", + "options" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + "source": "https://github.com/symfony/options-resolver/tree/v5.2.4" }, "funding": [ { @@ -2532,27 +2736,27 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-01-27T12:56:27+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.22.0", + "name": "symfony/polyfill-ctype", + "version": "v1.22.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { "php": ">=7.1" }, "suggest": { - "ext-mbstring": "For best performance" + "ext-ctype": "For best performance" }, "type": "library", "extra": { @@ -2566,7 +2770,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" + "Symfony\\Polyfill\\Ctype\\": "" }, "files": [ "bootstrap.php" @@ -2578,25 +2782,24 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for the Mbstring extension", + "description": "Symfony polyfill for ctype functions", "homepage": "https://symfony.com", "keywords": [ "compatibility", - "mbstring", + "ctype", "polyfill", - "portable", - "shim" + "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" }, "funding": [ { @@ -2615,22 +2818,25 @@ "time": "2021-01-07T16:49:33+00:00" }, { - "name": "symfony/polyfill-php72", + "name": "symfony/polyfill-intl-grapheme", "version": "v1.22.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170", + "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170", "shasum": "" }, "require": { "php": ">=7.1" }, + "suggest": { + "ext-intl": "For best performance" + }, "type": "library", "extra": { "branch-alias": { @@ -2643,7 +2849,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" }, "files": [ "bootstrap.php" @@ -2663,16 +2869,424 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "description": "Symfony polyfill for intl's grapheme_* functions", "homepage": "https://symfony.com", "keywords": [ "compatibility", + "grapheme", + "intl", "polyfill", "portable", "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-01-22T09:19:47+00:00" + }, + { + "name": "symfony/polyfill-intl-idn", + "version": "v1.22.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", + "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php72": "^1.10" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-01-22T09:19:47+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.22.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", + "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-01-22T09:19:47+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.22.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-01-07T16:49:33+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.22.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-01-07T16:49:33+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.22.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.22-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" }, "funding": [ { @@ -2852,18 +3466,272 @@ ], "time": "2021-01-07T16:49:33+00:00" }, + { + "name": "symfony/property-access", + "version": "v5.2.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/property-access.git", + "reference": "3af8ed262bd3217512a13b023981fe68f36ad5f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/property-access/zipball/3af8ed262bd3217512a13b023981fe68f36ad5f3", + "reference": "3af8ed262bd3217512a13b023981fe68f36ad5f3", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php80": "^1.15", + "symfony/property-info": "^5.2" + }, + "require-dev": { + "symfony/cache": "^4.4|^5.0" + }, + "suggest": { + "psr/cache-implementation": "To cache access methods." + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\PropertyAccess\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides functions to read and write from/to an object or array using a simple string notation", + "homepage": "https://symfony.com", + "keywords": [ + "access", + "array", + "extraction", + "index", + "injection", + "object", + "property", + "property path", + "reflection" + ], + "support": { + "source": "https://github.com/symfony/property-access/tree/v5.2.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-01-27T10:15:41+00:00" + }, + { + "name": "symfony/property-info", + "version": "v5.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/property-info.git", + "reference": "cc8121baf91039648d5f8feb894dc4a9d4935cc0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/property-info/zipball/cc8121baf91039648d5f8feb894dc4a9d4935cc0", + "reference": "cc8121baf91039648d5f8feb894dc4a9d4935cc0", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-php80": "^1.15", + "symfony/string": "^5.1" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/dependency-injection": "<4.4" + }, + "require-dev": { + "doctrine/annotations": "^1.10.4", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/cache": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/serializer": "^4.4|^5.0" + }, + "suggest": { + "phpdocumentor/reflection-docblock": "To use the PHPDoc", + "psr/cache-implementation": "To cache results", + "symfony/doctrine-bridge": "To use Doctrine metadata", + "symfony/serializer": "To use Serializer metadata" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\PropertyInfo\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Extracts information about PHP class' properties using metadata of popular sources", + "homepage": "https://symfony.com", + "keywords": [ + "doctrine", + "phpdoc", + "property", + "symfony", + "type", + "validator" + ], + "support": { + "source": "https://github.com/symfony/property-info/tree/v5.2.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-07T14:04:56+00:00" + }, + { + "name": "symfony/string", + "version": "v5.2.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", + "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0", + "symfony/http-client": "^4.4|^5.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "files": [ + "Resources/functions.php" + ], + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v5.2.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-10T14:56:10+00:00" + }, { "name": "symfony/translation", - "version": "v5.2.7", + "version": "v5.2.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e37ece5242564bceea54d709eafc948377ec9749" + "reference": "445caa74a5986f1cc9dd91a2975ef68fa7cb2068" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e37ece5242564bceea54d709eafc948377ec9749", - "reference": "e37ece5242564bceea54d709eafc948377ec9749", + "url": "https://api.github.com/repos/symfony/translation/zipball/445caa74a5986f1cc9dd91a2975ef68fa7cb2068", + "reference": "445caa74a5986f1cc9dd91a2975ef68fa7cb2068", "shasum": "" }, "require": { @@ -2927,7 +3795,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.2.7" + "source": "https://github.com/symfony/translation/tree/v5.2.8" }, "funding": [ { @@ -2943,7 +3811,7 @@ "type": "tidelift" } ], - "time": "2021-04-01T08:15:21+00:00" + "time": "2021-05-07T13:41:16+00:00" }, { "name": "symfony/translation-contracts", diff --git a/www/templates/lang.json b/www/templates/lang.json index 197415d02..0a086fef5 100644 --- a/www/templates/lang.json +++ b/www/templates/lang.json @@ -424,5 +424,6 @@ "shopneworder": "Создан заказ %s", "shopyoursorder": "Ваш заказ %s", "notalldata": "Не введены все данные", - "nocommonoptions": "Не заданы параметры в общих настройках" + "nocommonoptions": "Не заданы параметры в общих настройках", + "delcusts": "Удалено %s, деактивировано %s " } \ No newline at end of file diff --git a/www/templates/pages/base.html b/www/templates/pages/base.html index 6da995556..73306ee40 100644 --- a/www/templates/pages/base.html +++ b/www/templates/pages/base.html @@ -824,18 +824,19 @@ - {{/toasts}} + {{/toasts}} - + - + diff --git a/www/templates/pages/service/import.html b/www/templates/pages/service/import.html index 861cc488d..7dfe8070d 100644 --- a/www/templates/pages/service/import.html +++ b/www/templates/pages/service/import.html @@ -21,6 +21,7 @@

Импорт номенклатуры

@@ -42,6 +43,14 @@

Импорт номенклатуры

+
+ + +
+
+ + +
diff --git a/www/templates/printforms/report/paybalance.tpl b/www/templates/printforms/report/paybalance.tpl index 5b1c09db2..3f9c7ba1d 100644 --- a/www/templates/printforms/report/paybalance.tpl +++ b/www/templates/printforms/report/paybalance.tpl @@ -38,7 +38,7 @@ - Расходы> + Расходы diff --git a/www/templates/widgets/docview.html b/www/templates/widgets/docview.html index 4c6cb6251..328aab2de 100644 --- a/www/templates/widgets/docview.html +++ b/www/templates/widgets/docview.html @@ -114,7 +114,13 @@
+ +
Уведомить
+ +
+
+