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

1625 Commits

Author SHA1 Message Date
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
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
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
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
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
William Buezas 7089202fe1 remove comment 2024-02-05 08:35:26 -03:00
William Buezas 584511bc62 Change EntryBuys table image proportions 2024-02-05 08:32:56 -03:00
Alex Moreno a5064e2e2f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-05 07:10:20 +01:00
Javier Segarra 289516a599 Merge pull request 'Refs #6694 fix: VnLocation placeholder i18n' (!178) from 6694_fix_placeholder into test 
Reviewed-on: verdnatura/salix-front#178
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-05 06:08:46 +00:00
Javier Segarra d49a82d10c Refs #6694 fix: VnLocation placeholder i18n 2024-02-04 15:51:54 +00:00
William Buezas 6c8e736b17 changes in entry searchbar 2024-02-02 14:08:17 -03:00
William Buezas 59c8ada077 merge with salix-front branch dev 2024-02-02 13:26:34 -03:00
William Buezas ba45f71a42 Entries several changes 2024-02-02 12:45:29 -03:00
Carlos Satorres 6a87510396 Merge pull request '#5888 - FiscalData Field location' (!174) from 5888_fiscalData_field_location into test 
Reviewed-on: verdnatura/salix-front#174
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-02-02 13:54:31 +00:00
Javier Segarra 76c98c59b9 refs #5888 test: improve tests 2024-02-02 14:52:19 +01:00
Javier Segarra 1c7ad7946e refs #5888 feat: change layout 2024-02-02 14:41:59 +01:00
Kevin Martinez ea9a9323e7 Fix feedback 2024-02-02 08:33:37 -03:00
Javier Segarra fd56f0744b refs #5888 feat: change model variable 2024-02-02 09:52:36 +01:00
Javier Segarra 13504be081 refs #5888 feat: change layout 2024-02-02 09:52:29 +01:00
Javier Segarra 6c1bad1cf5 Merge pull request '#5834 - Bic/Swift' (!169) from 5834_billingDataSwift into dev 
Reviewed-on: verdnatura/salix-front#169
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-02 07:25:50 +00:00
Alex Moreno e1e5bbccc6 Merge branch 'dev' into 5834_billingDataSwift 2024-02-02 07:18:04 +00:00
Alex Moreno 565b94e915 refs #6762 fix(supplierConsumption): subtoolbar 2024-02-02 07:38:06 +01:00
Alex Moreno 0ffff5ea1c Merge branch 'feature/SuppliersCorrections' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev 2024-02-02 07:30:57 +01:00
William Buezas 25926e6660 Add item descriptor photo class again 2024-02-01 11:38:16 -03:00
William Buezas 68260c1383 force item descriptor image upload 2024-02-01 11:35:14 -03:00
Alex Moreno 90f5d8dbf3 refs #6783 deploy: init version 2024-02-01 14:24:54 +01:00
Alex Moreno 6bfa710864 fix(VnLog): option-value 2024-02-01 14:20:46 +01:00
Alex Moreno f325e3d735 refs #6783 fix: correct version 2024-02-01 12:28:52 +01:00
William Buezas bb1ddf5900 add table rows selection 2024-01-31 21:22:32 -03:00
Carlos Satorres e6e3cafe5a Merge pull request 'refs #6677 VnSelectFilter add url prop' (!164) from 6677-urlSelectFilter into dev 
Reviewed-on: verdnatura/salix-front#164
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-31 14:42:42 +00:00
Javier Segarra f14246631a Merge branch 'dev' into 5834_billingDataSwift 2024-01-31 14:39:27 +00:00