8062-testToMaster_2 #792

Merged

alexm merged 347 commits from 8062-testToMaster_2 into master 2024-10-03 05:48:03 +00:00

Conversation 0 Commits 347 Files Changed 163 +3439 -2732

alexm commented 2024-10-02 13:29:43 +00:00

Member

Copy Link

No description provided.

alexm added 346 commits 2024-10-02 13:29:43 +00:00

8a3b575157 fix: refs #6346 fix list and create

5926381f36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule

12370b6437 feat: refs #6346 new wagon type section

a7a1b7801c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule

3a0204d27b feat: vnLocation changes

8ceee6f182 fix: fix conflicts

4188569908 feat: refs #7500 added VnImg to show files

fee7743b6e Merge branch 'dev' into 7500_ChangeEntryDms

351c2a07dc chore: refs #4074 wip replace useRole for useAcl

c766110bd9 chore: refs #4074 wip replace useRole for useAcl

dcc2f4dfde chore: refs #4074 admit several acls

27034d1dc2 chore: refs #4074 admit several acls

fb496d7fc6 chore: refs #4074 admit several acls

db18e8c937 fix: refs #4074 workerCard data-key

9e9a530803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

199ed80212 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

53aec24790 chore: refs #4074 drop workerCreate

6c3c03722f feat: refs #4074 useAcl in vnSelectDialog

51fec90607 feat: refs #4074 useAcl in vnSelectDialog

2a4180a1c3 refactor: refs #6346 deleted front error checking

f2be2b4300 fea: stockBought add form and formDetail

de94b3629e fix: remove console.log

cf1545d5e8 Merge branch 'dev' into 7404-stockBought

c8ab5b3bfd feat: refs #7663 add setWeight menu opt (wip)

ffd7d98e9c feat: travel m3

40e46f5a72 fix: refs #7830 customer credit

c31aa3258f fix: refs #7830 remove console.log

3e44c6e404 Merge branch 'dev' into 7677_vnLocation_perf

92130b4c9c WIP: 59262019 Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev

55b9cd9ff4 feat: handle same multiple CP

8acd008f42 feat: handle newValue

9eff6b56ea fix: remove print variable

bd83a959f7 fix: customer credit opinion

dae71dacfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables

793001be6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables

bdaba6b3ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

e45e551526 feat: customer consumption

f927e9b722 fix: #6943 fix customerSummaryTable

a131cb559d feat: add max rule

aebf6d7a8e Merge branch 'dev' into 7017_formModel_validations

bc1ea611ce feat: CustomerConsumptionFilter

c382118492 Merge branch 'dev' into 6943_fix_customerSummaryTable

0d99c5f609 feat: CustomerConsumptionFilter

56f687ce36 perf: sendEmail customerConsumption

6c887c36b1 fix: CustomerDescriptor.bussinessTypeFk

9a48cb0742 feat: VnImg draggable

3aa3d2d8d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

10747d7a4f perf: customerSummaryTable

db97e8322e feat: change url CustomerList

61c7c622f7 perf: update CustommerDescriptor

452b084caf feat: change QBadge color

b481876e81 fix: CustommerSummaryTable Proxy

3ea8490e98 Merge branch 'dev' into 6943_fix_customerSummaryTable

cadd6a2b62 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable

20ddabcc01 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable

ca74ad85b4 fix: Customerconsumption

1b5658726e Merge branch 'dev' into 6943_fix_customerSummaryTable

e8f660ea37 perf: CustomerBasicData

7d526f4aa4 fix: CusomerSummary to Address

bdffdce966 Merge branch 'dev' into 6943_fix_customerSummaryTable

375e65aed0 fix: CustomerDescriptorAccount

c727e5f669 feat: copy customer countryFk

b66ff783be feat: CustomerBalance

8b4fcbd888 feat: CustomerGreuges

52883dfb52 Merge branch 'dev' into 6943_fix_customerSummaryTable

0314ca8397 fix: customerSummaryToTicketList button

d155b40bde revert: vnUSerLink change

4762c9fa53 perf: disable card option

00acd5b0ab feat: CustomerCredit section

c25b689685 Merge branch 'dev' into 6943_fix_customerSummaryTable

5fc33cb4c3 Merge branch 'dev' of https: refs #7500//gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms

e4e9496cac Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms

76a7f8a1b3 refactor: refs #7500 refactor vnimg when storage is dms

1824d9a0e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

2fb974af0f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought

3e81b34379 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

74b47361c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought

