Commit Graph

10182 Commits

Author SHA1 Message Date
Guillermo Bonet 110cae3171 Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2353
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-30 08:23:52 +00:00
Carlos Satorres ace39b92ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6870-modifyDefaulterNotification
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 12:14:38 +02:00
Jorge Penadés be69b5e2c4 fix: refs #5919 rollback 2024-04-29 12:04:31 +02:00
Carlos Satorres f3c7b1e89c refs #6870 add observationEmail 2024-04-29 11:59:51 +02:00
Jorge Penadés f6e89c9049 fix: refs #5919 rollback 2024-04-29 11:46:58 +02:00
Jorge Penadés 7240269f5b fix: refs #5919 rollback 2024-04-29 11:45:54 +02:00
Jorge Penadés 50ea41f99a fix: refs #5919 rollback 2024-04-29 11:43:56 +02:00
Jorge Penadés 8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-04-29 09:24:10 +02:00
Sergio De la torre a180f54390 refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 08:59:12 +02:00
Sergio De la torre f4767728bc refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 08:20:57 +02:00
Sergio De la torre f2225b49a7 refs #6275 hotFix fix:getExpeditionSummary 2024-04-29 08:19:18 +02:00
Jorge Penadés b9d3684db2 feat: refs #6600 add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 15:48:30 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +02:00
Robert Ferrús fd7dcf2781 fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 10:26:20 +02:00
Robert Ferrús 2d0d4b5643 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:48:01 +00:00
Pablo Natek 4693ba13fa Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-26 08:37:51 +02:00
Javi Gallego 94e04c1c2f Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:45:43 +02:00
Jorge Penadés b9de2b3ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:18:37 +02:00
Jorge Penadés 32da39899a fix: refs #7211 test e2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 17:16:43 +02:00
Pablo Natek 5c45dd6c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 16:18:18 +02:00
Jorge Penadés 180a484c55 fix: refs #7211 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:14:34 +02:00
Jorge Penadés f7cdbd39f0 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 16:08:52 +02:00
Jorge Penadés edeed037a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl 2024-04-25 15:38:40 +02:00
Jorge Penadés 4e864fed52 fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 15:38:21 +02:00
Javi Gallego 2e2bc3d594 Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:31:06 +00:00
Javi Gallego 4f20224acc Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 14:28:53 +02:00
Javi Gallego 7d3870e4a1 feat: refs#6382 test fixed 2024-04-25 14:28:47 +02:00
Javier Casado a9e4b2cd36 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 11:46:53 +00:00
Jorge Penadés 931c2c4f5e feat: refs #7211 error & locale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 13:12:06 +02:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Jorge Penadés 6749722634 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 10:10:06 +02:00
Pablo Natek c5b02dc239 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency 2024-04-25 09:46:53 +02:00
Jorge Penadés c9dfccbc53 feat: refs #7211 add test & changelog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 09:35:53 +02:00
Alex Moreno 917592cdad Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2366
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 12:34:46 +00:00
Alex Moreno 69486fb29f fix(componentUpdate): refs #7225 fix transfer all lines to newTicket
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:15:27 +02:00
jcasado aeee012c2b refs #6697 fix sql test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:43:10 +02:00
jcasado 87d5e0a311 Merge branch '6697-removeClaimQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 11:19:17 +02:00
jcasado d1659ce04c refs #6697 fix claimQuantity 2024-04-24 11:19:15 +02:00
Alex Moreno 0cd740ce0c test: refs #7225 fix back test
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-24 10:42:50 +02:00
Jon Elias 6706974784 fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 10:31:26 +02:00
Javier Segarra f7d9cc8102 Merge pull request 'FIX bug Ticket-Request Filter' (!2355) from fix_itemFk_ticketRequest_filter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2355
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-24 07:56:03 +00:00
Jon Elias 88ba6833be Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!2322) from 6899-endInvoiceOutMigration into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2322
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-24 07:36:55 +00:00
Javi Gallego dcc46494bc Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 07:45:02 +02:00
Javier Segarra 0fd120676d Actualizar modules/ticket/back/methods/ticket-request/filter.js
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:29:40 +00:00
Javier Casado 69ea518a49 Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-23 10:55:45 +00:00
Guillermo Bonet 1044a24bc7 refactor: #6997 Deleted vn.client.eypbc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:00:23 +02:00
Alex Moreno 60d5b9e4aa test: refs #7173 fix sql, adding alias
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-23 08:47:52 +02:00
Alex Moreno 85491613b0 test: refs #7173 fix fixtures 2024-04-23 08:47:28 +02:00
Javi Gallego b0c4f7fd3c feat: moved files to invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 11:45:58 +02:00
Sergio De la torre 23fa74a5ad Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 08:11:37 +00:00
Javier Segarra f6199f8f8e Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:56:05 +00:00
Javier Segarra 283d27e1c5 Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:22:36 +00:00
Jon Elias fa653f630c Merge branch '6899-endInvoiceOutMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 07:37:49 +02:00
Jon Elias 9759ee4bd0 refactor: refs #6899 requested changes 2024-04-22 07:37:47 +02:00
Javier Segarra b4503afc47 Merge branch 'dev' into 6930_scope_Default_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 10:50:45 +02:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Alex Moreno da7ab00c73 Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 07:22:33 +00:00
Alex Moreno 5b5ec11973 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 08:58:17 +02:00
Jon Elias 9dedd5383c Merge branch 'dev' into 6899-endInvoiceOutMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 06:10:49 +00:00
Jon Elias f40c730f6e refactor: refs #6899 changed comercial value in negativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 07:52:43 +02:00
Sergio De la torre f4afda8cb2 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 14:52:57 +00:00
Alex Moreno 87e23b49e7 hotFix: change require to import
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-18 15:19:19 +02:00
Jon Elias 08ca1a302b Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2323
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 12:55:58 +00:00
Sergio De la torre 279c300fbf Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 11:08:15 +00:00
Guillermo Bonet 2b11f85b67 Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 11:06:47 +00:00
Jon Elias f7a6d47c04 Merge pull request 'feat: #7130 added "served" field to RouteList table(Salix).' (!2219) from 7130-addFieldInRoutes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2219
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 09:34:35 +00:00
Sergio De la torre 958759dc80 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:12:46 +00:00
Sergio De la torre e909d64757 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 10:01:22 +02:00
Alex Moreno 9143447eb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 09:27:46 +02:00
Alex Moreno af06ef30d4 hotFix(workerDms): document.isDocuware
gitea/salix/pipeline/head This commit looks good Details
2024-04-18 08:50:17 +02:00
Jon Elias d42aab346f refactor: refs #7139 replace warehouse with ticket
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:17:43 +02:00
Jon Elias f41177643f refactor: refs #6899 corrected Lilium styles and functionalities
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 08:01:16 +02:00
Sergio De la torre 32e2827287 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:55:07 +02:00
Sergio De la torre a3c8532661 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 13:27:00 +02:00
Javier Segarra 6214da2c42 feat(salix): refs #6930 Undo rollback salix-back 2024-04-17 09:52:53 +02:00
Guillermo Bonet 9f9662924d Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 06:48:43 +00:00
Sergio De la torre ae88a8a281 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 07:44:08 +02:00
Guillermo Bonet 36bf770ed4 Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2258
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-17 05:17:36 +00:00
Guillermo Bonet d92d373db4 Merge branch 'dev' into 6968-groupingModeRefactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-17 05:15:37 +00:00
Guillermo Bonet 56dc0ddb68 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 12:32:53 +02:00
Guillermo Bonet 9ea1ac2a56 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-16 12:32:27 +02:00
Guillermo Bonet 7a557be09a feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 11:07:57 +02:00
Guillermo Bonet d88957d157 Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 06:45:04 +00:00
Guillermo Bonet 91d5f51e73 Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 08:44:51 +02:00
Guillermo Bonet 93abfdd8a1 feat: refs #7173 Added restrictions in invoiceIn structure 2024-04-16 08:44:50 +02:00
Sergio De la torre d24de61213 refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 08:29:39 +02:00
Pablo Natek 0418540ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 07:39:13 +02:00
Jorge Penadés 3c9ac9634b fix: refs #6938 front tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 15:02:45 +02:00
Jorge Penadés 3e1218463c fix: refs #6938 filters & scope
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-15 14:44:18 +02:00
Guillermo Bonet 339c349ed0 feat: refs #6724 Added admon acl to vn-check
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 14:00:54 +02:00
Guillermo Bonet 5c524ecc7d rollback: refs #6724 entry.js
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 13:13:40 +02:00
Guillermo Bonet 78bd561122 Merge branch 'dev' into 6724-permisos-vn.entry.isBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-15 11:11:55 +00:00
Sergio De la torre 4cb79956a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery 2024-04-15 13:03:47 +02:00
Jorge Penadés d7b06fe637 fix: refs #6938 scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 12:47:27 +02:00
Jorge Penadés 200cbd8d74 fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 11:03:57 +02:00
Jorge Penadés 0219fa105e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:22:44 +02:00
Jorge Penadés a68b8431c5 feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:21:59 +02:00
jcasado dc8a6d1274 Merge branch 'dev' into 6641-checkboxMyTeam
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:11:36 +02:00
Alex Moreno b4862a8ce9 hotFix(claimBegginingModel): enable claimIsEditable and &&
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-12 11:35:21 +02:00
Pablo Natek 726b1ddc07 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-12 05:14:29 +00:00
Jorge Penadés c161c122d0 feat: refs #6449 add column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-11 15:56:17 +02:00
Guillermo Bonet 2226922366 Merge branch 'master' into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-04-11 14:52:16 +02:00
Guillermo Bonet 4449441cbf Merge pull request 'hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod' (!2279) from ticket168996-hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2279
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-11 12:42:44 +00:00
Alex Moreno 99d80d4d30 hotFix(closeAll): continue loop
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-11 13:51:33 +02:00
Alex Moreno 3635a4b6d0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-11 07:46:16 +02:00
Ivan Mas 83befbd120 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-10 15:21:42 +00:00
jcasado 0cf1ced747 remove focus
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-10 13:17:43 +02:00
jcasado 7d925bac87 refs #6641 fix PR changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-10 13:16:41 +02:00
Pablo Natek c581deef66 refactor: refs #6005 refactor spec 2024-04-10 13:09:31 +02:00
Sergio De la torre 9c373d9ef3 refs #6921 feat: getTicketsObservations
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-10 12:02:25 +02:00
Guillermo Bonet 1fe783cf0e hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-10 12:00:52 +02:00
Alex Moreno 51e7045e8b hotFix(workerTimeControl): getWeekNumber
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-10 09:44:09 +02:00
Ivan Mas eedf30a2dd refs #6732 salix dependencies and undo changes Proveedores
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 17:31:34 +02:00
Pablo Natek ed517399dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-04-09 15:04:04 +02:00
Pablo Natek ac9732606c remove(focus): refs #6005 from spec 2024-04-09 14:55:29 +02:00
Ivan Mas f02c4354ba Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 14:45:29 +02:00
Ivan Mas 521033edd2 Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 11:54:41 +00:00
Pablo Natek da037c5235 refactor: refs #6005 delay on productionConfig 2024-04-09 13:34:33 +02:00
Guillermo Bonet 0e2e68488d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 13:08:54 +02:00
Carlos Satorres de75d811c3 refs #6682 absence
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 12:30:25 +02:00
Alex Moreno c69a4e1c98 Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-09 08:21:20 +00:00
Guillermo Bonet c42e00f11e Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 07:43:51 +00:00
Pablo Natek 7cb40f5d89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:42:39 +02:00
Pablo Natek 638b715ee5 fix: refs #6005 move logic to hook
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:30:28 +02:00
Alex Moreno 500244dbed fix id
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-09 07:51:57 +02:00
Sergio De la torre 75293fbb9a refs #6276 hotFix:itemShelving_add
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-09 07:38:28 +02:00
Alex Moreno 0ecc09fcc4 Merge branch 'dev' into 6551-workerDms_refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 12:50:05 +00:00
Alex Moreno 9134216332 refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-08 14:46:35 +02:00
jcasado a30c0ee675 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-08 14:39:00 +02:00
jcasado 84997eacd5 refs: 6697 remove claim quantity 2024-04-08 14:38:54 +02:00
jcasado 26c74a3e71 refs #6641 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-08 13:03:15 +02:00
Guillermo Bonet e27279e20e Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-08 05:18:36 +00:00
Alex Moreno 93000aaecf Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 12:20:09 +00:00
Guillermo Bonet 16a6e3d8a6 feat: refs #6636 Requested change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 08:18:38 +02:00
Pablo Natek 4b4aaa9e10 feat: refs #6005 move logic from report to hook 2024-04-05 08:04:53 +02:00
Guillermo Bonet 0cd4013f5e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-05 07:51:19 +02:00
Guillermo Bonet 1656c8db63 Merge branch '6636-pickup' of https://gitea.verdnatura.es/verdnatura/salix into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 07:42:04 +02:00
Guillermo Bonet 23db6a41be feat: refs #6636 Minor change 2024-04-05 07:42:03 +02:00
Guillermo Bonet ac658fb6af Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-05 05:29:26 +00:00
Carlos Andrés fe0afe30bf fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 17:50:39 +02:00
Sergio De la torre 2ed5237568 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:45:20 +00:00
jcasado 84e6e7f7bf refs #6641 test fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 14:53:26 +02:00
Carlos Andrés 9fcad457a7 fix: closeTicket idem salix Refs: #6549
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 14:46:51 +02:00
jcasado 1c6d913926 refs #6641 addFilterCollegues
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-04 14:28:39 +02:00
Guillermo Bonet fcb4fe92e8 Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 12:14:23 +00:00
Guillermo Bonet f44e19cae3 feat: refs #6636 Modified updateClaim, model and tests
gitea/salix/pipeline/pr-dev Build queued... Details
2024-04-04 14:15:20 +02:00
jcasado 5acef1fcc0 refs #6641 add button my team
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 13:53:23 +02:00
Alex Moreno 20e4ab1d2c Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2253
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-04-04 11:35:09 +00:00
Alex Moreno dd9c7283c3 hotFix: handle mail error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-04 13:32:39 +02:00
Guillermo Bonet 29eee4e8a7 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 11:30:03 +02:00
Sergio De la torre 9423a2d043 refs #3520 hotFix: hasUncheckedTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-04 10:38:55 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia
gitea/salix/pipeline/head This commit looks good Details
2024-04-04 10:13:56 +02:00
Jon Elias 3e044a8efe fix: refs #7152 add supplier storage
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-04 08:16:37 +02:00
Pablo Natek 2efd1945f8 feat: refs #4988 add agency 2024-04-04 07:27:27 +02:00
Alex Moreno ff2e00c51c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-04-03 16:24:45 +02:00
Alex Moreno 59ead0c2e5 debug(closure): add log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 15:29:56 +02:00
Javier Casado 3968d88a8d Merge branch 'master' into hotfix_languageClaimNotification
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 11:37:15 +00:00
jcasado 09f023090e hotfix claimStateLanguage
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-03 13:33:56 +02:00
Javier Segarra 8ab9063b50 refs #6436 feat: use mocks
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-01 11:00:55 +02:00
Jorge Penadés a62e189e47 feat: refs #6724 hook added
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 16:10:52 +01:00
Sergio De la torre b62905c5ef Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 10:08:56 +00:00
Alex Moreno a376003da6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-28 10:10:22 +01:00
Alex Moreno ed46ad03d2 refs #7152 warmFix
gitea/salix/pipeline/head This commit looks good Details
2024-03-28 09:33:57 +01:00
Carlos Satorres 9f438751d3 Merge branch 'dev' into 6074-KkearisBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 08:13:37 +00:00
Alex Moreno f1931fce69 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-28 08:19:26 +01:00
Alex Moreno c47989c6fe Merge pull request '3520_wareshouse_back' (!2218) from 3520_wareshouse_back into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2218
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:16:56 +00:00
Alex Moreno 0b764ebc1b Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:12:51 +00:00
Sergio De la torre 4ca3e8f650 Merge branch 'dev' into 3520_wareshouse_back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:12:24 +00:00
Sergio De la torre 8e6416d59c refs #3520 feat:uncheckedTicket
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-28 08:08:32 +01:00
Alex Moreno 6853454d30 Merge pull request '#7002 update direction if device exists' (!2206) from 7002-fixUpdateTimeEntry into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2206
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:04:17 +00:00
Alex Moreno 8cccc78b88 Merge branch 'dev' into 6532-deleteMermas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 06:42:39 +00:00
Javier Segarra d30cac971f refs #6930 updates
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:22:28 +01:00
Sergio De la torre 7634d82d8b refs #6964 feat:hasItemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-28 07:15:30 +01:00
Carlos Satorres f4915fbe2e Merge branch 'dev' into 6074-KkearisBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 16:50:03 +00:00
Jorge Penadés e7a29119d0 feat: refs #7002 add test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 13:38:04 +01:00
Jorge Penadés 227d123247 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7002-fixUpdateTimeEntry
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 12:24:19 +01:00
Sergio De la torre 483345666e refs #3520 feat:back WarehouseFk
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 11:01:32 +01:00
Jon Elias 562dd4034f feat: #7130 added "served" field to RouteList table(Salix).
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 07:58:35 +01:00
Sergio De la torre 9240732c00 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 07:49:51 +01:00
Sergio De la torre 2cf572baf8 refs #3520 hasUncheckedTicket
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-27 07:48:16 +01:00
Sergio De la torre a983f25c57 refs #3520 hasUncheckedTicket 2024-03-27 07:47:36 +01:00
Sergio De la torre 39b1e9ff7b refs #3520 hasUncheckedTicket 2024-03-27 07:26:11 +01:00
Sergio De la torre eaf3749440 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3520_wareshouse_back 2024-03-27 07:11:16 +01:00
Sergio De la torre ff8522cfd1 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 07:09:18 +01:00
Sergio De la torre 43b042a616 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-27 07:08:47 +01:00
Javier Segarra 38c5209c33 refs #6930 fix more endpoints
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 15:01:28 +01:00
Jorge Penadés 6ded14b593 feat: refs #7002 update direction if it was not manual
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 14:25:25 +01:00
Sergio De la torre b805a5de0a refs #3520 feat:uncheckedTicket 2024-03-26 12:40:44 +01:00
Robert Ferrús 3e2e0ccadb Merge branch 'master' into 7141-sale_replaceItem
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-26 11:00:44 +00:00
Sergio De la torre caf99a9738 refs #3520 feat:uncheckedTicket 2024-03-26 11:06:14 +01:00
Sergio De la torre 678eb2928f refs #6964 feat:hasItemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 10:30:17 +01:00
Sergio De la torre c265896224 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 10:24:27 +01:00
Sergio De la torre dc5f588c8e refs #3520 feat: backWarehouse in Salix 2024-03-26 10:13:57 +01:00
Jon Elias a5082d04f9 refs: #6514 fixed error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 08:52:11 +01:00
Jon Elias 0f4e1acf09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 08:37:51 +01:00
Alex Moreno 2212899400 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 08:35:38 +01:00
Jon Elias 04e42cd3c8 feat: #6514 created supplierDms functionality
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-26 08:29:07 +01:00
Alex Moreno dce0155c00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-26 08:18:47 +01:00
Sergio De la torre 1840117b3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder 2024-03-25 16:08:11 +01:00
Jorge Penadés 0188b3d1df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 15:03:00 +01:00
Robert Ferrús dd977fab83 fix: refs #7141 catalog_calculate
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-25 14:56:12 +01:00
Jorge Penadés eb2b0d41de feat: refs #7002 update direction if device exists
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 13:33:39 +01:00
Sergio De la torre 0f5c5efcaa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6276-newWarehouse-salix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-25 13:04:02 +01:00
Sergio De la torre 386bc1c934 refs #6276 hotFix: setUserError and return 2024-03-25 13:00:55 +01:00
Jorge Penadés 308a449b94 Merge branch 'master' into 6085-hotFix-addOwnedAlias
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-25 07:48:08 +00:00
Sergio De la torre a40234ba9b refs #6964 feat:hasItemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 08:20:08 +01:00
Sergio De la torre 22f78dbb91 refs #6964 feat:hasItemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-25 07:54:51 +01:00
Jorge Penadés 0867f4d501 fix: refs #6951 var names & procedure name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 16:01:22 +01:00
Jorge Penadés e8d1967e11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 15:14:12 +01:00
Sergio De la torre c4fcb2cd12 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 13:04:16 +01:00
Sergio De la torre 61b649fdc5 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 11:47:12 +01:00
Sergio De la torre 976c5b7ba8 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 11:42:19 +01:00
Sergio De la torre 027aa86662 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 10:08:20 +01:00
Sergio De la torre 9e5e49c28f refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-22 06:56:27 +01:00
Carlos Satorres ca0d269ee2 refs #6074 remove isBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 15:02:09 +01:00
Jorge Penadés d8aad86c92 feat: refs #6085 add acl authenticated
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 13:42:02 +01:00
Sergio De la torre 2a976664ec refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:05:34 +01:00
Sergio De la torre 5135bee2d2 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:02:57 +01:00
Sergio De la torre d8da317339 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev Build started... Details
2024-03-21 10:10:57 +00:00
Sergio De la torre 1d37d3d8bf refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:33:49 +01:00
Sergio De la torre 3fbf32bd52 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-21 10:32:36 +01:00
Pablo Natek 130fb68d27 Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2187
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-21 09:28:39 +00:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:18:54 +01:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:01:05 +01:00
Pablo Natek da8fbb5a92 fix: refs #6302 spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 21:14:01 +01:00
Pablo Natek f7b458d368 feat: refs #6302 delete after add to turn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-20 20:54:24 +01:00
Alex Moreno adddcc96aa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 15:01:17 +01:00
Carlos Satorres b352fc10e7 refs #6532 redirect grafana, remove mermas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-20 14:44:06 +01:00
Alex Moreno 7895a51e33 hotFix(closeAll): fix debug
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-20 12:15:41 +01:00
Carlos Andrés 913b261f86 Merge branch 'dev' into 6549-ticket_close
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-18 17:55:54 +01:00
Alex Moreno 517aeebe8b refs #7019 fix(createManualInvoice): add throw error
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-18 14:20:05 +01:00
Jorge Penadés 3c3dd64da1 feat: refs #6951 test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-18 09:39:56 +01:00
Jorge Penadés f044809f30 feat: refs #6951 to create back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 15:45:47 +01:00
Alex Moreno 8119106e69 hotFix: try to debug closeAll
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-15 15:40:54 +01:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Jorge Penadés 6281ba352b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 10:38:08 +01:00
Jorge Penadés b1bf6be44b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 09:29:42 +01:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 08:26:45 +00:00
Pablo Natek e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:39:13 +00:00
Carlos Satorres 1457884252 Merge branch 'dev' into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:54:06 +00:00
Carlos Satorres dd7c700130 refs #6755 fix test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:53:50 +01:00
Alex Moreno 4ad562a4da fix: refs #6925 transalation
gitea/salix/pipeline/head Build queued... Details
2024-03-14 09:12:19 +01:00
Alex Moreno 974c95b961 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 08:00:29 +00:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-03-14 08:36:19 +01:00
Carlos Satorres 24c1ab541d Merge branch 'dev' into 6913-routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 07:31:31 +00:00
Alex Moreno 977181f156 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 07:27:16 +00:00
Carlos Satorres 33bd21d40b refs #6755 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 16:29:05 +01:00
Carlos Satorres 1315bfda88 refs #6755 fix test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 14:18:53 +01:00
Carlos Andrés ff459ea3be fix: closeTicket idem salix refs #6549
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 12:18:43 +01:00
Carlos Satorres 92cf8fc5e1 refs #6755 remove console
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-13 11:46:43 +01:00
Sergio De la torre def9aaf41a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-13 07:15:45 +01:00
Javier Segarra 99f01a1dbd refs #6930 perf: add accessScopes to account.logout
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 13:39:21 +01:00
Carlos Satorres a6d1c5b6db refs #6755 remove
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 13:33:14 +01:00
Carlos Satorres 106296be7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:56 +01:00
Carlos Satorres ed57212618 refs #6755 fix restore
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 12:55:14 +01:00
Carlos Satorres 93170dd82f Merge branch 'dev' into 6913-routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 11:48:49 +00:00
Javier Segarra 486b51bcfa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia 2024-03-12 12:46:46 +01:00
Sergio De la torre 375b690063 Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 09:12:45 +00:00
Javier Segarra 63a22a50f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-12 09:37:41 +01:00
Carlos Satorres 6627c7a16a refs #6913 routeKm
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-12 08:25:01 +01:00
Alex Moreno 35ef9b53c2 Merge branch 'dev' into 6925-fix_translations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:49:34 +00:00
Jorge Penadés 745253f30b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 13:46:53 +01:00
Pablo Natek 35dab518c8 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:41:07 +00:00
Guillermo Bonet a34be6ca02 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-11 12:21:54 +01:00
Pablo Natek 8815f07850 feat(spec): refs #6005 add spec to backup Notify
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:18:03 +01:00
Jorge Penadés 58635b5468 fix: refs #6942 add test & change column name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 12:11:13 +01:00
Pablo Natek 8529bed895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler 2024-03-11 12:01:13 +01:00
Jorge Penadés 8b29152c00 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-11 10:12:04 +01:00
Jorge Penadés 4e8e7d3f4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 08:59:26 +01:00
Jorge Penadés 5c2e8c135b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 08:24:10 +01:00
Alex Moreno 51fa0e1a75 fix: refs #6925 refund invoice transaltions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-11 08:12:29 +01:00
Javier Segarra 18773f34de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-09 11:27:57 +01:00
Carlos Satorres 879adfaac8 refs #6755 restore fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 14:59:33 +01:00
Pablo Natek ae25ba3fb6 feat(notify): refs #6005 add restriction on created notification time
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 13:44:19 +01:00
Carlos Satorres 8a16c24245 refs #6755 fix ticket 2024-03-08 12:27:47 +01:00
Javier Segarra a8420cd650 refs #7004 feat: translate label newSupplier
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-08 10:39:54 +01:00
Javier Segarra 238099311b refs #7004 fix: bug 2024-03-08 10:39:34 +01:00
Jorge Penadés ea18d3ef6f feat: refs #5186 add locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 09:25:07 +01:00
Pablo Natek 2421cc7c68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-08 08:23:08 +01:00
Alex Moreno 8cda12a9da feat: refs #6925 check incoterms in closure and makeInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-08 07:49:00 +01:00
Alex Moreno c2ecedca71 feat: refs #6925 check incoterms in closure and makeInvoice 2024-03-08 07:48:55 +01:00
Jorge Penadés 1e3967a4fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 15:56:02 +01:00
Jorge Penadés 13e08ceb51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 14:29:13 +01:00
Alex Moreno 2f2aba1cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-07 11:42:35 +01:00
Alex Moreno dbbebbe73c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-07 11:39:03 +01:00
Alex Moreno 01cd2709cc deploy: refs #6995 skip test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-07 11:38:30 +01:00
Carlos Satorres d4d3fdceb5 refs #6755 fix canRestoreTicket 2024-03-07 11:36:30 +01:00
Jorge Penadés b783a9cdfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 09:44:32 +01:00
Jorge Penadés a94fd1a61c fix: refs #6744 change error kind
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 09:29:51 +01:00
Carlos Satorres 64d82d92d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6755-restoreRefactor 2024-03-07 09:28:32 +01:00
Jorge Penadés 05f3a3f31b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 08:43:01 +01:00
Sergio De la torre 69ad44c0bd Merge branch 'dev' into 6078_workerActivty
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-07 07:18:16 +01:00
Guillermo Bonet 39b4e5db28 Merge branch 'dev' into 6948-bank
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-07 06:17:26 +00:00
Javier Segarra 6c06f70121 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 18:18:34 +00:00
Carlos Satorres 2e4a5029b8 refs #6755 fix restore 2024-03-06 14:52:49 +01:00
Carlos Satorres a14ab90d5a refs #6755 fix restore add fixtures 2024-03-06 14:41:58 +01:00
Alex Moreno 9ab0228714 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6925-invoice-transaction 2024-03-06 13:58:10 +01:00
Jorge Penadés b0814304aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 13:51:37 +01:00
Jorge Penadés f79435bd13 feat: refs #6942 set false isBooed & ledger
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-06 13:41:56 +01:00
Carlos Satorres 1b3a8ddbdd refs #6755 fix restore 2024-03-06 12:03:35 +01:00
Javier Segarra 7999a9bf93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 11:42:09 +01:00
Jorge Penadés f600a99708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-03-06 10:55:05 +01:00
Jorge Penadés b5e8184489 fix: refs #6942 delete
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 09:56:22 +01:00
Jorge Penadés f78f8ab6b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn 2024-03-06 09:34:49 +01:00
Carlos Satorres a45aebf582 Merge branch 'dev' into 6980-validateIBANRefactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 08:22:51 +00:00
Alex Moreno 31dc2db838 Merge branch 'dev' into 6336-claimState_removeSome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-06 08:08:25 +00:00
Jorge Penadés 5a11e9ac76 feat: refs #6942 toUnbook
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 16:14:05 +01:00
Carlos Satorres 70096e7a76 refs #6755 fix restore 2024-03-05 14:24:32 +01:00
Carlos Satorres 0156bb09d1 Merge branch 'dev' into 6980-validateIBANRefactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 11:54:20 +00:00
Guillermo Bonet 00d5d06c6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:38:15 +01:00
Guillermo Bonet 85d3508848 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:37:06 +01:00
Carlos Satorres 16fc446b85 refs #6755 fix method 2024-03-05 10:46:15 +01:00
Guillermo Bonet 55ba315858 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:30:25 +01:00
Guillermo Bonet e0732835d0 refactor: refs #6948 Bank to Accouting
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-05 10:25:23 +01:00
Carlos Satorres 2b299eb32b refs #6980 fix iban
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-05 09:48:53 +01:00
Carlos Satorres cac388f986 refs #6755 fix ticket 2024-03-05 09:43:07 +01:00
Sergio De la torre 09923d2509 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 18:35:36 +01:00
Carlos Satorres 893320b114 refs #6755 model ticketlog, restore 2024-03-04 15:00:43 +01:00
Alex Moreno d979e36686 refs #6336 feat(claimState): delete without using & refactor: unnecessary test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 14:13:37 +01:00
Alex Moreno b761c258a1 refs #6336 feat(claimState): delete without using 2024-03-04 14:12:56 +01:00
Javier Segarra 753525d0ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 11:57:16 +01:00
Jorge Penadés 854a9b62af fix: refs #6276 refactor updateInTime & changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-04 09:21:41 +01:00
Jorge Penadés 7d8d31022b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:29:55 +01:00
Jorge Penadés 657430d28b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5186-createParkingLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-01 12:15:49 +01:00
Pablo Natek 6aa68afd8f Merge pull request 'remove(claimRma): refs #6349 remove' (!2100) from 6349-deleteClaimRma into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2100
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-01 07:39:06 +00:00
Jorge Penadés 7b0bed209e feat: refs #5186 add acl & model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 16:27:42 +01:00
Jorge Penadés c54c9ce913 fix: refs #5186 create parkingLog & add sector relation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 14:43:37 +01:00
Jorge Penadés c79bdeb3f4 fix: refs #6744 drop to set emailVerified
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 13:41:27 +01:00
Jorge Penadés 1658838c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 12:41:24 +01:00
Alex Moreno e844a3f8fb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-02-29 09:45:07 +01:00
Alex Moreno 3f6ec13fa5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-29 09:43:44 +01:00
Javier Segarra 8e976d2e4f refs #5858 feat: remove Schedule system
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 09:28:27 +01:00
Javier Segarra becd2e6f48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-29 07:49:24 +01:00
Javier Segarra 599e8761c1 hotfix fix: replace pdf with csv
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-29 06:26:21 +00:00
Javier Segarra 6b7dc67c3e hotfix fix: replace pdf with csv 2024-02-29 06:25:41 +00:00
Ivan Mas 10a89cb790 refs #6827 Check usernames special characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-28 13:32:17 +01:00
Javier Segarra a1a80259a2 Merge branch 'dev' into 6930_scopedToken_Multimedia
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-28 06:41:17 +00:00
Jorge Penadés cbb7bd0028 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 15:50:47 +01:00
Carlos Satorres 482805de4b Merge branch 'dev' into 5858-fiscalData-validations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 12:01:36 +00:00
Alex Moreno 7874762da9 Merge pull request 'master' (!2102) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-27 11:38:02 +00:00
Sergio De la torre 699af5b9b7 refs #6531_hotFix_lastTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-27 11:53:55 +01:00
Guillermo Bonet 89ebd36b9b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 11:50:23 +01:00
Guillermo Bonet 6339a59de0 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-27 11:49:58 +01:00
Jorge Penadés b86110c898 fix: refs #6276 changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 10:29:49 +01:00
Guillermo Bonet a8065ab1a4 fix: refs #6184 hasFile false in saveSign and saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-02-27 09:43:53 +01:00
Jorge Penadés c875abf5e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:42:14 +01:00
Carlos Satorres aa49a5c82d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-27 09:28:27 +01:00
Pablo Natek 8263b203a7 remove(claimRma): refs #6349 remove
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 18:38:50 +01:00
Guillermo Bonet 554f6c4695 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 14:28:46 +01:00
Guillermo Bonet 3579c94268 fix: refs #6184 saveSign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-26 14:09:53 +01:00
Guillermo Bonet 096987040e fix: refs #6184 saveSign
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-26 14:00:04 +01:00
Guillermo Bonet a4419a2542 fix: refs #6184 saveSign
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-26 13:57:07 +01:00
Guillermo Bonet c1c64d0f89 fix: refs #6184 saveSign 2024-02-26 13:39:57 +01:00
Guillermo Bonet 817f685621 fix: refs #6184 saveSign 2024-02-26 13:00:35 +01:00
Guillermo Bonet a359ace1b8 fix: refs #6184 saveSign 2024-02-26 12:57:49 +01:00
Sergio De la torre 96abdd4630 refs #6078 feat:add workeractivity 2024-02-26 12:52:34 +01:00
Guillermo Bonet 413f7eb8c8 fix: refs #6184 saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-02-26 12:45:38 +01:00
Alex Moreno b1a8fcf968 refs #6925 fix(invoice): incoterms error 2024-02-26 11:50:46 +01:00
Alex Moreno 9f8e448562 refs #5509 fix(EntryDms): some issues
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 07:22:51 +01:00
Alex Moreno d37802fda8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-26 07:21:47 +01:00
Javier Segarra 04086e37ee refs #6930 feat: add accessScopes: ['read:multimedia'] forEarch method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-26 06:57:17 +01:00
Javier Segarra ae0ce8e49a refs #6930 feat: use tokenMultimedia intead tokenUser 2024-02-26 06:53:30 +01:00
Carlos Satorres 6dc4181575 refs #5878 fix pr 2024-02-23 13:54:32 +01:00
Carlos Satorres efdc8eb188 refs #5878 fix phone 2024-02-23 13:52:44 +01:00
Carlos Satorres 8fa4346f8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations 2024-02-23 13:37:49 +01:00
Jorge Penadés 70c400c5f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 12:51:22 +01:00
Jorge Penadés 3bf25e5759 fix: refs #6744 locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 09:31:01 +01:00
Jorge Penadés cab8a9c8b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 09:24:15 +01:00
Ivan Mas 03fc7cfb4e Merge branch 'dev' into 6784-delete-clientTypeFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 08:24:12 +00:00
Jorge Penadés 625c498f26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 09:18:45 +01:00
Alex Moreno 0ad3abcea3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 08:39:54 +01:00
Alex Moreno 1d4c48e149 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-23 08:39:26 +01:00
Alex Moreno f51df43d17 Merge branch 'master' into 6878-hotfix-addManualTimeEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 07:32:18 +00:00
Alex Moreno 489432b4e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:51:26 +01:00
Alex Moreno 607b908814 Merge branch 'dev' into 6414-fix_backTest_newWorker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 06:41:36 +00:00
Alex Moreno 4a2032b9cd refs #5509 fix(EntryDms): sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-23 07:39:56 +01:00
Alex Moreno 1f48245223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-23 07:13:54 +01:00
Alex Moreno c7dd81e53d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-02-23 07:12:24 +01:00
Jorge Penadés 744dd61561 fix: refs #6744 create setUnverifiedPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 15:42:54 +01:00
Guillermo Bonet df5e9bc830 fix: refs #6184 Rollback saveSign.js
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 14:46:10 +01:00
Carlos Satorres fac7071bae refs #6414 fix(newWorker): back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:38:26 +01:00
Ivan Mas a0cb32ea10 refs #6784 Delete unnecessary JOINs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 14:01:19 +01:00
Jorge Penadés 168e8ca205 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-22 13:21:46 +01:00
Jorge Penadés 76b1433099 fix: refs #6878 use clockIn procedure on update time
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-22 12:48:07 +01:00
Guillermo Bonet 80fc9e4472 fix: refs #6184 Quitadas transacciones en los SELECT en saveSign.js
gitea/salix/pipeline/head This commit looks good Details
2024-02-22 10:16:29 +01:00
Alex Moreno 033b176e72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-22 09:06:03 +01:00
Alex Moreno 60dfe8ec05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_master24_8
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-21 15:12:48 +01:00
Alex Moreno 01f1bd0088 Revert "Merge branch 'dev' into test"
gitea/salix/pipeline/pr-test This commit looks good Details
This reverts commit c4a64b93cc, reversing
changes made to 2ab1cebb31.
2024-02-21 14:44:34 +01:00
Ivan Mas 48310d24c7 refs #6732 change name supplier.isSerious to supplier.isReal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 14:36:12 +01:00
Javier Segarra 57a1f2a1f6 refs #5858 test: check vn_schedules 2024-02-21 14:29:20 +01:00
Javier Segarra dddd482317 refs #5858 test: check vn_schedules
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 14:22:19 +01:00
Javier Segarra e00133458b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-21 13:48:53 +01:00
Pablo Natek 5e97f820a2 feat(spec): refs #6005 add spec
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:59:42 +01:00
Ivan Mas f592045925 refs #6784 Delete clientType.id and modify relationships in json and js 2024-02-21 11:49:27 +01:00
Jorge Penadés c6c2f84e29 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 10:29:49 +01:00
Carlos Satorres 7514348d13 Merge branch 'dev' into 6414-testBackClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-21 09:29:45 +00:00
Alex Moreno 946006c7e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-21 07:48:05 +01:00
Pablo Natek 59336b8588 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 14:33:45 +01:00
Javier Segarra 811a49275d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-20 13:53:18 +01:00
Carlos Satorres ed37902291 Merge branch '5858-fiscalData-validations' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:14:54 +01:00
Ivan Mas 3813dbb9fd refs #6784 Delete clientTypeFk 2024-02-20 13:10:03 +01:00
Carlos Satorres 728224cad9 refs #5858 fix accepts 2024-02-20 13:04:45 +01:00
Alex Moreno 7fbb9b5c3f Merge branch 'master' into hotFix_workerTimeControl_reUse_hasToRefill
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-20 11:15:16 +00:00
Alex Moreno ab9c952afc hotFix(sendMail): hasToRefill
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-20 12:13:49 +01:00
Jorge Penadés 9ce162da71 fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 10:59:13 +01:00
Carlos Satorres f3511d4a43 refs #6414 tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 09:53:28 +01:00
Pablo Natek ab7eb88913 merge(dev): refs #6005 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 09:34:08 +01:00
Jorge Penadés 55b490160b fix: refs #6776 back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 09:27:37 +01:00
Jorge Penadés 072280cc9c fix: refs #6776 method names
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 08:48:47 +01:00
Jorge Penadés 9b5823384a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-20 08:26:02 +01:00
Guillermo Bonet 6daa7a03ff Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-20 06:26:16 +00:00
Jorge Penadés e9f7fbed86 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:56 +01:00
Jorge Penadés d5a3413307 fix: refs #6776 method names & chanmges
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 14:46:42 +01:00
Pablo Natek 011880eb72 fix(spec): refs #6879 remove f from describe
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 14:15:44 +01:00
Pablo Natek 7b0dd6975d fix(usesMana): refs #6879 add mana excluded worker
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-19 14:13:36 +01:00
Jorge Penadés d127354905 Merge branch 'dev' into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 12:21:48 +00:00
Alex Moreno 231ebf78d7 hotFix: remove console.log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-19 12:33:33 +01:00
Alex Moreno 8328dd6f4c hotFix: workerTimeControl use department.hasToRefill 2024-02-19 12:31:14 +01:00
Alex Moreno e8a945ba51 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-19 11:49:20 +01:00
Sergio De la torre 7a0320270a Merge pull request 'test' (!2048) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2048
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-19 10:25:33 +00:00
Jorge Penadés fc6e34ddfd fix: refs #6776 replace name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-19 11:18:05 +01:00
Sergio De la torre adeca2bb22 refs #6531 feat:modify name
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-19 09:17:57 +01:00
Sergio De la torre 5b541aa804 refs #6531 feat:modify name
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-19 09:13:03 +01:00
Sergio De la torre 15de4f0b73 refs #6531 feat:showLastTickets
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-16 15:56:40 +01:00
Jorge Penadés 9f2768c131 fix: refs #6776 tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 15:51:54 +01:00
Jorge Penadés 4bfd259845 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-16 14:18:32 +01:00
Jorge Penadés 69acebb43c fix: refs #6776 replace name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:48:55 +01:00
Jorge Penadés 8cecff36ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:14:59 +01:00
Jorge Penadés 030f42d03f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:11:02 +01:00
Carlos Satorres 59ea47a8c3 refs #6414 tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 13:06:33 +01:00
Jorge Penadés 1767ce426a fix: refs #6276 collection_addItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 11:54:59 +01:00
Jorge Penadés 89970e39d0 fix: refs #6276 back tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-16 10:47:41 +01:00
Jorge Penadés 63c615655b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-16 08:34:05 +01:00
Jorge Penadés 556a67ecfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-16 08:26:32 +01:00
Jorge Penadés 78583751ec refactor: refs #6760 ticketsIds improved
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 16:22:13 +01:00
Jorge Penadés 2fb68e81c9 fix: refs #6276 rollback sale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 15:17:39 +01:00
Jorge Penadés f11aa2605b feat: refs #6776 back & procedure modified
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 14:48:30 +01:00
Carlos Satorres 98d2b5a0ff hotfix creditClient
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-15 12:59:30 +01:00
Jorge Penadés be7a570314 fix: refs #6776 test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 11:18:01 +01:00
Jorge Penadés bec574ff99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6776-makeMulti
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 11:03:33 +01:00
Guillermo Bonet 256aa76e23 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 09:18:13 +00:00
Alex Moreno 625922275c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 10:14:19 +01:00
Alex Moreno 2703d50cbf refs #6859 fix(account): changePassword name
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 09:39:02 +01:00
Guillermo Bonet 5a0ce700b3 fix: refs #5586 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 09:38:34 +01:00
Jorge Penadés fa7b94590d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6760-modifyTransferClient
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 08:36:00 +01:00
Javier Segarra 234ea26fe2 Merge branch 'test' into 2687_fix_travel_cloneWithEntries
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-15 07:07:44 +00:00
Guillermo Bonet 8c262df31e Merge branch '5586-optimizeNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 07:52:34 +01:00
Guillermo Bonet 10bfb7a7d7 fix: refs #5586 Minor change 2024-02-15 07:52:33 +01:00
Alex Moreno fddbf6451b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:52:08 +01:00
Guillermo Bonet 46a1ad35b5 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-15 06:50:03 +00:00
Guillermo Bonet 05b7c37b94 fix: refs #5586 Rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-15 07:49:17 +01:00
Alex Moreno b08dd95e92 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-15 07:30:42 +01:00
Javier Segarra 3ff3c812ed refs #2687 fix: remove bad changes file
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-14 20:15:34 +01:00
Jorge Penadés 32f8d13359 fix: refs #6760 back modified & revoke update on ticket.clientFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-14 13:15:31 +01:00
Javier Segarra 5918c14d41 refs #5878 feat: replace by any
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-14 10:14:54 +01:00
Javier Segarra b9a624d9cd refs #2687 feat: create util.procedures
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-02-14 09:30:31 +01:00
Guillermo Bonet bdc6192a7c refactor: refs #5586 Optimized SQL negativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 12:50:39 +01:00
Guillermo Bonet 42de1a7e51 Merge branch 'dev' into 5586-optimizeNegativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 12:29:46 +01:00
Jorge Penadés 47bfb34507 fix: refs #6744 remove params
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 10:10:48 +01:00
Guillermo Bonet b449da28ef Merge branch 'dev' into 6184-externalCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 08:42:31 +00:00
Jorge Penadés 6e915d36d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6744-fixWorkerSetPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 09:42:05 +01:00
Guillermo Bonet 744171dd4c fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:41:26 +01:00
Jorge Penadés c8e13fa858 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6106-fixSignView
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 09:36:07 +01:00
Guillermo Bonet e08fb3d229 fix: refs #6184 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 08:59:58 +01:00
Alex Moreno 06fe4957d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-13 08:13:58 +01:00
Guillermo Bonet 97f02187e3 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-13 07:35:07 +01:00
Jorge Penadés 7b862c5c30 fix: refs #6744 fix setPassword
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 16:10:58 +01:00
Javier Segarra 0a398fdd6c refs #5858 feat: comments
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 11:37:08 +01:00
Jorge Penadés 534b5bb05a fix: refs #6106 where filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 11:26:00 +01:00
Javier Segarra 3cb494c735 refs #5858 fix: restore test to default 2024-02-12 10:14:23 +01:00
Javier Segarra 995a99c661 refs #5858 feat: removeZoneIncludedCheck
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 08:53:55 +01:00
Javier Segarra a756c3bc3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 08:51:58 +01:00
Javier Segarra e79bdb4456 refs #2687 test: fix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-12 08:45:07 +01:00
Jorge Penadés d60a95feaa fix: refs #6379 await & locale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-12 08:34:25 +01:00
Jorge Penadés 9cf5edb26e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:45:33 +01:00
Jorge Penadés c3b0a8260a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:38:59 +01:00
Jorge Penadés e61b6b0c13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6379-fixDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 13:36:53 +01:00
Jorge Penadés 4aeb88229d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 13:07:42 +01:00
Jorge Penadés e0de498f65 fix: refs #6379 add Error & locale
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-09 13:04:27 +01:00
Carlos Satorres e03e871529 Merge branch 'dev' into 6791-negativeNickname
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 11:47:36 +00:00
Carlos Satorres 1597f17230 refs #6791 remove intro
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 12:47:17 +01:00
Jorge Penadés 4075375d6e fix: refs #6379 get mail 2024-02-09 12:12:10 +01:00
Carlos Satorres 3e57bf2b34 refs #6791 remake negativeBases
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 11:49:29 +01:00
Jorge Penadés 3f08cdd51c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6806-fixEntryFilter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-09 09:45:10 +01:00
Jorge Penadés 30069ded15 fix: refs #6806 fix date filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-08 16:01:34 +01:00
Guillermo Bonet 974228eedd refactor: refs #5586 Optimized SQL negativeBases
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 11:37:15 +01:00
Jorge Penadés 8ad69a62b9 fix: refs #6276 loggable & userId
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 10:08:16 +01:00
Jorge Penadés 2940c68516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-08 08:36:05 +01:00
Alex Moreno b54827a2ad refs #5509 feat(EntryDms): add download & upload file 2024-02-08 07:23:42 +01:00
Carlos Satorres 7e18bd0a12 refs #6281 vehicles remove where
gitea/salix/pipeline/pr-test This commit looks good Details
2024-02-07 13:03:24 +01:00
Carlos Satorres 9ee0669903 hotfix kmMax
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-07 11:27:18 +01:00
Guillermo Bonet ffa9212861 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-07 10:29:42 +01:00
Jorge Penadés aff8ee28ea fix: refs #6272 back & create test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-07 10:16:47 +01:00
Alex Moreno e6735f9ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-07 08:35:54 +01:00
Guillermo Bonet f4feb6e8b7 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:13:48 +01:00
Guillermo Bonet 2cab007f57 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 12:12:45 +01:00
Carlos Satorres 318f74072e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 10:09:11 +01:00
Guillermo Bonet f2946e4168 fix: refs #6184 Requested changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 08:04:19 +01:00
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 06:39:51 +01:00
Alex Moreno 691853df49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-05 12:55:16 +01:00
Jorge Penadés a0c5b1fff6 feat: refs # test corrective & clone
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 11:59:51 +01:00
Jorge Penadés cd73e5adfe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 09:37:43 +01:00
Jorge Penadés 99fbb95669 fix: refs #6703 test back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 09:35:20 +01:00
Jorge Penadés 05478b43f2 fix: refs #4466 test back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 09:30:29 +01:00
Jorge Penadés 17680b2cc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:49:48 +01:00
Jorge Penadés 86d839ad45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:48:22 +01:00
Jorge Penadés ef5401aa46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:44:23 +01:00
Jorge Penadés 0c356938fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 08:43:56 +01:00
Jorge Penadés 743f317b20 fix: refs #4466 test & sql
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 14:02:16 +01:00
Guillermo Bonet eec36300ad refactor: refs #6184 Minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 12:25:48 +01:00
Guillermo Bonet 1d596b63a0 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 12:24:28 +01:00
Jorge Penadés c9b28d10bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 11:27:19 +01:00
Jorge Penadés 9f194f4f63 fix: refs #6276 fix model
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 10:28:13 +01:00
Alex Moreno d5e6750998 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-02 09:36:41 +01:00
Jorge Penadés 21cf05ddd0 fix: refs #6276 fix tests & errors
gitea/salix/pipeline/pr-dev Build queued... Details
2024-02-02 09:23:29 +01:00
Alex Moreno 9ac0ffb85a Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 07:30:59 +00:00
Jorge Penadés 7d01449518 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 08:11:48 +01:00
Jorge Penadés a20effc42c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 08:11:23 +01:00
Jorge Penadés 9f9d953b86 fix: refs #6276 resolve conflicts
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 08:11:00 +01:00
Jorge Penadés bda23a2139 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 14:33:51 +01:00
Jorge Penadés ec7a88c6dd fix: refs #6703 tests, backs & fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 12:56:11 +01:00
Carlos Satorres 6576bab305 Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 11:48:48 +00:00
Carlos Satorres ffbe0e1261 Merge branch 'dev' into 6318-removeQuantityCheck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 11:27:08 +00:00
Carlos Satorres e56e5905c2 Merge branch 'dev' into 6757-supplierMayus
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 11:22:47 +00:00
Alex Moreno a9a1f97366 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-02-01 12:17:48 +01:00
Carlos Satorres 91c3c8f04d Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 10:51:11 +00:00
Alex Moreno 36e8840e6e Merge branch 'dev' into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-01 09:28:59 +00:00
Jorge Penadés 4490dc7bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch 2024-02-01 08:15:15 +01:00
Jorge Penadés af4af43d9f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund 2024-02-01 08:14:50 +01:00
Jorge Penadés c4161eec97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-02-01 08:14:37 +01:00
Guillermo Bonet b045584658 Merge branch 'dev' into 6184-saveCmr 2024-02-01 07:11:33 +00:00
Guillermo Bonet 548526964e Merge branch 'dev' into 6184-saveCmr 2024-02-01 06:23:25 +00:00
Carlos Satorres aa993e7386 refs #6757 fix back, fix upperCase, fix e2e back
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 17:01:47 +01:00
Carlos Satorres cbdb089562 Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-01-31 15:44:57 +00:00
Carlos Satorres 40dd0d4e02 Merge branch 'dev' into 6318-removeQuantityCheck
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 14:50:05 +00:00
Guillermo Bonet 851e5cc5af refactor: refs #6235 Fixed tests back 2024-01-31 13:16:56 +01:00
Jorge Penadés 8f5a5d9cba fix: refs #6703 tests & backs 2024-01-31 13:11:15 +01:00
Carlos Satorres bbf50995c7 Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:21:06 +00:00
Guillermo Bonet e0d15e572c Merge branch 'dev' into 6235-addDeviceWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:13:57 +00:00
Jorge Penadés 2c1b8bd9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-31 10:02:58 +01:00
Jorge Penadés be3e7bb8df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:01:21 +01:00
Jorge Penadés 6f306ad18c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6703-refactorSaleRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 09:59:57 +01:00
Jorge Penadés e6eac54709 fix: refs #6703 tests & front 2024-01-31 09:59:32 +01:00
Jorge Penadés c136395d1e fix: refs #6703 fix conflicts 2024-01-31 09:16:38 +01:00
Jorge Penadés d43976192a fix: refs #6703 fix conflicts 2024-01-31 09:16:26 +01:00
Guillermo Bonet dd17b2c05d feat: refs #6235 Added device in clockIn 2024-01-31 09:04:30 +01:00
Sergio De la torre a8b483078f refs #6186 feat:deprecated packingShelve
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 08:52:36 +01:00
Jorge Penadés 9e12bdf4e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6557-useWorkerGetHierarch
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 08:49:28 +01:00
Carlos Satorres 5d2f3d1a4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6270-electronicInvoiceBack 2024-01-30 16:42:00 +01:00
Jorge Penadés 2a6abffef9 fix: refs #6276 fix errors & refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 16:07:33 +01:00
Jorge Penadés 5690da0a18 fix: refs #6776 add userId
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-30 16:05:56 +01:00
Carlos Satorres 509d5cea14 refs #6270 fix back
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 15:54:03 +01:00
Jorge Penadés e17fc91415 fix: refs #6276 fix acl, addSaleByCode & tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 14:58:11 +01:00
Jorge Penadés afa34c6296 feat: refs #6776 makeMulti
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 14:00:08 +01:00
Carlos Satorres 2fc39d54a0 refs #6318 fix code
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 13:09:15 +01:00
Jorge Penadés 88dfdb157f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 11:25:17 +01:00
Guillermo Bonet d39d54a514 fix: #6184 Requested changes 2024-01-30 09:50:53 +01:00
Guillermo Bonet 1e56e741e2 fix: #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 09:44:10 +01:00
Guillermo Bonet 13b8964e3d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 07:27:34 +00:00
Sergio De la torre 0f3ffcfa61 fix: refs #6184 Upload sign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:11:33 +01:00
Guillermo Bonet 1fe6818a0f fix: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 07:42:58 +01:00
Guillermo Bonet 65268487b9 fix: #6184 Now creates only one dms in saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 07:32:26 +01:00
Carlos Satorres 9b8c58ba7d refs #6270 makeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 16:00:24 +01:00
Carlos Satorres 94cc3ad80e Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 14:47:52 +00:00
Alex Moreno f4dc596e97 refs 5509 feat: add triggers, downloadFile
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 15:13:56 +01:00
Carlos Satorres f14c239391 Merge branch 'dev' into 6397-emailValidation
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 14:10:17 +00:00
Javier Segarra 2e0da0881b refs #6174 test: fix method
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 14:54:19 +01:00
Javier Segarra 9bf08f31ae refs #6174 feat: replace method in salix-front 2024-01-29 14:10:22 +01:00
Carlos Satorres 04f1a03d4d refs #6397 fix back
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 14:08:43 +01:00
Juan Ferrer 194262a93e fix: refs #6085 ACL canEditAlias checked, migrated to remote hooks
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 13:48:02 +01:00
Alex Moreno cf0e74c457 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 11:37:53 +01:00
Jorge Penadés 72e5050d93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 08:37:55 +01:00
Guillermo Bonet 65756f98ad fix: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 08:25:00 +01:00
Guillermo Bonet 990e8ee249 Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-29 08:14:34 +01:00
Guillermo Bonet 7c80a7bdda fix: #6184 Minor changes 2024-01-29 08:14:33 +01:00
Jorge Penadés 4fc780967f fix: refs #6703 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 15:32:50 +01:00
Guillermo Bonet 49a08a96da Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 11:56:43 +00:00
Guillermo Bonet 567e480e3b feat: #6184 Minor changes
gitea/salix/pipeline/head Build queued... Details
2024-01-26 12:40:42 +01:00
Jorge Penadés ab3fdf4fe4 fix: refs #6703 remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-26 12:33:04 +01:00
Guillermo Bonet 25fa154f60 feat: #6184 Minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 12:25:02 +01:00
Jorge Penadés e33861a80d fix: refs #6703 filter
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 12:15:53 +01:00
Guillermo Bonet d5a145ba1b feat: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:44:04 +01:00
Guillermo Bonet dec795d902 feat: #6184 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:14:47 +01:00
Guillermo Bonet 5828fa9657 feat: #6184 Refactor saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 10:05:24 +01:00
Javier Segarra 0afc9ab109 refs #6174 test: fix test bug
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 09:55:21 +01:00
Jorge Penadés 53f37bb0eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 09:32:08 +01:00
Javier Segarra f1cbb6aab3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify 2024-01-26 08:48:05 +01:00
Jorge Penadés e5d466b697 fix: refs #6703 drop & replace sale refund by clone
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 08:30:43 +01:00
Jorge Penadés ed77347fe1 fix: #6557 replace procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 15:41:55 +01:00
Pablo Natek a7faac3ef6 fix. refs #6743 remove consoleLog 2024-01-25 15:07:19 +01:00
Pablo Natek 2e1b55448a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb
gitea/salix/pipeline/head Build queued... Details
2024-01-25 15:04:32 +01:00
Pablo Natek 3848503853 fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 14:58:48 +01:00
Guillermo Bonet 9005975f1c feat: #6184 Modified email cmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 13:56:47 +01:00
Jorge Penadés e6335548ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 12:23:08 +01:00
Jorge Penadés 63fb3db8a1 fix: refs #6276 test item_card & general fixes
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 12:14:14 +01:00
Alex Moreno 66936d8983 hotFix: saveSign
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 11:37:25 +01:00
Alex Moreno 578bcd3cce hotFix: saveSign 2024-01-25 11:09:56 +01:00
Alex Moreno d305de2438 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 09:00:48 +01:00
Pablo Natek 36fc55180a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 08:30:28 +01:00
Pablo Natek 01c21baa65 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb 2024-01-25 08:25:08 +01:00
Jorge Penadés 01340408c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 08:14:02 +01:00
Jorge Penadés 02e38eb711 fix: refs #6276 fix tests
gitea/salix/pipeline/head Build queued... Details
2024-01-25 08:13:47 +01:00
Alex Moreno dec625d2df Merge branch 'master' into 6745-2404_testToMaster
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 06:23:29 +00:00
Carlos Satorres a594fda704 Merge branch 'dev' into 6313-removecanForceQuantity
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 12:50:03 +00:00
Alex Moreno 1c0f8acb87 refs #5871 fix: awb
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 13:37:29 +01:00
Sergio De la torre 48e4e21aa8 refs #6028 hotFix : getByWorker days to show
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 12:55:51 +01:00
Sergio De la torre fc53e98bb5 refs #6028 hotFix : getByWorker days to show
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 10:48:01 +01:00
Robert Ferrús 2ee48a53e2 refs #6222 fix(ticket): step-two
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 09:59:27 +01:00
Javier Segarra bc6f9bc074 refs #6174 test: new test for new method
gitea/salix/pipeline/head This commit looks good Details
2024-01-23 23:52:45 +01:00
Guillermo Bonet c7be1b57b1 Merge branch '6184-saveCmr' of https://gitea.verdnatura.es/verdnatura/salix into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 14:13:41 +01:00
Guillermo Bonet a676607e29 feat: #6184 Added email cmr 2024-01-23 14:13:40 +01:00
Guillermo Bonet 12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING 2024-01-23 11:05:39 +01:00
Guillermo Bonet 43bfb3cfde Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 10:05:21 +00:00
Jorge Penadés 799237e14c feat: refs #6276 test shelving_addLog
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 09:09:55 +01:00
Javier Segarra dcb2907d49 Merge branch 'dev' into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head This commit looks good Details
2024-01-23 07:43:40 +00:00
Jorge Penadés dcf6232c14 feat: refs #6276 test sale_getFromSectorCollection
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 08:39:30 +01:00
Jorge Penadés efb8bc46c6 refactor: refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 15:13:49 +01:00
Jorge Penadés e3899b2cf7 refactor: refs #6276 saleTracking_mark
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 13:32:50 +01:00
Jorge Penadés 65e5c6dac5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-22 12:45:25 +01:00
Jorge Penadés ed713e762b feat: refs #6276 test saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 12:36:52 +01:00
Javier Segarra 7f43a45955 Merge branch 'dev' into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 11:08:06 +00:00
Carlos Satorres cf03982d0c refs #6397 trad tback
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 10:20:10 +01:00
Guillermo Bonet 6701f70a33 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 09:07:31 +00:00
Javier Segarra 95398485dc Merge branch 'dev' into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 09:01:28 +00:00
Javier Segarra ba2815becb Merge branch 'dev' into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 09:00:55 +00:00
Alex Moreno ee6fe5a6e1 Merge branch 'dev' into 6667-searchFilter
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 07:02:51 +00:00
Jorge Penadés f04724a61f feat: refs #6276 new test added
gitea/salix/pipeline/head This commit looks good Details
2024-01-22 07:58:18 +01:00
Jorge Penadés 89d18e29f0 feat: refs #6276 test saleTrackingReplace (updateTracking)
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 07:49:21 +01:00
Jorge Penadés 6ee7ca79b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 14:54:25 +01:00
Carlos Satorres 73e1b52348 refs #6397 refactor
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 14:53:56 +01:00
Jorge Penadés f8faa958e6 feat: refs #6276 drop worker_getPrinter 2024-01-19 14:53:41 +01:00
Jorge Penadés d78e90687e fix: refs #6276 drop worker_getPrinter 2024-01-19 14:51:03 +01:00
Jorge Penadés 428da6fe00 feat: refs #6276 drop worker_getPrinter
gitea/salix/pipeline/head Build queued... Details
2024-01-19 14:50:33 +01:00
Jorge Penadés 6e59a87f9c feat: refs #6276 test operator_add
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 14:44:07 +01:00
Jorge Penadés 817a6b1289 feat: refs #6276 test operator_add
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-19 14:35:10 +01:00
Carlos Satorres 391f418883 refs #6397 fix test back
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-19 14:18:17 +01:00
Carlos Satorres 0f104e5410 refs #6667 view workerDepartment
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 10:11:33 +01:00
Jorge Penadés 5c0425b942 feat: refs #6276 test machineWorker_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-19 09:52:49 +01:00
Carlos Satorres 3be194356f fix expense
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 09:31:25 +01:00
Carlos Satorres 882dd04adb Merge branch 'dev' into 6296-countryAddress
gitea/salix/pipeline/head This commit looks good Details
2024-01-19 07:55:00 +00:00
Alex Moreno 7ea1fbfb26 refs #5509 feat: entryDms funcionality
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 15:09:52 +01:00
Jorge Penadés 34420375cd feat: refs #6276 test item_updateFromSale
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 15:03:17 +01:00
Jorge Penadés b33594e0da fix: refs #6276 item_card & wip test
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-18 14:35:51 +01:00
Jorge Penadés d41d57143f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 13:53:26 +01:00
Jorge Penadés c8bfb35cf6 feat: refs #6276 test itemShelvingMake_multi
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 13:28:22 +01:00
Jorge Penadés 6f35c62cd5 feat: refs #6276 test collection_addItem
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-18 11:51:21 +01:00
Carlos Satorres e9c1f125a5 refs #6397 test back
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 11:43:05 +01:00
Carlos Satorres 7cb7c7dace refs #6397 back validation
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 10:57:17 +01:00
Guillermo Bonet 9faf889833 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 09:55:04 +00:00
Alex Moreno ef2b156b55 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 08:07:47 +01:00
Guillermo Bonet ce5a2ada62 feat: #6184 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-18 07:46:58 +01:00
Jorge Penadés 8e5be5f5da feat: refs #6276 test itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 15:26:04 +01:00
Carlos Satorres 23b8703afc refs #6397 emailValidation
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 15:00:31 +01:00
Guillermo Bonet a486b7f2d4 feat: #6184 Minor change
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:42:38 +01:00
Carlos Satorres ccdef0458a refs #6667 fix groupBy
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:39:11 +01:00
Guillermo Bonet 85a0f8b323 feat: #6184 Minor change
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:30:58 +01:00
Jorge Penadés c0398d17bf feat: refs #6276 test itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 14:21:50 +01:00
Alex Moreno 3c778216a4 Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 13:19:18 +00:00
Guillermo Bonet 1a52e58eaa feat: #6184 Created generateCmrPdf
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:18:31 +01:00
Carlos Satorres 7525998477 refs #6296 postal code
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:13:09 +01:00
Carlos Satorres d1a3c67d2e refs #6667 fix limit
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 14:07:04 +01:00
Carlos Satorres 1458a803bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 13:49:05 +01:00
Carlos Satorres bf796c445d refs #5919 fix section
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-17 13:20:28 +01:00
Guillermo Bonet 45fd96cee6 feat: #6184 Modified uploadFile
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 13:07:26 +01:00
Jorge Penadés 1fbb84ae9f fix: refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 12:58:57 +01:00
Jorge Penadés bf13e85ecc fix: refs #6276 getFromSectorCollection
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 12:14:38 +01:00
Jorge Penadés e69ec2c856 feat: refs #6276 test expeditionPallet_get
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 12:07:22 +01:00
Javier Segarra 3564a77043 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6174_refactor_invoicePdfNotify
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 11:12:04 +01:00
Guillermo Bonet f1b84ee7a0 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:44:00 +01:00
Javier Segarra 21ce57d217 refs #6174 feat: update back to separate invoice and pdf
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:31:07 +01:00
Jorge Penadés 90b1e8d664 fix: refs #6276 backend tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:18:13 +01:00
Carlos Satorres d47429b4a7 refs #6667 sql
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:01:38 +01:00
Guillermo Bonet 2f67056dbf Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-17 09:44:32 +01:00
Jorge Penadés 6a78123fca fix: refs #6276 machineWorke_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 09:01:48 +01:00
Jorge Penadés 07e9b737c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-17 07:50:21 +01:00
Jorge Penadés 4f7240b496 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-16 14:50:55 +01:00
Jorge Penadés fafc25ed19 refactor: refs #6276 sectorCollection_getSale
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-16 14:50:09 +01:00
Alex Moreno aac3e17d3c Merge branch 'test' into 6222-test-saleCcomponentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-16 13:40:37 +00:00
Alex Moreno 9452aacb49 Merge branch 'dev' into 6230-basicItem
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 13:25:28 +00:00
Guillermo Bonet 5bbeda4014 feat: refs #4734 Added viaexpress interdia
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 13:05:16 +01:00
Carlos Satorres 7b9480f006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE 2024-01-16 12:48:13 +01:00
Carlos Satorres 3ebeebc159 refs #6230 remove basic-data columns
gitea/salix/pipeline/head This commit looks good Details
2024-01-16 11:47:45 +01:00
Carlos Satorres b3e1c58918 refs #6313 remove restriction
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 14:50:08 +01:00
Jorge Penadés 54192c54ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 13:56:32 +01:00
Carlos Satorres 55b5e4cfcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6296-countryAddress
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 13:29:39 +01:00
Javier Segarra 831d358e41 refs #6174 feat first approach 2024-01-15 10:52:02 +01:00
Guillermo Bonet 107e35001a fix: refs #6582 Solved log error
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 10:09:43 +01:00
Carlos Satorres 107dded411 refs #6296 countryAddress
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 09:03:56 +01:00
Jorge Penadés fcca927adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-ticketRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 07:54:35 +01:00
Alex Moreno c20b9fe212 refs #6656 fix(updateTimeEntry): correct accessType (WRITE)
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 07:45:40 +01:00
Jorge Penadés 6236cf0621 hotfix ticketRefund
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 16:18:26 +01:00
Alex Moreno 199656afb8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 12:41:52 +01:00
Jorge Penadés 2a6b509a78 fix: refs #6656 change acls
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 09:54:18 +01:00
Alex Moreno 14fff571b5 Merge branch 'dev' into 6353-ratingCatalog
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 08:52:51 +00:00
Carlos Satorres c0c3d913b7 refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 09:03:54 +01:00
Carlos Satorres d0df880c32 Merge branch 'dev' into 6322-futureTicketImporte
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 07:47:23 +00:00
Jorge Penadés ddcecb8f22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 16:52:54 +01:00
Alex Moreno b1530d049e refs #6398 hotFix: use userFk
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 13:29:03 +01:00
Javi Gallego c98baf21bf Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 12:17:59 +00:00
Juan Ferrer ce5e8c278f Merge branch 'dev' into 6660-mariadbV10.11.6
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 11:22:55 +00:00
Jorge Penadés c61f5a67b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 09:28:24 +01:00
Alex Moreno a92297da73 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 08:14:56 +01:00
Javier Segarra b76e269e73 refs #5499 perf: rename variable
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 06:18:02 +00:00
Alex Moreno edde5819e3 refs #6660 feat: update mariadb version 10.7.7→10.11.6
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 15:39:35 +01:00
Javier Segarra de4ddf9392 remove bad comment
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 13:47:42 +00:00
Pablo Natek a623e5b90e Merge branch '6398-ticketTrackingAsignFix' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTrackingAsignFix
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 13:55:03 +01:00
Pablo Natek dff277ed12 fix(spec): refs #6398 fix spec 2024-01-10 13:55:01 +01:00
Pablo Natek 5d63b4fba8 Merge branch 'master' into 6398-ticketTrackingAsignFix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-10 12:51:33 +00:00
Pablo Natek 63b20c1e91 fix(ticketTracking): refs #6398 assign ticket workerFk to userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-10 13:12:12 +01:00
Carlos Satorres 980ca81bfc refs #6353 fixtures catalog rating
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 09:38:20 +01:00
Carlos Satorres 877dc718a7 refs #6353 remove rating
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 08:57:19 +01:00
Javier Segarra 7cc454751e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-10 07:48:11 +01:00
Javier Segarra 1bd6751d56 refs #5499 revert 2024-01-10 07:46:11 +01:00
Guillermo Bonet 783436e8d2 fix: refs #6582 Traductions routesMonitor
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-09 15:02:58 +01:00
Carlos Satorres 16d7a20798 Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:49:31 +00:00
Guillermo Bonet 81ffc122fc Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 14:09:47 +01:00
Guillermo Bonet 9a82fbea05 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 14:07:32 +01:00
Guillermo Bonet 5d4c106825 fix: refs #5848 Added flag DONT_EXPIRE_PASSWD
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:59:11 +01:00
Carlos Satorres bf44f82f4f refs #6322 fix code
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 13:16:14 +01:00
Carlos Satorres 676d95563b refs #6322 importe
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 12:53:58 +01:00
Robert Ferrús ea5483e847 refs #6222 refactor: sale_calculateComponent
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 10:50:37 +01:00
Carlos Satorres a22de3ab25 Merge branch 'dev' into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good Details
2024-01-09 08:46:01 +00:00
Jorge Penadés ab1dc7af55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-08 16:21:46 +01:00
Pablo Natek 0e29db3b1e Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 13:17:24 +00:00
Carlos Satorres 782772bffc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 09:54:50 +01:00
Jorge Penadés 547ac44e9b fix: refs #6643 fix user link
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 09:11:44 +01:00
Pablo Natek 9af27783ed Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-08 08:11:03 +00:00
Carlos Satorres c72311860b refs #647 remove e2e
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 09:06:22 +01:00
Javi Gallego 406cf7335b Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-05 07:12:12 +00:00
Pablo Natek f48500f4b3 Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 18:44:11 +00:00
Pablo Natek e9773b3885 refactor(state): refs #6366 simplify if condition
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 18:56:31 +01:00
Jorge Penadés 8a5da43503 refactor: sectorCollection_getSale refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 16:00:25 +01:00
Javier Segarra 8ee6cfb015 refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:36:35 +01:00
Pablo Natek 2e5ae062cf Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 14:24:24 +00:00
Javier Segarra 71937a4df3 refs #5499 feat: send RocketMessage when change state
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:17:16 +01:00
Jorge Penadés 7a64b57a2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 15:07:33 +01:00
Javi Gallego 767c6a6ac8 test: refs #3979 fixtures arregladas para que los abonos sean negativos
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 15:01:56 +01:00
Jorge Penadés ad89363db5 fix: mark refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 13:11:39 +01:00
Jorge Penadés 2eca02d74f refactor: drop getItemPackingType refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 12:57:46 +01:00
Jorge Penadés 932b993723 Merge branch 'dev' into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 11:45:38 +00:00
Jorge Penadés 3ebf0a30a9 refactor: drop getItemPackingType refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 12:44:44 +01:00
Jorge Penadés da8057e4c7 fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 12:35:00 +01:00
Jorge Penadés 384d9ec803 fix: updateTracking refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 12:27:02 +01:00
Javier Segarra f7d83b15bd Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 08:08:46 +00:00
Jorge Penadés 7d0c11e937 Merge branch '6276-createNewWarehouse' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 08:51:46 +01:00
Jorge Penadés 6d0e1cc47c refactor: fix conficts refs #6276 2024-01-04 08:51:18 +01:00
Carlos Satorres 15d6c9a65b Merge branch '6456-refactor-ticketState' of https://gitea.verdnatura.es/verdnatura/salix into 6456-refactor-ticketState
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 08:39:07 +01:00
Javi Gallego 4cb82524cb test: refs #3979 quito clone parametro group porque no se usa
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-04 08:37:34 +01:00
Alex Moreno 23b544c1ec refs #6635 fix: add translation
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 08:19:48 +01:00
Pablo Natek 847623f9c6 Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 18:28:46 +00:00
Pablo Natek b42aed13c4 Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 18:15:29 +00:00
Javi Gallego 2fb60aeed3 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 15:37:05 +01:00
Javi Gallego ab341b9b5e test: refs #3979 test de clone 2024-01-03 15:36:39 +01:00
Alex Moreno 227afbe39d refs #5914 fix(invoiceOut_descriptorMenu): transalation
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 14:54:01 +01:00
Alex Moreno af784522c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2024-01-03 14:52:16 +01:00
Javier Segarra 4d7f0329ee Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 12:46:26 +00:00
Carlos Satorres 3fbead7473 refs #6291 fix tinIsValid
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 13:44:20 +01:00
David Domenech 3c1237f727 refs #6456
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 13:37:18 +01:00
Guillermo Bonet a6ebd01ebd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 13:28:23 +01:00
Jorge Penadés 1f77559519 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 12:53:12 +01:00
Sergio De la torre 0b5ffcc81c refs #6276:modify back silex→salix 2024-01-03 12:50:53 +01:00
Alex Moreno ba26237998 refs #5914 refactor: getTaxBases
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 12:19:28 +01:00
Guillermo Bonet f73a447391 refs #6398 Hotfix 1/2
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 11:57:49 +01:00
Jorge Penadés 4e951263c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 11:55:37 +01:00
Jorge Penadés 5dc49d226a refs #6274 fix locale
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 10:13:56 +01:00
Alex Moreno 121caee93a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2024-01-03 09:53:52 +01:00
Jorge Penadés 23854cb103 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 09:02:52 +01:00
Jorge Penadés b086da1936 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:57:46 +01:00
Alex Moreno 399ca694ab Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:38:01 +01:00
Alex Moreno f607719efe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2024-01-03 08:34:00 +01:00
Carlos Satorres 12165ab382 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:31:07 +01:00
Carlos Satorres 69739fca9c refs #5919 locker relation
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 08:17:37 +01:00
Pablo Natek c116bc56c3 refactor(clientSms): refs #6259 redirect to lilium 2024-01-02 19:37:51 +01:00
Jorge Penadés 31c282ac0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6515-hasAnyNegativeBase
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 14:50:26 +01:00
Guillermo Bonet 176cbe1537 Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 13:02:16 +00:00
Alex Moreno 1e3a7e5f91 refs #5914 refactor: invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 13:17:10 +01:00
Javier Segarra 295124e0af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries 2024-01-02 12:59:50 +01:00
Jorge Penadés 924fe12a93 add root: refs #6276
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 12:44:12 +01:00
Sergio De la torre 365e05d560 refs #6276:mdify back silex→salix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 12:21:25 +01:00
Javier Segarra b11b0642f8 Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-02 11:03:52 +00:00
Guillermo Bonet 7cfcb17aff Merge branch 'dev' into 6433-sectorRefactor
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 10:50:00 +00:00
Jorge Penadés 6b8a4a512b adding filter: refs #6606
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 10:42:50 +01:00
Javier Segarra 4510f0a037 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:26:18 +00:00
Jorge Penadés 68ef193a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-02 09:58:30 +01:00
Jorge Penadés 3bd14095fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6369-fixGetNegativeBasesInvoices
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 09:45:44 +01:00
Jorge Penadés 767894b128 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-02 09:41:47 +01:00
Jorge Penadés 763af7da2d fix test: refs #6274
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 08:58:41 +01:00
Alex Moreno dd02a932ef Merge branch 'test' into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 06:40:18 +00:00
Jorge Penadés 15ec91ec79 fix query: refs #6369
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 14:05:01 +01:00
Pablo Natek ccf5387e04 refactor(state): refs #6366 unifyTicketChangeState
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 12:44:24 +01:00
Jorge Penadés 1b8461034e using hasAnyNegative: refs #6515
gitea/salix/pipeline/head This commit looks good Details
2023-12-29 12:40:48 +01:00
Carlos Satorres 3a429a31da refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 08:44:42 +01:00
Carlos Satorres 6ceee45b13 refs #5919 fix locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 16:40:13 +01:00
Pablo Natek f7ec64f3c1 merge(dev): refs #6366 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 16:00:23 +01:00
Jorge Penadés 567879d64e corrective back created: refs #4466
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 15:55:11 +01:00
Carlos Satorres bfb31ad7c3 refs #5525 supplier
gitea/salix/pipeline/head This commit looks good Details
2023-12-28 11:46:34 +01:00
Carlos Satorres c77715d865 refs #6291 validation original
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 15:03:10 +01:00
Jorge Penadés a89d1e883a create rectification: refs #4466
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 14:36:58 +01:00
Carlos Satorres f35b2a4905 refs #5919 back chooseLocker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 13:44:52 +01:00
Carlos Satorres aa33c28468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 12:15:43 +01:00
Pablo Natek 5a1c4ddea0 refactor(ticketSms): refs #6259 ticketSmsToClientSms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 08:20:13 +01:00
Jorge Penadés 86db5a931d arrange test suites: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-22 10:44:21 +01:00
Pablo Natek 35750bc93f merge(dev): refs #6259 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:46:12 +01:00
Pablo Natek 27a369bef4 refactor(ticketSms): refs #6259 merge ticksms to clientsms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:34:22 +01:00
Carlos Satorres c4ff4c1984 refs #6291 tin valid
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 15:07:03 +01:00
Jorge Penadés 0998b5bf2c add locale and refactor: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 13:58:33 +01:00
Javier Segarra 6b37f23349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 13:06:52 +01:00
Javier Segarra 100936d40b Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 12:05:27 +00:00
Carlos Satorres 73d1c1698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI 2023-12-21 12:38:58 +01:00
Guillermo Bonet 0f20f95dc5 refactor: refs #6433 Deleted isPreviousPrepared* columns in model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 10:08:17 +01:00
Jorge Penadés f5cc2cd75b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 08:38:33 +01:00
Alex Moreno 7b65ebb58b Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 06:50:45 +00:00
Javier Segarra adc7608b25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 14:40:42 +01:00
Javier Segarra 5c5be788c1 refs #5499 feat: trigger for all changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 14:08:11 +01:00
Guillermo Bonet 5f83fc158c Merge branch 'dev' into 6582-routesMonitorTraduction
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 13:03:57 +00:00
Jorge Penadés 5d75592627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 12:19:10 +01:00
Javier Segarra acb0ec508f refs #5499 feat: claimObservation 2023-12-20 12:09:01 +01:00
Javier Segarra 01e6e7dc39 Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 11:02:00 +00:00
Juan Ferrer 10bfafdd3c Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 09:05:53 +00:00
Alex Moreno 351a12204a Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 08:07:30 +00:00
Guillermo Bonet 753c6e9ec5 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:28:54 +01:00
Guillermo Bonet 516a3760a1 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:27:13 +01:00
Alex Moreno 7777696cf7 refs #6589 fix(worker_absences): fix started hours
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 13:58:08 +01:00
Javier Segarra 3e30e77728 Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 12:57:59 +01:00
Javier Segarra 38a5337f68 refs #5858 test: execute test 2023-12-19 12:57:10 +01:00
Javier Segarra 243319b113 refs #5858 feat zoneIncludedCheck model 2023-12-19 12:55:27 +01:00
Alex Moreno 3f44eeb130 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 11:45:48 +00:00
Pablo Natek 4fbb7f05ec Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 09:51:36 +00:00
Pablo Natek f68529960e fix(notification): refs #6005 notification changes
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 10:51:18 +01:00
Guillermo Bonet 17e177b788 fix: refs #6398 Fix tests back
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 10:12:03 +01:00
David Domenech d60f2a7f88 fix: refs #6398 Changed alias of views
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 09:43:09 +01:00
Javier Segarra 72e9b69d7e Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:04:41 +00:00
Javier Segarra dbc3fc8007 refs #5858 perf: remove bad comments
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 08:02:38 +01:00
Carlos Satorres e4de704b4c Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 11:16:58 +00:00
Jorge Penadés 5c22f51043 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-18 10:29:14 +01:00
Javier Segarra 7723b244d0 Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 07:17:51 +00:00
Javier Segarra 8d650cf6c0 refs #6172 test: remove message code
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 08:09:44 +01:00
Javier Segarra 29a7d9b941 Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 13:01:47 +01:00
Javier Segarra dc98436b85 refs #2051 perf: rename variable 2023-12-15 13:01:44 +01:00
Javier Segarra c9af8cba81 refs #5878 feat: remove . for this message
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 12:50:05 +01:00
Jorge Penadés d70a3570d3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2023-12-15 12:18:28 +01:00
Javier Segarra 98a98e0d9e refs #2687 perf: remove force test
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 07:40:31 +01:00
Javi Gallego 3a37e6dfc8 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen 2023-12-15 07:37:29 +01:00
Javier Segarra f10cada19f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 07:35:04 +01:00
Javier Segarra b5b58faee4 refs #2687 perf: remove comments 2023-12-15 07:34:37 +01:00
Javier Segarra d9ffdaf855 refs #2687 test: use tx.rollback() 2023-12-14 16:00:29 +01:00
Alex Moreno 21a1dbeae7 refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:56:49 +01:00
Carlos Satorres fe184156a1 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 13:51:09 +00:00
Carlos Satorres f73f3813b3 Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 14:37:22 +01:00
Carlos Satorres bbb9f58a9e refs #6220 fix(client_filter): fix where 2023-12-14 14:37:14 +01:00
Javier Segarra 043c411f68 Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 11:41:11 +00:00
Javier Segarra 9316c31180 refs #6264 perf: rename variable when destroy ids
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:36:36 +01:00
Javier Segarra 1939c65fab refs #6264 test: remove force describe for dms test 2023-12-14 12:35:54 +01:00
Javier Segarra d0af29c0c5 refs #6264 test: remove force describe for dms test
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:28:41 +01:00
Javier Segarra dddc749744 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 11:05:00 +00:00
Javi Gallego 26a05a4840 fix: refs #3979 si se abona un abono sin almacen no falla
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 09:14:21 +01:00
Alex Moreno e7911738c6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 08:50:20 +01:00
Jorge Penadés 1f2d475f05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 08:41:45 +01:00
Javier Segarra 397eb4d32b Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 06:22:22 +00:00
Javier Segarra 485968037b Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 06:22:17 +00:00
Sergio De la torre af83519ee6 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 15:12:39 +00:00
Jorge Penadés 36a9b0eee4 refs #6276 collectionAddItem
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 16:00:07 +01:00
Javier Segarra 1e89ed6cdc Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 14:39:10 +00:00
Javier Segarra 06bae44824 refs #2051 perf: uploadFile after review
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 15:38:46 +01:00
Carlos Satorres 9a5536a3a3 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 14:05:51 +00:00
Carlos Satorres cfa08963fb Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 15:05:43 +01:00
Carlos Satorres 40499e44cf refs #6220 remove concat 2023-12-13 15:05:41 +01:00
Robert Ferrús 4df2fa8ee4 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 13:30:53 +00:00
Robert Ferrús b9efbc7d44 refs #5854
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 14:30:29 +01:00
Javier Segarra 7b9e3b0985 refs #2051 perf: removeFile after review 2023-12-13 14:24:05 +01:00
Carlos Satorres 6416891918 refs #6291 tinIsValid worker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 13:55:31 +01:00
Javier Segarra 7bdb1b2078 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor 2023-12-13 13:49:38 +01:00
Javier Segarra a5ecec9603 refs #2051 feat: remove front methods refactor 2023-12-13 13:47:30 +01:00
David Domenech 9bcd0a3c98 Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 11:29:46 +00:00
Jorge Penadés 8d61473d4f refs #6276 fixtures & itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 11:43:19 +01:00
Jorge Penadés a4c3d78e31 refs #6276 drop fixtures & fix getSale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 09:45:01 +01:00
David Domenech ee6ad55e66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 09:43:20 +01:00
Jorge Penadés 64c10f3b8e refs #6276 sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 08:52:43 +01:00
Pablo Natek f63b26b71f Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 07:52:36 +00:00
Carlos Satorres 371a202230 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 07:51:23 +00:00
Pablo Natek 69dd34665f refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 08:50:17 +01:00
Jorge Penadés 01fa0b1d36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 08:35:11 +01:00
Javier Segarra 074bb2b980 Merge branch 'dev' into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 06:30:14 +00:00
Sergio De la torre 435819cf3c refs #6275 feat:Silex_to_Salix test getExpeditionSummary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 07:24:13 +01:00
Javier Segarra d44cdcbd13 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 06:14:55 +00:00
Robert Ferrús 5f4adab017 refs #5854
gitea/salix/pipeline/head Build queued... Details
2023-12-12 18:03:09 +01:00
Jorge Penadés 9e6fac9add refs #6276 change to boolean
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 16:00:43 +01:00
Sergio De la torre e22201c840 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 14:50:25 +00:00
Javier Segarra d206c93305 refs #2051 feat: getAllowedContentTypes approach
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 15:03:00 +01:00
Jorge Penadés 7b81630b85 refs #6276 shelvingLog_add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 14:56:58 +01:00
Javier Segarra 6b70f8b3eb refs #2051 feat: uploadFile approach 2023-12-12 13:49:14 +01:00
Jorge Penadés f5ee3aff7a refs #6276 remove checking visible
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:43:15 +01:00
Jorge Penadés 3109f7722e refs #6276 saleTracking_mark
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:24:18 +01:00
Carlos Satorres 78aa25d74f refs #6220 fix testback
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 13:21:08 +01:00
Carlos Satorres 6cefc982e4 refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-12 13:14:41 +01:00
Javier Segarra ae76776245 refs #2051 feat: removeFile approach 2023-12-12 12:09:06 +01:00
Javier Segarra 8bd9becb74 refs #2687 feat: remove procedure argument
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 07:34:20 +01:00
Javier Segarra 30dbc8a587 refs #2687 feat: fix test suite 2023-12-12 07:33:08 +01:00
Robert Ferrús 9894591aa9 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 17:56:40 +00:00
Javier Segarra c0d2e0511d refs #2687 feat: modify back method 2023-12-11 14:54:12 +01:00
Carlos Satorres 7e6f311a43 refs #6220 address filter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:51:11 +01:00
Carlos Satorres c81ca94d2e refs #6220 add filter address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 14:44:33 +01:00
Jorge Penadés 84270587cb refs #6274 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 13:42:19 +01:00
Jorge Penadés 8acd03f115 refs #6276 saleTrackingReplace
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 13:01:34 +01:00
Javier Segarra f817551a57 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:59:02 +01:00
Carlos Satorres 2beb1f65f0 refs #6085 findOne
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:45:55 +01:00
Javier Segarra d1f0557923 refs #5666 perf: remove ruleAlias property
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 12:40:16 +01:00
Carlos Satorres 53ff8784ff refs #6085 remove myOptions
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 10:16:46 +01:00
Carlos Satorres 57ed36cdfc ref #6085 remove console options
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 09:43:38 +01:00
Carlos Satorres 584f3264ed refs #6085 refactor sql trad 2023-12-11 08:54:58 +01:00
Jorge Penadés e27bf2ef8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 08:29:35 +01:00
Carlos Satorres 866ad7a9f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail 2023-12-11 08:20:19 +01:00
Alex Moreno f874faa921 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 07:47:55 +01:00
Pablo Natek 5a99408ba7 feat: refs #6548 add buyer department to salesPerson list in client BasicData
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 07:31:57 +01:00
Jorge Penadés b88d61e864 Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl 2023-12-07 14:53:33 +01:00
Jorge Penadés 6fb4e86777 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD 2023-12-07 14:47:31 +01:00
Jorge Penadés 968dc65231 refs #6274 tests created 2023-12-07 14:47:22 +01:00
Sergio De la torre 9937fbed5e REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 11:59:01 +01:00
Sergio De la torre 67994188ee Merge branch 'dev' into 6028_routesByWorkerEmail
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 10:42:30 +00:00
Sergio De la torre fa65cc84a9 REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 11:39:22 +01:00
Sergio De la torre 0263d880ca refs #6028 add:email in ByWorker
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 08:00:17 +01:00
Carlos Satorres 3c9c221220 Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 06:59:38 +00:00
Sergio De la torre c9bcd672c9 refs #6028 add:email in ByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-07 07:59:21 +01:00
Carlos Satorres c7d960229d Merge branch 'dev' into 6010-testBackPending
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 06:34:32 +00:00
Carlos Satorres acfa0fd857 Merge branch 'dev' into 6318-negativeQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 06:31:21 +00:00
Javi Gallego 7ff8ec93ff Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1879
2023-12-06 07:54:13 +00:00
Jorge Penadés bb186bafe0 Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl 2023-12-05 14:12:00 +01:00
Javier Segarra a7c48b6ddc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-05 13:02:34 +01:00
Javier Segarra 035b31d878 refs #5666 test: fix e2e tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-05 12:00:31 +01:00
Jorge Penadés 25006a938b refs #6274 refactor clockIn
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 11:53:27 +01:00
Carlos Satorres f55e85a189 refs #6010 remove pending
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 10:35:48 +01:00
Carlos Satorres af07a531ed refs #6318 quantity
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 08:49:55 +01:00
Sergio De la torre 3692021b12 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 07:26:22 +00:00
Sergio De la torre 318f7e3c0d REFS #6275 feat:Silex_to_Salix
gitea/salix/pipeline/head This commit looks good Details
2023-12-05 08:20:55 +01:00
Javier Segarra 1d92bbf4a2 refs #5666 feat: replace base value and add mixins 2023-12-05 07:48:56 +01:00
Javier Segarra 57add7abf0 refs #5666 perf: replace Role by VnRole 2023-12-05 07:16:12 +01:00
Jorge Penadés 8cb97e2477 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-04 15:09:44 +01:00
Javier Segarra a8b0a7a5b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-04 14:46:21 +01:00
Javier Segarra e3379b42a1 refs #5858 test: bad test calls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 14:06:28 +01:00
Carlos Satorres 6d486fbec9 refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:58:45 +01:00
Jorge Penadés 1dfdd94584 refs #6276 fix getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:56:43 +01:00
Jorge Penadés 4690dca4f9 refs #6276 getItemPackingType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:54:09 +01:00
Pablo Natek bec1ff71ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk 2023-12-01 13:43:27 +01:00
Jorge Penadés 660e77be55 refs #6276 updateFromSale refactored
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 12:48:21 +01:00
Jorge Penadés 7e57640758 refs #6276 itemShelving_updateFromSale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 11:43:07 +01:00
Jorge Penadés d2769f4c21 refs #6276 return fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 11:38:30 +01:00
Robert Ferrús 2a93dcf5b8 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-12-01 10:20:08 +00:00
Jorge Penadés f2ab44bb8f refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 10:14:32 +01:00
Jorge Penadés 30b63f577f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 09:49:49 +01:00
Jorge Penadés d5f09c2f75 refs #6276 saleTrackingDel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 09:44:49 +01:00
Javier Segarra db06620d7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 09:39:47 +01:00
Jorge Penadés 3333c83702 refs #6276 WIP itemShelving_return
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 16:25:13 +01:00
Jorge Penadés 611b45bae0 Merge branch 'dev' into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 15:16:18 +00:00
Alex Moreno b2e7ea3089 refs #5914 feat: make invoice support rectificative
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 15:16:41 +01:00
David Domenech eb0766bafd Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 14:08:47 +00:00
Pablo Natek 72283005b8 remove(console.log): refs #3271 remove console.log
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:43:14 +01:00
David Domenech 8ab981907d refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:25:00 +01:00
Pablo Natek c457b5c4d2 Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:39:26 +00:00
Jorge Penadés 40236fdb7b refs #6276 itemShelvingMake_multi
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 13:23:10 +01:00
Alex Moreno ee7dd66ce9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:49:42 +01:00
Alex Moreno 35e74a7635 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:48:27 +01:00
Alex Moreno 016e4ae37c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-11-30 12:20:50 +01:00
Javier Segarra 01e7135224 refs #5666 feat: replace Role by VnRole in front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 12:20:05 +01:00
Pablo Natek 3f22f48df7 fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:13:12 +01:00
Javier Segarra 2a2998a8bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin 2023-11-30 12:01:44 +01:00
Jorge Penadés 25a0ffcfde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:49:50 +01:00
Jorge Penadés 6121eeaa3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:44:05 +01:00
Carlos Satorres 9cdb7c3cca refs #6065 remove workcenter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:18:00 +01:00
Jorge Penadés 5442e3b4e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 08:44:41 +01:00
Javier Segarra 97d7f8356f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken 2023-11-30 07:08:23 +01:00
Javier Segarra 1576ab992d refs #6434 perf: new field in SignInLog table
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:36:30 +00:00
Jorge Penadés 0d558fb4f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head Build queued... Details
2023-11-29 16:26:10 +01:00
Javi Gallego d246b5f9a8 Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 15:26:51 +01:00
Carlos Satorres 9a3efdd6fe refs #6085 model y back
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 13:55:44 +01:00
Jorge Penadés 877c679273 refs #6276 getVersion
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 13:22:44 +01:00
Jorge Penadés 133fe1065a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:44:09 +01:00
Jorge Penadés c609f6f47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:27:50 +01:00
Carlos Satorres e548ef4dae refs #6085 searchpanel and change path
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-29 07:51:58 +01:00
Carlos Satorres 0186c2c806 refs #6085 aclMail back
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 07:33:49 +01:00
Jorge Penadés 29fb36010c refs #6274 back methods created
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 14:48:03 +01:00
Javier Segarra 63533459b0 refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 13:22:17 +01:00
Jorge Penadés f2673c3818 refs #5835 rate added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-28 12:12:42 +01:00
Guillermo Bonet 1a5cc67312 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 12:07:50 +01:00
Javi Gallego 2fa56cce4b fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 09:22:00 +01:00
Javier Segarra bb9723b65d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 08:18:11 +01:00
Javier Segarra f5f2896cbf refs 5666 feat: replace Role model by VnRole model 2023-11-28 08:12:16 +01:00
Pablo Natek b713a32fe1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 08:12:06 +01:00
Alex Moreno 37555cbb63 refs #6335 warmFix(ticketAdvance): correct properties
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 15:10:00 +01:00
Juan Ferrer c7291e3367 Merge pull request 'test' (!1863) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1863
2023-11-27 12:17:11 +00:00
Juan Ferrer 74772472d5 Merge pull request 'master' (!1820) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1820
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-27 12:16:42 +00:00
Robert Ferrús 5f26553092 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 11:05:50 +00:00
Robert Ferrús 62fab4e744 refs #5854 itemShelving traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 11:52:37 +01:00
Guillermo Bonet 3bdb002034 Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 09:06:17 +00:00
Guillermo Bonet aefff68c29 refactor: refs #3222 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:51:56 +01:00
Javier Segarra 901a44cc62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:48:31 +01:00
Javier Segarra 72a0932e35 refs #6264 other: rename camel-case variable 2023-11-27 09:46:27 +01:00
Alex Moreno 3fb1ed9dfe Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 08:38:17 +01:00
Carlos Satorres f9d5cad412 refs #6506 contract
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 07:57:18 +01:00
Alex Moreno 824ca1d70a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 07:42:50 +01:00
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 12:42:25 +01:00
Javier Segarra 4383ebd7f1 refs #5858 feat: email notification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-24 12:30:44 +01:00
Jorge Penadés 53c8e87b5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:57:32 +01:00
Jorge Penadés 8ac3887d80 refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-24 10:53:38 +01:00
Jorge Penadés c56588a472 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:18:47 +01:00
Jorge Penadés b3584d9db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:12:45 +01:00
Carlos Satorres 5d18c211a0 refs #6507 state
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 08:40:06 +01:00
Javi Gallego 4071c06b5f feat: refs #6275 getTickets con los campos de silex
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 08:15:39 +01:00
Carlos Satorres 8a568f180a refs #6506 fix e2e, refactor business
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 07:47:57 +01:00
Carlos Satorres ebe467f721 refs #6506 hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 07:04:55 +01:00
Javi Gallego aa0794e136 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 06:31:25 +01:00
Jorge Penadés e314a67fe7 refs #6274 time control methods migrated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 13:25:31 +01:00
Jorge Penadés cf3b5efee9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 12:36:19 +01:00
Jorge Penadés 6b2c1e09de refs #5835 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:31:00 +01:00
Javi Gallego 5b145a57e6 error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:29:53 +01:00
Jorge Penadés 048e3089cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:26:41 +01:00
Jorge Penadés db15285858 refs #5811 test updated
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 11:21:56 +01:00
Jorge Penadés 2e67ef4f5d refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:32:07 +01:00
Jorge Penadés 900dffbbba refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 10:26:28 +01:00
Pablo Natek b261e9987a Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 10:10:11 +01:00
Pablo Natek 754150d17d feat(operator.spec): refs #6005 add spec for delay and fix spec for spam 2023-11-23 10:10:09 +01:00
Javi Gallego f44424dbcf test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 09:44:47 +01:00
Javi Gallego 5b289ec083 Merge branch 'dev' into 6028_route_getRouteByWorker 2023-11-23 09:21:44 +01:00
Pablo Natek 68dca67442 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 07:33:46 +00:00
Pablo Natek a35a790155 remove(getVideo.spec.js): refs #6005 created task to review the spec
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 08:33:30 +01:00
Jorge Penadés da7b670d74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 08:28:56 +01:00
Alex Moreno f4fabb9fff refs #6491 refactor(order_filter): optimized
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-23 08:26:14 +01:00
Pablo Natek 1b4ce1a0b5 feat(noSpam): refs #6005 check if exists a previous notification 2023-11-23 08:22:24 +01:00
Carlos Satorres 2b455488a3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 18:35:16 +01:00
Carlos Satorres 6b07ee4eb1 hotfix workerhours 2023-11-22 18:35:14 +01:00
Javi Gallego e856de0cfd feat: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:54:38 +01:00
Jorge Penadés 26a8cc6a2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:41:24 +01:00
Jorge Penadés a60a30128c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:40:11 +01:00
Javi Gallego e146c0ea46 Merge branch 'dev' into 6028_route_getRouteByWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 12:42:20 +01:00
Javi Gallego a0a9e299d9 feat: refs #6275 getTickets with phone
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 12:39:21 +01:00
Guillermo Bonet d52c82fb19 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 11:36:07 +00:00
Pablo Natek 8dae2919e8 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 09:38:20 +00:00
Jorge Penadés 40bbad04c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 10:16:12 +01:00
Jorge Penadés a27bb53089 refs #5835 getTotals fixed
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 08:57:45 +01:00
Carlos Satorres 7c6798c564 refs #6291 dni vn-user
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 16:25:48 +01:00
Jorge Penadés 251578146e refs #6276 several methods created
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 12:32:36 +01:00
Jorge Penadés 67fa60ae81 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-21 12:27:13 +01:00
Jorge Penadés 3f8d1ff617 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:17:31 +01:00
Guillermo Bonet b3d1c72adc Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:41 +00:00
Alex Moreno e909c2bc26 Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:17 +00:00
Alex Moreno 02e8b90926 refs #6454 test: fix e2e by dump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 10:12:07 +01:00
Juan Ferrer bf7c67dbde fix: refs #6197 add definer to events
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:26:02 +01:00
Jorge Penadés dd11cf5327 ref #5835 fix test
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:03:25 +01:00
Jorge Penadés 34e5409533 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 08:19:11 +01:00
Juan Ferrer 0a2fd9cf5d fix: refs #6432, #5848 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 18:39:37 +01:00
Alex Moreno ee1a0c15ee refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 15:09:55 +01:00
Guillermo Bonet 5fdf18825c Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 13:14:51 +00:00
Alex Moreno e25ca914a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-20 10:13:02 +01:00
Alex Moreno 0ddfb28327 refs #5914 fix: transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 07:56:15 +01:00
Guillermo Bonet badb4d69a2 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 06:15:40 +00:00
Pablo Natek e2a2454d4e Merge branch 'dev' into 6461-fixFilterNegativeBases
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 10:31:35 +00:00
Pablo Natek dc100f7959 fix(filter): refs #6461 now is mockDate in local
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 11:29:57 +01:00
Juan Ferrer bb6f3b4cfd fix: refs #6432 account sync fixes
gitea/salix/pipeline/head This commit looks good Details
2023-11-17 08:56:25 +01:00
Guillermo Bonet 500eb22dc6 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 06:43:58 +00:00
Guillermo Bonet 8da36569f7 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head Build queued... Details
2023-11-17 07:44:43 +01:00
Guillermo Bonet 3d1c69be56 refactor: refs #4502 zoneEstimatedDelivery
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-17 07:43:32 +01:00
Guillermo Bonet 2f611391b9 Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery"
gitea/salix/pipeline/head This commit looks good Details
This reverts commit bfd6e1f398.
2023-11-17 07:17:29 +01:00
Juan Ferrer c2e295f777 fix: refs #6432 account sync fixes 2023-11-17 00:08:29 +01:00
Juan Ferrer ea5a881d1f fix: refs #6432 account sync fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:10:30 +01:00
Juan Ferrer 1937560118 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 23:07:30 +01:00
Juan Ferrer 4f5242e3ae fix: refs #6432 account sync fixes 2023-11-16 23:07:26 +01:00
Javier Segarra 9e64939810 refs #6434 feat: add Id property in model 2023-11-16 11:56:48 +01:00
Alex Moreno b8d256e4e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:58:51 +01:00
Alex Moreno f677382f96 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 09:29:53 +01:00
Javier Segarra e4f7790843 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-16 09:15:01 +01:00
Javier Segarra c6b5d7f5a4 refs #6434 feat: rename id key by token 2023-11-16 08:30:01 +01:00
Guillermo Bonet bfd6e1f398 refactor: refs #4502 Deleted zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 08:29:00 +01:00
Alex Moreno 5bdf6a7338 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-16 07:56:23 +01:00
Javier Segarra 13720291b2 refs #6434 perf: remove unique in token column
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 15:18:02 +01:00
Alex Moreno ac3d23579a Merge branch 'master' into 6434-signInLog_issue_MASTER
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 13:50:21 +00:00
Carlos Satorres 5b587b3449 Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 12:56:45 +00:00
Javier Segarra e0f6d08a1e refs #6434 feat: create signInLog table 2023-11-15 13:49:41 +01:00
Sergio De la torre a5d94b3a26 Merge branch 'test' into 5652_warmFix_setVisibleDiscard
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 12:43:58 +00:00
Alex Moreno 89967b8538 fix(workerDescriptor): show account button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 13:16:31 +01:00
Sergio De la torre 692c5eb164 refs #5652 fix: setVisibleDiscard add parameter null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 12:38:08 +01:00
Guillermo Bonet 2847b993d3 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:30:23 +00:00
Javier Segarra f7b0882978 refs #6434 feat: remove forceId property
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:50:56 +01:00
Javi Gallego a4328e607e Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 10:11:05 +01:00
Javi Gallego 3f7663da97 feat: refs #6275 crea back etExpeditionSummary
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 10:09:04 +01:00
Javier Segarra 4061241650 refs #6434 feat: create signInLog table 2023-11-15 09:37:03 +01:00
Alex Moreno 2a67048594 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 15:54:47 +01:00
Alex Moreno 88ec0f24c3 ref #5914 rename table
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 15:45:52 +01:00
Pablo Natek 2a57f7e98a Merge branch 'dev' into 6366-unifyTicketChangeState
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 14:02:27 +00:00
Pablo Natek 0a5e8e1902 refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 14:49:54 +01:00
Carlos Satorres f3faf37e1a hotfix addressFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 12:34:00 +01:00
Carlos Satorres b57106af48 refs #6291 validateTin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 11:13:33 +01:00
Alex Moreno 2cd9c9c688 Merge branch 'dev' into 5914-warmfix-renameTable
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 09:36:47 +00:00
Alex Moreno bc6389fd66 Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 09:00:12 +00:00
Alex Moreno aec1c9d447 fix: correct align
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-14 09:54:07 +01:00
Guillermo Bonet 4003e161ce Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:44:06 +00:00
Guillermo Bonet 64ca72b1f4 refactor refs #6184 Changed downloadCmrsZip
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:57:25 +01:00
Javier Segarra 384b5eb7c7 refs #5666 remove old file
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 09:56:16 +01:00
Javier Segarra aab88dc7de refs #5666 perf: use use loggable as mixin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-13 09:54:12 +01:00
Guillermo Bonet 2792efa9cd perf: refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 08:36:05 +01:00
Javier Segarra 3c5af184bb refs #5666 feat: use mixin for this models
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 15:12:49 +01:00
Carlos Satorres c5c314eb43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 11:59:01 +01:00
Guillermo Bonet a4cbc33ee1 Merge branch '6023-changeRol' of https://gitea.verdnatura.es/verdnatura/salix into 6023-changeRol
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 11:55:38 +01:00
Guillermo Bonet b7da144967 feat: refs #6023 Added SELECT FOR UPDATE 2023-11-10 11:55:37 +01:00
Guillermo Bonet eb98de71b1 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 10:49:38 +00:00
Carlos Satorres a1c8bba4a5 hotfix addressId
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 11:29:18 +01:00
Alex Moreno 0fed5c1ab4 Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 09:59:24 +00:00
Alex Moreno 2eacf7391e refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 08:46:49 +01:00
Alex Moreno e9666a5930 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-11-10 08:11:52 +01:00
Jorge Penadés 40b9a83606 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:59:12 +01:00
Jorge Penadés 8d94a94e14 ref #5914 fix test back
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:56:50 +01:00
Jorge Penadés 513562955b ref #5835 test back
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:53:41 +01:00
Jorge Penadés 52f1843580 ref #5835 due day new and fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:00:49 +01:00
Jorge Penadés 0baa9c5a98 ref #5914 fix summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 14:34:53 +01:00
Jorge Penadés b07858fddb ref #5914 replace name
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 14:33:46 +01:00
Guillermo Bonet 05a7498219 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:14:21 +00:00
Guillermo Bonet 0771548ef1 refs #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 14:14:09 +01:00
Guillermo Bonet 9668468f94 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:06:55 +00:00
Pablo Natek 1e4f778ef9 refactor(main-labeler): refs #6005 refactor de mainLabeler a backupPrinterFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:22:12 +01:00
Jorge Penadés 01d3c23cf0 ref #5914 renameTable
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 11:57:52 +01:00
Alex Moreno 52f419d4cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-11-09 09:33:22 +01:00
Pablo Natek c00bbe070c Merge branch 'dev' into 6005-backupLabeler 2023-11-09 09:26:13 +01:00
Sergio De la torre 4258015c07 refs #5870 feat:fixModel
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 08:04:38 +01:00
Pablo Natek 9c896c835f refactor(printer-notification): refs #6005 refactor de la notificación 2023-11-09 07:56:35 +01:00
Javi Gallego 9d54618620 fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 10:01:02 +01:00
Sergio De la torre d30c4e4463 refs #5652 feat:addressShortage
gitea/salix/pipeline/head This commit looks good Details
2023-11-07 16:13:21 +01:00
Pablo Natek 1c6618d494 fix(new): refs #6150 revert chabges in worker new method
gitea/salix/pipeline/head Build queued... Details
2023-11-06 14:56:48 +01:00
Pablo Natek aa800b1fd3 Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 14:23:38 +01:00
Pablo Natek a75565f2ce feat(client.create): refs #6150 clientCredit update fix 2023-11-06 14:23:36 +01:00
Juan Ferrer 99c88e6f5d fix: refs #6390 Loggable set as base for ItemShelving
gitea/salix/pipeline/head This commit looks good Details
2023-11-05 09:33:18 +01:00
Alex Moreno d06810b1b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 14:58:55 +01:00
Alex Moreno a523e32373 refs #6335 style(ticketAdvance): fix with split-progress
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 07:57:53 +01:00
Jorge Penadés d0975f0acd ref #6276 operator_add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-02 16:25:25 +01:00
Sergio De la torre 728838334c hotFix_6312 fix originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:42:22 +01:00
Pablo Natek 2d3ee4a16e Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 13:05:31 +00:00
Pablo Natek 175e73e565 fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:05:14 +01:00
Alex Moreno 740d2fb976 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-11-02 08:48:03 +01:00
Alex Moreno 83b9ef72fc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 08:47:44 +01:00
Alex Moreno 742d6de986 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 07:28:41 +01:00
Carlos Andrés 8c1ff26de7 Merge branch 'dev' into 5637-saleGroupLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 11:12:40 +00:00
Robert Ferrús 6112c7ba5f refs #5637 saleGroup traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 09:59:34 +01:00
Pablo Natek a47d31cec9 Merge branch 'dev' into 4131-unifyTicketStatusChanges
gitea/salix/pipeline/head This commit looks good Details
2023-10-31 06:48:53 +00:00
Alex Moreno 37dce99447 refs #6335 test(ticketAdvance): add test to keep price
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 15:00:05 +01:00
Pablo Natek e504ad313c remove(console.log): refs #4131 quitar console log
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 14:56:33 +01:00
Alex Moreno a80715583c refs #6335 feat(ticketAdvance): change the date if you can
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-30 14:16:25 +01:00
Jorge Penadés ab0640291b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState
gitea/salix/pipeline/head This commit looks good Details
2023-10-30 08:25:41 +01:00
Alex Moreno bd8cc897c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-30 07:21:31 +01:00
Pablo Natek 14753212bb fix(saveSign): refs #4131 remove call state on saveSign
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:07:17 +02:00
Pablo Natek 65a1d052dc feat(ticket.state): refs #4131 to state
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 18:03:40 +02:00
Sergio De la torre 7ae12327f5 refs #5134 fix: model ExpeditionScan
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 16:16:22 +02:00
Alex Moreno ae160890a8 refs #6335 feat(ticketAdvance): use componentUpdate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-27 15:06:20 +02:00
Pablo Natek 42bbdf9814 feat(ticket.state): refs #4131 convert changeState to State
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 13:41:32 +02:00
Pablo Natek 524ac4d99d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges 2023-10-26 22:16:06 +02:00
Pablo Natek 3584b15c19 Merge branch 'dev' into 4131-unifyTicketStatusChanges 2023-10-26 22:10:35 +02:00
Alex Moreno 55d80458cc refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 14:37:42 +02:00
Alex Moreno 30895f444f Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 12:14:31 +00:00
Alex Moreno 6b94ea7d11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-10-26 09:48:35 +02:00
Jorge Penadés 3a1227bdc2 ref #5914 fix ticketrefund
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 09:20:25 +02:00
Jorge Penadés da2bc416f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 08:26:35 +02:00
Alex Moreno 013b010c22 refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 07:56:57 +02:00
Alex Moreno 26bdbabff5 refs #6335 feat(ticketAdvanced): show all tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-25 15:48:19 +02:00
Alex Moreno a501d577f8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:23:00 +02:00
Alex Moreno efa9f16452 fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:22:44 +02:00
Carlos Andrés 001d7cd574 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 15:03:38 +00:00
Jorge Penadés 9f141238bc ref #5216 add userFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 11:47:54 +02:00
Alex Moreno 5442476f05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-10-24 10:35:11 +02:00
Jorge Penadés 35bb949fcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 10:13:38 +02:00
Jorge Penadés f1deeb69ca ref #5914 add ticketrefund and fix text
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:34:04 +02:00
Alex Moreno 22b7c59812 refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:23:03 +02:00
Jorge Penadés 1231d6dd1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-24 08:34:42 +02:00
Carlos Andrés 08431e94c6 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 13:52:52 +00:00
Carlos Andrés 6e3517b40f refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 14:51:09 +02:00
Alex Moreno 247aa5af2a refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:52:06 +02:00
Alex Moreno cf856a585b refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:50:00 +02:00
Jorge Penadés 1f0a57d320 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 09:03:15 +02:00
Alex Moreno dc00b85bec Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 08:31:37 +02:00
Jorge Penadés 33656e9d9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 08:21:32 +02:00
Pablo Natek 0237517f0c Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:55:30 +00:00
Pablo Natek 8597c23fb3 Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:53:57 +02:00
Pablo Natek 5c69d9c7f0 fix: add await in async functions refs #5979 2023-10-20 12:53:54 +02:00
Alex Moreno 1eabad7f4b refs #6257 fix(saleQuantity): add isInPreparing restriction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 12:37:44 +02:00
Pablo Natek 75cfea4a2e Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 10:18:43 +00:00
Pablo Natek 25c13e42ab Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 11:36:24 +02:00
Pablo Natek 243a32dff5 remove(expand): quito expand de la columna requester refs #6278 2023-10-20 11:36:11 +02:00
Alex Moreno ef1ddfd484 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:28:37 +02:00
Alex Moreno 84aed7ca21 refs #6257 fix(saleQuantity): newPrice correct restricction
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 09:26:56 +02:00
Alex Moreno d5f98700e7 refs #6287 fix: ticket new correct return type
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 08:32:35 +02:00
Pablo Natek 9cb4e57951 Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-20 05:31:12 +00:00
Pablo Natek dc93328bcf Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 18:24:04 +02:00
Pablo Natek 07fa011035 fix(updateClaim): el spec daba error refs #5979 2023-10-19 18:24:03 +02:00
Pablo Natek dad67539c5 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 16:23:34 +00:00
Carlos Andrés 16f20cea70 refs #6199 fix(sale): get minim price without grouping
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 15:12:06 +02:00
Pablo Natek f26595bb62 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:15:43 +00:00
Alex Moreno a0e32cf455 Merge branch 'test' into 6199-saleUploadQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:05:25 +00:00
Alex Moreno cadec7d01f Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:36:14 +00:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Alex Moreno d9ab607126 refs #6199 feat(sale): increase quantity if newPrice is higher
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:03:11 +02:00
Pablo Natek 71182d8630 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:49:31 +00:00
Alex Moreno 1ea6b87266 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:48:51 +00:00
Juan Ferrer 39a0f13500 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 10:14:29 +00:00
Guillermo Bonet 1b8f227c47 ticket #125321 filter advance tickets fix
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:58:15 +02:00
Pablo Natek e2f7ce8b35 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:58:50 +00:00
Alex Moreno 3294937b54 Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:50:29 +00:00
Jorge Penadés e680a6a080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 10:00:43 +02:00
Jorge Penadés 15890e80d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:59:19 +02:00
Jorge Penadés 52b14cf8b4 ref #6138 fix emailVerified
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:51:10 +02:00
Jorge Penadés 5b1e5743b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 09:35:37 +02:00
Pablo Natek f1b11fdca2 Merge branch 'master' into 5979-getAppOrigin
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 06:51:50 +00:00
Javi Gallego 84fc0de4ea Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1803
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-19 06:41:43 +00:00
Pablo Natek d3a7b4ecb9 remove: console.log from updateClaim refs #5979 2023-10-19 08:41:26 +02:00
Pablo Natek f8889df903 remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979
gitea/salix/pipeline/head Build queued... Details
2023-10-19 08:40:25 +02:00
Pablo Natek 488181e1b6 feat(getUrl): se añade el metodo getUrl refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:37:28 +02:00
Jorge Penadés 770aa60b69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:26:22 +02:00
Jorge Penadés 7e25fac3e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:25:00 +02:00
Jorge Penadés 8917821ec0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-19 08:23:44 +02:00
Alex Moreno daaf076133 Merge branch 'dev' into 6312
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 05:29:43 +00:00
Alex Moreno da20697052 refs #6199 feat(sale_updateQuantity): can upload
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 15:19:26 +02:00
Javi Gallego 44ce0a8730 refs #6312 no inserta el originalquantity
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:46:41 +02:00
Jorge Penadés 8fe911ee0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:43:22 +02:00
Jorge Penadés 62d2c7e701 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:42:15 +02:00
Jorge Penadés ea5597d3f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 13:40:02 +02:00
Jorge Penadés af0d5072ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 13:37:14 +02:00
Pablo Natek 3e96b3d0d2 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 11:24:03 +00:00
Jorge Penadés 330fb08aac ref #5417 fix back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 13:23:00 +02:00
Pablo Natek bf09f13aa2 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 11:07:24 +00:00
Pablo Natek 44bc30adf7 Merge branch 'dev' into 6278-ticketRequestFixFilter
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:35:53 +00:00
Pablo Natek 2bb4300e1b remove: se quita el console log refs #6278
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:35:45 +02:00
Pablo Natek 34c9d030e9 Merge branch 'dev' into 6266-minimumImprtSmsFix
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:31:12 +00:00
Pablo Natek 5f49a4fe1d fix: created -> shipped refs #6266
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:25:47 +02:00
Pablo Natek 1920a1b893 merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:23:23 +02:00
Jorge Penadés 251d71a437 ref #5417 refactor transactions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-18 12:05:33 +02:00
Alex Moreno a84f6fe1da Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:05:04 +02:00
Jorge Penadés 700caac641 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 12:03:07 +02:00
Alex Moreno 4300b24c14 refs #5918 refactor(worker_timeControl): simplify ng-show
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:45:15 +02:00
Alex Moreno d1cb2a1d9a refs #5918 test: add updateWorkerTimeControlMail
gitea/salix/pipeline/head This commit looks good Details
2023-10-18 10:30:36 +02:00
Alex Moreno a7b0ef1e4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend 2023-10-18 09:23:55 +02:00
Alex Moreno b3c7511e59 refs #6067 feat(url): getByUser 2023-10-18 08:52:06 +02:00
Alex Moreno a916007314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-18 07:20:34 +02:00
Pablo Natek 8d44bb8867 refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 15:05:48 +02:00
Jorge Penadés 69a54be1a9 ref #5947 refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 14:02:08 +02:00
Pablo Natek 541926d3f7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded 2023-10-17 13:57:32 +02:00
Pablo Natek 9870a0e60a feat(origin): create method url_/geturl redf #5979 2023-10-17 13:56:49 +02:00
Carlos Satorres fd64cb7e80 refs #5919 front back
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 13:08:00 +02:00
Alex Moreno d4770c525e refs #6199 test(sale): fix test
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 11:00:41 +02:00
Jorge Penadés 48003b5d03 ref #6138
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 08:28:15 +02:00
Pablo Natek 4f911e644c fix: remove console.log refs #5979
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:43:03 +02:00
Pablo Natek afe4c676fc fix(url): la ulr termina con / no es necesario añadir el texto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:38:33 +02:00
Pablo Natek 033c02750b refactor(origin): .origin por getUrl()
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 18:24:58 +02:00
Jorge Penadés bd535374d8 ref #6138 setPasword created
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 15:58:25 +02:00
Alex Moreno 093431ecdf refs #6119 fix(sale_hook): fix quantity case
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-16 15:27:10 +02:00