#7896 - 24.36 Dev To Test #2884

Merged

jsegarra merged 118 commits from dev into test 2024-08-27 10:32:53 +00:00

Conversation 0 Commits 118 Files Changed 228 +1150 -4336

jsegarra commented 2024-08-27 05:54:18 +00:00

Member

Copy Link

No description provided.

jsegarra added 106 commits 2024-08-27 05:54:19 +00:00

4d7ac901c6 feat: refs #3199 Added more scopes ticket_recalcByScope

1ba6bf9a9c feat: refs #3199 Added more scopes ticket_recalcByScope

5fe88faabd Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry

7d47a986bf feat: refs #3199 Created ticket_recalcItemTaxCountryByScope

9112d4bfcc Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry

2cee9c9c01 feat: refs #3199 Added one more scope ticket_recalcByScope

9b09bc4efb feat: refs #3199 Added one more scope ticket_recalcByScope

098bda0f9c Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry

4757ce11a3 refactor: refs #7567 Fix and improvement

618baaf604 usa campo factura multipe

63763f2b22 Merge branch 'dev' into 7346

625b3a5608 refactor: refs #7567 Minor change

e61210fd17 feat: #3199 Requested changes

8f623bd51e feat: refs #7346 mas intuitivo

baa1498923 feat: refs #7712 sizeLimit

a01ae9b7b8 fix: refs #7756 Foreign keys invoiceOut

766da06c2f feat: refs #7524 add mock limit on find query

82c28e0399 chore: refs #7524 WIP limit call

c31e33535d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect

b3b7e9c213 fix: refs #7524 default limit select

b64b91e50f feat: refs #7524 wip remote hooks

3ee9833a70 fix: refs #7355 remove and tests accounts

3adb73cddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7524-limitSelect

bbe5306088 feat: refs #7524 add default limit

61d6efaea7 refactor: refs #7798 Drop bi.Greuges_comercial_detail

f421ae5ec6 Merge pull request 'refactor: refs #7798 Drop bi.Greuges_comercial_detail' (!2853) from 7798-greugesComercialDetail into dev ...

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

459254a652 Merge pull request 'test to dev' (!2855) from test into dev ...

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

e4dc86c685 Merge branch 'test' into dev

38cf5af23e feat: refs #7842 Added editorFk in vn.host

360e20545a feat: refs #7799 Added Fk in vn.item.itemPackingTypeFk

22ee4f1853 refactor: refs #7848 adapt to lilium

ef1b4ef0a4 feat(update-user): refs #7848 add twoFactor

6b2499909b Merge branch 'dev' into 7848-recoveryPassword

dd5845abae fix: refs #7800 tpvMerchantEnable PRIMARY KEY

68ee5e3549 fix: refs #7800 tpvMerchantEnable PRIMARY KEY

bad6447b72 Merge pull request '7848-recoveryPassword' (!2858) from 7848-recoveryPassword into dev ...

Reviewed-on: #2858
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

f5fd85771f Merge branch 'dev' into 7355-accountMigration2

7f543e8d3a Merge branch 'dev' into 7346

912cfd3721 Merge pull request 'fix: refs #7800 tpvMerchantEnable PRIMARY KEY' (!2861) from 7800-tpvMerchantEnable into dev ...

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

f21c292e20 Merge branch 'dev' into 7346

3ee377156b fix: refs #7355 remove and tests accounts

834f62a724 Merge branch '7355-accountMigration2' of https://gitea.verdnatura.es/verdnatura/salix into 7355-accountMigration2

8d35e95731 Merge branch 'test' into dev

c26bfffada Merge branch 'dev' into 7355-accountMigration2

b81f9bb32e Merge pull request 'fix: refs #7355 remove and tests accounts' (!2850) from 7355-accountMigration2 into dev ...

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

2aaad4316b Merge branch 'dev' into 7524-limitSelect

0d583e6351 Merge pull request '#7524 add limit on GET with filter param' (!2802) from 7524-limitSelect into dev ...

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

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

575577d29b feat: refs #7346 add multiple feature

ccfb53891f Merge branch 'dev' into 7346

b1ef037272 Merge branch 'dev' into 7756-fixRefFk

fc1767cab4 refactor: refs #7756 Fix tests

3412e919c4 Merge pull request 'fix: refs #7756 Foreign keys invoiceOut' (!2799) from 7756-fixRefFk into dev ...

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

0fcff01433 refactor: refs #7756 Fix tests

f9d0afa5da feat: refs #7712 Fix

1f5145ba9e feat: refs #7712 Unify

340348a38e feat: refs #7346 backTest checks new implementation

65ba1d4664 feat: refs #7346 backTest checks new implementation

55799719ae fix: refs #7346 minor error

45fa615daf Merge branch 'dev' into 7712-sizeLimit

c1810eaccf Merge pull request 'feat: refs #7712 sizeLimit' (!2797) from 7712-sizeLimit into dev ...

Reviewed-on: #2797
Reviewed-by: Pako Natek <pako@verdnatura.es>

a995d80b46 feat: refs #3199 Requested changes

d0f1362f85 feat: refs #3199 Requested changes

1db68c08ed Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry

d2bd408e31 feat: refs #3199 Requested changes

a967be51e2 Merge branch '3199-ticket_recalc_itemTaxCountry' of https://gitea.verdnatura.es/verdnatura/salix into 3199-ticket_recalc_itemTaxCountry

