8231_testToMaster_2448 #997

Merged

alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00

Conversation 2 Commits 400 Files Changed 268 +4077 -3887

alexm commented 2024-11-25 13:17:49 +00:00

Member

Copy Link

No description provided.

alexm added 397 commits 2024-11-25 13:17:49 +00:00

168201c755 refs #7283 itemList table

16b5b5d9a1 refs #7283 filter

afbcd2ebda refs #7283 item filters

daf99f4730 refs #7283 itemRequestList

b7ba8eec3d refs #7283 fix searchbar

85b030c7bc refs #7283 view summary

cce1d891fb refs #7283 fix viewSummary

339f6e810b refs #7283 fix descriptorproxy

f29d873ed4 refs #7283 fix request

86ae827fda refs #7283 clone

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

4d394a98a4 refs #7283 fix yml list basicData

f678c63043 refs #7283 request

2604441c13 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

b668d07e2d refs #7283 fetchedTags

fe78de0c47 refs #7283 fixedPrices

6ca8ede946 refs #7283 item request

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

589ee629cf refs #7283 fix conflicts

1df089cef7 refs #7283 fix itemFixedPrice

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

12a5d6cec0 fix: refs #7283 css

bae0b4de35 fix: itemBotanical

2ef56f9f97 refs #7283 fixedPrice

477984076b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

6de59c6419 refs #7283 itemRequestFixed

98be567ead Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

cd1b5f56f7 refs #7283 column-action

e4aec1773b refs #7283 itemRequest fix deny

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

268a27878c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

388036a2eb refs #7283 itemRequest fix

3bf3e8eeaa refs #7283 itemRequest fix deny

488dc74c1f refs #7283 itemRequest fix reload

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

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

04070a5a85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

04c8481b51 refs #7283 fix itemFixed

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

039a8d1d02 refs #7283 fix items

68a2ac385f refs #7283 fix items images

050d8ae208 refs #7283 fix items error get images

0fcc4fe232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

70759b8a4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

1916c6e4bf refs #7283 itemFilters

8c91cb42f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

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

db783e1538 refs #7283 item Descriptor

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

716d018121 refs #72983 fix filters

06a1b3b409 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

54015fb6bf refs #7283 fix itemMigration

55ddc8644f refs #7283 fix itemMigration list filters

419d3d2d45 fix: refs #6896 fixed module problems

d721083795 fix: filter panel

f16707756e fix: change type vnput

3d5d267345 revert: commit

787ce2fc48 feat: refs #7006 itemTypeLog added

d1c61c5aed Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

f2cb0111eb fix: refs #7283 fix image

16ef5d3722 fix: refs #7306 clean warning

608e6c717a fix: refs #7310 clean warning

58e88f605c refactor: refs #7132 delete duplicate translations' keys

8eef9c0009 refactor: refs #7132 customer's module translations

0e77d4b68f refactor: refs #7132 account's module translations

89cb9aacec refactor: refs #7132 1st wave of changes in global translations files

11bf70d76c fix: category and tags filters

fa0625aa86 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems

e5cd9d4b8f refactor: refs #7132 global translations files changed

1d41647022 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations

df3b4e7a18 refactor: refs #7132 deleted useless code

52981953f7 feat(): refs #8039 canceledError not notify

6f79275521 Merge branch 'dev' into 8039-canceledError_not_notify

9780fe596f feat: refs #8039 notify error unify

8478d89183 Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify

c69f7af390 test: refs #8039 axios not notify

29a7f3b2fe fix: refs #7283 #7283 ItemDiary subToolbar

f4a7e20c57 test: refs #6943 #6943 add comands to solve tests

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

f3a6209189 fix: refs #7283 #7283 bugs

1346a2e7fd fix: tag chips

d6b8d41b6c fix: refs #7283 #7283 ItemSummary bugs

fff3310658 fix: refs #7283 tooltips !Item

49c0d64c07 fix: refs #7283 #7283 ItemSummary bugs

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

9db1c4f721 fix: refs #8039 bad tests

