5065 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	359c44dc08	Merge branch 'dev' into 7356_TicketMigration_End	2024-07-17 18:59:36 +00:00
Jon Elias	b2b613a1d4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End	2024-07-17 14:58:25 +02:00
Alex Moreno	ea5fef9d7f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-17 14:19:25 +02:00
Alex Moreno	1c006a278e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-07-17 14:19:08 +02:00
Alex Moreno	3999d93268	fix(WorkerTimeControl): url	2024-07-17 14:17:00 +02:00
Alex Moreno	725b7053f7	fix(workerTimeControl): correct request 'updateMailState'	2024-07-17 13:32:04 +02:00
Jon Elias	a544ea224b	Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End	2024-07-17 13:02:22 +02:00
Jon Elias	1e959307d8	refactor: refs #7356 fixed VnTable filters	2024-07-17 13:02:21 +02:00
Jon Elias	0d60f63771	Merge branch 'dev' into 7356_TicketMigration_End	2024-07-17 06:52:42 +00:00
Jon Elias	cb610608df	feat: refs #7356 list & weekly to VnTable and style fixes	2024-07-17 08:49:38 +02:00
Jon Elias	9e78d30a4c	Merge branch dev of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-17 07:45:24 +02:00
Alex Moreno	c253959e01	feat: customerPayments card view	2024-07-16 14:08:03 +02:00
Alex Moreno	3cd185360b	fix: columns style	2024-07-16 14:03:14 +02:00
Javier Segarra	c7c6f0f1c6	filter: vnfilterPanel	2024-07-16 13:50:16 +02:00
Javier Segarra	86a84784b1	feat: userPanel	2024-07-16 13:50:07 +02:00
Alex Moreno	90db8b403f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-16 13:15:17 +02:00
Alex Moreno	3decadc64f	Merge pull request '#6917 - inputDate_inputTime_improviments' (!552) from 6917-inputDate_inputTime_improviments into test ... Reviewed-on: #552 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-16 11:12:54 +00:00
Javier Segarra	f7135008a2	feat: entryBuys	2024-07-16 12:22:08 +02:00
Javier Segarra	ace529a4ba	feat: vnTable template	2024-07-16 12:22:01 +02:00
Javier Segarra	5fbbd27273	fat: i18n	2024-07-16 12:21:50 +02:00
Javier Segarra	d467657928	feat: myEntries	2024-07-16 12:21:36 +02:00
Alex Moreno	4f36a78681	feat: curso in start when is 00:00	2024-07-16 12:13:16 +02:00
Alex Moreno	f01e6d74f8	test: better command if is date	2024-07-16 10:42:35 +02:00
Alex Moreno	9cc11f0a28	variable	2024-07-16 10:18:28 +02:00
Alex Moreno	c13f7fe237	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inputTime_improviments	2024-07-16 10:11:50 +02:00
Alex Moreno	493081254d	feat: improve to set time	2024-07-16 10:11:27 +02:00
Javier Segarra	e921e36ce9	Merge pull request '#7353 - Monitors requested changes' (!507) from hyervoni/salix-front-mindshore:7353-MonitorsFixes into dev ... Reviewed-on: #507 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-16 07:28:55 +00:00
Javier Segarra	d2a17bc376	Merge branch 'dev' into 7353-MonitorsFixes	2024-07-16 07:28:14 +00:00
Alex Moreno	e66fe0104a	build: init version 24.32	2024-07-16 09:18:23 +02:00
Alex Moreno	62347eb54c	Merge pull request '7729-devToTest_2430' (!554) from 7729-devToTest_2430 into test ... Reviewed-on: #554 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-16 07:17:03 +00:00
Alex Moreno	4f802a4786	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-16 07:40:51 +02:00
Javier Segarra	da43760688	Merge branch 'dev' into '7353-MonitorFixes'	2024-07-15 15:00:01 +02:00
Alex Moreno	b488a013c7	fix(arrayData): reset	2024-07-15 14:55:06 +02:00
Alex Moreno	bfa61d9bea	refactor: CustomerNotifications use VnTable	2024-07-15 14:54:31 +02:00
Alex Moreno	fd11259f74	refactor: CustomerPayments use VnTable	2024-07-15 14:18:21 +02:00
Alex Moreno	81a9719207	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer	2024-07-15 13:13:24 +02:00
Alex Moreno	39bf7e55c0	fix: e2e	2024-07-15 13:11:24 +02:00
Jon Elias	94aa3bc7a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-15 12:47:59 +02:00
Jon Elias	243a8cbdc6	fix: refs #7323 fix workerTimeControl form	2024-07-15 12:42:14 +02:00
Alex Moreno	ea3effd7f4	feat: VnInputDate & VnInputTime improviments	2024-07-15 12:33:58 +02:00
Alex Moreno	1ccf515509	fix: editable columns	2024-07-15 12:33:33 +02:00
Javier Segarra	a0b6455b4c	Merge pull request 'Ticket advance filter' (!533) from hyervoni/salix-front-mindshore:feature/TicketAdvanceFilter into dev ... Reviewed-on: #533 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-15 09:54:06 +00:00
Javier Segarra	be86b69079	fix: ticket menu order and i18n	2024-07-15 11:53:10 +02:00
Javier Segarra	5d58676288	Merge branch 'dev' into feature/TicketAdvanceFilter	2024-07-15 09:31:22 +00:00
Javier Segarra	9c6722a6fd	Merge pull request 'Ticket Dms' (!495) from hyervoni/salix-front-mindshore:feature/TicketDms into dev ... Reviewed-on: #495 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-15 09:30:57 +00:00
Javier Segarra	8ea1fb6793	Merge branch 'dev' into feature/TicketDms	2024-07-15 09:30:10 +00:00
Javier Segarra	c56610515c	Merge branch 'dev' into TicketDms	2024-07-15 11:29:27 +02:00
Pablo Natek	85a32a6029	Merge pull request '7129-finishMigration' (!549) from 7129-finishMigration into dev ... Reviewed-on: #549 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-15 09:26:43 +00:00
Pablo Natek	35a165b9f3	Merge branch 'dev' into 7129-finishMigration	2024-07-15 09:25:52 +00:00
Javier Segarra	3eba0a234b	Merge pull request 'Sale tracking' (!514) from hyervoni/salix-front-mindshore:feature/SaleTracking into dev ... Reviewed-on: #514 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-15 09:24:35 +00:00