Commit Graph

10261 Commits

Author SHA1 Message Date
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
Jorge Penadés 6b1001ec6a feat: refs #7353 drop section
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-19 16:29:36 +02:00
Javier Segarra 8fad522a3e feat(salix): refs #7677 #7677 return more postcode fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-19 12:45:06 +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
Javi Gallego f25d5c3bb5 Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 10:37:53 +00:00
Alex Moreno eca89c1c4e Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 08:19:26 +00:00
Javier Segarra 199d8e0034 Merge branch '7648_myEntries_filter' of https://gitea.verdnatura.es/verdnatura/salix into 7648_myEntries_filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 09:59:58 +02:00
Javier Segarra fb8b31b397 perf: refs #7648 #7648 clean fixtures and SQL filter 2024-07-15 09:59:52 +02:00
Robert Ferrús d85f40d725 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-15 05:28:16 +00:00
Javier Segarra 0ca4bffaf0 Perf: improve condition days filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-13 18:07:46 +00:00
Javier Segarra 1d23554508 perf(ssalix): refs #7648 remove default value
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 20:52:52 +02:00
Javier Segarra 5dcabd687e feat(ssalix): refs #7648 clean test !entry.filter 2024-07-12 20:52:26 +02:00
Javier Segarra bedff9f290 Merge branch 'dev' into 7648_myEntries_filter 2024-07-12 20:24:25 +02:00
Guillermo Bonet dcde6bb37a Merge branch 'dev' 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-07-12 14:04:50 +02:00
Guillermo Bonet 1e264c2102 fix: refs #7704 Warehouse priority 2024-07-12 14:04:49 +02:00
Javier Segarra 9206826135 Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 12:57:22 +02:00
Alex Moreno 896d273da8 fix(worker_new): fix countryFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:06:37 +02:00
Robert Ferrús 625ab07e48 Merge branch 'dev' into 7615-ticketRefundSetDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 10:01:12 +00:00
Robert Ferrús 4da811cba6 Merge branch 'dev' into 7670-addSaleRenewPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 08:50:48 +00:00
Guillermo Bonet f8f6950de1 Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2683
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-12 08:13:27 +00:00
Guillermo Bonet 1531e27911 fix: refs #7704 Restored minimum quantity label
gitea/salix/pipeline/head This commit looks good Details
2024-07-12 10:00:52 +02:00
Guillermo Bonet 910071bde0 refactor: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:11:55 +02:00
Guillermo Bonet bb787b1581 refactor: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 09:03:37 +02:00
Javier Segarra 47cff3f894 feat(ssalix): refs #7648 remove select field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 08:52:03 +02:00
Guillermo Bonet 5c80a99543 feat: refs #7704 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:58:59 +02:00
Guillermo Bonet 31530d6d3d feat: refs #6769 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-12 07:22:22 +02:00
Javier Segarra 9c5f38648a feat(ssalix): refs #7671 #7671 checkDates to present
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 00:24:26 +02:00
Javier Segarra b28a8a34dc feat(salix): refs #7648 #7648 add new filter 2024-07-11 19:55:36 +02:00
Javier Segarra ca48ad9777 feat(salix): refs #7648 #7648 add new entries and travels 2024-07-11 19:55:19 +02:00
Robert Ferrús 39b52e706a feat: refs #7615 setDeleted
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 14:51:34 +02:00
Guillermo Bonet 69e0d78537 feat: refs #7704 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 14:31:17 +02:00
Guillermo Bonet 9e3baeffa6 feat: refs #7704 Added tests
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 14:27:16 +02:00
Guillermo Bonet f1b0b95442 feat: refs #7704 Refactor
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:47:06 +02:00
Guillermo Bonet 7bdc242fc7 feat: refs #7704 Added minQuantity to tmp.ticketCalculateItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 11:40:06 +02:00
Guillermo Bonet 90802bd330 feat: refs #7704 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:28:00 +02:00
Guillermo Bonet 2e48263636 feat: refs #7704 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 11:10:01 +02:00
Guillermo Bonet 823756d71a feat: refs #7704 Optimization
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 10:29:26 +02:00
Guillermo Bonet 7ba2e8d4c5 feat: refs #7704 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-11 09:48:31 +02:00
Carlos Satorres 0579e7dbbf hotfix routeSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-11 09:14:14 +02:00
Guillermo Bonet 61a746c2d8 feat: refs #7704 Fixes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 09:00:07 +02:00
Guillermo Bonet 02bcfd9be3 feat: refs #7704 Major changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-11 08:57:45 +02:00
Javi Gallego 618baaf604 usa campo factura multipe 2024-07-11 08:37:08 +02:00
Javier Segarra ea626821fc feat(ssalix): refs #7671 #7671 checkDates 2024-07-11 06:17:19 +02:00
Robert Ferrús 36b1beeebf Merge branch 'dev' into 7670-addSaleRenewPrice
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-10 09:44:54 +00:00
Pablo Natek 64bddd4f63 feat: refs #6403 add dynamic clientType
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-10 10:41:52 +02:00
Alex Moreno c7d9fae17b Merge branch 'dev' into 7348-client-hasDailyInvoice
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 08:39:35 +00:00
Guillermo Bonet 46e8f5b811 feat: refs #7511 Rename to multiConfig tables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-10 07:46:18 +02:00
Guillermo Bonet 0b61a175ef Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-07-09 14:49:51 +02:00
Guillermo Bonet b28ef09f3d Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:04:02 +02:00
Guillermo Bonet 1f2c0190d0 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 12:02:15 +02:00
Carlos Satorres 944cf3baa3 refs #7694 hotfix filter
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-07-09 11:44:43 +02:00
Guillermo Bonet be83fa6729 fix: refs #7622 Fix
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-09 11:13:55 +02:00
Carlos Satorres 02c2ccd62e stash filterState 2024-07-09 11:00:02 +02:00
Guillermo Bonet f79b2378af Merge branch 'dev' into 7622-addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-08 10:05:35 +00:00
Guillermo Bonet e64f56cff1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:55:00 +02:00
Guillermo Bonet 5213fd4feb Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-08 07:54:42 +02:00
Jorge Penadés f5fb596d28 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-05 15:44:51 +02:00
Javier Segarra 5192bfd8ea fix(salix): refs #7648 #7648 entryFilter and getBuys by fi
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 14:58:34 +02:00
Guillermo Bonet 1799b52f8b feat: refs #7622 Added type column addressWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 12:37:59 +02:00
Jorge Penadés 9d1ee964c5 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-05 09:17:07 +02:00
Javi Gallego d4b4c0fafe feat: refs #7348 campos a modificar
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-05 09:04:38 +02:00
Javi Gallego e3db143b44 feat: refs #7348 campo en json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-05 08:55:24 +02:00
Sergio De la torre 159f2f5f1c hotFix itemNewer refs #6964
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-05 08:44:09 +02:00
Sergio De la torre 859f610f43 hotFix itemNewer refs #6964 2024-07-05 08:43:45 +02:00
Jorge Penadés dce62245e9 chore: refs #7197 add supplierActivityFk filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 13:10:32 +02:00
Alex Moreno 776fd05648 fix: send rocket after commit cau 199307
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 12:45:52 +02:00
Robert Ferrús 1fff3aa681 feat: refs #7670 addSale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-04 12:34:56 +02:00
Jorge Penadés 43c95c86fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn 2024-07-04 09:19:25 +02:00
Jorge Penadés 900fa2de5e fix: refs #7648 add myOpts
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 13:03:19 +02:00
Carlos Satorres 14bc6f1232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration 2024-07-03 12:20:56 +02:00
Carlos Satorres fafebb4339 refs #6897 fix filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 12:13:40 +02:00
Carlos Satorres dd3a8d4b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 12:05:00 +02:00
Jorge Penadés 12f29aa50e Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2277
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-07-03 08:51:56 +00:00
Alex Moreno 4535795515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-03 10:08:15 +02:00
Carlos Satorres f37dcddbb4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:07:39 +02:00
Jon Elias d01820c751 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:54:55 +00:00
Javier Segarra d72a52d6b1 Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 07:29:00 +00:00
Sergio De la torre 1561e15d5e feat roadmap refs #7195
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-03 09:21:58 +02:00
Jon Elias 4bdbb3b08e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:13:21 +00:00
Jorge Penadés 1c6dd17f90 Merge branch 'dev' into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:10:41 +00:00
Carlos Satorres 797a4e5df6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 08:51:14 +02:00
Sergio De la torre 7677ada925 Merge branch 'dev' into 7195_roadmap2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:46:10 +00:00
Javier Segarra 5c73a20f43 Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:17:34 +00:00
Javier Segarra 946d6f553a perf(salix): refs #7648 #7648 sql conventions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:16:55 +02:00
Guillermo Bonet d1a38ec589 Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2656
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:22:48 +00:00
Javier Segarra adbbe4aef9 fix(salix): refs #7648 #7648 solve big bug
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 01:46:01 +02:00
Javier Segarra cc004a864a feat(salix): refs #7648 #7648 rename some travel fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 20:41:53 +02:00
Sergio De la torre 61265a45e3 Merge branch 'dev' into 7195_roadmap2
gitea/salix/pipeline/pr-test Build queued... Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 11:25:46 +00:00
Sergio De la torre e1b6ba4276 feat roadmap refs #7195
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-02 12:03:21 +02:00
Javier Segarra 3539b5a33e test(salix): refs #7648 #7648 remove fdescribe
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-02 10:08:51 +02:00
Javier Segarra 30520cbe48 test(salix): refs #7648 #7648 getBuys.filter 2024-07-02 10:06:26 +02:00
Jorge Penadés 45573fed41 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-02 09:57:10 +02:00
Javier Segarra 89a394a10d test(salix): refs #7648 #7648 entry.filter 2024-07-02 09:52:18 +02:00
Javier Segarra f41c2489d9 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 09:34:46 +02:00
Sergio De la torre 08cf79b09b feat roadmap refs #7195
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 08:39:42 +02:00
Javier Segarra f27bdec758 feat(salix): refs #7648 #7648 changes requested
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 21:14:27 +02:00
Sergio De la torre d9742afc9b feat roadmap refs #7195
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 17:45:45 +02:00
Sergio De la torre 5992d7f53f Merge branch 'dev' into 6861-Reservas-front
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:39:19 +00:00
Javier Segarra f0326860ba feat(salix): refs #7648 #7648 add new fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:07:46 +02:00
Javier Segarra f47197cd80 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 14:06:28 +02:00
Carlos Satorres a68f252658 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 12:56:22 +02:00
Jon Elias 0e84749c07 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 10:22:11 +00:00
Jorge Penadés dcfc156209 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:56:30 +02:00
Carlos Satorres 0240734a4b refs #6897 fix filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:50:37 +02:00
Alex Moreno ebdd6bd08c fix merge dev
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:50:20 +02:00
Alex Moreno a26f6eaf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:32:21 +02:00
Sergio De la torre 22959db0ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:28:14 +02:00
Guillermo Bonet a23f485296 refactor: refs #7424 Component type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:11:16 +02:00
Guillermo Bonet ac54994760 Merge pull request 'feat: refs #7644 First commit' (!2651) from 7644-entryLabel into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2651
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-01 07:56:14 +00:00
Guillermo Bonet 5c8d8ba280 refs #7644 Added locales and changed name of method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 09:07:36 +02:00
Guillermo Bonet 57a879723e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-01 07:39:19 +02:00
Javi Gallego 355e426ccf mail-alias-account con mixin
gitea/salix/pipeline/head This commit looks good Details
2024-07-01 07:19:00 +02:00
Guillermo Bonet df4e5deae6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-28 13:33:43 +02:00
Guillermo Bonet 19bf606330 refs #7644 First commit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 12:57:27 +02:00
Jorge Penadés 2b0df02f20 Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 08:34:53 +00:00
Pablo Natek b6a72a1abb Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-27 07:12:40 +00:00
Sergio De la torre cbc00b90b9 feat front-reservas refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 14:02:25 +02:00
Guillermo Bonet ad4dd088a3 Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-06-26 11:58:43 +02:00
Carlos Satorres ca91c3926e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 11:42:35 +02:00
Jorge Penadés 624f4707ac feat: refs #7197 filter by correcting
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-26 10:43:02 +02:00
Carlos Satorres 827f3f6d1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration 2024-06-26 10:05:29 +02:00
Carlos Satorres f9a09f3fec Merge branch 'dev' into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 08:00:58 +00:00
Robert Ferrús 0534526ac2 fix: refs #7039 filterFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 09:03:06 +02:00
Pablo Natek 478a38b0ab Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 05:14:37 +00:00
Jorge Penadés 1f6fd8d6d1 feat: refs #6286 check if is teamBoss
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 17:27:00 +02:00
Jorge Penadés 93f2995d39 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 16:26:13 +02:00
Sergio De la torre 75f8de9277 Merge branch 'dev' into 7168-itemShelvingLog_get
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 14:16:29 +00:00
Carlos Satorres d1ed4b4459 refs #7409 fix back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 16:03:59 +02:00
Carlos Satorres ffff851d1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome 2024-06-25 14:49:32 +02:00
Alex Moreno 95a23ad9fc Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 11:43:42 +00:00
Sergio De la torre c551e229fb feat itemShelvingLog refs #7168
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 13:30:46 +02:00
Carlos Satorres f811e7e96c Merge branch 'dev' into 7406-workerFormation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 10:39:38 +00:00
Carlos Satorres 95e1bba58b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome 2024-06-25 12:36:12 +02:00
Alex Moreno 45e8674087 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 11:34:35 +02:00
Guillermo Bonet 134c38b9fd refs #6753 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-06-25 08:57:21 +02:00
Jorge Penadés 24cf23dddc feat: refs #62add travelKgPercentage table and model
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-21 13:16:01 +02:00
Carlos Satorres d0ddbe6a8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 10:32:38 +02:00
Carlos Satorres 424e0c430c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 09:50:29 +02:00
Carlos Satorres cf4a7c8fba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 09:11:40 +02:00
Carlos Satorres a80b0c3b4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:36:50 +02:00
Guillermo Bonet b02a4721af Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 13:10:31 +02:00
Guillermo Bonet 074d4f4755 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 13:10:07 +02:00
Guillermo Bonet 9a4ec46073 hotfix: refs #6820 Deleted km validation
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 13:09:40 +02:00
Jon Elias 419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 12:24:06 +02:00
Alex Moreno f99b1beb86 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:57 +02:00
Alex Moreno f84e85e443 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 09:48:34 +02:00
Javi Gallego 018972b948 Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2609
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-06-20 05:50:14 +00:00
Carlos Satorres 7619fa74ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 05:52:06 +02:00
Jorge Penadés 4b8b503964 Merge branch 'master' into 6744-hotfix-showChangePass
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-19 14:50:32 +00:00
Alex Moreno 7a0d107943 Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master Build queued... Details
2024-06-19 12:43:43 +00:00
Carlos Andrés c596cae0c0 Merge pull request 'fix: asociar ticketRefund refs #7586' (!2592) from 7586---Proceso-abonar-tickets/facturas-desde-Salix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2592
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-19 12:22:32 +00:00
Jorge Penadés 905528a704 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6744-hotfix-showChangePass
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-19 13:44:39 +02:00
Javi Gallego 1a8df4d87c feat: refs #7216 triggers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 13:41:37 +02:00
Jorge Penadés 6967aa9811 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-19 13:40:09 +02:00
Guillermo Bonet 738dcc7060 Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2582
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-19 09:31:18 +00:00
Pablo Natek 47eb6dd8fe Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-19 08:46:42 +00:00
Javi Gallego 637c6a9035 feat: refs #7216 logUnpaid
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-19 09:40:24 +02:00
Javi Gallego df4b3add8d fix: refs #6408 quito state.js
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-19 07:59:45 +02:00
Carlos Satorres 2d3311b824 refs #6898 fix supplier remove
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 13:44:39 +02:00
Carlos Satorres 313c05f654 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical 2024-06-18 13:26:19 +02:00
Carlos Satorres e404688042 refs #7407 create models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 10:12:22 +02:00
Sergio De la torre 239814e6b4 feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-06-18 10:08:40 +02:00
Jorge Penadés 3070d1ef01 refactor: refs #6238 drop useless round
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 10:04:21 +02:00
Jorge Penadés 87feddaedb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 09:55:22 +02:00
Sergio De la torre 46cd20a1fd feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-18 08:24:15 +02:00
Alex Moreno deb0f8e828 Merge branch 'dev' into 6897-entryMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-18 06:04:12 +00:00
Sergio De la torre eedcdb54fa feat hasItemOlder refs#6964
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 19:50:51 +02:00
Sergio De la torre dc777b2d7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 19:12:00 +02:00
Sergio De la torre c6da9e72e0 feat newLogin refs #6868
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 16:53:06 +02:00
Sergio De la torre 0ab620b485 feat newLogin refs #6868 2024-06-17 16:50:00 +02:00
Alex Moreno e8c7b55329 fix(WorkerIncome): refs #7409 fix models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 14:17:43 +02:00
Sergio De la torre 9d5d62afaf feat newLogin refs #6868
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-17 13:56:58 +02:00
Carlos Satorres fa8c1b3879 acls, fixtures, models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 13:50:07 +02:00
Guillermo Bonet 39381a4a7c Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2596
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-17 11:22:30 +00:00
Guillermo Bonet eaaf83561c fix: refs #5995 Optimized downloadCmrsZip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 13:03:02 +02:00
Jorge Penadés 4bc62a30bd fix: refs #6744 back test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-17 12:23:01 +02:00
Jorge Penadés 89ea931d9c feat: refs #6744 add locale & drop verification
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-17 12:19:59 +02:00
Robert Ferrús cfa0b87898 feat: refs #7296 RoutesMonitor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 11:50:25 +02:00
Carlos Satorres 54b6ef491f refs #7409 back 2024-06-17 10:23:30 +02:00
Pablo Natek 25afa80bab fix: refs #6404 remove fixtures after test
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-17 09:09:45 +02:00
Sergio De la torre 60f64ff74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-06-17 07:35:57 +02:00
Carlos Andrés 9b118f83e5 fix: asociar ticketRefund refs #7586
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-14 17:56:24 +02:00
Jorge Penadés 202884fdce feat: refs #6238 add travelKgPercentage table and model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 14:25:15 +02:00
Guillermo Bonet 9b80ef73a8 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-14 12:48:00 +02:00
Carlos Satorres 189c67bd2d warmFix change if
gitea/salix/pipeline/pr-test This commit looks good Details
2024-06-14 09:43:10 +02:00
Jon Elias 0bf384b2ce Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 07:06:30 +00:00
Jon Elias d3f23a6d7a fix: refs #6436 fix filter test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 09:04:18 +02:00
Jon Elias 61a588b57c refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 08:39:57 +02:00
Jorge Penadés 7717c38a45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 14:00:14 +02:00
Jorge Penadés 784bd91e04 fix: refs #6286 update WorkerTimeControl permissions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 13:43:28 +02:00
Sergio De la torre 52b82603d2 feat login-app refs #6868 2024-06-13 10:40:37 +02:00
Carlos Satorres 2d9092d2a5 Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-13 09:20:46 +02:00
Carlos Satorres 3c1544ac9d refs #6897 fix es.yml 2024-06-13 09:20:43 +02:00
Robert Ferrús 5714539d78 Merge pull request 'test' (!2585) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2585
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-06-13 07:18:55 +00:00
Jorge Penadés e093808af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 09:10:36 +02:00
Carlos Satorres 2dc7e75aee Merge branch 'dev' into 6897-entryMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-13 06:51:09 +00:00
Robert Ferrús b5e139b734 fix: refs #7039 supplier search-panel country
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-13 08:43:11 +02:00
Guillermo Bonet 53c732bcb9 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-13 07:12:10 +02:00
Jorge Penadés 7480f5ecb3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 16:54:03 +02:00
Carlos Satorres b72de3570a refs #6897 fix redirection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-12 14:41:35 +02:00
Carlos Satorres ba67acb72b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-12 14:33:11 +02:00
Jon Elias 84a51d3e8d feat: refs #6436 changed tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 12:23:37 +02:00
Javi Gallego 446e180cf0 hotfix claim
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 11:58:07 +02:00
Guillermo Bonet dcb9d54105 feat: refs #7545 Deleted hasIncoterms client column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 11:48:01 +02:00
Alex Moreno 3ca71b81af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-12 10:38:02 +02:00
Alex Moreno b5ecf2e3b5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 10:11:14 +02:00
Alex Moreno de0f0623e1 Merge branch 'master' into 6408-hotFix_updateQuantity
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-12 08:07:25 +00:00
Alex Moreno d9b0a1a75c fix(updateQuantity): fix rocket translation
gitea/salix/pipeline/pr-master Build queued... Details
2024-06-12 09:59:58 +02:00
Alex Moreno 789e0e65e3 fix(sale): rocket is only sent if it has sales
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-12 09:12:48 +02:00
Jon Elias 2b45c2c61a feat: refs #6436 new test changes, rollback order/filter and /ticket/clone
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 08:25:50 +02:00
Alex Moreno 60d4372996 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 07:51:01 +02:00
Alex Moreno 1eee1d0e9b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-12 07:47:56 +02:00
Pablo Natek 11a7d890a0 Merge pull request 'feat: refs #7499 add printedStickers' (!2577) from 7499-add-printedStickers into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2577
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-11 14:32:14 +00:00
Jorge Penadés d7d6de73c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 15:41:06 +02:00
Javi Gallego 4744f57269 Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2568
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-11 12:54:06 +00:00
Javi Gallego 79c922300b hotfix #6408
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 14:50:47 +02:00
Pablo Natek 13d1d0a61c feat: refs #7499 add printedStickers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 14:29:16 +02:00
Robert Ferrús 8039530ab4 fix: refs #7039 fix item-tax
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-11 14:15:10 +02:00
Jon Elias 944355d54f refactor: refs #6436 end first wave of changes in modules
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 13:17:19 +02:00
Alex Moreno 3b44bdd2bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:56:56 +02:00
Jon Elias 665d03f048 refactor: refs #6436 user-config and some sections tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:35:44 +02:00
Carlos Satorres 5d7a570c3f refs #6897 fix redirection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 12:28:49 +02:00
Jon Elias bd45352215 refactor: refs #6436 fourth wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 12:02:15 +02:00
Jon Elias 093eaeb475 refactor: refs #6436 third wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:45:46 +02:00
Jorge Penadés 902a9ee51b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-11 10:43:33 +02:00
Jon Elias b3fa869757 refactor: refs #6436 second wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:00:30 +02:00
Alex Moreno 9c2ccc5df4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 09:59:09 +02:00
Jon Elias 7df7382346 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 09:41:26 +02:00
Jon Elias f0ad012835 refactor: refs #6436 first wave 2024-06-11 09:39:06 +02:00
Carlos Satorres b38c5cdecc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration 2024-06-11 09:19:05 +02:00
Guillermo Bonet 873f36fef6 refactor: refs #7503 Added relations and ACLs
gitea/salix/pipeline/head This commit looks good Details
2024-06-11 08:50:32 +02:00
Sergio De la torre 5c3ce40bbd feat login-app refs #6868 2024-06-11 07:12:47 +02:00
Jorge Penadés 562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 15:36:34 +02:00
Jorge Penadés 8e3cc574ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 15:21:59 +02:00
Javi Gallego e081c4504d feat: refs #7548 link a grafana
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 14:51:48 +02:00
Sergio De la torre 379ad6a8e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-06-10 11:37:01 +02:00
Carlos Satorres 1a01b3e587 refs #7529 back models acls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-10 10:42:52 +02:00
Javi Gallego b4046de190 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 08:17:17 +00:00
Jorge Penadés 7794f23c17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-10 09:02:52 +02:00
Sergio De la torre cac1278c08 feat hsItemOlder refs $6964
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 16:29:51 +02:00
Javi Gallego f82f452423 Merge branch 'dev' into 7276_expeditionScanned
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 13:44:24 +00:00
Jorge Penadés 479e4f3f8a feat: refs #6273 required payMethod for internals
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 13:55:56 +02:00
Jorge Penadés ee1678ebb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 12:14:18 +02:00
Jorge Penadés faf450e075 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 11:45:51 +02:00
Carlos Satorres 48550bd986 refs #6897 fix remove
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 11:35:03 +02:00
Javi Gallego 0c068ed126 Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 09:03:24 +00:00
Alex Moreno 379d7ef2ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 10:33:07 +02:00
Alex Moreno ca6afb9c10 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-07 10:32:49 +02:00
Alex Moreno 6e17f3dca3 Merge branch 'master' into 6147-transferInvoice_split
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-07 08:14:38 +00:00
Jorge Penadés 310c2383cb fix: refs #6286 replace id for reason
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 09:08:21 +02:00
Carlos Satorres 4508f7bfff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-07 08:53:28 +02:00
Carlos Satorres cdc18ed84f refs #6897 fix entry Salix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-07 08:32:59 +02:00
Jorge Penadés 1912fdd45d refactor: refs #6286 replace name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 17:26:23 +02:00
Sergio De la torre 268c0a984c feat isScanned refs #7276 2024-06-06 12:28:34 +02:00
Javi Gallego e77bc87a2a Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2546
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-06-06 09:48:29 +00:00
Jon Elias c2e80060b3 Merge branch 'dev' into 6753-TicketsSaveSign
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-06 07:51:23 +00:00
Sergio De la torre d1214a998a feat: login refs #6868 2024-06-06 07:01:55 +02:00
Jorge Penadés 14afd8246a feat: refs #6273 add back test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 17:38:48 +02:00
Jorge Penadés 8188bdbcb0 fix: refs #6273 use userId
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 17:12:37 +02:00
Jorge Penadés a79285cd3d feat: refs #6273 register freelance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-05 16:27:00 +02:00
Alex Moreno a33f14ffa5 feat(transferInvoice): makePdf of refund
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-06-05 12:44:28 +02:00
Javi Gallego 1fa22e71a9 feat: refs #7203 nombre variables
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-05 12:42:55 +02:00
Javi Gallego 9b8fef2f20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-06-05 07:07:18 +02:00
Javi Gallego 143930bc86 fix: warmFix setDeleted checks ticketRequest not answered 2024-06-05 07:07:13 +02:00
Juan Ferrer f903d7cd2a Merge pull request 'master' (!2538) from master into test
gitea/salix/pipeline/pr-dev Build queued... Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2538
2024-06-04 21:05:27 +00:00
Carlos Andrés 3a68cfef77 Merge pull request 'hotfix: ledger_next transacciones refs #7523' (!2540) from 7523-ledger_next-transacciones into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
Reviewed-on: #2540
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-06-04 17:14:51 +00:00
Sergio De la torre f70605e565 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 16:03:37 +02:00
Carlos Andrés 1927fbce45 hotfix: ledger_next transacciones refs #7523
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 15:39:02 +02:00
Javi Gallego 4089c7deb3 feat: refs #4560 minorChanges
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-04 12:23:28 +02:00
Javi Gallego da1b4649bb feat: refs #4560 sin expeditionTruck 2024-06-04 11:58:39 +02:00
Javi Gallego 4230d46fe5 Merge branch 'dev' into 4560-GastosReparto 2024-06-04 09:47:58 +02:00
Alex Moreno 7a803cce37 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-06-04 09:38:50 +02:00
Alex Moreno 03201e1e2c fix(ticket): throw error if id is null
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-04 09:10:47 +02:00
Sergio De la torre 94aef434a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-04 07:17:37 +02:00
Sergio De la torre 882d5bf036 feat: roadMap refs #7195 2024-06-03 18:39:11 +02:00
Juan Ferrer 1ec55c8850 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 17:38:39 +02:00
Jorge Penadés a13581ed97 feat: refs #6243 Add warehouseFk parameter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 16:31:38 +02:00
Jorge Penadés 58053d8286 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 15:22:08 +02:00
Alex Moreno bbf027ede5 fix(operator): neq error 2024-06-03 15:01:06 +02:00
Alex Moreno c445bcb0ba build(operator): remove console.log
gitea/salix/pipeline/head This commit looks good Details
2024-06-03 14:39:32 +02:00
Alex Moreno a73c98eebe build(operator): console.log
gitea/salix/pipeline/head This commit looks good Details
2024-06-03 13:04:09 +02:00
Jorge Penadés 39dcb7d6a8 fix: refs #6889 check if has collection or sectorCollection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:30:20 +02:00
Carlos Satorres 7a92963886 fix acls
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-03 10:21:25 +02:00
Jorge Penadés ea7c2346d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 10:13:59 +02:00
Jorge Penadés 1382b24c1d refactor: refs #6600 add space
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:38:35 +02:00
Jon Elias 340a8c119e refactor: refs #6753 fix saveSign
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:35:44 +02:00
Jorge Penadés 72630d613b fix: refs #6600 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:32:03 +02:00
Jorge Penadés 790a637d4d feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 09:25:48 +02:00
Jorge Penadés 084f31e441 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 08:34:10 +02:00
Jorge Penadés 68bb282659 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 08:30:41 +02:00
Sergio De la torre b9a9f52514 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps 2024-06-03 07:56:43 +02:00
Guillermo Bonet b9d04e9557 Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 05:22:15 +00:00
Sergio De la torre 1941d8f5b3 Merge branch 'dev' into 6832_refactorBackToItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 05:04:05 +00:00
Jorge Penadés dc8696b422 feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 16:31:36 +02:00
Jorge Penadés 836cfcbd07 refactor: refs #6889 sale tests e2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-31 13:58:26 +02:00
Sergio De la torre 2985e1c9e8 feat: roadMap refs #7195 2024-05-31 13:08:48 +02:00
Jorge Penadés 9578c506b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:58:05 +02:00
Carlos Satorres e09a8f2eb7 refs #6897 remove code redirection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 12:41:38 +02:00
Javi Gallego 6a08a806a9 Merge branch 'dev' into 6408-rocketChat
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 10:39:14 +00:00
Guillermo Bonet 7dc17cd4f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-31 12:29:32 +02:00
Robert Ferrús 85c328e522 fix: refs #7039 hotFixcountry
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 10:07:27 +02:00
Alex Moreno 788f334e70 intros
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 09:29:47 +02:00
Alex Moreno bd82bb011a fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-31 08:44:30 +02:00
Sergio De la torre 1944a4f308 Merge branch 'dev' into 4021_packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 06:43:20 +00:00
Jorge Penadés eb15262fb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-31 08:37:28 +02:00
Sergio De la torre db1c352be3 feat: packaging refs #4021
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 18:06:35 +02:00
Jorge Penadés 002111d8d1 fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 11:47:12 +02:00
Jorge Penadés 5158017edd fix: refs #6889 fix back tests 2024-05-30 11:21:42 +02:00
Jorge Penadés 05e6e10337 fix: refs #6889 fix back tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-30 10:04:34 +02:00
Javi Gallego 7186686548 Merge branch 'dev' into 4560-GastosReparto 2024-05-30 09:44:06 +02:00
Javi Gallego 5e55f2d92d feat: refs # 6408 test ok
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-30 09:35:42 +02:00
Alex Moreno f9d25ccd6c hotFix(updateClaim): salesPerson undefined
gitea/salix/pipeline/head This commit looks good Details
2024-05-30 08:14:10 +02:00
Jorge Penadés a32db7840e feat: refs #6889 fixtures & models
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 16:54:24 +02:00
Javi Gallego d9d7904aaf refs: #7108 weekends
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 11:58:13 +02:00
Jorge Penadés fc606f7e36 fix: refs #6889 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 10:22:22 +02:00
Jorge Penadés 9d58c67b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-29 09:16:25 +02:00
Jorge Penadés d35bbe5c06 Merge branch 'dev' into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-29 07:00:17 +00:00
Guillermo Bonet f87ee5cb91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-29 08:09:53 +02:00
Jorge Penadés 885aa5208a feat : refs #6889 wip: check if is productionReviewer or owner
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 17:23:58 +02:00
Carlos Andrés dc3c92eef1 Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2519
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-28 11:34:04 +00:00
Jorge Penadés 56407e12a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 13:22:33 +02:00
Jorge Penadés 44e71b303c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 13:14:31 +02:00
Javi Gallego 1bcd7a9665 Merge branch 'dev' into 6408-rocketChat
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-28 12:46:37 +02:00
Carlos Andrés 6e5b41a886 Hotfix contabilizar DUA Ticket #188682
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:30:17 +02:00
Carlos Satorres b95009899c refs #7406 fix back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 12:22:11 +02:00
Javi Gallego 9ee05860f6 feat: #6408 tests 2024-05-28 12:19:54 +02:00
Alex Moreno 08856a9132 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-28 12:11:51 +02:00
Alex Moreno 8ec2a10cbf deploy: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:05:09 +02:00
Jorge Penadés 7cc86d5af0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:36:18 +02:00
Carlos Satorres 578b8a2c71 refs #7406 changes sql, modelconfig model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 14:28:13 +02:00
Robert Ferrús b404c7d101 Merge pull request 'test' (!2514) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2514
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:11:12 +00:00
Robert Ferrús f4426f5863 Merge branch 'test' into 7296-restoreExpeditionTruck
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-27 12:05:49 +00:00
Robert Ferrús df5f4a5a42 feat: refs #7296 fixAPPWarehouse 2024-05-27 14:05:31 +02:00
Guillermo Bonet c7a324bc27 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:57:53 +02:00
Jorge Penadés 9ecba10446 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 13:57:35 +02:00
Guillermo Bonet d384c5624f refactor: refs #7486 Deleted unused debugAll
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:57:27 +02:00
Jorge Penadés c136f2783a refactor: refs #6942 toUnbook & drop buyer acls 2024-05-27 12:34:27 +02:00
Carlos Satorres 208409acb2 refs #7406 add relation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 11:50:15 +02:00
Jorge Penadés dc90ad6595 fix: refs #6942 acls & back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-27 10:48:32 +02:00
Carlos Satorres 723327918b refs #7406 worker formation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 15:55:23 +02:00
Javi Gallego 0e5a15dd4e con addressFk 2024-05-24 15:14:20 +02:00
Jorge Penadés c76fd15f07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 08:46:16 +02:00
Carlos Satorres 2fc6f6356f Merge branch 'dev' into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 06:38:27 +00:00
Carlos Satorres a435d88e55 refs #7292 fix tback 2024-05-24 08:37:46 +02:00
Carlos Satorres a5079a5ae0 Merge branch 'dev' into 6095-refFk-null-on-search
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-24 06:26:46 +00:00
Sergio De la torre cee8fdd784 refs #6832 fix: ToItem
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 16:56:35 +02:00
Carlos Satorres 84582120d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 16:12:55 +02:00
Jorge Penadés 798b4f9df0 fix: refs #6942 toBook/toUnbook 2024-05-23 16:12:21 +02:00
Jorge Penadés 3e2abfea2c fix: refs #6942 merge
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 16:08:48 +02:00
Jorge Penadés 2cd3002d06 Merge pull request 'test' (!2506) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2506
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-05-23 14:07:21 +00:00
Carlos Andrés 14f243f251 Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2495
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-23 14:03:22 +00:00
Carlos Satorres f45f909995 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 14:46:33 +02:00
Carlos Satorres ee010a3bb3 refs #7296 fix pr errors, trad
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 14:44:47 +02:00
Jorge Penadés 4219b22553 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 14:13:17 +02:00
Sergio De la torre 0914925a86 refs #6964 feat: hasItemOlder 2024-05-23 13:43:00 +02:00
Carlos Andrés 35a583d6d8 Merge pull request 'test' (!2504) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2504
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-05-23 11:42:23 +00:00
Pablo Natek 86a6211cd8 fix: refs #7187 fix duplicate
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-23 12:23:31 +02:00
Guillermo Bonet 33f1ed360b refactor: refs #7457 Added from param if not exists
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-23 12:16:12 +02:00
Carlos Satorres 49c105ae09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6095-refFk-null-on-search
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-23 11:54:48 +02:00
Carlos Satorres 83f638323a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7292-createAddresUEEMember
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 16:09:52 +02:00
Sergio De la torre 49fed4e51e refs #6964 feat: hasItemOlder 2024-05-22 12:23:33 +02:00
Jorge Penadés 60fa55566c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-22 09:13:58 +02:00
Pablo Natek 2142b78deb feat: refs #7187 Add support for multiple PDAs per user
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-21 19:25:18 +02:00
Jorge Penadés 365e5a3ba3 fix: refs # 7400 ledger_next
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-21 17:31:29 +02:00
Alex Moreno 28279b0782 Merge branch 'dev' into 7421-fix_checking_NODE_ENV
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 13:12:30 +00:00
Alex Moreno ff33c926af fix: move to boot
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 15:11:32 +02:00
Alex Moreno 18bb8a4ea5 fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-21 13:50:45 +02:00
Guillermo Bonet 6e06891937 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 11:44:26 +02:00
Guillermo Bonet d672385776 hotfix: Rectificación Pepe
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 11:44:11 +02:00
Pablo Natek b39f953898 Merge branch 'dev' into 7187-redirect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 08:21:40 +00:00
Carlos Satorres 9bd5244f64 refs #7292 hook ueemember 2024-05-21 10:19:21 +02:00
Guillermo Bonet 6f9826421d refactor: refs #7422 Fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 09:39:09 +02:00
Pablo Natek 8e5d12a6cb Merge branch 'dev' into 7187-redirect
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 07:18:06 +00:00
Pablo Natek 1fef00789f fix: refs #7187 remove bindings
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 08:54:53 +02:00
Javier Casado d0bb9d7690 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 05:50:49 +00:00
Pablo Natek 335b9caaa4 fix: refs #7187 got summary before lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 01:10:53 +02:00
Jorge Penadés 50dbc5c515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 15:36:09 +02:00
Ivan Mas 52400ab626 refs #7393 Modify night ticket closing report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 15:17:41 +02:00
Robert Ferrús 823e8fd7a1 feat: refs #7296 requested changes3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:27:38 +02:00
Robert Ferrús 34f48e46e7 feat: refs #7296 requested changes2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:19:01 +02:00
Jorge Penadés 40762ba4aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:34:37 +02:00
Robert Ferrús 996f14341d Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:31:13 +00:00
Robert Ferrús 62ca4885c4 feat: refs #7296 requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:28:27 +02:00
Alex Moreno 9cba2be00d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 11:31:24 +02:00
Alex Moreno f82b105430 fix: TicketLog res.data
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 11:30:43 +02:00
Carlos Satorres 6d66c0f71f hotfix TicketLog filter
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-20 11:14:30 +02:00
Jorge Penadés 741c995c31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-20 10:30:38 +02:00
Jorge Penadés 480daea26f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 08:54:17 +02:00
Robert Ferrús e67981b382 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 06:44:31 +00:00
Carlos Satorres cbbd488674 Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-20 06:27:33 +00:00
Guillermo Bonet 18ce388944 Merge branch 'test' into dev 2024-05-20 06:59:42 +02:00
Carlos Satorres 05f09d0b87 refs #7187 fix workerPda
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:56:40 +02:00
Pablo Natek 7fb6ecd617 feat: refs #7187 redirect to lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:46:49 +02:00
Jorge Penadés f36f5fa5df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:39:35 +02:00
Carlos Satorres dd7ee27e9b refs #7396 fix worker model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:28:28 +02:00
Jorge Penadés 1f1a49d0a5 refactor: refs #6889 use addSale
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:20:33 +02:00
Javier Casado 5ee550ebf7 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:08:41 +00:00
Guillermo Bonet 968effc936 hotfix: ticket 135539 Unroute tickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-17 11:56:04 +02:00
Pablo Natek 47c573a324 fix: refs #6095 filter by refFk null
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-17 10:51:37 +02:00
Pablo Natek 1372f817bd fix: refs #7187 model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:05:22 +02:00
Pablo Natek b299e842b9 fix: refs #7187 model foreignKey
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:04:21 +02:00
Pablo Natek 4cf5457690 fix: refs #7187 remove focus on spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:01:41 +02:00
Pablo Natek 1abacdc42b fix: refs #7187 method
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 14:00:42 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 10:23:33 +02:00
Robert Ferrús 11a0b98495 feat: refs #7296 roadmapStop
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-16 10:20:08 +02:00
Alex Moreno 8260016da5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:53:07 +02:00
Carlos Satorres 4b8cad9aef hotfix accessScopes
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:23:36 +02:00
Carlos Satorres a4e1b1931c hotfix accessScopes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-15 12:38:30 +02:00
Juan Ferrer e469fb2da4 Merge pull request 'test' (!2456) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2456
2024-05-15 06:57:05 +00:00
Javi Gallego 0894cbd38c Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2422
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-14 13:45:11 +00:00
Sergio De la torre edb024a1f9 refs #6106 hotFix: getTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 10:14:53 +02:00
Robert Ferrús eeb36a6810 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 06:32:45 +00:00
Alex Moreno 3798509206 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 07:51:04 +02:00
Robert Ferrús c6f7a0768a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 05:49:39 +00:00
Alex Moreno 6251493adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 14:24:31 +02:00
Jorge Penadés b902a1a7f7 Merge branch 'dev' into 5919-locker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:02:17 +00:00
Jorge Penadés 1f39330041 fix: refs #5919 drop focus 2024-05-13 14:00:19 +02:00
Jorge Penadés 5d5f1ef7c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 13:20:32 +02:00
Jorge Penadés e16e5e3db3 feat: refs #5919 back test 2024-05-13 13:19:28 +02:00
Carlos Satorres ac4cc1506b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:18:03 +02:00
Guillermo Bonet 799108f041 fix: refs #7345 Fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 11:23:29 +02:00
Pablo Natek a797fca2dd feat: refs #7187 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-13 08:30:20 +02:00
Javier Casado 03f0de489e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 05:40:25 +00:00
Jorge Penadés cbb7cb18eb fix: refs #5919 delete locker field 2024-05-10 16:02:50 +02:00
Alex Moreno a7910d9894 hotFix(invoiceInPdf): fix accessScopes
gitea/salix/pipeline/head This commit looks good Details
2024-05-10 14:58:52 +02:00
Jorge Penadés 8943bc7115 fix: refs #5919 back tests 2024-05-10 14:04:34 +02:00
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Guillermo Bonet 13ed86d26d Fix: refs #7126 Tests back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:06:49 +02:00
Guillermo Bonet b1e136aa47 Fix: refs #7126 Tests back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 11:05:20 +02:00
Robert Ferrús 35f69b8692 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 07:21:05 +00:00
Jorge Penadés 4e7d0e6469 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 08:28:06 +02:00
Jon Elias 6207d79244 Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2412
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-10 04:51:41 +00:00
Jorge Penadés 7f4965879c fix: refs #5919 get locker by relation 2024-05-09 15:54:34 +02:00
Carlos Satorres fcd1b5e351 Merge pull request 'refs #6877 add attenderFk' (!2427) from 6877-modPeticionesCompra into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-09 10:53:10 +00:00
Robert Ferrús 0498b425b3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 10:51:18 +00:00
Jorge Penadés 035782414f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:47:25 +02:00
Carlos Satorres 0f52fe65d3 refs #7360 fix error weekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 09:46:40 +02:00
Pablo Natek 98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-09 09:09:00 +02:00
Jorge Penadés dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 08:45:17 +02:00
Jon Elias 620dd3d836 Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 08:05:24 +02:00
Jon Elias 58aedf160b refactor: refs #6739 changed translations' keys 2024-05-09 08:05:23 +02:00
Jon Elias 0f973baa65 Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:31:32 +00:00
Jon Elias 77c2f61f47 refs #6739 move petitions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:30:20 +02:00
Jon Elias 72da046ead Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 14:12:11 +02:00
Jon Elias 9d75ba0bc5 refactor: refs #6739 default params 2024-05-08 14:12:10 +02:00
Carlos Satorres 0d43d9a982 refs #6877 remove restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 13:20:45 +02:00
Carlos Satorres f64e899061 Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:27:20 +00:00
Carlos Satorres 7b298c1baf refs #6882 fix tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:24:05 +02:00
Carlos Satorres fa2c4de562 Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:21:19 +00:00
Carlos Satorres 8a7d124066 refs #6882 fix traductions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 12:17:44 +02:00
Carlos Satorres 0709a64dca refs #6882 fix back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:05:47 +02:00
Carlos Satorres 269c42e5c9 Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 11:47:06 +02:00
Carlos Satorres c355595384 refs #6882 fix back, tback te2e 2024-05-08 11:47:04 +02:00
Jorge Penadés 26ff5e8fa9 feat; refs #5919 WIP acls 2024-05-08 11:03:18 +02:00
Jorge Penadés d0c9e83504 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-08 10:35:07 +02:00
Carlos Satorres c0b4a931a6 Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 07:55:26 +00:00
Carlos Satorres 8637488fc1 refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:19 +02:00
Javi Gallego 8e1c84ec4b feat: #7333 ticket with refund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 15:33:18 +02:00
Carlos Satorres 5e8e09cbae refs #6877 add attenderFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 13:42:58 +02:00
Guillermo Bonet 6e9ea9665d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 13:18:46 +02:00
Guillermo Bonet 0d7d4917a7 Merge branch 'master' into test 2024-05-07 13:18:28 +02:00
Jorge Penadés 7d07c513b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 13:06:47 +02:00
Jorge Penadés 0f5e2dcc54 fix: refs #6938 rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 11:47:22 +02:00
Jon Elias 5e96049e65 Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 09:36:26 +00:00
Jon Elias d4f734455d refactor: refs #6739 transferInvoice() refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 11:35:05 +02:00
Carlos Satorres 19c729d5fd Merge branch 'dev' into 6842-errorCalendar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 06:55:05 +00:00
Robert Ferrús 1610b9bd0a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 05:11:02 +00:00
Jon Elias 4e78307a8d feat: refs #6739 transferInvoice new functionality
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 14:51:53 +02:00
Alex Moreno f23924e792 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-06 14:31:41 +02:00
Carlos Andrés 14a1c5cbbb Merge pull request 'master' (!2408) from 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
Reviewed-on: #2408
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-05-06 12:22:04 +00:00
Robert Ferrús b57be129e3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:27:21 +00:00
Carlos Satorres bc5f78827c Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:09:21 +00:00
Javi Gallego 633a3c481c Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 07:42:38 +00:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-06 09:26:14 +02:00
Robert Ferrús 87e85e4a4e Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 05:08:07 +00:00
Jorge Penadés 40b2c32a00 feat: refs #6243 show all cmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 17:37:36 +02:00
Carlos Satorres e15b8eee30 refs #6842 worker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:54:12 +02:00
Pablo Natek 699684bd65 feat: refs #7187 add sim column to the model and id 2024-05-03 14:22:48 +02:00
Pablo Natek 95aba9e7b3 Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2292
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-03 11:52:22 +00:00