CHANGELOG.md

@@ -5,11 +5,25 @@ 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).
 
-## [2322.01] - 2023-06-08
+## [2324.01] - 2023-06-08
+
+### Added
+-
+
+
+### Changed
+-
+
+### Fixed
+-
+
+
+
+## [2322.01] - 2023-06-01
 
 ### Added
 - (Tickets -> Crear Factura) Al facturar se envia automáticamente el pdf al cliente
-
+- (Artículos -> Histórico) Filtro para mostrar lo anterior al inventario
 
 
 ### Changed
@@ -39,10 +53,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - (Usuarios -> Histórico) Nueva sección
 - (Roles -> Histórico) Nueva sección
-- (General -> Traducciones) Correo de bienvenida a clientes al portugués y al francés
+- (Trabajadores -> Dar de alta) Permite elegir el método de pago
 
 ### Changed
 - (Artículo -> Precio fijado) Modificado el buscador superior por uno lateral
+- (Trabajadores -> Dar de alta) Quitada obligatoriedad del iban
 
 ### Fixed
 - (Ticket -> Boxing) Arreglado selección de horas

back/methods/docuware/deliveryNoteEmail.js

@@ -58,7 +58,10 @@ module.exports = Self => {
         for (const param in args)
             params[param] = args[param];
 
-        if (!recipient) params.recipient = models.Client.findById(recipientId, {fields: ['email']});
+        if (!recipient) {
+            client = await models.Client.findById(recipientId, {fields: ['email']});
+            params.recipient = client.email;
+        }
 
         const email = new Email('delivery-note', params);
 

db/changes/232201/00-defaulterView.sql

@@ -0,0 +1,20 @@
+-- vn.defaulter source
+
+CREATE OR REPLACE
+ALGORITHM = UNDEFINED VIEW `vn`.`defaulter` AS
+select
+    `d`.`clientFk` AS `clientFk`,
+    `d`.`created` AS `created`,
+    `d`.`amount` AS `amount`,
+    `d`.`defaulterSinced` AS `defaulterSinced`,
+    `d`.`hasChanged` AS `hasChanged`,
+    `c`.`countryFk` AS `country`,
+    `c`.`payMethodFk` AS `payMethod`
+from
+    (((`bs`.`defaulter` `d`
+join `vn`.`client` `c` on
+    (`c`.`id` = `d`.`clientFk`))
+join `vn`.`country` `co` on
+    (`co`.`id` = `c`.`countryFk`))
+join `vn`.`payMethod` `pm` on
+    (`pm`.`id` = `c`.`payMethodFk`));

db/changes/232201/00-workerConfigPayMethod.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `vn`.`workerConfig` ADD payMethodFk tinyint(3) unsigned NULL;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK FOREIGN KEY (roleFk) REFERENCES account.`role`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE `vn`.`workerConfig` ADD CONSTRAINT workerConfig_FK_1 FOREIGN KEY (payMethodFk) REFERENCES `vn`.`payMethod`(id) ON DELETE SET NULL ON UPDATE CASCADE;
+-- Cuando se apruebe el PR quitar y poner en redmine para hacerse manualmente
+UPDATE `vn`.`workerConfig`
+    SET payMethodFk = 4
+    WHERE id=1;

db/dump/fixtures.sql

@@ -2824,9 +2824,9 @@ INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
     VALUES
         (1, 1);
 
-INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `businessTypeFk`)
+INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`, `payMethodFk`, `businessTypeFk`)
     VALUES
-        (1, NULL, 1, 'worker');
+        (1, NULL, 1, 4, 'worker');
 
 INSERT INTO `vn`.`ticketRefund`(`refundTicketFk`, `originalTicketFk`)
     VALUES

db/dump/structure.sql

@@ -61943,141 +61943,205 @@ DELIMITER ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
 /*!50003 SET sql_mode              = 'IGNORE_SPACE,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
-CREATE DEFINER=`root`@`localhost` PROCEDURE `item_getBalance`(IN vItemId int, IN vWarehouse int)
+CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getBalance`(vItemFk int, vWarehouseFk int, vDate DATETIME)
 BEGIN
-    DECLARE vDateInventory DATETIME;
+/**
-    DECLARE vCurdate DATE DEFAULT util.VN_CURDATE();
+ * @vItemFk item a buscar
-    DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate);
+ * @vWarehouseFk almacen donde buscar
+ * @vDate Si la fecha es null, muestra el histórico desde el inventario. Si la fecha no es null, muestra histórico desde la fecha pasada.
+ */
 
-    SELECT inventoried INTO vDateInventory FROM config;
+	DECLARE vDateInventory DATETIME;
-    SET @a = 0;
+	DECLARE vInvCalculated INT;
-    SET @currentLineFk = 0;
-    SET @shipped = '';
 
-    SELECT DATE(@shipped:= shipped) shipped,
+	IF vDate IS NULL THEN
-        alertLevel,
+		SELECT inventoried INTO vDateInventory
-        stateName,
+			FROM config;
-        origin,
+	ELSE
-        reference,
+		SELECT mockUtcTime INTO vDateInventory
-        clientFk,
+			FROM util.config;
-        name,
+	END IF;
-        `in` AS invalue,
-        `out`,
-        @a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
-        @currentLineFk := IF (@shipped < util.VN_CURDATE()
-                            OR (@shipped = util.VN_CURDATE() AND (isPicked OR alertLevel >= 2)),
-                        lineFk,@currentLineFk) lastPreparedLineFk,
-        isTicket,
-        lineFk,
-        isPicked,
-        clientType,
-        claimFk
-        FROM
-            ( SELECT  tr.landed AS shipped,
-                    b.quantity AS `in`,
-                    NULL AS `out`,
-                    al.id AS alertLevel,
-                    st.name AS stateName,
-                    s.name AS name,
-                    e.invoiceNumber AS reference,
-                    e.id AS origin,
-                    s.id AS clientFk,
-                    IF(al.id = 3, TRUE, FALSE) isPicked,
-                    FALSE AS isTicket,
-                    b.id lineFk,
-                    NULL `order`,
-                    NULL AS clientType,
-                    NULL AS claimFk
-                FROM buy b
-                    JOIN entry e ON e.id = b.entryFk
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.id =
-                        CASE
-                            WHEN tr.landed < util.VN_CURDATE() THEN 3
-                            WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.landed >= vDateInventory
-                    AND vWarehouse = tr.warehouseInFk
-                    AND b.itemFk = vItemId
-                    AND e.isExcludedFromAvailable = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
 
-            SELECT tr.shipped,
+	CREATE OR REPLACE TEMPORARY TABLE itemDiary(
-                    NULL,
+		shipped DATE,
-                    b.quantity,
+		`in` INT(11),
-                    al.id,
+		`out` INT(11),
-                    st.name,
+		alertLevel INT(11),
-                    s.name,
+		stateName VARCHAR(20),
-                    e.invoiceNumber,
+		`name` VARCHAR(50),
-                    e.id,
+		reference VARCHAR(50),
-                    s.id,
+		origin INT(11),
-                    IF(al.id = 3, TRUE, FALSE),
+		clientFk INT(11),
-                    FALSE,
+		isPicked INT(11),
-                    b.id,
+		isTicket TINYINT(1),
-                    NULL,
+		lineFk INT(11),
-                    NULL,
+		`order` TINYINT(3) UNSIGNED,
-                    NULL
+		clientType VARCHAR(20),
-                FROM buy b
+		claimFk INT(10) UNSIGNED
-                    JOIN entry e ON e.id = b.entryFk
+	);
-                    JOIN travel tr ON tr.id = e.travelFk
-                    JOIN warehouse w ON w.id = tr.warehouseOutFk
-                    JOIN supplier s ON s.id = e.supplierFk
-                    JOIN alertLevel al ON al.id =
-                        CASE
-                            WHEN tr.shipped < util.VN_CURDATE() THEN 3
-                            WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 3
-                            ELSE 0
-                        END
-                    JOIN state st ON st.code = al.code
-                WHERE tr.shipped >= vDateInventory
-                    AND vWarehouse =tr.warehouseOutFk
-                    AND s.id <> 4
-                    AND b.itemFk = vItemId
-                    AND e.isExcludedFromAvailable = FALSE
-                    AND w.isFeedStock = FALSE
-                    AND e.isRaid = FALSE
-            UNION ALL
 
-            SELECT DATE(t.shipped),
+	INSERT INTO itemDiary
-                NULL,
+	SELECT tr.landed shipped,
-                s.quantity,
+					b.quantity `in`,
-                al.id,
+					NULL `out`,
-                st.name,
+					al.id alertLevel,
-                t.nickname,
+					st.name stateName,
-                t.refFk,
+					s.name `name`,
-                t.id,
+					e.invoiceNumber reference,
-                t.clientFk,
+					e.id origin,
-                stk.id,
+					s.id clientFk,
-                TRUE,
+					IF(al.code = 'DELIVERED', TRUE, FALSE) isPicked,
-                s.id,
+					FALSE isTicket,
-                st.`order`,
+					b.id lineFk,
-                ct.code,
+					NULL `order`,
-                cb.claimFk
+					NULL clientType,
-                FROM sale s
+					NULL claimFk
-                    JOIN ticket t ON t.id = s.ticketFk
+				FROM buy b
-                    LEFT JOIN ticketState ts ON ts.ticket = t.id
+					JOIN entry e ON e.id = b.entryFk
-                    LEFT JOIN state st ON st.code = ts.code
+					JOIN travel tr ON tr.id = e.travelFk
-                    JOIN client c ON c.id = t.clientFk
+					JOIN supplier s ON s.id = e.supplierFk
-                    JOIN clientType ct ON ct.id = c.clientTypeFk
+					JOIN alertLevel al ON al.code =
-                    JOIN alertLevel al ON al.id =
+						CASE
-                        CASE
+							WHEN tr.landed < util.VN_CURDATE() THEN 'DELIVERED'
-                            WHEN t.shipped < util.VN_CURDATE() THEN 3
+							WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
-                            WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 0
+							ELSE 'FREE'
-                            ELSE IFNULL(ts.alertLevel, 0)
+						END
-                        END
+					JOIN state st ON st.code = al.code
-                    LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+				WHERE tr.landed >= vDateInventory
-                    LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
+					AND vWarehouseFk = tr.warehouseInFk
-                    LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
+					AND b.itemFk = vItemFk
-                WHERE t.shipped >= vDateInventory
+					AND e.isExcludedFromAvailable = FALSE
-                    AND s.itemFk = vItemId
+					AND e.isRaid = FALSE
-                    AND vWarehouse =t.warehouseFk
+			UNION ALL
-                ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC
+			SELECT tr.shipped,
-            ) AS itemDiary;
+					NULL,
+					b.quantity,
+					al.id,
+					st.name,
+					s.name,
+					e.invoiceNumber,
+					e.id,
+					s.id,
+					IF(al.code = 'DELIVERED', TRUE, FALSE),
+					FALSE,
+					b.id,
+					NULL,
+					NULL,
+					NULL
+				FROM buy b
+					JOIN entry e ON e.id = b.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+					JOIN warehouse w ON w.id = tr.warehouseOutFk
+					JOIN supplier s ON s.id = e.supplierFk
+					JOIN alertLevel al ON al.code =
+						CASE
+							WHEN tr.shipped < util.VN_CURDATE() THEN 'DELIVERED'
+							WHEN tr.shipped = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED'
+							ELSE 'FREE'
+						END
+					JOIN state st ON st.code = al.code
+					JOIN entryConfig ec
+				WHERE tr.shipped >= vDateInventory
+					AND vWarehouseFk =tr.warehouseOutFk
+					AND s.id <> ec.inventorySupplierFk
+					AND b.itemFk = vItemFk
+					AND e.isExcludedFromAvailable = FALSE
+					AND w.isFeedStock = FALSE
+					AND e.isRaid = FALSE
+			UNION ALL
+			SELECT DATE(t.shipped),
+				NULL,
+				s.quantity,
+				al3.id,
+				st.name,
+				t.nickname,
+				t.refFk,
+				t.id,
+				t.clientFk,
+				stk.id,
+				TRUE,
+				s.id,
+				st.`order`,
+				ct.code,
+				cb.claimFk
+			FROM sale s
+				JOIN ticket t ON t.id = s.ticketFk
+				LEFT JOIN ticketState ts ON ts.ticket = t.id
+				LEFT JOIN state st ON st.code = ts.code
+				JOIN client c ON c.id = t.clientFk
+				JOIN clientType ct ON ct.id = c.clientTypeFk
+                JOIN alertLevel al  ON al.code = 'DELIVERED'
+				JOIN alertLevel al2  ON al2.code = 'FREE'
+                JOIN alertLevel al3 ON al3.id =
+                    CASE
+                        WHEN t.shipped < util.VN_CURDATE() THEN al.code
+                        WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN al2.code
+                        ELSE IFNULL(ts.alertLevel, al2.code)
+                    END
+				LEFT JOIN state stPrep ON stPrep.`code` = 'PREPARED'
+				LEFT JOIN saleTracking stk ON stk.saleFk = s.id AND stk.stateFk = stPrep.id
+				LEFT JOIN claimBeginning cb ON s.id = cb.saleFk
+			WHERE t.shipped >= vDateInventory
+				AND s.itemFk = vItemFk
+				AND vWarehouseFk =t.warehouseFk
+			ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC;
 
