6159 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	dc6acfadb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-09-25 08:51:21 +02:00
Jon Elias	4ff068aa8a	Merge pull request '#7553 modified TicketExpedition & changes in ticket section' (!571) from 7553_FixTicketExpedition into dev ... Reviewed-on: #571 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 05:51:15 +00:00
Javier Segarra	c1087614c6	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-25 05:50:22 +00:00
Javier Segarra	e8a0d44292	Merge pull request 'feat: autofocus after clear' (!747) from vnInput_autoFocus into dev ... Reviewed-on: #747 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-25 05:50:04 +00:00
Jon Elias	ff3ab83727	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-25 05:25:07 +00:00
Javier Segarra	2a64d9643e	Merge branch 'dev' into vnInput_autoFocus	2024-09-24 20:16:56 +00:00
Jorge Penadés	86a82c5aad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-09-24 14:39:18 +02:00
Alex Moreno	d35b40a891	fix: vnTable color	2024-09-24 14:07:04 +02:00
Jon Elias	67a1c28670	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 10:51:31 +00:00
Alex Moreno	32328da370	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-24 12:25:24 +02:00
Alex Moreno	c9e4ab490d	build: init version 2442	2024-09-24 12:23:19 +02:00
Alex Moreno	d85705bb39	Merge pull request '8032-devToTest_2440' (!751) from 8032-devToTest_2440 into test ... Reviewed-on: #751 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-09-24 10:05:32 +00:00
Jon Elias	8315eb2b4c	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 09:37:17 +00:00
Javier Segarra	41f168ebbe	Merge pull request '#7671 - Default Table Order by Description DESC' (!745) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #745 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:24:45 +00:00
Javier Segarra	3affd8712c	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-24 09:22:47 +00:00
Jon Elias	21f7613f21	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 08:36:57 +00:00
Jon Elias	f34e81038e	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-24 10:36:02 +02:00
Jon Elias	cd96003c0e	refactor: refs #7553 requested changes and added keyup.enter	2024-09-24 10:35:59 +02:00
Alex Moreno	2d90a75fa0	Merge pull request 'fix: wagon tests' (!752) from FixWagonTests into dev ... Reviewed-on: #752 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 07:53:08 +00:00
Javier Segarra	6e57306026	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-24 07:39:22 +00:00
Jon Elias	f2ae231efb	fix: missing code	2024-09-24 09:35:34 +02:00
Jorge Penadés	42e4493fb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-09-24 09:27:38 +02:00
Jon Elias	768e15755f	fix: deleted code	2024-09-24 09:18:10 +02:00
Jon Elias	2c73ce28c3	fix: fixed wagon tests	2024-09-24 09:02:35 +02:00
Alex Moreno	eaadacd332	Merge pull request '7404-fixFront' (!743) from 7404-fixFront into dev ... Reviewed-on: #743 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 06:19:58 +00:00
Alex Moreno	b7ed63afc6	Merge branch 'dev' into 7404-fixFront	2024-09-24 06:18:42 +00:00
Alex Moreno	8760781660	fix: merge in dev	2024-09-24 08:15:44 +02:00
Alex Moreno	98a3b03be7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-24 07:48:58 +02:00
Alex Moreno	1f9850f520	Merge pull request 'fix: Options VnSelect properties' (!746) from 6943_fix_customer_module into dev ... Reviewed-on: #746 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 05:41:49 +00:00
Alex Moreno	5fc306e11e	Merge branch 'dev' into 6943_fix_customer_module	2024-09-24 05:38:47 +00:00
Alex Moreno	96edfd4b6e	Merge pull request 'feat: change label because its more natural' (!749) from 5888_format_location_label into dev ... Reviewed-on: #749 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-24 05:36:09 +00:00
Javier Segarra	55e017b0cc	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 18:39:09 +00:00
Javier Segarra	3ede256dc5	feat: change label because its more natural	2024-09-23 18:30:14 +00:00
Jorge Penadés	2cb9899de1	feat: refs #7207 show queue	2024-09-23 15:38:54 +02:00
Javier Segarra	b4b31c0c92	fix: enable autofocus	2024-09-23 15:21:07 +02:00
Javier Segarra	e9e2caee85	feat: autofocus after clear	2024-09-23 13:18:14 +00:00
Javier Segarra	27a3e36b58	fix: comments	2024-09-23 14:56:34 +02:00
Javier Segarra	13b519e4b3	Merge branch 'dev' into 6943_fix_customer_module	2024-09-23 12:45:03 +00:00
Javier Segarra	ab0c38810a	fix: Options VnSelect properties	2024-09-23 12:44:37 +00:00
Javier Segarra	caddcf45c3	fix: Options VnSelect properties	2024-09-23 12:43:52 +00:00
Javier Segarra	3cfa883642	Merge pull request '#6943 - Customer module find salesPersons out of first get' (!711) from 6943_fix_customer_module into dev ... Reviewed-on: #711 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 12:25:21 +00:00
Javier Segarra	5803af7a74	Merge branch 'dev' into 6943_fix_customer_module	2024-09-23 12:24:01 +00:00
Javier Segarra	0c1114e89e	Merge pull request '6156 i18n' (!742) from 6156_i18n into dev ... Reviewed-on: #742 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 12:22:17 +00:00
Javier Segarra	ac8aa6bcc1	fix: table order	2024-09-23 14:21:41 +02:00
Javier Segarra	e651b7ad82	Merge branch 'dev' into 6156_i18n	2024-09-23 12:07:05 +00:00
Jon Elias	4fc3f08f77	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 11:52:31 +00:00
Jon Elias	b728b7c5bd	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-23 13:51:22 +02:00
Jon Elias	3716507f93	perf: refs #7553 removeSales function	2024-09-23 13:51:20 +02:00
Alex Moreno	d3b45af7e5	Merge pull request 'fix: VnLocation test' (!744) from fix_test_vnLocation into dev ... Reviewed-on: #744 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:45:24 +00:00
Robert Ferrús	d13cab0a24	Merge pull request 'feat: refs #8000 add column into zoneBasicData' (!741) from 8000-zoneBasicDataAddcolumn into master ... Reviewed-on: #741 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:43:14 +00:00