7631_testToMaster_2426 #480

Merged

alexm merged 390 commits from 7631_testToMaster_2426 into master 2024-06-25 06:40:05 +00:00

Conversation 0 Commits 390 Files Changed 204 +7604 -7000

alexm commented 2024-06-25 05:33:56 +00:00

Member

Copy Link

No description provided.

alexm added 390 commits 2024-06-25 05:33:57 +00:00

e499fd1511 working on create deliveryMan

20e284fe59 wornking on invoiceAllocation

3bd8e3c454 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4560-gastos-reparto

2c4676780e fix: refs #6911 add icons, fix invoiceIn & save on enter

c070969d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

ba1dea32a5 fix: refs #6911 save onKeyup enter

f8d1b3d935 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

b0cc7283b6 Merge branch 'dev' into 6911-saveOnEnter

492fb945d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

7c5f55dee4 Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

82e31d4dcf refs #6911 feat: setDefaults

901c8c8f71 refs #6911 feat: qFormMixin keyup.enter

628d5453a8 refs #6911 feat: remove keyup.eneter=submit for each form

58dc4c253a refs #6911 perf: use QForm instead classList

6bc8cdc0c3 refs #6911 feat: reaneme method and remove keyup

ef979f05a3 refs #6911 feat: reaneme method and remove keyup

149235f817 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

8604c86828 Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

7ae05a3e52 refs #6911: perf KeyCode is deprecated

5e43af9efd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

c2c100458e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

2eead3a69e Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

44d59d5e55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

c4748cc9b0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

38f25eb02d Merge branch 'dev' into 6911-saveOnEnter

d8d805a0ca refs #6911 changesSaveOnEnter

e44e182fec Merge branch 'dev' into 6911-saveOnEnter

bdfcba5c3e Merge branch 'dev' into 6911-saveOnEnter

0e7e804475 feat: refs #6598 create useAcl composable

4b4c02c01a feat: refs #6273 create worker form toggle

7c1ce7f560 feat: refs #6243 replace url

733f7a0702 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection

fc94454cfd Merge branch 'dev' into 6911-saveOnEnter

49603e5b37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

e1bf3f5404 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection

01bedb94d0 feat #7311: enable leftmenu option

c8b9233c87 feat #7311: i18n pageTitles

b1f25266aa Merge branch 'dev' into 6911-saveOnEnter

0947dcc17e feat #7311:sunmodules

99ef7fad76 feat #7311: subsections

034342beb2 Merge branch 'dev' into 7311_boilerplate_users

c68ad5be34 feat #7311: minor changes

9e7301d32e Merge branch 'dev' into 6911-saveOnEnter

e68b9e63fe Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

8128e22645 Merge branch 'dev' into 6911-saveOnEnter

a15530dba2 fix: replace key value

f51af69fdd updates

5f607823b7 feat AccountCreate

f6d3e37787 feat: accountRoles

f836857288 feat: remove unnused content

2cb402d3d4 feat: AccountList

c045b0d1f4 feat accountRoutes

555b5a663c feat: role router

f9e77596e4 feat: roles sections

4609e59cd9 feat: i18n

bdfafe9319 Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

4f38ae3745 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl

12ff55a010 fix: refs #6598 get acls

b63735a709 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl

74e330e523 fix: refs #6598 fix unit tests

1d67233e69 feat: refs #6598 unit tests

94bf6ff381 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl

12811692eb feat: refs #6598 add more tests

aa007117a7 Merge branch 'dev' into 7311_boilerplate_users

a2316fb222 feat: change skeleteon different components

c64a403ee2 feat: AccountSummary

0397f9ee68 feat: AccountDescriptor & AccountDescriptorMenu

474e2c3a48 style: align-center

bbd51c5773 feat: AccountDescriptorMenu

026997a369 role updates

2cae2168ac perf: AccountCard, BasicData, summary

dc14116717 perf: RoleCard, BasicData, summary

84845b7958 WIP

4de9895b38 refs: #6911-saveOnEnter

96719884fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

790e69f659 WIP

06664cc2d0 feat: newRole

433564507e Merge branch 'dev' into 7311_boilerplate_users

103e3fe08a Merge branch 'dev' into 6911-saveOnEnter

68213721a7 feat: refs #7003 new data order in section

889263bfb8 feat: roleCreate as dialog

9b3135fd97 WIP

68bb4251a4 WIP

a1fde3f645 WIP

d46b906020 feat: bolierplate layout samba and ldap

097197b8dc Zone exclude form and tree implementation

bfba4875cc Minor change in exclusion form

3cb17eeb66 remove console.logs

dbcd701725 Change Zone Calendar name