58eca71e95 Merge branch 'dev' into 6346-fixWagonModule

edfc6ace0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

50cdb053f8 feat: refs #7663 fine tunning

3dc720e2d0 feat: refs #7404 add m3 and fix detail

717bf1c3e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought

af5e47ed3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

cf3b9b2ef8 perf: CustomerSummary

fc5eb20dba chore: refs #7663 create test wip

62cdc1d527 feat: CustomerCreateTicket

6476a8307a perf: i18n

31abd8b4c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable

b3391ab522 perf: minor comments

1f96f5c09a feat: orderCreateDialog

cd12343302 feat: refs #7404 add some style to the form and reorganize fields

b13874e8a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

6f98f24926 chore: refs #7663 add test

34a9b4d4d0 Merge branch 'dev' of https: refs #4074//gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

86e1396da4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

3693ba0c99 feat: refs #4074 drop useless code

d0131dd552 fix: refs #4074 drop wrong acl

b87e7ce750 refactor: refs #4074 use VnTitle

e083d6a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought

b61e2a5c28 Merge branch 'dev' into 7500_ChangeEntryDms

684215fc46 feat(AccountBasicData): add twoFactorFk

5f546a47bf Merge branch 'dev' into 7500_ChangeEntryDms

bef9b05b45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

f78ca3f357 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule

e702e9d1a1 Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule

c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router

803ce3b909 refactor: refs #4074 rollback

2667d3afae feat: show preparation field

6438f36eca refactor: refs #4074 accept array

83d3246377 Merge branch 'dev' into 6156-advanceTicketsNewField

381b236a18 refactor: refs #4074 use acl & drop useless roles

7bc288ad71 fix: state cell

52d8ff8ae2 fix: isFullMovable checkbox

ee62f85250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

bd00f86d74 chore: refs #4074 fix tests

67b2cd3a0b feat: stateGroupedFilter

26c7dfde35 chore: refs #4074 fix tests

04aa96b798 chore: refs #4074 fix tests

f8cbb0a762 chore: refs #4074 fix tests

f3471fe5ab fix: refs #4074 await to watch

e1adb1a8dd refactor: refs #6346 requested changes

6790067a89 Merge branch 'dev' into 6346-fixWagonModule

30ffb2428e perf: refs #6346 previous changes

abc39633bf Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule

b4fb9ceb2e Merge branch 'dev' into 6346-fixWagonModule

f7975069d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

3fafb15eb8 refactor: refs #4074 use fn

f9adc49284 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight

5cc1d0cec4 chore: refs #7663 drop useless code

6d017d8c99 build: init version 2440

113ebd23a6 Merge branch 'dev' into 5938_fine_ticketAdvance

bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable

05c91e2a29 Merge branch 'dev' into 4074-useAcls

a8d4457365 Merge pull request '#4074 useAcls' (!584) from 4074-useAcls into dev ...

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

622afca9be feat: CustomerSample to VnTable

b5dcc865e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable

c7e717c611 feat: refs #7404 add travel m3 to reserves form

b2535dedcf Merge branch 'dev' into 5938_fine_ticketAdvance

a0eea16c35 Merge pull request '#5938 Fix & Fine Advance Tickets' (!690) from 5938_fine_ticketAdvance into dev ...

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

e7fb6a7963 hotFix: keyBinding toUpperCase if is null

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

19eb770893 feat: remove cli warnings

2d8322c6da fix: remove FIXME

2d5602e784 Merge branch 'dev' into 7663-setWeight

aa5ef76dcf Merge pull request '#7663 ticket setWeight' (!612) from 7663-setWeight into dev ...

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

f02ca7437c Merge branch 'dev' into 6156-advanceTicketsNewField

d072a11c1b Merge pull request 'refs #6156 new field' (!688) from 6156-advanceTicketsNewField into dev ...

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

c3108b4335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable

8d96539b24 perf: solve reload CardSummary component

233841ad16 Merge pull request '#6943 - FIX Customer module' (!628) from 6943_fix_customerSummaryTable into dev ...

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

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

4a234dd875 fix: duplicate code

e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought

6b79d70551 refactor: refs #7828 wip

9d055a48c4 Merge branch 'dev' into 7792-accountBasicData_twoFactorFk

1dffa8865e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls

9941975683 fix: infiniteScroll

25b7569791 Merge pull request 'FIX InfiniteScroll when use VnTable' (!704) from fix_VnTable_infiniteScroll into dev ...

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

3892df250c fix: #5938 grouped filter

c7adb91912 feat: use disableInifiniteScroll property

