CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2414.01] - 2024-04-04
+
+### Added
+
+### Changed
+
+### Fixed
+
 ## [2408.01] - 2024-02-22
 
 ### Added

db/routines/vn/procedures/inventory_repair.sql

@@ -37,7 +37,7 @@ BEGIN
 				LEFT JOIN origin o ON o.id = i.originFk
 				) ON it.id = i.typeFk
 		LEFT JOIN edi.ekt ek ON b.ektFk = ek.id
-		WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.packing = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
+		WHERE (b.packagingFk = "--" OR b.price2 = 0 OR b.buyingValue = 0) AND tr.landed > util.firstDayOfMonth(TIMESTAMPADD(MONTH,-1,util.VN_CURDATE())) AND s.name = 'INVENTARIO';
 	  
 	DROP TEMPORARY TABLE IF EXISTS tmp.lastEntryOk;
 	CREATE TEMPORARY TABLE tmp.lastEntryOk  
@@ -94,11 +94,6 @@ BEGIN
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
 		 SET b.price2 = eo.price2 WHERE  b.price2 = 0 ;
 		
-		UPDATE buy b
-		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
-		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk
-		SET b.packing = eo.packing WHERE b.packing = 0;
-		
 		UPDATE buy b
 		JOIN tmp.lastEntry lt ON lt.buyFk = b.id
 		JOIN tmp.lastEntryOkGroup eo ON eo.itemFk = lt.itemFk AND eo.warehouseFk = lt.warehouseFk

db/versions/10892-yellowGerbera/00-firstScript.sql

@@ -0,0 +1,19 @@
+SET @isTriggerDisabled := TRUE;
+
+UPDATE vn.buy 
+	SET packing = 1
+	WHERE packing IS NULL
+		OR packing <= 0;
+
+UPDATE vn.itemShelving 
+	SET packing = 1
+	WHERE packing IS NULL
+		OR NOT packing;
+
+SET @isTriggerDisabled := FALSE;
+
+ALTER TABLE vn.buy MODIFY COLUMN packing int(11) NOT NULL CHECK(packing > 0);
+ALTER TABLE vn.itemShelving MODIFY COLUMN packing int(11) NOT NULL CHECK(packing > 0);
+
+-- Antes tenia '0=sin obligar 1=groping 2=packing' (groping → grouping)
+ALTER TABLE vn.buy MODIFY COLUMN groupingMode tinyint(4) DEFAULT 0 NOT NULL COMMENT '0=sin obligar 1=grouping 2=packing';

modules/invoiceOut/front/descriptor-menu/index.html

@@ -102,7 +102,7 @@
         </vn-item>
         <vn-item class="dropdown"
             vn-click-stop="refundMenu.show($event, 'left')"
-            vn-tooltip="Create a single ticket with all the content of the current invoice"
+            vn-tooltip="Create a refund ticket for each ticket on the current invoice"
             vn-acl="invoicing, claimManager, salesAssistant"
             vn-acl-action="remove"
             translate>

modules/invoiceOut/front/descriptor-menu/index.js

@@ -118,11 +118,14 @@ class Controller extends Section {
         const query = 'InvoiceOuts/refund';
         const params = {ref: this.invoiceOut.ref, withWarehouse: withWarehouse};
         this.$http.post(query, params).then(res => {
-            const refundTicket = res.data;
+            const tickets = res.data;
-            this.vnApp.showSuccess(this.$t('The following refund ticket have been created', {
+            const refundTickets = tickets.map(ticket => ticket.id);
-                ticketId: refundTicket.id
+
+            this.vnApp.showSuccess(this.$t('The following refund tickets have been created', {
+                ticketId: refundTickets.join(',')
             }));
-            this.$state.go('ticket.card.sale', {id: refundTicket.id});
+            if (refundTickets.length == 1)
+                this.$state.go('ticket.card.sale', {id: refundTickets[0]});
         });
     }
 

modules/invoiceOut/front/descriptor-menu/locale/es.yml

@@ -15,7 +15,7 @@ Are you sure you want to clone this invoice?: Estas seguro de clonar esta factur
 InvoiceOut booked: Factura asentada
 Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
 Are you sure you want to refund this invoice?: Estas seguro de querer abonar esta factura?
-Create a single ticket with all the content of the current invoice: Crear un ticket unico con todo el contenido de la factura actual
+Create a refund ticket for each ticket on the current invoice: Crear un ticket abono por cada ticket de la factura actual
 Regenerate PDF invoice: Regenerar PDF factura
 The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
 The email can't be empty: El correo no puede estar vacío

modules/route/back/models/route.js

@@ -30,9 +30,11 @@ module.exports = Self => {
     });
 
     function validateDistance(err) {
-        const routeTotalKm = this.kmEnd - this.kmStart;
+        if (this.kmEnd) {
-        const routeMaxKm = 4000;
+            const routeTotalKm = this.kmEnd - this.kmStart;
-        if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
+            const routeMaxKm = 4000;
-            err();
+            if (routeTotalKm > routeMaxKm || this.kmStart > this.kmEnd)
+                err();
+        }
     }
 };

modules/ticket/front/descriptor-menu/locale/es.yml

@@ -14,7 +14,8 @@ Refund all...: Abonar todo...
 with warehouse: con almacén
 without warehouse: sin almacén
 Invoice sent: Factura enviada
-The following refund ticket have been created: "Se ha creado siguiente ticket de abono: {{ticketId}}"
+The following refund ticket have been created: "Se ha creado el siguiente ticket de abono: {{ticketId}}"
+The following refund tickets have been created: "Se han creado los siguientes tickets de abono: {{ticketId}}"
 Transfer client: Transferir cliente
 Send SMS...: Enviar SMS...
 Notify changes: Notificar cambios

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "24.12.0",
+    "version": "24.14.0",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",