0ba577ad04 Merge branch 'dev' into 6943_customer_spec

d25cdbf34e test: refs #6943 #6943 use command correctly

a732ec05fb test: refs #8039 add hasNotify and, refactor: agencyWorkCenter test

2d81cffb33 feat: refs #8039 show duplicate request in local

0c9c01b6e9 test: refs #8039 fix ZoneWarehouse e2e

cd00a3c67f test: refs #8039 fix WorkerNotification e2e

dd2dc86eea fix: refs #8039 o not handle unnecessary errors

0d3e8bb5d2 Merge branch 'dev' into 8039-canceledError_not_notify

ee31bc8262 chore: refs #8039 not required

f9392464e5 Merge branch '8039-canceledError_not_notify' of https://gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify

ae56c06628 feat: refs #7349 usa back con permisos

1bf1844c8f fix: refs #7349 dependencia no usada

3cbd294168 Merge pull request '#7943 -permisosWorker' (!855) from 7349-permisosWorker into dev ...

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

84dae53d66 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

b40af0ce7b fix: refs #7283 fix pr

d2da1e3544 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

03f2da8169 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations

b69ef48a44 refactor: refs #7132 deleted pageTitles repeated

d8b80cfa6d fix: refs #7283 fix pr

37b3affdbf refactor: revert catalog changes

76ed5150a5 Merge branch 'dev' into Fix_OrderModuleProblems

2420c6dee2 Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify

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

1c8eabe293 perf: refs #7283 #7283 declare composable inst4ead code duplicated

56ef811584 fix: refs #7283 order translation

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

de7f55c589 Merge branch 'dev' of https: refs #8039//gitea.verdnatura.es/verdnatura/salix-front into 8039-canceledError_not_notify

45e6d2011f Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

87d2e0a39b perf: refs #7283 #7283 handle composable i18n

2d8789312b test: refs #6943 #6943 remove skip tests

3f640c650b perf: refs #7283 #7283 handle i18n

64f36c7d4b feat: refs #8087 Traspasar redadas a travels

671d9fd6fb fix: refs #7283 itemtype fix

551b81e421 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

92ff8c188e Merge branch 'dev' into 7283-itemMigration

c2043902f8 fix: refs #7283 fix required

8cee3ac713 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration

e86afd57a0 Merge pull request 'feat: refs #8039 canceledError not notify' (!850) from 8039-canceledError_not_notify into dev ...

Reviewed-on: #850
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

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

855979d22d perf: refs #7283 #7283 i18n params

67a5d10a5e Merge branch 'dev' into 7283-itemMigration

92e147355f fix: better performance

12c236276d feat: refs #8087 Traspasar redadas a travels

e8d2a40daf fix: entryFilters

0aec073cf1 Merge pull request 'fix: entryFilters' (!872) from fix-entryFilters into dev ...

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

69aec0cd83 Merge branch 'dev' into warmFix_accountAcls

c274641334 Merge pull request 'fix: better performance' (!869) from warmFix_accountAcls into dev ...

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

0cb5f34b15 Merge branch 'dev' into 7283-itemMigration

a01e685d5d Merge pull request '#7283 #7831 itemMigration' (!553) from 7283-itemMigration into dev ...

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

4c1e4aedd2 feat: refs #8087 Traspasar redadas a travels

9e57c5e452 feat: refs #8087 Traspasar redadas a travels

100dfbec3e Merge branch 'dev' into 8087-nuevoCampoTravel

21c4468fce Merge branch 'dev' into 6943_customer_spec

ff559384aa perf: refs #6943 #6943 merge command

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

02f682ac0b perf: refs #6943 #6943 merge command

6bb6cd8d93 Merge branch 'dev' into 6943_customer_spec

fc175666b1 Merge pull request '#6943 add comands to solve tests' (!851) from 6943_customer_spec into dev ...

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

bb51a9e687 fix: refs #7943 use summary

cdb73f7a17 fix: refs #7943 use correct data-key

1b05a5173d Merge pull request 'fix: refs #7943 use summary' (!873) from 7943-fixWorker into dev ...

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

