7773-testToMaster_2430 #561

Merged

alexm merged 424 commits from 7773-testToMaster_2430 into master 2024-07-23 06:24:05 +00:00

Conversation 0 Commits 424 Files Changed 180 +6937 -5058

alexm commented 2024-07-23 06:07:27 +00:00

Member

Copy Link

No description provided.

alexm added 424 commits 2024-07-23 06:07:27 +00:00

d82372c0a9 feat: refs #6449 show summaryId

a33ce5699e feat: refs #7030 translation proposal

42c58296ac refafctor: changed titles errors

5712b4789a fix: leftMenu test

ec6b54cf13 refactor: refs #7030 shelving translation

789dffe2e2 refs #6898 vntable, traductions

a803250cb9 refs #6898 fix create

35c4b423a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

f88fffa89c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

9956561e4c chore: refs #7300 wip: create reset function

4effba1580 Ticket dms

c500dd6346 Add allow import feature in VnDmsList

677e71d1a7 refactor: refs #7543 standarized descriptors

1f41f8e564 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

def8d4222b refs #6898 fix warnings

efa8791b9d refs #6898 remove comment

44ba965feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

ad950f33c6 WIP

defd26fe91 feat: define Sticky Button

a5a3945582 feat: remove button from panel

452d1000bc refactor: refs #7543 requested changes

6bf2a8c2f6 Merge branch 'dev' into 7543-StandarizeDescriptors

aaee96d6bb refs #7366 VnTable

826e8ed068 changes

0e8106af17 Resolve conflicts

95a9805a84 refs #7366 fix icons actions

99628d2cf8 refs #7366 remove code

4dd1ed3a3d refs #7366 remove summary

d0038d7e61 fix: refs #6943 removes duplicate toggle menu & fix loading animation

d3f119fa04 chore: refs #6943 check if exists

f93929de6a refs #6897 vnTable, columns

9e636c1ded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2

053059997a WIP

381a9c6d1d feat: remake vnInputDate and fix: FormModel has changes when error

ed4517183e refs #6897 fix trad, latestBuys

67f89dfde2 refs #6897 fix latestbuys

bfd8804d0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData

8b55acf667 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime

ebaaba6079 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime

8ec51ff8fd refs #6897 fix columns

ca504ffead Merge branch 'dev' into 6943-fixCustomerGreuges

2e8396d1d4 refs #6897 fix url

ec5eeaa308 fix: refs #6151 fixed filters and styles

9d03e0e487 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomerGreuges

369cb9dc75 refactor: refs #7030 added translations

8e9b238eaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations

68552b8da9 perf: add QBtn in CardDescriptor instead each ModuleDescriptor

ffdcb28522 refactor: refs #6943 initialize totalAmount as undefined

b05528ae14 refs #6897 fix latestbuys trad

93c109b70d refactor: new translations

06420fcbef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData

2d2fff1bf3 perf: Dms buttons tooltip

fe67f21206 Ticket expedition

9fe5fd2391 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2

e62e914e48 refs #6897 change image, fit component

41d6c3f07e refs #6897 fix columns trad

bf9a731bcc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData

52d6eeb976 fix: vnSearchBar e2e

7bc9042c02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime

c399d40daf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime

0ac1f53348 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData

e418a647be feat: #7648 handle NavBar

361024abe2 feat: #7648 handle LeftMenu

4bbf0f29d5 feat: #7648 handle EntryList

666cb519c5 feat: #7648 handle EntryBuys

9f68c380da Merge branch 'dev' into feature/TicketExpedition

768b619904 Sale tracking

a69235e4d4 fix: refs #7404 add e2e and fix route

f4975d1f15 fix: ticketFilter adapt VnInputDate

ad3416cb0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData

938389de2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime

8cd04bd230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route

ff420d2b04 Merge branch 'dev' into 6151-FixOrderModule

f23b7837b7 perf: Dms buttons tooltip

9d1e7363ab refs #6897 fix filters

a6bb9af1a7 refs #6897 fix filters

00321803ab refs #6897 fix filters, right filters

379d90d4c9 updates

9b7ffbf3d2 fix: fix pagination issue & skip url query param

