8389-testToMaster #3357

Merged

alexm merged 51 commits from 8389-testToMaster into master 2025-01-14 06:31:08 +00:00

Conversation 0 Commits 51 Files Changed 27 +243 -130

51 Commits

Author	SHA1	Message	Date
Alex Moreno	00577056dd	build: refs #8389 changelog	2025-01-13 15:24:12 +01:00
Alex Moreno	6e56bdeeb1	fix: refs #8389 prevent error propagation	2025-01-13 15:24:01 +01:00
Alex Moreno	13455f6a20	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-13 09:19:19 +01:00
Alex Moreno	9d05b16404	fix: canBeInvoiced only in makeInvoice	2025-01-13 09:18:46 +01:00
Sergio De la torre	5ce23ee122	Merge pull request 'fix: refs #6861 refs#6861 addPrevOK' (!3351) from 6861-addPrevOK into test ... Reviewed-on: #3351 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-10 07:57:56 +00:00
Sergio De la torre	1ac75d87ad	fix: refs #6861 refs#6861 addPrevOK	2025-01-10 08:55:45 +01:00
Guillermo Bonet	e2763a4da9	Merge branch 'master' into test	2025-01-09 14:51:27 +01:00
Guillermo Bonet	18adbf9c69	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-09 11:34:44 +01:00
Guillermo Bonet	1787cd3102	Merge branch 'master' into test	2025-01-09 11:34:41 +01:00
Alex Moreno	1783f6f7e0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-09 09:54:43 +01:00
Guillermo Bonet	15ac9bfd0a	Merge branch 'master' into test	2025-01-09 07:30:04 +01:00
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	a4e22485c0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-08 11:41:17 +01:00
Alex Moreno	9842f70bec	fix: hotFix getMondayWeekYear	2025-01-08 11:25:07 +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	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
Alex Moreno	1cd083ac68	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-07 08:16:43 +01: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
Jon Elias	ad0c1eb4c5	feat: refs #8246 added relation for the front's new field	2025-01-07 07:12:33 +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	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
Alex Moreno	7092226c01	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-02 07:51:54 +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
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
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
Jose Antonio Tubau	a2218b41f8	feat: refs #8266 added itemFk and needed fixtures	2024-12-23 14:49:44 +01:00
Jorge Penadés	549cb7633e	Merge pull request 'test to dev' (!3326) from test into dev ... Reviewed-on: #3326 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-19 14:51:13 +00:00
Pablo Natek	ea4b118015	feat: refs #7301 update lastEntriesFilter to include landedDate and enhance test cases	2024-12-19 10:26:53 +01:00
Javi Gallego	a99d7adfe8	feat: refs #7924 add isCustomInspectionRequired field to item and update related logic	2024-12-19 10:11:33 +01:00
Pablo Natek	b838e988e0	fix: refs #7301 remove debug console log and update test cases in lastEntriesFilter	2024-12-19 08:39:47 +01:00
Pablo Natek	49c30890e5	fix: refs #7301 update SQL fixtures and improve lastEntriesFilter logic	2024-12-19 08:31:51 +01:00
Javi Gallego	9ae27e104e	feat: refs #8167 update canBeInvoiced method to include active status check and improve test cases	2024-12-19 07:07:56 +01:00
Carlos Andrés	8ca8e11f1c	Merge pull request 'feat: refs #8324 country unique' (!3322) from 8324-countryUnique into dev ... Reviewed-on: #3322 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-18 19:08:53 +00:00
Carlos Andrés	83d46d0a28	feat: refs #8324 country unique	2024-12-18 17:58:30 +01:00
Javi Gallego	6c2d7641f5	Merge pull request 'feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests' (!3306) from 7235-InvoiceOut into dev ... Reviewed-on: #3306 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-18 12:34:56 +00:00
Ivan Mas	ae220007e4	Merge pull request 'feat: refs #7880 error code and translations' (!3142) from 7880-hedera.order_confirmWithUserTranslations into dev ... Reviewed-on: #3142 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-12-18 11:19:11 +00:00
Ivan Mas	ab5cf0f497	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-18 11:17:14 +00:00
Alex Moreno	42c3cdae5d	build: init version	2024-12-18 11:33:48 +01:00
Ivan Mas	af86bb24c4	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-17 15:06:00 +00:00
Javi Gallego	e748e9a012	feat: refs #7235 add serialType parameter to getInvoiceDate and implement corresponding tests	2024-12-13 08:30:23 +01:00
Ivan Mas	10e332ca85	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-11-25 11:23:52 +00:00
Ivan Mas	bbc4eff922	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-10-23 13:28:05 +00:00
Ivan Mas	c593b95935	feat: refs #7880 error code and translations	2024-10-23 15:21:24 +02:00