25850 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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 RODRIGUEZ	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 RODRIGUEZ	0665453465	Merge branch 'dev' into 8266-changeExpeditionItemName	2024-12-24 10:55:10 +00:00
JOSE ANTONIO TUBAU RODRIGUEZ	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
Jorge Penadés	4887fa0cae	Merge pull request 'feat: refs #7936 add locale' (!3319) from 7936-fixInvoiceIn into test ... Reviewed-on: #3319 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-19 14:10:51 +00:00
Jorge Penadés	6abbf3ec1d	fix: refs #7936 update Spanish locale for SII terms	2024-12-19 13:01:34 +01:00
Jorge Penadés	1f7dae2514	fix: refs #7936 locale	2024-12-19 10:34:46 +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
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
Carlos Andrés	94136d35ff	Actualizar db/routines/vn/triggers/route_afterUpdate.sql	2024-12-18 12:22:59 +00:00
Jorge Penadés	c0893f8684	feat: refs #7936 add locale	2024-12-18 13:06:01 +01: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
Alex Moreno	0f40d6d0ec	Merge pull request '8315-devToTest' (!3313) from 8315-devToTest into test ... Reviewed-on: #3313 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-18 10:30:38 +00:00
Alex Moreno	cfee497adb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:26:22 +01:00
Alex Moreno	64d9c7e52f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-18 11:25:38 +01:00
Alex Moreno	116ec5b107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest	2024-12-18 11:22:28 +01:00
Jorge Penadés	dd5d9bcb08	Merge pull request '#7936 fineTunningInvoiceIn' (!3251) from 7936-fineTunningInvoiceIn into dev ... Reviewed-on: #3251 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-18 09:22:02 +00:00
Jorge Penadés	7a3339b623	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-18 10:18:43 +01:00
Jorge Penadés	3deaa8a95b	Merge pull request '#6583 add new opt in where builder' (!3162) from 6583-addOnlyDestination into dev ... Reviewed-on: #3162 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-18 08:48:41 +00:00
Jorge Penadés	8f1fb0a120	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-18 09:46:19 +01:00
JOSE ANTONIO TUBAU RODRIGUEZ	43d5243766	Merge pull request 'feat: refs #8293 include zone data' (!3309) from 8293-addZoneToClaimList into dev ... Reviewed-on: #3309 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-18 07:45:05 +00:00
Alex Moreno	1a8b05c46b	fix: refs #8315 fixture claimDevelopment	2024-12-18 07:08:23 +01:00
Ivan Mas	af86bb24c4	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-17 15:06:00 +00:00
Jorge Penadés	52a0e718c7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 13:44:11 +01:00
Jorge Penadés	31952725aa	refactor: refs #6583 use warehouseId var	2024-12-17 13:33:29 +01:00
Carlos Satorres	539edeb26a	Merge pull request 'fix: hotfix mix' (!3314) from hotfix-mixTravelSupplierFixedPrice into master ... Reviewed-on: #3314 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-17 12:08:24 +00:00
Carlos Satorres	148b82ea93	Merge pull request 'fix: monitorPayMethodFilter' (!3315) from warmfix-monitorPayMethodFilter into dev ... Reviewed-on: #3315 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-17 12:07:57 +00:00
Jorge Penadés	9ac8e60f0c	fix: refs #6583 drop focus	2024-12-17 12:58:57 +01:00
Jorge Penadés	b935878dd6	feat: refs #6583 add tests	2024-12-17 12:58:25 +01:00
Jorge Penadés	f965f7aa52	fix: refs #6583 update onlyWithDestination logic to handle null values correctly	2024-12-17 12:46:48 +01:00
Carlos Satorres	acfafa1c72	fix: monitorPayMethodFilter	2024-12-17 12:44:55 +01:00
Jorge Penadés	b4c8e16019	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 12:31:27 +01:00
Carlos Satorres	acccb4abc3	fix: hotfix mix	2024-12-17 12:19:46 +01:00