58e87a9af6 refs #6897 remove

dc619b5275 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2

3965608a18 refs #7366 fix travelList

71900b15a6 feat: newsection and i18n

0c31755fdb refs #7366 fix summary

0dfdb1edb0 Merge branch '7648_customerEntries' into 7648_dev_customerEntries

31cd266ec7 refs #7366 fix component

ff9e78cd47 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

95a3043359 refs #6898 fix colmns subtoolbar

eeab4ed915 updates

56017645c2 refs #6898 fix search

f4a77f5030 refs #6898 fix search datakey

d2292601de feat: use VnTable

814056d920 feat: showLabelerDialog

79d986b9ec perf: remove warnings

150c446d70 fix: refs #7652 update url

269fe18a9a refactor: refs #7652 Update ClaimDescriptor and ParkingDescriptor

c3a064eeda Change dms import form ubication

72aef18c49 Add tooltip

7896e3d7f9 Merge branch 'dev' into feature/TicketDms

3f5f918684 Merge branch 'dev' into feature/TicketExpedition

cc187cfeab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7652-fixPagination

d2ac7b9932 Handle empty response of default columns from backend

fef3dfa605 Merge branch 'feature/TicketExpedition' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketExpedition

dfed211578 Fix bad git pull merge

71d6506539 remove unused filter

93d7aee127 chore: refs #7652 fix redirection

95f2ddc6a4 fix: simple i18n

5d1873808d feat: restore component

68298b9ba6 feat: rreplace eti by labeler

f2304ab6f0 feat: myEntries

aa2885e6ca feat: remove isEmployee by acl.back

956ccf93c0 perf: remove unnecessary code

cb5c33dcc9 feat: rework VnInputTime and fix VnInputDate bugs

b4f92724ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime

2ad9530b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route

c0e65ff3b7 fix: refs #7030 solve conflicts

0384123564 fix: vntable filter where

2961c813a5 build: increase version 2430

af5314dac7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime

739be5fe7c fix(VnInputDate & VnInputTime): fix clearable

1ca47c1c6c Merge branch 'dev' into vnTable-fixes

249aedeaf5 remove unnecessary translation

73ec367987 Merge pull request 'fix: vntable filter where' (!509) from vnTable-fixes into dev ...

Reviewed-on: #509
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

9179dc7432 Ticket package

cdbbd576e3 refactor: refs #6899 end invoiceOut migration with VnTable

22f42ca7f9 feat(VnTable): add slots for columns

6d12c0f00c feat(VnTable): add selected funcitionality

07f76de8b7 Merge pull request 'feat(VnTable): add slots for columns' (!512) from 6825-vnTable-column-slots into dev ...

Reviewed-on: #512
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

06f8121ede Merge branch 'dev' into 6899_InvoiceOut_End

96a3298280 Merge branch 'dev' into 7652-fixPagination

8a94701422 Merge branch 'dev' into 7648_dev_customerEntries

5c2c9d0805 perf: change field column

e70162d342 Merge branch 'dev' into 6917-inputDate_inpuTime

0dcd2a861b Merge branch 'dev' into 7543-StandarizeDescriptors

7e374c258e test: test:e2e

dbbc8a4de6 test: change user

147d17301f remove unnussed tags

5c36ad14f4 Ticket components

34ee92ac24 Small change

d5b934a239 Merge branch 'dev' into 7030-FixTranslations

0d4ba3bf27 Merge pull request '#7030 translation proposal' (!458) from 7030-FixTranslations into dev ...

Reviewed-on: #458
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors

363abb899f fix: refs #7543 fix changed descriptors

e114bd7523 Merge branch '7543-StandarizeDescriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors

d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries

f46443ee69 Merge branch 'dev' into 7648_dev_customerEntries

69a395c61f Merge pull request '7648 - CustomerView labeler' (!505) from 7648_dev_customerEntries into dev ...

Reviewed-on: #505
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

ad2265fe7c refs #7366 fix travel migration

21d5d6b986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2

467ec08f3e Merge branch 'dev' into 6151-FixOrderModule

b40e3f2c7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2

4272990a7a Merge branch 'dev' into 6917-inputDate_inpuTime

