7525-devToTest #419

Merged

alexm merged 177 commits from 7525-devToTest into test 2024-06-04 08:06:27 +00:00

Conversation 0 Commits 177 Files Changed 85 +5208 -2525

alexm commented 2024-06-04 07:54:01 +00:00

Member

Copy Link

No description provided.

alexm added 177 commits 2024-06-04 07:54:02 +00:00

e10e06bcd4 fix: refs #6942 selectable expense

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

0fd83cf435 fix: refs #6942 changes and new features

87d458e196 feat: refs #6942 vat rate total

5551781bac feat: refs #6942 to unbook

48bde504c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

c1804790a8 fix: refs #6942 vnLocation

110fd3b7a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

ec3b44654e fix: refs #6942 vnLocation

3d5674128f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

2e19194a08 fix: refs #6942 reloading

9cbffff627 fear: refs #6942 save and continue btn

862194b454 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

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

3b0d3b4998 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

92dcff6d49 fix: refs #6942 tests e2e

6ed6e4150a feat: refs #6942 test e2e tobook & toUnbook

24700b5441 fix: refs #6942 drop comments

db632f3c11 feat: refs #6942 to book summary button & reactive value

058b21669f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

0b44d08808 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

de6f85eba7 fix: refs #5186 validation

252d9e3a50 fix: refs #6942 table bottom highlight & drop isBooked field

c0a7574cbf feat: 6942 hashtag in key : value summary

15efff6855 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

9f4f268603 Merge branch '6942-improveInvoceIn' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

4216839d96 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

c0c94ff924 refs #6111 fix qtable, actions, scroll

9833a5946a refs #6111 create visible columns

0cfcda7062 refs #6111 fix visibleColumns

ce02d21b3b refs #6111 fix routeList

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

da24b4d836 refs #6111 onMounted

a78e86a0b9 refs #6111 routeList fix

2eaa184fe0 refs #6111 fix trad remove logs

40a3815e85 refs #6111 clean code fix changes

cbe44c97f6 Upcoming deliveries

adde8d1ab8 refs #6332 fix colors

a35ccb5b51 Zone Locations

77a454b590 feat: refactor template

38d7c96c00 feat: #6957: Rename FetchedTags instance tag

dba42a6001 feat: #6957: Rename FetchedTags instance tag

676e020928 fix: refs #6095 add reFfk null on search

8e4c74c1cc fix: style

49b562ca44 Merge branch 'dev' into feature/UpcomingDeliveries

24eeb5519a style updates

08e6703853 style updates

41e2462b49 Merge branch 'dev' into 6957_refactorFetechedTags

1abcb4796f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

7f880b397c fix: refs #6942 fix vncard

81998a4137 refactor: refs #6942 summary

632acc13ac style: reset poc style

7197881cdd style: reset poc style

202473158c resolve conflicts

2366ef772f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

cda9e71197 refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue

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

febc88203d style: fix color when is empty

9f517eb59d refs #6820 fix BasicData Tickets

7466d03f15 resolve conflicts

b26bf10e70 Apply searchbar logic

5f10d25630 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

a8fef3fa84 deploy: init version

99d16d215f refs #6332 colors

bacc07a4ca remove right

990e3f6e75 handle searchbar dataKey change

27c86288e1 refs #6332 color red button

ad328d9c51 Merge branch 'dev' into 6957_refactorFetechedTags

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

2094506baf fix: WorkerCalendarItem

3d6fac5338 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods

81f7e06143 refs #6332 fix calendar

0e0f649ff9 fix: 9-12

a0ca26ad9b Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods

467531d029 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

eaa0288f25 update

c1bcc0379d refs #6332 fix festive

2af4df8ded refactor: refs #6652 improved defaulter section

77e3104047 Merge branch 'dev' into 6652-improveCustomerDefaulter

f6051472ef style: color transparent when is fetive

d900ed3764 Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods

98449b0c1e refs #6111 scroll horizontal

5bddc6e04d fix: refs #6942 wip: formModel

506b5dd9c2 refs #6820 fix error front

499e104daa Merge branch 'dev' into fix-CalendarTimeControlRightPanel

2746ea7f5e Merge pull request 'remove right' (!389) from fix-CalendarTimeControlRightPanel into dev ...

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

e4ebf4c4db refs #6820 fix traduction

3db3d04bc9 fix: refs #6942 formModel & CardDescriptor

6b474bfd06 Merge branch 'dev' into 6820-changeKmroute

f4807d887f Improve node management when using search bar

3fded533a6 perf: remove local tree variable

e2b72f132c Merge remote-tracking branch 'origin/dev' into feature/ZoneLocations

1a4d8bb0c0 Merge pull request '6820-changeKmroute' (!395) from 6820-changeKmroute into dev ...

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

1347e4ec40 Handle params search on mounted

e43485f19c resolve conflict

722f1e8a03 Merge branch 'dev' into feature/ZoneLocations

7685c38fb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

566ef90cbe Merge branch 'dev' into 6652-improveCustomerDefaulter

406c095ed2 Merge pull request '#6652 improved defaulter section' (!394) from 6652-improveCustomerDefaulter into dev ...

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

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

66c841114b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6111-modsRouteList

6ea942bf31 refs #6111 fix merge, fix column

