CHANGELOG.md

@@ -17,7 +17,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
 

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'});

front/core/components/button-menu/index.js

@@ -87,6 +87,7 @@ ngModule.vnComponent('vnButtonMenu', {
         selectFields: '<?',
         initialData: '<?',
         showFilter: '<?',
+        fields: '<?',
         field: '=?',
         url: '@?',
         data: '<?',

front/salix/components/log/style.scss

@@ -42,6 +42,7 @@ vn-log {
             & > td.after,
             & > th.after {
                 width: 40%;
+                white-space: pre-line;
             }
         }
     }

modules/client/front/balance/create/index.js

@@ -59,13 +59,11 @@ class Controller extends Dialog {
 
         if (value) {
             const accountingType = value.accountingType;
-            if (this.originalDescription) {
+            if (accountingType.receiptDescription != null) {
-                this.receipt.description =
+                this.receipt.description = accountingType.receiptDescription;
-                `${accountingType && accountingType.receiptDescription}, ${this.originalDescription}`;
+                if (this.originalDescription) this.receipt.description += `, ${this.originalDescription}`;
-            } else {
+            } else if (this.originalDescription)
-                this.receipt.description =
+                this.receipt.description = this.originalDescription;
-                `${accountingType && accountingType.receiptDescription}`;
-            }
             this.maxAmount = accountingType && accountingType.maxAmount;
 
             this.receipt.payed = new Date();

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>

modules/ticket/front/summary/index.html

@@ -16,6 +16,7 @@
             class="message"
             label="Change state"
             value-field="code"
+            fields="['id', 'name', 'alertLevel', 'code']"
             url="States/editableStates"
             on-change="$ctrl.changeState(value)">
         </vn-button-menu>