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

1659 Commits

Author SHA1 Message Date
Alex Moreno 2fb1688af4 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 17:30:47 +00:00
Alex Moreno 54e7e9c1e3 Merge pull request 'bugfix/shelving-154' (!168) from hyervoni/salix-front-mindshore:bugfix/shelving-154 into dev 
Reviewed-on: verdnatura/salix-front#168
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-08 17:28:04 +00:00
Kevin Martinez 4e42a6ab74 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/pages/Route/RouteList.vue
 2024-02-08 10:22:58 -03:00
Jorge Penadés 2eceb226a9 Merge branch '4666-invoiceInCorrection' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-08 13:30:21 +01:00
Jorge Penadés 97b8b0fa37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-08 13:30:15 +01:00
Jorge Penadés 5d90939288 Merge pull request '#6657 fixSummaryDescriptor' (!175) from 6657-fixSummaryDescriptor into dev 
Reviewed-on: verdnatura/salix-front#175
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-08 12:22:52 +00:00
Javier Segarra 242a8e25a8 refs #4466 fix: change VnSearchBar placeholder 2024-02-08 13:02:14 +01:00
Kevin Martinez a0ba4ac017 Fix LeftMenu Unit test 2024-02-08 08:32:35 -03:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +01:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable 2024-02-08 12:11:12 +01:00
Alex Moreno 04ec81e852 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 11:03:30 +00:00
Jorge Penadés 9393e05bd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6657-fixSummaryDescriptor 2024-02-08 11:57:18 +01:00
Carlos Satorres 1cc9502328 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-08 10:11:00 +01:00
Carlos Satorres 481b022786 fix(VnSelecFilter) filter 2024-02-08 10:10:43 +01:00
Carlos Satorres 10fc95c6bc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-08 09:54:42 +01:00
Carlos Satorres 78b484baeb fix(VnSelecFilter) filter 2024-02-08 09:54:17 +01:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/components/ui/VnSearchbar.vue
#	src/pages/Route/RouteList.vue
 2024-02-07 22:38:57 -03:00
Jorge Penadés 75b527207f refacto: refs #4466 replace composable name 2024-02-07 15:59:25 +01:00
Jorge Penadés e2facf3330 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 15:53:14 +01:00
Jorge Penadés 1f9aef96ca fix: refs #6657 full-width 2024-02-07 14:42:51 +01:00
Javier Segarra 56aa29b3ea Merge pull request '#5878 - FiscalData Validations' (!108) from 5858-fiscalData-validations into dev 
Reviewed-on: verdnatura/salix-front#108
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-02-07 09:31:47 +00:00
Javier Segarra 552ac49d0a Merge branch 'dev' into 5858-fiscalData-validations 2024-02-07 09:30:03 +00:00
Jorge Penadés dafa29f5b5 Merge branch '4666-invoiceInCorrection' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 10:22:31 +01:00
Jorge Penadés c162f34ee5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 10:22:23 +01:00
Javier Segarra 532c88c7c3 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-07 07:52:14 +00:00
Alex Moreno 267565a9f7 Merge pull request 'feature/EntriesCorrections' (!177) from hyervoni/salix-front-mindshore:feature/EntriesCorrections into dev 
Reviewed-on: verdnatura/salix-front#177
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-07 06:44:33 +00:00
William Buezas 225d600b52 resolve conflicts 2024-02-06 11:21:39 -03:00
Jorge Penadés a4deaf4be9 fix: refs refs #4466 console log 2024-02-06 15:13:43 +01:00
Jorge Penadés b80fbdbb6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-06 15:12:35 +01:00
Jorge Penadés b76c2a35a8 fix: refs refs #4466 tests 2024-02-06 15:11:59 +01:00
Kevin Martinez 011e15233e Fix Shelving creation 2024-02-06 10:54:06 -03:00
William Buezas 6773a9a696 Entry buys import open file explorer when clicking clip icon 2024-02-06 10:14:48 -03:00
Carlos Satorres f407446687 Merge pull request 'refs #6809 supplier UpperCase' (!182) from 6809-supplierUpperCase into dev 
Reviewed-on: verdnatura/salix-front#182
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-06 13:10:33 +00:00
Carlos Satorres 8e869a650d refs #6809 remove supplier 2024-02-06 13:26:13 +01:00
Carlos Satorres 7e8f81323a refs #6809 supplier UpperCase 2024-02-06 13:23:11 +01:00
Jorge Penadés 1883cb79ab feat: refs # create vnCurrency 2024-02-06 13:19:56 +01:00
William Buezas f6b0404cb4 multiple changes 2024-02-06 08:33:06 -03:00
Kevin Martinez 7e45486abd Add missing worker descriptor 2024-02-06 08:16:10 -03:00
Kevin Martinez 1665dbf400 Fix shelving priority field 2024-02-05 22:00:44 -03:00
William Buezas a7e653cbce Stop propagation on item descriptor cell click 2024-02-05 14:04:24 -03:00
William Buezas 02c163c5e0 small change 2024-02-05 12:50:05 -03:00
William Buezas 86bbc7cfd6 label input changes 2024-02-05 12:47:58 -03:00
William Buezas 5da5bb2047 get input events improvement 2024-02-05 12:31:57 -03:00
William Buezas 0525f5fdd8 Add ItemDescriptor to EntryBuys table 2024-02-05 12:13:21 -03:00
William Buezas 28790705ea Sort entry observation options 2024-02-05 12:04:28 -03:00
William Buezas cde41ab337 Entry notes validation 2024-02-05 11:55:22 -03:00
William Buezas 67e2130374 Adjust spacing in entry create form 2024-02-05 11:36:56 -03:00
William Buezas ddcbc5d8d7 make EditTableCellForm componente reusable 2024-02-05 09:37:29 -03:00
William Buezas 2de02723ba Abstract repetitive returns in a function 2024-02-05 09:31:12 -03:00
William Buezas 5280a4fa2d Remove '' in click.stop handle 2024-02-05 08:36:54 -03:00