14009 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	2cc89d9ae7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker	2023-01-13 13:54:16 +01:00
Joan Sanchez	c489c4c6a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-01-13 08:55:01 +01:00
Joan Sanchez	54356ece7d	fix(monitor): refresh monitor when using ng-for track ... Refs: #5083	2023-01-12 13:53:38 +01:00
Joan Sanchez	a1ef67157d	Merge pull request '#5081-hotfix-sms-faltas' (!1250) from #5081-hotfix-sms-faltas into master ... Reviewed-on: #1250	2023-01-12 12:06:56 +00:00
Pau	e05fa7c747	Merge branch 'master' into #5081-hotfix-sms-faltas	2023-01-12 13:00:01 +01:00
Pau	d5a7691b9c	add controller function	2023-01-12 12:56:51 +01:00
Joan Sanchez	7f29b0c5f9	Merge pull request '5080-mdbApp_primaryKey' (!1249) from 5080-mdbApp_primaryKey into master ... Reviewed-on: #1249	2023-01-12 11:47:50 +00:00
Pau	2678d59191	front test expected old value	2023-01-12 11:57:20 +01:00
Vicent Llopis	da8b6b7f2d	fix: comprueba que hay registros	2023-01-12 11:52:27 +01:00
Pau	b6de50848a	refs #5081 fix sms faltas	2023-01-12 11:48:44 +01:00
Vicent Llopis	ed90957ab5	fix: corregida primaryKey de mdbApp	2023-01-12 11:45:11 +01:00
Joan Sanchez	fe6211e965	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 09:56:59 +01:00
Joan Sanchez	7f080241f3	Merge pull request 'MASTER_4943-osticket_closeTicket' (!1242) from MASTER_4943-osticket_closeTicket into master ... Reviewed-on: #1242	2023-01-12 07:41:04 +00:00
Vicent Llopis	bca8a324d8	Merge pull request 'fix: se excluyen los test de back que fallan intermitente' (!1225) from 5035-intermittent_backTest into dev ... Reviewed-on: #1225 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-12 07:40:00 +00:00
Joan Sanchez	882cf6b9c1	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-01-12 08:36:24 +01:00
Vicent Llopis	352fba9acf	Merge branch 'dev' into 5035-intermittent_backTest	2023-01-12 07:32:44 +00:00
Alexandre Riera	e51e445b3e	Merge pull request 'fixes #3571 Refactorizar E2E (03-worker)' (!1233) from 3571-refactor-e2e into dev ... Reviewed-on: #1233 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-01-12 06:58:26 +00:00
Alexandre Riera	7bdc04cd13	Merge branch 'dev' into 3571-refactor-e2e	2023-01-12 06:55:09 +00:00
Pau	71db01a45c	Merge pull request '4875-fix-back-tests' (!1240) from 4875-fix-back-tests into dev ... Reviewed-on: #1240 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-11 13:25:36 +00:00
Pau	c908a71ebf	Merge branch 'dev' into 4875-fix-back-tests	2023-01-11 13:22:40 +00:00
Vicent Llopis	b1e12c90ae	Merge pull request '2952-ticket.sale-checked' (!1246) from 2952-ticket.sale-checked into dev ... Reviewed-on: #1246 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-10 13:33:02 +00:00
Vicent Llopis	6f94987392	Merge branch 'dev' into 2952-ticket.sale-checked	2023-01-10 13:11:06 +00:00
Vicent Llopis	ef40c15a4e	Merge pull request '4846-claim.search-panel' (!1174) from 4846-claim.search-panel into dev ... Reviewed-on: #1174 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-10 13:09:19 +00:00
Pau	e0cf45546e	Merge branch 'dev' into 4875-fix-back-tests	2023-01-10 12:57:39 +00:00
Vicent Llopis	984a3294f9	Merge branch 'dev' into 4846-claim.search-panel	2023-01-10 11:58:00 +00:00
Alexandre Riera	1f1a69a2b4	Merge pull request 'fixes #4984 Añadir autoincrement a 2 tablas' (!1239) from 4984-autoincrement-vnReport-vnPrinter into dev ... Reviewed-on: #1239 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-01-10 10:43:55 +00:00
Alexandre Riera	6a1e170e91	Merge branch 'dev' into 4984-autoincrement-vnReport-vnPrinter	2023-01-10 10:35:29 +00:00
Vicent Llopis	ac3e68d846	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest	2023-01-10 10:14:46 +01:00
Alexandre Riera	73aab50155	Merge pull request 'fixes #4937 viewReceipt added' (!1223) from 4937-marcar-verRecibo into dev ... Reviewed-on: #1223 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-10 08:47:40 +00:00
Vicent Llopis	ff653ad834	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 09:18:02 +01:00
Alexandre Riera	28ac2677a3	Merge branch 'dev' into 4937-marcar-verRecibo	2023-01-10 08:02:51 +00:00
Alexandre Riera	5a49da26f6	Merge pull request 'fixes #4926 item.basic-data añadir campo' (!1227) from 4926-add-itemPackingOut into dev ... Reviewed-on: #1227 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-10 08:00:55 +00:00
Joan Sanchez	4cfa63918f	Merge branch 'dev' into 4875-fix-back-tests	2023-01-10 07:41:26 +00:00
Vicent Llopis	5f0fa5e369	add changelog	2023-01-10 08:34:38 +01:00
Vicent Llopis	eb3ed95b22	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked	2023-01-10 08:32:44 +01:00
Alexandre Riera	07fc5b69ad	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-10 07:32:03 +00:00
Vicent Llopis	cdee85e1e8	refacotor: change description	2023-01-10 08:31:32 +01:00
Vicent Llopis	f103931e50	fix: se concatenan pq sino no muestra el id del ticket	2023-01-10 08:14:13 +01:00
Vicent Llopis	201987fb99	feat: muestra el error	2023-01-09 11:42:16 +01:00
Robert Ferrús	e01dc33262	Merge pull request 'refactor(invoiceOut): updated translation' (!1243) from 4857-invoiceOutTranslate into dev ... Reviewed-on: #1243 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-09 09:11:40 +00:00
Alexandre Riera	d051d66417	Merge branch 'dev' into 4984-autoincrement-vnReport-vnPrinter	2023-01-09 08:43:29 +00:00
Alex Moreno	8688fc4652	Merge branch 'dev' into 4658-createWorker	2023-01-09 06:23:21 +00:00
Vicent Llopis	0c6d335c4a	refactor: machacar stack	2023-01-05 15:01:29 +01:00
Vicent Llopis	a68fe26952	refactor: machar stack	2023-01-05 15:01:20 +01:00
Vicent Llopis	f356188491	feat: salta los tickets bloqueados	2023-01-05 14:54:43 +01:00
Robert Ferrús	bcefea726c	Merge branch 'dev' into 4857-invoiceOutTranslate	2023-01-05 13:54:01 +00:00
Vicent Llopis	1a74e84359	feat: salta los tickets bloqueados	2023-01-05 14:32:14 +01:00
Vicent Llopis	8f81aa2eeb	fix: salta los tickets que estan bloqueados	2023-01-05 14:28:35 +01:00
Robert Ferrús	6891da4863	refactor(invoiceOut): updated translation ... Refs #4857	2023-01-05 11:43:08 +01:00
Vicent Llopis	1aa21c16b5	refactor: borrado join a worker	2023-01-05 11:42:21 +01:00