081d3dc3c3 Merge pull request '#6151 fixed filters' (!497) from 6151-FixOrderModule into dev ...

Reviewed-on: #497
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

6ac4649210 Merge branch 'dev' into 6917-inputDate_inpuTime

9e042112ff Merge pull request '#6917 - inputDate_inpuTime' (!498) from 6917-inputDate_inpuTime into dev ...

Reviewed-on: #498
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

df55246a4a Merge branch 'dev' into 7652-fixPagination

0fd53872d0 Merge pull request '#7652 fix pagination' (!503) from 7652-fixPagination into dev ...

Reviewed-on: #503
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

79694b9d0c Merge branch 'dev' into 6449-updateVnLog

61bd1eaf04 merge dev

11266b602c refactor: refs #7404 route list add table

dc9463f249 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2

a192c1e994 remove: refs #7404 remove spec

10f5323b9a refactor: refs #6899 fix negativeBases call

7914387735 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End

f8d263c347 Merge branch 'dev' into 7543-StandarizeDescriptors

cd36055ad1 Merge pull request '#7543 standardize descriptors' (!486) from 7543-StandarizeDescriptors into dev ...

Reviewed-on: #486
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

dff77277ac refs #6897 fix summary, list, inputs

7d8f9d4072 fix: refs #7404 fix create

f15fc0d6a7 Merge branch 'dev' into 7404-add-e2e-to-route

94680a6c2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

937167ce95 remove: refs #7404 remove traductions

29c4b1bcb8 Merge branch '7404-add-e2e-to-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route

352580270b refs #6989 fix reload

5b98e968ed remove: refs #7404 remove comments

27876b0bab Merge branch 'dev' into 7366-travelMigration2

6f21e165a2 Merge pull request '7404-add-e2e-to-route' (!516) from 7404-add-e2e-to-route into dev ...

Reviewed-on: #516
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

1463cc8904 Merge branch 'dev' into 7366-travelMigration2

eeaf7d00e2 Merge pull request 'refs #7366 VnTable' (!489) from 7366-travelMigration2 into dev ...

Reviewed-on: #489
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

2156692804 Merge branch 'dev' into 6449-updateVnLog

f6f5c2c085 Merge pull request '#6449 update vnLog' (!284) from 6449-updateVnLog into dev ...

Reviewed-on: #284
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

c25b04e075 improve QChebox

885decc700 Merge branch 'dev' into 6897-entryMigration2

199d8fa237 Merge pull request '6897-entryMigration2' (!504) from 6897-entryMigration2 into dev ...

Reviewed-on: #504
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

92b8104b19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

f6af1415c2 Merge branch 'dev' into 6898-supplierMigration

bb73f60994 Merge branch '6898-supplierMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration

2162315905 Merge pull request 'supplier Migration' (!456) from 6898-supplierMigration into dev ...

Reviewed-on: #456
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

109544f475 fix searchbar

553927665f Merge pull request 'fix searchbar' (!518) from fix-filterSearchbar into dev ...

Reviewed-on: #518
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

161ebdc88a refs #6898 fix

218cc47834 fix: refs #6151 searchbar

95f488ba76 chore: refs #6151 rollback

869d134591 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6151-fix-searchbar

e09569378d Merge pull request '#6151 searchbar' (!520) from 6151-fix-searchbar into dev ...

Reviewed-on: #520
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

1e7fcce26c Merge branch 'dev' into fix-supplierSearchTable

7098ec03de Merge branch 'dev' into 6943-fixCustomerGreuges

f4c34162a6 Merge pull request 'refs #6898 fix' (!519) from fix-supplierSearchTable into dev ...

Reviewed-on: #519
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

825e4497d2 feat: handle request when unauthorized

83fa9a15b9 feat: redirect to login with current path

57b38a8746 test: unit && e2e

2340aaba0b feat: list use vnTable, fix descriptor

6ad0b0994f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData

d6ff9a184b Merge branch 'dev' into 6943-fixCustomerGreuges

c2333c9455 chore: refs #7300 reset arrayData

91eb966586 Ticket photos

02ce4f2658 Small change

8baf5b1489 Apply right alignment to total and import columns

