4930 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	c10e05396d	Merge pull request '#6943 - customer_migration_subsection' (!570) from 6943-customer_migration_subsection into dev ... Reviewed-on: #570 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-30 12:02:31 +00:00
Alex Moreno	ed110beda6	Merge branch 'dev' into 6943-customer_migration_subsection	2024-07-30 11:33:11 +00:00
Alex Moreno	ecb201edce	delete unnesessary class	2024-07-30 12:45:18 +02:00
Jorge Penadés	c306969f6a	Merge pull request 'fix: refs #6989 show entity name & default time from config table' (!576) from 6989-showClientName into dev ... Reviewed-on: #576 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-30 08:07:27 +00: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	b16f00b2e9	build: init version 2434	2024-07-30 08:38:14 +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
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	3741999fae	Merge pull request '#6891 worker tests' (!575) from fixE2e into dev ... Reviewed-on: #575 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-29 08:31:51 +00:00
Jorge Penadés	a7af5d43a2	fix: refs #6891 worker tests	2024-07-29 10:10:34 +02:00
Jorge Penadés	328c54deee	Merge pull request '#7197 fixInvoiceIn' (!466) from 7197-fixInvoiceIn into dev ... Reviewed-on: #466 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-29 07:44:04 +00: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	01c58484e2	Merge pull request 'fix: refs #7039 supplierSummary' (!574) from 7039-hotFixSupplierSummary into master ... Reviewed-on: #574 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 12:00:29 +00: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	36dd6fbe1e	Merge pull request 'fix: refs #6769 Fixes item diary' (!573) from 6769-itemDiaryFix into master ... Reviewed-on: #573 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 11:18:47 +00: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	5d42a2128e	Merge pull request 'refs #6898 filters' (!572) from hotfix-supplierMigration3 into master ... Reviewed-on: #572 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 10:14:33 +00: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
Pablo Natek	0fee90d371	Merge pull request '7401-add-option-on-descriptor-menu' (!569) from 7401-add-option-on-descriptor-menu into dev ... Reviewed-on: #569 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 08:34:48 +00:00
Alex Moreno	28e50512ba	remove console.log	2024-07-26 09:51:46 +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
Alex Moreno	026c632a4c	feat(customer): improve basicData to balance	2024-07-26 09:47:28 +02:00
Pablo Natek	81463cf129	Merge branch 'dev' into 7401-add-option-on-descriptor-menu	2024-07-26 07:46:32 +00:00
Pablo Natek	2d8eecca1c	fix: refs #7401 fix routeForm	2024-07-26 09:46:00 +02:00
Pablo Natek	ed60793381	fix: refs #7401 remove console.log	2024-07-26 09:42:53 +02:00
Pablo Natek	eae2144e1d	feat: refs #7401 add menu options	2024-07-26 09:41:47 +02:00
Alex Moreno	a96693f94c	Merge pull request 'warmFix: rollback VnRow' (!568) from warmFix_rollback_VnRow into dev ... Reviewed-on: #568 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-07-26 07:33:19 +00:00
Alex Moreno	c5927f14c3	warmFix: rollback VnRow	2024-07-26 09:27:38 +02:00
Javier Segarra	1923e83210	Merge pull request '#7648 - HOTFIX: myEntries filters' (!566) from hotfix_myEntries into master ... Reviewed-on: #566 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 05:50:35 +00:00
Javier Segarra	662ffeac0a	fix: minor changes	2024-07-26 07:44:46 +02:00
Javier Segarra	2245552dfa	Merge pull request 'Ticket expedition fix' (!567) from hyervoni/salix-front-mindshore:bugfix/TicketExpeditionFix into dev ... Reviewed-on: #567 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-26 05:39:12 +00:00
Javier Segarra	a27ac46f9f	fix: disable firstInput.focus	2024-07-26 06:21:39 +02:00
William Buezas	7432396cea	Ticket expedition initial load fix	2024-07-25 13:55:41 -03:00
Javier Segarra	1a9cdee838	fix: remove columnFilter	2024-07-25 15:12:15 +02:00
Javier Segarra	6bba14cac9	test: e2e fixed	2024-07-25 14:31:31 +02:00
Javier Segarra	ebbe6ef3b1	feat: add customfilter label	2024-07-25 12:36:16 +02:00
Javier Segarra	60708f4a6c	feat: improve qFormMixin in production environment	2024-07-25 12:36:04 +02:00
Javier Segarra	aef83b7e9a	feat: modify myentries filters	2024-07-25 12:35:47 +02:00
Alex Moreno	454c229f13	hotFix: try to fix myEntries	2024-07-25 09:53:59 +02:00
Alex Moreno	687262e78c	hotFix: try to fix myEntries	2024-07-25 09:50:30 +02:00
Alex Moreno	f0be377951	hotFix: try to fix myEntries	2024-07-24 20:52:14 +02:00