8144-devToTest_2444 #3137

Merged

alexm merged 90 commits from 8144-devToTest_2444 into test 2024-10-22 06:07:15 +00:00

Conversation 0 Commits 90 Files Changed 43 +529 -293

90 Commits

Author	SHA1	Message	Date
Carlos Satorres	56cba385cf	Merge pull request 'fix: refs #6850 remove notifyPickUp' (!3132) from 6850-removeChandgeUpdateClaim into dev ... Reviewed-on: #3132 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 12:31:30 +00:00
Carlos Satorres	aad616ff83	Merge branch 'dev' into 6850-removeChandgeUpdateClaim	2024-10-21 12:26:53 +00:00
Carlos Satorres	f8c83c8f68	Merge pull request 'fix: refs #6831 filter observation' (!3131) from 6831-observationDefaulterEmail into dev ... Reviewed-on: #3131 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 12:26:04 +00:00
Carlos Satorres	c3ffb31348	Merge branch 'dev' into 6831-observationDefaulterEmail	2024-10-21 12:23:39 +00:00
Jorge Penadés	b76b1c6d50	Merge pull request '#7919 delete if ticketRefund' (!3091) from 7919-deleteTicketRefund into dev ... Reviewed-on: #3091 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 11:21:34 +00:00
Jorge Penadés	2f77359892	Merge branch 'dev' into 7919-deleteTicketRefund	2024-10-21 11:00:31 +00:00
Pablo Natek	69a34ab0fa	Merge pull request 'fix: add date format on insert data' (!3135) from fixNightProc into dev ... Reviewed-on: #3135 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 10:25:41 +00:00
Pablo Natek	1731af13ea	Merge branch 'fixNightProc' of https://gitea.verdnatura.es/verdnatura/salix into fixNightProc	2024-10-21 12:19:22 +02:00
Pablo Natek	e479873547	fix: restore cursor	2024-10-21 12:19:20 +02:00
Pablo Natek	92f699aac3	Merge branch 'dev' into fixNightProc	2024-10-21 09:37:07 +00:00
Pablo Natek	e38c061deb	fix: add date format on insert data	2024-10-21 11:36:44 +02:00
Jon Elias	d75a032d75	Merge pull request 'Added new filter param in item request' (!3094) from Fix-ItemRequest into dev ... Reviewed-on: #3094 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-21 09:34:53 +00:00
Jon Elias	158f701f1e	Merge branch 'dev' into Fix-ItemRequest	2024-10-21 09:31:29 +00:00
Carlos Satorres	bf0cc687e1	Merge branch 'dev' into 6850-removeChandgeUpdateClaim	2024-10-21 07:27:46 +00:00
Guillermo Bonet	5d55fb287d	Merge branch 'test' into dev	2024-10-21 09:25:39 +02:00
Carlos Satorres	eea09a9d4a	fix: refs #6850 add code	2024-10-21 09:24:53 +02:00
Javi Gallego	be9f711cc1	Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ... Reviewed-on: #3110 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:31:17 +00:00
Carlos Satorres	19fbb836a6	fix: refs #6850 fix model	2024-10-21 08:30:39 +02:00
Javi Gallego	da772cf504	Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ... Reviewed-on: #3114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:29:17 +00:00
Carlos Satorres	b88dc1c70f	fix: refs #6850 remove notifyPickUp	2024-10-20 16:23:24 +02:00
Carlos Satorres	b8e782d3a5	fix: refs #6831 filter observation	2024-10-20 15:59:24 +02:00
Jon Elias	9e9773578a	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 11:22:35 +00:00
Carlos Satorres	a5bbdd7a01	Merge pull request 'fix: refs #7906 remake method' (!3109) from 7906-notDeleteZone into dev ... Reviewed-on: #3109 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 08:33:03 +00:00
Carlos Satorres	ed69604767	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 08:31:38 +00:00
Guillermo Bonet	939f083671	Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev ... Reviewed-on: #3122 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-18 08:27:08 +00:00
Jon Elias	35621e9051	Merge pull request '#7010 added filter fields to show packing type field in ticket list' (!3024) from 7010-AddPackingField into dev ... Reviewed-on: #3024 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 07:40:35 +00:00
Carlos Satorres	5a14aed73a	Merge branch 'dev' into 7906-notDeleteZone	2024-10-18 07:40:04 +00:00
Jon Elias	3139d99130	Merge branch 'dev' into 7010-AddPackingField	2024-10-18 07:30:43 +00:00
Guillermo Bonet	46c7745128	Merge pull request 'refactor: refs #7811 Deleted pm2' (!3127) from 7811-byePm2 into dev ... Reviewed-on: #3127 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-10-18 07:30:13 +00:00
Jon Elias	46993ad103	refactor: refs #7010 deleted distinct	2024-10-18 09:29:01 +02:00
Carlos Satorres	1273e895af	fix: refs #7906 fix test back	2024-10-18 09:27:43 +02:00
Carlos Satorres	8609e85ba1	Merge pull request '7986-workerMoto' (!3095) from 7986-workerMoto into dev ... Reviewed-on: #3095 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 07:24:49 +00:00
Carlos Satorres	50a2f6081e	Merge branch 'dev' into 7986-workerMoto	2024-10-18 07:20:06 +00:00
Jon Elias	f68584b3fa	Merge branch 'dev' into Fix-ItemRequest	2024-10-18 06:53:38 +00:00
Carlos Satorres	02dc952024	fix: refs #7906 add test	2024-10-18 08:28:08 +02:00
Ivan Mas	d7fd1b7ee5	Merge pull request 'refactor: refs #7865 delete client.gestdocFk from TPV' (!3123) from 7865-deleteClientGestdocFkTPV into dev ... Reviewed-on: #3123 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-18 06:22:58 +00:00
Ivan Mas	f4b041c9b1	Merge branch 'dev' into 7865-deleteClientGestdocFkTPV	2024-10-18 06:20:38 +00:00
Guillermo Bonet	44dc84be9f	Merge branch 'dev' into 7811-byePm2	2024-10-18 06:02:20 +00:00
Guillermo Bonet	93494c3eb0	refactor: refs #7811 Deleted pm2	2024-10-18 08:02:06 +02:00
Carlos Satorres	b15b2d578d	Merge pull request 'fix: refs #7230 producer fix' (!3112) from 7230-deliveryNoteProducer into dev ... Reviewed-on: #3112 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-18 05:56:29 +00:00
Carlos Satorres	541990efb7	Merge branch 'dev' into 7230-deliveryNoteProducer	2024-10-18 05:53:34 +00:00
Guillermo Bonet	865da7bba2	refactor: refs #8106 Requested changes	2024-10-18 07:15:26 +02:00
Alex Moreno	d93653372a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-18 07:12:18 +02:00
Guillermo Bonet	5017b344d4	Merge pull request 'refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile' (!3118) from 7930-healthcheckDockerfile into dev ... Reviewed-on: #3118 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-10-18 05:06:52 +00:00
Ivan Mas	7dc35458e8	refactor: refs #7865 delete client.gestdocFk from TPV	2024-10-17 17:05:08 +02:00
Guillermo Bonet	28e957fecd	refactor: refs #8106 refs #1406 Optimized ticket_getTax	2024-10-17 14:46:19 +02:00
Guillermo Bonet	a188efb1e3	refactor: refs #7930 Deleted HEALTHCHECK of back dockerfile	2024-10-17 11:45:13 +02:00
Javi Gallego	681f82a3ae	feat: refs #7744 test back ok	2024-10-16 16:09:53 +02:00
Carlos Satorres	37d3ef5f16	Merge branch 'dev' into 7986-workerMoto	2024-10-16 12:10:13 +00:00
Carlos Satorres	3f3b936255	fix: refs #7906 remove code	2024-10-16 13:56:42 +02:00
Carlos Satorres	5de4a11e8b	fix: refs #7230 fix line	2024-10-16 13:53:20 +02:00
Carlos Satorres	3e443ad5ce	fix: refs #7230 producer fix	2024-10-16 12:22:57 +02:00
Carlos Satorres	a282170016	fix: refs #7906 fix method	2024-10-16 11:36:48 +02:00
Alex Moreno	cb7575d821	Merge pull request 'fix: refs #7353 redirect to lilium' (!3111) from 7353-fixRedirect into dev ... Reviewed-on: #3111 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-16 07:39:10 +00:00
Jorge Penadés	8f01e4d110	fix: refs #7353 redirect to lilium	2024-10-16 09:32:15 +02:00
Carlos Satorres	c5aa7dc44e	fix: refs #7906 edit test	2024-10-16 09:30:37 +02:00
Jorge Penadés	8ca097d4a9	chore: refs #7919 change var name	2024-10-16 09:23:39 +02:00
Javi Gallego	f78aad0874	Merge branch 'dev' into 7744-closeAllTest	2024-10-16 09:09:41 +02:00
Javi Gallego	aac4dd0a6d	feat: refs #7348 minor bug	2024-10-16 08:52:27 +02:00
Javi Gallego	c6e764b478	feat: refs #7348 hasDailyInvoice from client	2024-10-16 08:32:10 +02:00
Carlos Satorres	46e657675b	fix: refs #7906 remake method	2024-10-16 08:26:39 +02:00
Jorge Penadés	d57f4fc44a	chore: refs #7919 refactor, drop relation on back	2024-10-15 17:24:14 +02:00
Jorge Penadés	6f8a005726	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund	2024-10-15 17:01:29 +02:00
Javi Gallego	4a88ba5078	feat: refs #7744 closeAll Test	2024-10-15 15:43:12 +02:00
Carlos Satorres	099fe8f950	fix: refs #7986 fix model	2024-10-15 14:42:35 +02:00
Guillermo Bonet	5a2058865d	Merge branch 'test' into dev	2024-10-15 14:02:39 +02:00
Carlos Satorres	c73fd51a9c	fix: refs #7986 add acl	2024-10-15 09:45:14 +02:00
Alex Moreno	85f8b6fd20	build: init version 24.44	2024-10-15 09:29:38 +02:00
Alex Moreno	6eab66340f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-10-15 09:21:31 +02:00
Javi Gallego	36bf2f89c7	Merge pull request '8098-closureTransation' (!3101) from 8098-closureTransation into dev ... Reviewed-on: #3101 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-15 07:20:06 +00:00
Jon Elias	e334152acc	refactor: deleted comment	2024-10-15 09:03:15 +02:00
Javi Gallego	c5f987d04c	fix: refs #8098 renew token test fixed	2024-10-15 08:44:08 +02:00
Javi Gallego	976e50b566	feat: refs #8098 identation	2024-10-15 08:25:53 +02:00
Javi Gallego	4526873bbe	feat: refs #8098 without Date	2024-10-15 08:24:13 +02:00
Javi Gallego	5e2edad6de	Merge branch 'dev' into 8098-closureTransation	2024-10-15 08:21:40 +02:00
Javi Gallego	f2d1aa5f16	feat: refs #8098 closureDaysAgo	2024-10-15 08:17:03 +02:00
Jorge Penadés	6d4c71d465	feat: refs #7919 test	2024-10-14 17:14:40 +02:00
Jorge Penadés	a35208d903	feat: refs #7919 test	2024-10-14 17:14:01 +02:00
Jorge Penadés	ccf9dbde8e	feat: refs #7919 test	2024-10-14 17:11:12 +02:00
Jorge Penadés	32756dabae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7919-deleteTicketRefund	2024-10-14 16:49:11 +02:00
Carlos Satorres	68469e2ba8	Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto	2024-10-14 13:52:08 +02:00
Jon Elias	07849ebeb8	fix: myTeam param	2024-10-14 13:25:09 +02:00
Jon Elias	4ee6a46bd5	feat: added new filter param	2024-10-14 11:29:49 +02:00
Jorge Penadés	770c604d6b	chore: refs #7919 delete if ticketRefund	2024-10-10 16:30:04 +02:00
Carlos Satorres	39e808bca7	fix: refs #7986 fix model	2024-10-08 16:06:38 +02:00
Carlos Satorres	b4dc5276dd	fix: refs #7986 create fk	2024-10-08 08:36:17 +02:00
Jon Elias	cbc8cc6210	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7010-AddPackingField	2024-10-03 09:14:16 +02:00
Jon Elias	b55db4bdc0	feat: refs #7010 added subquery to avoid using group by in sql	2024-09-30 14:09:57 +02:00
Jon Elias	b547858820	perf: refs #7010 showing field correctly	2024-09-27 08:28:12 +02:00
Jon Elias	4ebda1a06f	feat: refs #7010 added filter fields to show packing type field in ticket list	2024-09-26 14:06:45 +02:00