Merge branch 'next-3.x' into 'main'

Next 3.x

See merge request !100

bin/backend/controls/DeliveryAddress.js

@@ -77,6 +77,12 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
             const self = this,
                 Elm = this.getElm();
 
+            function ignoreAutoFill(node)
+            {
+                node.role = 'presentation';
+                node.autocomplete = 'off';
+            }
+
             Elm.set('html', Mustache.render(template, {
                 labelDifferentDeliveryAddress: QUILocale.get(
                     lg,
@@ -131,6 +137,14 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
             this.$Firstname.disabled = false;
             this.$Lastname.disabled = false;
 
+            ignoreAutoFill(this.$Salutation);
+            ignoreAutoFill(this.$Firstname);
+            ignoreAutoFill(this.$Lastname);
+            ignoreAutoFill(this.$Company);
+            ignoreAutoFill(this.$Street);
+            ignoreAutoFill(this.$ZIP);
+            ignoreAutoFill(this.$City);
+
             const Panel = QUI.Controls.getById(
                 this.getElm().getParent('.qui-panel').get('data-quiid')
             );
@@ -159,10 +173,15 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
                     this.$userId = this.$Customer.getValue();
 
                     this.$Customer.addEvent('onChange', () => {
+                        // same user needs no change
+                        if (this.$Customer.getValue() === this.$userId) {
+                            return;
+                        }
+
                         this.$userId = this.$Customer.getValue();
 
                         this.$getDeliveryAddressFromUser().then((result) => {
-                             if (!result) {
+                            if (!result) {
                                 this.$Checked.checked = false;
                                 this.$checkBoxChange();
                                 return;
@@ -300,8 +319,8 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
                 firstname: '',
                 lastname: ''
             };
-
             Object.merge(Address, value);
+
             this.$displayAddressData(Address);
 
             this.$Checked.checked = true;
@@ -370,15 +389,13 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
          * @param {DocumentEvent} [event]
          */
         $checkBoxChange: function(event) {
-            const self = this,
-                Checkbox = this.getElm().getElement('[name="differentDeliveryAddress"]'),
-                closables = this.getElm().getElements('.closable');
+            const closables = this.getElm().getElements('.closable');
 
             if (event) {
                 event.stop();
             }
 
-            if (!Checkbox) {
+            if (!this.$Checked) {
                 return;
             }
 
@@ -397,16 +414,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
             }
 
             if (!this.$userId) {
-                Checkbox.checked = false;
-
-                /*
-                QUI.getMessageHandler().then(function(MH) {
-                    MH.addInformation(
-                        QUILocale.get('quiqqer/erp', 'controls.DeliveryAddress.msg.select_customer'),
-                        self.$Customer.getElm()
-                    );
-                });
-                */
+                this.$Checked.checked = false;
 
                 this.$AddressSelectBtn.disable();
                 return;
@@ -414,7 +422,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
 
             this.$AddressSelectBtn.enable();
 
-            if (Checkbox.checked) {
+            if (this.$Checked.checked) {
                 closables.setStyle('display', null);
                 return;
             }

bin/backend/controls/process/ProcessGrid.js

@@ -119,6 +119,14 @@ define('package/quiqqer/erp/bin/backend/controls/process/ProcessGrid', [
                         case 'QUI\\ERP\\SalesOrders\\SalesOrder':
                             Type.setAttribute('title', QUILocale.get(lg, 'processGrid.salesOrder.open'));
                             break;
+
+                        case 'QUI\\ERP\\Accounting\\Offers\\Offer':
+                            Type.setAttribute('title', QUILocale.get(lg, 'processGrid.offer.open'));
+                            break;
+
+                        case 'QUI\\ERP\\Accounting\\Offers\\OfferTemporary':
+                            Type.setAttribute('title', QUILocale.get(lg, 'processGrid.temporaryOffer.open'));
+                            break;
                     }
 
                     if (typeof entry.paid_status === 'undefined') {
@@ -171,6 +179,14 @@ define('package/quiqqer/erp/bin/backend/controls/process/ProcessGrid', [
                     panel = 'package/quiqqer/salesorders/bin/js/backend/controls/panels/SalesOrder';
                     break;
 
+                case 'QUI\\ERP\\Accounting\\Offers\\Offer':
+                    panel = 'package/quiqqer/offers/bin/js/backend/controls/panels/Offer';
+                    break;
+
+                case 'QUI\\ERP\\Accounting\\Offers\\OfferTemporary':
+                    panel = 'package/quiqqer/offers/bin/js/backend/controls/panels/TemporaryOffer';
+                    break;
+
                 default:
                     console.error('missing', uuid, Btn.getAttribute('entityType'));
                     return;

bin/backend/controls/userData/UserData.js

@@ -122,6 +122,12 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
         create: function() {
             const labelUser = this.getAttribute('labelUser');
 
+            function ignoreAutoFill(node)
+            {
+                node.role = 'presentation';
+                node.autocomplete = 'off';
+            }
+
             this.$Elm = new Element('div', {
                 html: Mustache.render(template, {
                     labelTitle: labelUser,
@@ -209,6 +215,11 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
             this.$Zip = this.$Elm.getElement('[name="zip"]');
             this.$City = this.$Elm.getElement('[name="city"]');
 
+            ignoreAutoFill(this.$Company);
+            ignoreAutoFill(this.$Street);
+            ignoreAutoFill(this.$Zip);
+            ignoreAutoFill(this.$City);
+
             this.$Table = this.$Elm.getElement('.quiqqer-erp-userdata--customer');
             this.$rows = this.$Table.getElements('.closable');
             this.$AddressRow = this.$Table.getElement('.address-row');
@@ -245,11 +256,26 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
             return result;
         },
 
+        getAddress: function() {
+            return {
+                id: this.getAttribute('addressId'),
+                contactEmail: this.getAttribute('contactEmail'),
+                salutation: this.getAttribute('salutation'),
+                firstname: this.getAttribute('firstname'),
+                lastname: this.getAttribute('lastname'),
+                city: this.getAttribute('city'),
+                zip: this.getAttribute('zip'),
+                company: this.getAttribute('company'),
+                street_no: this.getAttribute('street_no'),
+                country: this.getAttribute('country')
+            };
+        },
+
         /**
          * Set the complete data values
          *
          * @param {Object} data
-         * @return {void}
+         * @return {Promise}
          */
         setValue: function(data) {
             if (this.$CustomerEdit) {
@@ -272,7 +298,7 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
                 addressPromise = this.setAddressId(data.addressId);
             }
 
-            dataPromise.then(addressPromise).then(() => {
+            return dataPromise.then(addressPromise).then(() => {
                 fields.forEach((field) => {
                     if (typeof data[field] !== 'undefined') {
                         this.setAttribute(field, data[field]);

src/QUI/ERP/Utils/Utils.php

@@ -14,10 +14,12 @@
 class Utils
 {
     public static array $entityIcons = [
-        'QUI\\ERP\\Order\\Order' => 'fa-shopping-basket',
-        'QUI\\ERP\\Accounting\\Invoice\\InvoiceTemporary' => 'fa-file-text-o',
-        'QUI\\ERP\\Accounting\\Invoice\\Invoice' => 'fa-file-text-o',
-        'QUI\\ERP\\SalesOrders\\SalesOrder' => 'fa-suitcase',
+        'QUI\ERP\Order\Order' => 'fa-shopping-basket',
+        'QUI\ERP\Accounting\Invoice\InvoiceTemporary' => 'fa-file-text-o',
+        'QUI\ERP\Accounting\Invoice\Invoice' => 'fa-file-text-o',
+        'QUI\ERP\SalesOrders\SalesOrder' => 'fa-suitcase',
+        'QUI\ERP\Accounting\Offers\Offer' => 'fa-file-text-o',
+        'QUI\ERP\Accounting\Offers\OfferTemporary' => 'fa-file-text-o',
     ];
 
     /**