8315-devToTest #3313

Merged

alexm merged 228 commits from 8315-devToTest into test 2024-12-18 10:30:39 +00:00

Conversation 0 Commits 228 Files Changed 84 +1435 -475

alexm commented 2024-12-17 09:39:19 +00:00

Member

Copy Link

No description provided.

alexm added 164 commits 2024-12-17 09:39:19 +00:00

bca22e8ad3 fix: refs #6389 saleMonitor filter

4fc3ee0ea6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

dfdd8f28d4 fix: refs #6389 filter

99bec3e7fe fix: refs #6389 salesFilter

bdec144b17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

b897d28e31 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

3318faffc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

55483f8e6b fix: refs #6389 packing

f1370d6960 feat: refs#8174 simSupplier

1c49c073ee feat: refs #8002 drop support btn

b75b369716 feat: refs #8002 adjust to lilium

873b91f113 chore: refs #8002 drop comments

021fd901b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium

285fe67ca5 chore: refs #8002 drop useless code

dbf5953d69 refactor: refs #8002 use loop wip

ca641e555f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium

69314171ea feat: refs #8190 entry_getCommission

1ed8c01712 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium

19fa05e774 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

6e6a5ea654 Merge branch 'dev' into 6389-changesMonitor

38958ca5fb Merge branch 'dev' into 6389-changesMonitor

c63dfba7da feat: refs #7301 add inventory-config and acl

c3844a8312 Merge branch 'dev' into 6389-changesMonitor

c17069a909 Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries

e92ce939b8 refactor: refs #7301 update entry and item filter tests to validate results against specific criteria

2ba931bedb Merge branch 'dev' of https: refs #7301//gitea.verdnatura.es/verdnatura/salix into 7301-itemLastEntries

96902afc83 Merge branch 'dev' of https: refs #8190//gitea.verdnatura.es/verdnatura/salix into 8190-entry_getCommission

5a92fe1691 feat: refs #8190 entry_getCommission

72b2bd688e Merge branch 'dev' into 8190-entry_getCommission

d9aa11b3e9 feat: refs #8190 entry_getCommission change request

70042c02aa Merge branch 'dev' into 8190-entry_getCommission

e3971848e8 Merge branch 'dev' into 8190-entry_getCommission

7202cc93a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

a4c91e2548 Merge branch '6389-changesMonitor' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

d5693291f0 refactor: refs #8004 simplify SQL query by removing redundant aliases

1d59d4eeef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8004-liliumStyleRemake

7afd14a301 Merge branch 'dev' into 8190-entry_getCommission

b49595fb13 Merge branch 'dev' into 8190-entry_getCommission

a85d797edc chore: pullinfo

c25b77c4bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

6ae2853c4d Merge branch 'test' into dev

424a0c8079 fix: refs #6389 packing

a8c7dea77f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

71da7772d9 build: new version

91db8817ef Merge branch 'dev' into 8004-liliumStyleRemake

fcaf854c87 Merge pull request '8004-liliumStyleRemake' (!3257) from 8004-liliumStyleRemake into dev ...

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

123c0db126 feat: modified data to be equal as the updated back

fad6f33b7c fix: refs #7031 remove check

41a3f9ae94 refactor: refs #8272 delete bi.rotacion

86a36732f0 Merge pull request 'refactor: refs #8272 delete bi.rotacion' (!3275) from 8272-deleteBi.rotacion into dev ...

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

127842a705 Merge branch 'test' into dev

483966501a fix: refs #7031 fix vnPrice

1c51516aeb Merge branch 'dev' into 7031-zonePrice

34f9f9b29f Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

85fe8e5575 Merge branch 'test' into dev

97f08542be feat: added translations and show error in item-type

04a96e87d6 refactor: refs #7882 Deleted quadminds files

185956b2c3 Merge pull request 'refactor: refs #7882 Deleted quadminds files' (!3280) from 7882-byeQuadminds into dev ...

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

8960b54664 feat: refs #7882 Added locationiq service

0dc1b9c80b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

0bb9282953 feat: refs #7882 Added locationiq service