2b0b470120 fix: TicketComponent Sales column

e2054c2eb7 fix: Itemdescriptor .link

8dc1ec75b3 refactor: refs #6899 requested changes

fcc8d59cb3 Merge branch 'dev' into 6899_InvoiceOut_End

b09cbe442c Merge pull request '#6943 removes duplicate toggle menu & fix loading animation' (!491) from 6943-fixCustomerGreuges into dev ...

Reviewed-on: #491
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

fbbeb200be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7300-createResetFnArrayData

14e26f0285 Merge branch 'dev' into feature/TicketComponents

6ce03287ef perf: remove justify-center CSS class

4a01f1d930 perf: cleancode

d6cc447989 Merge branch 'dev' into feature/SaleTracking

3585f651b8 Merge pull request '#7300 create reset function' (!478) from 7300-createResetFnArrayData into dev ...

Reviewed-on: #478
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

aec43cb1c5 refactor: arrayData & VnCard refactor

47fe9b25e9 Merge branch 'dev' into VnTable_fix

699f09cfcf fix: where empty

31fa889d1f Merge branch 'VnTable_fix' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix

1b839a89f7 refactor: refs #6896 Order migration

c6ae1aec36 refs #7366 fix travel

9b1f73d30f Rename catalog item

ad61bf61fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/TicketPhotos

90fbfd38e0 refcactor: refs #6899 deleted warnings

d4f70355a7 Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End

34c877bd64 Merge branch 'dev' into 6899_InvoiceOut_End

decf33c0b7 small changes

273641cd98 Change translation

317746b1f5 hotfix: refs #6769 Changes

dc16534787 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix

12ca0faf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5

b0ddad5231 fix: fixed e2e tests

05d0322133 Merge branch 'VnTable_fix' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix

9b3bb6ce3a refactor: refactored test e2e & changed openActionsDescriptor function

a616498d1a hotfix: refs #6769 Fix

26ad3d29c7 comment e2e

90da150d63 Merge pull request 'arrayData & VnCard refactor' (!524) from VnTable_fix into dev ...

Reviewed-on: #524
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

d3ea1986d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5

f81c5d4fb0 feat: refs #7348 add checkbox

dc923ed36c refs #7366 fix descriptor

44edccb905 refactor: refs #6896 fixed create order function

9d4cfbd90c Merge branch 'dev' into feature/TicketPackages

4ebcb420c3 test: fix myEntry

d2867857fc Merge branch 'dev' into 6825_vnTable_searchBtn_sticky

df01967e2e perf: remove unnecessary import

7201fd6d21 fix: remove warnings

7fae6b92a1 hotfix: refs #6769 Minor changes

60481861ee test: fix myentry.spec.js

da3a601741 feat: move Qbtn

9aa283a612 fix: refs #6899 fix openReport call

516a0642ab Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End

0436dbae51 fix: refs #6896 fixed OrderList path

e08a7710cf Merge branch 'dev' into 6899_InvoiceOut_End

c2da14e59a perf: remove warningsCLI

3a117a9f0e feat: add ClaimSummaryAction

ae7bb14382 Merge branch 'dev' into 7366-fixTravels

53a75954d1 Merge pull request 'refs #7366 fix travel' (!529) from 7366-fixTravels into dev ...

Reviewed-on: #529
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

2f173ac2e7 refactor: refs #6896 requested changes & deleted basicData and Lines warnings

fe530aa1c6 Merge branch 'dev' into 6896_Order_End

a634d8d6e6 refactor: refs #6899 deleted comments

5112ae7e1a Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End

6a4eb9f3b8 Merge branch 'dev' into 6899_InvoiceOut_End

41052cce28 refactor: refs #6899 corrected api call

e975279e2f Merge branch '6899_InvoiceOut_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899_InvoiceOut_End

2e02027a00 fix: cardDescriptor

ab5347d302 fix: e2e and min-height vnTable

0adbd3e6d2 Ticket advance filter

3490ba1a8c Add input type number

b87e88ae7f Handle quantity empty value

356db41eac Merge branch 'dev' into feature/TicketPackages

1cfa2edc01 fix: i18n

98595e9ce4 Add ticket price

