7383-testToMaster #370

Merged

alexm merged 365 commits from 7383-testToMaster into master 2024-05-14 05:46:56 +00:00

Conversation 0 Commits 365 Files Changed 229 +17016 -7873

alexm commented 2024-05-13 12:31:41 +00:00

Member

Copy Link

No description provided.

alexm added 365 commits 2024-05-13 12:31:41 +00:00

6baaebf6bd WIP

c7b60346e9 WIP

d12fa85d73 WIP

7ff8bc642e WIP

522b01b293 WIP

fc5d858bf1 WIP

65da9a3e69 resolve conflicts

d20828ac7c remove console.logs

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

f1faf18523 General improvements

6f97ee1aeb improvements

71a4a20f20 Disable text area when is not himself

5964189a83 Implement WorkerDateLabel

0a74b2a96e QCalendar implementation WIP

de912b266c Finish calendar integration

112112b069 Small change

b546b63352 resolve conflicts

1fc6eed1d5 Clean props when switching between edit and create mode in WorkerTimeForm

cb238476e7 Components reubication and change calendar selected date color

6bb0d30284 Move Worker Time control componente to Card folder

772959ff81 Improve getLocales code

026588c03d WorkerTimeForm set initial data

835174612c Make value comparision not strict

f404243d63 feat(route): refs # agency add agencyList

6c39c7da97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection

cd49ebe7a6 refs #6697 fix claimQuantity

fb6a2c8097 feat: refs #4988 add agencyList and searchBar

95b19d35e7 Change form model popup buttons order

580af396d1 Change buttons group

52611beaf1 Changes in isHimSelf computed and FormPopup buttons order

7584857c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl

4fa311120d feat: refs #6480 hide if no content

dfac40adb3 feat: refs #6480 vnCard

f60670cb87 refs #7172 change vnselectfilter

14d9147cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard

904f647a5b refs #7172 fix vnSelectFilter

0cc672d75a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData

5f502c2aad #6480: POC Claims

4a0ae8aa45 Item summary

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

984539b70f Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard

96d3073f67 Revert "Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard" ...

This reverts commit 984539b70f, reversing
changes made to d7ab6e8a02.

edf75c8cdd feat: refs #6480 check if hasContent or slots

bfa9dc9634 feat: refs #6480 include drawer

170747371a fix: refs #6480 css

ad8007fe6b refs #6641 add checkbox

98f273cb93 WIP

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

b5aae63e15 refs #6976 supplier onUnmounted

f72ea07b09 WIP

0006761201 Use black background on WorkerDateLabel

c4a8127a5b Add toggle right drawer button

9283b190b0 Differentiate manual chips

6019c7f7b2 Add remove chip button only if is manual

ee80b1d617 refs #6976 changes table

4d418c9cb7 Pull new traduction yml files and add translations

92429295cd more translations

5f46ad225e Fix genus and specie value

2699040f0e Item request view

9c7c98d64d Merge with dev

fcce2b5070 Add filter

00dfa171b0 WIP

c65c09c39c feat(agency): refs #4988 add agency router and sections

5664ec1313 WIP

51eba2ea77 Add calendar wrapper

1577fb701b remove unused span

a808491c5e use the color of calendar background for the border of panel card

256461a5bb Change current day colors

c82f4652f5 Move capitalize header week day to wrapper

e36949ad07 resolve conflicts

813bab4e9d manage QCalendar customization classes from wrapper

8e6538b369 Item request view

df2760ef60 Add dense attr to inputs

ba2499db9d resolve conflicts

da06e7bc87 WIP

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

2903c6a2bf table adjustments

5addd0056d Add filter panel

ace55c554f refactor: refs #6899 corrected Lilium styles and functionalities

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

90ed6ad09a fix: refs #6480 drop secondary acroos

75975b631e feat: refs #6480 include SearchBar into VnCard

3f8cafd201 style: refs #6899 fixed style

75dc81eba7 add column filters

f8da680e98 feat: refs #6480 setArrayData

b52b70041c resolve pnpm lock conflicts and change some colors

5f01e5c705 change es translations

246944d2a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard

7165e48bff Add states translations

dfdfb6ec93 feat: refs #6480 locale

a3cc6ed95b Add filter dates tooltip

