3059 Commits

Author	SHA1	Message	Date
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
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	d12c0de144	feat: refs #7644 Optimized entry labels report	2024-08-05 11:29:44 +02: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	91e066e18a	Merge branch 'test' into hotfix_TicketList_itemName	2024-08-05 05:44:41 +00:00
Jon Elias	bdf4c793dc	Merge branch 'test' into hotfix_ItemDiary	2024-08-02 11:04:47 +00:00
Alex Moreno	eb55743bc0	Merge branch 'test' into hotfix_6101_FixTicketList	2024-08-02 10:28:44 +00: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	8450830b59	Merge branch 'master' into 7413-filterValueFix	2024-08-02 07:55:30 +00:00
Jon Elias	2367550bc1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_ItemDiary	2024-08-02 09:25:46 +02:00
Jon Elias	276202f0c7	fix: refs CAU 207504 fix itemDiary and logs	2024-08-02 09:23:30 +02:00
Jon Elias	b6bb8e0952	hotfix: refs CAU #207614 fix sale.concept field	2024-08-02 08:41:46 +02:00
Jon Elias	c5f2075148	fix: refs #6101 fix TicketList	2024-08-02 08:25:57 +02:00
Alex Moreno	545f7c8039	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-01 14:11:15 +02:00
Alex Moreno	fa60467e76	fix(claim): small details	2024-08-01 10:51:13 +02:00
Carlos Satorres	68e4831ea5	refs #7355 fix conflicts	2024-08-01 09:56:54 +02:00
Carlos Satorres	2d467016b2	refs #7355 fix roles	2024-08-01 09:51:18 +02:00
Guillermo Bonet	f09308d956	fix: refs #7413 No id tag	2024-07-31 12:50:34 +02:00
Carlos Satorres	ed032badac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration	2024-07-31 09:37:20 +02:00
Alex Moreno	287abcf90c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-31 08:10:30 +02:00
Alex Moreno	2ad72c3209	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-07-31 08:01:44 +02:00
Carlos Satorres	5b214b58ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration	2024-07-31 07:22:43 +02:00
Alex Moreno	ed110beda6	Merge branch 'dev' into 6943-customer_migration_subsection	2024-07-30 11:33:11 +00:00
Alex Moreno	108ffbe7a8	Merge branch 'master' into 7679-hotFix_vnLocation	2024-07-30 11:12:10 +00:00
Alex Moreno	ecb201edce	delete unnesessary class	2024-07-30 12:45:18 +02:00
Carlos Satorres	7ff20f3064	hotFix: supplierList correct filter	2024-07-30 11:50:23 +02:00
Jorge Penadés	1fe2ba7f09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6989-showClientName	2024-07-30 09:52:29 +02:00
Alex Moreno	b5cb28a0cf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-30 07:47:46 +02:00
Alex Moreno	9179e13dcd	fix: vnLocation	2024-07-29 15:03:21 +02:00
Jorge Penadés	839af6d50c	fix: refs #6989 show entity name & default time from config table	2024-07-29 13:41:44 +02:00
Jorge Penadés	979b3b2a6c	fix: refs #7197 drop character	2024-07-29 08:46:47 +02:00
Jorge Penadés	5705904e40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-29 08:04:51 +02:00
Alex Moreno	f079ba4022	hotFix: twoFactor add required import	2024-07-26 14:51:22 +02:00
Robert Ferrús	bfbe4d64b3	Merge branch 'master' into 7039-hotFixSupplierSummary	2024-07-26 11:59:32 +00:00
Guillermo Bonet	7b13250a16	Merge branch 'test' into dev	2024-07-26 13:57:11 +02:00
Guillermo Bonet	621de11890	fix: refs #6769 Requested changes	2024-07-26 13:14:45 +02:00
Guillermo Bonet	48e133ffc7	fix: refs #6769 Fix worker images	2024-07-26 13:00:55 +02:00
Robert Ferrús	d4ff3ab993	fix: refs #7039 supplierSummary	2024-07-26 12:55:36 +02:00
Guillermo Bonet	86ab161302	fix: refs #6769 Fixes item diary	2024-07-26 12:37:53 +02:00
Alex Moreno	21b642a7c5	typo	2024-07-26 12:15:57 +02:00
Carlos Satorres	f4c0288ca0	refs #6898 filters sortby	2024-07-26 12:01:46 +02:00
Carlos Satorres	1ad15869e8	refs #6898 filters select	2024-07-26 11:45:13 +02:00
Carlos Satorres	d575c3cdae	refs #6898 filters	2024-07-26 11:25:44 +02:00
Alex Moreno	21dd2e4b46	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection	2024-07-26 09:49:22 +02:00