8235 Commits

Author	SHA1	Message	Date
Alex Moreno	7777696cf7	refs #6589 fix(worker_absences): fix started hours	2023-12-19 13:58:08 +01:00
Guillermo Bonet	17e177b788	fix: refs #6398 Fix tests back	2023-12-19 10:12:03 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views	2023-12-19 09:43:09 +01:00
Carlos Satorres	e4de704b4c	Merge branch 'dev' into 6220-addressFilter	2023-12-18 11:16:58 +00:00
Javier Segarra	7723b244d0	Merge branch 'dev' into 6172_transfer_ticket_message_error	2023-12-18 07:17:51 +00:00
Javier Segarra	8d650cf6c0	refs #6172 test: remove message code	2023-12-18 08:09:44 +01:00
Javier Segarra	29a7d9b941	Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-15 13:01:47 +01:00
Javier Segarra	dc98436b85	refs #2051 perf: rename variable	2023-12-15 13:01:44 +01:00
Javier Segarra	c9af8cba81	refs #5878 feat: remove . for this message	2023-12-15 12:50:05 +01:00
Javier Segarra	98a98e0d9e	refs #2687 perf: remove force test	2023-12-15 07:40:31 +01:00
Javi Gallego	3a37e6dfc8	Merge branch 'dev' into 3979-abonarTicketsSinAlmacen	2023-12-15 07:37:29 +01:00
Javier Segarra	f10cada19f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2687_travel_cloneWithEntries	2023-12-15 07:35:04 +01:00
Javier Segarra	b5b58faee4	refs #2687 perf: remove comments	2023-12-15 07:34:37 +01:00
Javier Segarra	d9ffdaf855	refs #2687 test: use tx.rollback()	2023-12-14 16:00:29 +01:00
Alex Moreno	21a1dbeae7	refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets	2023-12-14 15:56:49 +01:00
Carlos Satorres	fe184156a1	Merge branch 'dev' into 6220-addressFilter	2023-12-14 13:51:09 +00:00
Carlos Satorres	f73f3813b3	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-14 14:37:22 +01:00
Carlos Satorres	bbb9f58a9e	refs #6220 fix(client_filter): fix where	2023-12-14 14:37:14 +01:00
Javier Segarra	043c411f68	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 11:41:11 +00:00
Javier Segarra	9316c31180	refs #6264 perf: rename variable when destroy ids	2023-12-14 12:36:36 +01:00
Javier Segarra	1939c65fab	refs #6264 test: remove force describe for dms test	2023-12-14 12:35:54 +01:00
Javier Segarra	d0af29c0c5	refs #6264 test: remove force describe for dms test	2023-12-14 12:28:41 +01:00
Javier Segarra	dddc749744	Merge branch 'dev' into 6264-renewToken	2023-12-14 11:05:00 +00:00
Javi Gallego	26a05a4840	fix: refs #3979 si se abona un abono sin almacen no falla	2023-12-14 09:14:21 +01:00
Alex Moreno	e7911738c6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-12-14 08:50:20 +01:00
Javier Segarra	397eb4d32b	Merge branch 'dev' into 2051_dms_methods_refactor	2023-12-14 06:22:22 +00:00
Javier Segarra	485968037b	Merge branch 'dev' into 6264-renewToken	2023-12-14 06:22:17 +00:00
Sergio De la torre	af83519ee6	Merge branch 'dev' into 6275-silex-to-salix	2023-12-13 15:12:39 +00:00
Javier Segarra	1e89ed6cdc	Merge branch 'dev' into 6264-renewToken	2023-12-13 14:39:10 +00:00
Javier Segarra	06bae44824	refs #2051 perf: uploadFile after review	2023-12-13 15:38:46 +01:00
Carlos Satorres	9a5536a3a3	Merge branch 'dev' into 6220-addressFilter	2023-12-13 14:05:51 +00:00
Carlos Satorres	cfa08963fb	Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter	2023-12-13 15:05:43 +01:00
Carlos Satorres	40499e44cf	refs #6220 remove concat	2023-12-13 15:05:41 +01:00
Robert Ferrús	4df2fa8ee4	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-13 13:30:53 +00:00
Robert Ferrús	b9efbc7d44	refs #5854	2023-12-13 14:30:29 +01:00
Javier Segarra	7b9e3b0985	refs #2051 perf: removeFile after review	2023-12-13 14:24:05 +01:00
Carlos Satorres	6416891918	refs #6291 tinIsValid worker	2023-12-13 13:55:31 +01:00
Javier Segarra	7bdb1b2078	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor	2023-12-13 13:49:38 +01:00
Javier Segarra	a5ecec9603	refs #2051 feat: remove front methods refactor	2023-12-13 13:47:30 +01:00
David Domenech	9bcd0a3c98	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 11:29:46 +00:00
David Domenech	ee6ad55e66	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-13 09:43:20 +01:00
Pablo Natek	f63b26b71f	Merge branch 'dev' into 6125-roleCreditLimitFix	2023-12-13 07:52:36 +00:00
Carlos Satorres	371a202230	Merge branch 'dev' into 6220-addressFilter	2023-12-13 07:51:23 +00:00
Pablo Natek	69dd34665f	refactor(renameTable): refs #6125 clientCreditLimit to roleCreditLimit	2023-12-13 08:50:17 +01:00
Javier Segarra	074bb2b980	Merge branch 'dev' into 5666-loggable_to_mixin	2023-12-13 06:30:14 +00:00
Sergio De la torre	435819cf3c	refs #6275 feat:Silex_to_Salix test getExpeditionSummary	2023-12-13 07:24:13 +01:00
Javier Segarra	d44cdcbd13	Merge branch 'dev' into 6264-renewToken	2023-12-13 06:14:55 +00:00
Robert Ferrús	5f4adab017	refs #5854	2023-12-12 18:03:09 +01:00
Sergio De la torre	e22201c840	Merge branch 'dev' into 6275-silex-to-salix	2023-12-12 14:50:25 +00:00
Javier Segarra	d206c93305	refs #2051 feat: getAllowedContentTypes approach	2023-12-12 15:03:00 +01:00
Javier Segarra	6b70f8b3eb	refs #2051 feat: uploadFile approach	2023-12-12 13:49:14 +01:00
Carlos Satorres	78aa25d74f	refs #6220 fix testback	2023-12-12 13:21:08 +01:00
Carlos Satorres	6cefc982e4	refs #6220 add filter address	2023-12-12 13:14:41 +01:00
Javier Segarra	ae76776245	refs #2051 feat: removeFile approach	2023-12-12 12:09:06 +01:00
Javier Segarra	8bd9becb74	refs #2687 feat: remove procedure argument	2023-12-12 07:34:20 +01:00
Javier Segarra	30dbc8a587	refs #2687 feat: fix test suite	2023-12-12 07:33:08 +01:00
Robert Ferrús	9894591aa9	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-11 17:56:40 +00:00
Javier Segarra	c0d2e0511d	refs #2687 feat: modify back method	2023-12-11 14:54:12 +01:00
Carlos Satorres	7e6f311a43	refs #6220 address filter	2023-12-11 14:51:11 +01:00
Carlos Satorres	c81ca94d2e	refs #6220 add filter address	2023-12-11 14:44:33 +01:00
Jorge Penadés	84270587cb	refs #6274 refactor	2023-12-11 13:42:19 +01:00
Javier Segarra	f817551a57	refs #5666 perf: remove ruleAlias property	2023-12-11 12:59:02 +01:00
Carlos Satorres	2beb1f65f0	refs #6085 findOne	2023-12-11 12:45:55 +01:00
Javier Segarra	d1f0557923	refs #5666 perf: remove ruleAlias property	2023-12-11 12:40:16 +01:00
Carlos Satorres	53ff8784ff	refs #6085 remove myOptions	2023-12-11 10:16:46 +01:00
Carlos Satorres	57ed36cdfc	ref #6085 remove console options	2023-12-11 09:43:38 +01:00
Carlos Satorres	584f3264ed	refs #6085 refactor sql trad	2023-12-11 08:54:58 +01:00
Carlos Satorres	866ad7a9f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6085-ACLsMail	2023-12-11 08:20:19 +01:00
Alex Moreno	f874faa921	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-12-11 07:47:55 +01:00
Pablo Natek	5a99408ba7	feat: refs #6548 add buyer department to salesPerson list in client BasicData	2023-12-11 07:31:57 +01:00
Jorge Penadés	b88d61e864	Merge commit '6fb4e8677' into 6274-loginWorkerTimeControl	2023-12-07 14:53:33 +01:00
Jorge Penadés	6fb4e86777	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into HEAD	2023-12-07 14:47:31 +01:00
Jorge Penadés	968dc65231	refs #6274 tests created	2023-12-07 14:47:22 +01:00
Sergio De la torre	9937fbed5e	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:59:01 +01:00
Sergio De la torre	67994188ee	Merge branch 'dev' into 6028_routesByWorkerEmail	2023-12-07 10:42:30 +00:00
Sergio De la torre	fa65cc84a9	REFS #6275 feat:Silex_to_Salix	2023-12-07 11:39:22 +01:00
Sergio De la torre	0263d880ca	refs #6028 add:email in ByWorker	2023-12-07 08:00:17 +01:00
Carlos Satorres	3c9c221220	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:59:38 +00:00
Sergio De la torre	c9bcd672c9	refs #6028 add:email in ByWorker	2023-12-07 07:59:21 +01:00
Carlos Satorres	c7d960229d	Merge branch 'dev' into 6010-testBackPending	2023-12-07 06:34:32 +00:00
Carlos Satorres	acfa0fd857	Merge branch 'dev' into 6318-negativeQuantity	2023-12-07 06:31:21 +00:00
Javi Gallego	7ff8ec93ff	Merge pull request 'test' (!1879) from test into dev ... Reviewed-on: #1879	2023-12-06 07:54:13 +00:00
Jorge Penadés	bb186bafe0	Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-05 14:12:00 +01:00
Javier Segarra	a7c48b6ddc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-12-05 13:02:34 +01:00
Javier Segarra	035b31d878	refs #5666 test: fix e2e tests	2023-12-05 12:00:31 +01:00
Jorge Penadés	25006a938b	refs #6274 refactor clockIn	2023-12-05 11:53:27 +01:00
Carlos Satorres	f55e85a189	refs #6010 remove pending	2023-12-05 10:35:48 +01:00
Carlos Satorres	af07a531ed	refs #6318 quantity	2023-12-05 08:49:55 +01:00
Sergio De la torre	3692021b12	Merge branch 'dev' into 6275-silex-to-salix	2023-12-05 07:26:22 +00:00
Sergio De la torre	318f7e3c0d	REFS #6275 feat:Silex_to_Salix	2023-12-05 08:20:55 +01:00
Javier Segarra	1d92bbf4a2	refs #5666 feat: replace base value and add mixins	2023-12-05 07:48:56 +01:00
Javier Segarra	57add7abf0	refs #5666 perf: replace Role by VnRole	2023-12-05 07:16:12 +01:00
Jorge Penadés	8cb97e2477	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-12-04 15:09:44 +01:00
Javier Segarra	a8b0a7a5b3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-12-04 14:46:21 +01:00
Carlos Satorres	6d486fbec9	refs #6085 trad, remove front, back test	2023-12-01 13:58:45 +01:00
Pablo Natek	bec1ff71ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6398-ticketTracking-change-workerFk-to-userFk	2023-12-01 13:43:27 +01:00
Robert Ferrús	2a93dcf5b8	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-12-01 10:20:08 +00:00
Jorge Penadés	611b45bae0	Merge branch 'dev' into 5835-summaryRate	2023-11-30 15:16:18 +00:00
Alex Moreno	b2e7ea3089	refs #5914 feat: make invoice support rectificative	2023-11-30 15:16:41 +01:00
David Domenech	eb0766bafd	Merge branch 'dev' into 6398-ticketTracking-change-workerFk-to-userFk	2023-11-30 14:08:47 +00:00
Pablo Natek	72283005b8	remove(console.log): refs #3271 remove console.log	2023-11-30 14:43:14 +01:00
David Domenech	8ab981907d	refactor(ticketTracking.userFk): refs #6398 workerFk to userFk	2023-11-30 14:25:00 +01:00
Pablo Natek	c457b5c4d2	Merge branch 'test' into 3271-zoneGetFilterdFix	2023-11-30 12:39:26 +00:00
Alex Moreno	ee7dd66ce9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-30 12:49:42 +01:00
Alex Moreno	35e74a7635	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-30 12:48:27 +01:00
Alex Moreno	016e4ae37c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-30 12:20:50 +01:00
Javier Segarra	01e7135224	refs #5666 feat: replace Role by VnRole in front	2023-11-30 12:20:05 +01:00
Pablo Natek	3f22f48df7	fix(getFiltered): refs #3271 fix to event filter	2023-11-30 12:13:12 +01:00
Javier Segarra	2a2998a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-30 12:01:44 +01:00
Jorge Penadés	6121eeaa3a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-summaryRate	2023-11-30 09:44:05 +01:00
Carlos Satorres	9cdb7c3cca	refs #6065 remove workcenter	2023-11-30 09:18:00 +01:00
Jorge Penadés	5442e3b4e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-30 08:44:41 +01:00
Javier Segarra	97d7f8356f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-30 07:08:23 +01:00
Javier Segarra	1576ab992d	refs #6434 perf: new field in SignInLog table	2023-11-29 19:36:30 +00:00
Javi Gallego	d246b5f9a8	Merge branch 'dev' into 5652-fixtures-fix	2023-11-29 15:26:51 +01:00
Carlos Satorres	9a3efdd6fe	refs #6085 model y back	2023-11-29 13:55:44 +01:00
Jorge Penadés	c609f6f47f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl	2023-11-29 09:27:50 +01:00
Carlos Satorres	e548ef4dae	refs #6085 searchpanel and change path	2023-11-29 07:51:58 +01:00
Carlos Satorres	0186c2c806	refs #6085 aclMail back	2023-11-29 07:33:49 +01:00
Jorge Penadés	29fb36010c	refs #6274 back methods created	2023-11-28 14:48:03 +01:00
Javier Segarra	63533459b0	refs #6434 feat: improve signIn method	2023-11-28 13:22:17 +01:00
Jorge Penadés	f2673c3818	refs #5835 rate added	2023-11-28 12:12:42 +01:00
Guillermo Bonet	1a5cc67312	Merge branch 'dev' into 6023-changeRol	2023-11-28 12:07:50 +01:00
Javi Gallego	2fa56cce4b	fix: refs #5652 arreglo fixtures	2023-11-28 09:22:00 +01:00
Javier Segarra	bb9723b65d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin	2023-11-28 08:18:11 +01:00
Javier Segarra	f5f2896cbf	refs 5666 feat: replace Role model by VnRole model	2023-11-28 08:12:16 +01:00
Alex Moreno	37555cbb63	refs #6335 warmFix(ticketAdvance): correct properties	2023-11-27 15:10:00 +01:00
Juan Ferrer	c7291e3367	Merge pull request 'test' (!1863) from test into dev ... Reviewed-on: #1863	2023-11-27 12:17:11 +00:00
Juan Ferrer	74772472d5	Merge pull request 'master' (!1820) from master into test ... Reviewed-on: #1820 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-11-27 12:16:42 +00:00
Robert Ferrús	5f26553092	Merge branch 'dev' into 5854-itemShelvingTraduciones	2023-11-27 11:05:50 +00:00
Robert Ferrús	62fab4e744	refs #5854 itemShelving traducciones	2023-11-27 11:52:37 +01:00
Guillermo Bonet	3bdb002034	Merge branch 'dev' into 3222-expenceToExpense	2023-11-27 09:06:17 +00:00
Guillermo Bonet	aefff68c29	refactor: refs #3222 Requested changes	2023-11-27 09:51:56 +01:00
Javier Segarra	901a44cc62	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken	2023-11-27 09:48:31 +01:00
Javier Segarra	72a0932e35	refs #6264 other: rename camel-case variable	2023-11-27 09:46:27 +01:00
Alex Moreno	3fb1ed9dfe	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract	2023-11-27 08:38:17 +01:00
Carlos Satorres	f9d5cad412	refs #6506 contract	2023-11-27 07:57:18 +01:00
Alex Moreno	824ca1d70a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice	2023-11-27 07:42:50 +01:00
Guillermo Bonet	2be1639e9f	refactor: refs #3222 Expence to expense	2023-11-24 12:42:25 +01:00
Jorge Penadés	53c8e87b5b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:57:32 +01:00
Jorge Penadés	8ac3887d80	refs #5811 rename methods	2023-11-24 10:53:38 +01:00
Jorge Penadés	c56588a472	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-24 10:18:47 +01:00
Jorge Penadés	b3584d9db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals	2023-11-24 10:12:45 +01:00
Carlos Satorres	5d18c211a0	refs #6507 state	2023-11-24 08:40:06 +01:00
Javi Gallego	4071c06b5f	feat: refs #6275 getTickets con los campos de silex	2023-11-24 08:15:39 +01:00
Carlos Satorres	8a568f180a	refs #6506 fix e2e, refactor business	2023-11-24 07:47:57 +01:00
Carlos Satorres	ebe467f721	refs #6506 hotfix	2023-11-24 07:04:55 +01:00
Javi Gallego	aa0794e136	Merge branch 'dev' into 6275-silex-to-salix	2023-11-24 06:31:25 +01:00
Jorge Penadés	e314a67fe7	refs #6274 time control methods migrated	2023-11-23 13:25:31 +01:00
Jorge Penadés	6b2c1e09de	refs #5835 refactor	2023-11-23 11:31:00 +01:00
Javi Gallego	5b145a57e6	error: refs 6028 test front quitado	2023-11-23 11:29:53 +01:00
Jorge Penadés	048e3089cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals	2023-11-23 11:26:41 +01:00
Jorge Penadés	db15285858	refs #5811 test updated	2023-11-23 11:21:56 +01:00
Jorge Penadés	2e67ef4f5d	refs #5811 refactor deleteExpeditions	2023-11-23 10:32:07 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Javi Gallego	5b289ec083	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-23 09:21:44 +01:00
Jorge Penadés	da7b670d74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-23 08:28:56 +01:00
Alex Moreno	f4fabb9fff	refs #6491 refactor(order_filter): optimized	2023-11-23 08:26:14 +01:00
Carlos Satorres	2b455488a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-22 18:35:16 +01:00
Carlos Satorres	6b07ee4eb1	hotfix workerhours	2023-11-22 18:35:14 +01:00
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Jorge Penadés	26a8cc6a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-22 15:41:24 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Javi Gallego	a0a9e299d9	feat: refs #6275 getTickets with phone	2023-11-22 12:39:21 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00:00
Jorge Penadés	a27bb53089	refs #5835 getTotals fixed	2023-11-22 08:57:45 +01:00
Carlos Satorres	7c6798c564	refs #6291 dni vn-user	2023-11-21 16:25:48 +01:00
Jorge Penadés	3f8d1ff617	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-21 10:17:31 +01:00
Guillermo Bonet	b3d1c72adc	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-21 09:13:41 +00:00
Alex Moreno	e909c2bc26	Merge branch 'dev' into 6454-dbDump	2023-11-21 09:13:17 +00:00
Alex Moreno	02e8b90926	refs #6454 test: fix e2e by dump	2023-11-21 10:12:07 +01:00
Juan Ferrer	bf7c67dbde	fix: refs #6197 add definer to events	2023-11-21 09:26:02 +01:00
Jorge Penadés	dd11cf5327	ref #5835 fix test	2023-11-21 09:03:25 +01:00
Jorge Penadés	34e5409533	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay	2023-11-21 08:19:11 +01:00
Juan Ferrer	0a2fd9cf5d	fix: refs #6432, #5848 account sync fixes	2023-11-20 18:39:37 +01:00
Alex Moreno	ee1a0c15ee	refs #6454 feat: dump db	2023-11-20 15:09:55 +01:00
Guillermo Bonet	5fdf18825c	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 13:14:51 +00:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Alex Moreno	0ddfb28327	refs #5914 fix: transferInvoice	2023-11-20 07:56:15 +01:00
Guillermo Bonet	badb4d69a2	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 06:15:40 +00:00
Pablo Natek	e2a2454d4e	Merge branch 'dev' into 6461-fixFilterNegativeBases	2023-11-17 10:31:35 +00:00
Pablo Natek	dc100f7959	fix(filter): refs #6461 now is mockDate in local	2023-11-17 11:29:57 +01:00
Juan Ferrer	bb6f3b4cfd	fix: refs #6432 account sync fixes	2023-11-17 08:56:25 +01:00
Guillermo Bonet	500eb22dc6	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-17 06:43:58 +00:00
Guillermo Bonet	8da36569f7	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:44:43 +01:00
Guillermo Bonet	3d1c69be56	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:43:32 +01:00
Guillermo Bonet	2f611391b9	Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery" ... This reverts commit bfd6e1f398.	2023-11-17 07:17:29 +01:00
Juan Ferrer	c2e295f777	fix: refs #6432 account sync fixes	2023-11-17 00:08:29 +01:00
Juan Ferrer	ea5a881d1f	fix: refs #6432 account sync fixes	2023-11-16 23:10:30 +01:00
Juan Ferrer	1937560118	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-16 23:07:30 +01:00
Juan Ferrer	4f5242e3ae	fix: refs #6432 account sync fixes	2023-11-16 23:07:26 +01:00
Javier Segarra	9e64939810	refs #6434 feat: add Id property in model	2023-11-16 11:56:48 +01:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Javier Segarra	e4f7790843	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER	2023-11-16 09:15:01 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Guillermo Bonet	bfd6e1f398	refactor: refs #4502 Deleted zoneEstimatedDelivery	2023-11-16 08:29:00 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Javier Segarra	13720291b2	refs #6434 perf: remove unique in token column	2023-11-15 15:18:02 +01:00