From 9cb363e4e5236083ca6b1841d8c3edadab64fdab Mon Sep 17 00:00:00 2001
From: alexandre <alexandre@verdnatura.es>
Date: Mon, 30 Jan 2023 13:34:08 +0100
Subject: [PATCH 1/3] refs #5074 deleted null in reference

---
 CHANGELOG.md                                 |  2 +-
 modules/client/front/balance/create/index.js | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d00cafc2b..22efa1b28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
-
+- (Tickets -> Añadir pago) Eliminado "null" en las referencias
 
 ## [2302.01] - 2023-01-26
 
diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index 35b2e0b38..b64129e2e 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -59,13 +59,11 @@ class Controller extends Dialog {
 
         if (value) {
             const accountingType = value.accountingType;
-            if (this.originalDescription) {
-                this.receipt.description =
-                `${accountingType && accountingType.receiptDescription}, ${this.originalDescription}`;
-            } else {
-                this.receipt.description =
-                `${accountingType && accountingType.receiptDescription}`;
-            }
+            if (accountingType.receiptDescription != null) {
+                this.receipt.description = accountingType.receiptDescription;
+                if (this.originalDescription) this.receipt.description += `, ${this.originalDescription}`;
+            } else if (this.originalDescription)
+                this.receipt.description = this.originalDescription;
             this.maxAmount = accountingType && accountingType.maxAmount;
 
             this.receipt.payed = new Date();

From 4740cdbbb9696b8d2c8c2565a21a8bdb2c7034d0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 31 Jan 2023 10:37:18 +0100
Subject: [PATCH 3/3] fix: e2e

---
 e2e/paths/03-worker/04_time_control.spec.js |  3 +
 front/core/components/button-menu/index.js  |  1 +
 modules/ticket/front/sale/index.html        |  1 +
 modules/ticket/front/summary/index.html     | 61 +++++++++++----------
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/e2e/paths/03-worker/04_time_control.spec.js b/e2e/paths/03-worker/04_time_control.spec.js
index bba7ced89..b5da799fc 100644
--- a/e2e/paths/03-worker/04_time_control.spec.js
+++ b/e2e/paths/03-worker/04_time_control.spec.js
@@ -23,6 +23,7 @@ describe('Worker time control path', () => {
 
     it('should go to the next month, go to current month and go 1 month in the past', async() => {
         let date = new Date();
+        date.setDate(1);
         date.setMonth(date.getMonth() + 1);
         let month = date.toLocaleString('default', {month: 'long'});
 
@@ -32,6 +33,7 @@ describe('Worker time control path', () => {
         expect(result).toContain(month);
 
         date = new Date();
+        date.setDate(1);
         month = date.toLocaleString('default', {month: 'long'});
 
         await page.click(selectors.workerTimeControl.previousMonthButton);
@@ -40,6 +42,7 @@ describe('Worker time control path', () => {
         expect(result).toContain(month);
 
         date = new Date();
+        date.setDate(1);
         date.setMonth(date.getMonth() - 1);
         const timestamp = Math.round(date.getTime() / 1000);
         month = date.toLocaleString('default', {month: 'long'});
diff --git a/front/core/components/button-menu/index.js b/front/core/components/button-menu/index.js
index c19962b08..e9e4e5ab7 100644
--- a/front/core/components/button-menu/index.js
+++ b/front/core/components/button-menu/index.js
@@ -87,6 +87,7 @@ ngModule.vnComponent('vnButtonMenu', {
         selectFields: '<?',
         initialData: '<?',
         showFilter: '<?',
+        fields: '<?',
         field: '=?',
         url: '@?',
         data: '<?',
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index 97f6a2a81..fe259cf87 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -22,6 +22,7 @@
                     disabled="!$ctrl.isEditable"
                     label="State"
                     value-field="code"
+                    fields="['id', 'name', 'alertLevel', 'code']"
                     url="States/editableStates"
                     on-change="$ctrl.changeState(value)">
                 </vn-button-menu>
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index fe49a301f..af44ed67c 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -1,6 +1,6 @@
 <vn-card class="summary">
     <h5>
-        <a 
+        <a
             ng-if="::$ctrl.summary.id"
             vn-tooltip="Go to the ticket"
             ui-sref="ticket.card.summary({id: {{::$ctrl.summary.id}}})"
@@ -8,36 +8,37 @@
             <vn-icon-button icon="launch"></vn-icon-button>
         </a>
         <span>
-            Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} 
+            Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}}
             ({{$ctrl.summary.client.id}}) - {{$ctrl.summary.nickname}}
         </span>
-        <vn-button-menu 
+        <vn-button-menu
             disabled="!$ctrl.isEditable"
             class="message"
             label="Change state"
             value-field="code"
+            fields="['id', 'name', 'alertLevel', 'code']"
             url="States/editableStates"
             on-change="$ctrl.changeState(value)">
         </vn-button-menu>
-        <vn-ticket-descriptor-menu 
+        <vn-ticket-descriptor-menu
             ng-if="!$ctrl.isOnTicketCard"
-            ticket-id="$ctrl.summary.id" 
+            ticket-id="$ctrl.summary.id"
             parent-reload="$ctrl.reload()"
         />
     </h5>
     <vn-horizontal>
         <vn-one>
-            <vn-label-value label="State" 
+            <vn-label-value label="State"
                 value="{{$ctrl.summary.ticketState.state.name}}">
             </vn-label-value>
             <vn-label-value label="Salesperson">
-                <span 
+                <span
                     ng-click="workerDescriptor.show($event, $ctrl.summary.client.salesPersonFk)"
                     class="link">
                     {{$ctrl.summary.client.salesPersonUser.name}}
                 </span>
             </vn-label-value>
-            <vn-label-value label="Agency" 
+            <vn-label-value label="Agency"
                 value="{{$ctrl.summary.agencyMode.name}}">
             </vn-label-value>
             <vn-label-value label="Zone">
@@ -47,11 +48,11 @@
                     {{$ctrl.summary.zone.name}}
                 </span>
             </vn-label-value>
-            <vn-label-value label="Warehouse" 
+            <vn-label-value label="Warehouse"
                 value="{{$ctrl.summary.warehouse.name}}">
             </vn-label-value>
             <vn-label-value label="Route">
-                <span 
+                <span
                     ng-click="routeDescriptor.show($event, $ctrl.summary.routeFk)"
                     class="link">
                     {{$ctrl.summary.routeFk}}
@@ -66,17 +67,17 @@
             </vn-label-value>
         </vn-one>
         <vn-two>
-            <vn-label-value label="Shipped" 
+            <vn-label-value label="Shipped"
                 value="{{$ctrl.summary.shipped | date: 'dd/MM/yyyy HH:mm'}}">
             </vn-label-value>
-            <vn-label-value label="Landed" 
+            <vn-label-value label="Landed"
                 value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
-            <vn-label-value label="Package size" 
+            <vn-label-value label="Package size"
                 value="{{$ctrl.summary.packages}}">
             </vn-label-value>
             <vn-label-value label="Address phone"
-                ng-if="$ctrl.summary.address.phone != null" 
+                ng-if="$ctrl.summary.address.phone != null"
                 value="{{$ctrl.summary.address.phone}}">
             </vn-label-value>
             <vn-label-value label="Address mobile"
@@ -109,7 +110,7 @@
         </vn-one>
         <vn-auto name="sales">
             <h4>
-                <a 
+                <a
                     ui-sref="ticket.card.sale({id:$ctrl.ticket.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Sale</span>
@@ -146,13 +147,13 @@
                                     vn-tooltip="{{::$ctrl.$t('Claim')}}: {{::sale.claimBeginning.claimFk}}">
                                 </vn-icon>
                             </a>
-                            <vn-icon 
-                                ng-show="::(sale.visible < 0)" 
+                            <vn-icon
+                                ng-show="::(sale.visible < 0)"
                                 color-main
                                 icon="warning"
                                 vn-tooltip="Visible: {{::sale.visible || 0}}">
                             </vn-icon>
-                            <vn-icon ng-show="sale.reserved" 
+                            <vn-icon ng-show="sale.reserved"
                                 icon="icon-reserve"
                                 translate-attr="{title: 'Reserved'}">
                             </vn-icon>
@@ -170,22 +171,22 @@
                             </vn-icon>
                         </vn-td>
                         <vn-td number shrink>
-                            <span 
+                            <span
                                 ng-click="itemDescriptor.show($event, sale.itemFk, sale.id, $ctrl.ticket.shipped)"
                                 class="link">
                                 {{sale.itemFk | zeroFill:6}}
                             </span>
                         </vn-td>
                         <vn-td number shrink>
-                            <vn-chip 
-                                class="transparent" 
+                            <vn-chip
+                                class="transparent"
                                 ng-class="{'alert': sale.visible < 0}">
                                 {{::sale.visible}}
                             </vn-chip>
                         </vn-td>
                         <vn-td number shrink>
-                            <vn-chip 
-                                class="transparent" 
+                            <vn-chip
+                                class="transparent"
                                 ng-class="{'alert': sale.available < 0}">
                                 {{::sale.available}}
                             </vn-chip>
@@ -216,7 +217,7 @@
         </vn-auto>
         <vn-one ng-if="$ctrl.summary.packagings.length != 0">
             <h4>
-                <a 
+                <a
                     ui-sref="ticket.card.package({id:$ctrl.ticket.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Packages</span>
@@ -241,7 +242,7 @@
         </vn-one>
         <vn-one class="services" ng-if="$ctrl.summary.services.length != 0">
             <h4>
-                <a 
+                <a
                     ui-sref="ticket.card.service({id:$ctrl.ticket.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Service</span>
@@ -276,7 +277,7 @@
     <vn-horizontal>
         <vn-auto ng-if="$ctrl.summary.requests.length != 0">
             <h4>
-                <a 
+                <a
                     ui-sref="ticket.card.request.index({id:$ctrl.ticket.id})"
                     target="_self">
                     <span translate vn-tooltip="Go to">Purchase request</span>
@@ -304,7 +305,7 @@
                         <vn-td number>{{::request.quantity}}</vn-td>
                         <vn-td number>{{::request.price}}</vn-td>
                         <vn-td number>
-                            <span 
+                            <span
                                 ng-show="::request.saleFk"
                                 ng-click="itemDescriptor.show($event, request.sale.itemFk, request.sale.id)"
                                 class="link">
@@ -336,9 +337,9 @@
 <vn-invoice-out-descriptor-popover
     vn-id="invoice-out-descriptor">
 </vn-invoice-out-descriptor-popover>
-<vn-worker-descriptor-popover 
+<vn-worker-descriptor-popover
     vn-id="workerDescriptor">
 </vn-worker-descriptor-popover>
-<vn-zone-descriptor-popover 
+<vn-zone-descriptor-popover
     vn-id="zoneDescriptor">
-</vn-zone-descriptor-popover>
\ No newline at end of file
+</vn-zone-descriptor-popover>