6c4901076f Apply ItemsFilterPanel to EntryLatestBuys

6021e1e4ce refactor: refs #6899 changed comercial value in negativeBases table

988fd1f449 Merge branch 'dev' into 6899-endInvoiceOutMigration

9887d59808 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard

ff36f82333 fix: refs #6480 disable popup on no observe changes

b352dcde21 fix: refs #6480 summary data-key

de0468bb99 fix: refs #6480 summary reactivity

bd01fcdd88 Merge branch 'dev' into 7190_renewTokenMultimedia

2450d5bf7a reafacto: refs #6480 slots

3fb155e697 fix: refs #6480 reactivity

fb26219354 refs #7190 feat: useTokenConfig

aecea5f273 refs #7190 feat: renewToken

e38b53ca25 fix: refs #6480 reactive descriptor

b22d54f490 WIP

c3db9e17a8 fix: refs #6480 reactive summary

da6e121137 refactor: refs #6480 use VnCard

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

7a4f975cc9 fix: refs #6480 fix warning

cfe03aeffa Merge branch 'dev' into 6899-endInvoiceOutMigration

3f5c711fa1 Improvements

9212e53905 resolve conflicts

d5832eaf41 improvement

2b24e18f75 FEAT: SETiNTERVAL WITH RENEWpERIOD

5a588ead87 Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia

3c2f281e0a Merge branch 'dev' into 6899-endInvoiceOutMigration

ab61a68f28 refactor: refs #6899 moved css to app.scss

3b8761dc7c refactor: refs #6899 moved css to app.scss

d2ec47fe1c refs #6976 total Stems

6b4cb4ed12 feat: refs #4988 add agency section

43aadd4fc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection

dd74c7d507 refactor: refs #7239 changed translations

2e493258fd Merge branch 'dev' into 7239-changeTranslations

78561c5f42 Item types

1398a146ff Change restOfData to restOfItem

2105d7870b Refactor isBigger and isLower

dce48b536d Change in newPrice assign

e11625e05f set columns default attrs to avoid repeating code

663c093a00 feat: refs #4988 agency e2e

4ddcbaeacd refactor: refs #7239 fixed errors

87ce1f0217 Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations

781e863aca Merge branch 'dev' into 7239-changeTranslations

74eec098ac Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia

6018d51642 perf: #7190 remove comments

04fe9330d4 fix: #7190 tests

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

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

62c66ff952 Merge branch 'dev' into 7190_renewTokenMultimedia

5cce1df708 refs #6976 fix supplierConsumption

1c137bea4d deploy: refs #7253 init version 2420

fe600d9318 refactor: refs #7239 requested changes

f21fcc8959 Merge branch '7239-changeTranslations' of https://gitea.verdnatura.es/verdnatura/salix-front into 7239-changeTranslations

948440ebc4 fix: slow test on skipped comment all test

ecbde3a536 Merge pull request 'fix: slow test on skipped comment all test' (!316) from fixSlowTest into dev ...

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

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

02637556fb Merge branch 'dev' into 7239-changeTranslations

c99a7bed22 Merge pull request 'refactor: refs #7239 changed translations' (!311) from 7239-changeTranslations into dev ...

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

54f9cf36c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard

f9a88ea8c2 fix: refs #6480 fix workerCard

f8c238f443 fix: refs #6480 fix workerCard

c8b08b9e2d fix: refs #6480 fix workerCard

7f07b9780c refs: #6764 rename VnSelectFilter

c621ccb5a6 refs #7113 fix test

bfb7dfb472 Merge branch 'dev' into feature/WorkerTimeControl

9a78b8ac3b Merge branch 'dev' into feature/ItemRequests

f959b5dc37 Merge branch 'dev' into 7190_renewTokenMultimedia

b7ba664e45 WIP

81a630d6cd Add more translations

4f475a045d Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests

4396f7d6ba Fill thumb_down icon on hover

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

672bc9ca9d Change form model popup buttons order

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

7dd8835716 Merge pull request 'refs #6551 feature/WorkerTimeControl' (!254) from hyervoni/salix-front-mindshore:feature/WorkerTimeControl into dev ...

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

f3b5bf7f4b Item list filter

42fe189e9f Add module name in Item router file

5dc41f8236 Merge branch 'dev' into feature/ItemFamily

