7131 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	696c9ca9b3	fix: solve conflicts with stockBought	2024-10-01 11:40:29 +02:00
Javier Segarra	27b2d0232c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev	2024-10-01 11:35:14 +02:00
Jon Elias	90ce9b2cd3	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-10-01 11:32:17 +02:00
Jon Elias	de01dda2ed	refactor: refs #7884 modified icon color	2024-10-01 11:32:15 +02:00
Carlos Satorres	e64e6eefe3	refs #7355 add role	2024-10-01 10:35:31 +02:00
Javier Segarra	8fa82c818d	fix: remove limit	2024-10-01 10:04:56 +02:00
Javier Segarra	30767b110f	Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale	2024-10-01 10:03:42 +02:00
Javier Segarra	d6efd21db6	style: remove space between value and label	2024-10-01 10:03:39 +02:00
Javier Segarra	e9364f69d4	feat: #7679 show tooltips	2024-10-01 10:03:14 +02:00
Javier Segarra	778e6299ce	fix: solve conflicts from test to dev	2024-10-01 08:57:04 +02:00
Carlos Satorres	54015fb6bf	refs #7283 fix itemMigration	2024-10-01 08:44:08 +02:00
Jon Elias	86ab9f9540	Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale	2024-10-01 06:52:21 +02:00
Jon Elias	10bada7463	fix: deleted useless button	2024-10-01 06:52:19 +02:00
Carlos Satorres	06a1b3b409	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-10-01 06:30:19 +02:00
Javier Segarra	41acf0e1e2	feat: #7679 show country provinces	2024-10-01 00:24:34 +02:00
Javier Segarra	e7a2d3aa85	fix: refs #7354 ZonLocation filter	2024-09-30 20:20:51 +02:00
Alex Moreno	90853396ba	Merge pull request 'fix #6898 SupplierFiscalData show fields' (!778) from hotfix_supplierFiscalData into master ... Reviewed-on: #778 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 13:16:11 +00:00
Javier Segarra	03450a86fb	fix: SupplierFiscalData show data printing	2024-09-30 13:13:35 +00:00
Javier Segarra	4d4554a6ca	fix(lilium): #6898 SupplierFiscalData show fields	2024-09-30 15:11:22 +02:00
Alex Moreno	732bb0943c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-30 15:03:11 +02:00
Alex Moreno	35179695c3	Merge pull request 'fix: solve conflicts from master to test' (!777) from mergeConflicts into test ... Reviewed-on: #777 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 13:02:14 +00:00
Javier Segarra	2302e22f11	fix: solve conflicts from master to test	2024-09-30 15:00:05 +02:00
Jon Elias	3c5a5c3905	Merge branch 'dev' into Fix-TicketSale	2024-09-30 12:36:19 +00:00
Jon Elias	76a77dcee9	fix: duplicate call	2024-09-30 14:35:10 +02:00
Pablo Natek	6014ccebb4	Merge pull request '7404-fixSomeStyleIssues' (!774) from 7404-fixSomeStyleIssues into dev ... Reviewed-on: #774 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-30 12:27:42 +00:00
Pablo Natek	deb608cc96	Merge branch 'dev' into 7404-fixSomeStyleIssues	2024-09-30 12:26:37 +00:00
Javier Segarra	2d9dbbd23d	Merge pull request '#8031 - Enable notify positive when user update self data' (!750) from 8031_notify_dataSaved into dev ... Reviewed-on: #750 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 11:35:18 +00:00
Javier Segarra	7001a707b9	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-30 11:34:38 +00:00
Javier Segarra	da78edb6d2	Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues	2024-09-30 13:34:21 +02:00
Javier Segarra	48b7b879f2	Merge pull request 'Imrpove VnLocation to show less fields' (!738) from fix_8018 into master ... Reviewed-on: #738 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 11:14:30 +00:00
Javier Segarra	2812e6f456	Merge branch 'master' into fix_8018	2024-09-30 11:13:20 +00:00
Javier Segarra	d4dc12ebe3	Merge pull request '#8018 - Show fields instead null/undefined' (!737) from 8018_location_label into dev ... Reviewed-on: #737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 10:55:04 +00:00
Javier Segarra	cf509d608a	Merge branch 'dev' into 8018_location_label	2024-09-30 10:53:33 +00:00
Javier Segarra	b3c36e555f	style: refs #7404 compress spaces	2024-09-30 12:50:23 +02:00
Javier Segarra	b41026806f	style: refs #7404 compress spaces	2024-09-30 12:48:05 +02:00
Javier Segarra	cf67865b0b	feat: refs #7404 updates	2024-09-30 11:53:54 +02:00
Pablo Natek	90762f1d1c	Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues	2024-09-30 10:47:03 +02:00
Pablo Natek	7fa0a5b28c	fix: refs #7404 path name	2024-09-30 10:47:02 +02:00
Javier Segarra	63d2b06b70	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-30 08:23:12 +00:00
Pablo Natek	37d32a7934	Merge branch 'dev' into 7404-fixSomeStyleIssues	2024-09-30 08:14:44 +00:00
Pablo Natek	c815177be9	fix: refs #7404 translate and width problem	2024-09-30 10:13:39 +02:00
Pablo Natek	868e6a312f	fix: refs #7404 class name	2024-09-30 10:04:00 +02:00
Pablo Natek	cb0d3c5bca	fix: refs #7404 sticky footer and transparent header for vnTable	2024-09-30 09:46:00 +02:00
Javier Segarra	fd202f30d2	Merge branch '8018_location_label' of https://gitea.verdnatura.es/verdnatura/salix-front into 8018_location_label	2024-09-30 09:43:09 +02:00
Javier Segarra	9d7db2020b	Merge pull request '#7679 Filter data from others filters' (!769) from 7679_improve_filters into dev ... Reviewed-on: #769 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-30 07:19:30 +00:00
Javier Segarra	36838f930c	Merge pull request 'fix: onDataSaved VnTable' (!772) from fix_vnTable_onDataSaved into master ... Reviewed-on: #772 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 05:20:22 +00:00
Pablo Natek	e5eb1d7663	Merge pull request 'fix: refs #7404 revert commit prevent production access' (!771) from 7404-remove-from-test into test ... Reviewed-on: #771 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-30 05:18:36 +00:00
Pablo Natek	f005674db6	Merge branch 'test' into 7404-remove-from-test	2024-09-30 05:17:08 +00:00
Javier Segarra	8356be1ec0	fix: onDataSaved VnTable ... Habia un problema al usar this en entorno no local	2024-09-27 18:10:43 +00:00
Javier Segarra	12a452d774	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-27 18:02:24 +00:00