26012 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	e57e9ee9dd	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 11:42:49 +01:00
Alex Moreno	60933216f7	fix: hotFix getMondayWeekYear	2025-01-08 11:42:32 +01:00
Alex Moreno	a4e22485c0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 11:41:17 +01:00
Alex Moreno	ecc877e07d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-08 11:35:30 +01:00
Alex Moreno	9842f70bec	fix: hotFix getMondayWeekYear	2025-01-08 11:25:07 +01:00
Sergio De la torre	71006797af	Merge pull request 'fix: refs #6861 refs·6861 ticketOrderReserve' (!3344) from 6861-ticketOrderReserves into master ... Reviewed-on: #3344 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-08 09:31:21 +00:00
Javi Gallego	0d822d03c9	fix: refs #8298 remove duplicate entry in English locale file	2025-01-08 10:30:47 +01:00
Sergio De la torre	70ad6e2624	fix: refs #6861 refs·6861 ticketOrderReserve	2025-01-08 10:25:08 +01:00
Javi Gallego	1816b6de67	feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables	2025-01-08 10:24:18 +01:00
Alex Moreno	c0c75c1bee	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 09:41:31 +01:00
Alex Moreno	5ab06ef6e4	fix: hotFix getStartDateOfWeekNumber	2025-01-08 09:39:55 +01:00
Robert Ferrús	94ccdabe89	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-08 06:23:04 +00:00
Ivan Mas	0940a31288	Merge branch 'dev' into 7343-modifyDriverRouteEmail	2025-01-07 16:47:43 +00:00
Javi Gallego	dbd8d816c0	fix: refs #8361 streamline transaction handling in exchangeRateUpdate	2025-01-07 14:53:26 +01:00
Guillermo Bonet	2572182a89	Merge pull request 'feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana' (!3341) from 8357-workerManaExcludedTriggers into dev ... Reviewed-on: #3341 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-07 13:38:47 +00:00
Robert Ferrús	8417030438	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 12:43:57 +00:00
Guillermo Bonet	c83e6a8bbd	Merge branch 'dev' into 8357-workerManaExcludedTriggers	2025-01-07 12:28:23 +00:00
Ivan Mas	b68ffb0819	Merge pull request 'feat: refs #8073 #refs 8073 create vn.productionCountryVolume' (!3321) from 8073-newTableProductionCountryVolume into dev ... Reviewed-on: #3321 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-07 12:19:13 +00:00
Ivan Mas	23fb04876c	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2025-01-07 12:16:20 +00:00
Guillermo Bonet	065f13557b	feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana	2025-01-07 11:58:36 +01:00
Javi Gallego	786f1fe661	test: refs #8361 enhance exchangeRateUpdate specs to validate day1 and day2 entries without backfilling day3	2025-01-07 11:06:09 +01:00
Javi Gallego	73d5d508ce	test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios	2025-01-07 10:45:51 +01:00
Jon Elias	b1dda9f82b	Merge pull request '#7202 added new field in InvoiceOut module' (!3034) from 7202-AddCustomAgentFkColumn into dev ... Reviewed-on: #3034 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-07 09:03:14 +00:00
Jon Elias	c06f2c4e6f	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2025-01-07 09:00:26 +00:00
Alex Moreno	1d8dcdf63f	build: add new version	2025-01-07 09:44:50 +01:00
Alex Moreno	b83499c180	Merge pull request '8356-devToTest' (!3339) from 8356-devToTest into test ... Reviewed-on: #3339 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-07 08:37:56 +00:00
Robert Ferrús	f04f88d2fc	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 08:00:54 +00:00
Javi Gallego	399081f83c	Merge pull request '#7832 - ticketServiceModifyConcept' (!3332) from 7832-ticketServiceModifyConcept into dev ... Reviewed-on: #3332 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-07 07:45:41 +00:00
Javi Gallego	4f3c101e42	Merge branch 'dev' into 7832-ticketServiceModifyConcept	2025-01-07 07:43:19 +00:00
Alex Moreno	1cd083ac68	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-07 08:16:43 +01:00
Alex Moreno	a713ef64e8	Merge pull request 'build: refs #8355 dump db' (!3338) from 8355-dump into master ... Reviewed-on: #3338 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-07 07:16:27 +00:00
Alex Moreno	48d4bab706	build: refs #8355 dump db	2025-01-07 08:01:44 +01:00
Alex Moreno	72bf27f08d	Merge pull request '8355-testToMaster' (!3336) from 8355-testToMaster into master ... Reviewed-on: #3336 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-07 06:44:56 +00:00
Jon Elias	c3a5a5da27	Merge pull request '#8246: added new field's relation' (!3337) from 8246-ZoneListNewField into dev ... Reviewed-on: #3337 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-07 06:40:49 +00:00
Jon Elias	ecee47f859	Merge branch 'dev' into 8246-ZoneListNewField	2025-01-07 06:22:31 +00:00
Robert Ferrús	5c42130495	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 06:15:15 +00:00
Jon Elias	ad0c1eb4c5	feat: refs #8246 added relation for the front's new field	2025-01-07 07:12:33 +01:00
Alex Moreno	dc52c08c15	build: refs #8355 add changelog	2025-01-06 19:30:06 +01:00
Alex Moreno	e0a5a3cd8c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-06 19:06:14 +01:00
Pablo Natek	79ee81117b	Merge pull request 'feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic' (!3335) from 7301-warmFix-on-itemLasEntries into test ... Reviewed-on: #3335 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-03 08:55:41 +00:00
Pablo Natek	67c484cd87	feat: refs #7301 update SQL fixtures and enhance lastEntriesFilter logic	2025-01-03 09:39:49 +01:00
Alex Moreno	cfe886b687	Merge branch 'dev' into 8117-filtersAndValuesReviewed	2025-01-03 06:52:04 +00:00
Ivan Mas	8822fde7fb	feat: refs #7343 delete sending to user	2025-01-02 18:04:53 +01:00
Pablo Natek	98b68a2c74	Merge pull request 'fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic' (!3324) from 7301-removeRedundantInventories into dev ... Reviewed-on: #3324 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-02 09:54:10 +00:00
Sergio De la torre	05b8c3451a	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-02 10:47:11 +01:00
Jon Elias	fb57a1fa31	Merge branch '7202-AddCustomAgentFkColumn' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2025-01-02 08:39:59 +01:00
Jon Elias	5221b9254a	Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2025-01-02 08:39:57 +01:00
Alex Moreno	7092226c01	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-02 07:51:54 +01:00
Alex Moreno	bf80cbbf4a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-02 07:50:28 +01:00
Javier Segarra	c80ce7d7a7	Merge pull request 'fix: refs #6598 update ACL property assignment' (!3331) from 6598-fixAclProperty into dev ... Reviewed-on: #3331 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-31 11:56:19 +00:00