f52f5df78b Make searchbar work

62443ff44b Abstract ZoneCalendarGrid in a component and reuse it

cff434c1a6 Add sticky form button

c4b88fae41 adapt tree

7cd2bf2319 watch fix

b783adfc31 several changes

d4600a1181 resolve conflicts and adapt tree

e80b9a71c6 Hide panel when ZoneEvent view unmounts

4292804922 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList

062de82bca Account list

21879b54ab remove console.log

fd7f46cbe2 several changes

0659eac652 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles

532d60130d Merge branch 'dev' into feature/ZoneCalendar

f9fa68b0b1 feat: dashOrCurrency filter

c5e2a40d3e feat: add router.meta.moduleName as default param

b7bc82aa3c feat: use new filter

ed566e6ece style: increase height

3f76aea680 fix: dashOrCurrency filter

b5e72aec7c Wip

5c9f62bd59 Remove unnecesary files

6c34a250db Remove more unnecesary files

e47bda0afc small changes

1414b93633 Account create

d82de6da58 Account roles

56dd5e0a76 change fn name

ed2ba5458d Avoif filter panel from redirecting

0cf4f41d19 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases

5c25c77f19 Mail aliases

05b7df9168 Role submodules

4bd78922af remove unnecesary files

2c9ff60399 Merge branch 'dev' into feature/ZoneCalendar

5b9d64128b fix: AccountFilter

67b3888f8c feat: AccountForm as dialog

c2dd7831d1 perf: remove unnecessary components

4268f15d30 perf: remove unnecessary submodules

28173ddee2 Merge branch 'dev' into feature/AccountRoles

d072fc858d Merge branch 'dev' into 6911-saveOnEnter

0450986025 fix InvoiceInBasicdata

5139bba5a0 fix: handle VnNotes keyup

c499cc8f09 refs #6897 remove code fix section

d5dc9d974c fix: ClaimBasicData form

a39c827579 refs #7366 fix url

d8bf95008a fix: src/components/EditPictureForm.vue

492e333d2f fix: i18n VnNotes

25d5887a57 fix: src/pages/Entry/Card/EntryBuysImport.vue

59f9cf4111 fix: src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

221ed7c534 feat(TravelSummary): isConfirmed checkbox

e6a1c31119 fix: src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

0ad839dfc6 src/pages/Order/Card/OrderCatalogItemDialog.vue

1c14841233 Several changes

8e1f7c24a4 submodules WIP

aabf5420b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7003-fixedPriceOrder

3a0f99ac22 feat: refs #6891 Add collapse menu button to filter panel

217f9bd86c fix: refs #6891 rollback

0d25c1b66b refs #7366 fix travel

ca4193e11a Merge branch 'dev' into 4560-gastos-reparto

56a46cd130 4560

c78828d6a6 refactor: refs #6891 Move filter panel rendering to RightMenu component

36ff4e9312 refactor: refs #6891 searchbar teleport

02d8254df9 rest of submodules

8320a75e61 make searchbar work

2a61ca4dbb refactor: refs #6891 drop isHeaderMounted condition

e6f0e6b089 refactor: refs #6891 Remove unused i18n

f55e9d7c32 fix: refs #6891 Optimize RightMenu component rendering

668dc5fd53 fix: List without limit

0d1453ddeb feat: isPublic checkbox

ef47b34569 Merge branch 'dev' into feature/MailAliases

0b92e98511 fix: refs #6891 show cross

b93b630c6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection

1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse

de4ea6271b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt

0b0754f76e refactor: refs #6273 replace QBtnGroup with QRadio for worker type selection

5f00f3bad4 Merge branch 'dev' into 4560-gastos-reparto

26ddb483f6 build: add new version

f1df969fa6 feat: refs #560 refactor descriptor

535798af25 feat: refs #7502 new Lilium icons

4c50cb816d Merge branch 'dev' into 7502-liliumIcons

3efca6242d Account ACLs

c96e6482f9 remove mail alias content

857aca49dd feat: refs #4560 sin DeliveryMan

84ad1745e2 several changes

37a8956f86 Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList

253b54379c Add submodules routes again

c574af9e9b resolve conflicts

ddc149b6fc adapt account privileges to new formModel changes

969186c872 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases

a1bfe4c7ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt

06ddcc5030 refs #7366 fix travel

c71877cdb1 Account connections

7e0ceca623 feat: refs #6273 freelance form & vnRadio

946aa6b24d Small changes

9f6d0b4dc9 Remove roles

0bb6498061 fix: minor i18n

b852faf91f refs #6905 fix userPanel

3227d299e9 updates