57a3504a7f Merge branch 'dev' into 7006-itemTypeLog

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

8edba36a74 feat: refs #7006 itemType basic data new inputs

211da859bd fix: catalog view category and type filter

494fc66c06 feat: refs #7006 itemType basic data new inputs

d14f2bd638 Merge branch 'dev' into 7006-itemTypeLog

0537213a58 Merge pull request 'feat: refs #7006 itemTypeLog added' (!825) from 7006-itemTypeLog into dev ...

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

1da86900e6 fix: refs #7524 e2e & worker module

0cc0e82aaa feat: refs #8078 add shortcut multi selection

c93f152060 fix: order catalog fixes

ca6547e174 feat: refs #7970 notify changes

454be43884 Merge branch 'dev' into 7970-NotifySaleChanges

bb106e25a0 Merge pull request 'fix: refs #7524 e2e & worker module' (!876) from 7524-fixE2e into dev ...

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

cca255507a fix: itemType redirection and fix filters

bc8a87b267 chore: typo

ffee9fb27c Merge branch 'dev' into fix_itemType-redirection

9d37d78e8b Merge pull request 'fix: itemType redirection and fix filters' (!878) from fix_itemType-redirection into dev ...

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

df1c123444 feat: refs #7193 modified parking to use the scope and corrected small errors

18a71e63e1 Merge branch 'dev' into 7193-ParkingCreateScope

2cde850132 fix: refs #7193 fixed e2e test

68478c4d13 Merge branch '7193-ParkingCreateScope' of https://gitea.verdnatura.es/verdnatura/salix-front into 7193-ParkingCreateScope

9347bb1ef5 refactor: refs #7970 refactored VnConfirm to emit events

e5a221d073 Merge branch '7970-NotifySaleChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 7970-NotifySaleChanges

30f88070ff Merge pull request '#7193 modified parking to use the scope' (!879) from 7193-ParkingCreateScope into dev ...

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

17b1921af6 feat: added composable to confirm orders

ea05637bf2 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems

639e08406e Merge branch 'dev' into Fix_OrderModuleProblems

3d4ca2bc67 refactor: refs #7970 added emit

ac3013205e Merge branch 'dev' into 7970-NotifySaleChanges

cab5a165d2 refactor: changed confirmOrder directory

c997081303 Merge branch 'Fix_OrderModuleProblems' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderModuleProblems

f2803a6313 fix: refs #7283 item filters

965c2f7b20 fix: refs #7283 preview

d252f6d2a3 fix: refs #7283 fix preview

a1105f2ef1 feat: refs #7524 add front test

526b7d91de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection

a9092251a8 Merge pull request 'fix: refs #7283 item filters' (!880) from 7283-fixItemFilters into dev ...

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

76dd27638a Merge branch 'dev' into 7970-NotifySaleChanges

d4f92812cf Merge pull request '#7970 notify changes in lines' (!877) from 7970-NotifySaleChanges into dev ...

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

15977357d9 refactor: refs #7266 Changed method name

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

934b32092b chore: refs #7524 fix test

b8ba313132 Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!864) from 8087-nuevoCampoTravel into dev ...

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

fecf9fddff Merge branch 'dev' into 7524-addTests

458c6b0f42 Merge pull request 'feat: refs #7524 add front test' (!881) from 7524-addTests into dev ...

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

5ef5285abc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection

d5639471cf feat: refs #8078 add tests

7e3e194b46 fix: refs #8078 e2e #7970

57488503aa fix: refs #8078 e2e #7970

1e16e3312e fix: refs #8078 improve cy command

0de4dfd4f8 feat: apply changes for customerModule

0b2c404ab3 perf: minor bugs detected

4b00ab877c perf: use required instead :required="true"

d2680b0a1f test: fix arrayData

b8ecf40777 Merge branch 'dev' into 7266-buyLabelSupplier

df7f9b47d3 Merge pull request 'refactor: refs #7266 Changed method name' (!884) from 7266-buyLabelSupplier into dev ...

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

