7983-testToMaster_2438 #2977

Merged

alexm merged 212 commits from 7983-testToMaster_2438 into master 2024-09-17 05:36:47 +00:00

Conversation 0 Commits 212 Files Changed 1287 +2782 -7278

alexm commented 2024-09-16 13:20:28 +00:00

Member

Copy Link

No description provided.

alexm added 212 commits 2024-09-16 13:20:29 +00:00

e404688042 refs #7407 create models

313c05f654 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical

774d55d4ae refs #7407 fix acls fixtures

2d3311b824 refs #6898 fix supplier remove

7619fa74ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

cf4a7c8fba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical

d0ddbe6a8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

7f278269a5 feat(AccessToken&ACL): refs #7547 upgrade security

827f3f6d1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

ca91c3926e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

a26f6eaf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical

ebdd6bd08c fix merge dev

a68f252658 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

2a203926b9 feat: refs #7564 Added volume column

1e5fd8002c feat: refs #7564 Added proc

2f8df96ba7 feat: refs #7564 Added ticket_setVolumeItemCost

f37dcddbb4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

14bc6f1232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

2064107897 feat(salix): #7671 define isDestiny field in model

1be04babe4 Merge branch 'dev' into 7671_dense_itemFixedPrices

ea626821fc feat(ssalix): refs #7671 #7671 checkDates

39b52e706a feat: refs #7615 setDeleted

373497e031 Merge branch 'dev' into 7615-ticketRefundSetDeleted

9c5f38648a feat(ssalix): refs #7671 #7671 checkDates to present

625ab07e48 Merge branch 'dev' into 7615-ticketRefundSetDeleted

9206826135 Merge branch 'dev' into 7671_dense_itemFixedPrices

d85f40d725 Merge branch 'dev' into 7615-ticketRefundSetDeleted

c5cb4d84f1 Merge branch 'dev' into 7671_dense_itemFixedPrices

4ff61a75e0 Merge branch 'dev' into 7615-ticketRefundSetDeleted

304405a8a3 Merge branch 'dev' into 7671_dense_itemFixedPrices

10a4831f95 Merge branch 'dev' into 7615-ticketRefundSetDeleted

b8244b48e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security

94aefb057c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security

9340d47485 test: fix connections e2e

d8f1368b32 Merge branch 'dev' into 7615-ticketRefundSetDeleted

219740f669 feat: refs #7759 Changed definer root to vn-admin

4259339afb Merge branch 'dev' into 7615-ticketRefundSetDeleted

8845f78383 test: refs #7615 add test to setDeleted

729a0bb166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

15e2808d37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

cfa487a80f Merge branch 'dev' into 7615-ticketRefundSetDeleted

6de9ea4b16 Merge branch 'dev' into 7759-newDefiner

e0b9100de1 fix

5d91566cc0 Merge branch 'dev' into 7759-newDefiner

18dc3873b8 feat: refs #7650 Added no transfer lines to inventory entry and fixtures

0451e4bb2a feat: refs #7650 Fix tests

d74a04a881 feat: deleted code and redirect to Lilium

179c3c30d8 Merge branch 'dev' into InvoiceOut_Migration

67764f4139 Merge branch 'dev' into 7615-ticketRefundSetDeleted

1e711b63fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration

460b9899c0 refactor: deleted e2e & added back descriptor and summary

524acea70c Merge branch 'InvoiceOut_Migration' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration

4fc43df11b feat: refs #6650 new itemShelvingLog

8e63d85964 feat: refs #7759 Changed name

3087a14248 Merge branch 'dev' into 7759-newDefiner

6acd3e0b1d feat: refs #7759 Changed defined only of vn objects

7fc47f0506 feat: refs #7564 Requested changes

8a03650eca feat: refs #7564 Requested changes

289dc58be4 Merge branch 'dev' into 7564-ticketVolume

2b12e046e4 feat: refs #7564 Fix version

9154507b72 Merge branch '7564-ticketVolume' of https://gitea.verdnatura.es/verdnatura/salix into 7564-ticketVolume