c22f8f1069 fix: stop call back event hasMoreData

a3afe790b9 fix: CustomerGreuges

29bd3f0516 Merge branch 'dev' into fix_VnTable_infiniteScroll

856d551503 Merge pull request 'Fix Call back when hasMoreData' (!707) from fix_VnTable_infiniteScroll into dev ...

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

058039fd61 Merge branch 'dev' into 5938_filterGrouped

e5056c45c0 fix: refs #7500 fixed showing images wrongly

35247007f0 Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms

be389c6736 Merge branch 'dev' into 7500_ChangeEntryDms

d00a88a3f4 refactor: refs #7500 deleted useless code

b8f6bc26ad Merge branch '7500_ChangeEntryDms' of https://gitea.verdnatura.es/verdnatura/salix-front into 7500_ChangeEntryDms

ea37015ec2 Merge pull request '#5938 - Use filter grouped by id' (!706) from 5938_filterGrouped into dev ...

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

adb9cac360 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls

44fd356d63 feat: refs #7828 useAcl & cherry pick mail data worker

cfdfc7f531 fix: CustomerSamples

dcb8c5daad fix: workerDms filter workerFk

a29ee42b9e fix: CustomerBasicData show id assigned

8fc7e3cfb4 fix: CustomerSamples

24f4af712e fix: CustomerMandates

70d0132710 fix: CustomerWebPayment

39f2deafc4 fix: CustomerCreditOpinion workerDescriptor

54fc7f6394 fix: CustomerRecovery transalate label

6e784bb290 fix: address-create i18n

fa408dc226 fix: CustomerAddress mobile

aca13d9119 fix: CustomerBillingData

b36f072b24 Merge branch 'dev' into 6943_fix_customer_module

67140e4383 Merge pull request '#6943 - Customer module migration bugs' (!705) from 6943_fix_customer_module into dev ...

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

eca4b02022 Merge branch 'dev' into 7500_ChangeEntryDms

6c4f5ef915 Merge pull request '#7500 added VnImg in EntryDms' (!565) from 7500_ChangeEntryDms into dev ...

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

ed5987630f Merge branch 'dev' into 6346-fixWagonModule

770663cc37 Merge pull request 'fix: refs #6346 fix list and create' (!404) from 6346-fixWagonModule into dev ...

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

8be1833f9e refs #7155 scopeDays

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

46fb7d0c73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls

a5ea940dd8 fix: Customer module find salesPersons out of first get

025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf

58be11df04 chore: refs #7828 fix e2e

5796bc9c0a fix: emit:updateModelValue

a56dc7aa08 test: fix test

48a5c15b9d feat: refs #7828 create axios instance which no manage errors

0f604ea8b5 fix: refs #7500 fixed e2e test

842fb9de5f refs #7155 scopeDays fix

6e6af0af80 perf: improve style

9c36a113e1 Merge branch 'dev' into 7671_dense_itemFixedPrices

8ce082d841 Merge pull request '#7671 - Improve/FIX ItemFixedPrice' (!714) from 7671_dense_itemFixedPrices into dev ...

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

ed5ba1dd1a Merge branch 'dev' into 7017_formModel_validations

401400bdcf fix: remove FetchData

b6cce74449 fix: merge conflicts

93488a5750 fix: styles

57b939bdd5 Merge branch 'test' into dev

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

c08167c5a9 Merge branch 'dev' into Hotfix-FixEntryDmsTest

deb30ee955 feat: refs #7404 travel m3 form

c59c8127cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought

27069e56b8 Merge branch 'dev' into 6943_fix_customer_module

e6278d51eb Merge pull request 'fix: refs #7500 fixed e2e test' (!712) from Hotfix-FixEntryDmsTest into dev ...

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

263dc29d7a fix: refs #7404 remove console.log

8577f33599 Merge branch 'dev' into 7828-makeCorrectCalls

3c14d94bf1 Merge pull request '#7828 makeCorrectCalls' (!703) from 7828-makeCorrectCalls into dev ...

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

d384894bf0 fix: rule

eb8690a422 fix: remove promise execution

ae76bd0b0e refactor: refs #6346 wagons to VnTable

cb87f4dce1 Merge branch 'dev' into 6346-WagonTypeToCard

6ffd985575 perf: CustomerBasicData.salesPersonFk

cf95cd7db7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module

603fb1de71 Merge branch 'dev' into 7017_formModel_validations

af4756d810 Merge pull request '#7017 Show FormModel Validations' (!469) from 7017_formModel_validations into dev ...

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

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

