8032-devToTest_2440 #751

Merged

alexm merged 319 commits from 8032-devToTest_2440 into test 2024-09-24 10:05:33 +00:00

Conversation 0 Commits 319 Files Changed 169 +3937 -2830

319 Commits

Author	SHA1	Message	Date
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
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
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
Javier Segarra	88fd40eae6	feat: minor changes	2024-09-23 11:05:58 +02:00
Pablo Natek	17bb144bce	fix: refs #7404 translates and some minor style fixes	2024-09-23 10:04:45 +02:00
Javier Segarra	8bbea9c903	feat: change order	2024-09-23 09:47:54 +02:00
Javier Segarra	2a97f35dd9	Merge branch 'dev' into 6943_fix_customer_module	2024-09-21 01:32:45 +02:00
Javier Segarra	d81d562edf	feat: goToSupplier	2024-09-21 01:30:37 +02:00
Javier Segarra	f5c50e842e	Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module	2024-09-21 01:22:30 +02:00
Javier Segarra	f84444d894	feat: add tooltip CustomerNewCustomAgent	2024-09-21 01:22:25 +02:00
Jorge Penadés	cf11573713	Merge pull request 'feat: hide menus on small view' (!739) from hideMenu into dev ... Reviewed-on: #739 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-20 13:05:47 +00:00
Jorge Penadés	deff8a1cf4	feat: hide menus on small view	2024-09-20 13:58:26 +02:00
Javier Segarra	650e801433	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 11:10:28 +00:00
Alex Moreno	1150739de7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-19 12:59:51 +02:00
Alex Moreno	f03a2aebee	Merge pull request 'feat: global handler' (!729) from fix_global_handler into dev ... Reviewed-on: #729 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-09-19 10:56:11 +00:00
Alex Moreno	4f442a1f5a	Merge branch 'dev' into fix_global_handler	2024-09-19 10:54:45 +00:00
Javier Segarra	8e96265106	fix: CustomerFilter	2024-09-19 12:51:49 +02:00
Jon Elias	a012660518	Merge pull request 'Fix: Wagon section reload' (!727) from FixWagonRedirect into dev ... Reviewed-on: #727 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-19 10:45:31 +00:00
Jon Elias	c0dab66a24	Merge branch 'dev' into FixWagonRedirect	2024-09-19 10:08:18 +00:00
Javier Segarra	88e2ea48c2	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 10:07:46 +00:00
Javier Segarra	8b379faa52	perf: imrpove exprBuilder	2024-09-19 12:06:00 +02:00
Jon Elias	8fa11263e8	fix: fix wagon list reload	2024-09-19 12:05:08 +02:00
Javier Segarra	cc4f7de966	Merge pull request 'Fix VnTable InfiniteScroll' (!728) from fix_VnTable_infiniteScroll into dev ... Reviewed-on: #728 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-19 08:27:52 +00:00
Javier Segarra	35e89591ff	Merge branch 'dev' into fix_VnTable_infiniteScroll	2024-09-19 08:25:49 +00:00
Javier Segarra	46dbab4757	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 09:35:34 +02:00
Javier Segarra	297596fe38	Merge pull request 'Apply color for today' (!730) from highlight_today_qDate into dev ... Reviewed-on: #730 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-19 07:32:36 +00:00
Javier Segarra	1425ec268c	Merge branch 'dev' into highlight_today_qDate	2024-09-19 07:31:37 +00:00
Javier Segarra	aa97ac2810	Merge pull request 'More sections with 'add_circle' icon' (!731) from add_shortcut_add_subSections into dev ... Reviewed-on: #731 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-19 07:29:07 +00:00
Javier Segarra	c21133ebd4	Merge branch 'dev' into 6943_fix_customer_module	2024-09-19 01:10:23 +02:00
Javier Segarra	ccfe61d777	feat: vnSelect exprBuilder	2024-09-19 01:10:14 +02:00
Javier Segarra	1550d79160	feat: add shortcut more buttons	2024-09-19 00:10:28 +02:00
Javier Segarra	08bec59a37	add_circle	2024-09-19 00:04:58 +02:00
Javier Segarra	1cb2981f97	feat: apply color when today	2024-09-18 16:26:56 +00:00
Javi Gallego	b3f27d9a84	feat: translations fixed	2024-09-18 17:51:49 +02:00
Javier Segarra	3de08826ac	Merge branch 'dev' into fix_VnTable_infiniteScroll	2024-09-18 15:41:35 +00:00
Alex Moreno	5ca38ca825	feat: global handler	2024-09-18 14:48:15 +02:00
Javier Segarra	b59e7174df	Merge branch 'fix_VnTable_infiniteScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_VnTable_infiniteScroll	2024-09-18 14:30:53 +02:00
Alex Moreno	7b70734eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-18 14:29:29 +02:00
Javier Segarra	d76250f56f	fix: reset VnTable scroll properties	2024-09-18 12:27:48 +00:00
Javier Segarra	ee0f4037ed	Merge pull request 'Add shortcut for few sub sections' (!726) from add_shortcut_add_subSections into dev ... Reviewed-on: #726 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-18 12:26:44 +00:00
Javier Segarra	98411d3c29	Merge branch 'dev' into add_shortcut_add_subSections	2024-09-18 12:25:23 +00:00
Carlos Satorres	a302050494	Merge pull request 'refs #7155 scopeDays' (!710) from 7155-scopeDays into dev ... Reviewed-on: #710 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-18 12:09:18 +00:00
Carlos Satorres	364ce63545	Merge branch 'dev' into 7155-scopeDays	2024-09-18 12:01:43 +00:00
Jon Elias	9db12a8dee	fix: wagon reload	2024-09-18 13:46:37 +02:00
Javier Segarra	37329a7391	feat: add shortcut add event in some subSections	2024-09-18 13:30:51 +02:00
Alex Moreno	cba8647ac2	Merge pull request 'feat(AccountBasicData): add twoFactorFk' (!689) from 7792-accountBasicData_twoFactorFk into dev ... Reviewed-on: #689 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-18 10:41:56 +00:00
Alex Moreno	8abd375985	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk	2024-09-18 10:14:54 +02:00
Alex Moreno	21a7fafba5	feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData	2024-09-18 09:57:21 +02:00
Javier Segarra	9d210ace84	Merge pull request 'fix: SupplierFiscalData VnLocation' (!725) from fix_supplierFD_location into dev ... Reviewed-on: #725 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-18 07:54:42 +00:00
Javier Segarra	aa6dac3944	fix: SupplierFiscalData VnLocation	2024-09-18 07:28:10 +00:00
Alex Moreno	f1759eca04	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk	2024-09-18 08:23:25 +02:00
Alex Moreno	fb1a94604b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-18 08:20:45 +02:00
Carlos Satorres	4f662375cd	fix(VnTable): sanitizer value is defined	2024-09-17 15:04:58 +02:00
Pablo Natek	6886c18ddc	Merge pull request '7404-stockBought' (!593) from 7404-stockBought into dev ... Reviewed-on: #593 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 11:55:41 +00:00
Javier Segarra	e40f216e33	Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module	2024-09-17 13:48:20 +02:00
Javier Segarra	c7bef79c0a	perf: improve	2024-09-17 13:48:17 +02:00
Pablo Natek	cead2c2b5e	Merge branch 'dev' into 7404-stockBought	2024-09-17 11:40:42 +00:00
Pablo Natek	e559ab43d7	fix: refs #7404 remove some style	2024-09-17 13:40:27 +02:00
Javier Segarra	29e4c723c9	Merge branch 'dev' into 6943_fix_customer_module	2024-09-17 12:12:41 +02:00
Jon Elias	162c7858ff	Merge pull request '#6346 Wagons to VnTable' (!717) from 6346-WagonTypeToCard into dev ... Reviewed-on: #717 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 09:09:50 +00:00
Jon Elias	58cd0b54cf	Merge branch 'dev' into 6346-WagonTypeToCard	2024-09-17 09:08:00 +00:00
Javier Segarra	907e6dbf4f	Merge pull request '#7677 - Improve VnLocation' (!563) from 7677_vnLocation_perf into dev ... Reviewed-on: #563 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-17 08:29:23 +00:00
Pablo Natek	7faa0c240f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-17 10:10:40 +02:00
Javier Segarra	6dc337e585	Merge branch 'dev' into 6943_fix_customer_module	2024-09-17 07:30:29 +00:00
Javier Segarra	e4adbfa9f7	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 07:29:00 +00:00
Alex Moreno	b4cee6b02f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-16 14:24:22 +02:00
Javier Segarra	af4756d810	Merge pull request '#7017 Show FormModel Validations' (!469) from 7017_formModel_validations into dev ... Reviewed-on: #469 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-16 12:11:52 +00:00
Javier Segarra	603fb1de71	Merge branch 'dev' into 7017_formModel_validations	2024-09-16 11:58:15 +00:00
Javier Segarra	cf95cd7db7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module	2024-09-16 13:33:28 +02:00
Javier Segarra	6ffd985575	perf: CustomerBasicData.salesPersonFk	2024-09-16 13:33:07 +02:00
Jon Elias	cb87f4dce1	Merge branch 'dev' into 6346-WagonTypeToCard	2024-09-16 11:04:29 +00:00
Jon Elias	ae76bd0b0e	refactor: refs #6346 wagons to VnTable	2024-09-16 12:58:06 +02:00
Javier Segarra	eb8690a422	fix: remove promise execution	2024-09-16 10:30:04 +00:00
Javier Segarra	d384894bf0	fix: rule	2024-09-16 10:29:36 +00:00
Jorge Penadés	3c14d94bf1	Merge pull request '#7828 makeCorrectCalls' (!703) from 7828-makeCorrectCalls into dev ... Reviewed-on: #703 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-16 10:26:53 +00:00
Jorge Penadés	8577f33599	Merge branch 'dev' into 7828-makeCorrectCalls	2024-09-16 10:24:45 +00:00
Pablo Natek	263dc29d7a	fix: refs #7404 remove console.log	2024-09-16 12:19:03 +02:00
Jon Elias	e6278d51eb	Merge pull request 'fix: refs #7500 fixed e2e test' (!712) from Hotfix-FixEntryDmsTest into dev ... Reviewed-on: #712 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-16 10:17:33 +00:00
Javier Segarra	27069e56b8	Merge branch 'dev' into 6943_fix_customer_module	2024-09-16 10:11:29 +00:00
Pablo Natek	c59c8127cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-16 08:59:46 +02:00
Pablo Natek	deb30ee955	feat: refs #7404 travel m3 form	2024-09-16 08:59:36 +02:00
Jon Elias	c08167c5a9	Merge branch 'dev' into Hotfix-FixEntryDmsTest	2024-09-16 06:20:36 +00:00
Guillermo Bonet	07e45f2051	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-16 07:17:38 +02:00
Guillermo Bonet	57b939bdd5	Merge branch 'test' into dev	2024-09-16 07:17:25 +02:00
Javier Segarra	93488a5750	fix: styles	2024-09-13 23:19:16 +02:00
Javier Segarra	b6cce74449	fix: merge conflicts	2024-09-13 23:11:18 +02:00
Javier Segarra	401400bdcf	fix: remove FetchData	2024-09-13 22:52:26 +02:00
Javier Segarra	ed5ba1dd1a	Merge branch 'dev' into 7017_formModel_validations	2024-09-13 22:50:13 +02:00
Javier Segarra	8ce082d841	Merge pull request '#7671 - Improve/FIX ItemFixedPrice' (!714) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #714 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-13 20:44:29 +00:00
Javier Segarra	9c36a113e1	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-13 20:17:01 +00:00
Javier Segarra	6e6af0af80	perf: improve style	2024-09-13 15:16:40 +02:00
Carlos Satorres	842fb9de5f	refs #7155 scopeDays fix	2024-09-13 12:52:25 +02:00
Jon Elias	0f604ea8b5	fix: refs #7500 fixed e2e test	2024-09-13 11:34:45 +02:00
Jorge Penadés	48a5c15b9d	feat: refs #7828 create axios instance which no manage errors	2024-09-13 10:54:09 +02:00
Javier Segarra	a56dc7aa08	test: fix test	2024-09-13 10:33:08 +02:00
Javier Segarra	5796bc9c0a	fix: emit:updateModelValue	2024-09-13 10:32:40 +02:00
Jorge Penadés	58be11df04	chore: refs #7828 fix e2e	2024-09-13 10:13:03 +02:00
Javier Segarra	025436b4b8	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-13 09:27:38 +02:00
Javier Segarra	a5ea940dd8	fix: Customer module find salesPersons out of first get	2024-09-13 09:23:15 +02:00
Jorge Penadés	46fb7d0c73	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls	2024-09-13 09:20:14 +02:00
Alex Moreno	0dbcc4be3d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-13 08:57:27 +02:00
Carlos Satorres	8be1833f9e	refs #7155 scopeDays	2024-09-13 08:49:36 +02:00
Jon Elias	770663cc37	Merge pull request 'fix: refs #6346 fix list and create' (!404) from 6346-fixWagonModule into dev ... Reviewed-on: #404 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-13 06:16:04 +00:00
Jon Elias	ed5987630f	Merge branch 'dev' into 6346-fixWagonModule	2024-09-13 06:14:05 +00:00
Jon Elias	6c4f5ef915	Merge pull request '#7500 added VnImg in EntryDms' (!565) from 7500_ChangeEntryDms into dev ... Reviewed-on: #565 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-13 06:11:32 +00:00
Jon Elias	eca4b02022	Merge branch 'dev' into 7500_ChangeEntryDms	2024-09-13 06:10:34 +00:00
Javier Segarra	67140e4383	Merge pull request '#6943 - Customer module migration bugs' (!705) from 6943_fix_customer_module into dev ... Reviewed-on: #705 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-13 05:33:51 +00:00
Javier Segarra	b36f072b24	Merge branch 'dev' into 6943_fix_customer_module	2024-09-12 21:26:43 +02:00
Javier Segarra	aca13d9119	fix: CustomerBillingData	2024-09-12 21:26:28 +02:00
Javier Segarra	fa408dc226	fix: CustomerAddress mobile	2024-09-12 21:20:30 +02:00
Javier Segarra	6e784bb290	fix: address-create i18n	2024-09-12 21:11:51 +02:00
Javier Segarra	54fc7f6394	fix: CustomerRecovery transalate label	2024-09-12 21:10:06 +02:00
Javier Segarra	39f2deafc4	fix: CustomerCreditOpinion workerDescriptor	2024-09-12 21:08:41 +02:00
Javier Segarra	70d0132710	fix: CustomerWebPayment	2024-09-12 21:03:19 +02:00
Javier Segarra	24f4af712e	fix: CustomerMandates	2024-09-12 20:59:35 +02:00
Javier Segarra	8fc7e3cfb4	fix: CustomerSamples	2024-09-12 20:43:50 +02:00
Javier Segarra	a29ee42b9e	fix: CustomerBasicData show id assigned	2024-09-12 20:41:50 +02:00
Alex Moreno	dcb8c5daad	fix: workerDms filter workerFk	2024-09-12 13:27:28 +02:00
Javier Segarra	cfdfc7f531	fix: CustomerSamples	2024-09-12 13:19:37 +02:00
Jorge Penadés	44fd356d63	feat: refs #7828 useAcl & cherry pick mail data worker	2024-09-12 13:19:31 +02:00
Jorge Penadés	adb9cac360	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls	2024-09-12 13:11:11 +02:00
Javier Segarra	ea37015ec2	Merge pull request '#5938 - Use filter grouped by id' (!706) from 5938_filterGrouped into dev ... Reviewed-on: #706 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-12 11:05:25 +00:00
Jon Elias	b8f6bc26ad	Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms	2024-09-12 12:34:55 +02:00
Jon Elias	d00a88a3f4	refactor: refs #7500 deleted useless code	2024-09-12 12:34:54 +02:00
Jon Elias	be389c6736	Merge branch 'dev' into 7500_ChangeEntryDms	2024-09-12 10:32:47 +00:00
Jon Elias	35247007f0	Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms	2024-09-12 12:31:03 +02:00
Jon Elias	e5056c45c0	fix: refs #7500 fixed showing images wrongly	2024-09-12 12:31:00 +02:00
Javier Segarra	058039fd61	Merge branch 'dev' into 5938_filterGrouped	2024-09-12 10:27:36 +00:00
Javier Segarra	856d551503	Merge pull request 'Fix Call back when hasMoreData' (!707) from fix_VnTable_infiniteScroll into dev ... Reviewed-on: #707 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-12 10:13:57 +00:00
Javier Segarra	29bd3f0516	Merge branch 'dev' into fix_VnTable_infiniteScroll	2024-09-12 10:12:31 +00:00
Javier Segarra	a3afe790b9	fix: CustomerGreuges	2024-09-12 12:00:07 +02:00
Javier Segarra	c22f8f1069	fix: stop call back event hasMoreData	2024-09-12 09:57:31 +00:00
Javier Segarra	c7adb91912	feat: use disableInifiniteScroll property	2024-09-12 09:56:37 +00:00
Javier Segarra	3892df250c	fix: #5938 grouped filter	2024-09-12 08:53:46 +00:00
Javier Segarra	25b7569791	Merge pull request 'FIX InfiniteScroll when use VnTable' (!704) from fix_VnTable_infiniteScroll into dev ... Reviewed-on: #704 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-12 08:22:25 +00:00
Javier Segarra	9941975683	fix: infiniteScroll	2024-09-12 08:07:53 +00:00
Jorge Penadés	1dffa8865e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls	2024-09-12 09:55:30 +02:00
Alex Moreno	9d055a48c4	Merge branch 'dev' into 7792-accountBasicData_twoFactorFk	2024-09-12 07:29:47 +00:00
Jorge Penadés	6b79d70551	refactor: refs #7828 wip	2024-09-12 09:14:55 +02:00
Pablo Natek	e2dbe0fd38	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-12 09:09:21 +02:00
Alex Moreno	4a234dd875	fix: duplicate code	2024-09-12 08:31:57 +02:00
Alex Moreno	8bf7b729d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-12 08:26:10 +02:00
Javier Segarra	233841ad16	Merge pull request '#6943 - FIX Customer module' (!628) from 6943_fix_customerSummaryTable into dev ... Reviewed-on: #628 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-12 05:28:18 +00:00
Javier Segarra	8d96539b24	perf: solve reload CardSummary component	2024-09-11 13:18:54 +02:00
Javier Segarra	c3108b4335	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable	2024-09-11 12:48:38 +02:00
Javier Segarra	d072a11c1b	Merge pull request 'refs #6156 new field' (!688) from 6156-advanceTicketsNewField into dev ... Reviewed-on: #688 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-11 10:34:47 +00:00
Javier Segarra	f02ca7437c	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 10:27:12 +00:00
Jorge Penadés	aa5ef76dcf	Merge pull request '#7663 ticket setWeight' (!612) from 7663-setWeight into dev ... Reviewed-on: #612 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-11 07:42:17 +00:00
Jorge Penadés	2d5602e784	Merge branch 'dev' into 7663-setWeight	2024-09-11 07:40:36 +00:00
Javier Segarra	2d8322c6da	fix: remove FIXME	2024-09-11 09:20:54 +02:00
Javier Segarra	19eb770893	feat: remove cli warnings	2024-09-11 08:41:16 +02:00
Alex Moreno	3781ee97cb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-11 08:33:32 +02:00
Alex Moreno	e7fb6a7963	hotFix: keyBinding toUpperCase if is null	2024-09-11 08:32:59 +02:00
Javier Segarra	a0eea16c35	Merge pull request '#5938 Fix & Fine Advance Tickets' (!690) from 5938_fine_ticketAdvance into dev ... Reviewed-on: #690 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-11 06:30:11 +00:00
Javier Segarra	b2535dedcf	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-11 06:29:27 +00:00
Pablo Natek	c7e717c611	feat: refs #7404 add travel m3 to reserves form	2024-09-11 07:55:12 +02:00
Javier Segarra	b5dcc865e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable	2024-09-10 15:17:25 +02:00
Javier Segarra	622afca9be	feat: CustomerSample to VnTable	2024-09-10 15:17:10 +02:00
Jorge Penadés	a8d4457365	Merge pull request '#4074 useAcls' (!584) from 4074-useAcls into dev ... Reviewed-on: #584 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-10 11:50:43 +00:00
Jorge Penadés	05c91e2a29	Merge branch 'dev' into 4074-useAcls	2024-09-10 11:45:15 +00:00
Javier Segarra	bcfa67baec	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-09-10 12:26:17 +02:00
Javier Segarra	113ebd23a6	Merge branch 'dev' into 5938_fine_ticketAdvance	2024-09-10 09:49:23 +00:00
Alex Moreno	6d017d8c99	build: init version 2440	2024-09-10 10:33:55 +02:00
Jorge Penadés	5cc1d0cec4	chore: refs #7663 drop useless code	2024-09-10 10:04:40 +02:00
Jorge Penadés	f9adc49284	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-10 09:41:34 +02:00
Jorge Penadés	3fafb15eb8	refactor: refs #4074 use fn	2024-09-10 09:18:57 +02:00
Jorge Penadés	f7975069d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-10 08:59:01 +02:00
Jon Elias	b4fb9ceb2e	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:29:51 +00:00
Jon Elias	abc39633bf	Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-09-10 08:28:49 +02:00
Jon Elias	30ffb2428e	perf: refs #6346 previous changes	2024-09-10 08:28:48 +02:00
Jon Elias	6790067a89	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:02:18 +00:00
Jon Elias	e1adb1a8dd	refactor: refs #6346 requested changes	2024-09-10 08:01:28 +02:00
Jorge Penadés	f3471fe5ab	fix: refs #4074 await to watch	2024-09-09 17:20:16 +02:00
Jorge Penadés	f8cbb0a762	chore: refs #4074 fix tests	2024-09-09 17:10:35 +02:00
Jorge Penadés	04aa96b798	chore: refs #4074 fix tests	2024-09-09 17:01:36 +02:00
Jorge Penadés	26c7dfde35	chore: refs #4074 fix tests	2024-09-09 16:44:43 +02:00
Javier Segarra	67b2cd3a0b	feat: stateGroupedFilter	2024-09-09 14:58:26 +02:00
Jorge Penadés	bd00f86d74	chore: refs #4074 fix tests	2024-09-09 14:09:29 +02:00
Jorge Penadés	ee62f85250	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-09 13:59:13 +02:00
Javier Segarra	52d8ff8ae2	fix: isFullMovable checkbox	2024-09-09 13:15:45 +02:00
Javier Segarra	7bc288ad71	fix: state cell	2024-09-09 13:15:37 +02:00
Jorge Penadés	381b236a18	refactor: refs #4074 use acl & drop useless roles	2024-09-09 12:56:37 +02:00
Javier Segarra	83d3246377	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 10:48:44 +00:00
Jorge Penadés	6438f36eca	refactor: refs #4074 accept array	2024-09-09 12:28:14 +02:00
Javier Segarra	2667d3afae	feat: show preparation field	2024-09-09 12:07:22 +02:00
Jorge Penadés	803ce3b909	refactor: refs #4074 rollback	2024-09-09 11:53:59 +02:00
Jorge Penadés	c978cca8c5	refactor: refs #4074 useAcl in navigationStore & router	2024-09-09 11:35:49 +02:00
Jon Elias	e702e9d1a1	Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-09-09 10:04:48 +02:00
Jon Elias	f78ca3f357	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-09-09 10:04:44 +02:00
Jorge Penadés	bef9b05b45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-09 10:03:51 +02:00
Jon Elias	5f546a47bf	Merge branch 'dev' into 7500_ChangeEntryDms	2024-09-09 08:02:17 +00:00
Alex Moreno	684215fc46	feat(AccountBasicData): add twoFactorFk	2024-09-09 09:59:22 +02:00
Jon Elias	b61e2a5c28	Merge branch 'dev' into 7500_ChangeEntryDms	2024-09-09 05:27:53 +00:00
Pablo Natek	e083d6a802	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-08 07:54:26 +02:00
Jorge Penadés	b87e7ce750	refactor: refs #4074 use VnTitle	2024-09-06 17:01:23 +02:00
Jorge Penadés	d0131dd552	fix: refs #4074 drop wrong acl	2024-09-06 15:52:06 +02:00
Jorge Penadés	3693ba0c99	feat: refs #4074 drop useless code	2024-09-06 15:37:33 +02:00
Jorge Penadés	86e1396da4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-06 14:23:04 +02:00
Jorge Penadés	34a9b4d4d0	Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-09-06 13:23:02 +02:00
Jorge Penadés	6f98f24926	chore: refs #7663 add test	2024-09-06 11:55:39 +02:00
Jorge Penadés	b13874e8a1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-06 11:30:24 +02:00
Pablo Natek	cd12343302	feat: refs #7404 add some style to the form and reorganize fields	2024-09-06 07:26:04 +02:00
Javier Segarra	1f96f5c09a	feat: orderCreateDialog	2024-09-05 22:20:57 +02:00
Javier Segarra	b3391ab522	perf: minor comments	2024-09-05 20:51:33 +02:00
Javier Segarra	31abd8b4c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable	2024-09-05 19:45:41 +02:00
Javier Segarra	6476a8307a	perf: i18n	2024-09-05 15:08:59 +02:00
Javier Segarra	62cdc1d527	feat: CustomerCreateTicket	2024-09-05 14:56:50 +02:00
Jorge Penadés	fc5eb20dba	chore: refs #7663 create test wip	2024-09-05 08:56:38 +02:00
Javier Segarra	cf3b9b2ef8	perf: CustomerSummary	2024-09-04 17:55:27 +02:00
Jorge Penadés	af5e47ed3e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-04 16:06:31 +02:00
Pablo Natek	717bf1c3e3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-04 14:40:53 +02:00
Pablo Natek	3dc720e2d0	feat: refs #7404 add m3 and fix detail	2024-09-04 14:40:36 +02:00
Jorge Penadés	50cdb053f8	feat: refs #7663 fine tunning	2024-09-03 17:33:17 +02:00
Jorge Penadés	edfc6ace0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-03 16:23:48 +02:00
Jon Elias	58eca71e95	Merge branch 'dev' into 6346-fixWagonModule	2024-09-03 12:36:42 +00:00
Pablo Natek	74b47361c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 09:42:35 +02:00
Jorge Penadés	3e81b34379	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-03 09:10:34 +02:00
Pablo Natek	2fb974af0f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 08:01:19 +02:00
Jorge Penadés	1824d9a0e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-02 17:02:58 +02:00
Jon Elias	76a7f8a1b3	refactor: refs #7500 refactor vnimg when storage is dms	2024-09-02 12:09:48 +02:00
Jon Elias	e4e9496cac	Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms	2024-09-02 11:33:15 +02:00
Jon Elias	5fc33cb4c3	Merge branch 'dev' of https: refs #7500//gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms	2024-09-02 11:33:10 +02:00
Javier Segarra	c25b689685	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-31 00:14:42 +02:00
Javier Segarra	00acd5b0ab	feat: CustomerCredit section	2024-08-30 14:24:25 +02:00
Javier Segarra	4762c9fa53	perf: disable card option	2024-08-30 13:02:39 +02:00
Javier Segarra	d155b40bde	revert: vnUSerLink change	2024-08-30 12:41:59 +02:00
Javier Segarra	0314ca8397	fix: customerSummaryToTicketList button	2024-08-30 12:41:03 +02:00
Javier Segarra	52883dfb52	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-30 09:31:32 +02:00
Javier Segarra	8b4fcbd888	feat: CustomerGreuges	2024-08-29 15:30:09 +02:00
Javier Segarra	b66ff783be	feat: CustomerBalance	2024-08-29 15:29:57 +02:00
Javier Segarra	c727e5f669	feat: copy customer countryFk	2024-08-29 14:23:18 +02:00
Javier Segarra	375e65aed0	fix: CustomerDescriptorAccount	2024-08-29 12:20:34 +02:00
Javier Segarra	bdffdce966	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-29 10:55:25 +02:00
Javier Segarra	7d526f4aa4	fix: CusomerSummary to Address	2024-08-28 20:33:22 +02:00
Javier Segarra	e8f660ea37	perf: CustomerBasicData	2024-08-28 20:32:13 +02:00
Javier Segarra	1b5658726e	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-27 20:47:09 +02:00
Javier Segarra	ca74ad85b4	fix: Customerconsumption	2024-08-27 20:46:51 +02:00
Javier Segarra	20ddabcc01	Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable	2024-08-27 16:30:32 +02:00
Javier Segarra	cadd6a2b62	Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable	2024-08-27 15:52:38 +02:00
Javier Segarra	3ea8490e98	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-27 15:46:04 +02:00
Javier Segarra	b481876e81	fix: CustommerSummaryTable Proxy	2024-08-27 12:37:30 +02:00
Javier Segarra	452b084caf	feat: change QBadge color	2024-08-27 12:13:49 +02:00
Javier Segarra	61c7c622f7	perf: update CustommerDescriptor	2024-08-27 07:00:54 +02:00
Javier Segarra	db97e8322e	feat: change url CustomerList	2024-08-27 07:00:40 +02:00
Javier Segarra	10747d7a4f	perf: customerSummaryTable	2024-08-27 07:00:28 +02:00
Jorge Penadés	3aa3d2d8d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-08-26 16:58:20 +02:00
Javier Segarra	9a48cb0742	feat: VnImg draggable	2024-08-26 12:26:31 +02:00
Javier Segarra	6c887c36b1	fix: CustomerDescriptor.bussinessTypeFk	2024-08-26 12:26:21 +02:00
Javier Segarra	56f687ce36	perf: sendEmail customerConsumption	2024-08-23 21:06:15 +02:00
Javier Segarra	0d99c5f609	feat: CustomerConsumptionFilter	2024-08-23 15:30:22 +02:00
Javier Segarra	c382118492	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-23 13:32:23 +02:00
Javier Segarra	bc1ea611ce	feat: CustomerConsumptionFilter	2024-08-23 10:36:31 +02:00
Javier Segarra	aebf6d7a8e	Merge branch 'dev' into 7017_formModel_validations	2024-08-21 13:55:28 +02:00
Javier Segarra	a131cb559d	feat: add max rule	2024-08-21 13:34:40 +02:00
Javier Segarra	f927e9b722	fix: #6943 fix customerSummaryTable	2024-08-19 14:31:52 +02:00
Alex Moreno	e45e551526	feat: customer consumption	2024-08-16 15:16:35 +02:00
Jorge Penadés	bdaba6b3ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-08-14 16:29:53 +02:00
Alex Moreno	793001be6e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables	2024-08-14 13:40:49 +02:00
Alex Moreno	dae71dacfc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables	2024-08-14 10:49:11 +02:00
Alex Moreno	bd83a959f7	fix: customer credit opinion	2024-08-14 10:11:52 +02:00
Javier Segarra	9eff6b56ea	fix: remove print variable	2024-08-14 09:48:59 +02:00
Javier Segarra	8acd008f42	feat: handle newValue	2024-08-14 09:47:27 +02:00
Javier Segarra	55b9cd9ff4	feat: handle same multiple CP	2024-08-14 09:18:24 +02:00
Javier Segarra	92130b4c9c	WIP: 59262019 Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev	2024-08-14 08:09:27 +02:00
Javier Segarra	3e44c6e404	Merge branch 'dev' into 7677_vnLocation_perf	2024-08-14 08:01:26 +02:00
Pablo Natek	c31aa3258f	fix: refs #7830 remove console.log	2024-08-13 18:15:16 +02:00
Pablo Natek	40e46f5a72	fix: refs #7830 customer credit	2024-08-13 18:13:46 +02:00
Pablo Natek	ffd7d98e9c	feat: travel m3	2024-08-13 17:56:07 +02:00
Jorge Penadés	c8ab5b3bfd	feat: refs #7663 add setWeight menu opt (wip)	2024-08-13 14:57:09 +02:00
Pablo Natek	cf1545d5e8	Merge branch 'dev' into 7404-stockBought	2024-08-05 14:25:47 +00:00
Pablo Natek	de94b3629e	fix: remove console.log	2024-08-05 15:44:37 +02:00
Pablo Natek	f2be2b4300	fea: stockBought add form and formDetail	2024-08-05 15:42:57 +02:00
Jon Elias	2a4180a1c3	refactor: refs #6346 deleted front error checking	2024-08-02 13:20:46 +02:00
Jorge Penadés	51fec90607	feat: refs #4074 useAcl in vnSelectDialog	2024-08-02 12:04:19 +02:00
Jorge Penadés	6c3c03722f	feat: refs #4074 useAcl in vnSelectDialog	2024-08-02 09:37:48 +02:00
Jorge Penadés	53aec24790	chore: refs #4074 drop workerCreate	2024-08-02 09:04:16 +02:00
Jorge Penadés	199ed80212	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-08-01 16:39:20 +02:00
Jorge Penadés	9e9a530803	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls	2024-08-01 16:37:12 +02:00
Jorge Penadés	db18e8c937	fix: refs #4074 workerCard data-key	2024-08-01 16:10:26 +02:00
Jorge Penadés	fb496d7fc6	chore: refs #4074 admit several acls	2024-08-01 16:08:40 +02:00
Jorge Penadés	27034d1dc2	chore: refs #4074 admit several acls	2024-08-01 14:46:04 +02:00
Jorge Penadés	dcc2f4dfde	chore: refs #4074 admit several acls	2024-08-01 14:14:28 +02:00
Jorge Penadés	c766110bd9	chore: refs #4074 wip replace useRole for useAcl	2024-08-01 14:13:37 +02:00
Jorge Penadés	351c2a07dc	chore: refs #4074 wip replace useRole for useAcl	2024-08-01 09:15:35 +02:00
Jon Elias	fee7743b6e	Merge branch 'dev' into 7500_ChangeEntryDms	2024-07-25 08:05:32 +00:00
Jon Elias	4188569908	feat: refs #7500 added VnImg to show files	2024-07-25 10:03:20 +02:00
Jon Elias	8ceee6f182	fix: fix conflicts	2024-07-25 07:06:27 +02:00
Javier Segarra	3a0204d27b	feat: vnLocation changes	2024-07-24 14:58:51 +02:00
Jon Elias	a7a1b7801c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-07-23 13:25:58 +02:00
Jon Elias	12370b6437	feat: refs #6346 new wagon type section	2024-07-23 13:22:54 +02:00
Jon Elias	5926381f36	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-06-07 13:38:08 +02:00
Pablo Natek	8a3b575157	fix: refs #6346 fix list and create	2024-05-24 00:28:18 +02:00