1de091da47 Initial value of quantity 0

5ec40ac6cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5

5be762d781 refactors

d2c4c65b00 fix

a303942f76 Merge branch 'dev' into feature/TicketExpedition

22faaf8186 Merge pull request 'Ticket expedition' (!499) from hyervoni/salix-front-mindshore:feature/TicketExpedition into dev ...

Reviewed-on: #499
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f87b806406 Merge branch 'dev' into feature/TicketPhotos

5a09caa3b5 Merge pull request 'Ticket photos' (!534) from hyervoni/salix-front-mindshore:feature/TicketPhotos into dev ...

Reviewed-on: #534
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

84462fe201 Merge branch 'dev' into feature/TicketComponents

869fd66840 Merge pull request 'Ticket components' (!522) from hyervoni/salix-front-mindshore:feature/TicketComponents into dev ...

Reviewed-on: #522
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

aabd575854 Merge branch 'dev' into feature/TicketPackages

9b0fb8001f Merge pull request 'Ticket packages' (!528) from hyervoni/salix-front-mindshore:feature/TicketPackages into dev ...

Reviewed-on: #528
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

500d582100 Merge branch 'dev' into 7185_logoutErrorsToast

67e6386939 Merge pull request '#7185 - Multiple toast errors when logout' (!521) from 7185_logoutErrorsToast into dev ...

Reviewed-on: #521
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

fcbe6827e3 Merge branch 'dev' into 6825_vnTable_searchBtn_sticky

a73892723f Merge pull request '#6825 - vnTable_searchBtn_sticky' (!488) from 6825_vnTable_searchBtn_sticky into dev ...

Reviewed-on: #488
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

7d90b536b0 Merge branch 'dev' into 6899_InvoiceOut_End

03d47d0145 Merge pull request '#6899 end invoiceOut migration with VnTable' (!513) from 6899_InvoiceOut_End into dev ...

Reviewed-on: #513
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

e9ab0154fe Merge branch 'dev' into feature/TicketAdvanceFilter

7393e51a94 fix: when param not exists

815a544244 Merge branch 'dev' into 7348-client-hasDailyInvoice

32d2087bce feat: #7348 restore template

41deb82174 feat(VnTable): add visibleColumns

4a8493f035 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns

b437630b62 Merge pull request 'feat: refs #7348 add checkbox' (!530) from 7348-client-hasDailyInvoice into dev ...

Reviewed-on: #530
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

4588897752 Merge branch 'dev' into 6825-visibleColumns

dd872dba3b fix: areAllChecksMarked

54ca806ad9 Merge branch '6825-visibleColumns' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns

0c84d7d0ef Merge pull request 'feat(VnTable): add visibleColumns' (!536) from 6825-visibleColumns into dev ...

Reviewed-on: #536
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

b23915ea2d fix: vnTable filter class

75b8cca2e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5

092909512a feat(ClaimSummary): add workerDescriptor in development

286fbc5aba fix: Right menu double icon

20eb26127a fix: Right menu double icon

6bd119abc3 Merge branch 'dev' into 6896_Order_End

1869e318ca Merge pull request '#6896 Order migration' (!525) from 6896_Order_End into dev ...

Reviewed-on: #525
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

6482dbad22 fix: TicketDmsImportForm

cededb54e8 Merge branch 'dev' into feature/TicketDms

3f2b675d07 feat: change ticketDms leftMenuItem position

c5c96bf51b Merge branch 'dev' into feature/SaleTracking

a9e19309ee fix warning

4eaab6f4ae fix warning when quasar build

38dd54b2f5 fix: i18n components

66a5516116 warmFix: delete params.filter url query

bb8f0b43f0 Merge branch 'dev' into 6336-migrationClaim-v5

fd9caea5c1 Merge pull request '6336-migrationClaim-v5' (!531) from 6336-migrationClaim-v5 into dev ...

Reviewed-on: #531
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

1978157a08 fix: props

24368d99b5 fix: refs #6896 fixed list & lines error

0ad62695b5 Merge pull request '#6896 fix list & lines' (!540) from 6896_Order_End into dev ...

Reviewed-on: #540
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

58a2a32027 warmFix(workerDescriptor): ?.

