Commit Graph

9846 Commits

Author SHA1 Message Date
Guillermo Bonet 6f97d1b83a fix: refs #7844 salesFilter and isTooLittle condition
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-03 09:57:18 +02:00
Pablo Natek e20ef7c699 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-03 07:50:41 +02:00
Jorge Penadés 4c5f5c8324 fix: refs #7663 conflicts
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 17:08:23 +02:00
Jorge Penadés b83e548feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-02 17:02:00 +02:00
Guillermo Bonet 6fc8b9b821 feat: ticket 215005 Changed acl show transferClient
gitea/salix/pipeline/head This commit looks good Details
2024-09-02 14:41:02 +02:00
Carlos Satorres 28a34fa5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 14:07:01 +02:00
Jorge Penadés 4ea1177d38 chore: refs #6900 fix test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-02 13:55:44 +02:00
Javier Segarra 355714fec8 test: refs #7277 fix test proposal
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-02 11:43:35 +02:00
Robert Ferrús 48bf5004a6 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 08:09:43 +00:00
Javier Segarra 48c7d1d783 Merge branch 'dev' into 7277-RefundInvoices 2024-09-02 09:35:08 +02:00
Jorge Penadés cdaf8a7a67 fix: refs #6900 fine tunning
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-02 08:43:53 +02:00
Javier Segarra 8aa4427693 Merge branch 'dev' into 7905-getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 21:38:53 +00:00
Javi Gallego e2f1fea6be fix: refs #7277 error test
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 17:04:45 +02:00
Javi Gallego 2e3fb7646f feat: refs #7277 fit
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 14:03:02 +02:00
Javi Gallego ac36762e21 feat: refs #7277 fdescribe
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 13:56:07 +02:00
Javi Gallego c45a861ef4 feat: refs #7277 fdescribe
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 13:51:36 +02:00
Javi Gallego 51535bfa6b feat: refs #7277 refundInvoices 2024-08-30 13:50:51 +02:00
Carlos Satorres 4a7d81f920 fix: refs #6897 back and tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 12:53:44 +02:00
Carlos Satorres f65d36011b fix: refs #6897 back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 12:40:37 +02:00
Carlos Satorres 26d93ef474 fix: refs #6897 travel filter
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 12:35:10 +02:00
Carlos Satorres e8010d0f18 fix: refs #6897 fix json
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 12:10:33 +02:00
Carlos Satorres b451641d47 fix: refs #6897 fix filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-30 11:49:39 +02:00
Javier Segarra 0f4bc3f83b feat(salix): refs #7905 #7905 use getBuys toCSV flattened
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-30 09:42:50 +02:00
Guillermo Bonet e50c67c305 feat: refs #7905 Added new method getBuysCsv
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-29 12:22:29 +02:00
Guillermo Bonet 72b4607d54 feat: refs #7905 Added new method getBuysCsv
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-29 12:19:06 +02:00
Guillermo Bonet 1e3ab2d31a feat: refs #7905 Added param toCsv 2024-08-29 10:07:02 +02:00
Guillermo Bonet 6cb6110b14 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-29 07:51:23 +02:00
Guillermo Bonet 6093f2001b Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-29 07:51:14 +02:00
Javi Gallego a8ee92f891 Merge branch 'dev' into 6760-transferClient
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-28 10:36:17 +00:00
Carlos Satorres 49394b9b16 fix: change claim
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-28 09:42:59 +02:00
Javier Segarra 5b49e7cf45 fix(salix): rollback updateClaim
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-28 06:51:32 +00:00
Guillermo Bonet 79e2424a41 Merge branch 'dev' into 7844-changeProblemsCalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 08:04:21 +00:00
Javier Segarra b00070fd1a Merge branch 'dev' into 6760-transferClient
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-27 06:19:44 +00:00
Javier Segarra ef26d7f437 fix(salix): #7283 ItemFixedPrice duplicated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-27 06:05:39 +00:00
Jorge Penadés 4a3faebe7d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-26 16:59:40 +02:00
Javi Gallego 5f06ae5cf4 feat: refs #6760 refs #actualiza campo nickname
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-26 15:57:39 +02:00
Guillermo Bonet e9870be76f Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-08-26 12:14:38 +02:00
Carlos Satorres de73ee4718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-26 11:42:32 +02:00
Javi Gallego 638a43d3e6 Merge pull request '#7710 - clone with ticket packaging' (!2878) from 7710-cloneWithTicketPackaging into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2878
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-08-23 13:41:39 +00:00
Javi Gallego 32d36cda21 feat: refs #7710 pr revision
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 14:28:25 +02:00
Javi Gallego 340515968b feat: refs #7710 test fixed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 10:57:35 +02:00
Ivan Mas 9806265030 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-23 06:25:06 +00:00
Ivan Mas d9d2ae2f7b feat: refs #7758 Add code mandateType and accountDetailType
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-21 16:45:46 +02:00
Guillermo Bonet 09f1637064 fix: refs #212295 ticket 212295 Fixed claim link
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-20 10:19:46 +02:00
Javi Gallego 55799719ae fix: refs #7346 minor error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-20 10:16:59 +02:00
Javi Gallego 65ba1d4664 feat: refs #7346 backTest checks new implementation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-20 10:11:56 +02:00
Javi Gallego 340348a38e feat: refs #7346 backTest checks new implementation 2024-08-20 10:11:42 +02:00
Javi Gallego ccfb53891f Merge branch 'dev' into 7346
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-19 09:10:06 +02:00
Javi Gallego 575577d29b feat: refs #7346 add multiple feature
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-16 10:08:58 +02:00
Alex Moreno 00dc58221e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-16 09:23:43 +02:00
Jorge Penadés 57a1de7f13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-14 16:29:12 +02:00
Jorge Penadés b2f4b54654 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6900-dropInvoiceIn
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-14 14:41:18 +02:00
Carlos Satorres c26bfffada Merge branch 'dev' into 7355-accountMigration2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-14 11:04:24 +00:00
Guillermo Bonet 5e0bf4c739 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-08-14 12:48:22 +02:00
Carlos Satorres 834f62a724 Merge branch '7355-accountMigration2' of https://gitea.verdnatura.es/verdnatura/salix into 7355-accountMigration2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-14 12:38:41 +02:00
Carlos Satorres 3ee377156b fix: refs #7355 remove and tests accounts 2024-08-14 12:38:38 +02:00
Jorge Penadés 79923cc1d3 feat: refs #6900 drop section
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-14 12:20:02 +02:00
Javi Gallego f21c292e20 Merge branch 'dev' into 7346 2024-08-14 12:19:40 +02:00
Javi Gallego 7f543e8d3a Merge branch 'dev' into 7346 2024-08-14 10:32:32 +02:00
Alex Moreno f5fd85771f Merge branch 'dev' into 7355-accountMigration2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-14 07:51:30 +00:00
Jorge Penadés 6c9676ce9c chore: refs #7663 fix logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 14:52:26 +02:00
Jorge Penadés 52d62710e6 chore: refs #7663 fix logic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 13:49:00 +02:00
Jorge Penadés 85f064c869 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-13 11:41:52 +02:00
Jorge Penadés a733560649 feat: refs #7323 add locale
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-13 10:26:36 +02:00
Jorge Penadés c742f6f79d Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 16:59:28 +02:00
Carlos Satorres 3ee9833a70 fix: refs #7355 remove and tests accounts
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-12 14:06:02 +02:00
Alex Moreno 46abf2f57b fix(defaulter_filter): recovery subquery
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-12 10:27:26 +02:00
Alex Moreno 64fb097086 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-09 12:54:34 +02:00
Alex Moreno af65ef2536 fix(orders_filter): add sourceApp accepts 2024-08-09 12:54:33 +02:00
Jorge Penadés 8ab049be0d chore: refs #6900 beautify code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-09 11:48:22 +02:00
Jorge Penadés 5dfdb458a6 #6900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 15:27:42 +02:00
Alex Moreno 30e1b7280a Merge branch 'dev' into 6336-claim-redirectToLilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 10:38:33 +00:00
Jorge Penadés 853a57ec63 #6900 fix: empty commit
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-08 12:37:29 +02:00
Jorge Penadés 660ebfbe15 #6900 feat: empty commit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 12:36:06 +02:00
Jorge Penadés 4af881a8d9 #6900 feat: clear empty
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 12:35:11 +02:00
Jorge Penadés b4ea7819f8 #6900 feat: clear empty
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 12:18:42 +02:00
Jorge Penadés 1ccfd8731f #6900 feat: empty commit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 12:17:56 +02:00
Jorge Penadés afc5615140 #6900 fix: #6900 rectificative filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 12:14:44 +02:00
Alex Moreno 715439ae38 test: fix claim descriptor redirect to lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 08:23:17 +02:00
Alex Moreno c768fa113e test: fix ticket redirect to lilium
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-08 08:20:26 +02:00
Jorge Penadés 8241a6c22a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Worker_Migration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-07 15:48:41 +02:00
Guillermo Bonet 09a0459a7b refs #7844 Fix tests part 2/2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-07 13:52:41 +02:00
Guillermo Bonet 4cbea3bf7b refs #7844 Fix tests part 2/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 13:51:00 +02:00
Guillermo Bonet 8aa06e12b3 refs #7844 Fix tests part 1/2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 12:39:18 +02:00
Alex Moreno 4e831dc1bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 11:17:09 +02:00
Alex Moreno 0152fb8a98 hotFix getTIckets
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 09:51:15 +02:00
Alex Moreno 69c676d44b hotFix(route): fix getTicket use skip
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 09:38:27 +02:00
Alex Moreno 6fb78e1599 test: hotFix saveSign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 08:59:20 +02:00
Pablo Natek 323ab638d7 fix: refs #7404 fix fixtures and back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 15:55:44 +02:00
Pablo Natek 0e7272f911 fix: refs #7404 fix error message
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-05 15:42:21 +02:00
Pablo Natek f148635c68 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed 2024-08-05 15:41:41 +02:00
Pablo Natek 47543d5760 refactor: refs #7404 remove console.log 2024-08-05 15:34:01 +02:00
Pablo Natek 961fafb33e feat: refs #7404 stockBought add and calculate 2024-08-05 15:32:36 +02:00
Guillermo Bonet d6e09fcfc9 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 12:59:37 +02:00
Guillermo Bonet 91253cc807 fix: refs #7835 transferSales
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:57:38 +02:00
Guillermo Bonet d5a8e32b52 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 11:59:46 +02:00
Guillermo Bonet ab446b54ed feat: refs #7644 Optimized entry labels report
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-05 11:29:35 +02:00
Jon Elias 6620a1d119 Merge branch 'dev' into Worker_Migration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-01 11:56:06 +00:00
Jon Elias ed283cac46 feat: deleted worker module code & redirect to Lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-01 13:15:11 +02:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
Sergio De la torre 94d89f9c99 Merge branch 'master' into 6861_triggerItemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 19:51:36 +00:00
Carlos Andrés 5b0dcee62d hotfix: getBuys add field comment Ticket 207748
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 18:41:18 +02:00
Sergio De la torre 70b931553b hotFix itemShelving refs #6861
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-31 18:14:09 +02:00
Jorge Penadés 57f6c6d9a1 chore: refs #7663 WIP setWeight
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 10:43:55 +02:00
Jon Elias 460b9899c0 refactor: deleted e2e & added back descriptor and summary 2024-07-31 10:22:56 +02:00
Jon Elias 1e711b63fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration 2024-07-31 09:52:13 +02:00
Robert Ferrús 67764f4139 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-31 06:13:42 +00:00
Sergio De la torre 952b7a5054 hotFix model itemShelving refs #7805
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 07:10:38 +02:00
Jon Elias d74a04a881 feat: deleted code and redirect to Lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-30 11:37:41 +02:00
Carlos Andrés 9fc3516e52 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 19:12:48 +02:00
Jorge Penadés 4f385f16e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 09:40:34 +02:00
Guillermo Bonet f9c58e63e1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:24:57 +02:00
Guillermo Bonet c713c3a5c0 fix: refs #6861 Unhandled error
gitea/salix/pipeline/head This commit looks good Details
2024-07-29 09:21:35 +02:00
Jorge Penadés ffd8e5e282 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-29 08:05:55 +02:00
Guillermo Bonet c6bcf6f488 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 13:56:07 +02:00
Guillermo Bonet b876d1c278 feat: refs #7644 Added item reference
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 13:52:18 +02:00
Alex Moreno 2505adf87f hotFix: ticketAdvanced
gitea/salix/pipeline/head This commit looks good Details
2024-07-26 13:47:15 +02:00
Pablo Natek cf84ce1337 feat: refs #7401 redirect lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-26 09:38:49 +02:00
Javier Segarra 7254abea40 feat(salix): #7648 Add args to filter shipped value
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-25 12:49:23 +02:00
Guillermo Bonet ff8f340978 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-25 09:40:45 +02:00
Guillermo Bonet af62c2e807 fix: refs #7664 No insert editorFk 2024-07-25 08:57:18 +02:00
Robert Ferrús cfa487a80f Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-25 06:18:10 +00:00
Alex Moreno df737c784d Merge pull request 'fix: refs #6403 remove console log' (!2786) from 6403-remove-console-log into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2786
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-24 10:57:06 +00:00
Pablo Natek bc9fe220d5 fix: refs #6403 remove console log
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 12:38:27 +02:00
Javier Segarra de7b4dc9d6 fix: missing fields
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-24 10:08:01 +00:00
Carlos Satorres 729a0bb166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration 2024-07-24 09:47:25 +02:00
Jon Elias 9cf5f8759f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule 2024-07-24 07:34:44 +02:00
Alex Moreno 1a3ed42bcd fix: defaulter filter correct sql
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 14:37:34 +02:00
Jon Elias 2568ac4e92 feat: refs #6346 new wagon type section
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 13:24:43 +02:00
Alex Moreno 8845f78383 test: refs #7615 add test to setDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 12:23:31 +02:00
Robert Ferrús 4259339afb Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-23 10:00:21 +00:00
Guillermo Bonet c6b49e2134 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-23 09:27:05 +02:00
Pablo Natek d152a58dda Merge branch '7129-fixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7129-fixFilter
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-22 13:33:52 +02:00
Pablo Natek b73eceb1c8 fix: refs #7129 fix backFilters 2024-07-22 13:33:51 +02:00
Pablo Natek 62ab72d6d5 Merge branch 'test' into 7129-fixFilter
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-07-22 11:20:04 +00:00
Guillermo Bonet 513b4583b3 fix(deletExpeditions): merge test → dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 12:49:50 +02:00
Guillermo Bonet b9c57c2f0e Fix
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 12:45:57 +02:00
Guillermo Bonet 169534568e Merge branch 'test' into dev 2024-07-22 12:36:27 +02:00
Guillermo Bonet b58cdcc590 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-22 12:24:39 +02:00
Carlos Andrés d7b9a3ffd0 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 11:58:51 +02:00
Guillermo Bonet ab45b988c8 feat: refs #7704 Added itemMinimumQuantity_check
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 10:27:24 +02:00
Javi Gallego 8f623bd51e feat: refs #7346 mas intuitivo 2024-07-22 10:26:40 +02:00
Pablo Natek c18765f22f fix: refs #7129 fix return
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-07-22 09:18:37 +02:00
Pablo Natek c3d3a21b23 feat: refs #7129 add fields 2024-07-22 09:12:24 +02:00
Guillermo Bonet ce59a2bbbf fix: refs #6769 Item diary redirection to Lilium
gitea/salix/pipeline/head This commit looks good Details
2024-07-22 08:40:12 +02:00
Robert Ferrús d8f1368b32 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-22 05:07:01 +00:00
Pablo Natek ae18a52a89 fix: refs #7129 fix filter 2024-07-22 06:41:02 +02:00
Carlos Andrés bf0f95f661 Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 15:57:16 +02:00
Guillermo Bonet ca48c64163 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 13:19:02 +02:00
Alex Moreno 15e1f9763a BREACKING CHANGE: claim redirect to lilium
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-19 12:58:34 +02:00
Javier Segarra 376ddebdcd Merge branch 'master' into 7648_myEntries 2024-07-19 11:42:53 +02:00
Ivan Mas 58ee4f1b75 Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 07:08:48 +00:00
Guillermo Bonet 3525c878b6 Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2711
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-19 05:46:42 +00:00
Guillermo Bonet fd2bac713d fix: #6184 Deleted unused params
gitea/salix/pipeline/head This commit looks good Details
2024-07-19 07:16:24 +02:00
Robert Ferrús 10a4831f95 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-19 05:09:41 +00:00
Javier Segarra 304405a8a3 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-18 15:21:12 +02:00
Ivan Mas 6d1663617f Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 12:51:34 +00:00
Alex Moreno c30362a266 Merge branch 'dev' into 6943-fixCustomer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 11:58:18 +00:00
Guillermo Bonet f18b165e4a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-18 13:45:23 +02:00
Jon Elias 150b3a276e feat: refs #7356 new parameters in sql for Weekly tickets front
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 10:51:24 +02:00
Robert Ferrús e96fa75356 fix: refs #7039 country order
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-18 09:22:27 +02:00
Alex Moreno e66d138091 feat(defaulter_filter): add department
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-18 08:12:39 +02:00
Alex Moreno 12316fb44b fix(client_filter): add recovery 2024-07-18 07:32:42 +02:00
Sergio De la torre 0181764744 Merge pull request 'master' (!2750) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2750
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-17 15:09:35 +00:00
Sergio De la torre 3aea6fdd46 hotFix reservas refs #6861 2024-07-17 16:13:31 +02:00
Alex Moreno a1f481deb1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 14:17:17 +02:00
Ivan Mas 019e29f3dd Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-17 11:48:57 +00:00
Alex Moreno 2763839c54 hotFix(workerTimeControl): confirm correct url
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 13:42:23 +02:00
Alex Moreno d52a229613 hotFix(workerTimeControl): confirm correct url
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 13:40:57 +02:00
Alex Moreno 021d315a01 fix: weeklyHourRecordEmail workerId prop and correct request in frontend
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 13:30:47 +02:00
Alex Moreno ae2ddcb8c7 add console.log
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:58 +02:00
Alex Moreno e5bfb4af23 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 12:20:22 +02:00
Alex Moreno 4ff388198b fix(deletExpeditions): add try catch
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 10:14:41 +02:00
Robert Ferrús 4ff61a75e0 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-17 06:26:26 +00:00
Pablo Natek f83dd37a28 fix: refs #6403 remove line
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 08:23:33 +02:00
Pablo Natek 0ea69427ec feat: refs #6403 add cancelShipment on deleteExpeditions
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-17 08:16:01 +02:00
Ivan Mas 1d10e61541 Merge branch 'dev' into 7393-Night_tcket_closing_report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 17:14:08 +00:00
Carlos Andrés 38d863aac6 feat: refactor buyUltimate refs #7736
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-16 18:44:24 +02:00
Sergio De la torre a82df8e2a2 feat handleUser refs #6868
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 17:20:35 +02:00
Sergio De la torre 7870416860 feat handleUser refs #6868
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 17:08:38 +02:00
Pablo Natek d2f022ab64 Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 11:44:54 +00:00
Pablo Natek b7e84f43de feat: refs #6403 add delete
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-16 13:26:20 +02:00
Javier Segarra d558e3d9f4 test(salix): refs #7648 #7648 test travels and entries
gitea/salix/pipeline/pr-master Build queued... Details
2024-07-16 12:45:51 +02:00
Javier Segarra 8fe94772f3 feat(salix): refs #7648 #7648 buyLabels 2024-07-16 12:45:31 +02:00
Javier Segarra 6856ab0501 feat(salix): refs #7648 #7648 myEntries 2024-07-16 12:45:14 +02:00
Alex Moreno 3f1e340323 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-16 10:55:23 +02:00
Alex Moreno 1cf0ab1654 Merge branch 'test' into warmFix_worker_new
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 08:51:11 +00:00
Alex Moreno b871615e8f fix: worker new if not has provinceFk
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 10:42:08 +02:00
Sergio De la torre dbb893c723 Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2737
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-16 08:19:38 +00:00
Sergio De la torre 144cf20e71 feat handleUser refs #6868
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 10:14:19 +02:00
Javi Gallego 63763f2b22 Merge branch 'dev' into 7346 2024-07-16 09:32:16 +02:00
Javier Segarra c5cb4d84f1 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 09:23:30 +02:00
Javier Segarra 3e14d2fd48 Merge pull request '#7648 Add field for endpoint as buyLabel report' (!2738) from 7648_getBuys_fields into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2738
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-16 06:28:41 +00:00
Sergio De la torre ae6963c26d feat handleUser refs #6868
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-16 08:19:13 +02:00
Alex Moreno 4fa9f057de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 07:41:21 +02:00
Javier Segarra a0be2edc41 feat(salix): #7648 remove white line
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 17:33:21 +00:00
Javier Segarra ddd6c799dc feat(salix): #7648 Add field for endpoint as buyLabel report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 17:32:14 +00:00
Sergio De la torre dc5903421b refs newStatePartial refs #7642
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-15 16:21:19 +02:00
Sergio De la torre 87b0d3e8d1 refs newStatePartial refs #7642
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-15 16:18:30 +02:00
Sergio De la torre ac0c3b79b4 feat createLogin refs #6868 2024-07-15 15:51:52 +02:00