17134 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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	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
Javi Gallego	92789ba3de	refs #6173 fixed backTest	2023-08-31 10:04:28 +02:00
Javi Gallego	ea5e10faed	Merge pull request 'test' (!1730) from test into dev ... Reviewed-on: #1730	2023-08-31 07:58:48 +00:00
Javi Gallego	e498bba37b	initial dump	2023-08-31 08:41:19 +02:00
Javi Gallego	30c863722c	fixes #6169 no se necesita tests	2023-08-30 14:14:20 +02:00
Javi Gallego	fea0db14e2	fixes #6169 invoiceIn con valores predeterminados	2023-08-30 13:35:51 +02:00
Juan Ferrer	d60e35d817	Merge pull request 'refs #6153 master into test' (!1726) from master into test ... Reviewed-on: #1726	2023-08-29 06:50:27 +00:00
Guillermo Bonet	1ad9a30848	Merge pull request '5300-byePostgresql' (!1725) from 5300-byePostgresql into dev ... Reviewed-on: #1725 Reviewed-by: JORGE PENADES HURTADO <jorgep@verdnatura.es>	2023-08-28 10:20:36 +00:00
Guillermo Bonet	f38ff9ef9c	refs #5300 calendar_employee depend. (refs #5378)	2023-08-28 12:00:35 +02:00
Guillermo Bonet	4d802182f5	refs #5300 calendar_employee depend. (refs #5378)	2023-08-28 11:59:45 +02:00
Guillermo Bonet	7848634bff	refs #5300 Deleted postgresql dependences	2023-08-28 11:51:25 +02:00
Guillermo Bonet	6292d4302d	Merge pull request 'refs #5991 Deleted view currentWorkersStats' (!1724) from 5991-deletedCurrentWorkersStats into dev ... Reviewed-on: #1724 Reviewed-by: JORGE PENADES HURTADO <jorgep@verdnatura.es>	2023-08-28 08:45:34 +00:00
Guillermo Bonet	de8aba289a	refs #5991 Deleted view currentWorkersStats	2023-08-28 10:36:29 +02:00
Jorge Penadés	d424714956	Merge pull request '5216-expeditionStateAdd' (!1717) from 5216-expeditionStateAdd into dev ... Reviewed-on: #1717 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-25 13:06:29 +00:00
Jorge Penadés	7f1db050ad	Merge branch 'dev' into 5216-expeditionStateAdd	2023-08-25 12:56:53 +00:00
Javi Gallego	cfbd24c721	Merge pull request '6146-route-sugestedTicket-error' (!1722) from 6146-route-sugestedTicket-error into dev ... Reviewed-on: #1722 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-08-25 12:54:52 +00:00
Jorge Penadés	5fe12d9281	Merge branch 'dev' into 5216-expeditionStateAdd	2023-08-25 12:43:26 +00:00
Jorge Penadés	ca28d2d78f	ref #5216 myOptions added	2023-08-25 14:37:32 +02:00
Alex Moreno	45c58feb8c	Merge branch 'dev' into 6146-route-sugestedTicket-error	2023-08-25 12:10:52 +00:00
Vicent Llopis	864ffd032f	Merge pull request '5244-component_workerAutocomplete' (!1679) from 5244-component_workerAutocomplete into dev ... Reviewed-on: #1679 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-08-25 08:56:42 +00:00