5826 Commits

Author	SHA1	Message	Date
Vicent Llopis	799c26796e	feat: añadidos chips	2022-12-20 15:19:05 +01:00
Pau	90b36bf1ab	Fix missing report for the invoice electronic notification	2022-12-20 14:21:01 +01:00
Alexandre Riera	62152d1668	Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas	2022-12-20 12:16:40 +01:00
Alexandre Riera	721123381c	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 11:54:22 +01:00
Alexandre Riera	4c6a735235	refs #4962 moved sql and methods to ticket	2022-12-20 11:53:54 +01:00
Alexandre Riera	8403af7db5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-20 11:37:40 +01:00
Alexandre Riera	342eec1e41	refs #3963 autoload fixed	2022-12-20 11:36:58 +01:00
Alexandre Riera	b356839148	refs #3963 autoload fixed	2022-12-20 11:36:37 +01:00
Vicent Llopis	8b5f5d928e	fix: backTest	2022-12-20 10:40:39 +01:00
Vicent Llopis	b7100873a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadZip	2022-12-20 10:11:52 +01:00
Alexandre Riera	284f9f418b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-20 09:54:47 +01:00
Alexandre Riera	6ef282feda	refs #4962 updated merge, changed autoload, changed tf->Future	2022-12-20 09:54:28 +01:00
Vicent Llopis	63343998d8	refactor: cambiada la forma en que se descarga el zip	2022-12-20 09:48:58 +01:00
Joan Sanchez	c063c0e72f	fix(pagination): duplicated rows on paginate ... Refs: #4531	2022-12-20 09:48:41 +01:00
Vicent Llopis	1a616fa1d4	refactor: delete transaction	2022-12-20 09:09:21 +01:00
Pau	d8cae400a8	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-20 07:11:59 +00:00
Alexandre Riera	cd71a59dfe	Merge branch 'dev' into 4928-supplier-payMethod-notify	2022-12-20 07:01:45 +00:00
Alex Moreno	5d2b69d063	test(item_fixedPrice): front recalculateRate2	2022-12-19 15:06:59 +01:00
Alex Moreno	f82870bec6	feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item	2022-12-19 14:39:38 +01:00
Pau	5a01e49f27	Merge branch 'dev' into 4791-refactor-sendsms	2022-12-19 12:25:58 +00:00
Guillermo Bonet	dc82e610b7	refs #4975 Minor changes	2022-12-19 11:24:18 +01:00
Alex Moreno	17a3896c1c	Merge branch 'dev' into 4548-invoiceIn-pdf-2	2022-12-19 07:32:52 +00:00
Guillermo Bonet	a46c2ced7c	refs #4975: Added last mdbVersion/last method	2022-12-19 07:26:07 +01:00
Pau	28e0d0566c	Merge branch 'dev' into 4875-skip-tests	2022-12-19 06:13:45 +00:00
Alexandre Riera	45b02c3bc6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-16 13:45:25 +01:00
Alexandre Riera	98c9e0ac50	refs #4962 autoload added and second header	2022-12-16 13:42:23 +01:00
Alexandre Riera	fb4432b088	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-12-16 13:06:06 +01:00
Alexandre Riera	b72cb64bf8	refs #4928 findById	2022-12-16 12:50:09 +01:00
Alex Moreno	2a8a928ac5	feat: create invoiceIn	2022-12-16 10:36:18 +01:00
Alexandre Riera	855f00b1c9	Merge branch '4700-split-tour' into 3963-ticket-advance	2022-12-16 09:51:40 +01:00
Alexandre Riera	45317c0850	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-15 14:26:10 +01:00
Alexandre Riera	522000cd04	refs #4928 fix fixtures	2022-12-15 09:52:34 +01:00
Alexandre Riera	5a975d0b05	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify	2022-12-15 09:22:36 +01:00
Alexandre Riera	33196acac6	refs #4928 fixture notification, fix test supplier	2022-12-15 08:31:47 +01:00
Joan Sanchez	c004a2917d	Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev ... Reviewed-on: #1204 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-15 07:24:34 +00:00
Joan Sanchez	3b9cd5be09	Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev ... Reviewed-on: #1200 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-15 07:21:01 +00:00
Joan Sanchez	e6867f6004	Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev ... Reviewed-on: #1203 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-12-15 07:20:00 +00:00
Vicent Llopis	4e8896202a	delete: transacción innecesaria	2022-12-15 07:17:26 +01:00
Vicent Llopis	6793b8e9a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-15 07:13:09 +01:00
Guillermo Bonet	76001ec022	refs #4204 labelCount argument not required	2022-12-14 16:15:41 +01:00
Vicent Llopis	e616835600	delete: hasDateRange()	2022-12-14 13:40:28 +01:00
Vicent Llopis	f7a97a8139	fix: siempre muestra el botón si hay datos	2022-12-14 13:31:56 +01:00
Alexandre Riera	f80f851e8d	refs #4962 model TicketFuture deleted	2022-12-14 13:10:33 +01:00
Alexandre Riera	2baa4a1954	refs #4962 ticket tour future refactor	2022-12-14 12:26:18 +01:00
Alex Moreno	c14059df75	fix(supplier_consumption): fix JOIN	2022-12-14 10:12:51 +01:00
Guillermo Bonet	b7a369a41c	refs #4204 Added param URL labelCount and ... changes in the css	2022-12-13 18:05:29 +01:00
Alexandre Riera	050010c09f	refs #4700 success translation	2022-12-13 14:03:37 +01:00
Alexandre Riera	dce48a8a93	refs #4700 corrections	2022-12-13 14:00:46 +01:00
Alex Moreno	1e0b0028f2	fix: only edit structure	2022-12-13 13:37:25 +01:00
Alexandre Riera	72c27f7176	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-12-13 12:37:56 +01:00
Alex Moreno	8900656b14	Merge branch 'dev' into 4859-export_db	2022-12-13 08:29:32 +00:00
Alexandre Riera	86a58a26ea	Merge branch 'dev' into 4893-formato-correo	2022-12-13 08:07:48 +00:00
Guillermo Bonet	d7a6350995	refs #4898 Created report expedition-pallet-label	2022-12-12 18:27:45 +01:00
Alex Moreno	4cb8d8c763	test: enable one test and skip another	2022-12-12 13:11:45 +01:00
Vicent Llopis	2e14e04ed0	Merge branch 'dev' into 4846-claim.search-panel	2022-12-12 11:17:15 +00:00
Vicent Llopis	9bcef08397	feat: buscar por responsibleFk sin afectar a la consulta principal	2022-12-12 12:08:30 +01:00
Alex Moreno	b2dcb84a7b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-12 11:57:27 +01:00
Joan Sanchez	f93398c783	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-12 10:27:28 +01:00
Alexandre Riera	704cb71b61	refs #4866 instance log added and e2e done	2022-12-07 13:53:59 +01:00
Alex Moreno	995fb6a5c3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-12-02 13:13:53 +01:00
Vicent Llopis	14a3a815da	fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE	2022-12-02 12:05:25 +01:00
Joan Sanchez	6128414685	m3 decimal	2022-12-02 11:26:21 +01:00
Joan Sanchez	0c4ab815fd	decimal	2022-12-02 11:24:08 +01:00
Joan Sanchez	6562b68341	fix(agencyTerm): permitir decimales en m3 minimos	2022-12-02 11:16:49 +01:00
Alexandre Riera	48a7635449	refs #4893 regex changed	2022-12-02 09:18:52 +01:00
Pau	691d157da8	Merge branch 'dev' into 4875-skip-tests	2022-12-01 13:33:52 +00:00
Pau	c54844f7ff	removed pending from working test	2022-12-01 14:32:05 +01:00
Joan Sanchez	e815292d6b	fix(componentUpdate): updated filter where sintax	2022-12-01 09:24:56 +01:00
Joan Sanchez	6cb0e518d4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-12-01 07:33:38 +01:00
Vicent Llopis	4c0effc48a	refacor: description actualizada	2022-12-01 07:25:18 +01:00
Vicent Llopis	6c59a3098d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-12-01 07:24:40 +01:00
Vicent Llopis	444d495b7f	refactor: codigo reducido	2022-12-01 07:22:13 +01:00
Vicent Llopis	ba8fe7dfa8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-12-01 07:11:00 +01:00
Alex Moreno	8df7b91127	fix: entry ref	2022-11-30 15:24:33 +01:00
Alex Moreno	43bd583d6f	Merge branch 'dev' into 4875-skip-tests	2022-11-30 13:49:59 +00:00
Pau	79f8e30ded	add pending to the tests	2022-11-30 14:49:00 +01:00
Pau	67384b724d	refs #4875 skipped failing test	2022-11-30 14:41:03 +01:00
Alex Moreno	b769845a28	hotFix: not transfer all sales if all sales is negatives	2022-11-30 14:29:44 +01:00
Vicent Llopis	c1089c637a	fix: backTest	2022-11-30 13:43:29 +01:00
Vicent Llopis	1588492f9a	feat: solo añade los logs de salix con el model 'Sale'	2022-11-30 13:29:39 +01:00
Vicent Llopis	68855add59	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-11-30 10:53:54 +01:00
Pau	97baa89a71	Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone	2022-11-30 09:52:19 +01:00
Alexandre Riera	492b852be8	delete orderBy	2022-11-30 09:22:53 +01:00
Pau	bef1071316	refs #4914 @1h	2022-11-30 09:22:03 +01:00
Alexandre Riera	27078595ce	fix balances	2022-11-30 08:39:04 +01:00
Pau	02598ced92	solve merge conficts	2022-11-30 07:12:26 +01:00
Pau	2d7b3cc3a2	Merge branch 'dev' into 4871-socialName-on-client-filter	2022-11-29 13:13:57 +00:00
Joan Sanchez	990dd88e2c	Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev ... Reviewed-on: #1186	2022-11-29 13:08:38 +00:00
Joan Sanchez	5f3e7c3384	Merge branch 'test' into master	2022-11-29 11:49:06 +00:00
Alexandre Riera	cd8d5efa88	corrections	2022-11-29 10:29:18 +01:00
Pau	ddc543ad63	Merge branch 'dev' into 4557-duplicate-tickets-in-routes	2022-11-29 08:22:05 +00:00
Alexandre Riera	acbd0474a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-29 08:50:48 +01:00
Vicent Llopis	e3e337c02e	fix: backTest	2022-11-28 14:28:47 +01:00
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Carlos Andrés	2a4e8cdde9	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 12:19:58 +00:00
Pau	0d6e424a3e	allow client search by socialname	2022-11-28 10:21:01 +01:00
Alex Moreno	da2d1df522	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:14:16 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Vicent Llopis	7f3265be55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2022-11-25 12:24:00 +01:00
Vicent Llopis	d15e2551a2	feat: add frontTest	2022-11-25 12:16:01 +01:00
Vicent Llopis	af87fc2d53	fix: modelo incorrecto	2022-11-25 11:51:07 +01:00
Vicent Llopis	bca79e1240	feat: add backTest	2022-11-25 11:50:54 +01:00
Alexandre Riera	8fec0670ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 10:25:46 +01:00
Pau	8f98082910	refs #4791 @2h	2022-11-25 09:59:02 +01:00
Vicent Llopis	e540bf7b31	feat: inserta en la nueva tabla ticketSms	2022-11-25 09:38:34 +01:00
Carlos Andrés	8d2e532167	#4613 eliminar uso de portfolio	2022-11-25 09:32:54 +01:00
Vicent Llopis	dbbce77cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-25 07:41:43 +01:00
Pau	65f82c8fc1	Merge branch 'dev' into 4557-duplicate-tickets-in-routes	2022-11-25 06:05:05 +00:00
Vicent Llopis	84c6604dd9	feat: enviar sms con cambios en el pedido	2022-11-24 15:04:15 +01:00
Pau	7c71e40cc5	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-24 13:15:54 +00:00
Joan Sanchez	0f40aa3e27	Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev ... Reviewed-on: #1175 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-11-24 12:49:53 +00:00
Pau	001c3ec2ac	requested changes	2022-11-24 12:06:13 +01:00
Vicent Llopis	20d0d053ac	Merge branch 'dev' into 4682-searchbar_filter	2022-11-24 11:03:23 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Pau	37a7a12f87	requested change	2022-11-24 11:47:32 +01:00
Vicent Llopis	b8c6734798	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:40:43 +00:00
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +00:00
Pau	6a30074a6a	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-24 09:23:00 +00:00
Vicent Llopis	927b5a63ec	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:14:01 +00:00
Alexandre Riera	32e4a7273c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-24 09:59:59 +01:00
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Alexandre Riera	23cf2d9aaf	Merge branch 'dev' into 3949-invoiceIn-add-docFk	2022-11-24 08:33:39 +00:00
Vicent Llopis	7ccf37c079	Merge branch 'dev' into 4793-models_translation	2022-11-24 08:08:56 +00:00
Vicent Llopis	6f2a7a5cef	feat: enviar sms con cambios en las líneas	2022-11-23 15:15:40 +01:00
Vicent Llopis	14eba75a8e	feat: backTest	2022-11-23 14:08:43 +01:00
Vicent Llopis	1c6a5164d4	feat: buscar por itemFk y claimResponsibleFk	2022-11-23 14:04:43 +01:00
Alexandre Riera	164b797ab8	front and e2e tests done	2022-11-23 11:09:32 +01:00
Vicent Llopis	9a47b2fea4	Merge branch 'dev' into 4682-searchbar_filter	2022-11-23 10:00:27 +00:00
Vicent Llopis	f313a53cde	refactor: cambiadas fixtures, backTest y traducciones	2022-11-23 10:56:55 +01:00
Vicent Llopis	6a2af344aa	feat: antes de bloquear comprobar que no existe un bloqueo previo	2022-11-23 10:41:32 +01:00
Vicent Llopis	9cfab2b3f4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block	2022-11-23 10:23:17 +01:00
Vicent Llopis	bf782c3782	fix: añadido esquema account	2022-11-23 10:09:09 +01:00
Vicent Llopis	e854fd248e	feat: add checkInBox	2022-11-23 10:08:58 +01:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Pau	ad38f50ae3	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:55:46 +01:00
Pau	ade2e777d6	refs #4457 @30min requested changes	2022-11-23 08:55:44 +01:00
Pau	88db9c0d80	Merge branch '4789-search-ticket-without-invoice' of https://gitea.verdnatura.es/verdnatura/salix into 4789-search-ticket-without-invoice	2022-11-23 08:25:20 +01:00
Pau	4c4e0e109d	refactor test to use toBeGreaterThan	2022-11-23 08:25:15 +01:00
Pau	b6ff1d99b1	Merge branch '4791-refactor-sendsms' of https://gitea.verdnatura.es/verdnatura/salix into 4791-refactor-sendsms	2022-11-23 08:20:13 +01:00
Pau	0b6d7eaffc	refs #4791 @30min fix broken test	2022-11-23 08:20:12 +01:00
Vicent Llopis	ccce6af021	fix: add translations	2022-11-23 07:57:27 +01:00
Pablo Natek	83ed79569a	refs #4844	2022-11-22 20:45:18 +01:00
Pau	51d3091a40	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-22 13:45:03 +00:00
Pau	bb640da8f0	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-22 13:44:23 +00:00
Vicent Llopis	df4acb70a3	feat: add backTest	2022-11-22 14:43:21 +01:00
Vicent Llopis	e0ba7d523c	refacfor: add ctx	2022-11-22 14:43:15 +01:00
Alex Moreno	660648e01f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-22 14:35:25 +01:00
Alexandre Riera	8613b196d8	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 13:31:04 +00:00
Vicent Llopis	32f28e91b5	feat: sistema de bloque para ficheros mdb	2022-11-22 14:29:42 +01:00
Alexandre Riera	d7843f3298	Merge branch '4547-fix-compensation' of https://gitea.verdnatura.es/verdnatura/salix into 4547-fix-compensation	2022-11-22 14:24:55 +01:00
Alexandre Riera	34fb80beec	fix translations	2022-11-22 14:24:19 +01:00
Joan Sanchez	7e12938de3	Merge branch 'dev' into test	2022-11-22 12:53:03 +00:00
Alexandre Riera	5552cd654e	Merge branch 'dev' into 4547-fix-compensation	2022-11-22 10:48:11 +00:00
Alexandre Riera	d5521adb6b	working on tests	2022-11-22 11:44:36 +01:00
Alexandre Riera	6656ea4f54	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-22 10:20:42 +01:00
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Alexandre Riera	c51354b13f	refs #3949 textfield, edit and create dialog added	2022-11-22 09:29:25 +01:00
Vicent Llopis	8876bc2b68	Merge branch 'dev' into 4793-models_translation	2022-11-22 08:12:07 +00:00
Pau	3b66da20ca	Merge branch 'dev' into 4791-refactor-sendsms	2022-11-22 07:01:33 +00:00
Pau	4bd643143b	requested changes refs #4791 @1h	2022-11-22 07:59:18 +01:00
Pau	cb6ae41c13	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-21 13:45:28 +00:00
Pau	fc08b27fb6	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-21 13:42:53 +00:00
Pau	3003290e61	refs #4551 @20min requested changes	2022-11-21 14:38:51 +01:00
Pau	0099b42fe3	requested changes	2022-11-21 14:06:38 +01:00
Alex Moreno	26be27c2ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-21 13:13:25 +01:00
Alexandre Riera	6ddd2d95a5	insert acl	2022-11-21 11:48:18 +01:00
Alexandre Riera	4c21ffac3b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-21 11:44:53 +01:00
Alexandre Riera	463e56b631	corrections	2022-11-21 11:41:17 +01:00
Alexandre Riera	40ea9805cf	fixes #4547 check compensation and tests	2022-11-21 10:49:19 +01:00
Pau	b788415920	Merge branch 'dev' into 4767-route.index-delete-route	2022-11-21 08:46:32 +00:00
Pau	cb0735d136	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-21 08:34:18 +00:00
Pau	68e4eea2e3	Merge branch 'dev' into 4767-route.index-delete-route	2022-11-21 08:32:39 +00:00
Pau	153f5f56fa	fix test refs #4791 @30min	2022-11-21 09:11:17 +01:00
Vicent Llopis	3fde11c3ed	Merge branch 'dev' into 4793-models_translation	2022-11-21 08:06:39 +00:00
Pau	4e97d931f7	refs #4791 @2h	2022-11-21 08:45:45 +01:00
Vicent Llopis	4c4482c40a	Merge branch 'dev' into 4832-refactor_workerTimeControl.sendMail	2022-11-21 06:09:05 +00:00
Pau	c320342476	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-21 06:05:43 +00:00
Joan Sanchez	813cf78128	Merge branch 'dev' into 4793-models_translation	2022-11-18 14:03:09 +00:00
Pau	0f17c082a3	refs #4557 @1h left join note only delivery	2022-11-18 12:07:33 +01:00
Pau	65fd5e2c8f	Possible change?	2022-11-18 08:51:17 +01:00
Alex Moreno	8e758f5456	invoiceIn-disable-options	2022-11-18 06:36:30 +00:00
Joan Sanchez	d7729654ee	fix(ordersFilter): wrong table schema	2022-11-17 16:48:31 +01:00
Joan Sanchez	f501707adf	fix(ordersFilter): wrong table schema	2022-11-17 16:47:01 +01:00
Joan Sanchez	721f89b76c	fix(ordersFilter): wrong table schema	2022-11-17 16:39:12 +01:00
Alexandre Riera	4a063cc310	refs #4780 verification deleted	2022-11-17 09:25:18 +01:00
Alexandre Riera	c4430b4bca	fix acl	2022-11-17 08:56:51 +01:00
Vicent Llopis	161886c936	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4832-refactor_workerTimeControl.sendMail	2022-11-17 07:22:26 +01:00
Pau	9257a02390	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-16 13:34:49 +00:00
Pau	f56c226fba	Merge branch 'dev' into 4767-route.index-delete-route	2022-11-16 13:32:32 +00:00
Pau	a733bc8c2f	refs #4789 hasInvoice on ticket searchbar @3h30m	2022-11-16 13:36:26 +01:00
Alexandre Riera	66002968f6	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 11:10:21 +01:00
Alexandre Riera	489df60afc	suggested filter added	2022-11-16 11:10:00 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Alexandre Riera	294f806bd9	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 09:52:13 +01:00
Alexandre Riera	78dc7db7a7	correcciones	2022-11-16 09:46:35 +01:00
Vicent Llopis	9bbaa7c718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-16 09:41:43 +01:00
Pau	7779059459	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 08:05:19 +00:00
Pau	2a4af7ac78	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-16 07:29:09 +00:00
Pau	b21d4b698e	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-16 07:29:03 +00:00
Vicent Llopis	0089b821cf	fix: corregido test intermitente	2022-11-16 07:26:30 +01:00