e4adbfa9f7 Merge branch 'dev' into 7677_vnLocation_perf

6dc337e585 Merge branch 'dev' into 6943_fix_customer_module

7faa0c240f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought

907e6dbf4f Merge pull request '#7677 - Improve VnLocation' (!563) from 7677_vnLocation_perf into dev ...

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

58cd0b54cf Merge branch 'dev' into 6346-WagonTypeToCard

162c7858ff Merge pull request '#6346 Wagons to VnTable' (!717) from 6346-WagonTypeToCard into dev ...

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

29e4c723c9 Merge branch 'dev' into 6943_fix_customer_module

e559ab43d7 fix: refs #7404 remove some style

cead2c2b5e Merge branch 'dev' into 7404-stockBought

c7bef79c0a perf: improve

e40f216e33 Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module

6886c18ddc Merge pull request '7404-stockBought' (!593) from 7404-stockBought into dev ...

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

4f662375cd fix(VnTable): sanitizer value is defined

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

f1759eca04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk

aa6dac3944 fix: SupplierFiscalData VnLocation

9d210ace84 Merge pull request 'fix: SupplierFiscalData VnLocation' (!725) from fix_supplierFD_location into dev ...

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

21a7fafba5 feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData

8abd375985 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7792-accountBasicData_twoFactorFk

cba8647ac2 Merge pull request 'feat(AccountBasicData): add twoFactorFk' (!689) from 7792-accountBasicData_twoFactorFk into dev ...

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

37329a7391 feat: add shortcut add event in some subSections

9db12a8dee fix: wagon reload

364ce63545 Merge branch 'dev' into 7155-scopeDays

a302050494 Merge pull request 'refs #7155 scopeDays' (!710) from 7155-scopeDays into dev ...

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

98411d3c29 Merge branch 'dev' into add_shortcut_add_subSections

ee0f4037ed Merge pull request 'Add shortcut for few sub sections' (!726) from add_shortcut_add_subSections into dev ...

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

d76250f56f fix: reset VnTable scroll properties

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

b59e7174df Merge branch 'fix_VnTable_infiniteScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_VnTable_infiniteScroll

5ca38ca825 feat: global handler

3de08826ac Merge branch 'dev' into fix_VnTable_infiniteScroll

b3f27d9a84 feat: translations fixed

1cb2981f97 feat: apply color when today

08bec59a37 add_circle

1550d79160 feat: add shortcut more buttons

ccfe61d777 feat: vnSelect exprBuilder

c21133ebd4 Merge branch 'dev' into 6943_fix_customer_module

aa97ac2810 Merge pull request 'More sections with 'add_circle' icon' (!731) from add_shortcut_add_subSections into dev ...

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

1425ec268c Merge branch 'dev' into highlight_today_qDate

297596fe38 Merge pull request 'Apply color for today' (!730) from highlight_today_qDate into dev ...

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

46dbab4757 Merge branch 'dev' into 6943_fix_customer_module

35e89591ff Merge branch 'dev' into fix_VnTable_infiniteScroll

cc4f7de966 Merge pull request 'Fix VnTable InfiniteScroll' (!728) from fix_VnTable_infiniteScroll into dev ...

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

8fa11263e8 fix: fix wagon list reload

8b379faa52 perf: imrpove exprBuilder

88e2ea48c2 Merge branch 'dev' into 6943_fix_customer_module

c0dab66a24 Merge branch 'dev' into FixWagonRedirect

a012660518 Merge pull request 'Fix: Wagon section reload' (!727) from FixWagonRedirect into dev ...

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

8e96265106 fix: CustomerFilter

4f442a1f5a Merge branch 'dev' into fix_global_handler

f03a2aebee Merge pull request 'feat: global handler' (!729) from fix_global_handler into dev ...

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

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

650e801433 Merge branch 'dev' into 6943_fix_customer_module

deff8a1cf4 feat: hide menus on small view

cf11573713 Merge pull request 'feat: hide menus on small view' (!739) from hideMenu into dev ...

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

f84444d894 feat: add tooltip CustomerNewCustomAgent

f5c50e842e Merge branch '6943_fix_customer_module' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customer_module

d81d562edf feat: goToSupplier

2a97f35dd9 Merge branch 'dev' into 6943_fix_customer_module

8bbea9c903 feat: change order

17bb144bce fix: refs #7404 translates and some minor style fixes

88fd40eae6 feat: minor changes

66cb069109 perf: CustomerBalance