c87629f2ec fix: accountBasicData after update

30c912fa62 reset changes

de488169b7 feat: AccountDescriptor

382591fb11 fix: refs #6273 set paymethodFk to 0 if it is external

56af348fdd feat: refs #6273 update changelog

807460dfad fix: info icon

f453f42b06 feat: New and edit ACL from Popup

9ed297207b Make create form work

f3ec9ea58d fix: VnPaginate order

fe9adb7a3c perf: minor changes

516b905305 feat: refs #7502 new icons v1.73

057e4780ae Merge branch '7502-liliumIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 7502-liliumIcons

a3d3d7d1e6 Merge pull request '#7502 new Lilium icons' (!420) from 7502-liliumIcons into dev ...

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

395eb6bed7 Merge branch 'dev' into feature/AccountRoles

aee3c67ee0 clean code

454527b0a7 remove console.log

f66d7b91f7 Merge pull request 'Account Roles' (!413) from hyervoni/salix-front-mindshore:feature/AccountRoles into dev ...

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

26c7b09b8a perf: improve handleKeyUp method

b27ae621f3 Merge branch 'dev' into 6891-addToggleFilterPanel

aba27c204a Merge pull request '#6891 add toggle' (!417) from 6891-addToggleFilterPanel into dev ...

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

985ce9a643 deploy: test to dev

f305cee3ce Account view forms

17924dfeb3 fix: styles and i18n

fe3ad9dc08 fix: styles and i18n

e178778264 fix: styles

a26401d8eb feat: hide ID

17c3a89264 fix: show exclusionEvent in Calendar

1237dd5c10 fix: style workweek

2a85fe21b0 Merge branch 'dev' into 6911-saveOnEnter

28836fc514 test: fix test beacuse use {enter}

7880f66c6e Merge branch '6911-saveOnEnter' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter

a56df46678 fix(AccountAcls): fix and optimization

53c47301c7 Merge pull request '#6911 save on enter' (!207) from 6911-saveOnEnter into dev ...

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

ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar

b54cb73c91 Merge pull request 'Zone Calendar' (!411) from hyervoni/salix-front-mindshore:feature/ZoneCalendar into dev ...

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

0ea44eb8db Merge branch 'dev' into feature/AccountAcls

7f083bde5c build: increase version

6c608e86e6 Merge branch 'feature/AccountAcls' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountAcls

edad698f72 fix: update list when update record

3f22d098b0 Merge branch 'dev' into feature/AccountAcls

f01d83cfe5 Merge pull request 'Account ACLs' (!422) from hyervoni/salix-front-mindshore:feature/AccountAcls into dev ...

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

567c9ad307 Merge branch 'dev' into feature/MailAliases

6053d42442 fix: descriptor and i18n

5551077c92 fix: roles

d0dccddcf3 fix: refs #7499 id article

5197211cf0 Merge branch 'dev' into 7499-refactorEntrys

3729817c2b Merge branch 'dev' into 6905-fixUserPanelLocal

6a9bba287b Merge pull request 'refs #6905 fix userPanel' (!423) from 6905-fixUserPanelLocal into dev ...

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

9ceac32d89 feat: refs #7548 grafana

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

d35f9c9468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection

6368342be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection

8b93dbc57d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt

213ba4ba52 chore: refs #6273 Add default pay method for internal

290325b677 refactor: refs #7003 changed order filter

d6bd3de971 refactor: refs #7003 fixed order param

deb6b448fb Merge branch 'dev' into 7003-fixedPriceOrder

dce95824be fix(AccountAlias): fix and optimization

21a412f688 Merge branch 'dev' into feature/MailAliases

301a62aa9d Merge pull request 'Mail aliases' (!418) from hyervoni/salix-front-mindshore:feature/MailAliases into dev ...

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

4c84fd9326 resolve conflicts

8d89fc2d90 feat: refs #6273 set payMethod to 0

59b85f24ea fix: refs #6273 console error

695dd36c1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt

1e67a0feca Make AccountLdap work again

fa4a18fbbb make account samba work again

2bdfc90241 build: increase version

bf3c146317 resolve conflicts

b68547ac1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt

91e0eb636f resolve conflicts

f3a28edb5e Merge branch 'dev' into 7003-fixedPriceOrder

deca90c7ea Merge pull request '#7003 new data order in section' (!398) from 7003-fixedPriceOrder into dev ...

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

049783b16c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt

911ff376fd Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev ...

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

0e0e351805 Merge branch 'dev' into 7548-ticketSummaryCollection

d81ce9fe95 feat: refs #6273 add test & improve form

