3805 Commits

Author	SHA1	Message	Date
Jon Elias	bb1eb30a25	fix: refs #7553 changed fields in order in purchase request table	2024-09-12 13:22:53 +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
Jon Elias	b4c46dc153	refactor: refs #7553 modified ticketSummary QChips, deleted useless code	2024-09-12 13:13:56 +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	058039fd61	Merge branch 'dev' into 5938_filterGrouped	2024-09-12 10:27:36 +00:00
Javier Segarra	a3afe790b9	fix: CustomerGreuges	2024-09-12 12:00:07 +02: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
Jon Elias	4a1f5e922c	refactor: refs #7553 align ticket sale qdrawer fields	2024-09-12 10:19:21 +02:00
Jon Elias	6a5f31ff1e	fix: refs #7553 fixed conflicts	2024-09-12 10:14:38 +02:00
Alex Moreno	368e013f54	Merge branch 'master' into hotFix_claimList_attenderFk	2024-09-12 07:59:16 +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
Jorge Penadés	d92659289b	fix: refs #7323 add correct label	2024-09-12 09:41:29 +02:00
Jorge Penadés	22bc8f2414	fix: refs #7323 show user name	2024-09-12 09:33:06 +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
Alex Moreno	d822bb6f20	fix(ClaimList): attenderFk filter	2024-09-12 09:12:36 +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
Alex Moreno	8d04d50a13	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-12 08:26:01 +02:00
Jon Elias	18fc5e241c	fix: refs #7903 fixed ticket's search bar and keybinding tooltip	2024-09-11 14:07:31 +02: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	f02ca7437c	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-11 10:27:12 +00:00
Jorge Penadés	9219fa07f5	fix: refs #7353 hide search param	2024-09-11 11:23:14 +02:00
Jon Elias	422907447b	refactor: refs #7553 merge conflicts	2024-09-11 10:27:08 +02:00
Jon Elias	d1138529b2	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-11 10:26:52 +02:00
Carlos Satorres	1c9e13fe15	refs #7962 fix claimSummary	2024-09-11 10:23:27 +02:00
Jorge Penadés	b559f2f18c	refactor: refs #7353 use global locales	2024-09-11 10:18:11 +02:00
Jon Elias	ff7bcfb00a	refactor: refs #7553 modified ticket sale to create a row in the table	2024-09-11 10:16:42 +02:00
Jorge Penadés	2b012d2de4	fix: refs #7353 use same datakey	2024-09-11 10:04:40 +02:00
Jorge Penadés	2d5602e784	Merge branch 'dev' into 7663-setWeight	2024-09-11 07:40:36 +00:00
Alex Moreno	e2d3154878	fix(ClaimLines): not reload when change quantity	2024-09-11 09:21:30 +02:00
Javier Segarra	19eb770893	feat: remove cli warnings	2024-09-11 08:41:16 +02: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
Carlos Satorres	7b2545798c	fix(account_privileges): fix url update	2024-09-10 12:38:09 +02: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
Jon Elias	e7a89138ba	fix: refs #7553 fix conflicts	2024-09-10 11:47:38 +02:00
Carlos Satorres	8c57bca4e0	hotfix cau #218919 accountPrivileges fix	2024-09-10 10:36:41 +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
Alex Moreno	3164209bef	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-10 08:13:56 +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
Javier Segarra	d347a81d74	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-10 05:19:02 +00:00
Jon Elias	4786a0e277	Merge branch 'dev' into 7889-KeyShortcuts	2024-09-10 04:45:24 +00:00
Javier Segarra	7e74123459	Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices	2024-09-10 00:18:12 +02:00
Javier Segarra	d734674eb6	fix: minor changes	2024-09-10 00:18:09 +02:00
Javier Segarra	b4b65ad0fd	fix: minor error whit dates	2024-09-10 00:17:59 +02:00
Javier Segarra	41939315be	style: show subName value	2024-09-10 00:17:39 +02:00
Javier Segarra	9c86fd0ed5	perf: order by	2024-09-10 00:17:13 +02:00
Javier Segarra	7358dab1d0	fix: call upsert when crudModel haschanges	2024-09-10 00:16:01 +02:00
Jorge Penadés	f8cbb0a762	chore: refs #4074 fix tests	2024-09-09 17:10:35 +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
Javier Segarra	b3f305a3fd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:17:59 +00: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
Jon Elias	6248a4117d	refactor: refs #7553 requested changes	2024-09-09 13:52:41 +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
Alex Moreno	070f0da757	Merge branch 'dev' into 7547-accessToken-security	2024-09-09 10:55:22 +00:00
Javier Segarra	83d3246377	Merge branch 'dev' into 6156-advanceTicketsNewField	2024-09-09 10:48:44 +00:00
Carlos Satorres	15a764d1cf	refs #7283 fix	2024-09-09 12:35:47 +02: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
Carlos Satorres	6c78fb1bee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor	2024-09-09 12:06:01 +02:00
Carlos Satorres	3004d77d34	refs #7283 fix ItemDescriptor warehouse	2024-09-09 12:05:08 +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
Alex Moreno	684215fc46	feat(AccountBasicData): add twoFactorFk	2024-09-09 09:59:22 +02:00
Jon Elias	6a96b252b4	Merge branch 'dev' into 7889-KeyShortcuts	2024-09-09 07:47:40 +00:00
Jon Elias	0b961050a0	refactor: refs #7553 rollback ticket advance due to slot problems	2024-09-09 08:14:53 +02:00
Jon Elias	94ae74ca7f	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-09 08:10:06 +02:00
Jon Elias	4630496361	refactor: refs #7553 changed fields in ticket component & ticket filter	2024-09-09 08:10:05 +02:00
Jon Elias	459551b16e	Merge branch 'dev' into 7889-KeyShortcuts	2024-09-09 05:30:14 +00:00
Javier Segarra	53e6c67ff9	perf: minor clean code	2024-09-08 12:56:40 +02: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
Javier Segarra	754f047943	perf: order components	2024-09-07 21:55:08 +02:00
Javier Segarra	0c1cd47d38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices	2024-09-07 16:38:06 +02:00
Jorge Penadés	18c952c0fc	refactor: refs #7323 drop useless code	2024-09-06 17:51:13 +02:00
Jorge Penadés	b87e7ce750	refactor: refs #4074 use VnTitle	2024-09-06 17:01:23 +02:00
Jorge Penadés	3693ba0c99	feat: refs #4074 drop useless code	2024-09-06 15:37:33 +02:00
Carlos Satorres	27f25f611f	refs #7283 fix ItemDescriptor warehouse	2024-09-06 14:57:10 +02:00
Javier Segarra	3276548f88	fix: editTableOptions	2024-09-06 14:47:29 +02:00
Javier Segarra	31b8088b5f	perf: improve ItemFixedPricefilterPanel	2024-09-06 14:41:38 +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
Javier Segarra	a8057b47dc	feat: updates	2024-09-06 14:06:30 +02:00
Jon Elias	4636e2f2e6	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-06 12:05:07 +00:00
Jon Elias	0e5607d685	feat: refs #7553 ticket component to vntable and fixed minor errors	2024-09-06 13:59:50 +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
Javier Segarra	9bb298bbeb	feat: handle create row	2024-09-06 13:14:46 +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
Javier Segarra	e592a76946	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices	2024-09-06 10:42:07 +02:00
Jon Elias	ef98f60486	refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu	2024-09-06 10:30:32 +02:00
Jon Elias	5d78f564dd	refactor: refs #7889 deleted subtitle attr and use keyBinding instead	2024-09-06 10:00:07 +02:00
Jorge Penadés	5d91b03f9a	fix: dynamic fetch	2024-09-06 09:27:55 +02:00
Jon Elias	585919a4d9	feat: refs #7889 added shortcuts to modules	2024-09-06 09:19:38 +02:00
Jorge Penadés	f0351b0417	chore: refs #7323 worker changes	2024-09-06 09:05:29 +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
Jon Elias	8ff9dae1d8	refactor: refs #7553 requested changes	2024-09-06 07:16:03 +02:00
Jon Elias	102f7fb13e	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-06 07:15:48 +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	af91ca43e0	Merge branch 'dev' into 7283-fixItemDescriptor	2024-09-05 13:57:53 +00: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
Jon Elias	db6f4fd15a	refactor: refs #7553 deleted logs	2024-09-05 14:32:22 +02:00
Jon Elias	6321ed4ee2	Merge branch 'dev' into plus_key_shortcut	2024-09-05 11:08:52 +00:00
Jon Elias	b6e14c4e6a	fix: refs #7911 fixed shortcut and related files	2024-09-05 13:08:02 +02:00
Carlos Satorres	d4da8fc69f	fix branch	2024-09-05 12:48:31 +02:00
Carlos Satorres	99b65c564c	fix branch	2024-09-05 12:41:21 +02:00
Carlos Satorres	fc7cc86362	fix branch	2024-09-05 12:39:55 +02:00
Carlos Satorres	8fe6fad4a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor	2024-09-05 12:07:18 +02:00
Carlos Satorres	3999936ec1	Merge branch 'master' into 6943-fixCustomerSamples	2024-09-05 08:58:20 +00:00
Carlos Satorres	95b19b5cce	refs #7283 refactor fix ItemDescriptor	2024-09-05 10:04:58 +02:00
Jon Elias	70806769ce	feat: refs #7911 added shortcut to modules	2024-09-05 08:25:28 +02:00
Jon Elias	96cdb85258	Merge branch 'dev' of https: refs #7911//gitea.verdnatura.es/verdnatura/salix-front into 7911-plus_key_shortcut	2024-09-05 07:42:55 +02:00
Javi Gallego	c2e2d5ca81	feat: minor fixes	2024-09-04 18:30:20 +02:00
Javi Gallego	91164da2eb	feat: refuncInvoiceForm component	2024-09-04 18:16:40 +02:00
Javier Segarra	cf3b9b2ef8	perf: CustomerSummary	2024-09-04 17:55:27 +02:00
Javi Gallego	5d7e6be17c	Merge branch 'dev' into 7277-RefundInvoices	2024-09-04 17:51:02 +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
Carlos Satorres	716270ef92	Merge branch 'dev' into 7407-MedicalWorker2	2024-09-04 12:53:09 +00:00
Carlos Satorres	61c0f63eaf	refs #6943 add try catch get	2024-09-04 14:46:21 +02:00
Carlos Satorres	bcdd6965e6	refs #6943 add try catch	2024-09-04 14:43:48 +02:00
Carlos Satorres	d08748b1a4	refs #6943 fix sampleType	2024-09-04 14:41:35 +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
Carlos Satorres	b29a56d7dd	refs #6943 remake, refactor, clean code Samples	2024-09-04 14:37:39 +02:00
Jon Elias	65e3fd874d	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-04 14:15:58 +02:00
Jon Elias	f5eacea483	refactor: refs #7553 modified QDrawer and table columns	2024-09-04 14:12:27 +02:00
Jon Elias	1889aa85b5	refactor: refs #7553 deleted expedition code and slot in VnTable	2024-09-04 11:49:49 +02:00
Jorge Penadés	763cf2e345	refactor: refs #6900 create setRectificative composable	2024-09-04 10:30:14 +02:00
Carlos Satorres	1f9d1b79ab	refs #7283 refactor ItexDescriptor	2024-09-04 10:17:57 +02:00
Jon Elias	19ae1f9d80	refactor: deleted useless prop in FetchedTags	2024-09-04 10:05:18 +02:00
Jon Elias	beaa9ab5c8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails	2024-09-04 09:53:47 +02:00
Carlos Satorres	3a703141c6	Merge branch 'dev' into 7407-MedicalWorker2	2024-09-04 07:49:14 +00:00
Jon Elias	5edea7cad1	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-04 09:11:06 +02:00
Jon Elias	0d9773a30f	refactor: refs #7553 added default date in new expedition modal	2024-09-04 09:11:05 +02:00
Jon Elias	4bc148f16b	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-04 06:19:20 +00:00
Jon Elias	5471607d32	refactor: refs #7553 added order to Expedition table and tootltip in delete button	2024-09-04 08:18:10 +02:00
Jon Elias	cb7d729b0f	fix: refs #7553 fixed details in summary and data-key in TicketList	2024-09-04 08:02:28 +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
Javi Gallego	5b53e9dc37	feat: transfer an invoice	2024-09-03 15:25:36 +02:00
Jorge Penadés	00beeaf51b	feat: refs #6900 add tooltip	2024-09-03 14:37:24 +02:00
Jorge Penadés	6eb5435e25	chore: refs #6900 drop useless code	2024-09-03 13:03:38 +02:00
Jon Elias	f35e33cf10	fix: refs #7553 fixed TicketTransfer	2024-09-03 12:54:44 +02:00
Jorge Penadés	a5887114ef	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning	2024-09-03 12:50:35 +02:00
Javier Segarra	397a2606f1	fix: cli warnings	2024-09-03 10:31:37 +02:00
Carlos Satorres	64eeeb67fa	refs #6899 fix InvoiceOut	2024-09-03 10:00:44 +02:00
Jon Elias	75e18a1e2f	fix: added missing descriptors and small details	2024-09-03 09:55:58 +02: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
Robert Ferrús	5a684e244f	Merge branch 'dev' into 211153-businessDataLinkGrafana	2024-09-03 06:46:35 +00:00
Javier Segarra	c4c4285b4b	fix: remove unnecessary console.log	2024-09-03 08:16:01 +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
Jon Elias	d18ca14b4e	fix: refs #7553 merge changes	2024-09-03 07:45:46 +02:00
Jon Elias	3d683c1da3	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-03 07:45:23 +02:00
Jon Elias	b622f6ef96	fix: refs #7553 fixed QChips like Salix	2024-09-03 07:36:40 +02:00
Pablo Natek	f6fe05a47a	Merge branch 'dev' into 7129-someFixesAfterMigration	2024-09-03 05:26:37 +00:00
Jon Elias	a2eb298733	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-03 04:36:22 +00:00
Javier Segarra	e9da8d44f0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36	2024-09-02 19:31:54 +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
Jorge Penadés	3df86d20d2	chore: refs #6900 drop useless locale	2024-09-02 16:48:15 +02:00
Jorge Penadés	b42385d7d6	refactor: refs #6900 create new expense form	2024-09-02 16:47:54 +02:00
Javier Segarra	e4bd19b02d	Merge branch 'dev' into plus_key_shortcut	2024-09-02 15:25:42 +02:00
Carlos Satorres	e73930a4eb	refs #7407 Medical Section remove table	2024-09-02 15:11:04 +02:00
Javier Segarra	c495698cac	Merge branch 'dev' into plus_key_shortcut	2024-09-02 15:05:38 +02:00
Javier Segarra	7892e68e1b	feat: updates	2024-09-02 15:03:47 +02:00
Carlos Satorres	0475083a2b	refs #7407 Medical Section	2024-09-02 14:57:01 +02:00
Pablo Natek	77d306ffeb	Merge branch 'dev' into 7129-someFixesAfterMigration	2024-09-02 12:46:26 +00:00
Pablo Natek	9cd941a01c	feat: refs #7129 add km start and end on create form	2024-09-02 14:45:43 +02:00
Jorge Penadés	0faa42867d	chore: refs #6900 drop comment	2024-09-02 13:52:13 +02:00
Jorge Penadés	200481414f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev	2024-09-02 13:21:40 +02:00
Jorge Penadés	f24daa4ebd	feat: refs #6900 hide menu item	2024-09-02 13:15:06 +02:00
Jon Elias	1af4a559fc	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-02 10:50:22 +00:00
Jon Elias	709f434e5d	refactor: refs #7354 changed icon color in table and notification when deleting a zone	2024-09-02 12:49:15 +02:00
Javier Segarra	970c8473a2	fet: updates	2024-09-02 11:28:13 +02:00
Jon Elias	8bcecb91c6	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-02 11:25:11 +02:00
Jon Elias	45d9322892	feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes	2024-09-02 11:24:06 +02:00
Robert Ferrús	a3b253c9eb	feat: refs #211153 businessDataLinkGrafana	2024-09-02 11:14:46 +02:00
Jorge Penadés	56d226b36b	fix: refs #7524 dynamic fetching	2024-09-02 10:03:01 +02:00
Javier Segarra	cfa5b84f4e	feat	2024-09-02 09:56:52 +02:00
Javier Segarra	fb15e90f0b	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-02 09:48:48 +02:00
Jorge Penadés	ed2167e199	refactor: refs #7353 ease logic	2024-09-02 09:30:15 +02:00
Jorge Penadés	a8fc5a8d73	Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-09-02 09:09:27 +02:00
Jorge Penadés	be63c8a7fa	fix: refs #6900 fine tunning wip	2024-09-02 08:43:32 +02:00