c10f62b717 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

36fc988df2 fix(VnTable): visible if is nullish

4b720d9b67 warmfix: ticketList add imports

93076f459c Actualizar src/pages/Ticket/TicketList.vue

f701b6387a Merge branch 'dev' into 6769-itemDiary

3b43505c3e feat: refs #6769 Requested changes

5a4be3de4a feat: refs #6769 Requested changes

b1e6e725cf feat: refs #7704 Deleted minQuantity label

fd6b395f34 feat(VnTable): order column

b3570878bf fix(VnTable): moreFilterPanel slot

d005fa3787 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable-orderColumn

3a2b27484a Merge pull request 'feat(VnTable): order column' (!545) from 6825-vnTable-orderColumn into dev ...

Reviewed-on: #545
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

8fad2f1a27 Merge branch 'dev' into 7704-itemMinimalQuantity

5232df2595 feat: claimList better support vnTable, claimSummary redesign. ...

BREAKING CHANGE: VnTable default-mode table

fdb8f92a10 typo

73049f7282 add new filter by days

a2bb9bdf32 Merge branch 'dev' into warmfix_ticketList

452db07e6d Merge pull request 'feat: claimList better support vnTable, claimSummary redesign.' (!546) from 6336-clam_list_summary_fixes into dev ...

Reviewed-on: #546
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

dc20b7f027 Merge branch 'dev' into 6769-itemDiary

b770567036 Merge branch 'dev' into warmfix_ticketList

2a03ad7aaa Merge pull request 'warmfix: ticketList add imports' (!541) from warmfix_ticketList into dev ...

Reviewed-on: #541
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

ada666a26c feat(VnTable): improve css columns

b4853af69d fix(VnTable): max-width vn-select

e1049f660e fix(VnTable): max-width vn-select

b41dc28fde fix(VnTable): check column skipped only onMounted

3e0c495f97 Merge branch 'dev' into 7704-itemMinimalQuantity

28cf9ac509 Merge pull request 'feat: refs #7704 Deleted minQuantity label' (!544) from 7704-itemMinimalQuantity into dev ...

Reviewed-on: #544
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

686bbc26bd Merge branch 'dev' into 6769-itemDiary

0794e09272 Merge pull request 'feat: refs #6769 itemDiary' (!532) from 6769-itemDiary into dev ...

Reviewed-on: #532
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

9098e63793 refactor: refs #7129 refactor with vnTable

72b86c0eec remove: refs #7129 remove console log

1d4454604b Merge branch 'dev' into 7648_myEntries_filter

a736867e6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration

79928910ca Merge branch 'dev' into 6825-improve-css

873d8ad2c3 Merge pull request 'feat(VnTable): improve css columns' (!548) from 6825-improve-css into dev ...

Reviewed-on: #548
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

7ddf84ac11 Merge branch 'dev' into 7648_myEntries_filter

c754a8c110 remove: refs #7129 remove spec

a77bf93e0d feat: create VnSelectCache and add in VnColumn

de814f9881 Merge branch 'dev' into 6825-vnSelectCache

eaea8a50f0 fix: refs #7129 fix styles

58d029c5bb fix(vnTable_order): default value

73c5e0f1f4 fix: formModelPoup defaultActions false

904acfd48f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration

9494a30ddd feat: refs #7704 Added min quantity label in catalog

3087dbf512 fix(CrudModel): onChange $index

b30da92c1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnSelectCache

bfab1ec314 useAttrs

65381e6536 perf: #7648 remove default value

20403287dd feat: scopeDays replace by daysOnward

7f7bf9c0e6 feat: remove empty locales

1e668d1fbd Merge branch 'dev' into 7648_myEntries_filter

b3d14ebeee fix: order left panel

a4afba6000 Merge branch 'dev' into 6825-vnSelectCache

9d8ed59c1c Merge pull request 'feat: create VnSelectCache and add in VnColumn' (!550) from 6825-vnSelectCache into dev ...

Reviewed-on: #550
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

dbba7589ef fix: VnBreadcrumbs return if not has matched

fea9c8b7fb Merge branch 'dev' into 7129-finishMigration

