17299 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	a29b25cffd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono	2023-09-11 10:48:38 +02:00
Carlos Satorres	815ea6f67e	Merge branch '5660-changeRolDeliveryAssistant' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-11 10:47:44 +02:00
Carlos Satorres	9d0e4e7558	refs #5660 change sql	2023-09-11 10:47:39 +02:00
Carlos Satorres	544259df9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-11 10:47:21 +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
Javi Gallego	d602709679	refs #4059 changes en la carpeta actual	2023-09-11 08:46:26 +02:00
Javi Gallego	3e1f844288	Merge branch 'dev' into 4059-revocar-permisos-client-account	2023-09-11 08:44:30 +02: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
Juan Ferrer	15d471bf99	Merge pull request 'test' (!1742) from test into master ... Reviewed-on: #1742	2023-09-07 09:20:39 +00:00
Pablo Natek	0a1a36018b	Merge pull request 'refs #5881 changes' (!1741) from 5881-fixerror into test ... Reviewed-on: #1741 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-07 09:17:10 +00:00
Pablo Natek	da9182783d	refs #5881 changes	2023-09-07 11:02:47 +02:00
Javi Gallego	fc7e393546	Merge pull request 'test' (!1740) from test into master ... Reviewed-on: #1740	2023-09-07 07:43:51 +00:00
Javi Gallego	ee093bbd1c	refs #4059 acls	2023-09-07 09:03:25 +02:00
Javi Gallego	b96a7f5850	Merge pull request 'master' (!1739) from master into test ... Reviewed-on: #1739	2023-09-07 06:56:12 +00: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
Carlos Satorres	c09a2e075e	Merge pull request 'refs #6194 change link' (!1737) from 6194-changeURLGoLabel into master ... Reviewed-on: #1737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-06 12:48:31 +00:00
Carlos Satorres	4918e3ccc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-06 14:02:53 +02:00
Pablo Natek	04d04e6598	refs #6159 fixtrigger	2023-09-06 13:59:28 +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	c6023e220c	Merge branch 'dev' into 4059-revocar-permisos-client-account	2023-09-06 08:35:33 +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	8141cd7834	refs #6194 url verdnatura	2023-09-04 14:08:17 +02:00
Carlos Satorres	b81dd1a9e8	refs #6194 new url verdnatura	2023-09-04 14:01:36 +02:00
Carlos Satorres	2711ed579c	refs #6194 generical url	2023-09-04 13:26:08 +02:00
Pablo Natek	05a73247a1	refs #6159 fix	2023-09-04 13:19:02 +02:00
Pablo Natek	cc5c815cfc	Merge branch 'dev' into 6159-businessAfterInsert	2023-09-04 11:15:40 +00:00
Pablo Natek	d14c49519e	refs #6159 fixSpec	2023-09-04 13:16:36 +02:00
Carlos Satorres	eb6917c10d	refs #6194 change link	2023-09-04 13:08:01 +02:00
Carlos Satorres	29b7f7d8ef	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-09-04 10:47:44 +00: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
Pablo Natek	0d05aa521b	Merge branch 'dev' into 6159-businessAfterInsert	2023-09-04 10:35:39 +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
Guillermo Bonet	979315aa5e	refs #5995 Implemented downloadCmrsZip	2023-09-01 12:10:39 +02:00
Carlos Satorres	89a0ae243f	refs #6044 changelog	2023-09-01 11:55:39 +02:00