10140 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	0e1f04323c	Merge pull request 'Fix[OrderCatalogItemDialog]: Fixed add item to order' (!1359) from Fix-OrderCatalogAddToOrder into dev ... Reviewed-on: #1359 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-10 08:08:59 +00:00
Jon Elias	585bb9973e	Merge branch 'dev' into Fix-OrderCatalogAddToOrder	2025-02-10 07:57:03 +00:00
Jon Elias	311eab363a	Merge pull request '#8246 modified addressFk field to use dashIfEmpty filter' (!1208) from 8246-ZoneAddressFk2 into dev ... Reviewed-on: #1208 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-10 07:55:54 +00:00
Jon Elias	a287844860	Merge branch 'dev' into 8246-ZoneAddressFk2	2025-02-10 07:54:53 +00:00
Jon Elias	73dfce4104	fix: fixed OrderCatalog add item to order	2025-02-10 08:51:51 +01:00
Jose Antonio Tubau	b2f011e7cc	Merge pull request 'fix: refs #7318 fixed claim summary warnings' (!1347) from 7318-claimSummaryFixWarnings into dev ... Reviewed-on: #1347 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-10 07:17:48 +00:00
Jose Antonio Tubau	b95d8f3b44	Merge branch 'dev' into 7318-claimSummaryFixWarnings	2025-02-10 07:16:40 +00:00
Alex Moreno	03ef6f01e5	Merge branch 'dev' into 7550-refactPagesParking	2025-02-10 06:14:25 +00:00
PAU ROVIRA ROSALENY	6ac24586d0	Merge branch 'dev' into 7065-testUserPanel	2025-02-10 05:51:54 +00:00
Pablo Natek	af2cbda077	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix-front into 6897-entryBuyListRefactor	2025-02-09 18:28:33 +01:00
Pablo Natek	b37923e194	feat: refs #6897 add success messages for entry lock and improve data attributes for better testing	2025-02-09 18:24:41 +01:00
Jorge Penadés	dc3c800342	Merge pull request 'fix: refs #6919 include entityId in descriptor filter' (!1358) from 6919-fixFilters into dev ... Reviewed-on: #1358 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-09 12:24:03 +00:00
Jorge Penadés	1948ee9c52	fix: refs #6919 include entityId in descriptor filter	2025-02-09 10:16:48 +01:00
Javier Segarra	40569b1ede	fix: refs #6321 ticket locale en	2025-02-08 16:39:25 +01:00
Javier Segarra	ca6cfb4c5e	Merge branch 'fix_customerConsumption_filter' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_customerConsumption_filter	2025-02-07 23:42:39 +01:00
Javier Segarra	b3fd818b13	feat: improves	2025-02-07 23:42:17 +01:00
Javier Segarra	ce17e124a0	Merge branch 'dev' into fix_customerConsumption_filter	2025-02-07 22:23:58 +00:00
Javier Segarra	55719fbce7	style: remove comments	2025-02-07 23:02:45 +01:00
Javier Segarra	9dc22b39e2	feat: add more filters	2025-02-07 23:02:17 +01:00
Javier Segarra	63af730838	Merge branch 'dev' into 6321_negative_tickets	2025-02-07 21:42:21 +00:00
Carlos Satorres	f8b41101d3	Merge pull request 'fix: improve method into dev' (!1356) from fix_reload_icon into dev ... Reviewed-on: #1356 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-07 14:19:32 +00:00
Javier Segarra	d060e88ebb	fix: improve method into dev ... Reviewed-on: #1354 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-07 14:15:28 +00:00
Javier Segarra	a4179eeb0a	Merge pull request 'WARMFIX: improve method' (!1354) from warmfix_reload_scriptIsMissing into test ... Reviewed-on: #1354 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-07 14:13:39 +00:00
Jorge Penadés	b75578b6fb	Merge pull request '#8388 fixInvoiceIn' (!1321) from 8388-fixInvoiceIn into dev ... Reviewed-on: #1321 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 13:51:46 +00:00
Jorge Penadés	8380808ffa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn	2025-02-07 14:49:43 +01:00
Javier Segarra	2a3e807460	fix: improve method	2025-02-07 13:38:06 +00:00
Jon Elias	b1f0cc7f1d	Merge pull request 'Fix[ItemFixedPrice]: Fixed item name filter' (!1351) from Fix-ItemFixedPriceNameFilter into dev ... Reviewed-on: #1351 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 12:44:37 +00:00
Jon Elias	94849d0cdf	Merge branch 'dev' into Fix-ItemFixedPriceNameFilter	2025-02-07 12:43:23 +00:00
Jon Elias	0692de7bfb	fix: fixed item name filter	2025-02-07 13:41:34 +01:00
Alex Moreno	2d65811360	Merge branch 'dev' into 8246-ZoneAddressFk2	2025-02-07 12:04:55 +00:00
Jorge Penadés	f01e5b824e	fix: refs #8388 adjust table cell properties and remove unused styles in InvoiceInVat.vue	2025-02-07 10:41:42 +01:00
PAU ROVIRA ROSALENY	e41ed4eff5	Merge branch 'dev' into 7065-testUserPanel	2025-02-07 09:39:35 +00:00
Jorge Penadés	d9897b3ea2	Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn	2025-02-07 10:05:30 +01:00
Jorge Penadés	de6020626f	Merge pull request 'feat: refs #7119 show country name' (!1346) from 7119-showCountryName into dev ... Reviewed-on: #1346 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 09:03:52 +00:00
Jorge Penadés	05f6e1ec20	Merge branch '7119-showCountryName' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName	2025-02-07 10:02:46 +01:00
Jorge Penadés	0adb86d4f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7119-showCountryName	2025-02-07 10:02:37 +01:00
Carlos Satorres	b334807c5b	fix: refs #7550 department	2025-02-07 09:59:47 +01:00
Javier Segarra	86b77c2022	Merge pull request '#7601 - Different agency fot future tickets' (!1342) from 7601_futureAgency into dev ... Reviewed-on: #1342 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-07 08:36:18 +00:00
Javier Segarra	0901c57b12	Merge branch 'dev' into 7601_futureAgency	2025-02-07 08:32:53 +00:00
Carlos Satorres	154a893580	Merge pull request 'fix: refs #6426 create constants' (!1228) from 6426-refactorConstants into dev ... Reviewed-on: #1228 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 08:22:54 +00:00
Carlos Satorres	780e7839f4	Merge branch 'dev' into 6426-refactorConstants	2025-02-07 08:21:56 +00:00
Carlos Satorres	acb1ce39e0	fix: refs #7550 organize parking, shelving	2025-02-07 09:19:11 +01:00
PAU ROVIRA ROSALENY	be894f52c1	Merge branch 'dev' into 7065-testUserPanel	2025-02-07 07:51:49 +00:00
Jose Antonio Tubau	1f1fa1e2b6	refactor: refs #7318 update order prop type to string and improve conditional rendering for zone	2025-02-07 08:32:33 +01:00
Alex Moreno	6dd3a7b00d	Merge branch 'dev' into 7411-addInfoOnVnCheckboxAndVnInput	2025-02-07 07:26:52 +00:00
Alex Moreno	89df2e837c	Merge pull request 'refactor: #8322 changed supplier component to use VnSection/VnCardBeta' (!1216) from 8322-Supplier into dev ... Reviewed-on: #1216 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 07:20:47 +00:00
Alex Moreno	c72d4e9f04	fix: refs #8322 supplier use cardBeta correctly	2025-02-07 08:19:51 +01:00
Jon Elias	98bcb2f45b	Merge pull request 'Hotfix[InvoiceOutList]: Fixed company filter' (!1349) from Hotfix-InvoiceOutCompanyFilter into master ... Reviewed-on: #1349 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-07 07:12:36 +00:00
Javier Segarra	2550add549	Merge branch 'dev' into 7601_futureAgency	2025-02-07 07:07:48 +00:00
Jon Elias	f93c512e16	Merge branch 'master' into Hotfix-InvoiceOutCompanyFilter	2025-02-07 07:00:43 +00:00