Merge mainline #82

naydav · 2017-09-05T10:50:58Z

No description provided.

…tom Prices isn't displayed on Slide Panel (admin panel)

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … …isnt displayed on Slide Panel (admin panel) See merge request !262

…tom Prices isn't displayed on Slide Panel (admin panel) - Fix Retriever namespace

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … …isn't displayed on Slide Panel (admin panel) - Fix Retriever namespace See merge request !263

# Conflicts: # app/code/Magento/Catalog/Pricing/Price/TierPrice.php

…lop_SPRINT-40_v01 # Conflicts: # app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php

2.2 develop sprint 40 v01 See merge request !264

…tom Prices isn't displayed on Slide Panel (admin panel) - Fix unit test

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … See merge request !265

…tom Prices isn't displayed on Slide Panel (admin panel) - Fix CR comment

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … See merge request !266

…l templates

Mainline 2.2 develop See merge request !269

Sprint 41 See merge request !270

…s with the same ids and different options - Fix loading product options for bundle products

MAGETWO-71595: Issue while loading product options for bundle products with the … See merge request !271

…ak email fonts styles #8241

…s with the same ids and different options - Unit test update

… upgrading from 2.1 to 2.2

MAGETWO-71595: Issue while loading product options for bundle products with the … See merge request !272

… upgrading from 2.1 to 2.2

…n upgrading to 2.2

Fixed issues: - MAGETWO-71841 Caching issue with tier prices - MAGETWO-70603 Impossible add gift options on order level if use secure url

- Merge Pull Request magento/magento2#10739 from nowszy/magento2:magento2-10738 - Merged commits: 1. 093e742

Because count() gives an int, hasShipment returns an int. Now i can't do this: ```if ($view->getOrder()->hasShipments() === true) {```

- Merge Pull Request magento/magento2#10755 from jissereitsma/magento2:patch-3 - Merged commits: 1. d59a428

- Merge Pull Request magento/magento2#10759 from RakeshJesadiya/magento2:patch-1 - Merged commits: 1. ba33ebc

…agento2#10755

- Merge Pull Request magento/magento2#10760 from reindert-vetter/magento2:patch-1 - Merged commits: 1. a3fe637 2. c785afb

…fonts styles #8241 #10638

…into MAGETWO-71896-PR-10638

…fonts styles #8241 #10638

Fixed issues: - MAGETWO-72261: Merge 2.2-develop into develop

…e into MAGETWO-71896-PR-10638

…fonts styles #8241 #10638

…gento-engcom/magento2ce into develop-prs

[EngCom] Public Pull Requests - MAGETWO-72260: Remove unnecessary comment. magento/magento2#10759 - MAGETWO-72259: phpDocumentor Return tag must be an int magento/magento2#10760 - MAGETWO-72258: Fix minor type "consturctor" > "constructor" magento/magento2#10755 - MAGETWO-72226: Fix for translated attribute label comparisson. magento/magento2#10739 - MAGETWO-71896: Static versioning and styles minification break email fonts styles magento/magento2#8241 magento/magento2#10638

# Conflicts: # composer.lock

magento-cicd2 · 2017-09-05T10:51:01Z

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 9 committers have signed the CLA.

❌ stkorf
❌ kalashnikau-uladzimir
❌ isxam
❌ nikshostko
❌ vital-pantsialeyeu
❌ kirylbakun
❌ anthoula
❌ p-bystritsky
❌ nmalevanec

[Arrows] MC-40776: [MSI] Inventory sources with the same names can be created

stkorf and others added 30 commits July 28, 2017 15:45

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Cus…

dac8bfb

…tom Prices isn't displayed on Slide Panel (admin panel)

Merge branch 'MAGETWO-55937' into 'SPRINT-40'

b884072

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … …isnt displayed on Slide Panel (admin panel) See merge request !262

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Cus…

82da025

