8144-devToTest_2444 #852

Merged

carlossa merged 86 commits from 8144-devToTest_2444 into test 2024-10-22 08:55:44 +00:00

Conversation 0 Commits 86 Files Changed 52 +1147 -121

alexm commented 2024-10-22 05:44:34 +00:00

Member

Copy Link

No description provided.

alexm added 86 commits 2024-10-22 05:44:34 +00:00

56af4d3736 feat: refs #7010 added packing type field in customer summary and ticket list

6d5a8cba6f refactor: refs #7010 modified customer summary table

51aae0f726 Merge branch 'dev' into 7010-AddPackingField

1c99c01d1d refactor: refs #7010 modified front

9386d648d0 Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField

1a697aa018 feat: refs #7679 #7679 add sortBy and limit

2bd004f52b perf: refs #7679 add sortBy & limit whe retrieve Autonomies

692c649b8c perf: refs #7679 #7679 improve watch

0650380b7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField

0b76d0d556 refactor: refs #7010 added function to get item packaging type

be53b466b9 Merge branch 'dev' into 7010-AddPackingField

fef875270e Merge branch 'dev' into 7679_improve_newPostcode_form

8ee4edc5d5 perf: refs #7010 customer summary packaging type field

6a1bb6d41f Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField

b93375f5a4 Merge branch 'dev' into 7010-AddPackingField

4b9588c189 refactor: refs #7825 modified worker list form to fill the field when a bank entity is created

0d31adaa4b refs #7767 check holiday

bd3de77cbd fix: changes in list and filter to fix section

33d6d529c5 Merge branch 'dev' into Fix-TicketsModule

afc52f6cea fix: changes in sale and summary

27dca7c35f Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule

73e5039ec3 refs #7986 create front

855032e4a6 refs #7986 fix front

9edf35fba2 Merge branch 'dev' into 7679_improve_newPostcode_form

801b6585e8 perf: refs #7679 change limit value

2dd3e09928 refactor: requested changes

3d9d08146c test: refs #6943 add customer test

b6bce0c2f3 Merge branch 'dev' into 7679_improve_newPostcode_form

2edeb1043e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded

0fae36c239 Merge branch 'dev' into 7679_improve_newPostcode_form

720042bed9 feat: added new filter param and refactored link colors

b225f6a4c8 refs #7767 fix contractHolidays

8258fbb91e refs #7767 remove onMounted

1a2c5c96fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto

6633e65ee2 Merge branch 'dev' into 6943_customer_spec

dfceb9403c fix: refs #7986 fix front

bc581caa4e fix: refs #7767 console remove

d416a34560 refactor: use docuware in ticket descriptor menu

cdce0771c9 Merge branch 'dev' into Fix-TicketsModule

0f84baf1a8 build: init version 24.44

af830591b3 fix: refs #7986 front fixed

3badfbcff9 Merge branch 'dev' into 7767-holidayDaysExceeded

22cc9d689d Merge pull request 'refs #7767 check holiday' (!800) from 7767-holidayDaysExceeded into dev ...

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

b4245d05fb fix: refs #7986 crudModel

15f171da0f perf: refs #7825 create bank entity

c4670b57de Merge branch 'dev' into 7825-FixCreatebankEntity

4fb3e0dadf Merge pull request '#7825: Fill the bank field when a new entity is created' (!798) from 7825-FixCreatebankEntity into dev ...

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

a30915f99e fix: refs #7986 fix operator, fix crudmodel update

cad3fddc3e fix: refs #7986 descriptor fix

e06ce4f8a4 fix: refs #7986 clean code

e0c294bce6 test(claimDevelopment): skip intermitent e2e

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

8262406eda perf: refs #6943 Remove handle term

6b9dc8f3a6 Merge branch '6943_customer_spec' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_customer_spec

4115b1b303 Merge branch 'dev' into 6943_customer_spec

70ae50a5f1 Merge branch 'dev' into 7679_improve_newPostcode_form

3cdba5dafa Merge branch 'dev' into 7986-workerMoto

c42c811444 fix: refs #7353 load on scroll end

1f4b681b5b fix: refs #7986 clean code

8bc06593c5 Merge branch '7986-workerMoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7986-workerMoto

da3364b424 Merge pull request '7986-workerMoto' (!830) from 7986-workerMoto into dev ...

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

7d78ce7781 Merge branch 'dev' into 7010-AddPackingField

5c5393db6d Merge pull request '#7010 added packing type field' (!762) from 7010-AddPackingField into dev ...

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

0c2d9e6ec6 fix: refs #7353 load on scroll end 80% zoom

2aaba93c3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fixLoadOnScroll

55f8b78eba Merge pull request 'fix: refs #7353 load on scroll end' (!841) from 7353-fixLoadOnScroll into dev ...

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

175ebbc343 feat(navBar): refs #7632 isLoading

f4caf6aecc test: refs #7632 not use hash word

64c0496f7a Merge branch 'dev' into Fix-ItemRequest

11092866b8 fix: merge conflicts

fbfb1c654a Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule

0cc1090739 Merge branch 'dev' into 7632-axios_isLoading

f2147311d3 fix(TicketBasicData_zone): refs #6233 add acls and fix get zones

2a7bebb0b6 Merge pull request 'Added new filter param and refactored link colors in item request' (!827) from Fix-ItemRequest into dev ...

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

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

d221b8e3c4 chore: refs #7632 change requests

d61c690a70 Merge pull request 'feat(navBar): refs #7632 isLoading' (!844) from 7632-axios_isLoading into dev ...

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

0afcba0b07 Merge branch 'dev' into 6233-fix_ticketBasicData_zone

fbd6633bdb Merge pull request 'fix(TicketBasicData_zone): refs #6233 add acls and fix get zones' (!847) from 6233-fix_ticketBasicData_zone into dev ...

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

cdce4d063c Merge branch 'dev' into 6943_customer_spec

76b69a7588 Merge pull request '#6943 - Customer specs' (!822) from 6943_customer_spec into dev ...

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

e5064e8a37 Merge branch 'dev' into 7679_improve_newPostcode_form

bc1a082fe1 Merge pull request '#7679 Improve NewPostCodeForm' (!787) from 7679_improve_newPostcode_form into dev ...

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

cd4b17048c Merge branch 'dev' into Fix-TicketsModule

665e84d338 Merge pull request '#7356: Changes to fix ticket section' (!806) from Fix-TicketsModule into dev ...

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

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

carlossa approved these changes 2024-10-22 06:05:00 +00:00

carlossa merged commit c799d17e19 into test 2024-10-22 08:55:44 +00:00

carlossa deleted branch 8144-devToTest_2444 2024-10-22 08:55:44 +00:00

carlossa referenced this issue from a commit 2024-10-22 08:55:45 +00:00

Merge pull request '8144-devToTest_2444' (!852) from 8144-devToTest_2444 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#852

No description provided.