6132 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	5f4df6eb96	Merge pull request '7155-travel_daysOnward_2' (!759) from 7155-travel_daysOnward_2 into test ... Reviewed-on: #759 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-25 11:27:25 +00:00
Alex Moreno	bcada72f04	fix: refs #7155 use chip-locale	2024-09-25 13:24:22 +02:00
Alex Moreno	6bd2835c59	chore: refs #7155 typo	2024-09-25 13:18:26 +02:00
Alex Moreno	9a11f94922	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2	2024-09-25 13:17:34 +02:00
Alex Moreno	f04beb8f90	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-25 12:52:58 +02:00
Jorge Penadés	0dec6edc68	Merge pull request 'fix: refs #6898 add role' (!757) from 6898-hotfix-addRole into master ... Reviewed-on: #757 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:48:16 +00:00
Jorge Penadés	aab428494e	fix: refs #6898 add role	2024-09-25 12:40:22 +02:00
Javier Segarra	357f3ba308	Merge pull request 'fix: refs #6943 prevent null' (!756) from 6943-warmfix-preventNull into test ... Reviewed-on: #756 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 10:26:14 +00:00
Jorge Penadés	d2996f0838	fix: refs #6943 prevent null	2024-09-25 12:23:41 +02:00
Javier Segarra	53d5d123c2	feat: i18n	2024-09-25 11:36:44 +02:00
Javier Segarra	fb180f0198	fix: apply order	2024-09-25 11:31:05 +02:00
Javier Segarra	77ad96a58b	fix: itemfixedPrice inputs	2024-09-25 11:30:18 +02:00
Alex Moreno	991ad21c77	fix: refs #7155 remove userParams in watcher	2024-09-24 13:16:34 +02:00
Alex Moreno	e555bd4cde	Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward	2024-09-24 12:21:31 +02:00
Alex Moreno	d85705bb39	Merge pull request '8032-devToTest_2440' (!751) from 8032-devToTest_2440 into test ... Reviewed-on: #751 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-09-24 10:05:32 +00:00
Alex Moreno	3d34d9c6bb	chore: refs #7155 remove console.log	2024-09-24 10:54:17 +02:00
Alex Moreno	edb6e9ce61	feat(TravelList): add daysOnward	2024-09-24 09:57:05 +02:00
Alex Moreno	2d90a75fa0	Merge pull request 'fix: wagon tests' (!752) from FixWagonTests into dev ... Reviewed-on: #752 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 07:53:08 +00:00
Jon Elias	f2ae231efb	fix: missing code	2024-09-24 09:35:34 +02:00
Jon Elias	768e15755f	fix: deleted code	2024-09-24 09:18:10 +02:00
Jon Elias	2c73ce28c3	fix: fixed wagon tests	2024-09-24 09:02:35 +02:00
Alex Moreno	eaadacd332	Merge pull request '7404-fixFront' (!743) from 7404-fixFront into dev ... Reviewed-on: #743 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 06:19:58 +00:00
Alex Moreno	b7ed63afc6	Merge branch 'dev' into 7404-fixFront	2024-09-24 06:18:42 +00:00
Alex Moreno	8760781660	fix: merge in dev	2024-09-24 08:15:44 +02:00
Alex Moreno	98a3b03be7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-24 07:48:58 +02:00
Alex Moreno	1f9850f520	Merge pull request 'fix: Options VnSelect properties' (!746) from 6943_fix_customer_module into dev ... Reviewed-on: #746 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 05:41:49 +00:00
Alex Moreno	5fc306e11e	Merge branch 'dev' into 6943_fix_customer_module	2024-09-24 05:38:47 +00:00
Alex Moreno	96edfd4b6e	Merge pull request 'feat: change label because its more natural' (!749) from 5888_format_location_label into dev ... Reviewed-on: #749 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 05:36:09 +00:00
Javier Segarra	3ede256dc5	feat: change label because its more natural	2024-09-23 18:30:14 +00:00
Javier Segarra	27a3e36b58	fix: comments	2024-09-23 14:56:34 +02:00
Javier Segarra	13b519e4b3	Merge branch 'dev' into 6943_fix_customer_module	2024-09-23 12:45:03 +00:00
Javier Segarra	ab0c38810a	fix: Options VnSelect properties	2024-09-23 12:44:37 +00:00
Javier Segarra	caddcf45c3	fix: Options VnSelect properties	2024-09-23 12:43:52 +00:00
Javier Segarra	3cfa883642	Merge pull request '#6943 - Customer module find salesPersons out of first get' (!711) from 6943_fix_customer_module into dev ... Reviewed-on: #711 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 12:25:21 +00:00
Javier Segarra	5803af7a74	Merge branch 'dev' into 6943_fix_customer_module	2024-09-23 12:24:01 +00:00
Javier Segarra	0c1114e89e	Merge pull request '6156 i18n' (!742) from 6156_i18n into dev ... Reviewed-on: #742 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 12:22:17 +00:00
Javier Segarra	e651b7ad82	Merge branch 'dev' into 6156_i18n	2024-09-23 12:07:05 +00:00
Alex Moreno	d3b45af7e5	Merge pull request 'fix: VnLocation test' (!744) from fix_test_vnLocation into dev ... Reviewed-on: #744 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:45:24 +00:00
Robert Ferrús	d13cab0a24	Merge pull request 'feat: refs #8000 add column into zoneBasicData' (!741) from 8000-zoneBasicDataAddcolumn into master ... Reviewed-on: #741 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:43:14 +00:00
Javier Segarra	0829b6d0d2	fix: i18n en preparation label	2024-09-23 11:42:47 +00:00
Javier Segarra	6a8ed89a71	fix: VnLocation test	2024-09-23 11:41:30 +00:00
Pablo Natek	b04564d5a8	fix: refs #7404 style non center pop up	2024-09-23 13:23:25 +02:00
Pablo Natek	e700f6f4a8	feat: refs #7404 style dynamic text color	2024-09-23 13:14:25 +02:00
Javier Segarra	279a100f8b	fix: i18n en preparation label	2024-09-23 10:25:44 +00:00
Javier Segarra	a52cdf8f94	fix: i18n en preparation label	2024-09-23 10:25:11 +00:00
Robert Ferrús	5ebbb1cf73	feat: refs #8000 fix	2024-09-23 12:24:19 +02:00
Robert Ferrús	1ae20202cc	feat: refs #8000 add column into zoneBasicData	2024-09-23 11:56:20 +02:00
Alex Moreno	29cc14673a	warmFix: e2e claimDevelopment	2024-09-23 11:15:17 +02:00
Alex Moreno	951b8fc1fa	warmFix: e2e claimDevelopment	2024-09-23 11:15:11 +02:00
Javier Segarra	66cb069109	perf: CustomerBalance	2024-09-23 11:06:08 +02:00