wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
7,314 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

7314 Commits

Author SHA1 Message Date
Javier Segarra 8200b19238 Merge branch 'dev' into 6654-stickySubToolbar 2024-01-30 08:25:24 +00:00
William Buezas b440545ac9 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TravelSubmodules 2024-01-29 16:33:56 -03:00
William Buezas 6096123c6e Mejoras y cosas faltantes 2024-01-29 16:33:39 -03:00
William Buezas f911a644e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-29 12:40:25 -03:00
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms 2024-01-29 15:12:30 +01:00
Carlos Satorres fac4e0f9ca Merge pull request 'refs #6339 clipboard' (!159) from 6339-cilpboard into dev 
Reviewed-on: verdnatura/salix-front#159
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 14:09:02 +00:00
Carlos Satorres 979b95ff98 Merge branch 'dev' into 6339-cilpboard 2024-01-29 13:59:51 +00:00
Carlos Satorres a2c884cb1f Merge pull request 'refs #6733 remove alert' (!161) from 6733-workerCreate into dev 
Reviewed-on: verdnatura/salix-front#161
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 13:58:33 +00:00
William Buezas 73f5c1c636 Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/SuppliersCorrections 2024-01-29 10:58:30 -03:00
William Buezas 7eda82bf82 Improvements WIP 2024-01-29 10:57:43 -03:00
Carlos Satorres 53da9406d0 Merge branch 'dev' into 6733-workerCreate 2024-01-29 13:55:24 +00:00
Javier Segarra c5290339a1 Merge pull request 'refs #6694 VnLocation' (!154) from 6280_vnLocation into dev 
Reviewed-on: verdnatura/salix-front#154
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 13:23:01 +00:00
Javier Segarra b0083544f0 Merge branch 'dev' into 6280_vnLocation 2024-01-29 13:14:20 +00:00
Jorge Penadés 1d7316dd6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-29 14:10:58 +01:00
Carlos Satorres 5c87cfc671 refs #6677 fix e2e 2024-01-29 13:54:41 +01:00
William Buezas 5e296869a1 More improvements 2024-01-29 08:59:20 -03:00
William Buezas 7d9b34d4c5 Latest buys WIP 2024-01-29 08:39:46 -03:00
Carlos Satorres 510d9d1731 Merge pull request 'refs #6664 popup' (!153) from 6664-portesClaim into dev 
Reviewed-on: verdnatura/salix-front#153
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 11:36:42 +00:00
Alex Moreno 05c6825141 Merge branch 'dev' into 6664-portesClaim 2024-01-29 11:32:06 +00:00
Carlos Satorres afcfd645ce Merge branch '6664-portesClaim' of https://gitea.verdnatura.es/verdnatura/salix-front into 6664-portesClaim 2024-01-29 11:48:20 +01:00
Carlos Satorres 324d6da3a3 refs #6664 claimfix 2024-01-29 11:48:18 +01:00
Carlos Satorres a89748827f refs #6677 url 2024-01-29 11:42:08 +01:00
Jorge Penadés 0edfe24a85 fix: refs #6654 fix css 2024-01-29 10:25:59 +01:00
Javier Segarra 81527ce95c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6280_vnLocation 2024-01-29 10:05:47 +01:00
Alex Moreno a51b539189 Merge branch 'dev' into 6733-workerCreate 2024-01-29 08:49:58 +00:00
Alex Moreno f715c615d2 Merge pull request 'refs #6681 - PR3 - Resolve conflicts' (!166) from hyervoni-PR-3 into dev 
Reviewed-on: verdnatura/salix-front#166
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-01-29 08:29:43 +00:00
Alex Moreno 935211a71f refs #6681 try fix jenkins 2024-01-29 08:41:38 +01:00
Alex Moreno 70e912fc92 refs #6681 try fix jenkins 2024-01-29 08:38:55 +01:00
Alex Moreno 30ff6e52cc Empty commit 2024-01-29 08:30:41 +01:00
Javier Segarra a02b534cfa refs #6280 test: remove comments 2024-01-29 07:20:40 +00:00
Javier Segarra 8c9db8b3ae refs #6280 test: remove comments 2024-01-29 07:16:39 +00:00
Alex Moreno f8e7ba4dac Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-PR-3 2024-01-29 08:15:25 +01:00
Kevin Martinez 4cf9548234 Fix shelving module 2024-01-28 15:40:57 -03:00
Kevin Martinez 5449b34fa0 Fix searchbar redirection bug 2024-01-28 15:21:28 -03:00
Carlos Fonseca 5b490e1705 Merge pull request 'features/ms_158_logs_card' (#80) from features/ms_158_logs_card into dev 
Reviewed-on: hyervoni/salix-front-mindshore#80
 2024-01-27 23:56:42 +00:00
carlosfonseca 9fcbd5bc40 Se modifica las peticiones en el componente 2024-01-27 18:53:35 -05:00
William Buezas 8cc92f127c merge with dev 2024-01-27 16:10:15 -03:00
William Buezas 9757fdf70a Travel termographs and general improvements 2024-01-27 16:08:02 -03:00
William Buezas 91cd4c35e8 TravelSummary improvements 2024-01-27 13:14:02 -03:00
Carlos Fonseca 9122431588 Merge pull request 'Create child submodules feature' (#82) from feature/CreateChildSubmodulesFeature into dev 
Reviewed-on: hyervoni/salix-front-mindshore#82
 2024-01-27 15:18:19 +00:00
William Buezas e9fe4a3cb9 improvement 2024-01-27 12:14:50 -03:00
William Buezas 187cca127f merge with dev 2024-01-27 12:10:29 -03:00
William Buezas a01b80703e Create child submodules feature 2024-01-27 12:08:56 -03:00
Carlos Fonseca 221fcedb93 Merge pull request 'Se crea rutas hijas y construccion inicial de los componentes' (#81) from features/ms_160_contracts_opinion_credit into dev 
Reviewed-on: hyervoni/salix-front-mindshore#81
 2024-01-27 14:33:24 +00:00
carlosfonseca 7b3e64f129 Se crea rutas hijas y construccion inicial de los componentes 2024-01-27 09:31:49 -05:00
William Buezas cbd8af7fae In TravelList show warehouses name instead warehouseFk 2024-01-27 10:49:49 -03:00
William Buezas 21050362c8 Add .json filter to ImportBuys QFile 2024-01-26 16:45:45 -03:00
William Buezas 9d90a3808f apply item descriptor in OrderCatalogItem 2024-01-26 16:40:59 -03:00
William Buezas 4fae8e633b Create items module base structure, item descriptor and add it to supplier consumption 2024-01-26 16:36:27 -03:00
carlosfonseca 9a23bb2ed2 Se corrige comentario 39968 2024-01-26 11:08:45 -05:00