92f01f79d3 feat: refs #7800 Added company Fk

2d4acd0f00 feat: refs #7784 Changes in entry-order-pdf

83f44e5a1d Merge pull request 'feat: refs #7800 Added company Fk' (!2871) from 7800-tpvMerchantEnableFk into dev ...

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

cf7ee3d990 feat: refs #7784 Requested changes

04235e85e6 Merge branch 'dev' into 7784-entryOrderPdf

d2709a871c feat: refs #7514 Changes to put srt log

0bd64a790e Merge branch 'dev' into 7567-movingCleanFix

62176b8517 feat: refs #7567 Changed time to call event

4839add2b4 Merge branch '7567-movingCleanFix' of https://gitea.verdnatura.es/verdnatura/salix into 7567-movingCleanFix

29b779d6ab feat: refs #7882 Added quadMindsConfig table

c641b47a9b feat: refs #7882 Added quadMindsConfig table

d63a1c5497 feat: refs #7882 Added quadMindsConfig table

ed5b012d3f Merge pull request 'feat: refs #7882 Added quadMindsConfig table' (!2874) from 7882-quadMindsConfig into dev ...

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

9c4f4ad5a9 Merge branch 'dev' into 7514-srtLog

ae985312a9 Merge pull request 'feat: refs #7514 Changes to put srt log' (!2873) from 7514-srtLog into dev ...

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

73fedfabea Merge branch 'dev' into 3199-ticket_recalc_itemTaxCountry

35c49b4708 Merge pull request 'feat: refs #3199 Added one more scope ticketTotal' (!2447) from 3199-ticket_recalc_itemTaxCountry into dev ...

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

32ae8282f1 Merge branch 'dev' into 7784-entryOrderPdf

16039b0ccc Merge pull request 'feat: refs #7784 Changes in entry-order-pdf' (!2872) from 7784-entryOrderPdf into dev ...

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

582fa5faeb feat: refs #7567 Requested changes

c2cc7207c3 Merge branch 'dev' into 7567-movingCleanFix

d9d2ae2f7b feat: refs #7758 Add code mandateType and accountDetailType

150c60c894 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType

24468ad338 Merge pull request 'feat: refs #7346' (!2864) from 7346 into dev ...

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

7c545a379f feat: refs #7862 roadmap new fields

2026fb128d Merge pull request 'feat: refs #7862 roadmap new fields' (!2877) from 7862-Roadmap-new_fields into dev ...

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

9806265030 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType

3974728658 Merge branch 'dev' into 7567-movingCleanFix

cce7bb2264 Merge pull request 'refactor: refs #7567 Fix and improvement' (!2699) from 7567-movingCleanFix into dev ...

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

340515968b feat: refs #7710 test fixed

94461cff58 feat: refs #7758 Modify code lowerCamelCase and UNIQUE

754792e3b5 Merge branch 'dev' into 7758-Add_code_mandateType_accountDetailType

ffbcd1bd4a Merge pull request 'feat: refs #7758 Add code mandateType and accountDetailType' (!2876) from 7758-Add_code_mandateType_accountDetailType into dev ...

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

c5210157b1 feat: refs #7758 accountDetailType fix deploy error

32d36cda21 feat: refs #7710 pr revision

2ea9198279 Merge pull request 'feat: refs #7758 accountDetailType fix deploy error' (!2880) from 7758-error_deploy into dev ...

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

638a43d3e6 Merge pull request '#7710 - clone with ticket packaging' (!2878) from 7710-cloneWithTicketPackaging into dev ...

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

e9870be76f Merge branch 'test' into dev

aaf95e3cff fix: refs #7756 id 0

d2a61cf18d Merge branch 'test' into dev

jsegarra requested review from guillermo 2024-08-27 05:56:38 +00:00

guillermo approved these changes 2024-08-27 06:08:47 +00:00

jsegarra added 2 commits 2024-08-27 06:15:46 +00:00

ef26d7f437 fix(salix): #7283 ItemFixedPrice duplicated

5f949e1344 Merge pull request '#7283 ItemFixedPrice duplicated' (!2886) from 7283_itemFixedPrice_duplicated into dev ...

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

pako added 2 commits 2024-08-27 06:39:39 +00:00

ce2058ec8b version

b2b16dc551 Merge pull request 'version' (!2887) from saleGroup_state into dev ...

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

guillermo added 7 commits 2024-08-27 08:07:28 +00:00

ea75446982 refs #7844 Change in problems calc

4f2e343d0c refs #7844 Fix

8aa06e12b3 refs #7844 Fix tests part 1/2

4cbea3bf7b refs #7844 Fix tests part 2/2

09a0459a7b refs #7844 Fix tests part 2/2

79e2424a41 Merge branch 'dev' into 7844-changeProblemsCalc

724a9b5dc1 Merge pull request 'refs #7844 Change in problems calc' (!2842) from 7844-changeProblemsCalc into dev ...

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

guillermo added 1 commit 2024-08-27 08:08:07 +00:00

4d820f1003 Merge branch 'test' into dev

jsegarra merged commit e98d64f526 into test 2024-08-27 10:32:53 +00:00

jsegarra referenced this issue from a commit 2024-08-27 10:32:55 +00:00

Merge pull request '#7896 - 24.36 Dev To Test' (!2884) from dev 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

3 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#2884

No description provided.