951b8fc1fa warmFix: e2e claimDevelopment

29cc14673a warmFix: e2e claimDevelopment

a52cdf8f94 fix: i18n en preparation label

279a100f8b fix: i18n en preparation label

e700f6f4a8 feat: refs #7404 style dynamic text color

b04564d5a8 fix: refs #7404 style non center pop up

6a8ed89a71 fix: VnLocation test

0829b6d0d2 fix: i18n en preparation label

d3b45af7e5 Merge pull request 'fix: VnLocation test' (!744) from fix_test_vnLocation into dev ...

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

e651b7ad82 Merge branch 'dev' into 6156_i18n

0c1114e89e Merge pull request '6156 i18n' (!742) from 6156_i18n into dev ...

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

5803af7a74 Merge branch 'dev' into 6943_fix_customer_module

3cfa883642 Merge pull request '#6943 - Customer module find salesPersons out of first get' (!711) from 6943_fix_customer_module into dev ...

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

caddcf45c3 fix: Options VnSelect properties

ab0c38810a fix: Options VnSelect properties

13b519e4b3 Merge branch 'dev' into 6943_fix_customer_module

27a3e36b58 fix: comments

3ede256dc5 feat: change label because its more natural

96edfd4b6e Merge pull request 'feat: change label because its more natural' (!749) from 5888_format_location_label into dev ...

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

5fc306e11e Merge branch 'dev' into 6943_fix_customer_module

1f9850f520 Merge pull request 'fix: Options VnSelect properties' (!746) from 6943_fix_customer_module into dev ...

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

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

8760781660 fix: merge in dev

b7ed63afc6 Merge branch 'dev' into 7404-fixFront

eaadacd332 Merge pull request '7404-fixFront' (!743) from 7404-fixFront into dev ...

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

2c73ce28c3 fix: fixed wagon tests

768e15755f fix: deleted code

f2ae231efb fix: missing code

2d90a75fa0 Merge pull request 'fix: wagon tests' (!752) from FixWagonTests into dev ...

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

edb6e9ce61 feat(TravelList): add daysOnward

3d34d9c6bb chore: refs #7155 remove console.log

d85705bb39 Merge pull request '8032-devToTest_2440' (!751) from 8032-devToTest_2440 into test ...

Reviewed-on: #751
Reviewed-by: Jon Elias <jon@verdnatura.es>

e555bd4cde Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward

991ad21c77 fix: refs #7155 remove userParams in watcher

d2996f0838 fix: refs #6943 prevent null

357f3ba308 Merge pull request 'fix: refs #6943 prevent null' (!756) from 6943-warmfix-preventNull into test ...

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

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

9a11f94922 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward_2

6bd2835c59 chore: refs #7155 typo

bcada72f04 fix: refs #7155 use chip-locale

5f4df6eb96 Merge pull request '7155-travel_daysOnward_2' (!759) from 7155-travel_daysOnward_2 into test ...

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

f00db79d47 fix(VnTable): header background-color

bbf3b6d4b7 fix: #6943 show nickname salesPerson

353116a7a0 fix: split params

d5253149ed Merge pull request 'fix: split params' (!768) from warmfix-addSearchUrl into test ...

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

807827c97c Merge branch 'test' into warmfix_customerModule

193670fdcf fix: refs #7404 revert commit prevent production access

336f2ba89e fix: refs #7404 remove from test

5097cc8b81 Merge pull request 'fix: #6943 show nickname salesPerson' (!766) from warmfix_customerModule into test ...

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

f005674db6 Merge branch 'test' into 7404-remove-from-test

e5eb1d7663 Merge pull request 'fix: refs #7404 revert commit prevent production access' (!771) from 7404-remove-from-test into test ...

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

2302e22f11 fix: solve conflicts from master to test

35179695c3 Merge pull request 'fix: solve conflicts from master to test' (!777) from mergeConflicts into test ...

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

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

2e9a8d9205 fix(WorkerList): add type email

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

alexm added 1 commit 2024-10-02 13:31:15 +00:00

8de5602564 chore: refs #8062 add changelog

guillermo approved these changes 2024-10-03 05:42:33 +00:00

alexm merged commit 58a94599a9 into master 2024-10-03 05:48:03 +00:00

alexm deleted branch 8062-testToMaster_2 2024-10-03 05:48:04 +00:00

alexm referenced this issue from a commit 2024-10-03 05:48:05 +00:00

Merge pull request '8062-testToMaster_2' (!792) from 8062-testToMaster_2 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#792

No description provided.