861e4385bb Merge branch 'dev' into feature/ItemsSummary

1ea74d0639 fix: minor updates

716dd4e28f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter

1206cc2292 warmFix: duplicated button after merge min

bf08ca7655 Merge branch 'dev' into 7190_renewTokenMultimedia

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

77798cbae4 Merge pull request '#6480 improve Card' (!271) from 6480-improveCard into dev ...

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

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

39685c222f refactor: refs #6899 fixed css and minor changes

de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices

bda232f1c3 Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!304) from 6899-endInvoiceOutMigration into dev ...

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

8bb3d48c81 Merge branch 'dev' into feature/FixedPrices

331484dbc7 Merge pull request 'Item Fixed prices' (!307) from hyervoni/salix-front-mindshore:feature/FixedPrices into dev ...

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

6391ed1360 refs #6697 changes claim

5103b5b365 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6697-changeClaimQuantity

c9ab98471e refs #6697 fix changes

a555d11663 fix: #7190 test

1c3660050b Merge branch 'dev' into 7190_renewTokenMultimedia

391ca36764 fix conflicts

6961a048e5 refs #6905 fix bank select

f4eb14f487 feat: i18n Clone

299838bfa5 Merge branch 'dev' into feature/ItemsSummary

e65ffb63c9 Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests

51b432dfd0 fix icon

e6c9a692f5 feat moduleName

dcb06918dd Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily

e1f50f5daf fix: minorchanges

726699bbc5 Item log

a6ebe9cf19 Item barcode

84a9dc8319 Fix ItemDescriptor labels

969087a347 Remove unused things

aa58838ad7 refs: #6764 rename VnSelect

4b3df372cd refs: #6764 fixConflicts

c6c925a105 refs: #6764 fixConflicts

68dba82763 Merge branch 'dev' into feature/ItemListFilter

13d38c8b02 refactor: refs #6764 fix conflicts

897ddc44fe fix: search bar

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

d490d85ecc feat: agencyWorkCenter

914c3fb169 fix: test and console log

a3ba68e865 fix: test

f2d0d3f3ff fix: remove test from vitest

da89f4d731 Merge pull request 'Items summary' (!281) from hyervoni/salix-front-mindshore:feature/ItemsSummary into dev ...

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

7875df4b02 refs #6697 fix tfront

166d678d0b Merge branch 'dev' into feature/ItemRequests

08a40e13f9 Merge branch 'dev' into 6764-rename-VnSelectFilter

fb4170d83d fix Double request when update row

e5eb3010a3 fix: Change method because X updates row

823351f76d Item botanical

5544676a1b fix: mistakes like console.log an disables

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

436f24b674 fix: translates

fff9ec4184 fix: e2e test

f76f3cae7e Merge pull request 'refs: #6764 rename VnSelectFilter' (!320) from 6764-rename-VnSelectFilter into dev ...

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

6d5e0484cd Merge branch 'dev' into 6697-changeClaimQuantity

433ca7c456 Merge pull request 'refs #6697 fix claimQuantity' (!317) from 6697-changeClaimQuantity into dev ...

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

3116bf0944 Merge branch 'dev' into feature/ItemRequests

22478bed48 Merge pull request 'Item requests' (!297) from hyervoni/salix-front-mindshore:feature/ItemRequests into dev ...

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

d7bebfecb1 fix: fix translates

fc275d9274 refs #6976 remove logs

faa6d0e4fa feat: setup commit

aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog

7fd053b842 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel

b3be7c8bc3 Merge pull request 'Item log' (!323) from hyervoni/salix-front-mindshore:feature/ItemLog into dev ...

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

22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical

7f4155cde9 fix: replace VnSelectFilter by VnSelect

1d9f4e30af Merge branch 'dev' into 6905-fixUserPanel

dbdcc7cdf1 Merge pull request 'refs #6905 fix bank select' (!322) from 6905-fixUserPanel into dev ...

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

cb22eaee4d Merge branch 'dev' into 4988-agencySection

966831b6d3 refs #6976 fix pr

e64936da72 Merge branch 'dev' into 6976-supplierConsumption

3c033458d3 fix: minor changes

f53caac771 Merge pull request 'refs #6976 supplier onUnmounted' (!286) from 6976-supplierConsumption into dev ...

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

