5805 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	9a165b38c9	Merge pull request 'refs #6898 fix new list' (!594) from 6898-suppliersMigrationFix3 into master ... Reviewed-on: #594 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-06 09:45:46 +00:00
Pablo Natek	7d6520fdaa	fix: routeForm	2024-08-06 11:44:38 +02:00
Carlos Satorres	75866f2d27	refs #6898 fix new list	2024-08-06 11:00:59 +02:00
Jorge Penadés	1411833a4c	chore: refs #7283 fix e2e logout	2024-08-06 09:51:22 +02:00
Alex Moreno	4c46e419e3	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-06 09:43:50 +02:00
Alex Moreno	28efe4aacf	hotFix(route_list): columnFilter change "from" to "to"	2024-08-06 09:43:16 +02:00
Jorge Penadés	90073a0a68	fix: refs #7283 locale	2024-08-06 09:12:12 +02:00
Jorge Penadés	50468d22cc	fix: refs #7283 min-width vnImg	2024-08-06 08:56:12 +02:00
Jorge Penadés	db38270ed5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration	2024-08-06 08:47:09 +02:00
Alex Moreno	f38a70c040	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-06 08:01:41 +02:00
Alex Moreno	02172fbc26	Merge pull request '7837-testToMaster_2432' (!592) from 7837-testToMaster_2432 into master ... Reviewed-on: #592 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-06 05:54:10 +00:00
Jorge Penadés	005f571ecf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration	2024-08-05 17:14:06 +02:00
Jorge Penadés	b8d38f15e4	fix: refs #7283 use vnAvatar & add optional zoom	2024-08-05 17:13:15 +02:00
Pablo Natek	cf1545d5e8	Merge branch 'dev' into 7404-stockBought	2024-08-05 14:25:47 +00:00
Pablo Natek	de94b3629e	fix: remove console.log	2024-08-05 15:44:37 +02:00
Pablo Natek	f2be2b4300	fea: stockBought add form and formDetail	2024-08-05 15:42:57 +02:00
Alex Moreno	8c754dd196	hotFix(claim_development): reload when change route id	2024-08-05 15:22:34 +02:00
Alex Moreno	6abce3c7d0	hotFix(VnPaginate): watch when is mounted	2024-08-05 15:20:07 +02:00
Alex Moreno	2faab84962	add changelog	2024-08-05 14:52:20 +02:00
Alex Moreno	dcc2ef3d18	typo	2024-08-05 14:25:42 +02:00
Jorge Penadés	5bd0bbb3ac	fix: refs #7283 userPanel pic	2024-08-05 14:03:55 +02:00
Alex Moreno	5bac9143e6	fix(customer_sms: fix reload	2024-08-05 14:02:39 +02:00
Alex Moreno	88ea25cb83	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection-v2	2024-08-05 13:46:17 +02:00
Alex Moreno	98a16b9453	refactor(customer_log: use VnLog	2024-08-05 13:44:35 +02:00
Alex Moreno	7612260359	refactor(customer_webAccess): FormModel	2024-08-05 13:36:27 +02:00
Jorge Penadés	16cfd84fab	fix: refs #7283 itemTags & VnImg	2024-08-05 13:01:26 +02:00
Alex Moreno	810e579ea9	refactor(customer_recovery): to vnTable	2024-08-05 12:10:15 +02:00
Guillermo Bonet	59b709b57d	Merge branch 'test' into dev	2024-08-05 11:59:15 +02:00
Guillermo Bonet	da911f80f6	Merge branch 'master' into test	2024-08-05 11:58:58 +02:00
Guillermo Bonet	d90ed6c703	Merge pull request 'feat: refs #7644 Optimized entry labels report' (!590) from 7644-buyLabelChunk into master ... Reviewed-on: #590 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-05 09:53:42 +00:00
Guillermo Bonet	d12c0de144	feat: refs #7644 Optimized entry labels report	2024-08-05 11:29:44 +02:00
Alex Moreno	cb95f0637f	Merge pull request 'feat(customer_balance): refs #6943 add functionality from salix' (!589) from 6943-cusotmer-balance into dev ... Reviewed-on: #589 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-05 08:08:43 +00:00
Alex Moreno	c83b3d54ae	typo	2024-08-05 10:07:47 +02:00
Alex Moreno	30961c796d	feat(customer_balance): refs #6943 translations	2024-08-05 10:05:41 +02:00
Alex Moreno	460b166a17	feat(customer_balance): refs #6943 add functionality from salix	2024-08-05 09:04:08 +02:00
Alex Moreno	6cece5c071	Merge pull request 'hotfix: refs CAU #207614 fix sale.concept field' (!586) from hotfix_TicketList_itemName into test ... Reviewed-on: #586 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-05 05:45:47 +00:00
Alex Moreno	91e066e18a	Merge branch 'test' into hotfix_TicketList_itemName	2024-08-05 05:44:41 +00:00
Jorge Penadés	6f771c7ae6	fix: refs #7283 basicData locale	2024-08-02 14:31:41 +02:00
Jon Elias	d4a5b074be	Merge pull request 'hotfix: CAU 207504 fix itemDiary and logs' (!587) from hotfix_ItemDiary into test ... Reviewed-on: #587 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-02 11:06:37 +00:00
Jon Elias	bdf4c793dc	Merge branch 'test' into hotfix_ItemDiary	2024-08-02 11:04:47 +00:00
Jorge Penadés	27e7d30158	fix: refs #7283 basicData locale	2024-08-02 12:50:58 +02:00
Jorge Penadés	bc4ee5c8a5	fix: refs #7283 basicData locale	2024-08-02 12:50:09 +02:00
Alex Moreno	3e5c811961	Merge pull request 'fix: refs #6101 fix TicketList' (!585) from hotfix_6101_FixTicketList into test ... Reviewed-on: #585 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-02 10:29:48 +00:00
Alex Moreno	eb55743bc0	Merge branch 'test' into hotfix_6101_FixTicketList	2024-08-02 10:28:44 +00:00
Jorge Penadés	51fec90607	feat: refs #4074 useAcl in vnSelectDialog	2024-08-02 12:04:19 +02:00
Guillermo Bonet	0d016e0898	Merge branch 'test' into dev	2024-08-02 10:01:16 +02:00
Guillermo Bonet	33da5dd8a8	Merge branch 'master' into test	2024-08-02 10:01:01 +02:00
Guillermo Bonet	6bc265b83f	Merge pull request 'fix: refs #7413 No id tag' (!580) from 7413-filterValueFix into master ... Reviewed-on: #580 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-02 07:57:32 +00:00
Guillermo Bonet	8450830b59	Merge branch 'master' into 7413-filterValueFix	2024-08-02 07:55:30 +00:00
Jorge Penadés	6c3c03722f	feat: refs #4074 useAcl in vnSelectDialog	2024-08-02 09:37:48 +02:00