d84fd34c4b Merge branch 'dev' into 7648_myEntries_filter

3f3d0c7337 fix(claimList): claimList client column

cc8062785a Merge branch 'dev' into feature/SaleTracking

6007e0c7cc fix: refs #7129 fix e2e

9a115dac3c Merge branch '7129-finishMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-finishMigration

a4f11fb497 Merge branch 'dev' into 7129-finishMigration

a779853095 Merge branch 'dev' into 7648_myEntries_filter

e87be83585 Merge pull request '#7648 - Filter entries by days' (!547) from 7648_myEntries_filter into dev ...

Reviewed-on: #547
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

ae55983405 Merge branch 'dev' into feature/SaleTracking

3eba0a234b Merge pull request 'Sale tracking' (!514) from hyervoni/salix-front-mindshore:feature/SaleTracking into dev ...

Reviewed-on: #514
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

35a165b9f3 Merge branch 'dev' into 7129-finishMigration

85a32a6029 Merge pull request '7129-finishMigration' (!549) from 7129-finishMigration into dev ...

Reviewed-on: #549
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

c56610515c Merge branch 'dev' into TicketDms

8ea1fb6793 Merge branch 'dev' into feature/TicketDms

9c6722a6fd Merge pull request 'Ticket Dms' (!495) from hyervoni/salix-front-mindshore:feature/TicketDms into dev ...

Reviewed-on: #495
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

5d58676288 Merge branch 'dev' into feature/TicketAdvanceFilter

be86b69079 fix: ticket menu order and i18n

a0b6455b4c Merge pull request 'Ticket advance filter' (!533) from hyervoni/salix-front-mindshore:feature/TicketAdvanceFilter into dev ...

Reviewed-on: #533
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

1ccf515509 fix: editable columns

ea3effd7f4 feat: VnInputDate & VnInputTime improviments

39bf7e55c0 fix: e2e

b488a013c7 fix(arrayData): reset

4f802a4786 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

62347eb54c Merge pull request '7729-devToTest_2430' (!554) from 7729-devToTest_2430 into test ...

Reviewed-on: #554
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

493081254d feat: improve to set time

c13f7fe237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inputTime_improviments

9cc11f0a28 variable

f01e6d74f8 test: better command if is date

4f36a78681 feat: curso in start when is 00:00

3decadc64f Merge pull request '#6917 - inputDate_inputTime_improviments' (!552) from 6917-inputDate_inputTime_improviments into test ...

Reviewed-on: #552
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

1c006a278e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

5833b4d856 fix(VnTable): autoload when has url parameters

f8026dd3f6 feat: improve VnSelectCache add find by Object

bcf4f34862 Merge pull request '6825-fix_vnSelectCache_and_autoload' (!557) from 6825-fix_vnSelectCache_and_autoload into test ...

Reviewed-on: #557
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

c5903e29e8 Merge branch 'master' into test

580777af65 Deleted repeated labeler i18n

af6a20729b fix: refs #7129 fixFilters

6f959ff99c fix: refs #7129 fix filters

5f0c4fea3c feat: refs #7129 add e2e

f2b56c92c6 Merge branch 'test' into 7129-fixFilters

3ceb0771a7 fix: refs #7129 remove templates

1a091e5b5a Merge branch '7129-fixFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixFilters

a421c96e85 Merge pull request '#7129 - fixFilters' (!559) from 7129-fixFilters into test ...

Reviewed-on: #559
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

guillermo approved these changes 2024-07-23 06:18:47 +00:00

alexm merged commit 53d59ee75c into master 2024-07-23 06:24:05 +00:00

alexm deleted branch 7773-testToMaster_2430 2024-07-23 06:24:05 +00:00

alexm referenced this issue from a commit 2024-07-23 06:24:06 +00:00

Merge pull request '7773-testToMaster_2430' (!561) from 7773-testToMaster_2430 into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

Labels

Clear labels   

bug

Something is not working

  

CR / Tests passed

CR / Tests passed

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

  

Missing Tests

Missing Tests

  

wontfix

This won't be fixed

No Label

bug

CR / Tests passed

duplicate

enhancement

invalid

Missing Tests

wontfix

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix-front#561

No description provided.