7af802c306 Merge branch 'dev' into 4988-agencySection

022fd6caa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData

119f625435 Merge pull request '#4988 - agencySection' (!293) from 4988-agencySection into dev ...

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

36e99e2c6c fix: bug when save

98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical

c84555b0a3 Merge pull request 'Item botanical' (!329) from hyervoni/salix-front-mindshore:feature/ItemBotanical into dev ...

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

8f064e3338 warmFix: replace VnSelectFilter to VnSelect

33f3024246 Merge branch 'dev' into 7190_renewTokenMultimedia

8864048a56 Merge branch 'dev' into 6641-myTeamFilterClaim

95fded4a83 Merge branch 'dev' into feature/ItemListFilter

2deeada1f5 Merge remote-tracking branch 'origin/dev' into fix_Customer_1

cf193b07c5 Item tax

127567898d fix: add filter panel

76cd79173c refs #7172 fix select

485e916f55 Add input focus

c1ed4ab032 fix: add exprBuilder

0d50944c2d fix: add exprBuilder

dc0f4fb40e resolve conflicts

a03049a721 fix: poc

955e196882 fix: filterPanelbug

4792485214 Translate more fields label

ad085974da remove console.log

4282463e51 Fill filter fields with user params

ce55109dd3 fix more fields label when selected

1e1c88e55c fix: reset fieldFilter.value when change model

322ad816b9 item diary

fdd088955b Merge pull request 'Item Barcode' (!333) from hyervoni/salix-front-mindshore:feature/ItemBarCode into dev ...

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

f83ef4eb4c Merge branch 'dev' into feature/ItemListFilter

4d0b9707cf Merge pull request 'feature/ItemListFilter' (!324) from hyervoni/salix-front-mindshore:feature/ItemListFilter into dev ...

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

9a840c9cee Merge branch 'dev' into feature/ItemFamily

1c435725f2 Merge branch 'dev' into feature/ItemFamily

fe22fb26fb Merge branch 'dev' into 6641-myTeamFilterClaim

e757fff4dd Merge pull request 'refs #6641 add checkbox' (!283) from 6641-myTeamFilterClaim into dev ...

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

8b55044891 feat: refs #6336 add ItemDescriptor

e3237ee4f1 refs #7172 refact VnSelect

76a1227c0e Merge branch 'dev' into 7172-fixClaimBasicData

6ae38d2611 refactor: refs #6887 pending claim changes

a78c920ec8 refs #7172 fix VnSelect

abd1f72340 Merge branch '7172-fixClaimBasicData' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData

b8380bc9c5 Merge branch 'dev' into 6887-endClaimMigration

19fcacebc9 perf: VnSearchbar

bdc5d7210f fix: remove redirect

8c3d32ec86 fix: remove VnFilterPanel inside Summary

34c8874468 fix: i18n

0e66f08674 Merge branch 'dev' into feature/ItemFamily

806f3a13d5 fix(claimLines): refs #6336 fix total calc

6c69c44dfd remove comment

1e23666943 Merge branch 'dev' into 7190_renewTokenMultimedia

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

2f55272df7 fix: WorkerDescriptor

7e2ec588c5 fix: remove Warning

0fff6cd446 perf: VnCard

761bc7724f fix: redirect

e01b988ee8 Merge branch 'dev' into feature/ItemFamily

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

b3aaf35c6a Merge branch 'dev' into 6887-endClaimMigration

a5d6ca447b fix: TicketSummary.packages label

6276c433d1 Fix exprBuilder

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

0b5aea76d9 Move translations

4be559bbe8 fix: hansChanges to false

1b619055eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemDiary

ac9063e166 Item Last entries

ccac3a54f9 move translations

8390a8b7b0 Merge branch 'dev' into 6336-claims_v4

0abc31d96d Merge pull request 'feat: refs #6336 v4' (!334) from 6336-claims_v4 into dev ...

Reviewed-on: #334
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

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

3cb662d406 Merge branch 'dev' into feature/ItemTax

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

5b15558dbf refactor: refs #6887 fixed errors

d5762f65b3 refactor: refs #6887 fixed errors

9563a1a6ed Merge branch 'dev' into 6887-endClaimMigration

a512f094d6 perf: ZoneDescriptor

38cd54a7f0 refs #6895 remove autoload