5e96ed3bd3 fix: refs #6273 fix arrayData changed

5869ad220c feat: refs #6273 wip: add locale

9eed6e55be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt

9c72597c2c fix: refs #6273 tests

3f94eabc3d feat: refs #7548 añado link grafana

a64cd6fa73 refactor: refs #6273 update locale

a5b71ecebc feat: refs #6273 delete prop

9bcfd5c58a Merge pull request '#6273 create freelance form option' (!347) from 6273-createFreelanceFormOpt into dev ...

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

348310bc34 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection

c1df20a09b Worker descriptor menu

992249c638 fix: refs #6273 redirect

fbecbd0c08 Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu

d847b33def minor change

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

5e7ef68439 feat: simplify html

0289c167ee refactor: unnecessary computed

b07f7b0003 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration

f9b688fc37 Merge branch 'dev' into 6243-generalizeCmrSection

313395ef7c refs #7366 fix travelMigration

01658ee100 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl

8e9656f96a refs #7366 remove warning

c5889b2170 Merge branch 'dev' into 6273-fixRedirect

0cfaef2520 Merge pull request '#6273 fix redirect' (!434) from 6273-fixRedirect into dev ...

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

31afa22de8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration

205e7d82a6 Merge branch 'dev' into 6598-getUserAcl

31081bd471 Merge pull request '#6598 create useAcl composable' (!345) from 6598-getUserAcl into dev ...

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

11bcfb0d2d Merge branch 'dev' into 6243-generalizeCmrSection

0624f8dfb7 Merge pull request '#6243 generalize cmr section' (!349) from 6243-generalizeCmrSection into dev ...

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

adbc9dee2c Merge branch 'dev' into feature/WorkerDescriptorMenu

fde004af3c Merge pull request 'Worker descriptor menu' (!433) from hyervoni/salix-front-mindshore:feature/WorkerDescriptorMenu into dev ...

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

fac9b6a439 Merge branch 'dev' into feature/AccountConnections

ba0364e799 refs #6897 fix BasicData

57eadbc74e Merge pull request 'Account connections' (!424) from hyervoni/salix-front-mindshore:feature/AccountConnections into dev ...

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

e5a590a9f9 feat: refs #7154 new item descriptor field

989ea3d82c Merge branch 'dev' into 7154-ItemDescriptor

7ac2aed326 fix: default model value depends on route

80adeede81 fix: refs #7499 fix item reference

be919f97b1 Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys

de18b670ea feat: refs #7154 changed label

2d0b33c626 Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor

6789f3d1cb fix: refs #7499 fix style

cb0559fee8 Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev ...

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

4045a3a631 Merge branch 'dev' into 7154-ItemDescriptor

a7b805a4ab stash departmentFilter

a65f5dfe44 fix: refs #7499 use current colors

d0759cb654 Merge branch 'dev' into feature/AccountFormsView

e9051f1ee8 Merge pull request 'Account views: Accounts, Ldap, Samba' (!426) from hyervoni/salix-front-mindshore:feature/AccountFormsView into dev ...

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

df364dca4a Merge branch 'dev' into 7154-ItemDescriptor

79e84175a6 Merge pull request '#7154 new item descriptor field' (!436) from 7154-ItemDescriptor into dev ...

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

b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys

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

11c0154c48 Merge branch 'dev' into 7323_fix_workerTimeControl

ef24a5cd2f Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev ...

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

9388cb3599 Merge branch 'test' into dev

51d497a1de feat: refs #6238 add percentage & summary btn

a4c21c7673 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn

1052e9eb21 fix: refs #6238 use :deep

f414b8aa0e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7391-defaulterFilter

2641489d83 fix: refs #6238 use .value prop

b0e4dc99b0 Fix worker department create modal did not open

e464608a9f refs #7391 fix url, fix filters

34e92d130a refs #7366 fix basic-data

6e4843563c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration

19aa1bf01d fix; refs #6238 fix test

7393b82008 refactor: refs #6238 update getRate function and color logic

ffd4109dc7 Merge branch 'dev' into bugfix/WorkerDepartment

e10755d8fe Merge branch 'dev' into 7499-refactorEntrys

78042ab109 Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev ...

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

fa55e33b54 fix: refs #7566 fixed summary cards and table

2b66148ff5 Merge branch 'dev' into 7566-FixCustomerSummary

3958d5ab08 Merge branch 'dev' into 7366-travelMigration

8c5ea42be2 Merge branch 'dev' into 6897-EntryMigration

548fc374c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration

648546888d fix: DeleteDepartment VnConfirm

7d73cd0e33 Merge branch 'dev' into bugfix/WorkerDepartment

