Compare commits

...

9 Commits
test ... dev

Author SHA1 Message Date
Alex Moreno 728e6e921a build: init version
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:46 +01:00
Alex Moreno f316349ac2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-18 13:38:21 +01:00
Jon Elias 0f0504e590 Merge pull request '#8555: Added new filter field' (!3434) from 8555-AddNewField into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3434
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-18 11:46:12 +00:00
Jon Elias 6118154ef9 Merge branch 'dev' into 8555-AddNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 11:44:01 +00:00
Jon Elias 5a1c826f15 Merge pull request '#8606: Show correct text of duplicate entry error' (!3461) from 8606-FixZoneModule into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3461
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2025-02-18 11:29:46 +00:00
Jon Elias 16bb716abd Merge branch 'dev' into 8606-FixZoneModule
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-18 10:36:49 +00:00
Jon Elias c8abd7b2a1 feat: refs #8606 show correct text of duplicate entry error
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-14 14:16:01 +01:00
Jon Elias 2e04a38c66 Merge branch 'dev' into 8555-AddNewField
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-11 11:24:17 +00:00
Jon Elias 02f51a244d feat: refs #8555 added new filter field
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-11 12:19:15 +01:00
5 changed files with 21 additions and 3 deletions

View File

@ -257,5 +257,6 @@
"Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.", "Ticket has been delivered out of order": "The ticket {{ticket}} of route {{{fullUrl}}} has been delivered out of order.",
"clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}", "clonedFromTicketWeekly": ", that is a cloned sale from ticket {{ ticketWeekly }}",
"negativeReplaced": "Replaced item [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} with [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} from ticket [{{ticketId}}]({{{ticketUrl}}})", "negativeReplaced": "Replaced item [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} with [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} from ticket [{{ticketId}}]({{{ticketUrl}}})",
"The tag and priority can't be repeated": "The tag and priority can't be repeated" "The tag and priority can't be repeated": "The tag and priority can't be repeated",
"duplicateWarehouse": "The introduced warehouse already exists"
} }

View File

@ -398,5 +398,6 @@
"Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.", "Ticket has been delivered out of order": "El ticket {{ticket}} {{{fullUrl}}} no ha sido entregado en su orden.",
"Price cannot be blank": "El precio no puede estar en blanco", "Price cannot be blank": "El precio no puede estar en blanco",
"clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}", "clonedFromTicketWeekly": ", que es una linea clonada del ticket {{ticketWeekly}}",
"negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})" "negativeReplaced": "Sustituido el articulo [#{{oldItemId}}]({{{oldItemUrl}}}) {{oldItem}} por [#{{newItemId}}]({{{newItemUrl}}}) {{newItem}} del ticket [{{ticketId}}]({{{ticketUrl}}})",
"duplicateWarehouse": "El almacén seleccionado ya existe en la zona"
} }

View File

@ -67,6 +67,11 @@ module.exports = Self => {
type: 'number', type: 'number',
description: 'The freighter supplier id' description: 'The freighter supplier id'
}, },
{
arg: 'entrySupplierFk',
type: 'number',
description: 'The supplier of the entry(not freighter) id'
},
], ],
returns: { returns: {
type: ['Object'], type: ['Object'],
@ -94,6 +99,8 @@ module.exports = Self => {
return {'t.landed': {lte: value}}; return {'t.landed': {lte: value}};
case 'continent': case 'continent':
return {'cnt.code': value}; return {'cnt.code': value};
case 'entrySupplierFk':
return {'e.supplierFk': value};
case 'id': case 'id':
case 'agencyModeFk': case 'agencyModeFk':
case 'warehouseOutFk': case 'warehouseOutFk':

View File

@ -0,0 +1,9 @@
let UserError = require('vn-loopback/util/user-error');
module.exports = Self => {
Self.rewriteDbError(function(err) {
if (err.code === 'ER_DUP_ENTRY')
return new UserError(`duplicateWarehouse`);
return err;
});
};

View File

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