Merge branch 'dev'

ajax/invoices/temporary/save.php

@@ -46,6 +46,7 @@ function ($invoiceId, $data) {
             unset($data['articles']);
         }
 
+        $Invoice->setAttribute('invoice_address', false); // needed because of address reset
         $Invoice->setAttributes($data);
         $Invoice->save();
     },

bin/backend/controls/panels/TemporaryInvoice.UserData.html

@@ -55,7 +55,7 @@
                 <span class="field-container-item" title="{{textStreet}}">
                     {{textStreet}}
                 </span>
-                <input type="text" class="field-container-field" name="street" disabled/>
+                <input type="text" class="field-container-field" name="street_no" disabled/>
             </label>
         </td>
     </tr>

bin/backend/controls/panels/TemporaryInvoice.UserData.js

@@ -40,10 +40,10 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice.Use
             userId   : false,
             addressId: false,
 
-            company: false,
-            street : false,
-            zip    : false,
-            city   : false
+            company  : false,
+            street_no: false,
+            zip      : false,
+            city     : false
         },
 
         initialize: function (options) {
@@ -100,7 +100,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice.Use
             this.$CustomerEdit.addEvent('click', this.editCustomer);
 
             this.$Company = this.$Elm.getElement('[name="company"]');
-            this.$Street  = this.$Elm.getElement('[name="street"]');
+            this.$Street  = this.$Elm.getElement('[name="street_no"]');
             this.$Zip     = this.$Elm.getElement('[name="zip"]');
             this.$City    = this.$Elm.getElement('[name="city"]');
 
@@ -285,10 +285,9 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice.Use
 
                 // set fields
                 self.setAttributes(address);
-
                 self.$AddressField.value = address.id;
-                self.setAttribute('addressId', address.id);
 
+                self.setAttribute('addressId', address.id);
                 self.refreshValues();
             });
         },
@@ -342,6 +341,7 @@ define('package/quiqqer/invoice/bin/backend/controls/panels/TemporaryInvoice.Use
                     self.refreshValues();
 
                     self.setAttribute('addressId', addressId);
+
                     self.$fireChange();
 
                     resolve(address);

src/QUI/ERP/Accounting/Invoice/InvoiceView.php

@@ -416,10 +416,10 @@ public function getTemplate()
 
         // Delivery address
         $DeliveryAddress = false;
-        $deliveryAdress  = $this->Invoice->getAttribute('delivery_address');
+        $deliveryAddress = $this->Invoice->getAttribute('delivery_address');
 
-        if (!empty($deliveryAdress)) {
-            $DeliveryAddress = new QUI\ERP\Address(\json_decode($deliveryAdress, true));
+        if (!empty($deliveryAddress)) {
+            $DeliveryAddress = new QUI\ERP\Address(\json_decode($deliveryAddress, true));
             $DeliveryAddress->clearMail();
             $DeliveryAddress->clearPhone();
         }