13441 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	d0acd3e4c0	refs #4550 collection-label changes	2022-11-30 08:18:37 +01:00
Guillermo Bonet	b7fa4dca4c	refs #4550 changed font-family of collection-label	2022-11-29 14:16:44 +01:00
Joan Sanchez	5f3e7c3384	Merge branch 'test' into master	2022-11-29 11:49:06 +00:00
Guillermo Bonet	a9b4526493	Merge pull request 'refs #4550 collection-label fixes' (!1184) from #4550-HOTFIX-collection-label into master ... Reviewed-on: #1184	2022-11-29 11:23:27 +00:00
Guillermo Bonet	2faacb169a	refs #4550 collection-label more fixes	2022-11-29 11:56:05 +01:00
Vicent Llopis	a218c086ce	Merge pull request 'TEST_fix_log' (!1182) from TEST_fix_log into test ... Reviewed-on: #1182 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-29 07:42:30 +00:00
Guillermo Bonet	b262b29627	refs #4550 collection-label fixes	2022-11-29 08:22:32 +01:00
Vicent Llopis	a0f5cf1449	refactor: borrados saltos de linea	2022-11-28 14:48:37 +01:00
Vicent Llopis	c3d06ca5db	fix: crashea cuando el log no tiene changedModel	2022-11-28 14:47:23 +01:00
Joan Sanchez	7121dcb25c	Merge pull request 'MASTER_-fix_sendMail' (!1176) from MASTER_-fix_sendMail into master ... Reviewed-on: #1176	2022-11-28 08:06:17 +00:00
Joan Sanchez	2eabe38277	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-11-25 12:44:23 +01:00
Joan Sanchez	2210f8970c	Fixes	2022-11-25 12:26:58 +01:00
Joan Sanchez	6b94922335	Fixes	2022-11-25 12:12:48 +01:00
Joan Sanchez	6af7da4793	Updated regex	2022-11-25 11:13:26 +01:00
Joan Sanchez	5bde9da6b6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-11-25 09:46:12 +01:00
Joan Sanchez	7ea4d9c2e1	fix(rocketchat): Regex fix	2022-11-25 09:18:21 +01:00
Joan Sanchez	db64ba48fc	fix(rocketchat): Removed parenthesis	2022-11-25 08:45:26 +01:00
Joan Sanchez	866ee4d565	fix(rocketchat): Replace invalid link characters	2022-11-25 08:36:29 +01:00
Joan Sanchez	4e7ef47b88	SQL fixes	2022-11-25 07:41:08 +01:00
Vicent Llopis	82cc2b1208	Merge pull request 'DEV_fix_closeTicket' (!1173) from DEV_fix_closeTicket into dev ... Reviewed-on: #1173 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 13:29:42 +00:00
Vicent Llopis	e34fb3e4db	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:59:29 +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
Vicent Llopis	d233286a3f	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:44:37 +00:00
Vicent Llopis	9517063853	Merge pull request 'fixes #4682-searchbar_filter' (!1164) from 4682-searchbar_filter into dev ... Reviewed-on: #1164 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 12:44:19 +00:00
Vicent Llopis	20d0d053ac	Merge branch 'dev' into 4682-searchbar_filter	2022-11-24 11:03:23 +00:00
Vicent Llopis	8e74ddf267	Merge pull request 'fixes #4793-models_translation' (!1148) from 4793-models_translation into dev ... Reviewed-on: #1148 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 11:03:08 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Pau	8e6d0bd6b0	Merge pull request 'fixes #4457 hasInvoiceElectronic-para-cliente' (!1116) from 4457-hasInvoiceElectronic-para-cliente into dev ... Reviewed-on: #1116 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 09:45:43 +00: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	c17435f6c4	Merge pull request 'closes #4789 hasInvoice on ticket searchbar' (!1153) from 4789-search-ticket-without-invoice into dev ... Reviewed-on: #1153 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 09:27:18 +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	a2e08c5907	Merge pull request 'fixes #4547 check compensation and tests' (!1161) from 4547-fix-compensation into dev ... Reviewed-on: #1161 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 08:48:40 +00:00
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Alexandre Riera	e3831cc1e3	Merge pull request 'fixes #3949 invoiceIn basic-data añadir campo docFk' (!1172) from 3949-invoiceIn-add-docFk into dev ... Reviewed-on: #1172 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 08:40:35 +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	7f89899d6c	fix: closeTicket	2022-11-23 12:54:52 +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	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	c02be35e1c	Merge pull request 'closes #4511 kkear-expedition.itemFk' (!1146) from 4511-kkear-expedition.itemFk into dev ... Reviewed-on: #1146 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-23 07:37:28 +00: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
Vicent Llopis	ccce6af021	fix: add translations	2022-11-23 07:57:27 +01:00