6741 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	9ddd7f9524	Merge branch 'master' into hotfix_newCustomer_SalesPerson	2024-10-04 17:51:08 +00:00
Javier Segarra	a69a4577a3	Merge pull request 'Fix:: order module' (!802) from Fix-OrderCatalog into dev ... Reviewed-on: #802 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-04 17:48:47 +00:00
Javier Segarra	043ab6bcea	feat: #6943 Change icon	2024-10-04 19:47:46 +02:00
Pako Natek	355b1357b7	Merge branch 'dev' into Fix-OrderCatalog	2024-10-04 16:08:12 +00:00
Jorge Penadés	9383a71adb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-04 16:38:27 +02:00
Jorge Penadés	055b1b0a88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-04 16:12:31 +02:00
Javier Segarra	3c92b06b8e	feat: #6943 Change icon	2024-10-04 14:44:54 +02:00
Jon Elias	aee23c75e8	fix: order module	2024-10-04 14:31:39 +02:00
Jon Elias	e4e60abe0e	Merge branch 'master' into Hotfix-ZoneOrderFilters	2024-10-04 12:25:49 +00:00
Jon Elias	3a21f6aadb	fix: order catalog	2024-10-04 14:22:00 +02:00
Pablo Natek	d325459beb	Merge pull request '4988-fixE2e' (!801) from 4988-fixE2e into dev ... Reviewed-on: #801 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 12:18:52 +00:00
Jorge Penadés	9c5ce6dbfd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-04 13:50:31 +02:00
Jorge Penadés	905841e0d6	Merge branch 'dev' into 7207-showPbx	2024-10-04 11:45:28 +00:00
Jorge Penadés	9fe3de22ac	Merge branch '7323-fineTunningWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-10-04 13:37:57 +02:00
Jorge Penadés	b735ccb3a0	Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-10-04 13:37:55 +02:00
Pablo Natek	efe5208d30	Merge branch 'dev' into 4988-fixE2e	2024-10-04 11:32:40 +00:00
Jorge Penadés	9f433afb51	Merge pull request '#7702 - FIX Change password error' (!542) from 7702_fix_setPassword into dev ... Reviewed-on: #542 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 11:15:42 +00:00
Pablo Natek	1869e3315a	fix: refs #4988 remove id	2024-10-04 13:14:14 +02:00
Pablo Natek	7dc019cfbb	fix: refs #4988 selector on e2e	2024-10-04 13:13:57 +02:00
Jorge Penadés	a311cf00d2	Merge branch 'master' into 7353-hotfix-fixScopeDays	2024-10-04 11:12:19 +00:00
Jon Elias	195747b5a0	feat: added click and transfer tickets and deleted useless code	2024-10-04 12:34:37 +02:00
Carlos Satorres	45c8f6f4c5	Merge pull request 'refs #7355 fix searchbar' (!797) from hotfix-AccountSearchbar into master ... Reviewed-on: #797 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 10:09:53 +00:00
Jorge Penadés	ae8e4ba4b9	chore: refs #7702 fix tests	2024-10-04 11:54:40 +02:00
Jorge Penadés	67c2e284ba	feat: refs #7702 ask old pass	2024-10-04 11:45:10 +02:00
Carlos Satorres	0d31adaa4b	refs #7767 check holiday	2024-10-04 11:29:21 +02:00
Jorge Penadés	e43ba9b58a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-10-04 10:11:38 +02:00
Jon Elias	7874db1647	fix: zone delivery postcodes filter and order catalog type filter	2024-10-04 09:58:23 +02:00
Jorge Penadés	cebb3b2b16	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-04 07:47:46 +00:00
Javier Segarra	d34a7b5839	style: #refs remove commentst	2024-10-04 09:17:48 +02:00
Javier Segarra	01764f4954	style: #refs CardSummary max-height	2024-10-04 09:12:47 +02:00
Pablo Natek	222e83cad8	Merge pull request 'feat: refs #7404 change travel name and remove buyer filter' (!796) from 7404-addSomeLogisticPreferences into dev ... Reviewed-on: #796 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 06:59:12 +00:00
Jon Elias	4b9588c189	refactor: refs #7825 modified worker list form to fill the field when a bank entity is created	2024-10-04 08:55:48 +02:00
Pablo Natek	4ba52f1a56	Merge branch 'dev' into 7404-addSomeLogisticPreferences	2024-10-04 06:55:41 +00:00
Pablo Natek	7d0e3e6fd4	Merge pull request 'fix: refs #7129 translates from globals to module locals' (!794) from 7129--fixTranslates into dev ... Reviewed-on: #794 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 06:54:11 +00:00
Pablo Natek	4a357c5be6	Merge branch 'dev' into 7404-addSomeLogisticPreferences	2024-10-04 06:53:53 +00:00
Pablo Natek	99ba7a39fa	Merge branch 'dev' into 7129--fixTranslates	2024-10-04 06:53:17 +00:00
Carlos Satorres	530ed4b716	refs #7355 fix searchbar	2024-10-04 08:48:36 +02:00
Javier Segarra	5770c344c8	feat: #6942 Create Ticket or Order with data filtered by clientId	2024-10-04 01:32:11 +02:00
Javier Segarra	0b752cdb0d	feat: #6942 Open TicketSale in new tab	2024-10-04 01:27:18 +02:00
Javier Segarra	90610cb832	feat: #6942 CustomerDescriptor	2024-10-04 01:23:27 +02:00
Javier Segarra	cbb7bea545	fix: createForm	2024-10-04 00:58:14 +02:00
Javier Segarra	860370019e	style: #6321Customer updatees	2024-10-04 00:35:11 +02:00
Javier Segarra	02e7177dee	Merge branch 'master' into hotfix_newCustomer_SalesPerson	2024-10-03 23:46:44 +02:00
Jorge Penadés	c64fe8c044	chore: refs #7207 refactor locale	2024-10-03 17:04:56 +02:00
Jorge Penadés	b0ba6a5e0f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-03 15:40:05 +02:00
Jorge Penadés	cd20db637c	fix: refs #7874 btn ui	2024-10-03 15:30:26 +02:00
Jorge Penadés	aca10b81af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 15:14:28 +02:00
Pablo Natek	c04dad38f1	feat: refs #7404 change travel name and remove buyer filter	2024-10-03 15:02:14 +02:00
Jorge Penadés	e10088ed06	Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-10-03 13:49:33 +02:00
Jorge Penadés	ad8b72660f	fix: refs #7353 scopeDays	2024-10-03 13:37:21 +02:00