diff --git a/Layout/default/WarehouseShippingNote/PDF_HEADER.html b/Layout/default/WarehouseShippingNote/PDF_HEADER.html index 418a44096..6e8c2d764 100644 --- a/Layout/default/WarehouseShippingNote/PDF_HEADER.html +++ b/Layout/default/WarehouseShippingNote/PDF_HEADER.html @@ -52,7 +52,7 @@
-
+
Xinon Logo
diff --git a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js index ccfde159e..4df50e00f 100644 --- a/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js +++ b/public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js @@ -57,7 +57,7 @@ Vue.component('warehouse-shipping-note-modal-hours-entry', { - +
@@ -75,8 +75,8 @@ Vue.component('warehouse-shipping-note-modal-hours-entry', { date: this.date, hourCount: this.hourCount, hourlyPrice: this.hourlyPrice || null, - carId: this.carId, - kilometerCount: this.kilometerCount + carId: this.carId ? this.carId : null, + kilometerCount: this.carId ? this.kilometerCount : null }); // TODO: maybe make this cleaner Object.assign(this.$data, this.$options.data.apply(this))