f3387cf120 fix: refs #6336 fix reload and disable button when is loading

2c4cd56102 Merge pull request 'fix: refs #6336 fix reload and disable button when is loading' (!340) from 6336-claims_v4_action into dev ...

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

2e85b9c063 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemLastEntries

0890de3771 change prop name

72ad524c68 change prop names

d2531efdd6 fix: Botanical icon

4ef7b0e17c fix: item routes order

4fdf2bacf8 fix: pvp tooltip

57736654f1 Merge branch 'dev' into feature/ItemFamily

43093cfa7d Merge pull request 'Item types' (!319) from hyervoni/salix-front-mindshore:feature/ItemFamily into dev ...

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

b530101cda Merge branch 'dev' into 7190_renewTokenMultimedia

94fc856bea Merge branch 'dev' into feature/ItemDiary

6482f5680d Merge pull request '#7190 - Renew tokenMultimedia' (!278) from 7190_renewTokenMultimedia into dev ...

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

494f0be44a Merge branch 'dev' into feature/ItemDiary

73ade834e9 Merge branch 'dev' into 7172-fixClaimBasicData

e685b58adf Merge pull request 'refs #7172 change vnselectfilter' (!274) from 7172-fixClaimBasicData into dev ...

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

f46b78131c perf: remove onMounted and reload

29b215ac2e Merge branch 'feature/ItemTax' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemTax

cd5389fb91 fix: i18n

ef63d0cb6a Merge remote-tracking branch 'origin/dev' into feature/ItemTax

e4f787f2fa Merge branch 'dev' into feature/ItemDiary

c81e20e22e Merge pull request 'Item diary' (!339) from hyervoni/salix-front-mindshore:feature/ItemDiary into dev ...

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

6a958a0807 Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

8bb5f77b57 Merge branch 'dev' into 6895-removeShelving

c1a464d9ae fix: refs #6887 fix conflicts

0fa2a99080 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration

104b159039 Merge pull request 'refs #6895 remove autoload' (!341) from 6895-removeShelving into dev ...

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

f90bd908a5 Merge branch 'dev' into feature/ItemTax

793376139c Merge branch 'dev' into 6887-endClaimMigration

120e84f439 Add condition to packing and grouping badge colors

8043d72676 Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries

7e842f2ce1 Merge pull request 'Item tax' (!337) from hyervoni/salix-front-mindshore:feature/ItemTax into dev ...

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

1675919801 fix: minor build bugs

03759d2746 Merge branch 'dev' into feature/ItemLastEntries

1a79bd6fb8 feat: zoneSummary

d069ca5095 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration

988be19b96 Merge branch 'dev' into 6887-endClaimMigration

9dcce336a8 Merge pull request 'Item last entries' (!342) from hyervoni/salix-front-mindshore:feature/ItemLastEntries into dev ...

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

9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration

e3a36c0ab1 Merge pull request 'refactor: refs #6887 pending claim changes' (!335) from 6887-endClaimMigration into dev ...

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

534f71c9e3 Merge branch 'dev' into 7113-fixClaimPhoto

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

e744077d65 Merge branch '7113-fixClaimPhoto' of https://gitea.verdnatura.es/verdnatura/salix-front into 7113-fixClaimPhoto

f6abcc6693 Merge pull request 'refs #7113 fix test' (!318) from 7113-fixClaimPhoto into dev ...

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

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

82db1fac11 Merge pull request '7336_devToTest' (!354) from 7336_devToTest into test ...

Reviewed-on: #354
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

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

0a71060f60 fix: refs #6938 workerCard

ac0ebf431f Merge pull request '#6938 wamfix workerCard' (!357) from 6938-warmfix-masterToTest into test ...

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

5e0db81a21 fix: refs #6938 conflicts

0e7c2c7118 Merge pull request '#6938-warmfix' (!359) from 6938-warmfix into test ...

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

guillermo approved these changes 2024-05-14 05:37:48 +00:00

alexm merged commit c3e425590c into master 2024-05-14 05:46:56 +00:00

alexm deleted branch 7383-testToMaster 2024-05-14 05:46:56 +00:00

alexm referenced this issue from a commit 2024-05-14 05:46:58 +00:00

Merge pull request '7383-testToMaster' (!370) from 7383-testToMaster 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#370

No description provided.