26383 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	f04f88d2fc	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 08:00:54 +00:00
Robert Ferrús	04734ac55c	feat: refs #6822 test transfer	2025-01-07 08:59:47 +01: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
Carlos Satorres	ddecfee24b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness	2025-01-07 06:13:51 +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
Robert Ferrús	cbf72be299	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-03 08:40:05 +01:00
Robert Ferrús	e8faaa42aa	Merge branch 'dev' into 6822-entryTransfer	2025-01-03 07:37:20 +00:00
Robert Ferrús	31aa7f9915	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-03 08:35:17 +01:00
Robert Ferrús	02d77324b1	feat: refs #6822 crear test	2025-01-03 08:27:34 +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
Carlos Satorres	78a8f80321	fix: refs #7917 fix tback	2025-01-02 08:38:24 +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
Carlos Satorres	81d3bce12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2	2025-01-02 06:23:35 +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
Javi Gallego	0ad26b336d	fix: refs #7832 update ticketService model test suite to correct describe block	2024-12-31 11:48:05 +01:00
Javi Gallego	1f23ebf6d5	feat: refs #7832 implement refund ticket restrictions and add unit tests for ticket service updates	2024-12-31 11:46:32 +01:00
Ivan Mas	1cc6e37697	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-31 07:36:21 +00:00
Jorge Penadés	879ffcad64	fix: refs #6598 update ACL property assignment	2024-12-30 15:51:11 +01:00
Javi Gallego	be50c91299	Merge pull request 'feat: refs #8167 update canBeInvoiced method to include active status check and improve test cases' (!3323) from 8167-incoiceOutCheckIsActive into dev ... Reviewed-on: #3323 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-12-30 13:37:30 +00:00
Javi Gallego	a26de63660	Merge branch 'dev' into 8167-incoiceOutCheckIsActive	2024-12-30 13:35:17 +00:00
Javi Gallego	8ca5808554	fix: add isCustomInspectionRequired column to item table for customs inspection indication	2024-12-29 10:16:38 +01:00
Javi Gallego	49d87ea44f	Merge pull request 'feat: refs #7924 add isCustomInspectionRequired field to item and update related logic' (!3325) from 7924-itemInspection into dev ... Reviewed-on: #3325 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-29 09:10:51 +00:00
Javi Gallego	98e2483565	feat: refs #8167 update locale and improve invoicing logic with error handling	2024-12-29 09:38:51 +01:00
Javi Gallego	5acd4520f8	Merge branch 'dev' into 8167-incoiceOutCheckIsActive	2024-12-29 09:36:44 +01:00
Javier Segarra	a69a767c8a	feat: refs #7134 use filter to order by	2024-12-27 13:57:28 +01:00
Javier Segarra	3691daded4	feat: refs #7134 add bank name	2024-12-27 13:26:38 +01:00
Javier Segarra	ca90d6ecd7	Merge branch 'dev' into 7134-supplierBalance	2024-12-27 11:57:28 +01:00
Jose Antonio Tubau	48d2d1d327	feat: refs #8117 add worker first and last name to item type query	2024-12-26 10:41:20 +01:00
Jose Antonio Tubau	49263a5458	Merge pull request 'feat: refs #8266 added itemFk and needed fixtures' (!3329) from 8266-changeExpeditionItemName into dev ... Reviewed-on: #3329 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-26 07:43:14 +00:00
Jose Antonio Tubau	0665453465	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-24 10:55:10 +00:00
Carlos Satorres	85163a13fa	fix: refs #7917 fix fixtures	2024-12-24 08:13:00 +01:00
Jose Antonio Tubau	a2218b41f8	feat: refs #8266 added itemFk and needed fixtures	2024-12-23 14:49:44 +01:00