9275 Commits

Author	SHA1	Message	Date
Javier Segarra	aa2a8a2ce8	feat(salix): refs #7648 #7648 buyLabel	2024-07-01 11:43:12 +02:00
Javier Segarra	4decedddff	Merge pull request 'feat: refs #7648 refs #7644' into #7648	2024-07-01 10:05:54 +02:00
Javier Segarra	d160836eb0	test(salix): refs #7648 #7648 test:back	2024-06-29 00:23:23 +02:00
Javier Segarra	9193c784d0	feat(salix): refs #7648 #7648 filter entries and getBuys when !employee	2024-06-28 23:57:35 +02:00
Pablo Natek	b6a72a1abb	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-27 07:12:40 +00:00
Robert Ferrús	0534526ac2	fix: refs #7039 filterFix	2024-06-26 09:03:06 +02:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Guillermo Bonet	134c38b9fd	refs #6753 Hotfix	2024-06-25 08:57:21 +02:00
Jorge Penadés	24cf23dddc	feat: refs #62add travelKgPercentage table and model	2024-06-21 13:16:01 +02:00
Guillermo Bonet	074d4f4755	Merge branch 'master' into test	2024-06-20 13:10:07 +02:00
Guillermo Bonet	9a4ec46073	hotfix: refs #6820 Deleted km validation	2024-06-20 13:09:40 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Jorge Penadés	4b8b503964	Merge branch 'master' into 6744-hotfix-showChangePass	2024-06-19 14:50:32 +00:00
Alex Moreno	7a0d107943	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 12:43:43 +00:00
Carlos Andrés	c596cae0c0	Merge pull request 'fix: asociar ticketRefund refs #7586' (!2592) from 7586---Proceso-abonar-tickets/facturas-desde-Salix into master ... Reviewed-on: #2592 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 12:22:32 +00:00
Jorge Penadés	905528a704	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6744-hotfix-showChangePass	2024-06-19 13:44:39 +02:00
Pablo Natek	47eb6dd8fe	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 08:46:42 +00:00
Javi Gallego	df4b3add8d	fix: refs #6408 quito state.js	2024-06-19 07:59:45 +02:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Sergio De la torre	46cd20a1fd	feat hasItemOlder refs#6964	2024-06-18 08:24:15 +02:00
Sergio De la torre	eedcdb54fa	feat hasItemOlder refs#6964	2024-06-17 19:50:51 +02:00
Sergio De la torre	dc777b2d7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-06-17 19:12:00 +02:00
Guillermo Bonet	39381a4a7c	Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev ... Reviewed-on: #2596 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-17 11:22:30 +00:00
Guillermo Bonet	eaaf83561c	fix: refs #5995 Optimized downloadCmrsZip	2024-06-17 13:03:02 +02:00
Jorge Penadés	4bc62a30bd	fix: refs #6744 back test	2024-06-17 12:23:01 +02:00
Jorge Penadés	89ea931d9c	feat: refs #6744 add locale & drop verification	2024-06-17 12:19:59 +02:00
Robert Ferrús	cfa0b87898	feat: refs #7296 RoutesMonitor	2024-06-17 11:50:25 +02:00
Pablo Natek	25afa80bab	fix: refs #6404 remove fixtures after test	2024-06-17 09:09:45 +02:00
Carlos Andrés	9b118f83e5	fix: asociar ticketRefund refs #7586	2024-06-14 17:56:24 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Robert Ferrús	5714539d78	Merge pull request 'test' (!2585) from test into dev ... Reviewed-on: #2585 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 07:18:55 +00:00
Robert Ferrús	b5e139b734	fix: refs #7039 supplier search-panel country	2024-06-13 08:43:11 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Javi Gallego	446e180cf0	hotfix claim	2024-06-12 11:58:07 +02:00
Alex Moreno	b5ecf2e3b5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 10:11:14 +02:00
Alex Moreno	de0f0623e1	Merge branch 'master' into 6408-hotFix_updateQuantity	2024-06-12 08:07:25 +00:00
Alex Moreno	d9b0a1a75c	fix(updateQuantity): fix rocket translation	2024-06-12 09:59:58 +02:00
Alex Moreno	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Pablo Natek	11a7d890a0	Merge pull request 'feat: refs #7499 add printedStickers' (!2577) from 7499-add-printedStickers into dev ... Reviewed-on: #2577 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 14:32:14 +00:00
Javi Gallego	4744f57269	Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #2568 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:54:06 +00:00
Javi Gallego	79c922300b	hotfix #6408	2024-06-11 14:50:47 +02:00
Pablo Natek	13d1d0a61c	feat: refs #7499 add printedStickers	2024-06-11 14:29:16 +02:00
Robert Ferrús	8039530ab4	fix: refs #7039 fix item-tax	2024-06-11 14:15:10 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Guillermo Bonet	873f36fef6	refactor: refs #7503 Added relations and ACLs	2024-06-11 08:50:32 +02:00
Jorge Penadés	562e8689e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-10 15:36:34 +02:00
Jorge Penadés	8e3cc574ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 15:21:59 +02:00
Javi Gallego	e081c4504d	feat: refs #7548 link a grafana	2024-06-10 14:51:48 +02:00