96f894cc6c fix: refs #7283 filter

42fbdff5bd test: fix e2e

5663064dd8 refactor: modified composable

1ff77abaf5 Merge branch 'dev' into Fix_OrderModuleProblems

71420da586 Merge branch 'dev' of https: refs #8078//gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection

77cb2d84be fix: refs #8078 handleSelection

19a7e52605 fix: refs #8078 handleSelection

e39f85ff4b fix: refs #8078 improve handleSelection

c7c1343c06 Merge branch 'dev' into 7283-itemFilterWorkerBuyer

53887277ca Merge pull request 'fix: refs #7283 filter' (!887) from 7283-itemFilterWorkerBuyer into dev ...

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

9104e13a6d Merge branch 'dev' into Fix_OrderModuleProblems

89dfc0aff5 Merge pull request '#6896 fix Order module problems' (!817) from Fix_OrderModuleProblems into dev ...

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

fa5750bce4 Merge branch 'dev' into 8078-enableMultiSelection

476ef1dedd feat: refs #7206 added inactive label and corrected minor errors

00b4e885c1 Merge branch 'dev' into 7206-ModifySelectAddress

8be4210138 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress

bf480c20f8 Merge branch '7206-ModifySelectAddress' of https://gitea.verdnatura.es/verdnatura/salix-front into 7206-ModifySelectAddress

282999c49e fix: refs #7206 deleted duplicate code

e26fdfe4a3 Merge pull request '#7206 added inactive label and corrected minor errors' (!889) from 7206-ModifySelectAddress into dev ...

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

bf4bee0f95 feat(VnSelect): refs #7136 add scroll

f4bdefd4e7 Merge branch 'dev' into improve_isRequired_input

ed8225bf6c feat: #7782 waitUntil domContentLoad

b817aa92c2 feat: #7782 npm run resetDatabase

2090b78ce6 feat: #7782 cypress.config watchForFileChanges

fbbbc331a9 feat: #7782 add cypress report

4de23c31b3 feat: use composable to unify logic

1761cc23e0 feat: use composable to unify logic

d627c1f698 fix: order catalog

08204aa5f0 refactor(InvoiceInBasicData): use VnDms

e050a077d4 test: refactor e2e

a542f69b0f Merge branch 'dev' of https: refs #8078//gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection

1f9d850fbe chore: refs #8078 rollback ref

a4a4190e4e Merge branch '8078-enableMultiSelection' of https://gitea.verdnatura.es/verdnatura/salix-front into 8078-enableMultiSelection

86e6bef90f chore: refs #8078 fiz tests

14498a78b2 Merge pull request '6920-invoiceInBasicData_useVnDms' (!892) from 6920-invoiceInBasicData_useVnDms into dev ...

Reviewed-on: #892
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

ca9a7f2932 Merge branch 'dev' into 8078-enableMultiSelection

9ee05721a4 Merge pull request '#8078 enable multi choice' (!848) from 8078-enableMultiSelection into dev ...

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

4a95a0e39a chore: refs #7273 sticky add btn & refactor

9959fbf005 fix: refs #7273 use same filter

ec88bcbc44 Merge pull request '#7273 fixItemTags' (!895) from 7273-fixItemTags into dev ...

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

abd7b76636 feat(VnInput): empty to null

473b0808e8 Merge pull request 'feat(VnInput): empty to null' (!898) from 6766-vnInput_emptyToNull into dev ...

Reviewed-on: #898
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

a2bbf4474d fix(InvoiceOutGlobal): parallelism

ead241e7da chore: remove console.log

2b02c9fbd3 Merge branch 'dev' into warmFix_invoiceOut_Global

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

18cc3888e5 Merge branch 'dev' into warmFix_invoiceOut_Global

5d0c91187e Merge pull request 'fix(InvoiceOutGlobal): parallelism' (!900) from warmFix_invoiceOut_Global into dev ...

Reviewed-on: #900
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

2bf7fa46ca perf: remove appendParams

