2135 Commits

All Branches

Search

Author	SHA1	Message	Date
William Buezas	998561badd	Change customer unpaid initial date	2024-03-28 15:58:07 -03:00
William Buezas	643e068863	remove tabs in docker-compose.yml	2024-03-15 10:51:20 -03:00
Carlos Fonseca	f25e46cf08	Merge branch 'dev' into PR-CUSTOMER	2024-03-15 03:12:46 +00:00
carlosfonseca	da23ff7ca2	Correcciones generales	2024-03-14 22:11:38 -05:00
carlosfonseca	4a2a855f58	Correcciones generales customers 37	2024-03-14 11:54:22 -05:00
Javier Segarra	278ebbe070	Merge pull request 'Modulo de rutas' (!195) from hyervoni/salix-front-mindshore:feature/route-module into dev ... Reviewed-on: #195 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-14 12:44:43 +00:00
Kevin Martinez	8587d46943	Merge branch 'salix-dev' into feature/route-module ... # Conflicts: # src/pages/Route/Card/RouteSummary.vue	2024-03-14 08:05:51 -03:00
Carlos Fonseca	a3097a9223	Merge branch 'dev' into PR-CUSTOMER	2024-03-14 10:55:02 +00:00
Alex Moreno	7a75238695	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-03-14 08:16:15 +01:00
Alex Moreno	ab8e1fdc04	Merge pull request 'CambiosSolicitadosEntries' (!201) from hyervoni/salix-front-mindshore:CambiosSolicitadosEntries into dev ... Reviewed-on: #201 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-14 06:39:45 +00:00
William Buezas	f26d14e875	resolve conflicts	2024-03-13 12:57:41 -03:00
Javi Gallego	e1cf13076f	Merge pull request 'CambiosSolicitadosSuppliers' (!214) from hyervoni/salix-front-mindshore:CambiosSolicitadosSuppliers into dev ... Reviewed-on: #214 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-13 14:37:59 +00:00
Javi Gallego	4bc57d0287	Merge branch 'dev' into CambiosSolicitadosSuppliers	2024-03-13 14:37:06 +00:00
Javi Gallego	9e87365bd7	Merge pull request 'Workers PDA' (!234) from hyervoni/salix-front-mindshore:feature/WorkerPDA into dev ... Reviewed-on: #234 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-13 14:36:48 +00:00
William Buezas	4925bed845	resolve conflicts	2024-03-13 11:31:55 -03:00
William Buezas	fe737324ea	Fix unpaid bug	2024-03-13 11:14:11 -03:00
William Buezas	0f85bd25a2	Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER	2024-03-13 10:15:46 -03:00
William Buezas	41e1bad44d	Handle more watchs route changes bugs	2024-03-13 10:15:32 -03:00
carlosfonseca	1e9b3f8f0e	Solucion a comentarios 36	2024-03-13 07:41:55 -05:00
William Buezas	91bd396eab	Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER	2024-03-13 09:33:25 -03:00
William Buezas	0ba7ea86ed	Handle customer balance id null on route change exception	2024-03-13 09:33:07 -03:00
carlosfonseca	0aa5a051fb	Solucion a comentarios 35	2024-03-13 07:09:13 -05:00
Kevin Martinez	77e29a2b87	Fix tickets feedback	2024-03-12 21:26:17 -03:00
Kevin Martinez	e4553659cf	Update translation from population to city	2024-03-12 21:23:46 -03:00
carlosfonseca	38d3d49ecb	Solucion a comentarios 34	2024-03-12 16:24:27 -05:00
William Buezas	ff0b0c8131	Remove innecesary prop	2024-03-12 12:38:44 -03:00
William Buezas	bd5eb1a1c3	remove assignPDA translation	2024-03-12 11:34:38 -03:00
William Buezas	632049c13b	Assign button change	2024-03-12 11:31:32 -03:00
William Buezas	433843ea09	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers	2024-03-12 08:16:40 -03:00
William Buezas	dad2711311	fix translation	2024-03-12 08:13:27 -03:00
William Buezas	029fc043de	Change title translation	2024-03-12 08:08:20 -03:00
William Buezas	319295f2c2	Workers PDA	2024-03-11 16:53:33 -03:00
Javier Segarra	63f00c24d7	Merge pull request 'Create date and time utility' (!233) from hyervoni/salix-front-mindshore:feature/date-utility into dev ... Reviewed-on: #233 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>	2024-03-11 11:13:05 +00:00
carlosfonseca	5ff90d127b	Solucion a comentarios 33	2024-03-10 21:20:19 -05:00
Kevin Martinez	5011fd5f83	Create date and time utility	2024-03-10 21:41:36 -03:00
Javier Segarra	6baa158d43	Merge pull request 'EntryLatestBuysFilters' (!226) from hyervoni/salix-front-mindshore:EntryLatestBuysFilters into dev ... Reviewed-on: #226 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-08 12:08:56 +00:00
William Buezas	9ced305797	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into EntryLatestBuysFilters	2024-03-08 09:03:33 -03:00
Pablo Natek	3f1a731ac7	Merge pull request 'remove(claimRma): refs #6349 remove all references' (!208) from 6349-removeRma into dev ... Reviewed-on: #208 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-03-08 11:27:23 +00:00
Javier Segarra	79801d0be8	Merge pull request '#6940 - Fix CmrList Filter Panel' (!209) from 6940_hotFix_cmrFilterPanel into test ... Reviewed-on: #209 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-08 07:38:14 +00:00
Pablo Natek	e5e0d8f806	Merge branch 'dev' into 6349-removeRma	2024-03-08 07:08:36 +00:00
carlosfonseca	c844d26ccb	Solucion a comentarios 32	2024-03-07 20:45:52 -05:00
Kevin Martinez	1ab9bfefed	Centralize roadmap add stop form	2024-03-07 20:37:14 -03:00
carlosfonseca	dc3b91032c	Solucion a comentarios 31	2024-03-07 09:21:20 -05:00
Javier Segarra	baf01f6720	Merge branch 'test' into 6940_hotFix_cmrFilterPanel	2024-03-07 12:53:00 +00:00
Javier Segarra	13cfbf0224	Merge pull request 'Update input date/time behaviour' (!223) from hyervoni/salix-front-mindshore:feature/input-date-updates into dev ... Reviewed-on: #223 Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-07 11:20:07 +00:00
Kevin Martinez	80b2683001	Merge branch 'salix-dev' into feature/input-date-updates	2024-03-07 08:11:48 -03:00
Carlos Satorres	d189ebca28	Merge pull request 'fix px' (!231) from fixCheckbox into dev ... Reviewed-on: #231 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-07 10:27:58 +00:00
Carlos Satorres	39009d055d	fix px	2024-03-07 11:19:25 +01:00
Carlos Satorres	aefc237c3f	Merge pull request 'refs #6892 fix checkbox' (!230) from 6892-fixCheckbox into dev ... Reviewed-on: #230 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-03-07 08:38:05 +00:00
Carlos Satorres	cd8eb4ce5c	refs #6892 fix checkbox	2024-03-07 09:24:17 +01:00