Commit Graph

1554 Commits

Author SHA1 Message Date
Carlos Satorres 318f74072e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6757-supplierMayus
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-06 10:09:11 +01:00
David Domenech 0aed49d603 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-02-06 07:29:42 +01:00
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 06:39:51 +01:00
Alex Moreno 691853df49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-05 12:55:16 +01:00
Juanjo Breso 592e5c877f Merge branch 'dev' into 5167-kk-warehouseAlias-y-warehouseJoined
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-05 06:49:51 +00:00
Alex Moreno d5e6750998 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack 2024-02-02 09:36:41 +01:00
Jorge Penadés ec7a88c6dd fix: refs #6703 tests, backs & fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-01 12:56:11 +01:00
Guillermo Bonet 548526964e Merge branch 'dev' into 6184-saveCmr 2024-02-01 06:23:25 +00:00
Carlos Satorres aa993e7386 refs #6757 fix back, fix upperCase, fix e2e back
gitea/salix/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 17:01:47 +01:00
David Domenech a81a42c2e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6372-Delete-views-from-vn2008 2024-01-31 14:43:16 +01:00
Robert Ferrús 57c5c510ff Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/head This commit looks good Details
2024-01-31 10:05:46 +00:00
Jorge Penadés 2c1b8bd9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-31 10:02:58 +01:00
Juanjo Breso 18772c04f6 feat: refs #5167 update
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-31 09:38:57 +01:00
Sergio De la torre f88cef6745 refs #6186 feat:deprecated packingShelve 2024-01-31 08:45:52 +01:00
Jorge Penadés 88dfdb157f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-30 11:25:17 +01:00
Guillermo Bonet 34f7345315 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:44:04 +00:00
Guillermo Bonet 1e56e741e2 fix: #6184 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 09:44:10 +01:00
Robert Ferrús 22fa1d4c3f Merge branch 'dev' into 6371-limpiezaTablasVn2008Part1
gitea/salix/pipeline/head Build queued... Details
2024-01-30 09:23:16 +01:00
Robert Ferrús 3a9eb100a1 feat: refs #6371 table vn2008 to vn
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 08:06:36 +01:00
Jorge Penadés a3442d4887 fix: refs #6276 fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 15:47:46 +01:00
Guillermo Bonet ed43b6be2d Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 14:38:14 +01:00
Alex Moreno cf0e74c457 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5509-entryDmsBack
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 11:37:53 +01:00
David Domenech abbda268f5 refs #6372 feat: vn2008 to vn
gitea/salix/pipeline/head Build queued... Details
2024-01-29 09:18:11 +01:00
Jorge Penadés 72e5050d93 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-29 08:37:55 +01:00
Juan Ferrer ce0684e6ff fix: refs #5483 myt updated, jenkins tests and fixtures fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-28 12:40:13 +01:00
Guillermo Bonet 49a08a96da Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 11:56:43 +00:00
Juan Ferrer 81639726b2 feat: refs #5483 final merge
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 00:09:24 +01:00
Juan Ferrer 1ad1e53970 feat: refs #5483 update db files
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-25 17:33:54 +01:00
Juan Ferrer a5cd4a671c Merge branch 'dev' into 5483-unifyDb 2024-01-25 17:31:19 +01:00
Pablo Natek 2e1b55448a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb
gitea/salix/pipeline/head Build queued... Details
2024-01-25 15:04:32 +01:00
Pablo Natek 3848503853 fix(test): refs #6743 exportDb
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 14:58:48 +01:00
Jorge Penadés e6335548ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2024-01-25 12:23:08 +01:00
Pablo Natek 01c21baa65 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6743-exportDb 2024-01-25 08:25:08 +01:00
Alex Moreno ece0c926dd refs #6745 fix: duplicate fixtures
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 14:52:49 +01:00
Alex Moreno 1c0f8acb87 refs #5871 fix: awb
gitea/salix/pipeline/head This commit looks good Details
2024-01-24 13:37:29 +01:00
Alex Moreno 701b039e97 refs #6743 feat: import db
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-24 08:23:17 +01:00
Jorge Penadés ae89d59bde feat: refs #6276 WIP test sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 15:58:09 +01:00
Jorge Penadés 08dd37e9e4 feat: refs #6276 test sectorCollection_getSales
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 12:13:23 +01:00
Guillermo Bonet 12bfb8ca77 feat: #6184 Added tests and process.env.IS_SPEC_RUNNING 2024-01-23 11:05:39 +01:00
Jorge Penadés dcf6232c14 feat: refs #6276 test sale_getFromSectorCollection
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-23 08:39:30 +01:00
Jorge Penadés 89d18e29f0 feat: refs #6276 test saleTrackingReplace (updateTracking)
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-22 07:49:21 +01:00
Jorge Penadés 5c0425b942 feat: refs #6276 test machineWorker_update
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-19 09:52:49 +01:00
Alex Moreno 7ea1fbfb26 refs #5509 feat: entryDms funcionality
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 15:09:52 +01:00
Jorge Penadés 19edd7868e feat: refs #6276 test getVersion
gitea/salix/pipeline/head This commit looks good Details
2024-01-18 14:18:21 +01:00
Jorge Penadés 1fbb84ae9f fix: refs #6276 itemShelving_return
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 12:58:57 +01:00
Jorge Penadés 90b1e8d664 fix: refs #6276 backend tests
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-17 10:18:13 +01:00
Jorge Penadés 54192c54ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 13:56:32 +01:00
Juan Ferrer 74a4e486aa refs #6661 Propagate changes from vn-database
gitea/salix/pipeline/head This commit looks good Details
2024-01-15 13:12:15 +01:00
Juan Ferrer b7edbbe12f feat: refs #5483 Copy vn-database project 2024-01-15 12:31:03 +01:00
Alex Moreno 14fff571b5 Merge branch 'dev' into 6353-ratingCatalog
gitea/salix/pipeline/head This commit looks good Details
2024-01-12 08:52:51 +00:00
Jorge Penadés ddcecb8f22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 16:52:54 +01:00
Javi Gallego c98baf21bf Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 12:17:59 +00:00
Jorge Penadés c61f5a67b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-11 09:28:24 +01:00
Carlos Satorres 980ca81bfc refs #6353 fixtures catalog rating
gitea/salix/pipeline/head This commit looks good Details
2024-01-10 09:38:20 +01:00
Jorge Penadés ab1dc7af55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-08 16:21:46 +01:00
Carlos Satorres 782772bffc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI
gitea/salix/pipeline/head This commit looks good Details
2024-01-08 09:54:50 +01:00
Javi Gallego 406cf7335b Merge branch 'dev' into 3979-abonarTicketsSinAlmacen
gitea/salix/pipeline/head This commit looks good Details
2024-01-05 07:12:12 +00:00
Pablo Natek 2e5ae062cf Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 14:24:24 +00:00
Javi Gallego 767c6a6ac8 test: refs #3979 fixtures arregladas para que los abonos sean negativos
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 15:01:56 +01:00
Jorge Penadés 6d0e1cc47c refactor: fix conficts refs #6276 2024-01-04 08:51:18 +01:00
Alex Moreno 23b544c1ec refs #6635 fix: add translation
gitea/salix/pipeline/head This commit looks good Details
2024-01-04 08:19:48 +01:00
Pablo Natek 847623f9c6 Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 18:28:46 +00:00
Jorge Penadés bce8feb552 refs #6276 add maxHours
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 10:41:44 +01:00
Carlos Satorres 12165ab382 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail
gitea/salix/pipeline/head This commit looks good Details
2024-01-03 08:31:07 +01:00
Jorge Penadés 767894b128 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse 2024-01-02 09:41:47 +01:00
Alex Moreno dd02a932ef Merge branch 'test' into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head This commit looks good Details
2024-01-02 06:40:18 +00:00
Carlos Satorres c77715d865 refs #6291 validation original
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 15:03:10 +01:00
Javier Segarra 613327491b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-22 09:26:16 +01:00
Pablo Natek 35750bc93f merge(dev): refs #6259 merge dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:46:12 +01:00
Pablo Natek 27a369bef4 refactor(ticketSms): refs #6259 merge ticksms to clientsms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 18:34:22 +01:00
Javier Segarra 100936d40b Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 12:05:27 +00:00
Carlos Satorres 73d1c1698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI 2023-12-21 12:38:58 +01:00
Alex Moreno 9951e911ae refs #5925 feat(docuware_upload): use userConfig.tabletFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 10:39:46 +01:00
Alex Moreno 7b0c5fe0a0 refs #5739 fix: sql
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 08:33:50 +01:00
Javier Segarra 72e9b69d7e Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:04:41 +00:00
Javier Segarra dbc3fc8007 refs #5858 perf: remove bad comments
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 08:02:38 +01:00
Javier Segarra 5b6112720f refs #5858 feat: new fixture 2023-12-19 07:54:29 +01:00
Carlos Satorres 22a9ffc163 refs #6291 dni
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 12:33:04 +01:00
Alex Moreno 59f2e3d0e6 refs #5914 fix: remove unnecessary
gitea/salix/pipeline/head Build queued... Details
2023-12-15 08:54:41 +01:00
Alex Moreno 21a1dbeae7 refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:56:49 +01:00
Alex Moreno 1ce1af82fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2023-12-14 15:55:21 +01:00
Alex Moreno d7454cdb19 refs #6576 fix: correct version
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 11:41:59 +01:00
Jorge Penadés 1f2d475f05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 08:41:45 +01:00
Javier Segarra 1e89ed6cdc Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 14:39:10 +00:00
David Domenech 9bcd0a3c98 Merge branch 'dev' into 6125-roleCreditLimitFix
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 11:29:46 +00:00
Jorge Penadés 8d61473d4f refs #6276 fixtures & itemBarcode_delete
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 11:43:19 +01:00
Jorge Penadés a4c3d78e31 refs #6276 drop fixtures & fix getSale
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 09:45:01 +01:00
David Domenech ee6ad55e66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 09:43:20 +01:00
Pablo Natek 69dd34665f refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 08:50:17 +01:00
Jorge Penadés 01fa0b1d36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 08:35:11 +01:00
Javier Segarra d44cdcbd13 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-13 06:14:55 +00:00
Alex Moreno ea39f8b3be remove duplicate
gitea/salix/pipeline/head This commit looks good Details
2023-12-12 12:25:51 +01:00
Jorge Penadés e27bf2ef8b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 08:29:35 +01:00
Carlos Satorres 866ad7a9f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail 2023-12-11 08:20:19 +01:00
Alex Moreno f874faa921 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-11 07:47:55 +01:00
Javi Gallego 7ff8ec93ff Merge pull request 'test' (!1879) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1879
2023-12-06 07:54:13 +00:00
Javier Segarra a8b0a7a5b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-04 14:46:21 +01:00
Carlos Satorres 6d486fbec9 refs #6085 trad, remove front, back test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 13:58:45 +01:00
Jorge Penadés 30b63f577f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 09:49:49 +01:00
Javier Segarra db06620d7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-01 09:39:47 +01:00
Alex Moreno e634a5e213 refs #5914 feat: create getTaxBases and use in negatives and positives procedures 2023-11-30 15:15:40 +01:00
David Domenech eb0766bafd Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-30 14:08:47 +00:00
David Domenech 8ab981907d refactor(ticketTracking.userFk): refs #6398 workerFk to userFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 14:25:00 +01:00
Pablo Natek c457b5c4d2 Merge branch 'test' into 3271-zoneGetFilterdFix
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:39:26 +00:00
Alex Moreno ee7dd66ce9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:49:42 +01:00
Alex Moreno ab69dcd4fe refs #6524 fix: fixtures and feat: new changelog format
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:32:41 +01:00
Pablo Natek 3f22f48df7 fix(getFiltered): refs #3271 fix to event filter
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 12:13:12 +01:00
Jorge Penadés 25a0ffcfde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-30 09:49:50 +01:00
Javier Segarra 97d7f8356f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken 2023-11-30 07:08:23 +01:00
Javi Gallego d246b5f9a8 Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 15:26:51 +01:00
Jorge Penadés 133fe1065a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:44:09 +01:00
Alex Moreno 2e22984e77 refs #6197 fix: add salix role in fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:13:54 +01:00
Javi Gallego 2fa56cce4b fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 09:22:00 +01:00
Javier Segarra 901a44cc62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:48:31 +01:00
Alex Moreno 824ca1d70a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 07:42:50 +01:00
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 12:42:25 +01:00
Javier Segarra 5d156e81ca refs #5858 perf: move files to current version folder 2023-11-23 15:18:09 +01:00
Jorge Penadés f862ed7d8a refs #6274 refactor updateInTime
gitea/salix/pipeline/head This commit looks good Details
2023-11-23 13:19:59 +01:00
Jorge Penadés a60a30128c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-22 15:40:11 +01:00
Guillermo Bonet d52c82fb19 Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 11:36:07 +00:00
Jorge Penadés 40bbad04c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6276-createNewWarehouse
gitea/salix/pipeline/head This commit looks good Details
2023-11-22 10:16:12 +01:00
Jorge Penadés 251578146e refs #6276 several methods created
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 12:32:36 +01:00
Guillermo Bonet b3d1c72adc Merge branch 'dev' into 4502-zoneEstimatedDelivery
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:41 +00:00
Alex Moreno e909c2bc26 Merge branch 'dev' into 6454-dbDump
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 09:13:17 +00:00
Jorge Penadés 34e5409533 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 08:19:11 +01:00
Alex Moreno ee1a0c15ee refs #6454 feat: dump db
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 15:09:55 +01:00
Guillermo Bonet 61b2d4c5fd refactor: refs #4502 zoneEstimatedDelivery 2023-11-20 09:47:57 +01:00
Alex Moreno 0ddfb28327 refs #5914 fix: transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 07:56:15 +01:00
Alex Moreno 7951b874a6 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-20 06:39:50 +00:00
Javi Gallego a4328e607e Merge branch 'dev' into 6207-incoterm-solo-en-serie-world
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 10:11:05 +01:00
Alex Moreno 2a67048594 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 15:54:47 +01:00
Alex Moreno 88ec0f24c3 ref #5914 rename table
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 15:45:52 +01:00
Alex Moreno 2cd9c9c688 Merge branch 'dev' into 5914-warmfix-renameTable
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 09:36:47 +00:00
Alex Moreno 69255fe2fc refs #6014 feat(execute): use user_hasRoutinePriv. feat(execute): split in executeProc & executeFunc
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 10:58:58 +01:00
Jorge Penadés 40b9a83606 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:59:12 +01:00
Jorge Penadés 52f1843580 ref #5835 due day new and fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:00:49 +01:00
Jorge Penadés b07858fddb ref #5914 replace name
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 14:33:46 +01:00
Alex Moreno 52f419d4cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-11-09 09:33:22 +01:00
Alex Moreno 973eff4520 refs #6415 fix. sql files
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 09:05:56 +01:00
Alex Moreno 204323ac69 test(notification_getList): fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 14:57:07 +01:00
Javi Gallego 9d54618620 fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 10:01:02 +01:00
Javier Segarra 43366d1ba8 refs #6264 feat: update fixture.sql 2023-11-04 17:24:04 +01:00
Alex Moreno d06810b1b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 14:58:55 +01:00
Alex Moreno 83b9ef72fc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 08:47:44 +01:00
Alex Moreno 742d6de986 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 07:28:41 +01:00
Jorge Penadés 1231d6dd1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-24 08:34:42 +02:00
Carlos Andrés 6e3517b40f refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 14:51:09 +02:00
Pablo Natek f26595bb62 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 12:15:43 +00:00
Alex Moreno cadec7d01f Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 11:36:14 +00:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Pablo Natek e2f7ce8b35 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 08:58:50 +00:00
Alex Moreno a916007314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail 2023-10-18 07:20:34 +02:00
Guillermo Bonet e1c1d1a556 refs #6199 Fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-10-13 12:33:39 +02:00
Jorge Penadés 179d8ab87d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 11:30:53 +02:00
Pablo Natek 020de5d754 Merge branch 'dev' into 3126-changePackageFkTopackagingFk
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-05 07:57:46 +00:00
Alex Moreno 7a6022efd4 Merge branch 'dev' into 6216-saleLog_open_ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 06:31:54 +00:00
Alex Moreno ca86b3cc2f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 07:27:35 +02:00
Alex Moreno 4545a63214 refs #6067 feat(vnUser): verifyEmail redirect to lilium
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-02 14:51:19 +02:00
Alex Moreno b33700abc9 refs #6216 feat(ticket_sale): open filtered ticketLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-29 11:57:25 +02:00
Jorge Penadés d4e78ea889 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-09-29 08:16:12 +02:00
Alex Moreno f3c55cdee9 refs #5929 fix(isEditable): can edit if is weekly
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 16:00:09 +02:00
Alex Moreno 28dfb895ca refs #6224 deploy: correct sql folder and fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:49:58 +02:00
Jorge Penadés 4b213c1c9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 13:31:45 +02:00
Jorge Penadés 463fc8ae95 ref #5914 added fixtures in English
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-28 08:20:59 +02:00
Sergio De la torre 22f71e6147 Merge branch 'dev' into 5134-ModelsSalix
gitea/salix/pipeline/head This commit looks good Details
2023-09-28 08:18:15 +02:00
Jorge Penadés 474399b383 ref #5914 refactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-25 15:23:51 +02:00
Jorge Penadés f64f7a975d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:51:20 +02:00
Alex Moreno d43b70c971 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:30:28 +02:00
Alex Moreno cf36b10763 refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:29:48 +02:00
Pablo Natek a854fff94f refs #3126 changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-22 10:59:48 +02:00
Carlos Satorres 1f1dfae7e3 refs #5843 changes models
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 12:50:07 +02:00
Jorge Penadés ac4aea7d38 ref #5914 created transfer issued invoice
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 09:14:46 +02:00
Carlos Satorres cd20a2d06d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 07:32:19 +02:00
Jorge Penadés 5b818cef0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 15:25:20 +02:00
Carlos Satorres f92acdfe6f Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 09:52:32 +00:00
Jorge Penadés 87cee57e56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 10:47:53 +02:00
Javi Gallego 29a186fa18 Merge branch 'dev' into 6241--arreglar--dbTest
gitea/salix/pipeline/head Build queued... Details
2023-09-20 08:18:46 +02:00
Javi Gallego 45cf1b1ff3 fixes #6241 dbTest fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-20 08:12:07 +02:00
Carlos Satorres daf5b343fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-19 13:58:13 +02:00
Carlos Satorres cfd080530a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-18 11:49:03 +02:00
Sergio De la torre b756d2f938 refs #5652 modify
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 18:03:30 +02:00
Sergio De la torre 43f5bbb04e Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 09:05:55 +02:00
Sergio De la torre d2cd522842 refs #5652 modify:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 07:47:10 +02:00
Carlos Satorres 0ddcb57209 refs #5660 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-09-12 10:40:10 +02:00
Carlos Satorres 49e635ff4b refs #5660 dump dumpedFixtures 2023-09-11 13:49:18 +02:00
Carlos Satorres 62a4469803 refs #5660 cambios structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 11:34:23 +02:00
Carlos Satorres 544259df9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-11 10:47:21 +02:00
Carlos Andrés 0465c2ca54 Merge branch 'dev' into 6176-book-entry-deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 19:27:02 +00:00
Carlos Andrés 0d2db7749f refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 21:22:10 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Sergio De la torre 022d3d08e6 refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-01 12:34:33 +02:00
Javi Gallego 734b948aac refs #6173 back test fixed and fixtures refactored 2023-09-01 11:52:48 +02:00
Javi Gallego 92789ba3de refs #6173 fixed backTest 2023-08-31 10:04:28 +02:00
Javi Gallego e498bba37b initial dump 2023-08-31 08:41:19 +02:00
Carlos Satorres 0b9199688e refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-30 12:48:57 +02:00
Carlos Satorres 91c6ab9e44 refs #5843 edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-22 12:50:27 +02:00
Jorge Penadés 040f5be85c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-18 12:18:30 +02:00
Juan Ferrer 5924303ae2 refs #5483 Dumped fixtures for vn.time removed
gitea/salix/pipeline/head This commit looks good Details
2023-08-14 09:53:53 +02:00
Alex Moreno 9ef4ba9bef refs #5134 feat: add saleMistake model
gitea/salix/pipeline/head This commit looks good Details
2023-08-11 12:32:49 +02:00
Carlos Satorres 8807b9f87f fix upper
gitea/salix/pipeline/head This commit looks good Details
2023-08-10 09:58:48 +02:00
Carlos Satorres aff6668dc9 remove names upper
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:33:06 +02:00
Carlos Satorres 5653a39e3b fix fixtures names, socialnames streets
gitea/salix/pipeline/head This commit looks good Details
2023-08-09 13:10:05 +02:00
Jorge Penadés 7ca6c6b96d refs #5914 fix merge 2023-08-08 15:10:15 +02:00
Carlos Satorres 183fdacefc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-03 10:01:11 +02:00
Jorge Penadés 7513323156 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-07-31 07:53:36 +02:00
Jorge Penadés 50155cea8d refs #5914 WIP transfer invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 15:21:43 +02:00
Vicent Llopis fbc1e28031 Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-28 07:54:26 +00:00
Carlos Satorres 0546ae99eb refs #5660 add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-27 17:27:06 +02:00
Carlos Satorres af60412232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-07-27 17:24:50 +02:00
Sergio De la torre 85c017431c refs #5983 fix(itemShelving): fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-19 07:01:43 +02:00
Alex Moreno 2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:53:17 +00:00
Sergio De la torre 9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:11:50 +02:00
Vicent Llopis 09b00401ec Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 05:56:35 +00:00
Guillermo Bonet 3c013110d3 refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 07:32:45 +02:00
Carlos Satorres 6f3cdd3508 refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 12:30:48 +02:00
Carlos Satorres b113052b5c refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:48:36 +02:00
Vicent Llopis 01dc26f64e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:42:53 +02:00
Vicent Llopis 17b2b02246 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 09:16:32 +02:00
Alex Moreno 219a4fbca9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-12 13:09:58 +02:00
Vicent Llopis a831a1534b Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-11 11:50:15 +00:00
Alex Moreno 8922d27f20 refs #4614 fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-07 12:25:02 +02:00
Vicent Llopis 6fa6c21cb1 remove fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-07-07 09:31:26 +02:00
Alex Moreno be0120728d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight 2023-07-06 15:15:36 +02:00
Alex Moreno a665b6c060 refs #5970 fix sql
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 11:51:04 +02:00
Alex Moreno 63a8f40443 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-07-06 10:42:53 +02:00
Alex Moreno 040e9e4197 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4614-ticket_weight
gitea/salix/pipeline/head This commit looks good Details
2023-07-05 12:50:45 +02:00
Vicent Llopis e58d4e5db3 refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good Details
2023-07-04 14:42:51 +02:00
Pablo Natek 2ccf8d5197 refs #5347
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 14:49:21 +02:00
Alex Moreno 461e1d4d5d refs #5475 feat: userUses, fix forbiddenError and merge in dev
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 13:33:48 +02:00
Alex Moreno 7fe8698b6f refs #5753 fix ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-07-03 10:04:03 +02:00
Alex Moreno d1fb2859be Merge branch 'dev' into 5753_232401_db_dump
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-03 06:59:42 +00:00
Alex Moreno f636c3b1ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-06-30 11:57:56 +02:00
Alex Moreno ff320895a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5753_232401_db_dump 2023-06-30 08:23:00 +02:00
Alex Moreno c6bee8f2f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 14:50:06 +02:00
Carlos Andrés 1d993c74e5 refs #5590 fix total invoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-06-29 10:39:07 +02:00
Vicent Llopis e3e0c7e97a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5774-ticket.lines_evitarCantidadNegativa
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:31:54 +02:00
Alex Moreno 8723cf2958 refs #5753 fix legacy bugs
gitea/salix/pipeline/head This commit looks good Details
2023-06-28 14:10:21 +02:00
Carlos Satorres 3bea23c52a refs #5660 delivery acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-28 11:30:45 +02:00
Carlos Satorres a930963ef9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-06-27 12:34:37 +02:00
Alex Moreno e43e52b561 refs #5753 db export and fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-26 15:21:45 +02:00
Alex Moreno 798481b24a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-06-26 07:53:44 +02:00
Juan Ferrer 47a4a9950f refs #5772 Parallelism added to PDF generation
gitea/salix/pipeline/head This commit looks good Details
2023-06-23 11:42:30 +02:00
Alex Moreno 6ab431f8ef refs #5475 tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 14:17:25 +02:00
Carlos Satorres 9870cc7b14 refs #5660 change assist
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 13:34:27 +02:00
Alex Moreno d6c504d3bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-21 07:53:40 +02:00
Vicent Llopis f6cb1cb130 Merge branch 'dev' into 5554-renovar_token
gitea/salix/pipeline/head This commit looks good Details
2023-06-20 12:07:52 +00:00
Alex Moreno dd157d59d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa
gitea/salix/pipeline/head There was a failure building this commit Details
2023-06-16 13:42:13 +02:00
Vicent Llopis 425118d333 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 13:09:38 +02:00
Carlos Satorres 0eca606de0 Merge branch 'dev' into 5660-changeRolDeliveryAssistant
gitea/salix/pipeline/head This commit looks good Details
2023-06-16 07:29:30 +00:00
Sergio De la torre 1f454e6219 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje
gitea/salix/pipeline/head This commit looks good Details
2023-06-15 07:22:10 +02:00