22611 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	d75e008a23	feat: previas con sitema de reservas refs #6861	2024-06-11 12:49:33 +02:00
Jorge Penadés	a6c8b2bebe	Merge pull request 'hotfix buyer editZone acl' (!2572) from hotfix-buyerEditZoneAcl into master ... Reviewed-on: #2572 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 10:47:35 +00:00
Carlos Andrés	ed7218c133	feat: previas con sitema de reservas refs #6861	2024-06-11 12:44:25 +02:00
Carlos Satorres	5d7a570c3f	refs #6897 fix redirection	2024-06-11 12:28:49 +02:00
Jorge Penadés	1cefe817f5	feat: add editZone ACL for buyer	2024-06-11 12:06:44 +02:00
Guillermo Bonet	deff65918d	Merge pull request 'feat: refs #7568 Added freelancer exception' (!2571) from 7568-ticket_doCmr into dev ... Reviewed-on: #2571 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 09:22:29 +00:00
Jorge Penadés	96366c475a	fix: refs 6449 update changelog	2024-06-11 10:48:28 +02:00
Guillermo Bonet	76f76b8304	feat: refs #7568 Added freelancer exception	2024-06-11 10:48:24 +02:00
Jorge Penadés	902a9ee51b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 10:43:33 +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
Jorge Penadés	8117b748b3	Merge pull request '#6243 generalize cmr section' (!2406) from 6243-generalizeCmrSection into dev ... Reviewed-on: #2406 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:41:19 +00:00
Alex Moreno	c9885920e7	Merge pull request 'build: dump' (!2569) from 7565-dump into master ... Reviewed-on: #2569 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-11 07:37:04 +00:00
Jorge Penadés	6b04b371f2	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:36:58 +00:00
Jorge Penadés	6aca0765c0	Merge pull request '#6598 acls back' (!2400) from 6598-getUserAcls into dev ... Reviewed-on: #2400 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-11 07:31:03 +00:00
Carlos Satorres	21d2d66013	Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-11 09:19:08 +02:00
Carlos Satorres	b38c5cdecc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-11 09:19:05 +02:00
Alex Moreno	a446c278b4	Merge branch 'master' into 7565-dump	2024-06-11 07:17:11 +00:00
Jorge Penadés	d30cd68417	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls	2024-06-11 09:11:56 +02:00
Guillermo Bonet	873f36fef6	refactor: refs #7503 Added relations and ACLs	2024-06-11 08:50:32 +02:00
Alex Moreno	2dec51804c	build: dump	2024-06-11 08:38:26 +02:00
Alex Moreno	7adf4a373d	Merge pull request '7565-testToMaster' (!2567) from 7565-testToMaster into master ... Reviewed-on: #2567 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-11 06:31:16 +00:00
Alex Moreno	282cf96336	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7565-testToMaster	2024-06-11 08:04:09 +02:00
Guillermo Bonet	bd13ecd464	refactor: refs #7486 engine memory and primary key sales_merge	2024-06-11 07:59:53 +02:00
Sergio De la torre	62f4561279	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7168-itemShelvingLog_get	2024-06-11 07:34:42 +02:00
Alex Moreno	2061d08bac	feat: add changelog	2024-06-10 15:54:53 +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	59474a9dfb	Merge pull request '#6273 register freelance' (!2403) from 6273-registerFreelance into dev ... Reviewed-on: #2403 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 13:34:50 +00: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
Alex Moreno	c241189508	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-10 14:22:12 +02:00
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	9d82f0ff7c	Merge branch 'test' into dev	2024-06-10 12:48:53 +02: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
Pablo Natek	d41f1ff561	fix: refs #6404 remove focus from test	2024-06-10 12:36:15 +02:00
Pablo Natek	65fae086aa	Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-10 12:29:42 +02:00
Pablo Natek	c5227d6cf6	feat: refs #6404 add mail notification	2024-06-10 12:24:23 +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
Javi Gallego	8065b8cf14	Merge pull request '4560-GastosReparto' (!2544) from 4560-GastosReparto into dev ... Reviewed-on: #2544 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-10 08:40:54 +00:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Guillermo Bonet	ddb644aded	Merge pull request 'refactor: refs #7517 Added throw' (!2562) from 7517-throwBuy_afterUpsert into dev ... Reviewed-on: #2562 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 08:03:12 +00:00
Guillermo Bonet	ca7d67451b	refactor: refs #7517 Minor changes	2024-06-10 09:09:11 +02:00
Guillermo Bonet	2e8d28d795	refactor: refs #7517 Added throw	2024-06-10 09:08:26 +02:00
Jorge Penadés	7794f23c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 09:02:52 +02:00
Guillermo Bonet	317f898c2e	refactor: refs #7490 Minor changes	2024-06-10 08:48:56 +02:00
Guillermo Bonet	a4f8c0df80	Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking	2024-06-10 08:47:03 +02:00
Guillermo Bonet	fb4be69cf1	refactor: refs #7490 Added final update	2024-06-10 08:47:02 +02:00
Guillermo Bonet	e043badc19	Merge branch 'dev' into 7490-duaInvoiceInBooking	2024-06-10 06:39:15 +00:00
Guillermo Bonet	9b21cd5eb1	refactor: refs #7490 Deleted update duaInvoiceInBooking	2024-06-10 08:38:58 +02:00