3317 Commits

All Branches

Search

Author	SHA1	Message	Date
William Buezas	cf193b07c5	Item tax	2024-04-26 08:02:17 -03:00
Javier Segarra	2deeada1f5	Merge remote-tracking branch 'origin/dev' into fix_Customer_1	2024-04-26 12:50:46 +02:00
Javier Segarra	95fded4a83	Merge branch 'dev' into feature/ItemListFilter	2024-04-26 10:49:20 +00:00
Javier Segarra	813703ce93	fix: show icons	2024-04-26 12:39:09 +02:00
Javier Segarra	71f60b82e4	fix: minor bugs use VnSubToolbar	2024-04-26 12:30:17 +02:00
Javier Segarra	94a948c933	fix: add socialName	2024-04-26 12:29:55 +02:00
Javier Segarra	be1857bb94	fix: FilterPanel menu icon	2024-04-26 11:28:09 +02:00
Javier Segarra	320f6afd17	fix: CustomerDefaulter	2024-04-26 11:27:55 +02:00
Javier Casado	8864048a56	Merge branch 'dev' into 6641-myTeamFilterClaim	2024-04-26 09:14:54 +00:00
Javier Segarra	7831a69aa9	fix: i18n and icon class	2024-04-26 11:03:40 +02:00
Javier Segarra	f169ca6778	fix: add button showPDF	2024-04-26 11:02:48 +02:00
Javier Segarra	93bbd0c222	fix: icons	2024-04-26 10:48:25 +02:00
Jon Elias	8e4429a28c	Merge branch 'dev' into 6767-deleteDivCol	2024-04-26 07:48:23 +00:00
Jon Elias	e6dc7b9862	refactor: refs #6767 fix all conflicts	2024-04-26 09:47:44 +02:00
Javier Segarra	33f3024246	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-26 07:47:24 +00:00
Alex Moreno	8f064e3338	warmFix: replace VnSelectFilter to VnSelect	2024-04-26 09:37:02 +02:00
Javier Segarra	c84555b0a3	Merge pull request 'Item botanical' (!329) from hyervoni/salix-front-mindshore:feature/ItemBotanical into dev ... Reviewed-on: #329 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:31:29 +00:00
Javier Segarra	98846bbd1a	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 09:28:40 +02:00
Javier Segarra	36e99e2c6c	fix: bug when save	2024-04-26 09:28:32 +02:00
Pablo Natek	119f625435	Merge pull request '#4988 - agencySection' (!293) from 4988-agencySection into dev ... Reviewed-on: #293 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:19:07 +00:00
Carlos Satorres	022fd6caa4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData	2024-04-26 09:17:23 +02:00
Pablo Natek	7af802c306	Merge branch 'dev' into 4988-agencySection	2024-04-26 07:07:15 +00:00
Carlos Satorres	f53caac771	Merge pull request 'refs #6976 supplier onUnmounted' (!286) from 6976-supplierConsumption into dev ... Reviewed-on: #286 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:05:00 +00:00
Javier Segarra	3c033458d3	fix: minor changes	2024-04-26 09:02:51 +02:00
Jon Elias	652e85a6e0	Merge pull request 'refactor: refs #7239 changed spanish translations' (!331) from ES_smsTranslations into master ... Reviewed-on: #331 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 07:01:39 +00:00
Carlos Satorres	e64936da72	Merge branch 'dev' into 6976-supplierConsumption	2024-04-26 07:00:22 +00:00
Carlos Satorres	966831b6d3	refs #6976 fix pr	2024-04-26 09:00:42 +02:00
Pablo Natek	cb22eaee4d	Merge branch 'dev' into 4988-agencySection	2024-04-26 06:58:53 +00:00
Carlos Satorres	dbdcc7cdf1	Merge pull request 'refs #6905 fix bank select' (!322) from 6905-fixUserPanel into dev ... Reviewed-on: #322 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 06:56:50 +00:00
Carlos Satorres	1d9f4e30af	Merge branch 'dev' into 6905-fixUserPanel	2024-04-26 06:54:39 +00:00
Javier Segarra	7f4155cde9	fix: replace VnSelectFilter by VnSelect	2024-04-26 08:54:26 +02:00
Javier Segarra	22d9d369c8	Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical	2024-04-26 08:52:05 +02:00
Javier Segarra	b3be7c8bc3	Merge pull request 'Item log' (!323) from hyervoni/salix-front-mindshore:feature/ItemLog into dev ... Reviewed-on: #323 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-26 06:37:22 +00:00
Carlos Satorres	7fd053b842	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel	2024-04-26 08:36:15 +02:00
Javier Segarra	aa87d54f57	Merge remote-tracking branch 'origin/dev' into feature/ItemLog	2024-04-26 08:34:05 +02:00
Pablo Natek	faa6d0e4fa	feat: setup commit	2024-04-26 08:33:41 +02:00
Carlos Satorres	fc275d9274	refs #6976 remove logs	2024-04-26 08:29:34 +02:00
Pablo Natek	d7bebfecb1	fix: fix translates	2024-04-26 08:28:42 +02:00
Javier Segarra	22478bed48	Merge pull request 'Item requests' (!297) from hyervoni/salix-front-mindshore:feature/ItemRequests into dev ... Reviewed-on: #297 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 06:22:11 +00:00
Jon Elias	c56b6b2dbc	refactor: better syntax	2024-04-26 08:22:08 +02:00
Javier Segarra	3116bf0944	Merge branch 'dev' into feature/ItemRequests	2024-04-26 06:21:36 +00:00
Javier Segarra	22356966e1	Merge pull request 'Customer Fix: minor bugs, layout & vnlocation' (!325) from 6590_fix_CustomerAdressEdit into test ... Reviewed-on: #325 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 06:00:41 +00:00
Jon Elias	443f4a4443	refactor: refs #7239 changed spanish translations	2024-04-26 07:49:28 +02:00
Javier Casado	433ca7c456	Merge pull request 'refs #6697 fix claimQuantity' (!317) from 6697-changeClaimQuantity into dev ... Reviewed-on: #317 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 05:33:40 +00:00
Javier Casado	6d5e0484cd	Merge branch 'dev' into 6697-changeClaimQuantity	2024-04-26 05:32:32 +00:00
Javier Casado	f76f3cae7e	Merge pull request 'refs: #6764 rename VnSelectFilter' (!320) from 6764-rename-VnSelectFilter into dev ... Reviewed-on: #320 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 05:28:01 +00:00
Pablo Natek	fff9ec4184	fix: e2e test	2024-04-25 17:17:28 +02:00
Pablo Natek	436f24b674	fix: translates	2024-04-25 17:11:30 +02:00
Pablo Natek	f29f7a55a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection	2024-04-25 16:28:30 +02:00
Pablo Natek	5544676a1b	fix: mistakes like console.log an disables	2024-04-25 16:18:06 +02:00