13871 Commits

All Branches

Search

Author	SHA1	Message	Date
Alexandre Riera	02a958ca1e	Merge branch 'dev' into 4927-permitir-razonSocial-duplicada	2023-01-10 10:44:54 +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	7a36a159ec	Merge branch 'dev' into 4927-permitir-razonSocial-duplicada	2023-01-10 08:49:38 +00: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
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
Alexandre Riera	07fc5b69ad	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-10 07:32:03 +00: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
Robert Ferrús	bcefea726c	Merge branch 'dev' into 4857-invoiceOutTranslate	2023-01-05 13:54:01 +00:00
Robert Ferrús	6891da4863	refactor(invoiceOut): updated translation ... Refs #4857	2023-01-05 11:43:08 +01:00
Alexandre Riera	4b6762be77	Merge branch 'dev' into 4927-permitir-razonSocial-duplicada	2023-01-05 07:44:55 +00: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
Alexandre Riera	e82035606f	refs #4984 autoincrement added	2023-01-04 11:31:09 +01:00
Joan Sanchez	731e32c972	Merge branch 'dev' into 5044-notranslate_icons	2023-01-03 12:28:35 +00:00
Alexandre Riera	c6ad9a6aff	Merge branch 'dev' into 4937-marcar-verRecibo	2023-01-03 12:00:39 +00:00
Alexandre Riera	2eea1e68e8	Merge branch 'dev' into 4926-add-itemPackingOut	2023-01-03 11:45:35 +00:00
Alexandre Riera	3b9f5b4a85	Merge branch 'dev' into 4927-permitir-razonSocial-duplicada	2023-01-03 11:31:45 +00:00
Alexandre Riera	949c73a465	Merge pull request 'fixes #5051 Arreglar tests de back y e2e con fallo por cambio de fecha' (!1235) from 5051-fixBackE2E-dateChange into dev ... Reviewed-on: #1235 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2023-01-03 11:26:42 +00:00
Alexandre Riera	6185b2f055	refs #5051 changed fixture	2023-01-03 12:04:38 +01:00
Alexandre Riera	c6083ebe61	refs #5051 fdescribe	2023-01-03 11:53:47 +01:00
Alexandre Riera	b5ef090080	refs #5051 json date	2023-01-03 11:39:50 +01:00
Alexandre Riera	5c2e85d499	refs #5051 consolelog date	2023-01-03 11:00:01 +01:00
Alexandre Riera	04d3d13e82	refs #5051 sub stmt	2023-01-03 10:36:31 +01:00
Alexandre Riera	0ae76746ae	refs #5051 limit stmt	2023-01-03 10:20:44 +01:00
Alexandre Riera	17a7bfbf3b	refs #5051 continue fixing test jenkins	2023-01-03 10:11:52 +01:00
Alexandre Riera	cef0152ef5	refs #5052 fixing jenkins test	2023-01-03 09:44:27 +01:00
Joan Sanchez	d1150d0965	Updated changelog	2023-01-03 09:01:06 +01:00
Joan Sanchez	674fe49058	fix(icons): prevent icon translation when using google translator ... Refs: 5044	2023-01-03 08:41:58 +01:00
Alexandre Riera	9887f87dd3	refs #5051 pending added	2023-01-03 08:34:46 +01:00
Alexandre Riera	96f2e4b542	refs #5051 skipped tests and changed fixtures	2023-01-02 13:35:33 +01:00
Alexandre Riera	c01292bec7	Merge branch '4937-marcar-verRecibo' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo	2023-01-02 07:12:39 +01:00
Alexandre Riera	f027a7b07f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo	2023-01-02 07:12:10 +01:00
Alexandre Riera	7c45ac158c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut	2023-01-02 07:09:30 +01:00
Alexandre Riera	7d61933a3c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada	2023-01-02 07:07:09 +01:00
Alexandre Riera	81e1f88611	Merge branch 'dev' into 4937-marcar-verRecibo	2022-12-28 13:20:12 +00:00
Alex Moreno	a5ab5d613a	Merge pull request 'refactor(login): split in differents folder' (!1234) from 4995-split_folder into dev ... Reviewed-on: #1234 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-12-28 13:18:22 +00:00
Alex Moreno	90acbac2ad	refactor(login): split in differents folder	2022-12-28 14:06:51 +01:00
Alex Moreno	323776e50c	Merge pull request '#4995 feat(app): only use ui-view for routing' (!1232) from 4995-app_use_ui-view into dev	2022-12-28 12:47:40 +00:00
Alexandre Riera	502461fde5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut	2022-12-28 13:25:10 +01:00
Alex Moreno	c93c276968	Merge branch '4995-app_use_ui-view' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view	2022-12-28 11:40:14 +01:00
Alex Moreno	fc72a6e2f5	changelog	2022-12-28 11:40:13 +01:00
Alex Moreno	31ad0555fe	Merge branch 'dev' into 4995-app_use_ui-view	2022-12-28 10:28:21 +00:00
Alex Moreno	f4a60d3b35	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4995-app_use_ui-view	2022-12-28 11:27:49 +01:00
Alex Moreno	990bcc0f6e	feat(app): only use ui-view for routing	2022-12-28 11:18:53 +01:00
Alexandre Riera	d1eb3b97ea	Merge pull request 'fixes #4971 Filtrar Artículo en la pantalla de compras' (!1224) from 4971-filtrar-articulo into dev ... Reviewed-on: #1224 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-28 09:22:12 +00:00
Alexandre Riera	b6e17d3489	Merge branch 'dev' into 4971-filtrar-articulo	2022-12-28 09:16:14 +00:00
Alexandre Riera	33fbe8cc7b	Merge pull request 'fixes #4957 saleChecked kkear' (!1231) from 4957-saleChecked-kkear into dev ... Reviewed-on: #1231 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-12-28 09:06:25 +00:00
Alexandre Riera	c06c3dc6a7	refs #4957 saleChecked deleted	2022-12-27 11:50:58 +01:00