d6abcdbca8 Merge branch 'dev' into 7031-zonePrice

e279cc4b47 feat: refs #7882 Added osrm service

85baf151d9 feat: refs #7882 Fixed problems osrm service

4a7712779b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8002-refactorToLilium

87577d0982 Merge pull request '#7283 Items module: added translations and show error in item-type' (!3278) from Fix-ItemsModuleBack into dev ...

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

94bc1241e5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

cba5d88c5e feat: refs #7882 Osrm service

06230d6b2a Merge pull request 'refs #8257 test into dev' (!3287) from test into dev ...

Reviewed-on: #3287

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

391f1d8c97 fix: refs #7028 fix confirm deny

535b04e1df Merge branch 'dev' of https: refs #7031//gitea.verdnatura.es/verdnatura/salix into 7031-zonePrice

2dfc58564e Merge branch '7031-zonePrice' of https://gitea.verdnatura.es/verdnatura/salix into 7031-zonePrice

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

10558853a2 feat: refs #8174 create table simsupplier

8797635101 feat: refs #8174 fix

ce58a9ab2c Merge branch 'dev' into 8174-crearTablaSim

83fd11eba8 Merge branch 'dev' into 7031-zonePrice

1af288862a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6389-changesMonitor

bc3afa81e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

c8ec94bed9 feat: refs #7882 Osrm service

34da78e1ba fix: refs #6389 back

5bf18990ca Merge branch 'dev' into 8002-refactorToLilium

76253300b6 Merge pull request '#8002 adjust to Lilium' (!3199) from 8002-refactorToLilium into dev ...

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

28ab6b2266 feat: refs #8174 fix

193e628118 Merge branch '8174-crearTablaSim' of https://gitea.verdnatura.es/verdnatura/salix into 8174-crearTablaSim

7886adb8f5 Merge branch 'dev' into 8190-entry_getCommission

0d26c52d5d Merge branch 'dev' into 8174-crearTablaSim

252a029c98 feat: refs #7882 Osrm service

bc072208d7 Merge branch 'dev' into 7882-osrm

093fdb6cb3 fix: refs #6389 back

186ef52518 feat: refs #7882 Osrm service

956673cf56 Merge branch 'dev' into Invoice-Out-TransferInvoice

aba2bf6082 fix: refs #8251 add eng template

65e195d77d feat: refs #7882 Requested changes

c8f26bbbab refactor: refs #8266 changed expedition item name

b5d4d31abb fix: refs #7301 update ACL insertion to use INSERT IGNORE and refine property value

201b9b049b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

efcf4d225b fix: refs #7028 fix pr

2885facc01 Merge branch 'dev' into 7031-zonePrice

a9f1c8b393 Merge pull request '7031-zonePrice' (!3276) from 7031-zonePrice into dev ...

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

33287938ec Merge branch 'dev' into 7301-itemLastEntries

6282e3105d Merge branch 'dev' into 8251-engTemplates

7fe3369c35 Merge pull request '#8219: Modified data to be equal as the updated back' (!3274) from Invoice-Out-TransferInvoice into dev ...

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

6c35634bfb Merge branch 'dev' into 8251-engTemplates

b3eb8334ca Merge branch 'dev' into 7028-itemRequestConfDeny

423201f97b Merge pull request 'fix: refs #8251 add eng template' (!3296) from 8251-engTemplates into dev ...

Reviewed-on: #3296
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>

6beb1a18cb Merge branch 'dev' into 6389-changesMonitor

9c53fe9f60 Merge branch 'dev' into 7028-itemRequestConfDeny

43697eaba7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

1970b9c0db fix: refs #7028 fix tback findById

e9d304f2ba Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

a14989ddcf Merge pull request 'fix: refs #6389 saleMonitor filter' (!3130) from 6389-changesMonitor into dev ...

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

d35e785bee Merge branch 'dev' into 7028-itemRequestConfDeny

03ba892581 Merge branch 'dev' into 8266-changeExpeditionItemName

cd214b3526 fix: refs #7028 fix userError

dcd8b1ee15 Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

