6321 Commits

All Branches

Search

Author	SHA1	Message	Date
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	c8d6a67011	fix tootltip	2024-09-05 12:49:17 +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	83969f1d57	fix traduction	2024-09-05 12:05:53 +02:00
Carlos Satorres	1662e3b459	Merge pull request 'refs #6943 remake, refactor, clean code Samples' (!677) from 6943-fixCustomerSamples into master ... Reviewed-on: #677 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:57:20 +00:00
Javi Gallego	1b8a72175c	Merge pull request '#7277 feat: transfer an invoice' (!674) from 7277-RefundInvoices into dev ... Reviewed-on: #674 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:07:35 +00: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
Jorge Penadés	fc5eb20dba	chore: refs #7663 create test wip	2024-09-05 08:56:38 +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
Javier Segarra	e3c8adf676	Merge branch '7277-RefundInvoices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7277-RefundInvoices	2024-09-04 22:27:33 +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
Carlos Andrés	3e6710404b	Merge pull request '#7897 - Merge master into test' (!668) from master into test ... Reviewed-on: #668 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-04 14:28:54 +00: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
Jorge Penadés	a5d32895ea	Merge pull request 'fix: refs #6900 fine tunning' (!661) from 6900-hotfix-fineTunning into master ... Reviewed-on: #661 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 13:58:58 +00:00
Javier Segarra	95e30c88ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7277-RefundInvoices	2024-09-04 15:32:14 +02:00
Carlos Satorres	251f27bec6	Merge pull request 'refs #7407 Medical Section' (!667) from 7407-MedicalWorker2 into dev ... Reviewed-on: #667 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 13:07:33 +00: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	63c2da9a51	Merge pull request '#6896 Added missing descriptors and small details' (!671) from Fix_OrderMissingDetails into dev ... Reviewed-on: #671 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 10:36:04 +00:00
Jon Elias	4602f4c7b3	refactor: deleted useless prop	2024-09-04 12:25:05 +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	3a1575a385	Merge branch 'Fix_OrderMissingDetails' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails	2024-09-04 10:05:19 +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	6097f46e29	Merge branch 'dev' into Fix_OrderMissingDetails	2024-09-04 06:38:34 +00: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