9232 Commits

Author	SHA1	Message	Date
Jorge Penadés	d7d6de73c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 15:41:06 +02: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
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
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
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00: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
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Jorge Penadés	479e4f3f8a	feat: refs #6273 required payMethod for internals	2024-06-07 13:55:56 +02:00
Jorge Penadés	ee1678ebb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-07 12:14:18 +02:00
Jorge Penadés	faf450e075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-07 11:45:51 +02:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Alex Moreno	379d7ef2ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-07 10:33:07 +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	6e17f3dca3	Merge branch 'master' into 6147-transferInvoice_split	2024-06-07 08:14:38 +00:00
Sergio De la torre	268c0a984c	feat isScanned refs #7276	2024-06-06 12:28:34 +02: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
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
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
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	f903d7cd2a	Merge pull request 'master' (!2538) from master into test ... Reviewed-on: #2538	2024-06-04 21:05:27 +00: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	1927fbce45	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:39:02 +02:00
Javi Gallego	4089c7deb3	feat: refs #4560 minorChanges	2024-06-04 12:23:28 +02:00
Javi Gallego	da1b4649bb	feat: refs #4560 sin expeditionTruck	2024-06-04 11:58:39 +02:00
Javi Gallego	4230d46fe5	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 09:47:58 +02: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	03201e1e2c	fix(ticket): throw error if id is null	2024-06-04 09:10:47 +02:00
Juan Ferrer	1ec55c8850	Merge branch 'test' into dev	2024-06-03 17:38:39 +02:00
Jorge Penadés	a13581ed97	feat: refs #6243 Add warehouseFk parameter	2024-06-03 16:31:38 +02:00
Jorge Penadés	58053d8286	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-03 15:22:08 +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
Alex Moreno	a73c98eebe	build(operator): console.log	2024-06-03 13:04:09 +02:00
Jorge Penadés	39dcb7d6a8	fix: refs #6889 check if has collection or sectorCollection	2024-06-03 10:30:20 +02:00
Carlos Satorres	7a92963886	fix acls	2024-06-03 10:21:25 +02:00
Jorge Penadés	ea7c2346d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 10:13:59 +02:00
Jorge Penadés	1382b24c1d	refactor: refs #6600 add space	2024-06-03 09:38:35 +02:00
Jon Elias	340a8c119e	refactor: refs #6753 fix saveSign	2024-06-03 09:35:44 +02:00
Jorge Penadés	72630d613b	fix: refs #6600 rollback	2024-06-03 09:32:03 +02:00
Jorge Penadés	790a637d4d	feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table	2024-06-03 09:25:48 +02:00
Jorge Penadés	084f31e441	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment	2024-06-03 08:34:10 +02:00