Skip to content
Code-Schnipsel Gruppen Projekte
Commit 25095e08 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

feat: quiqqer/invoice#46 - add new invoice edit date permission

Übergeordneter 161f5c43
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
......@@ -129,8 +129,6 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/Invoice', [
events : {
onClick: this.print
}
});
this.addButton({
......
......@@ -289,6 +289,12 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
dateTime = time[1];
}
// set invoice date to today
// quiqqer/invoice#46
var local = new Date();
local.setMinutes(local.getMinutes() - local.getTimezoneOffset());
dateDate = local.toJSON().slice(0, 10);
QUIFormUtils.setDataToForm({
date : dateDate,
time_for_payment: self.getAttribute('time_for_payment'),
......@@ -296,6 +302,18 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice', [
editor_id : self.getAttribute('editor_id')
}, Form);
Form.elements.date.set('disabled', true);
Form.elements.date.set('title', QUILocale.get(lg, 'permissions.set.invoice.date'));
require(['Permissions'], function (Permissions) {
Permissions.hasPermission('quiqqer.invoice.change.date').then(function (has) {
if (has) {
Form.elements.date.set('disabled', false);
Form.elements.date.set('title', '');
}
});
});
return QUI.parse(Container);
}).then(function () {
return new Promise(function (resolve, reject) {
......
......@@ -1226,6 +1226,15 @@
<de><![CDATA[Alle]]></de>
<en><![CDATA[All]]></en>
</locale>
<locale name="permissions.set.invoice.date">
<de><![CDATA[
Du besitzt nicht die nötigen Rechte das Rechnungsdatum zu setzen. Daher wird das heutige Datum verwendet.
]]></de>
<en><![CDATA[
You do not have the necessary rights to set the invoice date. Therefore today's date is used.
]]></en>
</locale>
</groups>
<groups name="quiqqer/invoice" datatype="php">
......
......@@ -22,6 +22,9 @@
<permission name="quiqqer.invoice.addPayment" type="bool">
<defaultvalue>0</defaultvalue>
</permission>
<permission name="quiqqer.invoice.change.date" type="bool">
<defaultvalue>0</defaultvalue>
</permission>
<permission name="quiqqer.invoice.temporary.edit" type="bool">
<defaultvalue>0</defaultvalue>
......
......@@ -897,15 +897,17 @@ public function post($PermissionUser = null)
// data
$User = QUI::getUserBySession();
$date = \date('Y-m-d H:i:s');
$date = \date('Y-m-d H:i:s'); // invoice date, to today
$isBrutto = QUI\ERP\Defaults::getBruttoNettoStatus();
$Customer = $this->getCustomer();
$Handler = Handler::getInstance();
if ($this->getAttribute('date')
&& Orthos::checkMySqlDatetimeSyntax($this->getAttribute('date'))
) {
$date = $this->getAttribute('date');
if (QUI\Permissions\Permission::hasPermission('quiqqer.invoice.change.date')) {
if ($this->getAttribute('date')
&& Orthos::checkMySqlDatetimeSyntax($this->getAttribute('date'))
) {
$date = $this->getAttribute('date');
}
}
if ($Customer) {
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren