From 03e2b984858d6b4378eaa408ba2ec0f924c93a0e Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 24 May 2023 15:50:59 +0200 Subject: [PATCH 01/10] hotFix(closeAll): fix where --- modules/ticket/back/methods/ticket/closeAll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js index 3726d85b7..6690126b9 100644 --- a/modules/ticket/back/methods/ticket/closeAll.js +++ b/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 -- 2.40.1 From 02c331ddd6ff1bbfc22f3af66a337618b4b711c7 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 25 May 2023 08:37:06 +0200 Subject: [PATCH 02/10] refs # fix(SQL): wagon --- db/changes/231201/00-wagon.sql | 3 +-- db/changes/232001/00-wagon.sql | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 db/changes/232001/00-wagon.sql diff --git a/db/changes/231201/00-wagon.sql b/db/changes/231201/00-wagon.sql index 3e4d225d7..9e817bac4 100644 --- a/db/changes/231201/00-wagon.sql +++ b/db/changes/231201/00-wagon.sql @@ -56,8 +56,6 @@ CREATE TABLE `vn`.`collectionWagonTicket` ( ALTER TABLE `vn`.`wagon` ADD `typeFk` int(11) unsigned NOT NULL; ALTER TABLE `vn`.`wagon` ADD `label` int(11) unsigned NOT NULL; -ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE; - INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES ('WagonType', '*', '*', 'ALLOW', 'ROLE', 'productionAssi'), @@ -70,3 +68,4 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri ('WagonType', 'createWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'), ('WagonType', 'deleteWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'), ('WagonType', 'editWagonType', '*', 'ALLOW', 'ROLE', 'productionAssi'); + diff --git a/db/changes/232001/00-wagon.sql b/db/changes/232001/00-wagon.sql new file mode 100644 index 000000000..bdb384db5 --- /dev/null +++ b/db/changes/232001/00-wagon.sql @@ -0,0 +1 @@ +ALTER TABLE `vn`.`wagon` ADD CONSTRAINT `wagon_type` FOREIGN KEY (`typeFk`) REFERENCES `wagonType` (`id`) ON UPDATE CASCADE; -- 2.40.1 From dfac44a87b33a3955c063c1743b0566804bbdfd7 Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 25 May 2023 11:35:25 +0200 Subject: [PATCH 03/10] hotfix 3rd parameter to null --- modules/item/back/methods/item/getBalance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/item/back/methods/item/getBalance.js b/modules/item/back/methods/item/getBalance.js index 50372652d..c22d2a2d9 100644 --- a/modules/item/back/methods/item/getBalance.js +++ b/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 [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk], myOptions); + const query = 'CALL vn.item_getBalance(?, ?, ?)'; + const [diary] = await Self.rawSql(query, [where.itemFk, where.warehouseFk, null], myOptions); for (const entry of diary) if (entry.clientType === 'loses') entry.highlighted = true; -- 2.40.1 From cd508e970d42b0c677b2f9db25e2e0caa11436c7 Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 25 May 2023 12:42:49 +0200 Subject: [PATCH 04/10] changed structure like prod --- db/dump/structure.sql | 320 +++++++++++++++++++++++++----------------- 1 file changed, 191 insertions(+), 129 deletions(-) diff --git a/db/dump/structure.sql b/db/dump/structure.sql index 90e4c4bc9..089cb00ec 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -59861,141 +59861,203 @@ 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(); - DECLARE vDayEnd DATETIME DEFAULT util.dayEnd(vCurdate); +/** + * @vItemFk item a buscar + * @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; - SET @a = 0; - SET @currentLineFk = 0; - SET @shipped = ''; + DECLARE vDateInventory DATETIME; + DECLARE vInvCalculated INT; - 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 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 + IF vDate IS NULL THEN + SELECT inventoried INTO vDateInventory + FROM config; + ELSE + SELECT mockUtcTime INTO vDateInventory + FROM util.config; + END IF; - SELECT tr.shipped, - NULL, - b.quantity, - al.id, - st.name, - s.name, - e.invoiceNumber, - e.id, - s.id, - IF(al.id = 3, 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.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 + CREATE OR REPLACE TEMPORARY TABLE itemDiary( + shipped DATE, + `in` INT(11), + `out` INT(11), + alertLevel INT(11), + stateName VARCHAR(20), + `name` VARCHAR(50), + reference VARCHAR(50), + origin INT(11), + clientFk INT(11), + isPicked INT(11), + isTicket TINYINT(1), + lineFk INT(11), + `order` TINYINT(3) UNSIGNED, + clientType VARCHAR(20), + claimFk INT(10) UNSIGNED + ); - SELECT DATE(t.shipped), - NULL, - s.quantity, - al.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.id = - CASE - WHEN t.shipped < util.VN_CURDATE() THEN 3 - WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 0 - ELSE IFNULL(ts.alertLevel, 0) - 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 = vItemId - AND vWarehouse =t.warehouseFk - ORDER BY shipped, alertLevel DESC, isTicket, `order` DESC, isPicked DESC, `in` DESC, `out` DESC - ) AS itemDiary; + INSERT INTO itemDiary + SELECT tr.landed shipped, + b.quantity `in`, + NULL `out`, + al.id alertLevel, + st.name stateName, + s.name `name`, + e.invoiceNumber reference, + e.id origin, + s.id clientFk, + IF(al.code = 'DELIVERED', TRUE, FALSE) isPicked, + FALSE isTicket, + b.id lineFk, + NULL `order`, + NULL clientType, + NULL 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.code = + CASE + WHEN tr.landed < util.VN_CURDATE() THEN 'DELIVERED' + WHEN tr.landed = util.VN_CURDATE() AND tr.isReceived = TRUE THEN 'DELIVERED' + ELSE 'FREE' + END + JOIN state st ON st.code = al.code + WHERE tr.landed >= vDateInventory + AND vWarehouseFk = tr.warehouseInFk + AND b.itemFk = vItemFk + AND e.isExcludedFromAvailable = FALSE + AND e.isRaid = FALSE + UNION ALL + SELECT tr.shipped, + 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, + al.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 = + CASE + WHEN t.shipped < util.VN_CURDATE() THEN 'DELIVERED' + WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 'FREE' + ELSE IFNULL(ts.alertLevel, 0) + 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 */ ; -- 2.40.1 From 7e5fcc73adeefa1b804e8341023fb340a5a4a7fc Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 25 May 2023 13:10:05 +0200 Subject: [PATCH 05/10] modified fixed structure --- db/dump/structure.sql | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/db/dump/structure.sql b/db/dump/structure.sql index caac02d3d..380202eeb 100644 --- a/db/dump/structure.sql +++ b/db/dump/structure.sql @@ -59970,7 +59970,7 @@ BEGIN SELECT DATE(t.shipped), NULL, s.quantity, - al.id, + al3.id, st.name, t.nickname, t.refFk, @@ -59988,12 +59988,14 @@ BEGIN 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 = - CASE - WHEN t.shipped < util.VN_CURDATE() THEN 'DELIVERED' - WHEN t.shipped > util.dayEnd(util.VN_CURDATE()) THEN 'FREE' - ELSE IFNULL(ts.alertLevel, 0) - END + 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 -- 2.40.1 From 2e0721b1013f659f804ddbde0e3e01c87705d958 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 25 May 2023 18:22:46 +0200 Subject: [PATCH 06/10] refs #5667 Fixes: Id filter, translations --- front/salix/components/log/index.js | 8 ++++---- modules/item/back/locale/item-botanical/en.yml | 2 +- modules/item/back/locale/item-botanical/es.yml | 2 +- modules/item/back/locale/item/en.yml | 2 +- modules/item/back/locale/item/es.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 7452c6636..ef1b370b5 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -150,10 +150,10 @@ export default class Controller extends Section { if (value == null || value == '') return null; switch (prop) { case 'search': - const or = [{changedModelId: value}]; - if (!/^[0-9]+$/.test(value)) - or.push({changedModelValue: {like: `%${value}%`}}); - return {or}; + if (/^[0-9]+$/.test(value)) + return {changedModelId: value}; + else + return {changedModelValue: {like: `%${value}%`}}; case 'changes': return {or: [ {oldInstance: {like: `%${value}%`}}, diff --git a/modules/item/back/locale/item-botanical/en.yml b/modules/item/back/locale/item-botanical/en.yml index 03c66a097..9e3d7cad5 100644 --- a/modules/item/back/locale/item-botanical/en.yml +++ b/modules/item/back/locale/item-botanical/en.yml @@ -1,4 +1,4 @@ -name: botanical +name: botanical data columns: itemFk: item genusFk: genus diff --git a/modules/item/back/locale/item-botanical/es.yml b/modules/item/back/locale/item-botanical/es.yml index ca7fd5bf1..75b1587a5 100644 --- a/modules/item/back/locale/item-botanical/es.yml +++ b/modules/item/back/locale/item-botanical/es.yml @@ -1,4 +1,4 @@ -name: botánico +name: datos botánicos columns: itemFk: artículo genusFk: género diff --git a/modules/item/back/locale/item/en.yml b/modules/item/back/locale/item/en.yml index 39e465300..ea40fd34b 100644 --- a/modules/item/back/locale/item/en.yml +++ b/modules/item/back/locale/item/en.yml @@ -35,7 +35,7 @@ columns: packingOut: packing out hasMinPrice: has min price isFragile: fragile - isFloramondo: is floramondo + isFloramondo: floramondo packingShelve: packing shelve isLaid: laid inkFk: ink diff --git a/modules/item/back/locale/item/es.yml b/modules/item/back/locale/item/es.yml index 4b75b4704..973f5e94f 100644 --- a/modules/item/back/locale/item/es.yml +++ b/modules/item/back/locale/item/es.yml @@ -35,7 +35,7 @@ columns: packingOut: empaquetar hasMinPrice: tiene precio mínimo isFragile: frágil - isFloramondo: es floramondo + isFloramondo: floramondo packingShelve: estantería embalaje isLaid: puesto inkFk: tinta -- 2.40.1 From 27d4d1047268003962c3016b650a9b77ba09a82b Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 25 May 2023 18:32:03 +0200 Subject: [PATCH 07/10] refs #5667 Expedition translation fixes --- modules/ticket/back/locale/expedition/en.yml | 2 ++ modules/ticket/back/locale/expedition/es.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/ticket/back/locale/expedition/en.yml b/modules/ticket/back/locale/expedition/en.yml index 5ec5d5ecd..455cf78a2 100644 --- a/modules/ticket/back/locale/expedition/en.yml +++ b/modules/ticket/back/locale/expedition/en.yml @@ -12,3 +12,5 @@ columns: hostFk: PC isBox: box itemPackingTypeFk: packing type + externalId: external id + stateTypeFk: status diff --git a/modules/ticket/back/locale/expedition/es.yml b/modules/ticket/back/locale/expedition/es.yml index cda577f18..5f9d4f0a5 100644 --- a/modules/ticket/back/locale/expedition/es.yml +++ b/modules/ticket/back/locale/expedition/es.yml @@ -12,3 +12,5 @@ columns: hostFk: PC isBox: caja itemPackingTypeFk: tipo empaquetado + externalId: id externo + stateTypeFk: estado -- 2.40.1 From a232e9eceaa84b1b72cf750fea7f25ddf41a2a5c Mon Sep 17 00:00:00 2001 From: pablone Date: Mon, 29 May 2023 09:26:36 +0200 Subject: [PATCH 08/10] refs #5153 --- modules/client/back/methods/client/getCard.js | 6 ++++++ modules/client/back/models/pay-method.json | 2 +- modules/client/front/descriptor/index.html | 4 ++++ modules/client/front/descriptor/locale/es.yml | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/client/back/methods/client/getCard.js b/modules/client/back/methods/client/getCard.js index 414cbe058..b52678b39 100644 --- a/modules/client/back/methods/client/getCard.js +++ b/modules/client/back/methods/client/getCard.js @@ -59,6 +59,12 @@ module.exports = function(Self) { fields: ['id', 'name'] } }, + { + relation: 'businessType', + scope: { + fields: ['code', 'description'] + } + }, { relation: 'account', scope: { diff --git a/modules/client/back/models/pay-method.json b/modules/client/back/models/pay-method.json index c83c21e2f..6eeb2b0ee 100644 --- a/modules/client/back/models/pay-method.json +++ b/modules/client/back/models/pay-method.json @@ -3,7 +3,7 @@ "base": "VnModel", "options": { "mysql": { - "table": "payMethod" + "table": "payMethod" } }, "properties": { diff --git a/modules/client/front/descriptor/index.html b/modules/client/front/descriptor/index.html index 5aaecbdb0..f2dbd64b6 100644 --- a/modules/client/front/descriptor/index.html +++ b/modules/client/front/descriptor/index.html @@ -43,6 +43,10 @@ {{$ctrl.client.salesPersonUser.name}} + +
Date: Tue, 30 May 2023 11:23:07 +0200 Subject: [PATCH 09/10] refs #5153 --- modules/client/back/methods/client/getCard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/client/back/methods/client/getCard.js b/modules/client/back/methods/client/getCard.js index b52678b39..48840b036 100644 --- a/modules/client/back/methods/client/getCard.js +++ b/modules/client/back/methods/client/getCard.js @@ -62,7 +62,7 @@ module.exports = function(Self) { { relation: 'businessType', scope: { - fields: ['code', 'description'] + fields: ['description'] } }, { -- 2.40.1 From a4d7988591c04e8093a51fdf8def9319a5c918a6 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Tue, 30 May 2023 19:39:11 +0200 Subject: [PATCH 10/10] refs #5517 Translations fixes --- modules/shelving/back/locale/shelving/en.yml | 11 +++++++++++ modules/shelving/back/locale/shelving/es.yml | 11 +++++++++++ modules/worker/back/locale/business/en.yml | 11 +++++++++++ modules/worker/back/locale/business/es.yml | 11 +++++++++++ modules/worker/back/locale/worker-document/en.yml | 6 ++++++ modules/worker/back/locale/worker-document/es.yml | 6 ++++++ 6 files changed, 56 insertions(+) create mode 100644 modules/shelving/back/locale/shelving/en.yml create mode 100644 modules/shelving/back/locale/shelving/es.yml create mode 100644 modules/worker/back/locale/worker-document/en.yml create mode 100644 modules/worker/back/locale/worker-document/es.yml diff --git a/modules/shelving/back/locale/shelving/en.yml b/modules/shelving/back/locale/shelving/en.yml new file mode 100644 index 000000000..d89ddc871 --- /dev/null +++ b/modules/shelving/back/locale/shelving/en.yml @@ -0,0 +1,11 @@ +name: shelving +columns: + id: id + code: code + parkingFk: parking + isPrinted: printed + priority: priority + parked: parked + userFk: user + isSpam: SPAM + isRecyclable: recyclable diff --git a/modules/shelving/back/locale/shelving/es.yml b/modules/shelving/back/locale/shelving/es.yml new file mode 100644 index 000000000..dee96139c --- /dev/null +++ b/modules/shelving/back/locale/shelving/es.yml @@ -0,0 +1,11 @@ +name: estantería +columns: + id: id + code: código + parkingFk: parking + isPrinted: impreso + priority: prioridad + parked: aparcado + userFk: usuario + isSpam: SPAM + isRecyclable: reciclable diff --git a/modules/worker/back/locale/business/en.yml b/modules/worker/back/locale/business/en.yml index f0642fbe4..0f18a9ce8 100644 --- a/modules/worker/back/locale/business/en.yml +++ b/modules/worker/back/locale/business/en.yml @@ -4,9 +4,20 @@ columns: companyCodeFk: company started: started ended: ended + workerBusiness: business + reasonEndFk: ending reason payedHolidays: payed holidays + occupationCodeFk: occupation workerFk: worker + notes: notes + departmentFk: department + workerBusinessProfessionalCategoryFk: professional category calendarTypeFk: calendar type isHourlyLabor: hourly labor workcenterFk: workcenter + rate: rate + workerBusinessCategoryFk: category + workerBusinessTypeFk: type amount: amount + workerBusinessAgreementFk: agreement + basicSalary: salary diff --git a/modules/worker/back/locale/business/es.yml b/modules/worker/back/locale/business/es.yml index 13ecfdb19..3367c1b78 100644 --- a/modules/worker/back/locale/business/es.yml +++ b/modules/worker/back/locale/business/es.yml @@ -4,9 +4,20 @@ columns: companyCodeFk: empresa started: iniciado ended: finalizado + workerBusiness: negocio + reasonEndFk: motivo finalización payedHolidays: vacaciones pagadas + occupationCodeFk: ocupación workerFk: trabajador + notes: notas + departmentFk: departamento + workerBusinessProfessionalCategoryFk: categoría profesional calendarTypeFk: tipo calendario isHourlyLabor: horario laboral workcenterFk: centro de trabajo + rate: tarifa + workerBusinessCategoryFk: categoría + workerBusinessTypeFk: tipo amount: salario + workerBusinessAgreementFk: acuerdo + basicSalary: salario base diff --git a/modules/worker/back/locale/worker-document/en.yml b/modules/worker/back/locale/worker-document/en.yml new file mode 100644 index 000000000..0f644bf37 --- /dev/null +++ b/modules/worker/back/locale/worker-document/en.yml @@ -0,0 +1,6 @@ +name: document +columns: + id: id + worker: worker + document: document + isReadableByWorker: readable by worker diff --git a/modules/worker/back/locale/worker-document/es.yml b/modules/worker/back/locale/worker-document/es.yml new file mode 100644 index 000000000..721acd3d1 --- /dev/null +++ b/modules/worker/back/locale/worker-document/es.yml @@ -0,0 +1,6 @@ +name: documento +columns: + id: id + worker: trabajador + document: documento + isReadableByWorker: accesible por trabajador -- 2.40.1