From d7e8a2fa30aad7d4923daea58809a890457edcd1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 9 Nov 2022 22:56:18 +0100 Subject: [PATCH] permission changes & minor bug fixes --- Admin/Install/Admin.install.php | 0 Admin/Install/Media2.install.json | 0 ICAL.txt | 0 Models/SettingsEnum.php | 0 Theme/Backend/Lang/Navigation.ar.lang.php | 0 Theme/Backend/Lang/Navigation.cs.lang.php | 0 Theme/Backend/Lang/Navigation.da.lang.php | 0 Theme/Backend/Lang/Navigation.de.lang.php | 0 Theme/Backend/Lang/Navigation.el.lang.php | 0 Theme/Backend/Lang/Navigation.en.lang.php | 0 Theme/Backend/Lang/Navigation.es.lang.php | 0 Theme/Backend/Lang/Navigation.fi.lang.php | 0 Theme/Backend/Lang/Navigation.fr.lang.php | 0 Theme/Backend/Lang/Navigation.hu.lang.php | 0 Theme/Backend/Lang/Navigation.it.lang.php | 0 Theme/Backend/Lang/Navigation.ja.lang.php | 0 Theme/Backend/Lang/Navigation.ko.lang.php | 0 Theme/Backend/Lang/Navigation.no.lang.php | 0 Theme/Backend/Lang/Navigation.pl.lang.php | 0 Theme/Backend/Lang/Navigation.pt.lang.php | 0 Theme/Backend/Lang/Navigation.ru.lang.php | 0 Theme/Backend/Lang/Navigation.sv.lang.php | 0 Theme/Backend/Lang/Navigation.th.lang.php | 0 Theme/Backend/Lang/Navigation.tr.lang.php | 0 Theme/Backend/Lang/Navigation.uk.lang.php | 0 Theme/Backend/Lang/Navigation.zh.lang.php | 0 Theme/Backend/Lang/ar.lang.php | 0 Theme/Backend/Lang/cs.lang.php | 0 Theme/Backend/Lang/da.lang.php | 0 Theme/Backend/Lang/de.lang.php | 0 Theme/Backend/Lang/el.lang.php | 0 Theme/Backend/Lang/en.lang.php | 0 Theme/Backend/Lang/es.lang.php | 0 Theme/Backend/Lang/fi.lang.php | 0 Theme/Backend/Lang/fr.lang.php | 0 Theme/Backend/Lang/hu.lang.php | 0 Theme/Backend/Lang/it.lang.php | 0 Theme/Backend/Lang/ja.lang.php | 0 Theme/Backend/Lang/ko.lang.php | 0 Theme/Backend/Lang/no.lang.php | 0 Theme/Backend/Lang/pl.lang.php | 0 Theme/Backend/Lang/pt.lang.php | 0 Theme/Backend/Lang/ru.lang.php | 0 Theme/Backend/Lang/sv.lang.php | 0 Theme/Backend/Lang/th.lang.php | 0 Theme/Backend/Lang/tr.lang.php | 0 Theme/Backend/Lang/uk.lang.php | 0 Theme/Backend/Lang/zh.lang.php | 0 Theme/Backend/purchase-bill-list.tpl.php | 4 ++-- Theme/Backend/purchase-bill.tpl.php | 4 ++-- Theme/Backend/sales-bill-list.tpl.php | 4 ++-- Theme/Backend/sales-bill.tpl.php | 4 ++-- Theme/Backend/user-purchase-bill-dashboard.tpl.php | 4 ++-- Theme/Backend/user-purchase-bill.tpl.php | 4 ++-- tests/Admin/AdminTest.php | 0 tests/Controller/ApiControllerTest.php | 0 tests/Models/BillElementTest.php | 0 tests/Models/BillTest.php | 0 tests/Models/BillTypeL11nTest.php | 0 tests/Models/BillTypeTest.php | 0 tests/Models/NullBillElementTest.php | 0 tests/Models/NullBillTest.php | 0 tests/Models/NullBillTypeTest.php | 0 tests/Models/PurchaseBillMapperTest.php | 0 tests/Models/SalesBillMapperTest.php | 0 tests/Models/StockBillMapperTest.php | 0 66 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 Admin/Install/Admin.install.php mode change 100644 => 100755 Admin/Install/Media2.install.json mode change 100644 => 100755 ICAL.txt mode change 100644 => 100755 Models/SettingsEnum.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ar.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.cs.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.da.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.de.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.el.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.en.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.es.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fi.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.fr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.hu.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.it.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ja.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ko.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.no.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pl.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.pt.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.ru.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.sv.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.th.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.tr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.uk.lang.php mode change 100644 => 100755 Theme/Backend/Lang/Navigation.zh.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ar.lang.php mode change 100644 => 100755 Theme/Backend/Lang/cs.lang.php mode change 100644 => 100755 Theme/Backend/Lang/da.lang.php mode change 100644 => 100755 Theme/Backend/Lang/de.lang.php mode change 100644 => 100755 Theme/Backend/Lang/el.lang.php mode change 100644 => 100755 Theme/Backend/Lang/en.lang.php mode change 100644 => 100755 Theme/Backend/Lang/es.lang.php mode change 100644 => 100755 Theme/Backend/Lang/fi.lang.php mode change 100644 => 100755 Theme/Backend/Lang/fr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/hu.lang.php mode change 100644 => 100755 Theme/Backend/Lang/it.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ja.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ko.lang.php mode change 100644 => 100755 Theme/Backend/Lang/no.lang.php mode change 100644 => 100755 Theme/Backend/Lang/pl.lang.php mode change 100644 => 100755 Theme/Backend/Lang/pt.lang.php mode change 100644 => 100755 Theme/Backend/Lang/ru.lang.php mode change 100644 => 100755 Theme/Backend/Lang/sv.lang.php mode change 100644 => 100755 Theme/Backend/Lang/th.lang.php mode change 100644 => 100755 Theme/Backend/Lang/tr.lang.php mode change 100644 => 100755 Theme/Backend/Lang/uk.lang.php mode change 100644 => 100755 Theme/Backend/Lang/zh.lang.php mode change 100644 => 100755 Theme/Backend/user-purchase-bill-dashboard.tpl.php mode change 100644 => 100755 Theme/Backend/user-purchase-bill.tpl.php mode change 100644 => 100755 tests/Admin/AdminTest.php mode change 100644 => 100755 tests/Controller/ApiControllerTest.php mode change 100644 => 100755 tests/Models/BillElementTest.php mode change 100644 => 100755 tests/Models/BillTest.php mode change 100644 => 100755 tests/Models/BillTypeL11nTest.php mode change 100644 => 100755 tests/Models/BillTypeTest.php mode change 100644 => 100755 tests/Models/NullBillElementTest.php mode change 100644 => 100755 tests/Models/NullBillTest.php mode change 100644 => 100755 tests/Models/NullBillTypeTest.php mode change 100644 => 100755 tests/Models/PurchaseBillMapperTest.php mode change 100644 => 100755 tests/Models/SalesBillMapperTest.php mode change 100644 => 100755 tests/Models/StockBillMapperTest.php diff --git a/Admin/Install/Admin.install.php b/Admin/Install/Admin.install.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Media2.install.json b/Admin/Install/Media2.install.json old mode 100644 new mode 100755 diff --git a/ICAL.txt b/ICAL.txt old mode 100644 new mode 100755 diff --git a/Models/SettingsEnum.php b/Models/SettingsEnum.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/purchase-bill-list.tpl.php b/Theme/Backend/purchase-bill-list.tpl.php index b493c33..081ea30 100755 --- a/Theme/Backend/purchase-bill-list.tpl.php +++ b/Theme/Backend/purchase-bill-list.tpl.php @@ -154,7 +154,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/prefix}purchase/bill?{?}&id=' . $value->getId()); + $url = UriFactory::build('purchase/bill?{?}&id=' . $value->getId()); ?> getNumber(); ?> type->getL11n(); ?> - supplier->number; ?> + supplier->number; ?> printHtml($value->billTo); ?> billAddress; ?> diff --git a/Theme/Backend/purchase-bill.tpl.php b/Theme/Backend/purchase-bill.tpl.php index d8a6042..0cb1d91 100755 --- a/Theme/Backend/purchase-bill.tpl.php +++ b/Theme/Backend/purchase-bill.tpl.php @@ -300,8 +300,8 @@ echo $this->getData('nav')->render(); ?> extension === 'collection' - ? UriFactory::build('{/prefix}media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name) - : UriFactory::build('{/prefix}media/single?id=' . $file->getId() + ? UriFactory::build('media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name) + : UriFactory::build('media/single?id=' . $file->getId() . '&path={?path}' . ( $file->getId() === 0 ? '/' . $file->name diff --git a/Theme/Backend/sales-bill-list.tpl.php b/Theme/Backend/sales-bill-list.tpl.php index b5911ad..9032623 100755 --- a/Theme/Backend/sales-bill-list.tpl.php +++ b/Theme/Backend/sales-bill-list.tpl.php @@ -165,7 +165,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/prefix}sales/bill?{?}&id=' . $value->getId()); + $url = UriFactory::build('sales/bill?{?}&id=' . $value->getId()); ?> getNumber(); ?> type->getL11n(); ?> - client->number; ?> + client->number; ?> printHtml($value->billTo); ?> billAddress; ?> diff --git a/Theme/Backend/sales-bill.tpl.php b/Theme/Backend/sales-bill.tpl.php index 8acd266..6e94422 100755 --- a/Theme/Backend/sales-bill.tpl.php +++ b/Theme/Backend/sales-bill.tpl.php @@ -280,8 +280,8 @@ echo $this->getData('nav')->render(); ?> extension === 'collection' - ? UriFactory::build('{/prefix}media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name) - : UriFactory::build('{/prefix}media/single?id=' . $file->getId() + ? UriFactory::build('media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name) + : UriFactory::build('media/single?id=' . $file->getId() . '&path={?path}' . ( $file->getId() === 0 ? '/' . $file->name diff --git a/Theme/Backend/user-purchase-bill-dashboard.tpl.php b/Theme/Backend/user-purchase-bill-dashboard.tpl.php old mode 100644 new mode 100755 index b8d204e..66dad96 --- a/Theme/Backend/user-purchase-bill-dashboard.tpl.php +++ b/Theme/Backend/user-purchase-bill-dashboard.tpl.php @@ -154,7 +154,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/prefix}private/purchase/bill?{?}&id=' . $value->getId()); + $url = UriFactory::build('private/purchase/bill?{?}&id=' . $value->getId()); ?> getNumber(); ?> type->getL11n(); ?> - supplier->number; ?> + supplier->number; ?> printHtml($value->billTo); ?> billAddress; ?> diff --git a/Theme/Backend/user-purchase-bill.tpl.php b/Theme/Backend/user-purchase-bill.tpl.php old mode 100644 new mode 100755 index 29bfea5..4460dea --- a/Theme/Backend/user-purchase-bill.tpl.php +++ b/Theme/Backend/user-purchase-bill.tpl.php @@ -298,8 +298,8 @@ echo $this->getData('nav')->render(); ?> extension === 'collection' - ? UriFactory::build('{/prefix}media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name) - : UriFactory::build('{/prefix}media/single?id=' . $file->getId() + ? UriFactory::build('media/list?path=' . \rtrim($file->getVirtualPath(), '/') . '/' . $file->name) + : UriFactory::build('media/single?id=' . $file->getId() . '&path={?path}' . ( $file->getId() === 0 ? '/' . $file->name diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php old mode 100644 new mode 100755 diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/BillElementTest.php b/tests/Models/BillElementTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/BillTest.php b/tests/Models/BillTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/BillTypeL11nTest.php b/tests/Models/BillTypeL11nTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/BillTypeTest.php b/tests/Models/BillTypeTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullBillElementTest.php b/tests/Models/NullBillElementTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullBillTest.php b/tests/Models/NullBillTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/NullBillTypeTest.php b/tests/Models/NullBillTypeTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/PurchaseBillMapperTest.php b/tests/Models/PurchaseBillMapperTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/SalesBillMapperTest.php b/tests/Models/SalesBillMapperTest.php old mode 100644 new mode 100755 diff --git a/tests/Models/StockBillMapperTest.php b/tests/Models/StockBillMapperTest.php old mode 100644 new mode 100755