25861 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	15ac9bfd0a	Merge branch 'master' into test	2025-01-09 07:30:04 +01:00
Guillermo Bonet	d0d1950e75	fix: refs #7912 Changed week num param to to be similar vn.time	2025-01-09 07:28:14 +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	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	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
Sergio De la torre	70ad6e2624	fix: refs #6861 refs·6861 ticketOrderReserve	2025-01-08 10:25:08 +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
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
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
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
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
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
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
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