914a9afb92 Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev ...

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

fc54b44c7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn

64648c77f6 Merge branch 'dev' into 7566-FixCustomerSummary

7fccd0ae81 Merge branch '7366-travelMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration

8002f0a94b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration

bd6e45d260 refactor: refs #6238 get percentage from back

f4b7d34a7f refs #7366 fix redirect

94f4e154b0 refactor: refs #6238 use variable & link class

f64f42f473 fix: refs #6243 load warehouses & iron out column width

bc30531d42 refs #6897 fix trad

0940872625 Merge branch '6897-EntryMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration

af59da33aa Merge pull request '7366-travelMigration' (!430) from 7366-travelMigration into dev ...

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

1cf630378b Merge branch 'dev' into 6897-EntryMigration

301bb89460 Merge pull request '7391-defaulterFilter' (!446) from 7391-defaulterFilter into test ...

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

e6bf73c8d1 Merge pull request 'refs #6897 remove code fix section' (!415) from 6897-EntryMigration into dev ...

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

37af8ba8f5 fix: refs #7598 fix evt & .value

9725874d5d fix: refs #7598 fix evt & .value

024687e2d3 fix: refs #7598 fix evt & .value

b1b0f4efed Merge branch 'dev' into 6243-fixColumnWidth

fcc41f0e57 Merge pull request '#6243 load warehouses & iron out column width' (!449) from 6243-fixColumnWidth into dev ...

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

34069f4841 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn

741e6f27b1 Merge branch 'dev' into 7598-fix-formModel

f280a7d4dd Merge pull request '#7598 fix-formModel' (!453) from 7598-fix-formModel into dev ...

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

1b4bd2e7f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn

3f2779600a fix: refs #6238 drop old fix

14ef5ccefd fix: refs #6238 rollback

cbbcddfd50 fix: refs #7600 test vnLocation

4c40244d41 Merge pull request '#6238 addPercentageColumn' (!443) from 6238-addPercentageColumn into dev ...

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

4ff0901950 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7600-fix-vnLocation

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

dc0a938c4c Merge branch 'dev' into feature/AccountList

cc0eb77228 Merge pull request '#7600 test vnLocation' (!454) from 7600-fix-vnLocation into dev ...

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

cd8e99e1df perf: remove CLI warnings

ae75908e46 refactor: simplify code

546b43ffcf refactor: refs #7566 fix customer summary

e0b4d86cab Merge branch '7566-FixCustomerSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7566-FixCustomerSummary

fa425a4329 Merge branch 'dev' into 7566-FixCustomerSummary

ced1eaa801 Merge branch 'dev' into feature/AccountList

6eb44b2cd6 Merge pull request 'Account Submodule' (!412) from hyervoni/salix-front-mindshore:feature/AccountList into dev ...

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

a80caa7c93 Merge branch 'dev' into 7566-FixCustomerSummary

d5bd8c4432 fix: #7566 remove v-if

97c4130b05 Merge pull request '#7566 fixed summary cards and table' (!444) from 7566-FixCustomerSummary into dev ...

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

83428d0398 fix: refs #7599 fix spec remove enter key

188f225cf7 Merge branch 'dev' into 7599-fixspec

cd6c0f586e Merge pull request 'fix: refs #7599 fix spec remove enter key' (!460) from 7599-fixspec into dev ...

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

9f3a266239 Merge branch 'test' into 7596-devToTest_2426

43ae3d5a35 Merge pull request '7596-devToTest_2426' (!452) from 7596-devToTest_2426 into test ...

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

6aa920b70e fix: refs #6243 show rightPanel

93407d8219 Merge pull request '#6243 show rightPanel' (!468) from 6243-warmfix-showRightPanel into test ...

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

891c0d2347 feat: refs 6238 show notes & create vnPopup

bebb20c76f fix: refs 6238 drop locale

606c629d77 feat: refs #6238 function name

44d762694a fix: refs 6238 replace style

0daf61608d Merge pull request '#6238 show notes & create vnPopup' (!470) from 6238-addNotes into test ...

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

alexm added the

CR / Tests passed

label 2024-06-25 05:37:31 +00:00

guillermo approved these changes 2024-06-25 06:26:32 +00:00

alexm merged commit 86524fe9e2 into master 2024-06-25 06:40:05 +00:00

alexm deleted branch 7631_testToMaster_2426 2024-06-25 06:40:05 +00:00

alexm referenced this issue from a commit 2024-06-25 06:40:07 +00:00

Merge pull request '7631_testToMaster_2426' (!480) from 7631_testToMaster_2426 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#480

No description provided.