20542 Commits

All Branches

Search

Author	SHA1	Message	Date
jcasado	a30c0ee675	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-08 14:39:00 +02:00
jcasado	84997eacd5	refs: 6697 remove claim quantity	2024-04-08 14:38:54 +02:00
Juan Ferrer	75bed03ab7	Merge pull request 'test' (!2266) from test into dev ... Reviewed-on: #2266	2024-04-08 11:09:05 +00:00
Juan Ferrer	366f1997eb	Merge pull request 'fix: refs #6021 dump, floranet schema added' (!2265) from master into test ... Reviewed-on: #2265	2024-04-08 11:08:50 +00:00
Juan Ferrer	ccc644c298	fix: refs #6021 dump, floranet schema added	2024-04-08 13:07:04 +02:00
Carlos Andrés	5558e92b1e	Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev ... Reviewed-on: #2163 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 10:36:21 +00:00
Guillermo Bonet	d442ed64c4	Merge pull request 'feat: refs #6714 Added businessType zone_getAddresses' (!2263) from 6714-zone_getAddresses into dev ... Reviewed-on: #2263 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-04-08 08:42:15 +00:00
Guillermo Bonet	0b96471c7d	feat: refs #6714 Added businessType zone_getAddresses	2024-04-08 09:27:07 +02:00
Alex Moreno	93000aaecf	Merge branch 'dev' into 6549-ticket_close	2024-04-05 12:20:09 +00: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
Carlos Andrés	cedfdbb421	fix: closeTicket idem salix Refs: #6549	2024-04-05 13:22:54 +02: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
Carlos Andrés	fe0afe30bf	fix: closeTicket idem salix Refs: #6549	2024-04-04 17:50:39 +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
Carlos Andrés	9fcad457a7	fix: closeTicket idem salix Refs: #6549	2024-04-04 14:46:51 +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
Carlos Andrés	75a4d6947f	fix: closeTicket idem salix Refs: #6549	2024-04-04 14:20:55 +02: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