489df51d64 Merge branch 'dev' into fix_customer_issues

e210ad7de4 Merge branch 'dev' into fix_customer_issues

0b5be9e67f chore: correct checkNotification

624ba2c13d Merge pull request 'FIX: #6943 Customer issues' (!885) from fix_customer_issues into dev ...

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

498a52a3e5 refactor: small change

52a2250acc refactor: apply QPopupProxy

8bff7fc1d6 fix: reset category

96d68ed106 Merge branch 'dev' into fix/OrderCatalog

570c09bab5 Merge branch 'dev' into cypress_features

0a5c3bfe5b Merge branch 'dev' into improve_isRequired_input

0c6d6d6925 Merge pull request 'refs: #7782 Cypress features' (!891) from cypress_features into dev ...

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

dce57f4638 Merge branch 'dev' into improve_isRequired_input

ead326c66b Merge branch 'improve_isRequired_input' of https://gitea.verdnatura.es/verdnatura/salix-front into improve_isRequired_input

c22c8d9f11 Merge pull request 'Improve required attrs for VnInput*' (!886) from improve_isRequired_input into dev ...

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

a467c44b91 feat: refs #6818 saysimple integration

3825dc3851 feat: disabled buttons

3bae121ed7 fix: refs #6818 use right icon

c1d623622d refactor: remove unused variable

ade90afd03 refactor: change keyup.enter for update:model-value

7fb3e71688 feat: refs #6818 fetch url & default channel

462382ecb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration

777ac58f04 feat(Supplier): add companySize

e21087e645 Merge pull request 'feat(Supplier): add companySize' (!906) from 6828-supplier_companySize into dev ...

Reviewed-on: #906
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

07e7cbc355 feat: refs #6839 module searching

7f1a4d6cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration

40ecd6e358 refactor: refs #7950 Created cmr model

cc12250109 Merge pull request 'feat: refs #6839 module searching' (!910) from 6839-addSearchMenu into dev ...

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

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

700701f055 refactor: refs #6818 channel logic

81b35aa75b chore: refs #6818 add spaces

efd66ea02a feat: refs #6919 sync entry data

b4d7653661 refactor: refs #6919 export filter

a7d53fcbe6 Merge branch 'dev' into fix/OrderCatalog

830c3658d4 Merge pull request 'fix/OrderCatalog' (!893) from wbuezas/salix-front-mindshore-fork2:fix/OrderCatalog into dev ...

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

90f04cc010 Merge branch 'dev' into 6919-reactiveDescriptor

86b8f9bf54 Merge pull request 'feat: refs #6919 sync entry data' (!913) from 6919-reactiveDescriptor into dev ...

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

3f15c3cce0 feat(VnSelect): order data equal salix

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

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

83be57a0c4 chore: refs #6818 drop useless code & comment

8db3ab4d47 Merge branch 'dev' into 7950-cmrModelUnify

8269037faa chore: perf

2ae9d68fec Merge branch 'dev' into warmFix_order_equalSalix

1f8ead608c Merge pull request 'feat(VnSelect): order data equal salix' (!918) from warmFix_order_equalSalix into dev ...

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

96e9de519f Merge branch 'dev' into 6818-saySimpleIntegration

d474fb924f Merge pull request 'feat: refs #6818 saysimple integration' (!904) from 6818-saySimpleIntegration into dev ...

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

9291c4dd6a feat: refs #6818 add icon

7dba1a1846 Merge pull request 'feat: refs #6818 add icon' (!924) from 6818-addIcon into dev ...

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

9e653b8c2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7310-warningTravelTermographs

540e0348a1 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations

c2b6b816a4 fix: refs #7283 Account image resolution

f9ef50db02 Merge branch 'dev' into 7132-FixTranslations

483760c8cd Merge pull request '#7132 fix translations' (!843) from 7132-FixTranslations into dev ...

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

ef415d080a feat: refs #7308 #7308 remove warnings related to useSession

590d495dbd test: refs #7308 #7308 axios.spec.js

