7806_devToTest_2332 #578

Merged

alexm merged 138 commits from 7806_devToTest_2330 into test 2024-07-30 06:14:02 +00:00

Conversation 0 Commits 138 Files Changed 197 +2327 -2541

138 Commits

Author	SHA1	Message	Date
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	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
Guillermo Bonet	7b13250a16	Merge branch 'test' into dev	2024-07-26 13:57:11 +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
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	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
William Buezas	7432396cea	Ticket expedition initial load fix	2024-07-25 13:55:41 -03:00
Carlos Satorres	fdec25dc88	Merge pull request 'refs #6898 fix' (!562) from fix-supplierMigration into dev ... Reviewed-on: #562 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-24 09:38:01 +00:00
Carlos Satorres	2e56100623	refs #6898 fix	2024-07-24 11:36:00 +02:00
Alex Moreno	8d59fc95e7	Merge pull request '#6943 fix Customer' (!526) from 6943-fixCustomer into dev ... Reviewed-on: #526 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-24 05:53:37 +00:00
Alex Moreno	4d8ba2bca0	Merge branch 'dev' into 6943-fixCustomer	2024-07-24 05:52:29 +00:00
Jon Elias	19fa5a294d	Merge pull request '#7014 refactor <module>Main.vue' (!476) from 7014-RefactorQDrawer into dev ... Reviewed-on: #476 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-24 05:17:13 +00:00
Javier Segarra	6c7509856e	Merge branch 'dev' into 7014-RefactorQDrawer	2024-07-23 21:08:56 +00:00
Javier Segarra	2c0b215023	Merge branch 'dev' into 6943-fixCustomer	2024-07-23 18:44:08 +00:00
Alex Moreno	e6709db3a2	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-23 14:46:44 +02:00
Alex Moreno	eb90fe359f	fix: customer defaulter add amount order	2024-07-23 14:03:45 +02:00
Alex Moreno	0cd42e6fac	Merge branch 'dev' into 6943-fixCustomer	2024-07-23 09:47:01 +00:00
Jon Elias	7ce05406cc	fix: refs #7014 fix tests	2024-07-23 10:55:30 +02:00
Jon Elias	67275e435e	refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality	2024-07-23 10:38:45 +02:00
Jon Elias	e76d8bf269	fix: fix conflicts	2024-07-23 09:15:06 +02:00
Jon Elias	a3256c7dc8	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-07-23 09:14:53 +02:00
Jon Elias	18dac38fb2	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-07-23 09:14:14 +02:00
Jon Elias	33ad8fcb9d	refactor: refs #7014 improved route.js & deleted RouteMain	2024-07-23 09:12:00 +02:00
Jon Elias	92b053013f	Merge branch 'dev' into 7014-RefactorQDrawer	2024-07-23 06:18:17 +00:00
Guillermo Bonet	0a431ef5cb	Merge branch 'test' into dev	2024-07-22 08:20:16 +02:00
Guillermo Bonet	76517d102d	Merge branch 'test' into dev	2024-07-19 13:09:19 +02:00
Javier Segarra	bcde62afb5	Merge branch 'dev' into 6943-fixCustomer	2024-07-19 07:41:55 +00:00
Jon Elias	30dbfc88b3	Merge pull request '#7323 End Worker migration' (!535) from 7323_WorkerMigration_End into dev ... Reviewed-on: #535 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-19 07:22:42 +00:00
Javier Segarra	55c8de78fc	perf: VnFilterPanel	2024-07-19 09:20:33 +02:00
Jon Elias	89aa987c58	Merge branch 'dev' into 7323_WorkerMigration_End	2024-07-19 06:20:57 +00:00
Jon Elias	26cdae2384	refactor: refs #7323 hidden column filter proposal	2024-07-19 08:18:41 +02:00
Alex Moreno	dbe56fa3a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-19 08:02:58 +02:00
Alex Moreno	9b1636355d	fix: customerNotifications filter	2024-07-19 07:58:34 +02:00
Jon Elias	6f6ab74220	Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-19 07:42:59 +02:00
Jon Elias	f171774605	fix: refs #7323 fixed left filter	2024-07-19 07:42:58 +02:00
Alex Moreno	3fe566796b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer	2024-07-18 14:01:28 +02:00
Jon Elias	f4fa9b3c1f	Merge branch 'dev' into 7323_WorkerMigration_End	2024-07-18 10:14:26 +00:00
Jon Elias	4a544b0b6c	Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-18 12:13:39 +02:00
Jon Elias	901a9e1f6d	fix: refs #7323 fix department & email table filter	2024-07-18 12:13:38 +02:00
Jon Elias	81121833c6	Merge pull request '#7356 End Tickets migration' (!556) from 7356_TicketMigration_End into dev ... Reviewed-on: #556 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-18 10:10:37 +00:00
Jon Elias	108375bb69	perf: refs #7356 TicketList state column	2024-07-18 12:05:10 +02:00
Jon Elias	c36e2cd3c9	Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End	2024-07-18 10:53:46 +02:00
Jon Elias	78e074d2fb	refactor: refs #7356 requested changes	2024-07-18 10:53:44 +02:00
Alex Moreno	b2520a238e	Merge branch '6943-fixCustomer' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer	2024-07-18 08:31:24 +02:00
Alex Moreno	08e170bc17	unnecessary test	2024-07-18 08:31:23 +02:00
Alex Moreno	71d6e57ea5	Merge branch 'dev' into 6943-fixCustomer	2024-07-18 06:26:19 +00:00
Alex Moreno	83596daf76	fix: customerDefaulter correct functionality	2024-07-18 08:19:08 +02:00
Javier Segarra	ac89c4f328	Merge branch 'dev' into 7323_WorkerMigration_End	2024-07-18 05:49:58 +00:00
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
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
Alex Moreno	90db8b403f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-07-16 13:15:17 +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
Javier Segarra	da43760688	Merge branch 'dev' into '7353-MonitorFixes'	2024-07-15 15:00:01 +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
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
Jon Elias	74c36a28b2	fix: workerCreate form street field to be always upperCase	2024-07-12 13:05:46 +02:00
Jon Elias	a4a9572c96	feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate	2024-07-12 09:16:32 +02:00
Javier Segarra	9077c1651b	perf: width SalesTicketsTable	2024-07-10 12:25:30 +02:00
Javier Segarra	5ad317df65	feat: VnTable SalesTicketTable	2024-07-10 12:19:17 +02:00
Javier Segarra	167ba2aed0	perf: LeftMenu show/hide	2024-07-10 12:19:05 +02:00
Javier Segarra	85f94fa1f4	feat: salesTicketTable	2024-07-10 10:41:39 +02:00
Javier Segarra	44294bb46a	feat: salesOrderTable	2024-07-10 09:56:37 +02:00
Jon Elias	d86915fdd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-10 09:42:10 +02:00
Javier Segarra	f45b623f24	feat: SalesClientTable	2024-07-10 09:25:15 +02:00
Javier Segarra	5e53a7d9a0	Merge branch 'dev' into 7353-MonitorsFixes	2024-07-09 20:41:16 +02:00
Jon Elias	960c011024	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End	2024-07-08 13:16:06 +02:00
Jon Elias	e70adce488	feat: refs #7323 fix descriptors, added VnTable and minor changes	2024-07-08 13:15:14 +02:00
Jorge Penadés	aab823abd5	feat: refs #6943 wip consumption filter	2024-07-05 17:49:09 +02:00
Jorge Penadés	f723e6f058	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer	2024-07-05 16:49:32 +02:00
Jorge Penadés	028ae0b9ac	chore: refs #7197 drop space	2024-07-05 16:44:17 +02:00
Jorge Penadés	4b709caf42	chore: refs #7197 idrop useless class	2024-07-05 16:32:49 +02:00
Jorge Penadés	a0ccb239b1	chore: refs #7197 improve form filling in Cypress tests	2024-07-05 16:25:49 +02:00
Jorge Penadés	6de7696fd1	fix: refs #7197 rollback crudModel	2024-07-05 16:00:37 +02:00
Jorge Penadés	904fbae251	fix: refs #7197 rollback crudModel	2024-07-05 15:58:08 +02:00
Jorge Penadés	3dd2745dde	fix: refs #7197 rollback crudModel	2024-07-05 15:56:57 +02:00
Jorge Penadés	9e44896305	chore: refs #7197 fix tests	2024-07-05 15:41:53 +02:00
Jorge Penadés	1efdd38cfe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-05 13:07:44 +02:00
Jorge Penadés	a11dd6a5e9	feat: refs #6943 lock grid mode	2024-07-05 13:05:57 +02:00
Jorge Penadés	04422a1052	refactor: #6943 wip use vnTable CustomerCredits	2024-07-05 12:27:02 +02:00
Jorge Penadés	d5e916ff58	refactor: wip use vnTable CustomerCredits	2024-07-05 12:25:21 +02:00
Jorge Penadés	8fbaf43b82	fix: refs #6943 drop padding-left checkbox & create wrap mode vnRow	2024-07-05 12:04:43 +02:00
Jorge Penadés	ff7f375347	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer	2024-07-05 11:49:59 +02:00
Jorge Penadés	973d069abe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-05 09:19:02 +02:00
Jorge Penadés	6fd49691d6	chore: refs #7197 remove unused import	2024-07-04 17:32:50 +02:00
Jorge Penadés	cc203022d2	chore: refs #7197 fix unit tests	2024-07-04 17:31:40 +02:00
Jorge Penadés	ccf1603d02	fix: refs #6943 prevent undefined	2024-07-04 17:05:52 +02:00
Jorge Penadés	8957141222	fix: refs #7197 responsive summary layout	2024-07-04 13:56:16 +02:00
Jorge Penadés	4d6e2e2774	chore: refs #7197 drop useless attr	2024-07-04 13:12:06 +02:00
Jorge Penadés	35fe28fff1	feat: refs #7197 add supplier activities filter option	2024-07-04 13:11:04 +02:00
Jorge Penadés	239b34eac0	chore: refs #7197 fix test	2024-07-04 12:20:47 +02:00
Jorge Penadés	976f527107	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-04 12:15:42 +02:00
Jorge Penadés	8f11c82185	feat: refs #7197 summary responsive	2024-07-03 17:14:28 +02:00
Jorge Penadés	076fbad20e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-03 14:11:29 +02:00
Jorge Penadés	b0c5f19f1d	merge dev	2024-07-03 12:31:01 +02:00
Jorge Penadés	1c5583f439	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-02 16:08:04 +02:00
Jorge Penadés	2c9c1bed09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-02 09:56:55 +02:00
Jorge Penadés	f1323ad2c4	fix: refs #7197 add url InvoiceInSearchbar	2024-07-01 14:20:30 +02:00
Jorge Penadés	f2b8217883	fix: refs #7197 rollback	2024-07-01 13:50:29 +02:00
William Buezas	e951894ac3	Fixes	2024-07-01 08:43:15 -03:00
Jorge Penadés	4ffe0894c0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-01 11:55:16 +02:00
Jorge Penadés	2cb6d21ade	feat: refs #7197 add correcting filter	2024-06-26 11:47:14 +02:00
Jorge Penadés	98bc7cbf0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-06-26 09:46:38 +02:00
Jon Elias	f596a9b5f7	fix: refs #7014 fix wagon module	2024-06-26 07:26:35 +02:00
Jon Elias	42df3894ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-06-26 07:16:42 +02:00
Jon Elias	e0cc9f0249	Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer	2024-06-25 10:28:49 +02:00
Jon Elias	e8111502c0	refactor: refs #7014 deleted main files and changed route files	2024-06-25 10:28:48 +02:00
Jon Elias	1332ef8d0b	Merge branch 'dev' into 7014-RefactorQDrawer	2024-06-25 07:51:47 +00:00
Jorge Penadés	9dc9162e8e	fix: refs #7197 amount reactivity	2024-06-25 09:50:44 +02:00
Jorge Penadés	262742fee3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-06-25 09:23:05 +02:00
Jorge Penadés	11aadddd55	refactor: refs #7197 use invoiceInSearchbar & queryParams	2024-06-24 17:00:46 +02:00
Jon Elias	9207b37419	refactor: refs #7014 refactor <module>Main.vue	2024-06-24 13:46:06 +02:00
Jorge Penadés	6677a74842	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-06-21 16:45:19 +02:00
Jorge Penadés	0a6717171c	fix: refs #7197 reactivity invoiceCorrection	2024-06-20 16:31:59 +02:00
Jorge Penadés	9e078bc074	fix: refs #7197 vat, intrastat, filter and list sections	2024-06-20 16:15:10 +02:00
Jorge Penadés	6de5033464	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-06-20 15:31:14 +02:00
Jorge Penadés	453e3f92e5	fix: refs #7197 setInvoiceInCorrecition	2024-06-19 16:02:43 +02:00