8448-devToTest #3373

Merged

alexm merged 98 commits from 8448-devToTest into test 2025-01-21 10:00:50 +00:00

Conversation 0 Commits 98 Files Changed 51 +772 -223

98 Commits

Author	SHA1	Message	Date
Alex Moreno	05b383ecb0	test: refs #8448 fix e2e	2025-01-21 10:57:40 +01:00
Sergio De la torre	6f73758cad	Merge pull request '7569-sendEmailOrderTicket' (!3350) from 7569-sendEmailOrderTicket into dev ... Reviewed-on: #3350 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-21 06:29:28 +00:00
Sergio De la torre	c50ff6a43a	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-21 07:05:42 +01:00
Sergio De la torre	eee73f001d	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 07:00:02 +01:00
Sergio De la torre	7f17cd59e7	Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket	2025-01-21 06:58:15 +01:00
Sergio De la torre	ef68884fe0	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 16:27:35 +01:00
Sergio De la torre	b5e27707a7	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:36:31 +01:00
Sergio De la torre	0340612645	feat: refs #7569 refs#7569 sendEmailNotification	2025-01-20 12:35:55 +01:00
Guillermo Bonet	aa62f1d483	Merge branch 'test' into dev	2025-01-20 08:10:38 +01:00
Guillermo Bonet	04180bf8da	Merge branch 'test' into dev	2025-01-20 07:52:04 +01:00
PAU ROVIRA ROSALENY	5ef1d615a7	Merge pull request 'feat: #8258 added uppercase validation on supplier create' (!3368) from 8258-uppercaseInputs into dev ... Reviewed-on: #3368 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-20 06:01:20 +00:00
PAU ROVIRA ROSALENY	1cdeadb59d	feat: refs #8258 added uppercase validation on supplier create	2025-01-17 13:20:45 +01:00
Javi Gallego	d4b7d54052	Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev ... Reviewed-on: #3345 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-17 08:30:44 +00:00
Javi Gallego	125b7730e7	feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table	2025-01-16 12:56:04 +01:00
Guillermo Bonet	4d98c340d2	feat: refs #7882 Added coords to create a address	2025-01-16 09:34:18 +01:00
Javi Gallego	b8dbaec46c	Merge pull request 'test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios' (!3340) from 8361-exchangeRateUpdateWithFestiveDays into dev ... Reviewed-on: #3340 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-16 08:10:09 +00:00
Javi Gallego	69f1e76307	Merge pull request 'feat: refs #8381 add initial and final temperature fields to entry model and queries' (!3354) from 8381-entryTemperature into dev ... Reviewed-on: #3354 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-16 06:56:42 +00:00
Ivan Mas	8da1d866e3	Merge pull request 'refactor: refs #8378 deprecate bi.f_tvc' (!3365) from 8378-deprecateBi.f_tvc into dev ... Reviewed-on: #3365 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-15 15:12:08 +00:00
Ivan Mas	416e6c81f1	refactor: refs #8378 deprecate bi.f_tvc	2025-01-15 15:22:48 +01:00
Jon Elias	d0df1c1f42	Merge pull request '#8247: Added new acl for VnUser model' (!3358) from 8247-CreateNewAcl into dev ... Reviewed-on: #3358 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-15 10:51:25 +00:00
Javi Gallego	44765b5a64	feat: refs #8361 add hasToDownloadRate field to currency model and update exchange rate logic	2025-01-14 09:07:00 +01:00
Alex Moreno	48ad72ac98	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-14 08:00:08 +01:00
Alex Moreno	105a5045cf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-14 07:37:33 +01:00
Jon Elias	29e6a99983	feat: refs #8247 added new acl for VnUser model	2025-01-14 07:36:23 +01:00
Javi Gallego	c15a3bfe50	feat: refs #8381 add initial and final temperature fields to entry model and queries	2025-01-13 11:28:30 +01:00
Alex Moreno	e15fc01267	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-13 09:19:37 +01:00
Alex Moreno	951376af2f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-13 09:19:03 +01:00
Jose Antonio Tubau	1cd7eda4ac	Merge pull request 'feat: refs #8117 add worker first and last name to item type query' (!3330) from 8117-filtersAndValuesReviewed into dev ... Reviewed-on: #3330 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-13 06:13:31 +00:00
Robert Ferrús	f6f8f2214c	Merge pull request 'feat: refs #7584 workerTimeControl_afterDelete' (!3307) from 7584-workerTimeControl_afterDelete into dev ... Reviewed-on: #3307 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2025-01-10 10:05:59 +00:00
Robert Ferrús	1c30de5eee	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-10 09:36:09 +00:00
Robert Ferrús	bdaaffbbd7	feat: refs #7584 changes request	2025-01-10 10:33:19 +01:00
Sergio De la torre	a1e1d4fa72	fix: refs #7569 refs·6861 ticketOrderReserve	2025-01-10 07:20:24 +01:00
Sergio De la torre	12fa87a93c	fix: refs #7569 refs·6861 ticketOrderReserve	2025-01-09 16:15:29 +01:00
Guillermo Bonet	e01d7c1fc6	Merge branch 'test' into dev	2025-01-09 14:51:40 +01:00
Guillermo Bonet	4e608eccc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-09 11:34:59 +01:00
Guillermo Bonet	2f0a79da3f	Merge branch 'test' into dev	2025-01-09 11:34:53 +01:00
Alex Moreno	c8cfbf8d40	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-09 09:59:26 +01:00
Guillermo Bonet	6b39e5c651	Merge branch 'test' into dev	2025-01-09 07:30:14 +01:00
Robert Ferrús	eba9a1e38c	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-09 06:11:26 +00:00
Javi Gallego	53c604762a	Merge branch 'dev' into 8298-zonePriceOptimum	2025-01-08 13:43:17 +01:00
Ivan Mas	f9666b8e60	Merge pull request 'feat: refs #7343 delete sending to user' (!3334) from 7343-modifyDriverRouteEmail into dev ... Reviewed-on: #3334 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-01-08 12:17:49 +00:00
Ivan Mas	14b88b1ad6	Merge branch 'dev' into 7343-modifyDriverRouteEmail	2025-01-08 12:16:01 +00:00
Javi Gallego	be56313706	feat: refs #8298 add priceOptimum column to zoneEvent and update zone fixture data	2025-01-08 11:58:50 +01:00
Robert Ferrús	bdbc02e1b7	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-08 10:46:45 +00:00
Alex Moreno	f1b45a3903	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-08 11:43:00 +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
Javi Gallego	0d822d03c9	fix: refs #8298 remove duplicate entry in English locale file	2025-01-08 10:30:47 +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
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
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
Robert Ferrús	5c42130495	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 06:15:15 +00: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
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
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
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
Ivan Mas	c59cae9f74	feat: refs #8073 new comment message	2024-12-19 14:38:28 +01:00
Ivan Mas	da4968f8b1	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-19 12:55:23 +00:00
Ivan Mas	b7666f5395	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-18 14:08:31 +00:00
Ivan Mas	148ab57b1a	feat: refs #8073 change names and primary key	2024-12-18 15:06:49 +01:00
Ivan Mas	5620242d7e	Merge branch 'dev' into 8073-newTableProductionCountryVolume	2024-12-18 12:30:16 +00:00
Ivan Mas	1ba23ad450	feat: refs #8073 #refs 8073 create vn.productionCountryVolume	2024-12-18 13:27:43 +01:00
Robert Ferrús	68715a8c36	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2024-12-16 13:25:38 +00:00
Robert Ferrús	1d7e69cb25	feat: refs #7584 workerTimeControl_afterDelete	2024-12-16 07:40:49 +01:00
Sergio De la torre	2c672951c6	fix: refs #7569 refs#8188 add IfNotExists	2024-12-12 20:33:00 +01:00
Sergio De la torre	31a6db5da0	feat: refs #7569 refs#7569 sendMail	2024-12-12 20:30:38 +01:00
Jon Elias	2c0f596175	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2024-10-24 10:37:54 +00:00
Jon Elias	da824516f3	Merge branch '7202-AddCustomAgentFkColumn' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-23 08:10:03 +02:00
Jon Elias	2ec0d7f186	refactor: refs #7202 modified new invoice procedure and incoterms sql	2024-10-23 08:10:00 +02:00
Jon Elias	e91386dc92	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2024-10-01 10:49:00 +00:00
Jon Elias	f4015117e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 12:43:47 +02:00
Jon Elias	8e2359a672	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 11:37:01 +02:00
Jon Elias	ce77d4bf2b	Merge branch '7202-AddCustomAgentFkColumn' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 10:39:59 +02:00
Jon Elias	a6799cba0f	refactor: refs #7202 modified procedure to include customsAgent field when creating an invoice	2024-10-01 10:39:57 +02:00
Jon Elias	698ef3dec3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2024-10-01 10:12:21 +02:00
Jon Elias	5d4b79e313	Merge branch 'dev' into 7202-AddCustomAgentFkColumn	2024-09-30 07:47:29 +00:00
Jon Elias	451e3bebef	fix: refs #7202 fixed back test	2024-09-30 09:45:55 +02:00
Jon Elias	da749a5dcb	fix: refs #7202 fixed sql	2024-09-30 09:21:05 +02:00
Jon Elias	6fbc5a1a54	feat: refs #7202 added new field	2024-09-30 09:17:27 +02:00