Commit Graph

20526 Commits

Author SHA1 Message Date
Sergio De la torre 957b0c71ca refs #6574 feat: add order 2024-04-08 10:06:33 +02:00
Robert Ferrús 9af87f5cf2 Merge pull request 'feat: refs #6738 crear las Fk de la tabla flight' (!2054) from 6738-cleanTables2008Part2to2 into dev
Reviewed-on: #2054
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-05 11:51:21 +00:00
Robert Ferrús cf5113c5a6 Merge branch 'dev' into 6738-cleanTables2008Part2to2 2024-04-05 10:23:55 +00:00
Alex Moreno 0af3713a07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-04-05 10:33:47 +02:00
Alex Moreno 03fb52bf6f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-04-05 10:33:26 +02:00
Alex Moreno 273507d3b7 Merge pull request 'refs #7167 deploy: dump' (!2260) from 7167-dump into master
Reviewed-on: #2260
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-04-05 08:32:07 +00:00
Alex Moreno 2f4cd2bc7b refs #7167 fix: acl mailAlias 2024-04-05 10:05:51 +02:00
Alex Moreno ed95545de6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7167-dump 2024-04-05 10:00:34 +02:00
Javier Casado db618b819c Merge pull request 'refs #6816 remove tittle MicroSip' (!2248) from 6816-removeMicroSip into dev
Reviewed-on: #2248
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:56:44 +00:00
Javier Casado 6f2b3ea059 Merge pull request 'refs #6324 remove column and dependencies' (!2255) from 6324-removePackageFk into dev
Reviewed-on: #2255
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:55:46 +00:00
Javier Casado bf3eb51bad Merge pull request '#7123 - creditRequestChange' (!2238) from 7123-creditRequestChange into dev
Reviewed-on: #2238
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:29:43 +00:00
Guillermo Bonet 0cd4013f5e Merge branch 'test' into dev 2024-04-05 07:51:19 +02:00
Guillermo Bonet f067adb6b9 Merge branch 'master' into test 2024-04-05 07:50:46 +02:00
Guillermo Bonet 7ea917dc4d hotfix: #6875 packing DEFAULT 1 2024-04-05 07:49:37 +02:00
Sergio De la torre cf10ed0f13 Merge pull request '#6964 _ itemOlder' (!2197) from 6964_itemOlder into dev
Reviewed-on: #2197
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-04 14:18:19 +00:00
Sergio De la torre 2ed5237568 Merge branch 'dev' into 6964_itemOlder 2024-04-04 13:45:20 +00:00
Alex Moreno a6e4bdd7ac refs #7167 deploy: dump 2024-04-04 15:02:41 +02:00
Robert Ferrús efcb7a9d50 Merge pull request 'refs #169673 item_getSimilar' (!2252) from 169673-item_getSimilar into dev
Reviewed-on: #2252
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-04 12:43:26 +00:00
jcasado f9ef45f1d9 refs #6324 remove doc 2024-04-04 14:01:30 +02:00
jcasado f5943e4445 refs #6324 remove column and dependencies 2024-04-04 13:57:23 +02:00
Alex Moreno 20e4ab1d2c Merge pull request 'hotFix: handle mail error' (!2253) from hotFix_handleMailErrors into master
Reviewed-on: #2253
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-04-04 11:35:09 +00:00
Alex Moreno dd9c7283c3 hotFix: handle mail error 2024-04-04 13:32:39 +02:00
Robert Ferrús 9801279370 refs #169673 item_getSimilar 2024-04-04 13:28:29 +02:00
Javier Segarra 0ef2166004 Merge pull request '5858_fix_zone-incldued_HTML' (!2245) from 5858_fix_zone-incldued_HTML into master
Reviewed-on: #2245
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-04 10:49:47 +00:00
Javier Segarra ab173e8b67 Merge branch 'master' into 5858_fix_zone-incldued_HTML 2024-04-04 09:40:47 +00:00
Guillermo Bonet 29eee4e8a7 Merge branch 'test' into dev 2024-04-04 11:30:03 +02:00
Guillermo Bonet 3145335824 Merge branch 'master' into test 2024-04-04 11:29:39 +02:00
Guillermo Bonet 573b57a745 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2024-04-04 11:25:10 +02:00
Guillermo Bonet 8702a6808c hotfix: #7024 Modified duaInvoiceInBooking 2024-04-04 11:25:03 +02:00
Sergio De la torre b0c3f8ef98 Merge pull request 'refs #3520 hotFix: hasUncheckedTickets' (!2249) from 3520_hotFix-hasUnCheckedTicket into master
Reviewed-on: #2249
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-04 08:43:24 +00:00
Sergio De la torre 9423a2d043 refs #3520 hotFix: hasUncheckedTickets 2024-04-04 10:38:55 +02:00
Guillermo Bonet c685000b47 hotfix: refs #6930 Rollback tokenMultimedia 2024-04-04 10:13:56 +02:00
Javier Segarra d71b5a167e Merge pull request '#5858 FIX render HTML' (!2237) from 5858_fix_zone-incldued_HTML into test
Reviewed-on: #2237
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-04 07:50:21 +00:00
jcasado 0f8b80d533 refs #6816 remove tittle MicroSip 2024-04-04 09:40:43 +02:00
Pablo Natek 2cf5e94002 Merge pull request '7145-wordBreak' (!2247) from 7145-wordBreak into dev
Reviewed-on: #2247
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-04 07:38:52 +00:00
Alex Moreno b75cd3b768 Merge pull request 'fix: refs #7152 add supplier storage' (!2246) from 7152-hotFix_addSupplierStorage into master
Reviewed-on: #2246
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-04 06:58:05 +00:00
Pablo Natek 2a7807a4ab remove: refs #7145 dev code 2024-04-04 08:49:47 +02:00
Pablo Natek de5e954ce2 fix: refs #7145 fix overFlow on driver-route 2024-04-04 08:48:58 +02:00
Jon Elias 3e044a8efe fix: refs #7152 add supplier storage 2024-04-04 08:16:37 +02:00
Javier Segarra a99ea23d43 Merge branch 'master' into 5858_fix_zone-incldued_HTML 2024-04-04 05:43:09 +00:00
Javier Segarra b7c0ce0852 Merge branch 'test' into 5858_fix_zone-incldued_HTML 2024-04-04 05:41:26 +00:00
Alex Moreno 016b314e0b Merge pull request '7167-testToMaster_2414' (!2244) from 7167-testToMaster_2414 into master
Reviewed-on: #2244
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-04-04 05:32:40 +00:00
Alex Moreno ff2e00c51c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-04-03 16:24:45 +02:00
Alex Moreno 927f2e9ebf Merge pull request 'debug(closure): add log' (!2243) from hotFix_closure_logErrors into master
Reviewed-on: #2243
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-04-03 13:32:16 +00:00
Alex Moreno 59ead0c2e5 debug(closure): add log 2024-04-03 15:29:56 +02:00
Javier Casado e753c14421 Merge pull request 'hotfix claimStateLanguage' (!2242) from hotfix_languageClaimNotification into master
Reviewed-on: #2242
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-03 11:39:37 +00:00
Javier Casado 3968d88a8d Merge branch 'master' into hotfix_languageClaimNotification 2024-04-03 11:37:15 +00:00
jcasado 09f023090e hotfix claimStateLanguage 2024-04-03 13:33:56 +02:00
Guillermo Bonet d9ea126fd8 Merge pull request 'feat: refs #6829 Added two indexes' (!2241) from 6829-indexesSrtExpeditionLog into master
Reviewed-on: #2241
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-04-03 10:01:40 +00:00
Guillermo Bonet 064d6dbb64 feat: refs #6829 Added two indexes 2024-04-03 11:57:28 +02:00