c6477af493 fix: refs #6942 formModel watch changes & invoiceInCreate

2432a37211 refs #6111 fix sticky

af32c4b79c fix: refs #6942 drop console

74f25f54ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6095-add-refFk-null-on-search

e8fed46dd1 fix: refs #6942 cardDescriptor use store if its popup or different source data

8b8033cb3d refs #6095 remove limit

4a6d09ae2c feat: refs #6942 use correct currency in InvoiceIn components

d153cc9c24 fix: refs #6942 unit tests

bfdd319366 Merge branch 'dev' into 6332-calendarMods

0dfd00dbfc Merge pull request '#6332 - calendarMods' (!391) from 6332-calendarMods into dev ...

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

6388f08ffb Merge branch 'dev' into 6111-modsRouteList

4bf4d754a2 Merge pull request 'refs #6111 fix qtable, actions, scroll' (!264) from 6111-modsRouteList into dev ...

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

a603f37144 refs #7391 fix textarea

b6638e3545 refactor: refs #6942 use router hook

75c2800e55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

f12c9d5a9e refactor: add flat

286fe0d20c Merge branch 'dev' into feature/UpcomingDeliveries

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

4b9e9a84c5 Merge pull request 'Zone Upcoming deliveries' (!381) from hyervoni/salix-front-mindshore:feature/UpcomingDeliveries into dev ...

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

d015a2e217 Merge branch 'dev' into 6957_refactorFetechedTags

515561b75d Merge pull request '#6957: FetchedTags refactor template' (!382) from 6957_refactorFetechedTags into dev ...

Reviewed-on: #382
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

4bacc8d836 Merge branch 'dev' into 6095-add-refFk-null-on-search

70e5b207e5 Merge pull request 'fix: refs #6095 add reFfk null on search' (!383) from 6095-add-refFk-null-on-search into dev ...

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

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

12016f8653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

1c76d86710 fix: refs #6942 e2e tests

f1c688af89 refs #7391 fix textarea

d460b198a4 fix: refs #6942 skip e2e tests

933e0be028 fix: refs #6942 e2e tests

ba5407310f refs #7396 fix summary

c7d7ae5373 Merge pull request 'refs #7396 fix summary' (!406) from fix-basicDataWorker into dev ...

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

f25385961b perf: 6957 change fetchedTags color

5c711c1bcb perf: 6957 add color as new shared variable

9e264e6f1f Improvement

66955dbc90 mini fix

b4331ab2d2 remove import

cedc3e5c83 Merge pull request '#6957 - Change color FetechedTags' (!407) from 6957_changeColorFetechedTags into dev ...

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

d9e6baf7e3 Move container card to parent view

66c6c857db fix: refs #6942 drop console.log

3b799efa22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

b6f11096f3 feat: refs #6942 url update

c304c68c9e Zone tree abstraction

b408e0daaf remove on selected

24c0a62edf Merge branch 'test' into dev

ef9f8b8705 refactor: refs #6942 store key & actions

30cec965e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

4162e040cc Merge branch 'dev' into 7391-defaulterMods

ff251fbb85 Merge pull request 'refs #7391 fix textarea' (!402) from 7391-defaulterMods into dev ...

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

332e96f184 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

90cebb85fe reafactor: refs #6942 use meta moduleName

df6e6c66a9 fix: refs #6942 import

f2df252a94 improvement

4c3a64bfa6 refactor: refs #6942 new summary layout

a2df7b5cf7 small fix

fcaca42b1f resolve conflicts

8d7568d9a2 Search childs fix

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

9f18c12c33 feat: refs #7494 new icons

3c0936b2ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

5aa3b14014 refactor: refs #6942 WIP summary layout

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

93fb3096e0 feat: refs #7494 new icons

d15f31de03 Merge branch 'dev' into 7494-icons

c88934218a Merge pull request 'feat: refs #7494 new icons' (!409) from 7494-icons into dev ...

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

909c545106 Merge branch 'dev' into feature/ZoneLocations

d98717f253 Merge pull request 'Zone Locations' (!390) from hyervoni/salix-front-mindshore:feature/ZoneLocations into dev ...

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

3b3e7e7e03 fix: refs #6942 tests & summary table spacing

0de575bb6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

f15e8e42b3 Merge pull request '#6942 improve invoiceIn' (!220) from 6942-improveInvoceIn into dev ...

Reviewed-on: #220
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

15223971f1 fix: defaulter icon

2cf0a717ac deploy: increase version

5799a1121b fix: searchbar redirect

f58b072964 feat: refs #6600 Add option to add comment for photo motivation

d2180c67f7 refactor: refs #6600 replace QInput to VnInput

76f858ba7e Merge pull request '#6600 create photo comment' (!416) from 6600-itemPhotoComment into dev ...

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

alexm requested review from carlossa 2024-06-04 08:02:02 +00:00

carlossa approved these changes 2024-06-04 08:02:33 +00:00

alexm merged commit e532f0d167 into test 2024-06-04 08:06:27 +00:00

alexm deleted branch 7525-devToTest 2024-06-04 08:06:27 +00:00

alexm referenced this issue from a commit 2024-06-04 08:06:29 +00:00

Merge pull request '7525-devToTest' (!419) from 7525-devToTest into test

Sign in to join this conversation.

Reviewers

No reviewers

carlossa

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#419

No description provided.