Commit Graph

1666 Commits

Author SHA1 Message Date
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:54:16 +01:00
Alex Moreno 9a3fea99ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send 2023-01-13 13:45:10 +01:00
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Joan Sanchez c489c4c6a9 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-01-13 08:55:01 +01:00
Vicent Llopis 6a8e7873fa fix: sólo cierra caus que el último mensaje sea una respuesta. Cierra caus con el estado 'Abierto' y 'En espera'º
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:07:48 +01:00
Pau dfd264ff82 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 13:29:45 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Vicent Llopis 1df6ce170d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head Build queued... Details
2023-01-11 12:38:47 +01:00
Vicent Llopis 9042eaaf9f add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:38:37 +01:00
Vicent Llopis caff537f2e feat: imprime las facturas
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:29:03 +01:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:11:06 +00:00
Pau 24b8b172b9 use notification id 2023-01-05 14:13:42 +01:00
Pau 4ae903191a Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 12:48:03 +00:00
Vicent Llopis 810a1afcd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2023-01-05 11:40:25 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Pau 1653439c44 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:33:21 +00:00
Vicent Llopis 25dad4b358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-03 13:03:36 +01:00
Alex Moreno 29483bcc1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-03 12:28:55 +01:00
Alexandre Riera 6185b2f055 refs #5051 changed fixture
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:04:38 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Pau ea7f4b7c02 remove broken fixture 2022-12-27 10:34:12 +01:00
Pau 3ca1d1f4ee remove error in fixtures 2022-12-27 10:29:15 +01:00
Pau deb730aae7 solve fixture error 2022-12-27 09:21:02 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-26 07:12:13 +01:00
Vicent Llopis fb325d5e65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 12:34:51 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:08:16 +01:00
Joan Sanchez 39699114e3 Changed version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 10:01:08 +01:00
Joan Sanchez ff0243db8f Fixed SQL files 2022-12-23 09:55:15 +01:00
Alexandre Riera eefc5ab80d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-23 08:01:52 +01:00
Joan Sanchez 7c33cd2691 Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 10:43:20 +00:00
Pau a8ca163321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:49:41 +01:00
Pau fce0352986 add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 10:41:07 +01:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis e4f4e70cc6 Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:26:53 +00:00
Vicent Llopis 6634ebcec5 fix: id duplicado en util.notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 09:25:52 +01:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Pau 1430749892 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:02 +00:00
Alexandre Riera 5b87514501 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:15:50 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Vicent Llopis 1ddaf7ff08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-20 10:52:23 +01:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:47:08 +01:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alex Moreno 0a18c855e7 Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:43:40 +00:00
Vicent Llopis 3642b295b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-16 08:50:51 +01:00
Joan Sanchez dac6b4cb22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 08:41:43 +01:00
Joan Sanchez e7883d1c59 Removed deprecated foreign key 2022-12-16 08:39:59 +01:00
Joan Sanchez 5b23ee6d5a Removed deprecated fields 2022-12-16 08:10:39 +01:00
Vicent Llopis 1b30ee9d2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:32:51 +01:00
Alexandre Riera 45317c0850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:26:10 +01:00
Alexandre Riera 0af4f337e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 14:23:44 +01:00
Alexandre Riera 522000cd04 refs #4928 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:52:34 +01:00
Vicent Llopis 6793b8e9a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-15 07:13:09 +01:00
Alex Moreno 1e0b0028f2 fix: only edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 13:37:25 +01:00
Alexandre Riera 72c27f7176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 12:37:56 +01:00
Vicent Llopis e4dbeb0b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-13 09:54:56 +01:00
Alex Moreno 09edb99a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-12 13:48:06 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Vicent Llopis 2e14e04ed0 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 11:17:15 +00:00
Alexandre Riera 569a0e8cc9 refs #3302 log modified and fixed e2e tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-05 15:30:41 +01:00
Alex Moreno 995fb6a5c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head This commit is unstable Details
2022-12-02 13:13:53 +01:00
Joan Sanchez ac447d4981 Updated SQL version nomenclature
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:48:12 +01:00
Pau 5235ed5499 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 08:05:04 +00:00
Vicent Llopis ba8fe7dfa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:11:00 +01:00
Alex Moreno 8df7b91127 fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 15:24:33 +01:00
Vicent Llopis 68855add59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:53:54 +01:00
Alex Moreno 67cf4ebbea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-11-30 10:28:21 +01:00
Vicent Llopis 5c1b88fa44 detele: fixtures en español
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:21:53 +01:00
Vicent Llopis f056c26b0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-11-30 08:03:16 +01:00
Vicent Llopis c258587e02 feat: plantilla email para asientos contables importados incorrectamente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 15:06:21 +01:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 08:50:48 +01:00
Carlos Andrés 8a0c810a84 refs #4613
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 17:45:19 +01:00
Alex Moreno 7f1478f2e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 14:48:37 +01:00
Carlos Andrés bc83b9fd1f Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 10:07:21 +01:00
Carlos Andrés 2b0e6ab5ed test 2022-11-28 10:07:18 +01:00
Alex Moreno e4bbb6e83a Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 08:43:55 +00:00
Alex Moreno 6db1a9e8ae refs #4859 fix: fixtures db exportation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 07:19:30 +01:00
Vicent Llopis 7f3265be55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-11-25 12:24:00 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +01:00
Carlos Andrés 8d2e532167 #4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:32:54 +01:00
Alex Moreno c9347a929a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-11-25 08:52:11 +01:00
Vicent Llopis d023ec0a13 update fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 08:24:25 +01:00
Vicent Llopis dbbce77cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:43 +01:00
Pau 02f2724f2b Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:35:15 +00:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 15:04:15 +01:00
Vicent Llopis 927b5a63ec Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:14:01 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00
Alexandre Riera 5124b3b681 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:42:09 +00:00
Vicent Llopis 7ccf37c079 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 08:08:56 +00:00
Vicent Llopis 6f2a7a5cef feat: enviar sms con cambios en las líneas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 15:15:40 +01:00
Alex Moreno cbdffc98a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-23 14:16:42 +01:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:56:55 +01:00
Vicent Llopis 6a2af344aa feat: antes de bloquear comprobar que no existe un bloqueo previo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:41:32 +01:00
Vicent Llopis 9cfab2b3f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-23 10:23:17 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Vicent Llopis 32f28e91b5 feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:29:42 +01:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:48:11 +00:00
Vicent Llopis e148284332 jenkins test
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 11:02:19 +01:00
Alexandre Riera 6656ea4f54 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Vicent Llopis 8876bc2b68 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 08:12:07 +00:00
Alexandre Riera 40ea9805cf fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 10:49:19 +01:00
Joan Sanchez 1f857d5b10 4859 - Export production database
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:01:21 +01:00
Pau d41269bbbe Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 11:58:46 +01:00
Alexandre Riera a952fc0330 space fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 09:38:22 +01:00
Alexandre Riera 67f0346980 space fixtures
gitea/salix/pipeline/head Build queued... Details
2022-11-18 09:37:38 +01:00
Alexandre Riera fd58eaf838 drop procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:36:38 +01:00
Alexandre Riera 153cb48ff0 fix test
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:55:35 +01:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:30:00 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 14:17:24 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alex Moreno cba3c38ba6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 12:55:07 +01:00
Vicent Llopis fc516d4029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 12:23:59 +01:00
Vicent Llopis 843e5ae736 feat: traducciones en los modelos
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 11:41:57 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Alex Moreno 8f4ac8fcc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 10:12:29 +01:00
Alex Moreno bcab493f37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-15 07:33:53 +01:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Vicent Llopis 7e50f23563 refacor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:55:56 +01:00
Vicent Llopis a5b20bfb03 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-11 08:53:10 +01:00
Joan Sanchez 5e0a31f244 Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1129
2022-11-11 07:30:01 +00:00
Vicent Llopis 9d06f5c0f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:47:29 +01:00
Vicent Llopis 918ea3030d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:41:12 +01:00
Joan Sanchez 6a2977a2cf Fixed SQL changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:19:20 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Alexandre Riera ff00066138 refs #4700 tests front y fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 15:56:58 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Vicent Llopis 51b047eacc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:40:31 +01:00
Vicent Llopis ffa0ff650e feat: add time control
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 12:21:14 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Vicent Llopis ae513fb2b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 09:12:16 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Vicent Llopis f96fc0f91e Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:13:41 +00:00
Vicent Llopis 04f165d901 solved conflits
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:23:35 +01:00
Vicent Llopis 6df74facdc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-11-02 14:23:20 +01:00
Alex Moreno 6a9134d8f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:48:36 +01:00
Alex Moreno 2a8a8ed84a Merge branch 'dev' into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:01:11 +00:00
Joan Sanchez e2101db706 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:53:47 +00:00
Alex Moreno fc7a39e910 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:33:07 +01:00
Vicent Llopis d9107719fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail 2022-10-31 15:04:33 +01:00
Alex Moreno 36c0cc1a38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-31 14:12:40 +01:00
Joan Sanchez 231575d23e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:40:07 +01:00
Joan Sanchez d34936015b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 12:39:54 +01:00
Vicent Llopis 838402f05a add fixtures 2022-10-31 09:55:05 +01:00
Vicent Llopis 786ba0d614 feat: inserta fichadas de los teletrabajadores
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:34:34 +01:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Alex Moreno e9731c4ac0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-28 09:11:40 +02:00
Vicent Llopis 264b56378a Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 06:31:12 +00:00
Alex Moreno 9eb3b09be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 08:26:45 +02:00
Alex Moreno 80617dd578 Merge branch 'dev' into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 05:33:45 +00:00
Alex Moreno 9225e8f176 fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 15:11:57 +02:00
Alex Moreno 926ab0e35c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-27 09:05:05 +02:00
Alex Moreno 99fca9834f Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 06:10:14 +00:00
Vicent Llopis 1d908002e2 feat: add backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 14:25:27 +02:00
Alex Moreno f65d06fc7d fixes #4073
gitea/salix/pipeline/head This commit looks good Details
2022-10-26 08:27:28 +02:00
Vicent Llopis 5e0f976ad2 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 06:25:18 +00:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 14:09:21 +02:00
Vicent Llopis 6f7ec12cb2 feat: response as 'reply' and not as 'internNote'
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 10:35:41 +02:00
Pau 8b07180890 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:56:56 +00:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Alex Moreno 991893837c correct fixutures from dev
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:34:22 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:32:32 +02:00
Alex Moreno c637f2c879 feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 13:22:53 +02:00
Alex Moreno c2d37dadf7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:01:06 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:06:49 +02:00
Vicent Llopis 2e91698c1e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-10-07 08:19:08 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 07:47:46 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 15:04:27 +02:00
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Javi Gallego d73dab3454 Merge branch 'dev' into 4090-global_invoincing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 13:01:56 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 15:13:36 +02:00
Alex Moreno 8b636497a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 13:47:25 +02:00
Alex Moreno fe8ae164eb refactor(ticket): isEditable, canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:22:11 +02:00
Pau 9b202b7a84 refactor: isBox to freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-10-04 11:46:04 +02:00
Pau 3caf89bddb refactor: Replaced isBox with freightItemFk 2022-10-04 09:27:31 +02:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Alex Moreno f81b2775a0 add fixture
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 09:36:51 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +02:00
Alex Moreno 203b223cc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-28 12:24:40 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:46:23 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 5d6459d565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 08:37:20 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez 793705413e #452 - Dumped db
gitea/salix/pipeline/head This commit is unstable Details
2022-09-16 07:05:27 +00:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 11:35:15 +02:00
Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-05 08:12:07 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Vicent Llopis 31aafc0719 feat: add inserts in printQueue
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 09:11:38 +02:00
Alex Moreno 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:19:43 +02:00
Joan Sanchez cabc30ef87 Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1029
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-05 09:18:53 +00:00
Joan Sanchez 624428212b Merge pull request '4299-travel.agencyModeFk' (#1026) from 4299-travel.agencyModeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1026
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-08-04 12:51:41 +00:00
Vicent Llopis c3d396b042 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2022-08-04 13:52:59 +02:00
Vicent Llopis 020990dadc fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 09:53:22 +02:00
Vicent Llopis 998176f03c fix: fixtures
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 08:23:39 +02:00
Vicent Llopis 82f2ef768f fix: fixtures
gitea/salix/pipeline/head This commit is unstable Details
2022-08-04 08:15:20 +02:00
Vicent Llopis ede6da1a15 fix: db fixtures
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 15:14:02 +02:00
Juan Ferrer 539d9617e6 export
gitea/salix/pipeline/head This commit is unstable Details
2022-08-03 09:40:48 +02:00
Joan Sanchez eed0ac66c6 Merge pull request '4270-route.create' (#1023) from 4270-route.create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1023
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 07:09:08 +00:00
Joan Sanchez 0de2c08739 Merge pull request '4279-worker_phone' (#1034) from 4279-worker_phone into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1034
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-03 06:45:58 +00:00
Joan Sanchez 1b9de5cc95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-08-03 08:44:43 +02:00
Joan Sanchez 185ce60bef Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #994
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 06:41:22 +00:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Carlos Andrés 6f825ee3bc #3530 Eliminar uso de person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 17:03:31 +02:00
Carlos Andrés 67feac7c6c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 16:04:18 +02:00
Carlos Andrés 918a09ad5c #3530 Eliminar uso tabla person
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 15:17:00 +02:00
Vicent Llopis 537c383cd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:38:23 +02:00
Vicent Llopis 3bf7efea16 feat: add phone extension and personal phone. Update bussiness phone
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 12:16:41 +02:00
Joan Sanchez 468da0c5a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-27 08:12:06 +02:00
Alex Moreno 3fd34e0861 feat(claim_pickup_order): modify email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-25 14:49:39 +02:00
Alex Moreno 8048d4ce90 feat(notification): basic functionality and test 2022-07-25 08:25:10 +02:00
Alex Moreno f432d64f56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-07-25 07:45:26 +02:00
Carlos Jimenez Ruiz b8183748ce Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 13:58:52 +00:00
Carlos Jimenez Ruiz f3766edbb7 Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:56:19 +00:00
Vicent Llopis 7ad555c73f restart backTest Jenkins
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 13:59:36 +02:00
Carlos Jimenez Ruiz 7d7365c4f3 Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 11:07:08 +00:00
Vicent Llopis 8ea09a0449 jenkins testBack
gitea/salix/pipeline/head This commit looks good Details
2022-07-21 14:08:18 +02:00
Vicent Llopis 9035123c53 feat: update structure
gitea/salix/pipeline/head This commit is unstable Details
2022-07-21 10:36:21 +02:00
Alex Moreno 9b48cbb078 feat(notification): send
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:54:50 +02:00
Alex Moreno 7895decf4e feat(notification): create models
gitea/salix/pipeline/head This commit is unstable Details
2022-07-19 15:17:22 +02:00
Vicent Llopis b4408dc080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:42:43 +02:00
Vicent Llopis 762ec3045f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving 2022-07-14 09:11:43 +02:00
Vicent Llopis fdf6e04233 change travel.agencyFk by agencyModeFk 2022-07-13 14:36:03 +02:00
Vicent Llopis 48d4d4e964 try jenkins backTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 14:26:28 +02:00
Vicent Llopis f73012486c try jenckins backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 13:43:13 +02:00
Vicent Llopis 7bf9a8c100 delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 11:52:47 +02:00
Alex Moreno 051a849a21 fix(zone): fix getEventsFiltered
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 08:10:29 +02:00
Vicent Llopis 1eb6ee69cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 08:09:02 +02:00
Vicent Llopis 189d0a27bc refactor: delete unnecessary sql
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 11:44:03 +02:00
Vicent Llopis 5f2f5b9b25 feat: add sql changes 2022-07-05 10:18:26 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Alex Moreno c02433faab typo
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:24:26 +02:00
Alex Moreno c88df46b4f typo
gitea/salix/pipeline/head Build queued... Details
2022-06-30 13:23:57 +02:00
Alex Moreno ca767b84f0 fix(entry): change isInventory to isExcludedFromAvailable
gitea/salix/pipeline/head This commit looks good Details
2022-06-30 13:21:07 +02:00
Alex Moreno f6b9327fb5 try
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 08:43:43 +02:00
Alex Moreno 22fd0e91b0 title translations, and getWorkedHours test
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 12:10:37 +02:00
Alex Moreno a3f1c36226 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests 2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz bdf4ecdf50 Merge branch 'dev' into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-28 07:03:44 +00:00
Alex Moreno 8e2ed4e182 fix(worker_getWorkedHours): fix fixtures and test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-27 15:09:43 +02:00
Alex Moreno 0197f08c48 typo
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 14:13:50 +02:00
Alex Moreno 7980a941a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 14:03:24 +02:00
Alex Moreno 212c351064 fix(item_create): fixtures and test
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 13:17:22 +02:00
Carlos Jimenez Ruiz 57fd528e9b removed fixtures from deprecated column
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 12:20:17 +02:00
Alex Moreno a98a927663 fix back test and e2e that now fail
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz 6370471bd5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:01:42 +02:00
Alex Moreno 4155b45785 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 07:22:43 +02:00
Alex Moreno 9acd98e7b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4233-export-database
gitea/salix/pipeline/head This commit is unstable Details
2022-06-27 07:15:43 +02:00
Carlos Jimenez Ruiz d183ccb843 feat(claim.notes): added the observations setction to claim plus refactors
gitea/salix/pipeline/head This commit is unstable Details
2022-06-25 15:22:47 +02:00
Alex Moreno 86eb31ce65 fix(db_structure): change vn.VN_ to util.VN_
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:22:28 +02:00
Alex Moreno 4d4e09fb9f test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 14:07:53 +02:00
Juan Ferrer 7d67ca0e89 DB structure & data export, DB Dockerfile version changed to 10.7.3
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 12:14:16 +02:00
Joan Sanchez 2a758fd12a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization 2022-06-22 11:38:01 +02:00
Joan Sanchez e5b1bfeec2 Merge branch 'dev' into 4231-worker.calendar_payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-06-21 10:59:46 +00:00
Vicent Llopis 6611fcb40e fix: show correct payedHolidays
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-17 12:34:33 +02:00
Vicent Llopis c49f563299 feat: add fixtures 2022-06-16 10:59:17 +02:00
Alex Moreno 8474fb5692 Merge branch 'dev' into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-06-15 07:15:34 +00:00
Joan Sanchez 0e89616089 incoterms report refactor
gitea/salix/pipeline/head This commit is unstable Details
2022-06-13 11:03:11 +02:00
Alex Moreno de0f7c98fa Merge branch 'dev' into 3653-clientInsurance
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 05:32:58 +00:00
Alex Moreno f786cdd33d fix pass dates
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:39:51 +02:00
Alex Moreno eb9bd66ddb prepare for static dates
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz cd5dba6fcb Merge branch 'dev' into 4040-chat_sendQueued
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 08:44:22 +00:00
Alex Moreno 7eec9de0aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 07:47:03 +02:00
Alex Moreno 61cc3c19f3 refactor(client): creditInsuarnce change creditClassification for creditClassificationFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:13:54 +02:00
Vicent Llopis 3eac002fb4 feat: add queue to send rocket messages
gitea/salix/pipeline/head This commit is unstable Details
2022-06-03 12:22:07 +02:00
Vicent Llopis f6028316f4 feat: endpoint sendQueued addded
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 14:55:39 +02:00
Vicent Llopis e9c98a98e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:38:27 +02:00
Vicent Llopis f7be419bbe refator: updated fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-02 11:52:53 +02:00
Alex Moreno 8340041b33 throw userError and maxFileSize
gitea/salix/pipeline/head This commit is unstable Details
2022-06-01 07:57:32 +02:00
Alex Moreno aa7074f303 test(mdb): back test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-27 08:23:52 +02:00
Vicent Llopis 6359c9e5bf feat: add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 15:08:23 +02:00
Alex Moreno 79c42d04f9 feat(mdb): start section
gitea/salix/pipeline/head This commit is unstable Details
2022-05-25 14:59:28 +02:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:54:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz a76dd11825 Merge branch 'dev' into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:33:08 +00:00
Vicent Llopis ab6a0425f5 refactor: translate fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:47:43 +02:00
Vicent Llopis 875e9503c3 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:47 +02:00
Vicent Llopis c9bfbe990a refactor: request changues
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:53:10 +02:00
Vicent Llopis c5683ab880 feat: added itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-20 09:17:18 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:24:35 +02:00
Vicent Llopis 9eae1f479c add table vn.printer
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 10:39:46 +02:00
Vicent Llopis ebbb0466a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit is unstable Details
2022-05-17 10:13:05 +02:00
Vicent Llopis 7ad56327a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType 2022-05-17 08:21:49 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00:00
Vicent Llopis 10cd9c5b87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:16 +02:00
Joan Sanchez 9cbee7a38a Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 13:05:08 +00:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Alex Moreno 7f46d4e50a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 08:06:39 +02:00
Carlos Jimenez Ruiz 442644d3f1 Merge branch 'dev' into 3940-export_database
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 12:57:29 +00:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 14:47:54 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:47:33 +00:00
Vicent Llopis a0af774837 fix: test
gitea/salix/pipeline/head This commit looks good Details
2022-05-06 09:02:52 +02:00
Juan Ferrer bfd8c8d47a DB export
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 15:58:36 +02:00
Alex Moreno ac4d4e6db1 test and fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 10:59:37 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 10:35:31 +02:00
Juan Ferrer 6d5d9ca0e4 DB export
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 07:54:45 +02:00
Vicent Llopis d0f9613b4e delete hedera fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-04 07:19:45 +02:00
Alex Moreno b40b8d931d feat(client_credit): remove de old rows
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 11:18:39 +02:00
Juan Ferrer 6bdcdbb13c DB structure & data export
gitea/salix/pipeline/head This commit looks good Details
Hedera tables added to data export
2022-05-02 10:57:13 +02:00
Vicent Llopis ad80d0501c add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 07:48:09 +02:00
Vicent Llopis 5211a0d9d7 feat(supplier.fiscal-data): add two fields 2022-04-25 11:51:34 +02:00
Vicent Llopis 579ff3aa4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 07:13:34 +02:00
Alex Moreno e00d63d7af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:30:23 +02:00
Carlos Jimenez Ruiz 018047b6be Merge branch 'dev' into 3347-worker_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:52:56 +00:00
Carlos Jimenez Ruiz b087d275dc Merge branch 'dev' into 3605-invoiceIn_intrastat3
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:29:01 +00:00
Vicent Llopis c00be015ab feat(claim_photo): add fixtures and backTest 2022-04-08 13:53:25 +02:00
Alex Moreno dd9a38d1bf feat(client_search-panel): filter by province
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:29:00 +02:00
Alex Moreno d616367714 fix(test): use static dates
gitea/salix/pipeline/head This commit looks good Details
2022-04-05 07:46:49 +02:00
Alex Moreno c904bf0bdf feat(back): new Date mocked time
gitea/salix/pipeline/head This commit looks good Details
2022-04-01 13:55:45 +02:00
Alex Moreno d86f4da425 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate 2022-04-01 07:37:29 +02:00
Vicent Llopis 5f29b272e1 feat: add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 11:38:08 +02:00
Vicent Llopis bb267dad16 feat: add fixtures 2022-03-31 09:17:27 +02:00
Alex Moreno eec1c1ff86 feat(db): static dates
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-30 12:45:01 +02:00
Vicent Llopis e29f820e60 feat(ticket_line): new table ticketRefund and update proc ticket_doRefund
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 08:56:35 +02:00
Vicent Llopis d06b2e8bb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3605-invoiceIn_intrastat3
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 07:30:39 +02:00
Joan Sanchez bbbb0df1cd Merge branch 'dev' into 3781-export_database
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 10:15:33 +00:00
Carlos Jimenez Ruiz 74fb7c95c2 Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:18:13 +00:00
Alex Moreno fd02038c8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 10:08:29 +02:00
Carlos Jimenez Ruiz 407fe2850b Merge branch 'dev' into 3408-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:06:25 +00:00
Vicent Llopis 889dcf8763 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3781-export_database 2022-03-29 08:56:59 +02:00
Alex Moreno f853696d03 change fixture name
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 13:59:39 +02:00
Carlos Jimenez Ruiz 23c473de89 Merge branch 'dev' into 3408-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 10:26:13 +00:00
Carlos Jimenez Ruiz 8d70bac5c6 Merge branch 'dev' into 3621-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 10:13:21 +00:00
Carlos Jimenez Ruiz 39694b31b8 Merge branch 'dev' into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 08:40:32 +00:00
Juan Ferrer 85de742630 Export data & structure
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 09:44:29 +02:00
Vicent Llopis e02ab9dd2d feat: add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-24 11:39:19 +01:00
Alex Moreno 254fee5036 feat(worker_calendar): repaint, fix front test and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 14:02:48 +01:00
Vicent Llopis fd7afc962f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:53:33 +01:00
Vicent Llopis 1056060957 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:37:34 +01:00
Alex Moreno dc03a66c6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-23 12:01:50 +01:00
Joan Sanchez 52b61d16ac Merge pull request '3638-export_database' (#899) from 3638-export_database into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #899
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 10:43:14 +00:00
Alex Moreno 9a1c0a07fd Merge branch 'dev' into 3680-claim_basic-data_packages
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 08:42:52 +00:00
Vicent Llopis 84ebeed8ef add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 13:04:25 +01:00
Vicent Llopis e4eed95724 notify rocket when claimState change to canceled
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 10:02:56 +01:00
Alex Moreno b56e1810c3 test(item_fixedPrice): fix back test & e2e
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 10:30:30 +01:00
Vicent Llopis a32f7b5ef1 add new row
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-17 14:27:55 +01:00
Vicent Llopis 644c24fa3b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3607-supplier_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-17 11:55:07 +01:00
Vicent Llopis a3dbec82bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-17 07:59:07 +01:00
Alex Moreno f337f82b35 feat(claim): add packages, and next button
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 12:51:33 +01:00
Vicent Llopis 6742d7aa43 upload db changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 07:22:15 +01:00
Vicent Llopis a32ebc37da add supplier autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-09 23:54:23 +01:00
Juan Ferrer d49d1b437c User.login() error fixed
gitea/salix/pipeline/head This commit looks good Details
2022-03-09 15:34:26 +01:00
Vicent Llopis 91a23088c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-09 08:40:55 +01:00
Vicent Llopis 527387aad5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-03-08 08:45:40 +01:00
Alex Moreno efa32a3dc7 export structure
gitea/salix/pipeline/head This commit looks good Details
2022-03-04 13:04:28 +01:00
Alex Moreno 138e2ee9b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-03-04 12:25:05 +01:00
Vicent Llopis 4811254ccb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-02 15:07:38 +01:00
Vicent Llopis ade34c1e0a add section Autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-02 14:59:30 +01:00
Alex Moreno 5efb678a53 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 10:32:18 +01:00
Alex Moreno ccb5261ff6 Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 10:31:27 +01:00
Carlos Jimenez Ruiz 2b0f54c3aa Merge branch 'dev' into 3646-claim-summary
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 09:17:19 +00:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Vicent Llopis 72bfc1ef6e export db
gitea/salix/pipeline/head This commit looks good Details
2022-02-25 08:21:53 +01:00
Vicent Llopis 19887bdd16 feat: add section autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-24 14:52:32 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 13:52:26 +01:00
Vicent Llopis b3263fb97e add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:58:09 +01:00
Alex Moreno 52cf79516a refactor(claim_summary): move responsability and improve fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:23:47 +01:00
Vicent Llopis 591194d710 export db 2022-02-23 09:05:31 +01:00
Alex Moreno f3ff64c44d refactor(docuware): name for code
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 08:11:54 +01:00
Alex Moreno 0f4649c50f feat(ticket_descriptor-menu): docuware implemented
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 08:48:53 +01:00
Alex Moreno 3aeb2adb56 feat(ticket): docuware pdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-16 14:57:47 +01:00
Carlos Jimenez Ruiz 01e269db6d Merge branch 'dev' into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:03:47 +00:00
Alex Moreno 7cf252a8f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-02-01 07:29:38 +01:00
Alex Moreno 3d2f661bf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-02-01 07:20:21 +01:00
Vicent Llopis 44e6219df5 update table companyGroup
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 09:30:54 +01:00
Alex Moreno d0c4099255 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:20:39 +01:00
Alex Moreno 2455a24b68 feat(client_defaulter): section and test
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 14:27:30 +01:00
Javi Gallego 5fbbae7ac6 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-24 15:40:37 +01:00
Joan Sanchez 6de82caf0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 16:17:53 +01:00
Joan Sanchez ddf62d2496 Updated back unit test 2022-01-21 16:16:39 +01:00
Joan Sanchez 5ff950d078 refactor(invoice): hide report logo for non group companies #3519
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 10:33:40 +01:00
Javi Gallego 3c8e6a16a2 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-19 14:19:29 +01:00
Joan Sanchez 352c3205bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 13:57:26 +01:00
Alex Moreno b8355320f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 14:50:10 +01:00
Carlos Jimenez Ruiz dc0a498b4d Merge branch 'dev' into 3513-export_database
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 13:02:32 +00:00
Joan Sanchez 7d16d7aaf2 Closure refactor 2022-01-17 12:33:11 +01:00
Alex Moreno b05f464517 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 10:14:58 +01:00
Alex Moreno 245161375c update database
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 08:27:56 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 07:20:23 +01:00
Alex Moreno 6f7c1b6a46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:56:34 +01:00
Alex Moreno fba09e8c40 feat(ticket_volume): volume for packingType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-12 14:02:58 +01:00
Alex Moreno 9e491082e7 test(send): backTest and fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-01-11 08:39:06 +01:00
Alex Moreno e4db123672 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 13:55:36 +01:00
Alex Moreno 2a9cc2f465 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-03 09:54:11 +01:00
Alex Moreno db609c1713 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3468-export-database
gitea/salix/pipeline/head This commit looks good Details
2022-01-03 08:39:06 +01:00
Alex Moreno e8a4a9cd8c update today
gitea/salix/pipeline/head This commit looks good Details
2022-01-03 08:38:46 +01:00
Carlos Jimenez Ruiz ea4fc5c262 updated fixtured to amend failing test
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 12:08:05 +01:00
Alex Moreno a57999aaad unnecessary space
gitea/salix/pipeline/head This commit looks good Details
2021-12-29 11:55:48 +01:00
Alex Moreno e9f77bb9b4 feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk 2021-12-29 11:51:56 +01:00
Alex Moreno 5401c1ebf6 export database and fixture train
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 12:29:47 +01:00
Alex Moreno 1e6355cdde fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 08:37:50 +01:00
Alex Moreno 67dc5c2cbc refactor(ticket_basic-data): test e2e
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 08:11:33 +01:00
Alex Moreno e609994efa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 21:01:18 +01:00
Alex Moreno 18b6efe8f1 test(ticket_basic-data): test and fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 20:58:58 +01:00
Alex Moreno f67edffcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 13:51:44 +01:00
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 09:40:34 +00:00
Alex Moreno 9247bc98f1 feat(db): sql for supplier isPayMethodChecked 2021-12-20 08:01:13 +01:00
Javi Gallego a99174e42a Merge branch 'dev' into 2883-invoiceIn-Booking 2021-12-14 09:50:39 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 12:49:53 +01:00
Vicent Llopis b9893220cd export database
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 08:19:28 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:57:17 +01:00
Alex Moreno 771100ccab remove unnecessary intro and comment
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 08:40:20 +01:00
Alex Moreno eea9413628 fix(item_basic-data): controller, test e2e and model
gitea/salix/pipeline/head This commit looks good Details
2021-11-26 08:34:32 +01:00
Alex Moreno 9fce06dfe0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 11:53:26 +01:00
Alex Moreno fc2e81826d export database
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 13:02:58 +01:00
Alex Moreno 5931692fac test(item_basic-data): add genericFk e2e
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 09:21:41 +01:00
Carlos Jimenez Ruiz 1f2417b55e Merge branch 'dev' into 3290-entry_latest-buys
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz ff0a3acd6e Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 13:32:18 +00:00
Alex Moreno fe46dbd343 feat(entry_last-buys): add filter isFloramondo
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 11:49:30 +01:00
Vicent Llopis 8f2e29787b fix(payMethod): alter colums name
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 10:07:33 +01:00
Javi Gallego c8e9416448 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 07:33:54 +01:00
Carlos Jimenez Ruiz c1adba3249 Merge branch 'dev' into 3338-worker_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 14:01:25 +00:00
Carlos Jimenez Ruiz 924e6d063d moved getBalance modifications to correct version
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 12:42:31 +01:00
Carlos Jimenez Ruiz 2bfcaa810c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel 2021-11-18 12:40:50 +01:00
Javi Gallego b936272898 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 07:36:03 +01:00
Vicent Llopis 180fb95a00 feat(createAbsence): add backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 10:09:42 +01:00
Alex Moreno ec25df39e4 transaction activeWithBuyer.js
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:50:02 +01:00
Alex Moreno 54dc9aacaa feat(item): add checkbox isFloramondo in search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 13:53:18 +01:00
Alex Moreno 73211c5b3b Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 12:14:37 +01:00
Alex Moreno adf295ebf3 fix(item): add ng-model, add fixture and transaction back test 2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz d69ee4a597 Merge branch 'dev' into 3328-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz 59cdf00134 Merge branch 'dev' into 3312-ibanRequired
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 08:24:29 +00:00
Alex Moreno 5c7efbb838 feat(item): back filter buyer in search panel ans test
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 10:33:21 +01:00
Carlos Jimenez Ruiz 717ea60084 Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 13:40:56 +00:00
Alex Moreno 119d5e45b9 feat(supplier): add checkbox isPayMethodChecked
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 08:43:25 +01:00
Vicent Llopis f5977d9f01 delete maxAmount from structure.sql
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 14:35:34 +01:00
Carlos Jimenez Ruiz 345be297f0 Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 08:26:41 +00:00
Vicent Llopis 395ad1c76d fix(ibanRequired): set different ibanRequired for Client and Supplier
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 15:04:33 +01:00
Vicent Llopis bfbc9b50c4 feat(client_balance): add maxImport if "cash"
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 13:02:42 +01:00
Alex Moreno 45b36a5c77 export-database
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 09:28:34 +01:00
Carlos Jimenez Ruiz 683f01ddd8 refactor(zone): removed deprecated column m3Max
gitea/salix/pipeline/head This commit looks good Details
2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz 14a72b32bd refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max 2021-10-21 11:37:09 +02:00
Alex Moreno 9c4e46f363 export_database
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 13:32:03 +02:00
Joan Sanchez f87f3e85b4 Merge branch 'dev' into 3211-closure_invoicing
gitea/salix/pipeline/head This commit looks good Details
2021-10-19 12:42:13 +00:00
Joan Sanchez 5209414613 feat(closure): should mail the PDF invoice invoiceable clients
gitea/salix/pipeline/head This commit looks good Details
Refs: 3211
2021-10-19 13:46:17 +02:00
Carlos Jimenez Ruiz e3942c0bb9 refactor(thermograph): empty fields handler added and correct usage of thermograph.code 2021-10-19 10:58:58 +02:00
Carlos Jimenez Ruiz cec04a307d refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 12:05:38 +02:00
Joan Sanchez f60c754c59 refactor(invoice): Show generate PDF option if it was never generated before
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3162
2021-10-01 14:31:42 +02:00
Javi Gallego e5c9ea850b testback done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-24 08:24:34 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Carlos Jimenez Ruiz 8d8740a33b Merge branch 'dev' into 2910-route_closure
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:27:14 +00:00
Joan Sanchez f5b1eb3ccd feat(closure): send to driver the route report on route closure
gitea/salix/pipeline/head This commit looks good Details
2021-09-10 10:38:19 +02:00
Carlos Jimenez Ruiz 46b59473a3 refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures 2021-09-09 16:06:44 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Carlos Jimenez Ruiz 99f4a2ed7d refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked
gitea/salix/pipeline/head This commit looks good Details
2021-09-07 16:07:46 +02:00
Carlos Jimenez Ruiz ca82d7e759 fix(coillection): collection created dates were wrong for testing purposes 2021-09-06 16:35:31 +02:00
Carlos Jimenez Ruiz 6b465f9150 Merge branch 'dev' into 3068-ticket_colletion
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz 84b8ed610d fix(fixtures): dua code dups
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 15:30:07 +02:00
Carlos Jimenez Ruiz 158c15afa1 fix(filter): removed fixtures that no longer work due to structure changes 2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz ec9c061051 fix(getUpcomingDeliveries) fixtures were broken due to db structure changes
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 12:37:46 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 11:48:21 +02:00
Carlos Jimenez Ruiz 07929af0cb fixed(dua): removed fixtures from duainvoicein as dua has less data on production now
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 16:47:27 +02:00
Carlos Jimenez Ruiz 8de6712eab fix(client): column cplusTerIdNifFk deprecated on production 2021-08-31 16:29:21 +02:00
Joan Sanchez c592212290 fix(structure): Dumped production database
gitea/salix/pipeline/head This commit looks good Details
Dumped database and fixed structure issues
Refs: #3079
2021-08-31 15:15:51 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Javi Gallego 54634ed22d test okl
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 07:39:26 +02:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:23:13 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +02:00
Javi Gallego 9054aa0885 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-30 08:30:40 +02:00
Javi Gallego 59fac7edfa fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:33:01 +02:00
Joan Sanchez efc25fcb53 Updated ids
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 12:28:55 +02:00
Joan Sanchez b0d7f6537b Updated taxClass
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 09:32:10 +02:00
Joan Sanchez e6c50a2033 Updated structure
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 16:23:39 +02:00
Joan Sanchez 0a3f3cc57f Incremented up to 1000 on the users id
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 16:11:28 +02:00
Joan Sanchez 46bbe07c3f 2997 - Export production
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-22 15:01:10 +02:00
Joan Sanchez 4f2c21707f 2997 - Export production db 2021-06-22 14:59:26 +02:00
Javi Gallego e2f32a60fd cambio campos en front 2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz fc3af7b6a6 ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good Details
2021-06-09 14:25:50 +02:00
Joan Sanchez f6a0bcb12c Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 13:33:17 +02:00
Carlos Jimenez Ruiz 60b0488a47 Merge branch 'dev' into 2925-export_db
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 09:23:05 +00:00
Joan Sanchez f7487c76a6 2925 - Exported production database
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 11:13:08 +02:00
Carlos Jimenez Ruiz d440a631c8 getUserConfig now gets default company and warehouse with dynamic code
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 17:41:22 +02:00
Carlos Jimenez Ruiz c16c93a75a updated fixtures for item
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:34:17 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 14:15:28 +02:00
Carlos Jimenez Ruiz f0fbb13af8 fixtures to english changes + e2e amends
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 10:38:53 +02:00
Carlos Jimenez Ruiz 2b83abeefd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 10:13:02 +02:00
Joan Sanchez e6e91ced99 2905 - Restore ticket shipped and landed 2021-05-13 08:56:26 +02:00
Carlos Jimenez Ruiz 457d23dc16 reoute tickets order columns + endpoint refactor 2021-05-12 09:51:32 +02:00
Joan Sanchez dc44af148d 2863 - Added sales monitor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-11 09:43:15 +02:00
Joan Sanchez 29b5cac351 Fixtures for supplier 442
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 09:48:28 +02:00
Joan Sanchez d77e06a5a0 Changed city name
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 08:30:21 +02:00
Joan Sanchez 5445764043 Added supplier address fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 08:26:05 +02:00
Carlos Jimenez Ruiz 5931dd238c Anomalous trigger disabled 2021-04-15 10:43:28 +02:00
Carlos Jimenez Ruiz 2d041142c3 Merge branch 'dev' into 2631-notify_incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 09:30:05 +00:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 07:45:00 +02:00
Joan Sanchez 41ee6e70a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-01 08:42:02 +02:00
Joan Sanchez 50f1fd30aa Risk tolerance fixture
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 13:15:42 +02:00
Joan Sanchez d66cf68e89 Fixed table error
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 12:28:43 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz a78a73486a updated routes fixtures and fixed tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 13:19:11 +01:00
Carlos Jimenez Ruiz 1d521fa9a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2705-route_tickets_refactor 2021-03-16 10:57:24 +01:00
Carlos Jimenez Ruiz fb418edc7b backend modifications for route tickets 2021-03-15 11:32:17 +01:00
Joan Sanchez d275dcfafd Fix for procedure changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 09:45:48 +01:00
Joan Sanchez f92db8c5a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 08:52:07 +01:00
Carlos Jimenez Ruiz 0cb7ddd9ce ticket.total with and witout VAT refactor 2021-03-10 19:25:26 +01:00
Joan Sanchez b39ec70a2c Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:54:14 +00:00
Joan Sanchez 5cbd8d632d Changes 2021-03-09 10:01:40 +01:00
jorgebl 5972526327 Merge branch '2791-item_botanical_remove_field' of https://gitea.verdnatura.es/verdnatura/salix into 2791-item_botanical_remove_field
gitea/salix/pipeline/head This commit looks good Details
2021-03-05 08:05:23 +01:00
jorgebl 4a22cd5f85 db changes and acl for logistic boss on section item-botanical 2021-03-04 20:09:35 +01:00
Joan Sanchez 49fbecfc59 Exported db
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 08:41:42 +01:00
jorgebl 92db67292c Removed botanical field and changes "edi" for "vn"
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:56:31 +01:00
Joan Sanchez 0b532880c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-04 07:54:15 +01:00
Joan Sanchez e50dcf467f Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-03 12:21:04 +01:00
Joan Sanchez fed3657487 Export changes & backtest fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-02 14:59:02 +01:00
Joan Sanchez 718021cff8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index 2021-03-01 11:49:31 +01:00
Joan Sanchez 84c82ed32d 2595 - Added invoiceIn module
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 15:03:11 +01:00
Joan Sanchez dcad6dc8c8 Merge branch 'dev' into 2725-ticket-create-crear-shimpent
gitea/salix/pipeline/head This commit looks good Details
2021-02-10 07:21:29 +00:00
Javi Gallego 3a3dae179c done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 07:58:11 +01:00
Joan Sanchez c092bf58b4 Import buys
gitea/salix/pipeline/head This commit looks good Details
2021-02-09 07:59:55 +01:00
Carlos Jimenez Ruiz 76d6e2d4b7 worker added to supplier basic data and summary 2021-02-05 15:26:49 +01:00
Carlos Jimenez Ruiz c442eaa0c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-29 09:13:58 +01:00
Bernat Exposito 01c96272bd export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-26 10:55:30 +01:00
Joan Sanchez a6e4d68017 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-22 15:05:39 +00:00
Carlos Jimenez Ruiz a53231c721 amends
gitea/salix/pipeline/head This commit looks good Details
2021-01-21 10:44:43 +01:00
Joan Sanchez c9dc9495dc 2677 - Added rating component to order catalog
gitea/salix/pipeline/head This commit looks good Details
2021-01-20 13:51:30 +01:00
Javi Gallego ea6e234cde minor fixes
gitea/salix/pipeline/head This commit looks good Details
2021-01-11 08:01:57 +01:00
Javi Gallego 6c2138a69a Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 15:24:05 +01:00
Bernat Exposito a2550ce128 export table payment
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 10:24:41 +01:00
Javi Gallego b5cd4e3c9f Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:44:13 +01:00
Javi Gallego 1884dc8789 fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-08 09:43:36 +01:00
Bernat Exposito 779b229dfc refactor tag fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 12:11:14 +01:00
Javi Gallego c0cc91b6c3 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 09:11:34 +01:00
Bernat Exposito 6179921978 export production
gitea/salix/pipeline/head This commit looks good Details
2021-01-07 08:37:56 +01:00
Javi Gallego 0d5540b639 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-29 17:00:45 +01:00
Bernat Exposito a21476e3df fix searchbar index
gitea/salix/pipeline/head This commit looks good Details
2020-12-23 12:42:41 +01:00
Javi Gallego 36bace2a94 Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 07:42:28 +01:00
Javi Gallego 340927799c Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 09:53:00 +01:00
Javi Gallego 3a6d62ac7d xdiario
gitea/salix/pipeline/head This commit looks good Details
2020-12-21 09:52:27 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +01:00
Carlos Jimenez Ruiz 177d3cd35b fixtures amended for calendar testing
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 13:16:44 +01:00
Javi Gallego 87adbbfa3c Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 08:21:36 +01:00
Bernat Exposito 0b5a98c2fe export production
gitea/salix/pipeline/head This commit looks good Details
2020-12-17 15:17:03 +01:00
Joan Sanchez 5ecd589106 Updated delivery note
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 09:24:11 +01:00
Javi Gallego 2bb9125eee Merge branch 'dev' into 2517-clientBalanceCompensaciones
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:34:54 +01:00
Javi Gallego 963db11686 funcionalidad
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 08:33:08 +01:00
Joan Sanchez 59c622481f Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-10 13:21:11 +01:00
Joan Sanchez 260b502cd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-10 07:30:31 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Bernat Exposito 06e7583f2b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-25 12:47:17 +01:00
Bernat Exposito 78f25e0b46 export production 2020-11-25 12:37:44 +01:00
Javi Gallego b23a441f31 fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 12:20:58 +01:00
Joan Sanchez d40ea52560 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:06:34 +01:00
Joan Sanchez 7693a1c449 2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-20 15:05:57 +01:00
Joan Sanchez 8a3f5345f4 Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 13:54:47 +00:00
Joan Sanchez 359dcc904d Version merge
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 09:08:39 +01:00
Joan Sanchez 8194801308 Supplier cargo migration to vn
gitea/salix/pipeline/head This commit looks good Details
2020-11-16 08:48:42 +01:00
Bernat Exposito 6fc14d569c Merge branch 'dev' into 2575-image_download
gitea/salix/pipeline/head This commit looks good Details
2020-11-13 08:32:39 +00:00
Bernat Exposito 5be616ad91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-11-12 08:04:38 +01:00
Bernat Exposito 1e95f0105a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download 2020-11-11 10:52:46 +01:00
Bernat Exposito 75ffa108fb refactor back download 2020-11-11 10:52:35 +01:00
Bernat Exposito e4e4f37609 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-10 08:46:37 +01:00
Bernat Exposito 4ea5993dcc user image 2020-11-10 08:39:34 +01:00
Joan Sanchez 4c88a46b63 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2574-itemTag_refactor 2020-11-05 09:12:25 +01:00
Joan Sanchez a325ef2a78 2574 - ItemTag refactor sourceTable
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-04 11:29:10 +01:00
Carlos Jimenez Ruiz d533e9da2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-03 09:22:07 +01:00
Bernat Exposito 8976034bb0 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-03 08:15:49 +01:00
Bernat Exposito f2ee122778 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2557-export_production 2020-11-03 07:51:25 +01:00
Joan Sanchez 413283288f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 15:38:23 +01:00
Bernat Exposito b2d69127cb Merge branch 'dev' into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 14:31:36 +00:00
Joan Sanchez 15b7280222 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 14:31:39 +01:00
Joan Sanchez 590de622f5 Added model validations 2020-11-02 14:30:33 +01:00
Bernat Exposito 7e2555ddf1 export production 2020-11-02 10:58:27 +01:00
Bernat Exposito d6c5e0ef0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2565-address_fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-11-02 09:27:35 +01:00
Carlos Jimenez Ruiz 117270e3fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-11-02 09:19:23 +01:00
Joan Sanchez 565bd013bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2563-supplier_fiscalData 2020-11-02 08:32:46 +01:00
Bernat Exposito 459f4068ab fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 11:05:16 +01:00
Javi Gallego b50ae7b8ca testback arreglados
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 15:50:59 +01:00
Joan Sanchez 245b32a47f Added section
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-30 15:11:45 +01:00
Bernat Exposito 39de960b9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2538-supplier_contact 2020-10-30 10:23:47 +01:00
Bernat Exposito 7200aa3dfc fixtures and sql for supplierContact 2020-10-30 10:23:42 +01:00
Javi Gallego 59cbe276f4 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 10:08:38 +01:00
Javi Gallego 31b5a140d4 test completados 2020-10-30 10:07:53 +01:00
Javi Gallego 3fdc9c315d Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:40:47 +01:00
Bernat Exposito ea8d9e70b0 supplier log
gitea/salix/pipeline/head This commit looks good Details
2020-10-30 08:27:02 +01:00
Bernat Exposito 792b689b58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2539-supplier_log 2020-10-29 13:40:21 +01:00
Bernat Exposito Domenech a5e6f99b1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-29 08:06:50 +01:00
Bernat Exposito Domenech 77bc1b562e create section supplier log
gitea/salix/pipeline/head This commit looks good Details
2020-10-28 09:08:27 +01:00
Joan Sanchez 3675f7ed34 2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good Details
2020-10-26 12:16:57 +01:00
Bernat Exposito Domenech 58168e78ab test, translate and supplier searpanel, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-26 08:38:43 +01:00
Bernat Exposito Domenech fe2f12cd8f first test step 2020-10-22 09:35:11 +02:00
Javi Gallego ef7a886d86 Merge branch 'dev' into 2510-client-address-create-test
gitea/salix/pipeline/head This commit looks good Details
2020-10-21 10:13:04 +02:00
Bernat Exposito Domenech 7eed2ddd59 export structure and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-10-20 12:47:37 +02:00
Bernat Exposito Domenech cc35998f62 new module supplier, created section index and searchpanel
gitea/salix/pipeline/head This commit looks good Details
2020-10-15 08:15:04 +02:00
Javi Gallego 77064d85a0 Merge branch 'dev' into 2443
gitea/salix/pipeline/head This commit looks good Details
2020-10-05 12:54:02 +00:00
Joan Sanchez 420dfdbdff Send notification by email
gitea/salix/pipeline/head This commit looks good Details
2020-10-02 12:23:48 +02:00
Javi Gallego 78e22df177 test e2e de expense ok
gitea/salix/pipeline/head This commit looks good Details
2020-10-01 16:45:28 +02:00
Bernat Exposito Domenech 5f9ef3aea3 export structure db
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 07:37:29 +02:00
Joan Sanchez 0438171a47 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech 790c9bfe6f update models and fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 14:50:04 +02:00
Joan Sanchez de3c7acb08 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-24 12:30:44 +00:00
Bernat Exposito Domenech ce1c4e6f60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-22 14:00:52 +02:00
Juan Ferrer 81de97c071 Merge branch 'dev' into 2381-mariaDB 2020-09-21 18:33:28 +02:00
Juan Ferrer 9528fe0a19 Merge branch 'dev' into 2381-mariaDB 2020-09-21 17:47:55 +02:00
Juan Ferrer 5e056c315f Tests fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 17:46:40 +02:00
Juan Ferrer 1c621cff85 Fixtures fixes 2020-09-21 16:43:17 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Juan Ferrer b9c526c29c LDAP user & role syncronization
gitea/salix/pipeline/head This commit looks good Details
2020-09-21 13:24:43 +02:00
Carlos Jimenez Ruiz f50f4514fd fixtures enhanced for tags
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 11:11:18 +02:00
Joan Sanchez 1f1b09d456 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 14:14:13 +02:00
Carlos Jimenez Ruiz bf17d428e4 entry basic data + some minor refactors
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:51:58 +02:00
Juan Ferrer 61f3f82117 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:39:02 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Carlos Jimenez Ruiz 270e665291 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color 2020-09-10 14:38:48 +02:00
Bernat Exposito Domenech 0cf99a5a83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech 87fab5f57c delete duplicated fixtures 2020-09-10 11:34:32 +02:00
Bernat Exposito Domenech 4f50106e92 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 08:08:00 +02:00
Bernat Exposito Domenech fb3f01151c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 13:49:03 +02:00
Bernat Exposito Domenech 9ff7232b50 export production and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech ed926c39a1 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 11:27:00 +02:00
Bernat Exposito Domenech d90fb3444c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-08 08:30:00 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 07:17:23 +02:00
Carlos Jimenez Ruiz c3c7ef901a version pre-hex in vn.ink table
gitea/salix/pipeline/head This commit looks good Details
2020-09-04 12:40:23 +02:00
Carlos Jimenez Ruiz c796132e77 e2e + fixtures amended + refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-02 15:20:28 +02:00
Carlos Jimenez Ruiz 9fa3f17a9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section 2020-09-01 17:45:00 +02:00
Javi Gallego b4952002a3 Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
gitea/salix/pipeline/head This commit looks good Details
2020-09-01 06:49:09 +00:00
Javi Gallego daee9081d1 test excepto invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2020-08-31 12:29:51 +02:00
Javi Gallego 8b26c41b7f campo packageFk
gitea/salix/pipeline/head This commit looks good Details
2020-08-28 17:06:27 +02:00
Carlos Jimenez Ruiz c70ad808a0 refactor
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 17:54:43 +02:00
Carlos Jimenez Ruiz d156ca95ba front and back unit tests 2020-08-27 15:14:30 +02:00
Joan Sanchez 17542472da 2391 - Editable description
gitea/salix/pipeline/head This commit looks good Details
2020-08-27 08:24:21 +02:00
Joan Sanchez 4d8a84e774 Fixed back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-08-20 08:45:03 +02:00
Carlos Jimenez Ruiz 3a723a2e3d zone descriptor e2e
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 15:35:50 +02:00
Bernat Exposito Domenech 0d689a8c01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-08-13 10:43:25 +02:00
Bernat Exposito Domenech 689245c27d fix test
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 14:23:13 +02:00
Bernat Exposito Domenech f180b73656 delete deprecated sql
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 13:18:55 +02:00
Bernat Exposito Domenech 1e56619c33 export structure and fix test 2020-08-12 13:07:58 +02:00
Bernat Exposito Domenech 96af9bdcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 11:12:52 +02:00
Bernat Exposito Domenech 9a4e20bb31 new models and fixtures 2020-08-11 11:03:43 +02:00
Juan Ferrer bbc5193970 #2381 First working version
gitea/salix/pipeline/head This commit looks good Details
2020-08-07 14:35:20 +02:00
Carlos Jimenez Ruiz 9402f368f6 ticket index and zone descriptor refactor
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 12:51:19 +02:00
Joan Sanchez cfceaa531e Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:18:22 +00:00
Bernat Exposito Domenech 064b950773 export production
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech f7100f11ee first step add right menu in ticket components 2020-07-16 07:43:07 +02:00
Bernat Exposito Domenech 7d6ac265b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index 2020-07-09 08:17:03 +02:00
Joan Sanchez 53d672152b Merge branch 'dev' into 2343-exportar_produccion
gitea/salix/pipeline/head This commit looks good Details
2020-07-07 06:19:12 +00:00
Bernat Exposito Domenech 122dacffb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech c42c6c19d6 changes in order index
gitea/salix/pipeline/head This commit looks good Details
2020-07-02 07:46:55 +02:00
Joan Sanchez 0a327087ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 11:57:16 +02:00
Javi Gallego 039eec7d26 test excepto fallo e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 10:16:22 +02:00
Bernat Exposito Domenech ea1eb16060 export structure
gitea/salix/pipeline/head This commit looks good Details
2020-06-29 07:32:08 +02:00
Joan Sanchez beb1dd4973 absenceType fixture
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-27 12:16:56 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:18:19 +02:00
Bernat Exposito Domenech b3eba1c75a fix dbtest and export production
gitea/salix/pipeline/head This commit looks good Details
2020-06-02 13:53:54 +02:00
Bernat Exposito Domenech 8c2f57e380 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2226-item_last_entries
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 15:26:04 +02:00
Bernat Exposito Domenech 52241e6f2c update itemLastENtries 2020-05-21 15:26:00 +02:00
Bernat Exposito Domenech d4dd5eae0c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 14:06:51 +02:00
Bernat Exposito Domenech 8ca12d9fdd fix bugs in travel summary 2020-05-20 13:19:02 +02:00
Javi Gallego 692af6078c Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2020-05-19 10:21:33 +00:00
Javi Gallego a7e6e3d4b7 cr juan
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 08:46:42 +02:00
Joan Sanchez 4aea769797 2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 13:46:45 +02:00
Joan Sanchez 53b55468fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1833-claim_action_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 11:45:43 +02:00
Joan Sanchez 42bec3a944 1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 14:47:19 +02:00
Bernat Exposito Domenech 5ceb26c6da update structure and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 13:11:23 +02:00
Javi Gallego 3815edfbea falta CR
gitea/salix/pipeline/head This commit has test failures Details
2020-05-15 12:17:34 +02:00
Joan Sanchez 2ad14230b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into app_voz
gitea/salix/pipeline/head This commit looks good Details
2020-04-17 14:22:46 +02:00
Javi Gallego ea1cc68d29 test passed
gitea/salix/pipeline/head This commit looks good Details
2020-04-03 17:52:47 +02:00
Ainki 42f3bfb86d test, fitxures and changes
gitea/salix/pipeline/head This commit looks good Details
2020-03-30 14:28:29 +02:00
Javi Gallego 729daf8b34 Merge branch 'dev' into zone-deliveryDays-quitar-campo-provincia
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 12:16:47 +01:00
Joan Sanchez d640b66ef5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 11:22:00 +01:00
Joan Sanchez d4ca58edad Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-27 09:10:30 +01:00
Javi Gallego 0a8272a730 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into zone-deliveryDays-quita
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:52:41 +01:00
Javi Gallego d53cedd5d4 preparado para PR
gitea/salix/pipeline/head This commit looks good Details
2020-03-26 17:41:40 +01:00
Joan Sanchez f231fabef1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
gitea/salix/pipeline/head This commit looks good Details
2020-03-25 16:14:13 +01:00
Juan Ferrer 84bf240e71 All tests passed, but some intermittence in e2e
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 23:57:11 +01:00
Joan Sanchez 27b1376799 changes
gitea/salix/pipeline/head This commit has test failures Details
2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech a19a0578e9 structure DB
gitea/salix/pipeline/head This commit looks good Details
2020-03-16 10:25:49 +01:00
Joan Sanchez fd91c3061a Merge branch '2149-dbTest_workerTimeControl_check' of verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-06 11:19:26 +00:00
Carlos Jimenez Ruiz 0f3ceea653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2037_getWorkedHours_db_test
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 15:13:03 +01:00
Carlos Jimenez Ruiz 0179461cb3 timeBusiness and timeControl db tests 2020-03-04 15:12:36 +01:00
Joan Sanchez 516b112354 Merge branch '2034-postcode_autocomplete' of verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-03-04 12:15:41 +00:00
Joan Sanchez d6278e0df9 2164 - Show confirmation only when data is not empty
gitea/salix/pipeline/head This commit looks good Details
2020-03-04 09:26:12 +01:00
Joan Sanchez f16553ecba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2034-postcode_autocomplete 2020-03-03 13:59:33 +01:00
Joan Sanchez 04917f980f Updated E2E
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 09:30:54 +01:00
Bernat Exposito Domenech 5e86f67b37 dbtest workerTimeControCheck 2020-03-02 08:18:41 +01:00
Joan Sanchez 28553a1c0d Worker dms changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-02 07:50:07 +01:00
Bernat Exposito Domenech 79fca8b70b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor 2020-02-24 09:25:39 +01:00
Joan Sanchez 224241a954 Merge branch '2038-entry_descriptor_vista_impresion' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-02-24 08:02:51 +00:00
Bernat Exposito Domenech 50a8da2064 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2056-entry_descriptor
gitea/salix/2056-entry_descriptor This commit looks good Details
2020-02-21 12:48:37 +01:00
Bernat Exposito Domenech 9779c6d2ba entry summary and descriptor 2020-02-21 12:48:34 +01:00
Javi Gallego 4d389176fe Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2020-02-21 08:50:50 +01:00
Javi Gallego a8137c8a6b zoneClosure 3
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2020-02-20 15:15:50 +01:00
Carlos Jimenez Ruiz 587653fb40 #2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good Details
2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech aecfe2b8a9 report entry-order 2020-02-20 09:31:09 +01:00
Bernat Exposito Domenech 3f978bd32b entry index refactor
gitea/salix/2122-entry_index This commit looks good Details
2020-02-18 10:33:17 +01:00
Joan Sanchez fe8a0b4583 Added translation. taxClassCode.sql removed
gitea/salix/2113-item_data_add_instrastat This commit looks good Details
2020-02-18 07:21:35 +01:00
Joan Sanchez 844b27acb9 2118 - Create new intrastat
gitea/salix/2113-item_data_add_instrastat There was a failure building this commit Details
2020-02-17 12:47:03 +01:00
Bernat Exposito Domenech b78858eb7c export structure db
gitea/salix/2105-export_structure_db This commit looks good Details
2020-02-13 09:30:18 +01:00
Bernat Exposito Domenech 1887cc8c60 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2105-export_structure_db 2020-02-13 08:44:25 +01:00
Bernat Exposito Domenech 4abf87552d db production exported 2020-02-12 14:38:51 +01:00
Carlos Jimenez Ruiz 2a7f826cf6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2006-e2e-route-summary
gitea/salix/2006-e2e-route-summary This commit looks good Details
2020-02-12 14:36:14 +01:00
Carlos Jimenez Ruiz e8a178d5f4 #2006 e2e route.summary plus refactors 2020-02-12 14:36:05 +01:00
Bernat Exposito Domenech e0f7b917d7 db test ticket_recalcComponent
gitea/salix/1893-dbTest_ticket_recalcComponents This commit looks good Details
2020-02-12 10:39:46 +01:00
Joan Sanchez c174d0a29e acl fix
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-29 14:50:53 +01:00
Joan Sanchez 35e443a112 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2003-adress_validate_uee_members 2020-01-28 09:03:33 +01:00
Joan Sanchez 0044bd2efa updated tests
gitea/salix/2003-adress_validate_uee_members There was a failure building this commit Details
2020-01-28 09:03:20 +01:00
Bernat Exposito Domenech 849faad6ea add m3Max in agency.basicData
gitea/salix/2022-update_model_zone This commit looks good Details
2020-01-27 09:45:13 +01:00
Joan Sanchez 921af4dcc2 Merge branch '2014-remove_bi_from_db' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-24 12:52:30 +00:00
Bernat Exposito Domenech 2bcd0caa06 update structure db 2020-01-24 12:55:54 +01:00
Javi Gallego 08fda3ed1b #workedHours
gitea/salix/%232037-worked-hours This commit looks good Details
2020-01-24 12:38:08 +01:00
Joan Sanchez 25ffa839a2 added incoterms & customs agent to address forms
gitea/salix/2003-adress_validate_uee_members This commit has test failures Details
2020-01-24 09:47:24 +01:00
Joan Sanchez deada69ca4 Added models
gitea/salix/2003-adress_validate_uee_members This commit looks good Details
2020-01-23 14:59:37 +01:00
Bernat Exposito Domenech 6700daf0e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good Details
2020-01-23 12:58:47 +01:00
Bernat Exposito Domenech 64bd721287 update structure db 2020-01-23 12:58:38 +01:00
Bernat Exposito 6c0cc3d204 Merge branch '1982-travel_add_thermograph' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-23 10:00:58 +00:00
Bernat Exposito Domenech 2790cc8057 update structure
gitea/salix/2012-2013_update_structure_bi This commit looks good Details
2020-01-22 14:34:45 +01:00
Joan Sanchez 77f6333aba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph 2020-01-21 12:23:10 +01:00
Joan Sanchez f0b4c26aea added travel thermograph create & remove methods
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 12:21:53 +01:00
Joan Sanchez 20b4f6ec74 updated tests
gitea/salix/dev This commit looks good Details
2020-01-21 09:33:26 +01:00
Joan Sanchez 5e4ab8b128 Loggable errors
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-21 09:00:42 +01:00
Joan Sanchez 41e69a2e9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1982-travel_add_thermograph
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-20 13:05:06 +01:00
Bernat Exposito Domenech 0fe0596b3e worker phone refactor 2020-01-20 11:03:40 +01:00
Joan Sanchez 4002b51565 added section
gitea/salix/1982-travel_add_thermograph There was a failure building this commit Details
2020-01-17 08:43:10 +01:00
Joan Sanchez 1704f5e93b Merge branch '2011-client_phone' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-17 06:48:57 +00:00
Bernat Exposito Domenech 74b688dc4b client phone refactor
gitea/salix/2011-client_phone This commit looks good Details
2020-01-17 07:24:57 +01:00
Joan Sanchez 3cba6f0293 Translated family names
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 14:35:40 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech 1307f6c5fb update structure
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit Details
2020-01-15 13:43:38 +01:00
Bernat Exposito Domenech 1f60aac446 export structure db
gitea/salix/1999-travel_basicData This commit looks good Details
2020-01-15 08:19:22 +01:00
Carlos Jimenez Ruiz 83d2ec40d4 Merge branch '1985-apply_item_type_filter' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2020-01-09 10:50:26 +00:00
Bernat Exposito Domenech d432c32577 export production and create new models
gitea/salix/1980-models_Thermograph This commit looks good Details
2020-01-09 10:49:09 +01:00
Joan Sanchez 5a7bd4e18f filters refactor
gitea/salix/1985-apply_item_type_filter There was a failure building this commit Details
2020-01-08 12:27:18 +01:00
Bernat Exposito Domenech 730b8e160f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1947-route_basic_data 2020-01-07 08:30:55 +01:00
Bernat Exposito Domenech 814c96434e routebasic 2020-01-03 14:31:02 +01:00
Joan Sanchez 8a36e0913f changed fixtures for dynamic holidays
gitea/salix/1924-worker_calendar_dynamic_holidays This commit looks good Details
2020-01-03 08:43:03 +01:00
Joan Sanchez a5eb8e5315 extended worker contract ranges & fixed invoice
gitea/salix/dev There was a failure building this commit Details
2020-01-02 11:10:26 +01:00
Joan Sanchez 8f92abe49c fixed procedure bug
gitea/salix/1967-worker_time_control_worked_hours This commit looks good Details
2019-12-31 14:01:05 +01:00
Joan Sanchez 417642ac9e updated UserPhone acl
gitea/salix/dev This commit looks good Details
2019-12-31 11:07:46 +01:00
Joan Sanchez 0ece53a35e Send chat message with user avatar
gitea/salix/1958-send_chat_with_avatar This commit looks good Details
2019-12-27 08:49:51 +01:00
Bernat Exposito Domenech 0827b998a1 update structure sql
gitea/salix/1932-delete_scheme_bs This commit looks good Details
2019-12-23 15:15:58 +01:00
Bernat Exposito Domenech e9d416671d update fixtures and structure db
gitea/salix/1960-update_structure_db This commit looks good Details
2019-12-20 13:51:04 +01:00
Joan Sanchez 72d591e143 sql changes
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:59:17 +01:00
Joan Sanchez b9415c0335 updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good Details
2019-12-20 10:40:12 +01:00
Bernat Exposito Domenech aab970e667 client.phone section
gitea/salix/1928-client_phone This commit looks good Details
2019-12-17 09:11:28 +01:00
Bernat Exposito Domenech c1db827889 update structure db
gitea/salix/1930-turn_view_in_tables This commit looks good Details
2019-12-16 11:33:10 +01:00
Bernat Exposito Domenech e4c17492f0 update structure
gitea/salix/1926-delete_bs This commit looks good Details
2019-12-16 09:22:59 +01:00
Bernat Exposito Domenech d66519a39f set autoincrement db to one
gitea/salix/1926-delete_bs This commit has test failures Details
2019-12-16 08:48:12 +01:00
Bernat Exposito Domenech ff117c1811 merge conflicts structure.sql
gitea/salix/1707route.ticket This commit looks good Details
2019-12-13 09:06:39 +01:00
Bernat Exposito Domenech dd86961542 update structure
gitea/salix/1907manaSpellers This commit looks good Details
2019-12-13 08:46:40 +01:00
Bernat Exposito 6d1bd7575d Merge branch '1925excludeTables' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-13 06:17:03 +00:00
Juan Ferrer d61b08ed10 Merge branch '1922-mysql8' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-12-12 13:49:05 +00:00
Bernat Exposito Domenech e8c216799c update estructure
gitea/salix/1925excludeTables This commit looks good Details
2019-12-12 14:28:58 +01:00
Joan Sanchez 62aae9ce14 removed password from fixtures
gitea/salix/1920-remove-sms-password This commit looks good Details
2019-12-12 09:46:29 +01:00
Juan Ferrer 3428dfa6e0 Migration complete & test 2019-12-11 15:01:01 +01:00
Bernat Exposito Domenech d0a2f4627b 1707 route.ticket sistema tablas que soporte dirección salida para warehouses
gitea/salix/1707route.ticket This commit looks good Details
2019-12-10 12:42:14 +01:00
Bernat Exposito Domenech f6eabc81da add models and update structure db
gitea/salix/1834createTravelModels This commit looks good Details
2019-12-05 14:20:11 +01:00
Bernat f38210ddd2 udate structure db 2019-12-04 11:09:36 +01:00
Bernat 89e127f0ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1904delete_vn2008_references
gitea/salix/1904delete_vn2008_references This commit looks good Details
2019-11-26 14:26:50 +01:00
Bernat 18b5342609 update fixtures and structure db 2019-11-26 14:15:43 +01:00
Bernat Exposito a4a48e76a4 Merge branch '1762-worker_dms' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-25 08:33:04 +00:00
Joan Sanchez f9dba9489f updated tests
gitea/salix/1762-worker_dms This commit looks good Details
2019-11-25 09:17:24 +01:00
Bernat 5040d1d4a8 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-22 14:34:28 +01:00
Joan Sanchez a077dd5165 test unitario
gitea/salix/1762-worker_dms There was a failure building this commit Details
2019-11-22 14:34:20 +01:00
Bernat 1ce0c63bf2 1711Eliminar_referencias_vn2008
gitea/salix/1711Eliminar_referencias_vn2008 This commit looks good Details
2019-11-22 08:23:31 +01:00
Bernat 038ba3edb2 1711 update structure db 2019-11-21 13:18:30 +01:00
Carlos Jimenez Ruiz 8202a6f419 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
gitea/salix/1891-worker_time_control_tests This commit looks good Details
2019-11-21 11:17:17 +01:00
Joan Sanchez 56a73f152e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 09:33:10 +01:00
Joan Sanchez 5f28d39bbf dynamic header & footer texts by company #1336 2019-11-21 09:33:08 +01:00
Carlos Jimenez Ruiz c04640bd62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests 2019-11-21 09:19:15 +01:00
Carlos Jimenez Ruiz 52a8d5e0c2 #1891 tests for worker time control function 2019-11-21 09:19:03 +01:00
Bernat 0473f1de82 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-21 09:09:17 +01:00
Bernat 525e115781 #1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good Details
2019-11-21 07:24:31 +01:00
Bernat ee3a83ac0a update structure and fixtures 2019-11-19 13:40:29 +01:00
Bernat b608273510 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-19 12:51:11 +01:00
Bernat 99585b9cc9 fix fixtures 2019-11-19 12:50:50 +01:00
Joan Sanchez 3d90e80c82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-11-19 11:53:04 +01:00
Joan Sanchez f9deb9f52d send closure error by email 2019-11-19 11:53:01 +01:00
Bernat 12825f0503 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-11-19 11:43:00 +01:00
Bernat 0b58b5d09a update fixtures tblContadores 2019-11-19 11:40:46 +01:00
Carlos Jimenez Ruiz 04b4f60c48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-18 16:35:21 +01:00
Juan Ferrer 4d4e4f31f4 vnZoneEvents refactor
gitea/salix/dev This commit looks good Details
2019-11-18 16:31:37 +01:00
Carlos Jimenez Ruiz 8629b72d55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-14 14:22:22 +01:00
Carlos Jimenez Ruiz 34bd35ce4e #1852 worker.time-control 2019-11-14 14:20:05 +01:00
Joan Sanchez e0ed9072c9 unified LCR and CORE #1868
gitea/salix/dev This commit looks good Details
2019-11-14 08:16:52 +01:00
Joan Sanchez 236dcbf207 changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good Details
2019-11-13 13:22:39 +01:00
Bernat a3159f7dbd dumped data updated
gitea/salix/dev This commit looks good Details
2019-11-13 10:41:14 +01:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-13 08:09:54 +01:00
Bernat 7cbbc4c18e #1870 exportar produccion a la local
gitea/salix/dev This commit looks good Details
2019-11-12 11:13:20 +01:00
Joan Sanchez 963ac3ad77 dumpedfixtures rollback
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-11 11:56:13 +01:00
Joan Sanchez 6f7962935d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor 2019-11-11 11:24:26 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-07 11:19:05 +01:00
Javi Gallego 729f6cb767 changes to zone
gitea/salix/test This commit looks good Details
gitea/salix/dev This commit looks good Details
2019-11-06 13:44:58 +01:00