22306 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	4508f7bfff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-07 08:53:28 +02:00
Carlos Satorres	cdc18ed84f	refs #6897 fix entry Salix	2024-06-07 08:32:59 +02:00
Guillermo Bonet	aff0de23eb	Merge branch 'test' into dev	2024-06-07 08:29:28 +02:00
Guillermo Bonet	b6fb7650cd	Merge branch 'master' into test	2024-06-07 08:29:04 +02:00
Robert Ferrús	a89fde0f10	Merge pull request 'feat: refs #7496 deprecated ticket.isLabeled' (!2547) from 7496-ticketIsLabeled into dev ... Reviewed-on: #2547 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-07 06:22:14 +00:00
Guillermo Bonet	70eddb6ce2	refactor: refs #7419 Added index ticketLog	2024-06-07 08:18:07 +02:00
Robert Ferrús	f7c2fd824f	feat: refs #7496 changesRequested	2024-06-07 07:05:22 +02:00
Jorge Penadés	5a6e2a2b31	fix: refs #6942 create invoiceIn acl	2024-06-06 15:45:39 +02:00
Robert Ferrús	1ca7b75ce3	Merge branch 'dev' into 7496-ticketIsLabeled	2024-06-06 12:33:35 +00:00
Sergio De la torre	268c0a984c	feat isScanned refs #7276	2024-06-06 12:28:34 +02:00
Ivan Mas	cab9058907	Merge pull request 'refs #7536 modify itemShelvingRadar' (!2550) from 7536-TPV_Wrong_abajo_field into dev ... Reviewed-on: #2550 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-06 10:14:19 +00:00
Ivan Mas	a8f5993c21	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-06 10:12:45 +00:00
Javi Gallego	e77bc87a2a	Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev ... Reviewed-on: #2546 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-06 09:48:29 +00:00
Carlos Andrés	4a0d32eb60	Merge pull request 'Hotfix modificar entradas contabilizadas Ticket 191417' (!2551) from Hotfix-modificar-entradas-contabilizadas-Ticket-191417 into master ... Reviewed-on: #2551 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-06 09:21:18 +00:00
Jon Elias	34fd7cb78d	Merge pull request '#6753 fix saveSign' (!2533) from 6753-TicketsSaveSign into dev ... Reviewed-on: #2533 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-06 07:53:08 +00:00
Jon Elias	c2e80060b3	Merge branch 'dev' into 6753-TicketsSaveSign	2024-06-06 07:51:23 +00:00
Jorge Penadés	14afd8246a	feat: refs #6273 add back test	2024-06-05 17:38:48 +02:00
Jorge Penadés	8188bdbcb0	fix: refs #6273 use userId	2024-06-05 17:12:37 +02:00
Jorge Penadés	a79285cd3d	feat: refs #6273 register freelance	2024-06-05 16:27:00 +02:00
Carlos Andrés	b78ef97813	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:50:16 +02:00
Carlos Andrés	638a5e9a1e	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:44:11 +02:00
Ivan Mas	8458651ce0	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-05 12:57:47 +00:00
Ivan Mas	71ea1d1467	refs #7536 modify itemShelvingRadar	2024-06-05 14:53:59 +02:00
Guillermo Bonet	feda14a21b	Merge branch 'test' into dev	2024-06-05 14:23:09 +02:00
Guillermo Bonet	c2fecde1b8	Merge branch 'master' into test	2024-06-05 14:22:59 +02:00
Robert Ferrús	debfe15784	Merge pull request 'fix: refs #7335 hotFix cmrTicket' (!2549) from 7335-hotFixCmrTicket into master ... Reviewed-on: #2549 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 11:50:25 +00:00
Robert Ferrús	40d40bd0bb	fix: refs #7335 hotFix cmrTicket	2024-06-05 13:42:21 +02:00
Alex Moreno	a33f14ffa5	feat(transferInvoice): makePdf of refund	2024-06-05 12:44:28 +02:00
Javi Gallego	1fa22e71a9	feat: refs #7203 nombre variables	2024-06-05 12:42:55 +02:00
Guillermo Bonet	e4e7ae1699	Merge branch 'test' into dev	2024-06-05 11:16:15 +02:00
Guillermo Bonet	ceda2718d5	Merge branch 'master' into test	2024-06-05 11:15:56 +02:00
Guillermo Bonet	82954ed299	hotfix: ticket #176792	2024-06-05 11:13:40 +02:00
Carlos Andrés	8b584a08dc	Hotfix: midnight deterministic refs #7213	2024-06-05 10:11:04 +02:00
Carlos Andrés	f2b443021f	hotfix: midnight deterministis refs #7213	2024-06-05 10:03:37 +02:00
Robert Ferrús	e52da5117a	Merge branch 'dev' into 7496-ticketIsLabeled	2024-06-05 07:57:34 +00:00
Robert Ferrús	a0e79a778d	feat: refs #7496 deprecated ticket.isLabeled	2024-06-05 09:57:15 +02:00
Robert Ferrús	5d857696b5	Merge pull request 'feat: refs #7039 deleteVirtualColumnCountry' (!2532) from 7039-deleteVirtualColumnCountry into dev ... Reviewed-on: #2532 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 07:00:06 +00:00
Robert Ferrús	fd011428d5	Merge branch 'dev' into 7039-deleteVirtualColumnCountry	2024-06-05 06:48:20 +00:00
Guillermo Bonet	3dab181bff	Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev ... Reviewed-on: #2536 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 06:17:10 +00:00
Javi Gallego	130d2b6b47	feat: refs #7203 remove numbres alertLevel	2024-06-05 08:05:46 +02:00
Javi Gallego	9b8fef2f20	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-05 07:07:18 +02:00
Javi Gallego	143930bc86	fix: warmFix setDeleted checks ticketRequest not answered	2024-06-05 07:07:13 +02:00
Juan Ferrer	feaf5f8f5a	Merge pull request 'test' (!2545) from test into dev ... Reviewed-on: #2545	2024-06-04 21:05:47 +00:00
Juan Ferrer	f903d7cd2a	Merge pull request 'master' (!2538) from master into test ... Reviewed-on: #2538	2024-06-04 21:05:27 +00:00
Juan Ferrer	3b4cbe9e6c	ci(Jenkinsfile): refs #7442 Remove ci from back tests	2024-06-04 22:59:33 +02:00
Carlos Andrés	3a68cfef77	Merge pull request 'hotfix: ledger_next transacciones refs #7523' (!2540) from 7523-ledger_next-transacciones into master ... Reviewed-on: #2540 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-04 17:14:51 +00:00
Carlos Andrés	35b4255505	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:45:42 +02:00
Carlos Andrés	e4969f7061	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:43:09 +02:00
Carlos Andrés	a9eb5f7d1e	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:45:54 +02:00
Carlos Andrés	e2adadb8da	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:43:32 +02:00