7118_testToMaster_2412 #249

Merged

alexm merged 178 commits from 7118_testToMaster_2412 into master 2024-03-21 06:34:44 +00:00

Conversation 0 Commits 178 Files Changed 108 +2775 -1127

alexm commented 2024-03-20 15:54:39 +00:00

Member

Copy Link

No description provided.

alexm added 178 commits 2024-03-20 15:54:39 +00:00

e49a9f4165 feat: refs #6317 create vnCurrency

40d043036e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency

7db177ccba feat: refs #6317 create VnCurrency & useValidNumber

aa8ebe0767 Merge branch 'dev' into 6317-createVnCurrency

64b402abb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency

154f8ca477 Merge branch '6317-createVnCurrency' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency

c6e9ae2c5f fix: refs #6317 validation % fix e2e

53de842af5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency

330713f4df Merge branch 'dev' into 6317-createVnCurrency

196d8dde20 Change isRaid icon

2657034360 Corrections

1546077a92 Remove auto-load from SupplierList

d9a149dc70 Merge branch 'dev' into 6317-createVnCurrency

67eb8e82b6 WIP

e2d29f08b4 remove unnused class

ed2a7c5ee6 Add fill to lock icon

46e5503a79 save descriptor data in state

913bc7d870 Refetch descriptor data when exit EntryBasicData view

6605eea044 remove character added by accident

3e04c86000 reduce EntrySummary distance between table rows

4d2dacff6f add no results label

ac5d83b8cc Several changes

bf66d4ec99 Table column filters

fa80586fdd refs #6797 deploy: use pnpm

90bfba0290 Create global variable for table separation row

740eedbe44 Improve reactivity of card descriptor

84a0be0a5c Add new card to entry summary and fix links redirections

b092c5af6d refs 6486 commit

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

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

e372c04d35 change variable name

f048a1c820 Add reactivity to supplier descriptor icons

546df84db1 remove(claimRma): refs #6349 remove all references

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

50218d6ddf WIP

59dc1a4e38 Entry summary icon redirection condition

478f0e17b1 refs #6890 change redirect

e7e34ef21a Hide Go to summary icon when is in supplier summary view

5c8b3da33d Merge conflicts

d863248177 refs #6940 fix: use onMounted

02934037e7 refs #6940 fix: show button in Navbar

22db239ed8 Merge branch 'dev' into 6797-use-pnpm

547b5e4a76 refs #6797 package: old vitest version

f4d32e09eb Merge branch '6797-use-pnpm' of https://gitea.verdnatura.es/verdnatura/salix-front into 6797-use-pnpm

ced041ad43 refs #6797 package: fix pnpm-lock

a810209c9a Merge branch 'dev' into 6797-use-pnpm

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

e708e0cd6d refs #6980 feat: enable List, disable summary

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

f1961f07d1 CardSummary changes

9e86036f40 Change new address tooltip

fe5e448cf0 Change show summary icon condition

b0d43edbce Route summary link logic improvement

b49db55892 Merge branch 'dev' into 6349-removeRma

138e62a5e1 Merge branch 'dev' into 6797-use-pnpm

3804ec3e36 refs #6933 fetchedTags title fix

742b87c78e refs #6956 deploy: init version 2412

3c72acda37 Merge branch 'dev' into 6797-use-pnpm

097d3e5020 Merge pull request 'refs #6797 deploy: use pnpm' (!206) from 6797-use-pnpm into dev ...

Reviewed-on: #206
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

9119865ed6 Merge branch 'dev' into 6933-fetchedTagsRefact

b554577e6f Merge pull request 'refs #6933 fetchedTags title fix' (!216) from 6933-fetchedTagsRefact into dev ...

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

151d08f0bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency

cbf9bff0e3 fix: refs #6315 drop icon

a5463c4738 Merge branch '6317-createVnCurrency' of https://gitea.verdnatura.es/verdnatura/salix-front into 6317-createVnCurrency

3a1ba0bc17 fix: refs #6315 drop icon prop

4b68f5224f fix: refs #6315 drop icon prop

8523256faf fix: refs #6315 remove test patch

