Commit Graph

2339 Commits

Author SHA1 Message Date
Vicent Llopis 3fde11c3ed Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:06:39 +00:00
Alex Moreno 7e98a255b8 refs #4849 SQL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:11:01 +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
Alex Moreno ef6af87d89 feat: add supplier.isVies funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:21:21 +01:00
Alexandre Riera 153cb48ff0 fix test
gitea/salix/pipeline/head This commit looks good Details
2022-11-17 08:55:35 +01:00
Pau 8059e54a26 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:54:47 +00:00
Alexandre Riera 566d384483 Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 13:46:20 +01:00
Alexandre Riera e4a6585b6a fix test back 2022-11-16 13:46:16 +01:00
Pau 5b4c1ad4e6 Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:26:59 +01:00
Pau 6ab28678c5 Removed unused require and insert statement
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:56:03 +01:00
Pau 0f0c4c0554 feat(save-sign implemented in salix back, refs 3681 @2h
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:28:13 +01:00
Alexandre Riera 294f806bd9 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-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:46:35 +01:00
Pau 7b3a1bfb22 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 08:28:12 +01:00
Pau 8e7e7901af Implement needed functions refs #3681 @1h 2022-11-16 08:11:29 +01:00
Alexandre Riera 7c8178b423 Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:07:20 +00:00
Pau d7dc7c4329 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 06:08:01 +00: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
Vicent Llopis c200e1af32 refactor: optimizado select
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +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 8dcd567a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 13:20:52 +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
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:39:03 +00:00
Pau 6339634756 refs #4457 move sql, remove await on front @2h 2022-11-15 10:37:12 +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 72400ebf02 change folder db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 09:37:14 +01:00
Alexandre Riera 5acbaf036a refs #3557 back and test done
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 09:30:36 +01:00
Pau 9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:49:21 +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
Pau 29b299f36a Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 06:10:31 +00:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:30:35 +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
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Pau 58c90b3bbc refs #288
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 13:41:22 +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 163f7fd284 Added version 10503
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:31:45 +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
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +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
Alex Moreno 4c216c4556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:40:55 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +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
Pau 56201f4c1a Start implementing method refs #3681 @3h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:37:16 +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
Alex Moreno 517422be8c refactor: not use axios
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:32:07 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau 1327f0ae9d Added requested changes, refs #4507 @1:20h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:18:05 +01:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Vicent Llopis 79e9edcee9 delete: old code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-09 09:26:28 +01:00
Vicent Llopis 9bcfebcae6 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-09 07:26:56 +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
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 13:59:00 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 12:26:01 +01:00
Pau f21907855f Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente 2022-11-08 10:04:47 +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 d1be14605b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk 2022-11-08 09:32:09 +01:00
Pau 78e6c8da15 Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-08 09:08:06 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +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
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +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
Joan Sanchez 92a2367db2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:52:53 +01:00
Joan be1fbc4d68 Added version 10502
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:49:17 +01:00
Joan 17d6308126 Already on prod 2022-11-07 10:48:38 +01:00
Alex Moreno c3ee9da6c6 hotFix: force apply changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:18:32 +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
Alex Moreno 5051f8b590 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-07 07:24:44 +01:00
Vicent Llopis 98cc2b5866 refactor: endpoint 2022-11-04 13:41:38 +01:00
Joan Sanchez 1bcde47ab1 Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1110
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-04 10:42:32 +00:00
Joan Sanchez 2afb47fe14 Added version 10501 - November
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 10:01:23 +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
Vicent Llopis b6d3a08871 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 10:17:46 +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
Alex Moreno 67697784cd Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 06:48:38 +00:00
Pau 30fb8b1bd2 Merge branch 'dev' into 1885-delete-orderConfirmUser.spec.js
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 06:30:47 +00:00
Vicent Llopis 35c50cb314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs 2022-11-03 07:11:54 +01: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 8c4e70c11d Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:06:06 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Alex Moreno 943103c254 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:33:45 +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 c1ed0f2226 Merge branch 'dev' into changesInCorrectFolder
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:58:32 +00:00
Alex Moreno 2c3b735650 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-11-02 13:49:09 +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 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +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
Joan Sanchez 2fba17ab15 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 09:33:27 +00:00
Joan Sanchez fe3ebe8e0c Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:43:43 +00:00
Joan Sanchez 33c92a0f24 Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1076
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-02 06:34:49 +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
Alex Moreno a7b1ee85fe fix changes folder
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:27:57 +01:00
Alex Moreno e7047e982f fix e2e
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 15:07:22 +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 b37c257885 feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 14:13:06 +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
Pau 0739608de3 Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:57:50 +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
Pau 736de00e77 deleted the test as requested on #1885
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 09:18:00 +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 3ffc098b56 feat(privileges): check if user has role from userToUpdate
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 09:01:09 +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
Vicent Llopis fa89d1f944 fix: comentario corregido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 13:10:50 +02:00
Vicent Llopis 65e32f5e7f feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 12:40:13 +02:00
Vicent Llopis 350c516bb1 feat: cancelar petición cuando esta calculando el packaging
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 10:36:41 +02:00
Vicent Llopis 3110172c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice 2022-10-26 08:39:58 +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
Vicent Llopis 07a18dc736 delete sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:05:11 +02:00
Alex Moreno f07f0679d8 fix fixture
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:03:20 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02: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
Pau e72d57150a Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:40:57 +00:00
Alex Moreno ac8c4b8ef0 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:39:50 +00:00
Pau 7b04464848 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:00:13 +00:00
Joan Sanchez 1196125350 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-25 11:58:47 +02:00
Alex Moreno e1e13468a9 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-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Pau 76d248131c Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:25 +00:00
Pau 9089ba7346 requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:42:16 +02:00
Pau 23598c993b Change ACL from employee to hr
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:25:15 +02:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-25 07:25:07 +00:00
Vicent Llopis 7f1dd801a5 refactor: change ACLs
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:56:17 +02:00
Alex Moreno 7cb8175b73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-25 07:36:21 +02:00
Vicent Llopis d18b22bb05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:05:26 +02:00
Joan Sanchez e80754f280 Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 18:37:38 +02:00
Alex Moreno 9e0eab5a77 feat(invoiceIn): email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 15:15:23 +02:00
Vicent Llopis c77999871e refs #3951
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 14:34:17 +02:00
Alex Moreno a66c5e6798 acl
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 11:30:17 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 11:41:53 +02:00
Vicent Llopis 18c119c62a change acl
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:20:27 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Vicent Llopis 39f4445172 refator: endpoint name
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 07:23:57 +02:00
Alex Moreno 4b12405586 feat: report invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 15:15:54 +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
Pau 470b4485d5 Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:58:44 +02:00
Pau a204c6e2b0 Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:29:04 +02:00
Alex Moreno a5ceee07e9 use loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:50:16 +02:00
Pau 81088bc495 Fixed ACL
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:46:14 +02:00
Pau f481cc3c97 Capitalizar
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:38:40 +02:00
Pau c9e9e3545d Added ACL
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:33:48 +02: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
Pau 9290cd6fb6 Finished back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:02:18 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 12:07:34 +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
Pau dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:25:25 +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
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Alex Moreno 24cb8e00bb creates notification sql in changes
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 13:20:25 +02:00
Alex Moreno c78e222ee0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 10:09:57 +02:00
Vicent Llopis 9c52508a88 feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 08:40:22 +02:00
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:09:20 +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 8130cf9e6a feat: separate globalInvoicing in 2 parts
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 12:40:10 +02:00
Pau 51d3063849 Drop expedition itemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 10:53:15 +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 4fadc7e2a4 Added subversion
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 13:56:10 +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
Pau dde5eed9e2 DB fixtures 2022-10-06 13:34:06 +02: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
Vicent Llopis ddbe1057ad feat: add new section
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 09:47:53 +02:00
Joan Sanchez 1bf090b6ee Pass network name
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 09:09:49 +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
Joan Sanchez 3d36c0339a Merge branch 'dev' into 4592-jenkins_tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 12:05:10 +00: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
Joan Sanchez 8468eda05a run with network
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 12:47:37 +02:00
Joan Sanchez 627f0d762e attach to network
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 12:33:06 +02:00
Joan Sanchez 1cafbdab6e Connect to docker network
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 12:26:42 +02:00
Joan Sanchez e6512d00a1 Use port 3306
gitea/salix/pipeline/head This commit looks good Details
2022-10-05 12:16:59 +02:00
Joan Sanchez 0502f9ebf0 Log port
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 11:19:07 +02:00
Joan Sanchez 0ad583f22f Log host & port
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 11:14:49 +02:00
Joan Sanchez 0fccae0113 Network ip address
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 11:06:23 +02:00
Joan Sanchez 239c324eff Log network settings
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 11:03:48 +02:00
Joan Sanchez ee0938d7d6 Test
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 10:36:05 +02:00
Joan Sanchez 80d0b415ec Host log
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 10:28:07 +02:00
Joan Sanchez b0dac6c12d Use jenkins network
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 10:23:24 +02:00
Joan Sanchez 1534bdd188 Syntax error
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 10:16:17 +02:00
Joan Sanchez 13bfed6955 use jenkins network
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 10:06:11 +02:00
Joan Sanchez 98a2f79691 Run container on jenkins network
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-05 10:05:01 +02:00
Joan Sanchez 377a0f7228 Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:41:37 +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
Joan Sanchez c177c0366d Item PDF
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:35:49 +02:00
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Alex Moreno f81b2775a0 add fixture
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 09:36:51 +02:00
Alex Moreno e931414bb7 unnecessary code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 08:59:49 +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 3601881026 Client consumption queue
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:43:27 +02:00
Joan Sanchez 7a7ad6ac5f InvoiceOut_sendQueued
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 13:09:44 +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
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +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 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 13:53:33 +02:00
Joan Sanchez 664fd444cc Sample refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-22 15:44:35 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Joan Sanchez 71f8e73e55 Merge pull request '4155-close_tickets' (#1056) from 4155-close_tickets into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1056
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:46:24 +00: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
Vicent Llopis a330e9d64a refactor: change acl
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 12:02:04 +02:00
Vicent Llopis 6367f1ef05 refator: delete sensitive info
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 11:46:55 +02:00
Vicent Llopis afeed9757c refactor: change acl
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 10:39:59 +02:00
Vicent Llopis a695468bb7 refator: deleted sensitive information
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 10:32:37 +02:00
Vicent Llopis cfe5c66fe4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 09:23:56 +02:00
Vicent Llopis 503e78d4f0 fix: rollback mariadb version
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 09:07:43 +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
Joan Sanchez 9d5351c84c Updated db image
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-09-15 07:31:49 +00:00
Vicent Llopis 28bf7bd747 feat: check general status 'open' to close ticket
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 08:34:42 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +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 43df1e7e10 refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good Details
2022-09-05 12:06:14 +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
Javi Gallego 9fe32788fc regularizado
gitea/salix/pipeline/head This commit looks good Details
2022-08-24 14:38:05 +02:00
Joan Sanchez 6b6d00cf95 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:23:28 +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 69ca28ae14 Added SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 11:42:36 +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 a82bc7a8e8 delete: old versions of db changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-08-04 13:55:30 +02: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
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +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 cd78afb539 fix: db changes
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 12:03:59 +02:00
Vicent Llopis 538c04e8c5 feat: db connection and query
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 11:59:03 +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
Joan Sanchez 882c4cc3d7 fix(insurance): force script execution
gitea/salix/pipeline/head This commit looks good Details
2022-07-26 13:19:57 +02:00
Vicent Llopis 3fd289ff51 update chat
gitea/salix/pipeline/head Build queued... Details
2022-07-26 13:03:03 +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
Vicent Llopis 7809d9dd7e fix: typo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:41:18 +02:00
Vicent Llopis fc6e51e91f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4091-dms_clean 2022-07-22 13:41:02 +02:00
Vicent Llopis 465a5e4d73 refactor: mo ve folder of sql chagues 2022-07-22 13:12:54 +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 eccbd942f7 feat: can close a ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 13:11:24 +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
Vicent Llopis 26f8996936 refactor: set vn-focus and move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:02:15 +02:00
Vicent Llopis 771c86ba4b fix: shelving log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-20 12:40:30 +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 a0ea3b4c03 delete unnecessary sql
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:47:05 +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 c56ac1c192 feat: add log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:35:17 +02:00
Vicent Llopis 2a41c1bb93 update foreign key
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 12:44:55 +02:00
Carlos Jimenez Ruiz 7437da92a5 Merge branch 'dev' into 4294-zone_getEventsFiltered
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz bbfab8d0bd Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:22:15 +00:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good Details
2022-07-14 13:40:50 +02:00
Vicent Llopis ac344d6edd refactor: add column id PK and updated column code UQ
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-14 09:54:28 +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 d9a12fd203 feat: update commissionWorkCenterFk where is not calculated
gitea/salix/pipeline/head This commit is unstable Details
2022-07-07 07:39:46 +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
Vicent Llopis e441c658fd feat: set daysInFuture value
gitea/salix/pipeline/head This commit looks good Details
2022-07-04 08:31:53 +02:00
Joan Sanchez fc87039571 Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1011
2022-07-01 09:25:07 +00: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
Vicent Llopis 24159cd3e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
gitea/salix/pipeline/head Build queued... Details
2022-06-29 14:28:54 +02:00
Vicent Llopis d49a2666f1 refactor: don´t show 'description' if it is empty
gitea/salix/pipeline/head This commit is unstable Details
2022-06-29 14:28:23 +02:00
Alex Moreno f6b9327fb5 try
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 08:43:43 +02:00
Carlos Jimenez Ruiz 1981232df4 Merge branch 'dev' into 4217-worker_time-control_tests
gitea/salix/pipeline/head This commit is unstable Details
2022-06-28 10:45:16 +00: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 a52748348b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4098-rename_procedures
gitea/salix/pipeline/head This commit is unstable Details
2022-06-28 11:09:24 +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
Carlos Jimenez Ruiz f1cb5a958c data migration from claim.observation to claimObservations 2022-06-27 11:01:29 +02:00
Vicent Llopis fcf79a507c Merge branch 'dev' into 4213-item.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 05:32:21 +00: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
Joan Sanchez e3cb89b0a6 Moved SQL files from version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 15:19:02 +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
Vicent Llopis 2c721867fc feat(item.summary): add description
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 14:30:25 +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 f7d64e89ab 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-06-22 08:59:06 +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
Carlos Jimenez Ruiz e4883afc7c removed deprecated procedures and functions from Account 2022-06-20 13:28:49 +02:00
Carlos Jimenez Ruiz a5f53364c3 Merge branch 'dev' into renameDbChangesFolder
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 11:30:33 +00:00
Carlos Jimenez Ruiz c22e36ff1e Merge branch 'dev' into 4081-ticket.setDeleted
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 10:45:13 +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
Alex Moreno e775c67b1b rename
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 09:44:59 +02:00
Alex Moreno fd6b688382 fix(changes): prevent sql errors when test to master
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 09:40:33 +02:00
Carlos Jimenez Ruiz aa6ec3f770 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes 2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz 0f44f072ee refactor(client): added updateUser and setPassword methods to client module 2022-06-16 11:32:42 +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
Joan Sanchez 9ab8b84290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-06-10 13:16:27 +02:00
Joan Sanchez 2f082ece34 Added SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 10:18:56 +02:00
Alex Moreno 7dffe4edcb quit vn_curdate of sql in print
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 07:58:56 +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
Vicent Llopis a9badfc1ba feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 14:59:17 +02:00
Alex Moreno 417c798afd add schema
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:52:01 +02: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
Juan Ferrer 86605c3d67 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 10:18:03 +00: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
Joan Sanchez 7fe7fb2e8f Replaced fs sync functions
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 10:13:45 +02: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
Carlos Jimenez Ruiz a824da3908 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head This commit looks good Details
2022-06-08 09:17:24 +00:00
Alex Moreno 81f42985e4 sql
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 15:15:25 +02:00
Joan Sanchez c92f444776 Ammends
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz 27e8c99604 Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:50:37 +00:00
Joan Sanchez 58a1eea642 Merge branch 'dev' into 4111-claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:27:12 +00:00
Joan Sanchez 33e9dacf60 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 11:07:19 +00:00
Joan Sanchez f77f5cee58 4164 - Endpoint refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 13:06:42 +02:00
Vicent Llopis aab484ad41 refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 10:28:39 +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
Vicent Llopis 7de0fd6634 feat: create table chat
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 13:49:45 +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
Joan Sanchez c369453bfc Added model fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 13:36:27 +02:00
Joan Sanchez a5e833af2c feat(client): detail section with smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 07:56:17 +02:00
Alex Moreno 863977915e fix 2022-05-27 13:27:05 +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
Joan Sanchez a5f3580b17 derp
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 16:14:10 +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
Vicent Llopis 456f167513 feat: fix editExclusion mode
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 11:09:03 +02:00
Vicent Llopis 47ef3d0b46 Merge branch '1781-zoneHoliday' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 08:33:47 +02:00
Vicent Llopis bbdaa7de39 feat: add editExclusion mode 2022-05-26 08:33:45 +02:00
Vicent Llopis dbb44e228d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 07:47:49 +02:00
Vicent Llopis b5db025106 refactor: move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 07:41:00 +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
Carlos Jimenez Ruiz 402aa567dd Merge branch 'dev' into 4109-duplicated_folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:39:42 +00:00
Vicent Llopis a907354cc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-25 09:03:52 +02:00
Joan Sanchez 0cf8ee3edf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 15:06:32 +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
Alex Moreno 47ab4fc2c1 intro
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:52:26 +02:00
Alex Moreno 7a69d53642 fix(changes): add reference table
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:50:33 +02:00
Vicent Llopis 880f3ce647 refactor: move acl to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 14:44:18 +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 9bbdeb2840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:41:01 +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 3c9800a7a3 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +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
Joan Sanchez 6586595976 feat(closure): send incoterms authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-05-19 07:31:00 +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 3335cb8a01 feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 08:32:45 +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
Joan Sanchez bf8e7eed57 Added SQL version 10470
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 11:37:43 +02:00
Joan Sanchez 576cad16ad SQL fixes
gitea/salix/pipeline/head This commit is unstable Details
2022-05-16 11:34:29 +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
Joan Sanchez c88fe629cd Removed duplicated version
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 08:21:12 +02: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
Vicent Llopis 40bcc56758 refactor: change acl
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:01 +02:00
Vicent Llopis ab13c16948 feat: add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-16 07:17:29 +02:00
Carlos Jimenez Ruiz 990f7fe4b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation 2022-05-13 18:37:48 +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
Joan Sanchez 913b76880a Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 12:59:30 +00:00
Joan Sanchez f7077aaa3f Show build status
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 15:56:34 +02:00
Joan Sanchez ad4bee7a16 Show build status
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 15:44:11 +02:00
Carlos Jimenez Ruiz 9778783dfa removed unused console logs
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 14:02:50 +02:00
Vicent Llopis b96d9ea4c2 feat(zone.events): add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 13:53:13 +02:00
Carlos Jimenez Ruiz 9a47bdafbe debuging conection errors on CI db
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-12 13:24:19 +02:00
Javi Gallego 0d63f3c3af Merge branch 'dev' into 3851-dms_delete
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 11:13:34 +02: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 c749438f32 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 13:37:29 +00: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
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz 86ee110b78 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:55:00 +00:00
Joan Sanchez e0c0663e41 Renamed folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 14:21:41 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:19:31 +00:00
Joan Sanchez d9c8ed96e4 Added SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 09:46:56 +02:00
Vicent Llopis a6b8674302 feat(invoiceIn.tax): add button for create an expence
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:34:20 +02:00
Alex Moreno 55574919d2 rename 2022-05-09 13:19:34 +02: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
Javi Gallego 6584a29ce5 create deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 11:16:56 +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
Joan Sanchez ea6b1abdd8 Invoice queue 2022-05-02 09:51:49 +02:00
Joan Sanchez fea7df269c Added invoice schedule method
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 14:59:29 +02:00
Joan Sanchez c923526342 refactor(invoicing): send invoice to print queue
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:14:33 +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 39f4c4a6e8 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 12:36:05 +02:00
Vicent Llopis 76ff6330f9 feat(supllier.summary): add two fields
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 12:23:03 +02:00
Vicent Llopis 5211a0d9d7 feat(supplier.fiscal-data): add two fields 2022-04-25 11:51:34 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Vicent Llopis d1bd2f9c77 refactor: refund
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 14:59:41 +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 8b68fcf088 change new code
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:40:29 +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 8efcb6233f feat(user): added userConfig.darkMode relation towards account.user
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 10:25:01 +02:00
Carlos Jimenez Ruiz 9085098a04 Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:19:50 +00:00
Vicent Llopis a47349646f change versions db
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:50:29 +02:00
Alex Moreno 88d91d8b47 change db changes folder
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 08:19:33 +02:00
Alex Moreno 14933d13cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid 2022-04-13 08:17:44 +02:00
Vicent Llopis 013390fae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:49:34 +02:00
Joan Sanchez 3d8f851de8 Added version
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 11:46:14 +02:00
Joan Sanchez 2bc7b2db0c Removed keep file
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 10:15:30 +02:00
Alex Moreno c9e8826627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3758-client_unpaid
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 07:08:55 +02:00
Joan Sanchez 7228394393 Merge branch 'dev' into 3837-edi_import
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 12:43:52 +00: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 56e52c35d8 Merge branch 'dev' into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:40:52 +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
Joan Sanchez 39d18093eb Updated SQL files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 12:04:34 +02:00
Joan Sanchez 47a2f76aa4 3837 - Import data from external service
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-11 11:58:40 +02:00
Vicent Llopis d88a404ce6 refactor: pull request changes 2022-04-11 10:01:00 +02:00
Vicent Llopis 655db502f7 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 09:04:05 +02:00
Vicent Llopis d8a1bd1b1c fix: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:23:54 +02:00
Vicent Llopis c00be015ab feat(claim_photo): add fixtures and backTest 2022-04-08 13:53:25 +02:00
Joan Sanchez 8414f94cf6 Merge pull request '3736-worker-timeControl_calculate' (#926) from 3736-worker-timeControl_calculate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #926
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-04-08 06:49:39 +00:00
Joan Sanchez 381b37b1ff Merge branch 'dev' into 3043-client_search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 06:31:16 +00:00
Alex Moreno b8a954caec feat(client): section unpaid
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-07 11:41:35 +02:00
Carlos Jimenez Ruiz a72b1cd591 Merge branch 'dev' into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:36:39 +00:00
Joan Sanchez 0a4b7bd000 Added new version folder 2022-04-07 10:31:15 +02:00
Carlos Jimenez Ruiz 6216d6fa9b Merge branch 'dev' into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 08:29:26 +00:00
Joan Sanchez f5a6521f20 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 14:34:23 +02:00
Alex Moreno 98755656dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-04-06 12:43:12 +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
Joan Sanchez 7a8dbdfb16 Updated SQL files 2022-04-05 09:56:39 +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
Vicent Llopis 5f2424dc44 feat(ticket): add option 'refund all' in descriptor menu
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 13:26:53 +02:00
Vicent Llopis fdf285dd5f fix(worker_timeControl): corrected db procedure
gitea/salix/pipeline/head This commit looks good Details
2022-04-04 10:31:28 +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 fe32b81d9e sql update
gitea/salix/pipeline/head This commit looks good Details
2022-03-31 10:50:05 +02:00
Vicent Llopis bb267dad16 feat: add fixtures 2022-03-31 09:17:27 +02:00
Vicent Llopis 1f826e1214 sql code for production 2022-03-31 09:16:55 +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 3bf2b46689 feat(ticket_line): update workerMana if check claimMana option
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 10:09: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 e0244f388c refator: single quotes in sql files
gitea/salix/pipeline/head This commit looks good Details
2022-03-30 07:39:42 +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
Vicent Llopis 8e27ab612d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3802-ticket_sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 15:08:48 +02:00
Vicent Llopis a5ca116571 feat(ticket_sale): add mana options 2022-03-29 13:42:37 +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
Vicent Llopis 2ab45fe2eb delete jenkins changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 07:34:35 +02:00
Vicent Llopis 9faf9d8688 test Jenkins NOT PUSH
gitea/salix/pipeline/head This commit is unstable Details
2022-03-28 15:01:58 +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
Vicent Llopis f4d53c4040 pull request changes required
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 13:35:36 +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
Alex Moreno 7cd33619e3 change db version
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 11:47:20 +02:00
Alex Moreno 89d7d27061 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph 2022-03-28 11:47:09 +02: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
Alex Moreno 79c74d92b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-03-25 13:22:04 +01:00
Vicent Llopis e02ab9dd2d feat: add fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-03-24 11:39:19 +01:00
Vicent Llopis 67a90c356f updated FK for production db 2022-03-24 10:58:04 +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 f6ff8ea081 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3682-item_fixed-price 2022-03-23 12:17:14 +01:00
Joan Sanchez 0099b48865 Merge pull request '3704-feat(print_claim-pickup-order): add claimConfig' (#902) from 3704-print_claim-pickup-order into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #902
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 11:09:18 +00: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 31a5e19151 move db changes to correct folder
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 13:19:19 +01:00
Vicent Llopis 35312911b0 move db changes to correct folder
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 13:16:42 +01: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 a2b06e7248 feat(print_claim-pickup-order): add claimConfig
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 13:22:39 +01:00
Vicent Llopis f501d20c65 update sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 12:41:15 +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 c660786e45 refactor chaneg name
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 14:52:06 +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 afa7345d22 delete old db changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-17 09:00:13 +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
Carlos Jimenez Ruiz 3098fc36fb Merge branch 'dev' into 3604-route_agencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 14:14:16 +00: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
Alex Moreno 31eb22c1b4 feat(db): update users to role deliveryBoss
gitea/salix/pipeline/head This commit looks good Details
2022-03-14 11:34:09 +01:00
Vicent Llopis 189fe2ed41 update acl
gitea/salix/pipeline/head There was a failure building this commit Details
2022-03-10 08:14:50 +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 97f2341ae0 pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-03-08 13:42:44 +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 f972afb13e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm 2022-03-04 09:38:33 +01:00
Carlos Jimenez Ruiz 63fc58b6ba Merge branch 'dev' into 3649-claim_log
gitea/salix/pipeline/head This commit looks good Details
2022-03-03 12:00:02 +00:00
Vicent Llopis 5ea8c5b06c delete vendedores_updatePortfolio.sql
gitea/salix/pipeline/head This commit looks good Details
2022-03-03 11:38:32 +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 44318903e7 feat(claim): add log section
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 15:15:58 +01:00
Joan Sanchez cb21a51065 Added SQL version 10430-ash
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 12:12:40 +01:00
Alex Moreno ab6b5aa803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:14:34 +01: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
Vicent Llopis dedecb492e sql modify 2022-02-23 12:58:01 +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 4606b0d7ea change name for code
gitea/salix/pipeline/head This commit looks good Details
2022-02-22 15:23:23 +01:00
Alex Moreno 8bbb5d5c27 variable name
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 11:28:00 +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
Vicent Llopis a152e22f6e update sql changes
gitea/salix/pipeline/head This commit looks good Details
2022-02-18 12:26:16 +01:00
Alex Moreno 89eee042b5 refactor(ticket_basic-data): zeroFill and move getMovable
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 08:02:02 +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
Vicent Llopis d7f252a57d feat(invoiceIn): add section intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-02-16 10:30:56 +01:00
Alex Moreno 651c92698f feat(docuware): start download docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 16:48:37 +01:00
Alex Moreno 135aff27a4 fix(getMovable): show correct movable
gitea/salix/pipeline/head This commit looks good Details
2022-02-10 09:13:48 +01:00
Alex Moreno b4bed608ab refactor(ticket): getMovable
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 15:01:02 +01:00
Alex Moreno e09e84c36b refactor(setSaleQuantity): rename, remove transaction
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 12:41:55 +01:00
Alex Moreno dc78cd2dc5 feat(collection): setQuantitySale
gitea/salix/pipeline/head This commit looks good Details
2022-02-07 08:05:05 +01:00
Carlos Jimenez Ruiz e9189509c2 Merge branch 'dev' into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:50:01 +00:00
Alex Moreno c004ee638c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 10:34:48 +01:00
Alex Moreno e5548fe2a0 remove delete.keep
gitea/salix/pipeline/head This commit looks good Details
2022-02-02 07:24:15 +01:00
Alex Moreno cb5c4146cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state 2022-02-02 07:23:17 +01:00
Joan Sanchez d6ba1247d4 Added version 10420-valentines
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-01 14:37:34 +01:00
Alex Moreno 13230a2fe9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer 2022-02-01 12:40:04 +01:00
Alex Moreno f90607c8c7 change changes folder name 2022-02-01 12:39:58 +01:00
Alex Moreno a012740742 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 12:38:22 +01:00
Alex Moreno 128612a5ab Merge branch '3552-monitor_ticket_state' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 12:38:09 +01:00
Alex Moreno 90ed2fdfac change changes folder name 2022-02-01 12:38:05 +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 56331da20b feat(item_index): add column producer
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:37:11 +01: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
Joan Sanchez 9878780006 Merge branch 'dev' into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 15:41:20 +00:00
Alex Moreno 78b3df0b6a feat(monitor_ticket): classColor in db
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 13:15:37 +01:00
Joan Sanchez d30e8d9bcc Removed already uploaded changes
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 14:50:19 +01:00
Joan Sanchez 26f980998a renamed folder
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 14:49:11 +01:00
Alex Moreno 8936e02cd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-28 14:23:22 +01:00
Joan Sanchez 2480f37e24 Renamed version number (olrder version already applied on production)
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-28 14:20:54 +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 072ac5fb6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-28 09:28:13 +01:00
Alex Moreno b25ffa8feb feat(ticket_step-two): redirect to new ticket
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 09:15:41 +01:00
Alex Moreno 74916c182a Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-27 07:22:39 +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 f8a0094321 word movible
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 08:54:48 +01:00
Alex Moreno 57e4b400c9 Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 07:12:57 +01:00
Alex Moreno 442d58f59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-26 07:11:22 +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
Juan Ferrer 022c2cde3c Merge branch 'dev' into 3536-DbUserSync
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 11:18:50 +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
Juan Ferrer 997b7990d4 Docker connectTimeout && MySQL/MariaDB user sync
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 15:33:53 +01:00
Javi Gallego 6d66ab7bea getTotals without transaction
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 10:05:24 +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 8e1c3e107c refactor(ticket): advanceable code
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 12:48:39 +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
Alex Moreno 4b2153d638 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 13:37:25 +01: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
Carlos Jimenez Ruiz 941d43b9a2 Merge branch 'dev' into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 09:06:27 +00:00
Alex Moreno 61859a23c9 feat(ticket): getAdvanceable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-17 07:14:29 +01:00
Alex Moreno bf6d196414 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 08:33:27 +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 c90a2b6e5c update folder changes
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 07:24:46 +01:00