8266 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	7eb11c497b	Merge branch 'test' into 7301-warmFix	2025-01-02 13:48:39 +00:00
Jon Elias	1eaa81d243	Merge pull request 'Hotfix: ZoneExlcusion dated field' (!1165) from Hotfix-ZoneEventExclusionDate into master ... Reviewed-on: #1165 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-02 13:38:02 +00:00
Jon Elias	272d69d9e1	fix: dated field	2025-01-02 14:33:09 +01:00
Pablo Natek	6e38a23852	Merge pull request 'Warmfix: Zone exclusion dated field' (!1164) from Warmfix-ZoneExclusionEvent into test ... Reviewed-on: #1164 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-01-02 13:24:49 +00:00
Jon Elias	e648b82ecc	fix: dated field	2025-01-02 14:23:13 +01:00
Pablo Natek	fb21bcc02e	feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component	2025-01-02 11:38:04 +01:00
Alex Moreno	d7b7850f62	fix: duplicate transalation after test to dev	2025-01-02 08:04:39 +01:00
Alex Moreno	a7e04557dc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-02 07:52:47 +01:00
Alex Moreno	a65b8432d8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-02 07:51:39 +01:00
Jon Elias	16065b6342	Merge pull request 'Hotfix: zone events postcode select' (!1154) from Hotfix-ZoneEventSelect into master ... Reviewed-on: #1154 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-31 12:34:38 +00:00
Jon Elias	9525eef025	Merge branch 'master' into Hotfix-ZoneEventSelect	2024-12-31 12:33:33 +00:00
Jon Elias	27bbd7695f	Merge pull request 'Hotfix: use mapKey prop to show all ocurrencies' (!1157) from Hotfix-VnSms into master ... Reviewed-on: #1157 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-31 12:28:35 +00:00
Jon Elias	65a54b12e6	fix: use map-key prop to show all ocurrencies	2024-12-31 13:11:59 +01:00
Javier Segarra	d7bcc5b358	Merge pull request 'hotfix: CustomerConsumption campaignFilter' (!1156) from hotfix_customerConsumption_campaignFilter into master ... Reviewed-on: #1156 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-12-31 09:59:18 +00:00
Javier Segarra	b6161a41e8	perf: use dateRange	2024-12-31 10:48:07 +01:00
Javier Segarra	229130409a	fix: init fix	2024-12-31 10:45:37 +01:00
Javi Gallego	fdc0a856ad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-12-30 14:53:11 +01:00
Javi Gallego	d67ae3cafb	style: update CustomerBalance.vue to set label color	2024-12-30 14:53:08 +01:00
Javi Gallego	cea24f4720	Merge pull request 'test: refs #7052 add unit tests for EditTableCellValueForm component' (!1104) from 7052-testEditTableCellValueForm into dev ... Reviewed-on: #1104 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-30 13:37:10 +00:00
Javi Gallego	d16e2e81e4	Merge branch 'dev' into 7052-testEditTableCellValueForm	2024-12-30 13:35:32 +00:00
Jon Elias	7e15d3c7a4	Merge branch 'master' into Hotfix-ZoneEventSelect	2024-12-30 13:05:27 +00:00
Jon Elias	3c7880d02f	fix: zone events postcode select	2024-12-30 14:02:23 +01:00
Javi Gallego	55ab9fea3e	test: refs #7052 remove .only from EditTableCellValueForm test suite	2024-12-30 08:55:00 +01:00
Jose Antonio Tubau	fc648530bb	Merge pull request '#8266 change expedition item name' (!1073) from 8266-changeExpeditionItemNameFront into dev ... Reviewed-on: #1073 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-30 07:04:32 +00:00
Jose Antonio Tubau	3cd861edee	Merge branch 'dev' into 8266-changeExpeditionItemNameFront	2024-12-30 07:03:36 +00:00
Javi Gallego	5784c079ce	Merge pull request '7924-itemInsepction' (!1114) from 7924-itemInsepction into dev ... Reviewed-on: #1114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-29 09:10:43 +00:00
Javi Gallego	286e460638	Merge branch 'dev' into 7924-itemInsepction	2024-12-29 09:09:30 +00:00
Javi Gallego	1e0d444e85	refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests	2024-12-29 10:06:30 +01:00
Javi Gallego	53c1040cd8	refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage	2024-12-29 10:05:56 +01:00
Javi Gallego	6acf6f8131	Merge branch 'dev' into 7052-testEditTableCellValueForm	2024-12-29 09:44:12 +01:00
Jose Antonio Tubau	120f7892a8	Merge branch 'dev' into 8266-changeExpeditionItemNameFront	2024-12-27 14:06:33 +00:00
Javier Segarra	a297bb7f4a	Merge pull request 'perf: remove unused variables' (!1138) from warmfix_noUsedVars into test ... Reviewed-on: #1138 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-12-27 12:40:25 +00:00
Javier Segarra	7cc4d760dd	perf: remove unused variables	2024-12-27 12:02:34 +01:00
Jon Elias	ad64c4ea0c	Merge pull request 'Hotfix: Remove params when searching by id on VnSearchbar' (!1102) from Hotfix-VnSearchbarRemoveParams into master ... Reviewed-on: #1102 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-27 11:00:53 +00:00
PAU ROVIRA ROSALENY	d4eb61116a	Merge pull request 'fix: fixed translations' (!1136) from hotfix_unhandledTranslations into test ... Reviewed-on: #1136 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-27 10:55:19 +00:00
Jon Elias	93047ab179	Merge pull request '#8201: Fix descriptor icons error' (!1080) from 8201-DescriptorIcons into dev ... Reviewed-on: #1080 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-27 09:55:46 +00:00
Jon Elias	fad3e49e2f	Merge branch 'dev' into 8201-DescriptorIcons	2024-12-27 09:55:02 +00:00
Javier Segarra	0211aeb5cf	Merge pull request 'fix: discount class' (!1137) from fix_discount_class into dev ... Reviewed-on: #1137 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-27 09:49:59 +00:00
Jon Elias	d73b03f757	Merge branch 'master' into Hotfix-VnSearchbarRemoveParams	2024-12-27 09:48:39 +00:00
Javier Segarra	d81daf8c66	fix: fixed translations	2024-12-27 10:42:41 +01:00
Jon Elias	0e9c342b88	Merge pull request 'Hotfix: modified VnTable bottom icon to display when no data in the table' (!1103) from Hotfix-VnTableBottomButton into master ... Reviewed-on: #1103 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-27 09:41:17 +00:00
Jon Elias	976b891a75	Merge branch 'master' into Hotfix-VnSearchbarRemoveParams	2024-12-27 09:40:16 +00:00
Jon Elias	a4f6974e69	Merge branch 'master' into Hotfix-VnTableBottomButton	2024-12-27 09:39:36 +00:00
Jon Elias	c7f358115f	Merge branch 'dev' into 8201-DescriptorIcons	2024-12-27 09:39:05 +00:00
Jon Elias	894b0d3dee	Merge branch '8201-DescriptorIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 8201-DescriptorIcons	2024-12-27 10:36:04 +01:00
Jon Elias	de30725322	perf: refs #8201 onDataSaved fetch	2024-12-27 10:36:03 +01:00
PAU ROVIRA ROSALENY	9d89f6c5d1	fix: discount class	2024-12-27 09:24:39 +00:00
PAU ROVIRA ROSALENY	470e0cc08a	fix: fixed translations	2024-12-27 10:08:28 +01:00
Javier Segarra	d1fdb1777d	Merge pull request 'fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component' (!1135) from 7935-dropDuplicateCol into dev ... Reviewed-on: #1135 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-12-27 08:23:23 +00:00
Jon Elias	ceb470fc0f	Merge branch 'dev' into 8201-DescriptorIcons	2024-12-27 08:20:36 +00:00