17154 Commits

All Branches

Search

Author	SHA1	Message	Date
Sergio De la torre	b756d2f938	refs #5652 modify	2023-09-14 18:03:30 +02:00
Sergio De la torre	43f5bbb04e	Merge branch 'dev' into 5652-ItemTrash	2023-09-14 09:05:55 +02:00
Sergio De la torre	d2cd522842	refs #5652 modify:without fit	2023-09-14 07:47:10 +02:00
Carlos Satorres	5536e06ed1	Merge pull request '4764-serviceAbono' (!1505) from 4764-serviceAbono into dev ... Reviewed-on: #1505 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-13 09:47:34 +00:00
Carlos Satorres	12dff3e248	Merge branch 'dev' into 4764-serviceAbono	2023-09-13 08:52:59 +00:00
Javi Gallego	7bd3bfddc3	fix sin bankEntity ya no falla	2023-09-13 07:07:22 +02:00
Pablo Natek	e1cc254f82	Merge pull request 'refs #6131 constraint' (!1708) from 6131-duplicatedProvince into dev ... Reviewed-on: #1708 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-12 14:53:50 +00:00
Pablo Natek	d9088885e7	Merge branch 'dev' into 6131-duplicatedProvince	2023-09-12 14:47:38 +00:00
Javi Gallego	e25e0aad63	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-12 15:44:12 +02:00
Javi Gallego	f8149a988c	e2e invoiceIn basicData fixed	2023-09-12 15:44:05 +02:00
Sergio De la torre	1d25355423	refs #5652 fix:without fit	2023-09-12 08:44:42 +02:00
Pablo Natek	37c57af2ed	Merge branch 'dev' into 6131-duplicatedProvince	2023-09-11 17:27:10 +00:00
Pablo Natek	1b158bea67	refs #6131 unique constraint country-name	2023-09-11 19:28:05 +02:00
Sergio De la torre	5f5a0645be	refs #5652 feat:itemTrash_new	2023-09-11 16:16:49 +02:00
Carlos Satorres	b9dd442841	refs #4764 edit package-log	2023-09-11 10:52:16 +02:00
Carlos Satorres	a29b25cffd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-11 10:48:38 +02:00
Javi Gallego	08e97b6a19	Merge pull request 'fixes #6169 invoiceIn con valores predeterminados' (!1728) from 6169---invoice-in-basic-data--dms-refactor into dev ... Reviewed-on: #1728 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-11 07:00:20 +00:00
Carlos Andrés	5f254ed841	Merge pull request '6176-book-entry-deleted' (!1738) from 6176-book-entry-deleted into dev ... Reviewed-on: #1738 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-08 09:39:10 +00:00
Carlos Satorres	2d2d6b77db	refs #4764 changelog	2023-09-07 13:38:51 +02:00
Carlos Satorres	c2f73eb548	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-07 13:38:38 +02:00
Carlos Andrés	4784e71350	refs #6176 book entry deleted	2023-09-07 13:21:03 +02:00
Carlos Andrés	ea771cb910	refs #6176 book entry deleted	2023-09-07 11:30:01 +02:00
Carlos Andrés	0465c2ca54	Merge branch 'dev' into 6176-book-entry-deleted	2023-09-06 19:27:02 +00:00
Carlos Andrés	0d2db7749f	refs #6176 book entry deleted	2023-09-06 21:22:10 +02:00
Sergio De la torre	8218eb2a6b	refs #5652 feat:itemTrash_new	2023-09-06 09:37:41 +02:00
Sergio De la torre	dd1f759e20	refs #5652 feat:itemTrash_new	2023-09-06 09:35:43 +02:00
Sergio De la torre	9d367b8299	refs #5652 feat:itemTrash_new	2023-09-06 09:22:29 +02:00
Sergio De la torre	2fffa56d70	refs #5652 feat:itemTrash_new	2023-09-06 09:18:28 +02:00
Javi Gallego	93bc7e921e	Merge pull request '6173-dump-BBDD' (!1736) from 6173-dump-BBDD into dev ... Reviewed-on: #1736	2023-09-05 11:50:08 +00:00
Javi Gallego	6a4d8fbfbf	Merge branch 'dev' into 6173-dump-BBDD	2023-09-05 13:48:35 +02:00
Carlos Satorres	4f7ac4c05d	Merge pull request '6044-fixTickCalendar' (!1733) from 6044-fixTickCalendar into dev ... Reviewed-on: #1733 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-04 10:46:21 +00:00
Carlos Satorres	7025326e06	Merge branch 'dev' into 6044-fixTickCalendar	2023-09-04 10:31:08 +00:00
Javi Gallego	c2d8e1c002	fixes #6173 show just buyUltimate items	2023-09-04 12:14:52 +02:00
Carlos Andrés	40468b70e6	refs #6176 book entry deleted	2023-09-04 11:59:55 +02:00
Javi Gallego	ed25bd93d6	fixes #6173 lastItemBuy muestra articulos sin podu	2023-09-04 11:13:29 +02:00
Sergio De la torre	27a9881a6a	Merge pull request 'refs #4815 feat:DeviceLog Model' (!1705) from 4815-deviLogModel into dev ... Reviewed-on: #1705 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-01 10:45:16 +00:00
Sergio De la torre	022d3d08e6	refs #5652 feat:itemTrash_new	2023-09-01 12:34:33 +02:00
Sergio De la torre	3795404789	Merge branch 'dev' into 4815-deviLogModel	2023-09-01 10:15:26 +00:00
Sergio De la torre	7c6e3d3fc5	Merge pull request '6132-Modify-saveSign' (!1732) from 6132-Modify-saveSign into dev ... Reviewed-on: #1732 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-01 10:13:51 +00:00
Carlos Satorres	89a0ae243f	refs #6044 changelog	2023-09-01 11:55:39 +02:00
Javi Gallego	734b948aac	refs #6173 back test fixed and fixtures refactored	2023-09-01 11:52:48 +02:00
Carlos Satorres	9b971abb55	refs #6044 class scss	2023-09-01 11:49:08 +02:00
Sergio De la torre	00201197cc	Merge branch 'dev' into 4815-deviLogModel	2023-09-01 05:24:55 +00:00
Sergio De la torre	473e710d1b	refs #4815 feat:DeviceLogModel	2023-09-01 07:22:15 +02:00
Sergio De la torre	281ae0eb04	refs #4815 feat:DeviceLogModel	2023-09-01 07:21:15 +02:00
Sergio De la torre	7d8828e604	refs #6132 fix: saveSign without route	2023-08-31 13:50:31 +02:00
Sergio De la torre	e7cd052199	refs #6132 add messageError	2023-08-31 13:49:00 +02:00
Carlos Satorres	017e0dd948	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-08-31 13:29:34 +02:00
Javi Gallego	4eeae46683	post subida	2023-08-31 11:28:37 +02:00
Javi Gallego	b1978b07bd	changes path desactualizado	2023-08-31 11:06:47 +02:00