47a7fac0fe Merge pull request '#8266 changed expedition item name' (!3297) from 8266-changeExpeditionItemName into dev ...

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

f66b3f1cbd Merge branch 'dev' into 7028-itemRequestConfDeny

95d7c7f227 Merge branch 'dev' into 7882-osrm

8e61160aeb Merge pull request 'feat: refs #7301 add inventory-config and acl' (!3230) from 7301-itemLastEntries into dev ...

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

05ba85219b feat: refs #7882 Osrm service

bfad016ec4 Merge branch 'dev' into 7882-osrm

00b5333ab7 feat: refs #7882 Added tests

3cdb6c438b Merge branch 'test' into dev

11827207ba Merge pull request 'feat: refs#8174 simSupplier' (!3158) from 8174-crearTablaSim into dev ...

Reviewed-on: #3158
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

ec2b6dd0c2 Actualizar db/versions/11327-maroonOak/00-firstScript.sql

09e7ee4e43 Merge branch 'dev' into 7028-itemRequestConfDeny

233f45a07a feat: refs #7882 Reequested changes

e1db7a86f6 Merge branch 'dev' into 7882-locationiq

eadffe1ed9 Merge pull request 'feat: refs #7882 Added osrmservice' (!3281) from 7882-locationiq into dev ...

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

57c3cc8546 feat: refs #8174 Created table sim

10c28b03da Merge branch 'dev' of https: refs #7028//gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

e70ace613e Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

d42ff07547 feat: refs #8174 Changed datatype incompatibility access

d9a6e8a1c9 refactor: refs #7882 Added ACL's

71fb3996cd refactor: refs #7882 Added ACL's

32d9a3ace1 fix: refs #7028 remove ifs

d620f722b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

1e471ac20f fix: refs #7028 requesterId fix

e7e6c88ec5 Merge branch 'dev' into 8190-entry_getCommission

36705a028e fix: refs #8174 Version

d14621c2d2 Merge branch 'dev' into 8190-entry_getCommission

692b1070e8 Merge branch 'dev' into 7028-itemRequestConfDeny

5346dd845e feat: refs #8218 Added time and code in mistakeType

4ba8c91c1e Merge pull request 'feat: refs #8190 entry_getCommission' (!3207) from 8190-entry_getCommission into dev ...

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

a6bb381b74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

1090a78e10 Merge branch '7028-itemRequestConfDeny' of https://gitea.verdnatura.es/verdnatura/salix into 7028-itemRequestConfDeny

576641d09d fix: refs #7028 requesterId fix

5f43c0440c fix: refs #7028 requesterId fix salesPerson

f9434871d8 Merge pull request 'fix: refs #7028 fix confirm deny' (!3290) from 7028-itemRequestConfDeny into dev ...

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

fda2c5725a refactor: refs #8262 Deprecated inventoryFailure

d03a2ced04 fix: refs8174 pasar a char el PIN

7232bfb7a6 fix: 8174 pasar PIN a CHAR

deb1b68c49 fix: refs#8174 fix

11db90c67c fix: refs#8174 fix

de69a8db1d fix: refs#8174 fix

48064d6393 fix: refs #8174 fix

5a7ac8dcb3 fix: refs #8174 fix

6a3cbed3dd fix: refs #8174 fix

8166414678 Merge pull request 'fix: refs #8174 pasar a char el PIN' (!3312) from 8174-hotfix into dev ...

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

4f4eb389c9 Merge pull request 'feat: refs #8218 Added time and code in mistakeType' (!3310) from 8218-workerMistake into dev ...

Reviewed-on: #3310
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

db2a102a88 Merge pull request 'refactor: refs #8262 Deprecated inventoryFailure' (!3311) from 8262-byeInventoryFailure into dev ...

Reviewed-on: #3311
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

2cd1991a96 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

alexm added 3 commits 2024-12-18 06:08:31 +00:00

acfafa1c72 fix: monitorPayMethodFilter

148b82ea93 Merge pull request 'fix: monitorPayMethodFilter' (!3315) from warmfix-monitorPayMethodFilter into dev ...

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

1a8b05c46b fix: refs #8315 fixture claimDevelopment