0fe5f6d54d Merge branch 'dev' into 7308-warning_inject

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

b0bb09e9a6 perf: refs #7308 #7308 remove comments

e57a253c6f Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev ...

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

2bcd7061cb revert e57a253c6f ...

revert Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev

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

5b444ef0f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7306-warningCustomerUnpaid

c4a4f7fcd6 refactor: refs #6818 change channel source

e0e03526af Merge pull request 'warmFix: Revert previous commit e57a253c6f649382da187d1129449d265fb26d3b' (!930) from revert_warning_inject into dev ...

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

877497e8ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-useDefaultChannel

84802cf267 Merge pull request 'refactor: refs #6818 change channel source' (!932) from 6818-useDefaultChannel into dev ...

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

ecf131ba78 feat: move buttons to DescriptorMenu

857136a866 Merge branch 'dev' into 7306-warningCustomerUnpaid

27accd0e8b Merge pull request 'fix: refs #7306 clean warning' (!839) from 7306-warningCustomerUnpaid into dev ...

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

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

291e97e540 feat: #6943 use openURL quasar

61cd8c49c6 Merge branch 'dev' into warmFix_customerDescriptorActions

68994db6ff Merge pull request 'Change layout CustomerDescriptor Actions' (!931) from warmFix_customerDescriptorActions into dev ...

Reviewed-on: #931
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>

7224860c5c feat: refs #6839 normalize search

8d070edf8d Merge pull request 'feat: refs #6839 normalize search' (!936) from 6839-normalizeSearch into dev ...

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

59b40fed45 feat: refs #7874 improve vn-notes ui

8e0b098756 fix: refs #7874 add title

39e8f73d1b Merge branch 'dev' of https: refs #7136//gitea.verdnatura.es/verdnatura/salix-front into 7136-vnSelect_paginate_simplify_2

7626c777ed Merge pull request 'feat: refs #7874 improve vn-notes ui' (!938) from 7874-improveVnNotesUi into dev ...

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

c607fc5f61 Merge branch 'dev' into 7950-cmrModelUnify

3c77076718 Merge pull request 'refactor: refs #7950 Created cmr model' (!911) from 7950-cmrModelUnify into dev ...

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

0e93766670 Merge branch 'dev' into 7136-vnSelect_paginate_simplify_2

e8f0bc9965 Merge pull request 'feat(VnSelect): refs #7136 add scroll' (!890) from 7136-vnSelect_paginate_simplify_2 into dev ...

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

95291d4d4e Merge branch 'dev' into 7310-warningTravelTermographs

3f486f6514 Merge pull request 'fix: refs #7310 clean warning' (!840) from 7310-warningTravelTermographs into dev ...

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

2bc219a09b refactor: refs #8185 modified LeftMenu to avoid duplicates

34ccbccf20 Merge pull request 'Down changes from master to test' (!950) from master into test ...

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

3d8aa3cff9 Merge branch 'dev' into 8185-DuplicateLeftMenu

80770b1165 Merge pull request '#8185 Fix LeftMenu to avoid duplicates' (!952) from 8185-DuplicateLeftMenu into dev ...

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

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

0c36d385ec Merge branch 'test' into solveConflicts_test_to_dev

f52095a2fc Merge branch 'test' into solveConflicts_test_to_dev

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

09be2d4d41 Merge pull request 'solveConflicts_test_to_dev' (!957) from solveConflicts_test_to_dev into dev ...

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

dd490888cf merge test in dev

0c0b9ca648 fix: changed route.query

3c5472ad4a Merge pull request 'Fix: changed route.query' (!959) from Fix-OrderCatalogCategoryFilter into dev ...

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

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

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

8d997b5a7a build: refs #8144 change package version

b26028c6a5 Merge pull request '8144-devToTest_2448' (!963) from 8144-devToTest_2448 into test ...

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

38ccf464b7 fix: refs #7323 locale #7396

1faab668b1 fix: refs #7323 show advanced fields

5515f55bf6 test: fix e2e