0de5ad0648 refs #6892 refact summary

3abcf7bb09 Merge branch 'dev' into 6349-removeRma

d0c34e3238 Merge pull request '#6317 create vnCurrency' (!181) from 6317-createVnCurrency into dev ...

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

02959ca8a5 feat(colors): refs #6486 add salix-colors

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

bc4e081bee fix(light): refs #6486 add light theme colors

be9b70d9f5 move(style): refs #6486 order style

c18a974ff8 Merge branch 'dev' into 6486-salixColors

eca0997db5 remove(style): refs #6486 remove from claimCard

ac536d27ea remove(variables). refs #6486 remove old variables

dfc7e704fe Merge branch '6486-salixColors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors

3bfbcbe7d8 fix(searchBar): refs #6486 add contrast style on light theme searchBar

04903928f5 refs #6892 fix css

fdf09710d8 refs #6892 fix checkbox

8d4ba3d729 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact

c6f315d493 refs #6892 fix checkbox css

2ba9cc990d refs #6892 fix scss

bb17be2a8a refs #6892 remove label

37baa9bcac refs #6980 remove code

e3cf34fcda Merge branch 'dev' into 6980-redirection

f8872b81c5 refs #6892 rename color

043d592037 Merge pull request 'refs #6890 change redirect' (!212) from 6980-redirection into dev ...

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

adc290da6d refs #6935 restyle card

2774c68f19 Right filter panel WIP

ff94d7e43d supplier account changes

8f9048a786 refs #6892 fix scss class

9f1abf5cde Use next tick

4484f431bf refs #6336 feat: polish claims

432280884f Resolve conflicts

5f77115716 refs #6336 feat: polish claims

bfab1918e6 Merge branch 'dev' into 6349-removeRma

6eee05249d Entry latest buys side filter panel

98cf665126 Update input date/time behaviour

38783f423a refactor: refs #6948 Bank to Accouting

da1296a8c8 feat: refs #6981 replace files

23cfe35d94 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors

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

8ad2aed994 refs #6935 perf: improve css class to handle content after

b010f8ec3e Add links to invoice out summary table

6969daf90f Revert "Add links to invoice out summary table" ...

This reverts commit b010f8ec3e.

052123ad0e Change currentSupplier variable name

ed44d96589 refs #6892 fix checkbox

65f1d56d5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6892-summaryCardRefact

912d54ea55 new bank entity add focus to bic input on mounted

8df9d43fb4 fix(toolbar): refs #6486 add colors

973a6eb58c Merge branch 'dev' into 6935-cardDescriptorRemake

4637053ab2 refs #6336 feat: useCardSize

b6d1995e16 Merge pull request '#6981 update icons version' (!225) from 6981-updateIconsVersion into dev ...

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

366ed0974a Merge branch 'dev' into 6935-cardDescriptorRemake

59d41029d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors

b4726da68e Merge pull request 'refs #6935 restyle card' (!222) from 6935-cardDescriptorRemake into dev ...

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

207b95c0e9 Merge branch 'dev' into 6892-summaryCardRefact

28b63831cc Merge branch 'dev' into 6486-salixColors

8a964c7382 Merge pull request '6892-summaryCardRefact' (!221) from 6892-summaryCardRefact into dev ...

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

b584295101 fix: refs #6486 add title to basicData

0192ec344f Merge branch '6486-salixColors' of https://gitea.verdnatura.es/verdnatura/salix-front into 6486-salixColors

1aedb3c7da Merge branch 'dev' into 6486-salixColors

759dbaa066 Merge pull request '6486-salixColors' (!219) from 6486-salixColors into dev ...

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

7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary

ed15ea4c35 feat: update cypress v13

16adef62c3 fix(buid): refs #6486 add custom variable

5c40789633 Merge pull request 'fix(buid): refs #6486 add custom variable' (!228) from 6486-fixBuild into dev ...

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

5510594b74 Merge branch 'dev' into 6336-refactor-claimSummary

aa59643cf3 Merge branch 'dev' into 6948-bank

7bfbf26606 Merge pull request '6336-refactor-claimSummary' (!227) from 6336-refactor-claimSummary into dev ...

