diff --git a/bin/backend/controls/panels/Invoice.js b/bin/backend/controls/panels/Invoice.js
index be11e5613ebd0f8f643fc2871aca26ef69f16cb1..9a2e91f5eea48b6c6412d27cb1596b6b7d21c9d8 100644
--- a/bin/backend/controls/panels/Invoice.js
+++ b/bin/backend/controls/panels/Invoice.js
@@ -232,6 +232,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Invoice', [
}
});
+ /*
this.addCategory({
icon: 'fa fa-list',
name: 'articles',
@@ -241,6 +242,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Invoice', [
onClick: this.openArticles
}
});
+ */
this.addCategory({
icon: 'fa fa-money',
@@ -722,8 +724,10 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Invoice', [
/**
* open articles
+ * @deprecated
*/
openArticles: function() {
+ return;
const self = this;
this.Loader.show();
diff --git a/src/QUI/ERP/Accounting/Invoice/ErpProvider.php b/src/QUI/ERP/Accounting/Invoice/ErpProvider.php
index 411d5c30309b723e93423960b6ab80fb1eab3a67..992adbc00244c13d0506f48b190eaff8e4837f9e 100644
--- a/src/QUI/ERP/Accounting/Invoice/ErpProvider.php
+++ b/src/QUI/ERP/Accounting/Invoice/ErpProvider.php
@@ -38,7 +38,7 @@ public static function addMenuItems(Map $Map): void
}
$Invoice = new Item([
- 'icon' => 'fa fa-file-text-o',
+ 'icon' => Factory::ERP_INVOICE_ICON,
'name' => 'invoice',
'text' => ['quiqqer/invoice', 'erp.panel.invoice.text'],
'opened' => true,
@@ -56,7 +56,7 @@ public static function addMenuItems(Map $Map): void
$Invoice->appendChild(
new Item([
- 'icon' => 'fa fa-file-text-o',
+ 'icon' => Factory::ERP_INVOICE_ICON,
'name' => 'invoice-drafts',
'text' => ['quiqqer/invoice', 'erp.panel.invoice.drafts.text'],
'require' => 'package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoices'
@@ -65,7 +65,7 @@ public static function addMenuItems(Map $Map): void
$Invoice->appendChild(
new Item([
- 'icon' => 'fa fa-file-text-o',
+ 'icon' => Factory::ERP_INVOICE_ICON,
'name' => 'invoice-journal',
'text' => ['quiqqer/invoice', 'erp.panel.invoice.journal.text'],
'require' => 'package/quiqqer/invoice/bin/backend/controls/panels/Journal'
diff --git a/src/QUI/ERP/Accounting/Invoice/EventHandler.php b/src/QUI/ERP/Accounting/Invoice/EventHandler.php
index 3c16ddaebae27b863d53873d300379478f4e76b3..f405b0dfacd2c4e0314d9a6b695dd7bb1702a04a 100644
--- a/src/QUI/ERP/Accounting/Invoice/EventHandler.php
+++ b/src/QUI/ERP/Accounting/Invoice/EventHandler.php
@@ -271,7 +271,8 @@ public static function onQuiqqerErpGetHistoryByUser(
]),
strtotime($Invoice->getAttribute('c_date')),
'quiqqer/invoice',
- 'fa fa-file-text-o',
+ Factory::ERP_INVOICE_ICON,
+ false,
$Invoice->getUUID()
);
}
diff --git a/src/QUI/ERP/Accounting/Invoice/Factory.php b/src/QUI/ERP/Accounting/Invoice/Factory.php
index a09f79f1c4376f7a21946438f2b018acaaea1867..0fbc282b65b7404c641ece2416767c77a833ea65 100644
--- a/src/QUI/ERP/Accounting/Invoice/Factory.php
+++ b/src/QUI/ERP/Accounting/Invoice/Factory.php
@@ -18,6 +18,8 @@
*/
class Factory extends QUI\Utils\Singleton
{
+ const ERP_INVOICE_ICON = 'fa fa-file-text-o';
+
/**
* Creates a new temporary invoice
*
@@ -47,6 +49,9 @@ public function createInvoice(
// nothing
}
+ if (empty($globalProcessId)) {
+ $globalProcessId = QUI\Utils\Uuid::get();
+ }
$editor = 0;
$c_user = $User->getUUID();
diff --git a/src/QUI/ERP/Accounting/Invoice/Invoice.php b/src/QUI/ERP/Accounting/Invoice/Invoice.php
index b6edae1db462b8105d1055495b91c9213be2a48f..5e48297a0fd5eabf744da1859cef3eb292df2934 100644
--- a/src/QUI/ERP/Accounting/Invoice/Invoice.php
+++ b/src/QUI/ERP/Accounting/Invoice/Invoice.php
@@ -1655,7 +1655,15 @@ public function addComment(string $comment, QUI\Interfaces\Users\User $Permissio
$comments = $this->getAttribute('comments');
$Comments = QUI\ERP\Comments::unserialize($comments);
- $Comments->addComment($comment);
+ $Comments->addComment(
+ $comment,
+ false,
+ 'quiqqer/invoice',
+ Factory::ERP_INVOICE_ICON,
+ false,
+ $this->getUUID()
+ );
+
$this->setAttribute('comments', $Comments->toJSON());
$this->addHistory(
@@ -1708,7 +1716,14 @@ public function addHistory(string $comment): void
$history = $this->getAttribute('history');
$History = QUI\ERP\Comments::unserialize($history);
- $History->addComment($comment);
+ $History->addComment(
+ $comment,
+ false,
+ 'quiqqer/invoice',
+ Factory::ERP_INVOICE_ICON,
+ false,
+ $this->getUUID()
+ );
$this->setAttribute('history', $History->toJSON());
diff --git a/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php b/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php
index 1d0d6011ae68be373da787ad92551c04a93ea72b..823c8697285e318de29bcd0ce517b05a04a0ea9a 100644
--- a/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php
+++ b/src/QUI/ERP/Accounting/Invoice/InvoiceTemporary.php
@@ -1416,7 +1416,12 @@ public function post(QUI\Interfaces\Users\User $PermissionUser = null): Invoice
'oldHash' => $oldHash,
'newHash' => $this->getAttribute('hash')
]
- )
+ ),
+ false,
+ 'quiqqer/invoice',
+ Factory::ERP_INVOICE_ICON,
+ false,
+ $this->getUUID()
);
}
} catch (QUI\Exception $Exception) {
@@ -1431,7 +1436,12 @@ public function post(QUI\Interfaces\Users\User $PermissionUser = null): Invoice
QUI::getLocale()->get('quiqqer/invoice', 'history.invoiceTemporary.post', [
'userId' => QUI::getUserBySession()->getUniqueId(),
'username' => QUI::getUserBySession()->getUsername()
- ])
+ ]),
+ false,
+ 'quiqqer/invoice',
+ Factory::ERP_INVOICE_ICON,
+ false,
+ $this->getUUID()
);
// new invoice id
@@ -2058,7 +2068,15 @@ public function addComment(string $message): void
<img><table><tbody><td><tfoot><th><thead><tr>'
);
- $this->Comments->addComment($message);
+ $this->Comments->addComment(
+ $message,
+ false,
+ 'quiqqer/invoice',
+ Factory::ERP_INVOICE_ICON,
+ false,
+ $this->getUUID()
+ );
+
$this->save();
QUI::getEvents()->fireEvent(
@@ -2102,7 +2120,14 @@ public function getHistory(): QUI\ERP\Comments
*/
public function addHistory(string $message): void
{
- $this->History->addComment($message);
+ $this->History->addComment(
+ $message,
+ false,
+ 'quiqqer/invoice',
+ Factory::ERP_INVOICE_ICON,
+ false,
+ $this->getUUID()
+ );
QUI::getEvents()->fireEvent(
'quiqqerInvoiceTemporaryInvoiceAddHistory',
diff --git a/src/QUI/ERP/Accounting/Invoice/RestApi/Provider.php b/src/QUI/ERP/Accounting/Invoice/RestApi/Provider.php
index 9f4c4ca910afd1d5f4b89db2c779739659aea7f8..358f3ecde26f9d2a0776dadfd6c5b2e6385fdab1 100644
--- a/src/QUI/ERP/Accounting/Invoice/RestApi/Provider.php
+++ b/src/QUI/ERP/Accounting/Invoice/RestApi/Provider.php
@@ -7,6 +7,7 @@
use Psr\Http\Message\ResponseInterface as ResponseInterface;
use Psr\Http\Message\ServerRequestInterface as RequestInterface;
use QUI;
+use QUI\ERP\Accounting\Invoice\Factory;
use QUI\ERP\Accounting\Invoice\Factory as InvoiceFactory;
use QUI\ERP\Accounting\Invoice\ProcessingStatus\Handler as ProcessingStatuses;
use QUI\ERP\Currency\Handler as CurrencyHandler;