794036b880 Merge pull request '#7323 warmfix-addRemainingFields' (!965) from 7323-warfix-addRemainingFields into test ...

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

65100fcf25 test: fix e2e

f43e974bbc fix: worker test e2e

1b68d3c5ea Merge branch 'test' into Fix-WorkerCreateE2E

bdae26ba08 Merge pull request 'Warmfix: worker test e2e' (!968) from Fix-WorkerCreateE2E into test ...

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

8714980595 fix(VnSelect): setOptions when applyFilter

14e6b870ac Merge branch 'test' into warmFix_vnSelect

38c2f89fba Merge pull request 'fix(VnSelect): setOptions when applyFilter' (!969) from warmFix_vnSelect into test ...

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

5f7fd91272 feat: add /reports in gitignore

8fb843a180 Merge pull request 'feat: add /reports in gitignore' (!970) from warmFix_reports_in_gitignore into test ...

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

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

e6f8b87890 Merge branch 'test' into fix_test_jsegarra

b4ee19bcde test: #8162 fix clientList spec

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

67a5800a66 fix: logout spec

3ba8402dfd fix: vnSearchbar spec

e33bb9f8b5 Merge pull request 'fix: logout spec' (!974) from warmFix_logout.spec into test ...

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

c1d9650c60 Merge branch 'test' into warmFix_vnSearchBar.spec

98ac560b16 Merge pull request 'warmFix_vnSearchBar.spec' (!975) from warmFix_vnSearchBar.spec into test ...

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

68c9baa7f6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_js_e2e

1fb927488a test: #8162 fix clientList spec

e10ee5e6c7 test: #8162 fix vnLocation spec

226f604f9d test: #8162 fix vnLocation spec

9da0488184 feat: remove comments

deb6467af8 feat: remove comments

d6aedad38e perf: use const in VnLocation

7039b68bba fix: refs #7874 show name

c1e06325d3 Merge pull request '#7874 show name' (!978) from 7874-warmfix-useName into test ...

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

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

5a90434425 Merge branch 'test' into fix_js_e2e

6f324b44b8 Merge pull request 'WARMFIX: e2e jsegarra' (!973) from fix_js_e2e into test ...

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

e5434e7436 warmfix: ItemLastEntries to date

f36363dbd2 Merge pull request 'warmfix: ItemLastEntries to date' (!981) from warmfix_itemLastEntriesFilter into test ...

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

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

5268140d8b feat: refs#8087 Redadas en travel

e04d77f55e Merge pull request 'feat: refs#8087 Redadas en travel' (!984) from travelisRaidTest into test ...

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

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

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

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

14d2ddfa83 fix: merge errors

01ffb663f1 fix(ClaimList): stateCode orderBy priority

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

alexm added 1 commit 2024-11-25 13:49:18 +00:00

594fc60eec chore: refs #8231 add changelog

jsegarra added 2 commits 2024-11-25 13:59:31 +00:00

2ead484026 test: refs #8231 fix VnLocation

7e924bc791 Merge branch '8231_testToMaster_2448' of https://gitea.verdnatura.es/verdnatura/salix-front into 8231_testToMaster_2448

jsegarra commented 2024-11-25 13:59:42 +00:00

Member

Copy Link

VnLocation.spec.js report /home/jsegarra/Projects/salix-front/test/cypress/reports/index.html

VnLocation.spec.js report /home/jsegarra/Projects/salix-front/test/cypress/reports/index.html

jsegarra commented 2024-11-25 14:08:51 +00:00

Member

Copy Link

@alexm

@alexm 

report_1507_2511.zip

382 KiB

image.png

69 KiB

guillermo approved these changes 2024-11-26 06:03:35 +00:00

alexm merged commit 1ce1f1f8e0 into master 2024-11-26 06:28:29 +00:00

alexm deleted branch 8231_testToMaster_2448 2024-11-26 06:28:29 +00:00

alexm referenced this issue from a commit 2024-11-26 06:28:32 +00:00

Merge pull request '8231_testToMaster_2448' (!997) from 8231_testToMaster_2448 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

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

No description provided.