alexm added 60 commits 2024-12-18 10:23:38 +00:00

ca3ac64072 feat: refs #4460 invoiceIn refund

2a1fa8ca68 feat: refs #4466 invoiceIn refund

679dd6929b feat: refs #6583 add new opt in where builder

598813cbd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

611cd12392 feat: refs #6583 retrieve cloned sale

72dcb84523 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

e9df8e06c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

41512a0516 refactor: refs #6583 entry report table style

3db6ab0778 feat: refs #6583 rollback

88e92648e9 Merge branch '6583-addOnlyDestination' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

2f3efa15ba feat: refs #6583 rollback

ad35a354a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-facturas-recibidas

9a645c3288 fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table

a68e287b23 refactor: refs #7936 remove old trigger and add isRaid column to travel table

6ab25c2ff5 fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table

4234e614fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

5db1262e08 feat: refs #7936 add company filter

4bb3305704 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

ba51052d88 feat: refs #7936 add SiiTypeInvoiceIn model and update invoice correction logic

f92543a628 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

7d5ae9dfbd feat: refs #7936 add reference rates for currency in fixtures

c270ec3723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

1f6e401e39 feat: refs #7936 add save validation

332e1c62d9 feat: refs #7936 add validation to InvoiceIn & InvoiceInTax

03bf115831 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

9ece52c5ce feat: refs #7936 add currency check to updateInvoiceIn

163c6ddd20 feat: refs #7936 add currency handling in invoiceIn trigger

c9cf96676b fix: refs #7936 check if insert in hook & change test description

ac87905351 feat: refs #7936 add back test for updateInvoiceIn

59b5dd5a36 feat: refs #7936 add tests for invoiceIn

00085f2b99 feat: refs #7936 add tests for invoiceIn filter

9d26a9df7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

5b04debfb1 refactor: refs #7936 add transaction & tests

ea5bf85b55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

db8ab307ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

7c2c56ed9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

f69dfbd5aa refactor: refs #7936 remove schema

fcb842d948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

46448d5fc2 fix: refs #7936 change type

2a2b4b139b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

c0b1fe3994 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

addb093b6b feat: refs #7936 add minimum due date

8b37d99287 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

c83f34859a feat: refs #7936 return country code & is vies fields

9c32dc5707 feat: refs #8293 include zone data

4612bf2e9b Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

d9eab36160 fix: refs #7936 conflicts

6476eb28e6 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

b4c8e16019 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

f965f7aa52 fix: refs #6583 update onlyWithDestination logic to handle null values correctly

b935878dd6 feat: refs #6583 add tests

9ac8e60f0c fix: refs #6583 drop focus

31952725aa refactor: refs #6583 use warehouseId var

52a0e718c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

43d5243766 Merge pull request 'feat: refs #8293 include zone data' (!3309) from 8293-addZoneToClaimList into dev ...

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

8f1fb0a120 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination

3deaa8a95b Merge pull request '#6583 add new opt in where builder' (!3162) from 6583-addOnlyDestination into dev ...

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

7a3339b623 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn

dd5d9bcb08 Merge pull request '#7936 fineTunningInvoiceIn' (!3251) from 7936-fineTunningInvoiceIn into dev ...

Reviewed-on: #3251
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

116ec5b107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest

guillermo approved these changes 2024-12-18 10:24:11 +00:00

alexm added 1 commit 2024-12-18 10:26:52 +00:00

cfee497adb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest

alexm merged commit 0f40d6d0ec into test 2024-12-18 10:30:39 +00:00

alexm deleted branch 8315-devToTest 2024-12-18 10:30:39 +00:00

alexm referenced this issue from a commit 2024-12-18 10:30:41 +00:00

Merge pull request '8315-devToTest' (!3313) from 8315-devToTest into test

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

Labels

Clear labels   

CR / Tests passed

Unit tests and e2e passed

  

e2e

Implement e2e

  

Missing tests

Missing tests

  

Needs refactor

  

Simple

Simple check / No CR needed

No Label

CR / Tests passed

e2e

Missing tests

Needs refactor

Simple

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

No description provided.