8929 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	c465286718	Merge pull request 'feat: refs #8077 sumDefaulter' (!1239) from 8077-sumDefaulterFrontFix into dev ... Reviewed-on: #1239 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-24 10:55:37 +00:00
Robert Ferrús	fb18d5eace	Merge branch 'dev' into 8077-sumDefaulterFrontFix	2025-01-24 10:47:56 +00:00
Alex Moreno	3ef82599ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-24 11:47:24 +01:00
Alex Moreno	f7b1d7bd37	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2025-01-24 11:47:13 +01:00
Robert Ferrús	9269d17e85	Merge branch 'dev' into 8077-sumDefaulterFrontFix	2025-01-24 10:46:14 +00:00
Alex Moreno	658747d479	fix: empty store.order	2025-01-24 11:45:03 +01:00
Alex Moreno	16ca18c945	Merge pull request 'fix: refs #8347 remove skip, fix unpaid' (!1273) from 8347-fixCustomerUnpaidTest into dev ... Reviewed-on: #1273 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 10:28:57 +00:00
Alex Moreno	4476df4608	Merge branch 'dev' into 8347-fixCustomerUnpaidTest	2025-01-24 10:28:04 +00:00
Alex Moreno	a8a74cdb48	Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1146) from 8316-invoiceOutCardWithVnCardBeta into dev ... Reviewed-on: #1146 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 09:35:18 +00:00
Alex Moreno	28905063b2	fix: refs #8316 filter	2025-01-24 10:34:01 +01:00
Alex Moreno	661f7bacd6	Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta	2025-01-24 10:28:20 +01:00
Alex Moreno	cfcbb8bce5	Merge pull request 'refactor: #8322 changed Travel component to use VnSection/VnCardBeta' (!1220) from 8322-travel into dev ... Reviewed-on: #1220 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 09:14:18 +00:00
Alex Moreno	1dc19a6eaa	fix: refs #8322 filter and params	2025-01-24 10:11:30 +01:00
Alex Moreno	6ff1ae96d5	Merge branch 'dev' into 8322-travel	2025-01-24 09:04:53 +00:00
Alex Moreno	cbf7ef7ccf	Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1150) from 8316-parkingCardWithVnCardBeta into dev ... Reviewed-on: #1150 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 09:04:05 +00:00
Alex Moreno	c6f613c5e5	fix: refs #8316 redirections	2025-01-24 10:02:23 +01:00
Alex Moreno	221dda174a	Merge branch 'dev' into 8316-parkingCardWithVnCardBeta	2025-01-24 08:08:25 +00:00
Alex Moreno	10448b9d77	Merge pull request 'refactor: refs #8316 used VnSection and VnBetaCard' (!1147) from 8316-itemCardWithVnCardBeta into dev ... Reviewed-on: #1147 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-24 08:06:47 +00:00
Alex Moreno	6e588278d8	Merge branch 'dev' into 8316-itemCardWithVnCardBeta	2025-01-24 08:05:49 +00:00
Alex Moreno	1455d8ce02	fix: refs #8316 filter	2025-01-24 09:04:01 +01:00
Alex Moreno	e38e9b1dd7	fix: refs #8316 filter	2025-01-24 09:01:54 +01:00
Alex Moreno	8e3fad60c0	fix: refs #8316 icon	2025-01-24 08:59:47 +01:00
Jon Elias	26bc5401f1	Merge pull request '#8339 - fix_preview' (!1277) from 8339_fix_preview into dev ... Reviewed-on: #1277 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-01-24 07:55:19 +00:00
Javier Segarra	a3acb3b190	Merge branch 'dev' into 8339_fix_preview	2025-01-24 07:51:20 +00:00
Alex Moreno	55d86d3153	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2025-01-24 08:40:50 +01:00
Alex Moreno	e6279ff261	build: merge master in test	2025-01-24 08:38:24 +01:00
Alex Moreno	d0176303da	Merge pull request 'fix: order when is string' (!1279) from hotFix_fixOrderStringArray into master ... Reviewed-on: #1279 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-24 07:32:58 +00:00
Javier Segarra	2c6d3de784	Merge branch 'master' into hotFix_fixOrderStringArray	2025-01-24 07:25:46 +00:00
Javier Segarra	c61e4d30f6	Merge pull request 'Replace GoToUser by NewOrder from CustomerDescriptor' (!1276) from hotfix_customerDescriptor_orderBtn into master ... Reviewed-on: #1276 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-01-24 07:24:59 +00:00
Alex Moreno	5b448e5bb3	fix: order when is string	2025-01-24 08:24:12 +01:00
Javier Segarra	f0dc7b4a41	fix: import component	2025-01-24 08:19:53 +01:00
Javier Segarra	bddfd91de1	perf: refs #8339 minor changes	2025-01-24 08:09:48 +01:00
Javier Segarra	d9cc35280b	feat: refs #8339 define global.spreview	2025-01-24 08:09:31 +01:00
Javier Segarra	58fd5a8326	perf: refs #8339 removew preview tag	2025-01-24 08:09:14 +01:00
Alex Moreno	23e1a58f28	fix: refs #8316 advanced-menu	2025-01-24 07:32:02 +01:00
Alex Moreno	e53990d880	Merge branch 'dev' into 8316-itemCardWithVnCardBeta	2025-01-24 06:19:26 +00:00
Javier Segarra	d5ea4fb46d	perf: eslint	2025-01-24 00:26:31 +01:00
Javier Segarra	00c90b29e9	fix: remove "Go to module index" i18n value	2025-01-24 00:24:19 +01:00
Javier Segarra	f4adedb4f1	fix: replace GoToUser by NewOrder	2025-01-24 00:23:31 +01:00
Jose Antonio Tubau	5bb165757a	Merge pull request 'test: refs #7073 add unit tests for VnDms component' (!1198) from 7073-createTestToVnDms into dev ... Reviewed-on: #1198 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 13:55:32 +00:00
Jose Antonio Tubau	9b3ebff1c7	Merge branch 'dev' into 7073-createTestToVnDms	2025-01-23 13:54:31 +00:00
Carlos Satorres	c77a462cb6	fix: refs #8347 remove skip, fix unpaid	2025-01-23 13:34:09 +01:00
Robert Ferrús	a0f4b74422	Merge branch 'dev' into 8077-sumDefaulterFrontFix	2025-01-23 12:31:18 +00:00
Robert Ferrús	bf4faa88a1	Merge pull request 'feat: refs #8398 moveTicketsFuture' (!1223) from 8398-mergeSendCheckingPresence into dev ... Reviewed-on: #1223 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 09:50:56 +00:00
Robert Ferrús	961c9a6973	Merge branch 'dev' into 8398-mergeSendCheckingPresence	2025-01-23 08:22:02 +00:00
Robert Ferrús	1b567f8fa0	Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix-front into 8077-sumDefaulterFrontFix	2025-01-23 09:19:39 +01:00
Robert Ferrús	2ffcb6dfe8	feat: refs #8077 changes request	2025-01-23 09:14:54 +01:00
Jon Elias	8c46ee45c2	Merge pull request '#7184: Added myTeam filter at WorkerFilter' (!1271) from 7184-MyTeamFilter into dev ... Reviewed-on: #1271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-23 08:03:02 +00:00
Jon Elias	807567cede	Merge branch 'dev' into 7184-MyTeamFilter	2025-01-23 07:59:45 +00:00
Alex Moreno	f9dd927292	Merge pull request '#8197 - advancedMenu' (!1248) from 8197-advancedMenu into dev ... Reviewed-on: #1248 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-23 07:27:36 +00:00