…tom Prices isn't displayed on Slide Panel (admin panel) - Fix Retriever namespace

Merge branch 'MAGETWO-55937-namespace' into 'SPRINT-40'

bf31af2

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … …isn't displayed on Slide Panel (admin panel) - Fix Retriever namespace See merge request !263

Merge remote-tracking branch 'magento-ce/2.2-develop' into SPRINT-40

46d5d76

Merge remote-tracking branch 'magento-ce/2.2-develop' into SPRINT-40

586f2f7

# Conflicts: # app/code/Magento/Catalog/Pricing/Price/TierPrice.php

Merge remote-tracking branch 'magento-ce/2.2-develop' into SPRINT-40

1d62708

Merge remote-tracking branch 'magento-ce/2.2-develop' into SPRINT-40

ca62b64

# Conflicts: # app/code/Magento/Catalog/Pricing/Price/TierPrice.php

Merge remote-tracking branch 'magento-ce/2.2-develop' into SPRINT-40

35e92f5

Merge remote-tracking branch 'magento-epam/2.2-develop' into 2.2-deve…

395fb47

…lop_SPRINT-40_v01 # Conflicts: # app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php

Merge branch '2.2-develop_SPRINT-40_v01' into 'SPRINT-40'

d380f15

2.2 develop sprint 40 v01 See merge request !264

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Cus…

6ddca8c

…tom Prices isn't displayed on Slide Panel (admin panel) - Fix unit test

Merge branch 'SPRINT-40-fix-unit' into 'SPRINT-40'

e0f3721

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … See merge request !265

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Cus…

3ce1791

…tom Prices isn't displayed on Slide Panel (admin panel) - Fix CR comment

Merge branch 'CR-746-fix' into 'SPRINT-40'

48503c0

MAGETWO-55937: [Complex product/Grouped productsl] Tax Amount and Custom Prices … See merge request !266

MAGETWO-71528: Add an ability to call methods through objects in emai…

5ca86e1

…l templates

Merge branch 'mainline-2.2-develop' into 'SPRINT-41'

5547939

Mainline 2.2 develop See merge request !269

Merge branch 'SPRINT-41' into 'MAGETWO-71366-fx'

5284f02

Sprint 41 See merge request !270

MAGETWO-71595: Issue while loading product options for bundle product…

bfc0ccf

…s with the same ids and different options - Fix loading product options for bundle products

Merge branch 'MAGETWO-71595' into 'SPRINT-41'

1d8b402

MAGETWO-71595: Issue while loading product options for bundle products with the … See merge request !271

MAGETWO-64085: [GitHub] Static versioning and styles minification bre…

9de3b46

…ak email fonts styles #8241

MAGETWO-71595: Issue while loading product options for bundle product…

fbbf375

…s with the same ids and different options - Unit test update

MAGETWO-67037: core_config_data table is not populated correctly when…

247f793

… upgrading from 2.1 to 2.2

Merge branch 'MAGETWO-71595-unit-tests' into 'SPRINT-41'

fcd06a3

MAGETWO-71595: Issue while loading product options for bundle products with the … See merge request !272

MAGETWO-67037: core_config_data table is not populated correctly when…

33b824f

… upgrading from 2.1 to 2.2

MAGETWO-70540: Edit bundle product from shopping cart work unexpected

9842136

Merge branch '2.2-develop' into MAGETWO-67037

1daabff

MAGETWO-67037: core_config_data table is not populated correctly when…

f9696ce

… upgrading from 2.1 to 2.2

MAGETWO-67092: Table salesrule_product_attribute is not populated whe…

eef82fd

…n upgrading to 2.2

MAGETWO-67092: Table salesrule_product_attribute is not populated whe…

39cbc85

…n upgrading to 2.2

Sergii Kovalenko and others added 25 commits September 1, 2017 16:56

Merge pull request #1449 from magento-honey-badgers/bugs

f757b46

