14135 Commits

All Branches

Search

Author	SHA1	Message	Date
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
Pau	4f2472ea90	Merge branch 'dev' into 4605-Create-Model-PackagingMistake	2023-01-10 13:56:15 +01:00
Pau	d540e278eb	refs #4605 @30min	2023-01-10 13:52:30 +01:00
Vicent Llopis	984a3294f9	Merge branch 'dev' into 4846-claim.search-panel	2023-01-10 11:58:00 +00:00
Alexandre Riera	9f1c6e6d1d	Merge branch 'dev' into 4866-detalle-faltas	2023-01-10 10:48:10 +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
Alexandre Riera	713619ff25	Merge branch '4930-add-zone' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-10 10:15:48 +01:00
Alexandre Riera	6bdbd77640	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone	2023-01-10 10:15:41 +01: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
Guillermo Bonet	e0e34595f4	refs #4975 Added translations	2023-01-09 18:46:19 +01:00
Guillermo Bonet	f23eb9f4ad	refs #4975 Added call to last method in upload	2023-01-09 18:28:09 +01:00
Alex Moreno	382aad2622	feat(docuware): upload and send pdf	2023-01-09 15:11:53 +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
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
Pau	9911c3bccd	Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label	2023-01-05 14:40:27 +01:00
Pau	7cc4a2e635	cambiar report body y estilos para centrar mas la label	2023-01-05 14:39:53 +01: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
Guillermo Bonet	2803de9445	refs #4975 Return JSON {version:xxx}	2023-01-05 14:20:47 +01:00
Pau	4ae903191a	Merge branch 'dev' into 4732-previa-label	2023-01-05 12:48:03 +00: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
Vicent Llopis	810a1afcd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel	2023-01-05 11:40:25 +01:00
Vicent Llopis	3abbfc4fa7	refacotr	2023-01-05 10:35:55 +01:00
Vicent Llopis	fd9ca3a4c1	add test	2023-01-05 10:35:49 +01:00
Vicent Llopis	3edc0403ba	fix	2023-01-05 10:35:42 +01:00
Pau	252a2d2aad	Merge branch 'dev' into 4875-fix-back-tests	2023-01-05 08:49:40 +00:00
Pau	0e426db296	remove seed and randomize false on the test	2023-01-05 09:32:31 +01:00
Pau	80cc341bf0	refs #4875 @3h	2023-01-05 09:26:36 +01:00
Pau	f0761a92a2	reactivate working tests	2023-01-05 09:26:11 +01:00
Vicent Llopis	9ae7b92bbf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags	2023-01-05 09:00:37 +01:00
Joan Sanchez	8f118748b6	Merge pull request 'fix(icons): prevent icon translation when using google translator' (!1237) from 5044-notranslate_icons into dev ... Reviewed-on: #1237 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2023-01-05 07:29:52 +00:00
Alex Moreno	46f36e1de1	try	2023-01-04 15:03:45 +01:00