+	IF vDate IS NULL THEN
+		SET @a = 0;
+		SET @currentLineFk = 0;
+		SET @shipped = '';
+
+		SELECT DATE(@shipped:= shipped) shipped,
+			alertLevel,
+			stateName,
+			origin,
+			reference,
+			clientFk,
+			name,
+			`in` AS invalue,
+			`out`,
+			@a := @a + IFNULL(`in`,0) - IFNULL(`out`,0) as balance,
+			@currentLineFk := IF (@shipped < util.VN_CURDATE()
+								OR (@shipped = util.VN_CURDATE() AND (isPicked OR a.code >= 'ON_PREPARATION')),
+									lineFk, @currentLineFk) lastPreparedLineFk,
+			isTicket,
+			lineFk,
+			isPicked,
+			clientType,
+			claimFk
+			FROM itemDiary
+				JOIN alertLevel a ON a.id = itemDiary.alertLevel;
+	ELSE
+		SELECT sum(`in`) - sum(`out`) INTO vInvCalculated
+			FROM itemDiary
+			WHERE shipped < vDate;
+
+		SELECT p1.*
+			FROM(
+				SELECT vDate shipped,
+						0 alertLevel,
+						0 stateName,
+						0 origin,
+						'' reference,
+						0 clientFk,
+						'Inventario calculado',
+						vInvCalculated invalue,
+						NULL `out`,
+						0 balance,
+						0 lastPreparedLineFk,
+						0 isTicket,
+						0 lineFk,
+						0 isPicked,
+						0 clientType,
+						0 claimFk
+				UNION ALL
+				SELECT shipped, alertlevel, stateName, origin, reference, clientFk, name, `in`, `out`, 0,0, isTicket, lineFk, isPicked, clientType, claimFk
+					FROM itemDiary
+					WHERE shipped >= vDate
+				)as p1;
+	END IF;
+
+	DROP TEMPORARY TABLE itemDiary;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;

e2e/helpers/selectors.js