c991f32f5a feat: refs #7564 Fix version

de73ee4718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration

1e91d689c5 Merge branch 'dev' into 7564-ticketVolume

5f06ae5cf4 feat: refs #6760 refs #actualiza campo nickname

b00070fd1a Merge branch 'dev' into 6760-transferClient

b317c8c462 fixes: refs #7760 collection problems

3ac2c18da5 fixes: refs #7760 collection problems

44072de928 fixes: refs #7760 collection problems

58f8903b53 fixes: refs #7760 collection problems

6090e8ceee fixes: refs #7760 collection problems

db2215e3fa feat(salix): refs #7896 update version and changelog

df8fe4f1cd Merge pull request '7896_down_devToTest_2436' (!2892) from 7896_down_devToTest_2436 into dev ...

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

16fd69904b fixes: refs #7760 collection problems

97b839bf1a fix: refs #6727 No delete log tables data in clean procedures

fdeb041e56 Merge branch 'test' into dev

484bb48d04 fix: refs #7760 collection problems

a8ee92f891 Merge branch 'dev' into 6760-transferClient

a4e09884db Merge pull request 'feat: refs #6760 refs #actualiza campo nickname' (!2883) from 6760-transferClient into dev ...

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

1a47040e75 Merge pull request 'fixes: refs #7760 collection problems' (!2888) from 7760-Refactor-collection_assign into dev ...

Reviewed-on: #2888
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

5e95e0465c Merge branch 'dev' into 6727-noDeleteLogInProc

e6e142ce80 Merge pull request 'fix: refs #6727 No delete log tables data in clean procedures' (!2896) from 6727-noDeleteLogInProc into dev ...

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

6cb6110b14 Merge branch 'test' into dev

611fbebd6d feat: refs #7811 Added new params in datasources.json

1e3ab2d31a feat: refs #7905 Added param toCsv

c7777f609b feat: refs #7811 Added new params in datasources.json

72b4607d54 feat: refs #7905 Added new method getBuysCsv

e50c67c305 feat: refs #7905 Added new method getBuysCsv

4e52f344f4 feat: refs #7811 Added comment

0f4bc3f83b feat(salix): refs #7905 #7905 use getBuys toCSV flattened

b451641d47 fix: refs #6897 fix filter

e8010d0f18 fix: refs #6897 fix json

26d93ef474 fix: refs #6897 travel filter

f65d36011b fix: refs #6897 back

4a7d81f920 fix: refs #6897 back and tests

cde5e20260 Merge pull request 'fix: refs #6897 fix filter' (!2901) from 6897-entryMigrationFilterFix into dev ...

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

51535bfa6b feat: refs #7277 refundInvoices

c45a861ef4 feat: refs #7277 fdescribe

d46a93a96f Merge branch 'dev' into 7564-ticketVolume

ac36762e21 feat: refs #7277 fdescribe

b7fa6735a5 Merge pull request 'feat: refs #7564 Added volume column' (!2664) from 7564-ticketVolume into dev ...

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

2e3fb7646f feat: refs #7277 fit

e2f1fea6be fix: refs #7277 error test

8aa4427693 Merge branch 'dev' into 7905-getBuysCsv

8fee3dd706 Merge branch 'test' into dev

9d35cbfae4 Merge branch 'dev' into 7650-triggerInv

48c7d1d783 Merge branch 'dev' into 7277-RefundInvoices

48bf5004a6 Merge branch 'dev' into 7615-ticketRefundSetDeleted

355714fec8 test: refs #7277 fix test proposal

9485434dc2 Merge pull request 'feat: refs #7811 Added new params in datasources.json' (!2898) from 7811-datasourcesAddParams into dev ...

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

6f022bc232 Merge pull request 'feat: refs #7650 Added no transfer lines to inventory entry and fixtures' (!2803) from 7650-triggerInv into dev ...

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

28a34fa5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical

7ab1eea7e9 Merge branch 'test' into dev

6fc8b9b821 feat: ticket 215005 Changed acl show transferClient

