6151 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	19545ca7e6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays	2024-10-14 15:54:08 +02:00
Alex Moreno	29651b425e	Merge pull request 'refs: #6898 hotfix accounts' (!824) from 6898-fixSupplierAccounts into master ... Reviewed-on: #824 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-14 07:46:30 +00:00
Carlos Satorres	6a624b12a5	refs: #6898 hotfix accounts	2024-10-14 09:28:51 +02:00
Javier Segarra	09d40b844c	Merge pull request 'fix: Use geoFk for ZoneDeliveryPanel' (!819) from hotfix_zoneDeliveryPanel into master ... Reviewed-on: #819 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-10 08:33:58 +00:00
Jon Elias	8b68c0afeb	fix: improve geoFk for ZoneDeliveryPanel	2024-10-10 08:30:56 +00:00
Jon Elias	e58818e891	fix: Use geoFk for ZoneDeliveryPanel	2024-10-10 08:14:24 +00:00
Jorge Penadés	9c6b4f28d7	Merge pull request '#7524 use dynamic load' (!818) from 7524-hotfix-dynamicFetch into master ... Reviewed-on: #818 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-10 08:00:56 +00:00
Jorge Penadés	cfe95df9e8	fix: refs #7524 use dynamic load	2024-10-10 09:46:07 +02:00
Alex Moreno	6108a26e93	Merge pull request 'fix(VnPaginate): use default value' (!805) from hotFix_VnPaginate_offset into master ... Reviewed-on: #805 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-10-08 10:19:32 +00:00
Alex Moreno	d8a2cdc11c	Merge branch 'master' into hotFix_VnPaginate_offset	2024-10-08 10:16:14 +00:00
Carlos Satorres	0517b39c60	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front	2024-10-08 09:26:07 +02:00
Carlos Satorres	56fff55f71	fix: unnecessary property	2024-10-08 09:26:00 +02:00
Alex Moreno	bde739e7ef	Merge branch 'master' into hotFix_VnPaginate_offset	2024-10-08 06:50:16 +00:00
Javier Segarra	a0da1b3f46	Merge pull request 'HOTFIX: VnImg zoom resolution missing property' (!811) from hotfix_vnImg_zoom_resolution into master ... Reviewed-on: #811 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 12:00:55 +00:00
Javier Segarra	43da6ea1b8	Merge branch 'master' into hotfix_vnImg_zoom_resolution	2024-10-07 12:00:12 +00:00
Javier Segarra	0ed9fdd55d	fix: refs VnImg zoom resolution missing property	2024-10-07 13:02:40 +02:00
Carlos Satorres	51e8d37e4b	Merge pull request 'hotfix: routePrice null' (!810) from hotfix-routePrice into master ... Reviewed-on: #810 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 10:37:11 +00:00
Carlos Satorres	e396cd0cac	hotfix: routePrice null	2024-10-07 12:16:32 +02:00
Carlos Satorres	f22809d609	Merge pull request 'refs #6898 hotfix agency' (!808) from 6898-hotfixSupplierAgency into master ... Reviewed-on: #808 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-07 07:54:07 +00:00
Carlos Satorres	27e6dd5bf1	Merge branch 'master' into 6898-hotfixSupplierAgency	2024-10-07 07:51:02 +00:00
Carlos Satorres	5d65d3e20c	refs #6898 hotfix agency	2024-10-07 09:48:57 +02:00
Alex Moreno	5af6c89c1a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnPaginate_offset	2024-10-07 09:17:19 +02:00
Alex Moreno	9df5857b21	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-07 08:35:13 +02:00
Alex Moreno	34a40dd87c	fix(VnPaginate): use default value	2024-10-07 08:24:53 +02:00
Javier Segarra	c9467b5286	Merge pull request 'Hotfix: zones and order filters, ticket transfer' (!799) from Hotfix-ZoneOrderFilters into master ... Reviewed-on: #799 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-05 09:02:46 +00:00
Javier Segarra	04b2a4d9ce	perf: clean warnings	2024-10-05 00:31:41 +02:00
Javier Segarra	c3c2528342	feat: #7356 improve NotesSummary	2024-10-05 00:31:32 +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
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
Jon Elias	7874db1647	fix: zone delivery postcodes filter and order catalog type filter	2024-10-04 09:58:23 +02:00
Carlos Satorres	530ed4b716	refs #7355 fix searchbar	2024-10-04 08:48:36 +02:00
Jorge Penadés	ad8b72660f	fix: refs #7353 scopeDays	2024-10-03 13:37:21 +02:00
Javi Gallego	df64814c57	fix: hotfix refund invoice	2024-10-03 08:31:13 +02:00
Javi Gallego	641a25097d	fix: refundInvoice	2024-10-03 08:30:19 +02:00
Alex Moreno	58a94599a9	Merge pull request '8062-testToMaster_2' (!792) from 8062-testToMaster_2 into master ... Reviewed-on: #792 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-03 05:48:02 +00:00
Alex Moreno	8de5602564	chore: refs #8062 add changelog	2024-10-02 15:31:09 +02:00
Alex Moreno	9b90487b6a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-10-01 11:47:43 +02:00
Alex Moreno	2e9a8d9205	fix(WorkerList): add type email	2024-10-01 11:47:31 +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
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	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