@@ -313,7 +313,7 @@ export default {
         anyClient: 'vn-client-defaulter tbody > tr',
         firstClientName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(2) > span',
         firstSalesPersonName: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(3) > span',
-        firstObservation: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(6) > vn-textarea[ng-model="defaulter.observation"]',
+        firstObservation: 'vn-client-defaulter tbody > tr:nth-child(1) > td:nth-child(8) > vn-textarea[ng-model="defaulter.observation"]',
         allDefaulterCheckbox: 'vn-client-defaulter thead vn-multi-check',
         addObservationButton: 'vn-client-defaulter vn-button[icon="icon-notes"]',
         observation: '.vn-dialog.shown vn-textarea[ng-model="$ctrl.defaulter.observation"]',

e2e/paths/13-supplier/03_fiscal_data.spec.js

@@ -1,5 +1,20 @@
 import getBrowser from '../../helpers/puppeteer';
 
+const $ = {
+    saveButton: 'vn-supplier-fiscal-data button[type="submit"]',
+};
+const $inputs = {
+    province: 'vn-supplier-fiscal-data [name="province"]',
+    country: 'vn-supplier-fiscal-data [name="country"]',
+    postcode: 'vn-supplier-fiscal-data [name="postcode"]',
+    city: 'vn-supplier-fiscal-data [name="city"]',
+    socialName: 'vn-supplier-fiscal-data [name="socialName"]',
+    taxNumber: 'vn-supplier-fiscal-data [name="taxNumber"]',
+    account: 'vn-supplier-fiscal-data [name="account"]',
+    sageWithholding: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageWithholdingFk"]',
+    sageTaxType: 'vn-supplier-fiscal-data [ng-model="$ctrl.supplier.sageTaxTypeFk"]'
+};
+
 describe('Supplier fiscal data path', () => {
     let browser;
     let page;

front/core/components/searchbar/searchbar.js

@@ -203,7 +203,7 @@ export default class Searchbar extends Component {
 
     doSearch(filter, source) {
         if (filter === this.filter && !this.isIndex) return;
-        let promise = this.onSearch({$params: filter});
+        let promise = this.onSearch({$params: filter}, source);
         promise = promise || this.$q.resolve();
         promise.then(data => this.onFilter(filter, source, data));
         this.toBar(filter);
@@ -259,12 +259,6 @@ export default class Searchbar extends Component {
 
         this.filter = filter;
 
-        if (source == 'removeBar') {
-            delete params[this.toRemove];
-            delete this.model.userParams[this.toRemove];
-            this.model.refresh();
-        }
-
         if (!filter && this.model)
             this.model.clear();
         if (source != 'state')
@@ -279,7 +273,7 @@ export default class Searchbar extends Component {
         return {id: params.$row.id};
     }
 
-    onSearch(args) {
+    onSearch(args, source) {
         if (!this.model) return;
         let filter = args.$params;
 
@@ -325,6 +319,12 @@ export default class Searchbar extends Component {
             for (let param in stateFilter.tableQ)
                 params[param] = stateFilter.tableQ[param];
 
+            if (source == 'removeBar') {
+                delete params[this.toRemove];
+                delete this.model.userParams[this.toRemove];
+                delete stateFilter[this.toRemove];
+            }
+
             const newParams = Object.assign(stateFilter, params);
             return this.model.applyParams(newParams)
                 .then(() => this.model.data);

front/core/components/searchbar/searchbar.spec.js

@@ -197,7 +197,7 @@ describe('Component vnSearchbar', () => {
             controller.doSearch(filter, 'any');
             $scope.$apply();
 
-            expect(controller.onSearch).toHaveBeenCalledWith({$params: filter});
+            expect(controller.onSearch).toHaveBeenCalledWith({$params: filter}, 'any');
             expect(controller.onFilter).toHaveBeenCalledWith(filter, 'any', undefined);
         });
     });

loopback/locale/es.json

@@ -84,6 +84,7 @@
 	"The current ticket can't be modified": "El ticket actual no puede ser modificado",
 	"The current claim can't be modified": "La reclamación actual no puede ser modificada",
 	"The sales of this ticket can't be modified": "Las lineas de este ticket no pueden ser modificadas",
+    "The sales do not exists": "La(s) línea(s) seleccionada(s) no existe(n)",
 	"Please select at least one sale": "Por favor selecciona al menos una linea",
 	"All sales must belong to the same ticket": "Todas las lineas deben pertenecer al mismo ticket",
 	"NO_ZONE_FOR_THIS_PARAMETERS": "Para este día no hay ninguna zona configurada",
@@ -290,5 +291,7 @@
 	"isTaxDataChecked": "Datos comprobados",
 	"comercialId": "Id comercial",
 	"comercialName": "Comercial",
-	"Invalid NIF for VIES": "Invalid NIF for VIES"
+	"Invalid NIF for VIES": "Invalid NIF for VIES",
-}
+	"Ticket does not exist": "Este ticket no existe",
+    "Ticket is already signed": "Este ticket ya ha sido firmado"
+}

modules/client/back/methods/defaulter/filter.js

@@ -67,9 +67,13 @@ module.exports = Self => {
                         uw.id workerFk,
                         uw.name workerName,
                         c.creditInsurance,
-                        d.defaulterSinced
+                        d.defaulterSinced,
+                        cn.country,
+                        pm.name payMethod
                     FROM vn.defaulter d
                         JOIN vn.client c ON c.id = d.clientFk
+                        JOIN vn.country cn ON cn.id = c.countryFk
+                        JOIN vn.payMethod pm ON pm.id = c.payMethodFk 
                         LEFT JOIN vn.clientObservation co ON co.clientFk = c.id
                         LEFT JOIN account.user u ON u.id = c.salesPersonFk
                         LEFT JOIN account.user uw ON uw.id = co.workerFk

modules/client/back/models/defaulter.json

@@ -29,6 +29,16 @@
       "type": "belongsTo",
       "model": "Client",
       "foreignKey": "clientFk"
+    },
+    "country": {
+      "type": "belongsTo",
+      "model": "Country",
+      "foreignKey": "country"
+    },
+    "payMethod": {
+      "type": "belongsTo",
+      "model": "PayMethod",
+      "foreignKey": "payMethod"
     }
   }
 }

modules/client/front/defaulter/index.html

@@ -57,6 +57,13 @@
                         <th field="salesPersonFk">
                             <span translate>Comercial</span>
                         </th>
+                        <th field="country">
+                            <span translate>Country</span>
+                        </th>
+                        <th field="payMethod"
+                            vn-tooltip="Pay Method">
+                            <span translate>P.Method</span>
+                        </th>
                         <th
                             field="amount"
                             vn-tooltip="Balance due">
@@ -111,6 +118,12 @@
                                 {{::defaulter.salesPersonName | dashIfEmpty}}
                             </span>
                         </td>
+                        <td>
+                            {{::defaulter.country}}
+                        </td>
+                        <td>
+                            {{::defaulter.payMethod}}
+                        </td> 
                         <td>{{::defaulter.amount | currency: 'EUR': 2}}</td>
                         <td>
                             <span

modules/client/front/defaulter/index.js

@@ -20,8 +20,7 @@ export default class Controller extends Section {
                         showField: 'name',
                         valueField: 'id'
                     }
-                },
+                }, {
-                {
                     field: 'salesPersonFk',
                     autocomplete: {
                         url: 'Workers/activeWithInheritedRole',
@@ -30,6 +29,18 @@ export default class Controller extends Section {
                         showField: 'name',
                         valueField: 'id',
                     }
+                }, {
+                    field: 'country',
+                    autocomplete: {
+                        showField: 'country',
+                        valueField: 'country'
+                    }
+                }, {
+                    field: 'payMethodFk',
+                    autocomplete: {
+                        showField: 'name',
+                        valueField: 'id'
+                    }
                 },
                 {
                     field: 'workerFk',
@@ -132,7 +143,7 @@ export default class Controller extends Section {
     sendMail() {
         const params = {
             defaulters: this.checked,
-            observation: this.defaulter.observation
+            observation: this.defaulter.observation,
         };
         this.$http.post(`Defaulters/observationEmail`, params);
     }
@@ -143,6 +154,8 @@ export default class Controller extends Section {
         case 'amount':
         case 'clientFk':
         case 'workerFk':
+        case 'country':
+        case 'payMethod':
         case 'salesPersonFk':
             return {[`d.${param}`]: value};
         case 'created':

modules/client/front/defaulter/locale/es.yml

@@ -9,3 +9,6 @@ Search client: Buscar clientes
 Worker who made the last observation: Trabajador que ha realizado la última observación
 Email sended!: Email enviado!
 Observation saved!: Observación añadida!
+P.Method: F.Pago
+Pay Method: Forma de Pago
+Country: Pais

modules/item/back/methods/item/getBalance.js

@@ -26,8 +26,8 @@ module.exports = Self => {
             Object.assign(myOptions, options);
 
         const where = filter.where;
-        const query = 'CALL vn.item_getBalance(?, ?)';
+        const query = 'CALL vn.item_getBalance(?, ?, ?)';
-        const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk], myOptions);
+        const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, where.date], myOptions);
 
         for (const entry of diary)
             if (entry.clientType === 'loses') entry.highlighted = true;

modules/item/back/methods/item/specs/getBalance.spec.js

@@ -21,7 +21,8 @@ describe('item getBalance()', () => {
             const filter = {
                 where: {
                     itemFk: 1,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
             const results = await models.Item.getBalance(filter, options);
@@ -45,14 +46,16 @@ describe('item getBalance()', () => {
             const firstFilter = {
                 where: {
                     itemFk: 1,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
 
             const secondFilter = {
                 where: {
                     itemFk: 2,
-                    warehouseFk: 1
+                    warehouseFk: 1,
+                    date: null
                 }
             };
 

modules/item/front/diary/index.html

@@ -25,6 +25,16 @@
                 ng-model="$ctrl.warehouseFk"
                 label="Select warehouse">
             </vn-autocomplete>
+            <vn-check
+                ng-class="{'table-check':$ctrl.showOld}"
+                label="Show what's before the inventory"
+                ng-model="$ctrl.showOld">
+            </vn-check>
+            <vn-date-picker
+                label="Since"
+                ng-model="$ctrl.date"
+                ng-show="$ctrl.showOld">
+            </vn-date-picker>
         </vn-horizontal>
         <vn-table model="model">
             <vn-thead>
@@ -44,7 +54,7 @@
                 <vn-tr
                     ng-class="::{
                         'isIn': sale.invalue,
-                        'balanceNegative': sale.balance < 0}" 
+                        'balanceNegative': sale.balance < 0}"
                     ng-repeat="sale in sales"
                     vn-repeat-last
                     on-last="$ctrl.scrollToLine(sale.lastPreparedLineFk)"
@@ -58,7 +68,7 @@
                         </a>
                     </vn-td>
                     <vn-td expand>
-                        <span class="chip" 
+                        <span class="chip"
                             ng-class="::{warning: $ctrl.today == sale.shipped}">
                             {{::sale.shipped | date:'dd/MM/yyyy' }}
                         </span>
@@ -99,13 +109,13 @@
     </vn-vertical>
     </vn-card>
 </vn-vertical>
-<vn-ticket-descriptor-popover 
+<vn-ticket-descriptor-popover
     vn-id="ticket-descriptor">
 </vn-ticket-descriptor-popover>
-<vn-client-descriptor-popover 
+<vn-client-descriptor-popover
     vn-id="clientDescriptor">
 </vn-client-descriptor-popover>
-<vn-entry-descriptor-popover 
+<vn-entry-descriptor-popover
     vn-id="entryDescriptor">
 </vn-entry-descriptor-popover>
 

modules/item/front/diary/index.js

@@ -38,12 +38,8 @@ class Controller extends Section {
         if (value && value != this._warehouseFk) {
             this._warehouseFk = value;
             this.card.warehouseFk = value;
+            this.filter.where.warehouseFk = this.warehouseFk;
 
-            this.$state.go(this.$state.current.name, {
-                warehouseFk: value
-            });
-
-            this.filter.where.warehouseFk = value;
             this.$.model.refresh();
         }
     }
@@ -52,6 +48,28 @@ class Controller extends Section {
         return this._warehouseFk;
     }
 
+    set date(value) {
+        this._date = value;
+        this.filter.where.date = value;
+        this.filter.where.warehouseFk = this.warehouseFk;
+
+        this.$.model.refresh();
+    }
+
+    get date() {
+        return this._date;
+    }
+
+    set showOld(value) {
+        this._showOld = value;
+        if (!this._showOld) this.date = null;
+        else this.date = new Date();
+    }
+
+    get showOld() {
+        return this._showOld;
+    }
+
     scrollToLine(lineFk) {
         this.$.$applyAsync(() => {
             const hashFk = this.lineFk || lineFk;

modules/item/front/diary/locale/es.yml

@@ -1,4 +1,5 @@
 In: Entrada
 Out: Salida
 Visible quantity: Cantidad visible
-Ticket/Entry: Ticket/Entrada
+Ticket/Entry: Ticket/Entrada
+Show what's before the inventory: Mostrar lo anterior al inventario

modules/item/front/diary/style.scss

@@ -27,4 +27,7 @@ vn-item-diary {
         overflow: hidden;
         text-overflow: ellipsis;
     }
-}
+    .table-check{
+        justify-content: center;
+    }
+}

modules/ticket/back/methods/sale/canEdit.js

@@ -38,6 +38,9 @@ module.exports = Self => {
             }
         }, myOptions);
 
+        if (!salesData.length)
+            throw new UserError(`The sales do not exists`);
+
         const ticketId = salesData[0].ticketFk;
 
         const isTicketEditable = await models.Ticket.isEditable(ctx, ticketId, myOptions);
@@ -62,7 +65,5 @@ module.exports = Self => {
             throw new UserError('It is not possible to modify cloned sales');
         if (!shouldEditFloramondo)
             throw new UserError('It is not possible to modify sales that their articles are from Floramondo');
-
-        return true;
     };
 };

modules/ticket/back/methods/sale/specs/canEdit.spec.js

@@ -17,6 +17,32 @@ describe('sale canEdit()', () => {
         });
     });
 
+    describe('sale not exists', () => {
+        it('should return error if sale not exists', async() => {
+            const tx = await models.Sale.beginTransaction({});
+
+            try {
+                const options = {transaction: tx};
+
+                const developerId = 9;
+                const ctx = {req: {accessToken: {userId: developerId}}};
+
+                let max = await models.Sale.findOne({fields: ['id'], order: 'id DESC'}, options);
+                max.id = max.id + 1;
+
+                const sales = [max.id];
+                await models.Sale.canEdit(ctx, sales, options);
+
+                await tx.rollback();
+            } catch (e) {
+                await tx.rollback();
+                error = e.message;
+            }
+
+            expect(error).toEqual('The sales do not exists');
+        });
+    });
+
     describe('sale editTracked', () => {
         it('should return true if the role is production regardless of the saleTrackings', async() => {
             const tx = await models.Sale.beginTransaction({});
@@ -29,9 +55,7 @@ describe('sale canEdit()', () => {
 
                 const sales = [25];
 
-                const result = await models.Sale.canEdit(ctx, sales, options);
+                await models.Sale.canEdit(ctx, sales, options);
-
-                expect(result).toEqual(true);
 
                 await tx.rollback();
             } catch (e) {
@@ -51,9 +75,7 @@ describe('sale canEdit()', () => {
 
                 const sales = [10];
 
-                const result = await models.Sale.canEdit(ctx, sales, options);
+                await models.Sale.canEdit(ctx, sales, options);
-
-                expect(result).toEqual(true);
 
                 await tx.rollback();
             } catch (e) {
@@ -87,9 +109,7 @@ describe('sale canEdit()', () => {
                 });
                 const ctx = {req: {accessToken: {userId: role.id}}};
 
-                const result = await models.Sale.canEdit(ctx, saleCloned, options);
+                await models.Sale.canEdit(ctx, saleCloned, options);
-
-                expect(result).toEqual(true);
 
                 await tx.rollback();
             } catch (e) {
@@ -150,9 +170,7 @@ describe('sale canEdit()', () => {
                 const saleToEdit = await models.Sale.findById(sales[0], null, options);
                 await saleToEdit.updateAttribute('itemFk', 9, options);
 
-                const result = await models.Sale.canEdit(ctx, sales, options);
+                await models.Sale.canEdit(ctx, sales, options);
-
-                expect(result).toEqual(true);
 
                 await tx.rollback();
             } catch (e) {

modules/ticket/back/methods/ticket/closeAll.js

@@ -52,7 +52,7 @@ module.exports = Self => {
                 JOIN province p ON p.id = c.provinceFk
                 JOIN country co ON co.id = p.countryFk
                 LEFT JOIN account.emailUser eu ON eu.userFk = c.salesPersonFk
-            WHERE al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered')
+            WHERE (al.code = 'PACKED' OR (am.code = 'refund' AND al.code != 'delivered'))
                 AND DATE(t.shipped) BETWEEN DATE_ADD(?, INTERVAL -2 DAY)
                     AND util.dayEnd(?)
                 AND t.refFk IS NULL

modules/ticket/back/methods/ticket/merge.js

@@ -63,10 +63,11 @@ module.exports = Self => {
                     newInstance: {mergedTicket: ticket.originId}
                 };
 
-                await models.TicketLog.create(ticketDestinationLogRecord, myOptions);
                 await models.Sale.updateAll({ticketFk: ticket.originId}, {ticketFk: ticket.destinationId}, myOptions);
-                await models.Ticket.setDeleted(ctx, ticket.originId, myOptions);
+                if (await models.Ticket.setDeleted(ctx, ticket.originId, myOptions)) {
-                await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message);
+                    await models.TicketLog.create(ticketDestinationLogRecord, myOptions);
+                    await models.Chat.sendCheckingPresence(ctx, ticket.workerFk, message);
+                }
             }
             if (tx)
                 await tx.commit();

modules/ticket/back/methods/ticket/saveSign.js

@@ -29,8 +29,7 @@ module.exports = Self => {
         }
     });
 
-    Self.saveSign = async(ctx, options) => {
+    Self.saveSign = async(ctx, tickets, location, signedTime, options) => {
-        const args = Object.assign({}, ctx.args);
         const models = Self.app.models;
         const myOptions = {};
         let tx;
@@ -48,9 +47,9 @@ module.exports = Self => {
         async function setLocation(ticketId) {
             await models.Delivery.create({
                 ticketFk: ticketId,
-                longitude: args.location.Longitude,
+                longitude: location.Longitude,
-                latitude: args.location.Latitude,
+                latitude: location.Latitude,
-                dated: args.signedTime || new Date()
+                dated: signedTime || new Date()
             }, myOptions);
         }
 
@@ -107,9 +106,9 @@ module.exports = Self => {
         }
 
         try {
-            for (let i = 0; i < args.tickets.length; i++) {
+            for (const ticketId of tickets) {
                 const ticketState = await models.TicketState.findOne(
-                    {where: {ticketFk: args.tickets[i]},
+                    {where: {ticketFk: ticketId},
                         fields: ['alertLevel']
                     }, myOptions);
 
@@ -117,16 +116,19 @@ module.exports = Self => {
                     fields: ['id']
                 }, myOptions);
 
+                if (!ticketState)
+                    throw new UserError('Ticket does not exist');
                 if (ticketState.alertLevel < packedAlertLevel.id)
                     throw new UserError('This ticket cannot be signed because it has not been boxed');
-                else if (!await gestDocExists(args.tickets[i])) {
+                if (await gestDocExists(ticketId))
-                    if (args.location) setLocation(args.tickets[i]);
+                    throw new UserError('Ticket is already signed');
-                    if (!gestDocCreated) await createGestDoc(args.tickets[i]);
+
-                    await models.TicketDms.create({ticketFk: args.tickets[i], dmsFk: dms[0].id}, myOptions);
+                if (location) setLocation(ticketId);
-                    const ticket = await models.Ticket.findById(args.tickets[i], null, myOptions);
+                if (!gestDocCreated) await createGestDoc(ticketId);
-                    await ticket.updateAttribute('isSigned', true, myOptions);
+                await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions);
-                    await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [args.tickets[i], 'DELIVERED'], myOptions);
+                const ticket = await models.Ticket.findById(ticketId, null, myOptions);
-                }
+                await ticket.updateAttribute('isSigned', true, myOptions);
+                await Self.rawSql(`CALL vn.ticket_setState(?, ?)`, [ticketId, 'DELIVERED'], myOptions);
             }
 
             if (tx) await tx.commit();

modules/ticket/back/methods/ticket/setDeleted.js

@@ -36,6 +36,9 @@ module.exports = Self => {
         }
 
         try {
+            const ticketToDelete = await models.Ticket.findById(id, {fields: ['isDeleted']}, myOptions);
+            if (ticketToDelete.isDeleted) return false;
+
             const isEditable = await Self.isEditable(ctx, id, myOptions);
 
             if (!isEditable)

modules/ticket/front/main/index.html

@@ -16,4 +16,4 @@
 <vn-portal slot="menu">
     <vn-left-menu></vn-left-menu>
 </vn-portal>
-<ui-view></ui-view>
+<ui-view></ui-view>

modules/ticket/front/main/index.js

@@ -1,5 +1,6 @@
 import ngModule from '../module';
 import ModuleMain from 'salix/components/module-main';
+const UserError = require('vn-loopback/util/user-error');
 
 export default class Ticket extends ModuleMain {
     fetchParams($params) {
@@ -14,10 +15,19 @@ export default class Ticket extends ModuleMain {
             'scopeDays'
         ];
 
+        const seachPanelParams = Object.entries($params);
+        const hasFromParam = seachPanelParams.some(subarray => subarray.length > 0 && subarray[0] === 'from');
+        const hasToParam = seachPanelParams.some(subarray => subarray.length > 0 && subarray[0] === 'to');
+
+        if ((hasFromParam && !hasToParam) || (!hasFromParam && hasToParam))
+            throw new UserError(`Date range must have 'from' and 'to'`);
+
         const hasExcludedParams = excludedParams.some(param => {
             return $params && $params[param] != undefined;
         });
+
         const hasParams = Object.entries($params).length;
+
         if (!hasParams || !hasExcludedParams)
             $params.scopeDays = 1;
 
@@ -28,7 +38,6 @@ export default class Ticket extends ModuleMain {
             const to = new Date(from.getTime());
             to.setDate(to.getDate() + $params.scopeDays);
             to.setHours(23, 59, 59, 999);
-
             Object.assign($params, {from, to});
         }
 

modules/ticket/front/main/locale/es.yml

@@ -0,0 +1 @@
+Date range must have 'from' and 'to': El rango de fechas debe tener 'desde' y 'hasta'

modules/worker/back/methods/worker/new.js

@@ -54,18 +54,6 @@ module.exports = Self => {
                 description: `The worker province`,
                 required: true,
             },
-            {
-                arg: 'iban',
-                type: 'string',
-                description: `The worker iban`,
-                required: true,
-            },
-            {
-                arg: 'bankEntityFk',
-                type: 'number',
-                description: `The worker bank entity`,
-                required: true,
-            },
             {
                 arg: 'companyFk',
                 type: 'number',
@@ -101,6 +89,22 @@ module.exports = Self => {
                 type: 'date',
                 description: `The worker birth`,
                 required: true,
+            },
+            {
+                arg: 'payMethodFk',
+                type: 'number',
+                description: `The client payMethod`,
+                required: true,
+            },
+            {
+                arg: 'iban',
+                type: 'string',
+                description: `The client iban`,
+            },
+            {
+                arg: 'bankEntityFk',
+                type: 'number',
+                description: `The client bank entity`,
             }
         ],
         returns: {
@@ -162,6 +166,10 @@ module.exports = Self => {
                     myOptions
                 );
 
+                const payMethod = await models.PayMethod.findById(args.payMethodFk, {fields: ['isIbanRequiredForClients']});
+                if (payMethod.isIbanRequiredForClients && !args.iban)
+                    throw new UserError(`That payment method requires an IBAN`);
+
                 await models.Worker.rawSql(
                     'CALL vn.clientCreate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
                     [
@@ -202,6 +210,7 @@ module.exports = Self => {
 
                 await client.updateAttributes(
                     {
+                        payMethod: args.payMethod,
                         iban: args.iban,
                         bankEntityFk: args.bankEntityFk,
                         defaultAddressFk: address.id,

modules/worker/back/methods/worker/specs/new.spec.js

@@ -27,14 +27,14 @@ describe('Worker new', () => {
         street: 'S/ defaultWorkerStreet',
         city: 'defaultWorkerCity',
         provinceFk: 1,
-        iban: 'ES8304879798578129532677',
-        bankEntityFk: 128,
         companyFk: 442,
         postcode: '46680',
         phone: '123456789',
         code: 'DWW',
         bossFk: 9,
-        birth: '2022-12-11T23:00:00.000Z'
+        birth: '2022-12-11T23:00:00.000Z',
+        payMethodFk: 1,
+        roleFk: 1
     };
 
     it('should return error if personal mail already exists', async() => {
@@ -105,6 +105,33 @@ describe('Worker new', () => {
         expect(error.message).toEqual('This worker already exists');
     });
 
+    it('should return error if payMethod require iban', async() => {
+        const payMethodIbanRequired = await models.PayMethod.findOne({
+            where: {
+                isIbanRequiredForClients: true
+            },
+            fields: ['id']
+        });
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {payMethodFk: payMethodIbanRequired.id})
+            };
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('That payment method requires an IBAN');
+    });
+
     it('should create a new worker', async() => {
         const newWorker = await models.Worker.new({args: defaultWorker});
 

modules/worker/back/models/worker-config.json

@@ -15,6 +15,9 @@
         "roleFk": {
             "type": "number"
         },
+        "payMethodFk": {
+            "type": "number"
+        },
         "businessTypeFk": {
             "type": "string"
         }

modules/worker/front/create/index.html

@@ -142,12 +142,19 @@
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
+            <vn-autocomplete
+                vn-one
+                label="Pay method"
+                url="Paymethods"
+                ng-model="$ctrl.worker.payMethodFk"
+                initial-data="$ctrl.workerConfig.payMethodFk">
+            </vn-autocomplete>
             <vn-textfield
                 vn-one
                 label="IBAN"
                 ng-model="$ctrl.worker.iban"
-                rule
+                on-change="$ctrl.autofillBic()"
-                on-change="$ctrl.autofillBic()">
+                rule>
             </vn-textfield>
             <vn-autocomplete
                 vn-one

modules/worker/front/create/index.js

@@ -5,9 +5,17 @@ export default class Controller extends Section {
     constructor($element, $) {
         super($element, $);
         this.worker = {companyFk: this.vnConfig.user.companyFk};
+        this.$http.get(`WorkerConfigs/findOne`, {field: ['payMethodFk']}).then(res => {
+            if (res.data) this.worker.payMethodFk = res.data.payMethodFk;
+        });
     }
 
     onSubmit() {
+        if (!this.worker.iban && !this.worker.bankEntityFk) {
+            delete this.worker.iban;
+            delete this.worker.bankEntityFk;
+        }
+
         return this.$.watcher.submit().then(json => {
             this.$state.go('worker.card.basicData', {id: json.data.id});
         });

modules/worker/front/create/locale/es.yml

@@ -10,3 +10,4 @@ Street: Dirección
 Postcode: Código postal
 Web user: Usuario Web
 Access permission: Permiso de acceso
+Pay method: Método de pago

package.json

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