Reviewed-on: #227
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>

800b626c99 fire searchbar search on icon click

6a105d5d38 resolve conflicts

4443edd800 fix(claimSummary) header color

fe8e4a8342 add VnSelectDialog refill to action icon

70dc144019 fix(ticket): refs #6486 add a and style to card headers

00df197653 Merge branch 'dev' into 6486-fix-TicketHeaders

d549077ffa Merge pull request 'fix(ticket): refs #6486 add a and style to card headers' (!229) from 6486-fix-TicketHeaders into dev ...

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

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

44d7f98cdc Add item descriptor

2449488927 Changes

c34fc0f79e Fix date time timezone

61f13861f8 Merge branch 'dev' into 6948-bank

d8331dcfa5 Merge pull request 'refactor: refs #6948 Bank to Accouting' (!224) from 6948-bank into dev ...

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

cd8eb4ce5c refs #6892 fix checkbox

aefc237c3f Merge pull request 'refs #6892 fix checkbox' (!230) from 6892-fixCheckbox into dev ...

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

39009d055d fix px

d189ebca28 Merge pull request 'fix px' (!231) from fixCheckbox into dev ...

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

80b2683001 Merge branch 'salix-dev' into feature/input-date-updates

13cfbf0224 Merge pull request 'Update input date/time behaviour' (!223) from hyervoni/salix-front-mindshore:feature/input-date-updates into dev ...

Reviewed-on: #223
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

baf01f6720 Merge branch 'test' into 6940_hotFix_cmrFilterPanel

e5e0d8f806 Merge branch 'dev' into 6349-removeRma

79801d0be8 Merge pull request '#6940 - Fix CmrList Filter Panel' (!209) from 6940_hotFix_cmrFilterPanel into test ...

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

3f1a731ac7 Merge pull request 'remove(claimRma): refs #6349 remove all references' (!208) from 6349-removeRma into dev ...

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

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

6baa158d43 Merge pull request 'EntryLatestBuysFilters' (!226) from hyervoni/salix-front-mindshore:EntryLatestBuysFilters into dev ...

Reviewed-on: #226
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

5011fd5f83 Create date and time utility

63f00c24d7 Merge pull request 'Create date and time utility' (!233) from hyervoni/salix-front-mindshore:feature/date-utility into dev ...

Reviewed-on: #233
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>

319295f2c2 Workers PDA

029fc043de Change title translation

dad2711311 fix translation

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

632049c13b Assign button change

bd5eb1a1c3 remove assignPDA translation

ff0b0c8131 Remove innecesary prop

9e87365bd7 Merge pull request 'Workers PDA' (!234) from hyervoni/salix-front-mindshore:feature/WorkerPDA into dev ...

Reviewed-on: #234
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers

e1cf13076f Merge pull request 'CambiosSolicitadosSuppliers' (!214) from hyervoni/salix-front-mindshore:CambiosSolicitadosSuppliers into dev ...

Reviewed-on: #214
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f26d14e875 resolve conflicts

ab8e1fdc04 Merge pull request 'CambiosSolicitadosEntries' (!201) from hyervoni/salix-front-mindshore:CambiosSolicitadosEntries into dev ...

Reviewed-on: #201
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

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

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

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

09e18dfc01 refs #7033 deploy(2412): dev to test

78e3cff397 refs #7033 deploy: init version 2414

f1d21915eb fix vnlocation.spec

4f441ad5bc Merge pull request 'HOTFIX vnlocation.spec' (!240) from hotfix_spec_vnlocation into test ...

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

robert approved these changes 2024-03-21 06:33:06 +00:00

guillermo approved these changes 2024-03-21 06:34:11 +00:00

alexm merged commit 13a0e683f4 into master 2024-03-21 06:34:44 +00:00

alexm deleted branch 7118_testToMaster_2412 2024-03-21 06:34:44 +00:00

alexm referenced this issue from a commit 2024-03-21 06:34:45 +00:00

Merge pull request '7118_testToMaster_2412' (!249) from 7118_testToMaster_2412 into master

Sign in to join this conversation.

Reviewers

No reviewers

robert

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

3 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#249

No description provided.