20440 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	2e15b35fd1	fix: refs #7024 create exception for inventory	2024-04-10 14:01:03 +02:00
Alex Moreno	f76123f106	Merge pull request 'hotFix(workerTimeControl): getWeekNumber' (!2278) from hotFix_fix_getWeekNumber into master ... Reviewed-on: #2278 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-10 08:00:21 +00:00
Alex Moreno	51e7045e8b	hotFix(workerTimeControl): getWeekNumber	2024-04-10 09:44:09 +02:00
Javier Segarra	1bd1506c12	Merge pull request '#7188 - HOTFIX Rollback tokenMultimedia' (!2274) from 7188_HOTFIX_ROLLBACK_tokenMultimedia into master ... Reviewed-on: #2274 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-10 05:39:16 +00:00
Javier Segarra	d85562b090	refs #7188 fix: bug tokenMultimedia	2024-04-09 15:06:05 +02:00
Guillermo Bonet	743dc2144e	hotfix: refs #6276 Fix send chat msg getSales	2024-04-09 13:05:01 +02:00
Sergio De la torre	47c33c1648	Merge pull request 'refs #6276 hotFix:itemShelving_add' (!2270) from 6276_hotfix_itemShelving_add into master ... Reviewed-on: #2270 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 05:50:06 +00:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Juan Ferrer	ccc644c298	fix: refs #6021 dump, floranet schema added	2024-04-08 13:07:04 +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
Guillermo Bonet	7ea917dc4d	hotfix: #6875 packing DEFAULT 1	2024-04-05 07:49:37 +02:00
Alex Moreno	a6e4bdd7ac	refs #7167 deploy: dump	2024-04-04 15:02:41 +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
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	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
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
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
Ivan Mas	cd7ed5f17b	Merge pull request 'hotfix_clientsDisable' (!2240) from hotfix_clientsDisable into master ... Reviewed-on: #2240 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-03 08:46:46 +00:00
Ivan Mas	b9520b53ab	hotfix_clientsDisable	2024-04-03 10:03:59 +02:00
Javier Segarra	3449e27150	Actualizar print/templates/email/zone-included/zone-included.js	2024-04-03 05:50:04 +00:00
Javier Segarra	1f8afc074d	Actualizar print/templates/email/zone-included/zone-included.html	2024-04-03 05:49:40 +00:00
Javier Segarra	1b72572440	FIX render HTML	2024-04-02 11:58:30 +00:00
Pako Natek	3b0209977b	Merge pull request 'hotfix-collection_assign_releaseLock' (!2234) from hotfix-collection_assign_releaseLock into master ... Reviewed-on: #2234 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-01 12:29:16 +00:00
Pako Natek	cb745b0f4d	release_lock	2024-04-01 14:21:34 +02:00
Pako Natek	bfa59bdcea	release_lock	2024-04-01 14:20:25 +02:00
Pako Natek	3ac0af24d1	Merge pull request 'lines and volume' (!2233) from hotfix-collection_new_20240401 into master ... Reviewed-on: #2233 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-01 10:05:12 +00:00
Pako Natek	3a1f5109d9	lines and volume	2024-04-01 11:58:16 +02:00
Robert Ferrús	5f12e498d5	Merge pull request 'fix: riesgos' (!2225) from hotFixCompany_getSuppliersDebt into master ... Reviewed-on: #2225 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-03-28 14:10:44 +00:00
Robert Ferrús	9a7bcdf104	fix: company_getSuppliersDebt	2024-03-28 13:26:09 +01:00
Robert Ferrús	1c18b09531	fix: company_getSuppliersDebt	2024-03-28 10:47:47 +01:00
Robert Ferrús	063745167e	fix: modificar company_getSuppliersDebt	2024-03-28 10:30:41 +01:00