Fixed issues: - MAGETWO-71841 Caching issue with tier prices - MAGETWO-70603 Impossible add gift options on order level if use secure url

MAGETWO-72226: Fix for translated attribute label comparisson. #10739

6a2c35b

- Merge Pull Request magento/magento2#10739 from nowszy/magento2:magento2-10738 - Merged commits: 1. 093e742

Fix minor type "consturctor" > "constructor"

d59a428

Remove unnecessary comment.

ba33ebc

phpDocumentor Return tag must be an int

a3fe637

Because count() gives an int, hasShipment returns an int. Now i can't do this: ```if ($view->getOrder()->hasShipments() === true) {```

MAGETWO-72258: Fix minor type 'consturctor' > 'constructor' #10755

028d1a8

- Merge Pull Request magento/magento2#10755 from jissereitsma/magento2:patch-3 - Merged commits: 1. d59a428

MAGETWO-72260: Remove unnecessary comment. #10759

ff6edf0

- Merge Pull Request magento/magento2#10759 from RakeshJesadiya/magento2:patch-1 - Merged commits: 1. ba33ebc

MAGETWO-72258: Fix minor type "consturctor" > "constructor" magento/m…

85f49bf

…agento2#10755

Set (bool) before function

c785afb

MAGETWO-72259: phpDocumentor Return tag must be an int #10760

9e82159

- Merge Pull Request magento/magento2#10760 from reindert-vetter/magento2:patch-1 - Merged commits: 1. a3fe637 2. c785afb

Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-72261

df07d6c

MAGETWO-71896: Static versioning and styles minification break email …

b10dced

…fonts styles #8241 #10638

MAGETWO-71896: Merge branch 'develop' of github.com:magento/magento2 …

4b09ffd

…into MAGETWO-71896-PR-10638

MAGETWO-72260: Remove unnecessary comment. #10759

0594ecd

MAGETWO-72259: phpDocumentor Return tag must be an int #10760

5013d52

MAGETWO-72258: Fix minor type "consturctor" > "constructor" #10755

547ca4d

MAGETWO-72226: Fix for translated attribute label comparisson. #10739

c20b2e9

MAGETWO-71896: Static versioning and styles minification break email …

5feecfc

…fonts styles #8241 #10638

Merge pull request #1454 from magento-borg/MAGETWO-72261

e05217d

Fixed issues: - MAGETWO-72261: Merge 2.2-develop into develop

Merge branch 'develop' of github.com:magento/magento2ce into develop-prs

bb5e7b9

MAGETWO-71896: Merge branch 'develop' of github.com:magento/magento2c…

58694a6

…e into MAGETWO-71896-PR-10638

MAGETWO-71896: Static versioning and styles minification break email …

dfa6f87

…fonts styles #8241 #10638

MAGETWO-71896: Merge branch 'MAGETWO-71896-PR-10638' of github.com:ma…

4271168

…gento-engcom/magento2ce into develop-prs

Merge remote-tracking branch 'mainline/develop' into merge-mainline

073fb79

# Conflicts: # composer.lock

MSI: update composer lock

7a6e3e1

naydav merged commit 0f55a40 into develop Sep 5, 2017

smoskaluk mentioned this pull request Mar 23, 2018

Exception in Low stock report for product with another name on additional storeview #737

Closed

magento-cicd2 pushed a commit that referenced this pull request Mar 11, 2021

Merge pull request #82 from magento-tsg/MC-40776

febea46

[Arrows] MC-40776: [MSI] Inventory sources with the same names can be created

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge mainline #82

Merge mainline #82

naydav commented Sep 5, 2017

magento-cicd2 commented Sep 5, 2017 •

edited

Loading

Merge mainline #82

Merge mainline #82

Conversation

naydav commented Sep 5, 2017

magento-cicd2 commented Sep 5, 2017 • edited Loading

magento-cicd2 commented Sep 5, 2017 •

edited

Loading