8e34e78964 Merge branch 'test' into dev

5468049b26 Merge branch 'dev' into 6650-shelvingLog

6b53c24f20 feat: refs #6650 Added saleGroupLog

32fa4155dd Merge pull request 'feat: refs #6650 new itemShelvingLog' (!2847) from 6650-shelvingLog into dev ...

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

77fd3e7f46 feat: refs #7898 Add column "floor" in vn.parking

652395bee1 feat: refs #7277 transfer addressFk

a1bc881385 Merge branch '7277-RefundInvoices' of https: refs #7277//gitea.verdnatura.es/verdnatura/salix into 7277-RefundInvoices

d54361a0bc Merge branch 'dev' into 7277-RefundInvoices

c5521ea021 Merge branch 'test' into dev

99243fa248 feat: refs #7277 traducciones

fbfbcf9bd4 Merge branch 'test' into dev

c1e76e4c43 Merge branch '7277-RefundInvoices' of https://gitea.verdnatura.es/verdnatura/salix into 7277-RefundInvoices

2bb73af47d Merge branch 'test' into dev

b66386fdb1 Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev ...

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

4c96d57491 Merge branch 'dev' into 7615-ticketRefundSetDeleted

34d0cb76e8 Merge pull request 'feat: refs #7615 setDeleted' (!2719) from 7615-ticketRefundSetDeleted into dev ...

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

03d711b694 chore: refs #7524 add select limit

d49707828b fix(salix): refs #7905 #7905 use right fn to flatten data

2b465d0d23 Merge branch 'dev' into 7905-getBuysCsv

2aeff19578 fix: refs #7905 added comments to flatten.js

f6e585433a Merge branch '7905-getBuysCsv' of https://gitea.verdnatura.es/verdnatura/salix into 7905-getBuysCsv

6df817ea5d Merge branch 'test' into dev

d0eab064b7 Merge branch 'dev' into 7905-getBuysCsv

e98313a1a5 Merge branch 'dev' into 7524-addFixture

8ca491b8de Merge branch 'dev' into 7759-newDefiner

97f409183e Merge pull request 'feat: refs #7759 Changed definer root to vn' (!2769) from 7759-newDefiner into dev ...

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

dc236dbf82 Merge pull request 'Redirect invoice out to Lilium' (!2807) from InvoiceOut_Migration into dev ...

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

bb401af086 Merge branch 'dev' into 7524-addFixture

40a1b24403 Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev ...

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

ac01da5eed feat: refs #7759 Deleted version 11163-maroonEucalyptus

5a51d5c07b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

620ce5d45e Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev ...

Reviewed-on: #2900
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

4869322476 Merge branch 'dev' into 7524-addFixture

ac8b101455 feat: refs #7898 Modify default

72024fb854 fix: refs #7759 Added user 'vn'@'localhost' & grants

f193938264 Merge branch 'dev' into 7898-New_column_floor_parking

718c37e057 feat: refs #7532 Requested changes

671dc0342a Revert commit

1b8583a19d feat: refs #7759 Revoke routine grants vn

747e6a562a feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval

0626b83370 Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval

26db88b344 Merge branch 'dev' into 7898-New_column_floor_parking

78a851336f chore: refs #7323 worker changes wip

46a4b577ce feat: refs #7277 test with warehouse

b0abe829b1 fix: refs ##7905 Handle error

0a7a9e2cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole

18d93d93a6 chore: refs #7323 worker changes

2df9bb9bdb Merge branch 'dev' into 7524-addFixture

8e87b7e6ba Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval

87d23b327a Merge pull request 'chore: refs #7524 add select limit' (!2923) from 7524-addFixture into dev ...

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

af929c1ee9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole

d9c860c44a Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval

0d6ae2fecd Merge pull request 'feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval' (!2929) from 7747-DeleteBuyUltimateAndBuyUltimateFromInterval into dev ...

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

762975ed14 Merge branch 'dev' into 7898-New_column_floor_parking

