22084 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	75a529830c	Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test ... Reviewed-on: #2564 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 11:33:10 +00:00
Guillermo Bonet	37fa92aca8	Merge branch 'master' into test	2024-06-10 12:48:38 +02:00
Guillermo Bonet	272a34c5f9	refactor: refs #7486 Added userFk debug	2024-06-10 12:46:26 +02:00
Guillermo Bonet	7579e15fcc	refactor: refs #7486 Optimized procs	2024-06-10 11:55:40 +02:00
Guillermo Bonet	b4820858c9	hotfix: ticket 192672 ticketPreviousPreparingList	2024-06-10 11:32:44 +02:00
Carlos Andrés	ba410360e9	Merge pull request 'Hotfix-midnight-determinist' (!2548) from Hotfix-midnight-determinist into master ... Reviewed-on: #2548 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-07 14:22:04 +00:00
Carlos Andrés	1497146940	Merge branch 'master' into Hotfix-midnight-determinist	2024-06-07 16:17:11 +02:00
Alex Moreno	ca6afb9c10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-07 10:32:49 +02:00
Alex Moreno	60ea248b6e	Merge pull request 'fix(transferInvoice): separate invoice functionality from generating PDF and adapt tests' (!2528) from 6147-transferInvoice_split into master ... Reviewed-on: #2528 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-07 08:17:20 +00:00
Alex Moreno	6e17f3dca3	Merge branch 'master' into 6147-transferInvoice_split	2024-06-07 08:14:38 +00:00
Jorge Penadés	2319ab7032	Merge pull request '#6942 create invoiceIn acl' (!2556) from 6942-warmfix-setInsertAcl into test ... Reviewed-on: #2556 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:13:51 +00:00
Jorge Penadés	99e4808ae9	Merge branch 'test' into 6942-warmfix-setInsertAcl	2024-06-07 07:11:07 +00:00
Guillermo Bonet	b6fb7650cd	Merge branch 'master' into test	2024-06-07 08:29:04 +02:00
Guillermo Bonet	70eddb6ce2	refactor: refs #7419 Added index ticketLog	2024-06-07 08:18:07 +02:00
Jorge Penadés	5a6e2a2b31	fix: refs #6942 create invoiceIn acl	2024-06-06 15:45:39 +02: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
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
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
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
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
Carlos Andrés	c57f4db623	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:41:53 +02:00
Carlos Andrés	1927fbce45	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:39:02 +02:00
Alex Moreno	f354fe1b1f	Merge pull request '7525-devToTest' (!2542) from 7525-devToTest into test ... Reviewed-on: #2542 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-04 07:59:33 +00:00
Alex Moreno	7a803cce37	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-04 09:38:50 +02:00
Alex Moreno	e2c7475ea8	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-04 09:38:32 +02:00
Alex Moreno	963c2f68b7	Merge pull request 'fix(ticket): throw error if id is null' (!2541) from hotFix_ticket_request into master ... Reviewed-on: #2541 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-04 07:23:33 +00:00
Alex Moreno	03201e1e2c	fix(ticket): throw error if id is null	2024-06-04 09:10:47 +02:00
Carlos Andrés	9a7074d600	hotfix: ledger_next transacciones refs #7523	2024-06-03 20:16:27 +02:00
Pablo Natek	6b234f4664	Merge pull request 'fix: refs #6404 change db language on local' (!2534) from 6404-fixSaturdayDelivery into master ... Reviewed-on: #2534 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-03 15:40:27 +00:00
Juan Ferrer	1ec55c8850	Merge branch 'test' into dev	2024-06-03 17:38:39 +02:00
Juan Ferrer	f78585f6ab	Merge branch 'master' into test	2024-06-03 17:37:47 +02:00
Pablo Natek	2ee41b17dc	Merge branch 'master' into 6404-fixSaturdayDelivery	2024-06-03 15:34:36 +00:00
Juan Ferrer	5dd2e3b7d3	ci(Jenkinsfile): refs #7442 Tag image with build id	2024-06-03 16:45:02 +02:00
Alex Moreno	0b885ab773	build: increase version	2024-06-03 15:06:29 +02:00
Alex Moreno	3875bdb98d	build(operator): remove console.log	2024-06-03 15:01:25 +02:00
Alex Moreno	bbf027ede5	fix(operator): neq error	2024-06-03 15:01:06 +02:00
Alex Moreno	c445bcb0ba	build(operator): remove console.log	2024-06-03 14:39:32 +02:00