9eb2da621b Merge pull request 'feat: refs #7898 Add column "floor" in vn.parking' (!2912) from 7898-New_column_floor_parking into dev ...

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

a718b6e81f Merge branch 'test' into dev

3d985d10d3 Merge pull request 'feat: refs #7277 test with warehouse' (!2931) from 7277-refunding into dev ...

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

b277ae2d92 Merge branch 'dev' into 7323-dynamicRole

05b75c1f0d Merge pull request 'chore: refs #7323 worker changes wip' (!2930) from 7323-dynamicRole into dev ...

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

eb11e18df5 fix: refs #7323 fetch from right source

6065c056e2 chore: refs #7323 fix test

0a4bd0f2d5 chore: refs #7323 fix test

ba2c5cb209 chore: refs #7323 filter data

59cce5d349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices

dbd8f94555 perf: refs #7671 improve showBadDates

5c4a30f2f9 perf: refs #7671 improve showBadDates

632d3190b1 feat: refs #7938 remove unnecessary insert in clientLog

c4527cc5c5 feat: refs #4515 New throw buy_checkItem

af1cab44eb Merge pull request 'fix: refs #7323 fetch from right source' (!2933) from 7323-replaceWorkerDataSource into dev ...

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

0c4b9dcdae Merge pull request 'feat: refs #4515 New throw buy_checkItem' (!2935) from 4515-throwBuyCheck into dev ...

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

d7613767fb Merge pull request 'feat: refs #7938 remove unnecessary insert in clientLog' (!2934) from 7938-unnecessary_insert_clientLog into dev ...

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

6012604946 perf(salix): refs #7671 #7671 imrpove and revert where changes

57dbdc6f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices

7710b87f4a test(salix): refs #7671 #7671 improve and revert where changes

44a183785e Merge branch 'dev' into 6998-supplierMigration

daf3dfd2ee Merge branch 'test' into dev

01690ed081 Merge branch 'dev' into 6998-supplierMigration

a25dac140e Merge pull request 'refs #6898 fix supplier remove' (!2605) from 6998-supplierMigration into dev ...

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

0949112b13 Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security

5a04083d31 Merge pull request 'feat(AccessToken&ACL): refs #7547 upgrade security' (!2630) from 7547-accessToken-security into dev ...

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

03d4427bcd Merge branch 'dev' into 7671_dense_itemFixedPrices

1a0fb2fecd Merge pull request 'feat(salix): #7671 define isDestiny field in model' (!2681) from 7671_dense_itemFixedPrices into dev ...

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

946806c98e Merge branch 'test' into dev

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

e74da7cbab feat: refs #7953 pullinfo

8e5d088797 Merge pull request '7953-devToTest_2438' (!2942) from 7953-devToTest_2438 into test ...

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

01d591af53 fix: refs #7564 Deleted query

4c6aba96e5 Merge branch 'master' into test

8518351790 Merge branch 'master' into test

1ef9cc0458 Merge pull request 'master' (!2957) from master into test ...

Reviewed-on: #2957
Reviewed-by: Robert Ferrús <robert@verdnatura.es>

2e34f1bbe6 Merge branch 'master' into test

e7343b7e25 fix: refs #7760 tmp.ticketIPT

33540063f4 fix: refs #7760 tmp.ticketIPT

9d50b228f6 Merge pull request '7760-tmp.ticketIPT' (!2973) from 7760-tmp.ticketIPT into test ...

Reviewed-on: #2973
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>

8803ae0534 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

2e03fe8193 fix: refs #7760 tmp.ticketIPT

d46be39786 chore: refs #7983 changelog

3011421526 fix: refs #7983 correct version

guillermo approved these changes 2024-09-17 05:36:21 +00:00

alexm merged commit fa0c8689d4 into master 2024-09-17 05:36:47 +00:00

alexm deleted branch 7983-testToMaster_2438 2024-09-17 05:36:47 +00:00

alexm referenced this issue from a commit 2024-09-17 05:36:49 +00:00

Merge pull request '7983-testToMaster_2438' (!2977) from 7983-testToMaster_2438 into master

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

No description provided.