Merge branch 'develop' into FearlessKiwis-MAGETWO-31458-fpt-display-on-partial-invoice
Showing
- CHANGELOG.md 31 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backend/etc/adminhtml/system.xml 0 additions, 7 deletionsapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Backup/composer.json 5 additions, 5 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/Model/Product/Price.php 12 additions, 1 deletionapp/code/Magento/Bundle/Model/Product/Price.php
- app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php 22 additions, 10 deletions...code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php
- app/code/Magento/Bundle/composer.json 17 additions, 17 deletionsapp/code/Magento/Bundle/composer.json
- app/code/Magento/Captcha/composer.json 6 additions, 6 deletionsapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/Api/Data/CategoryInterface.php 6 additions, 0 deletionsapp/code/Magento/Catalog/Api/Data/CategoryInterface.php
- app/code/Magento/Catalog/Api/Data/ProductInterface.php 75 additions, 0 deletionsapp/code/Magento/Catalog/Api/Data/ProductInterface.php
- app/code/Magento/Catalog/Api/Data/ProductTierPriceInterface.php 17 additions, 3 deletions...de/Magento/Catalog/Api/Data/ProductTierPriceInterface.php
- app/code/Magento/Catalog/Api/ProductAttributeMediaGalleryManagementInterface.php 8 additions, 2 deletions...g/Api/ProductAttributeMediaGalleryManagementInterface.php
- app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php 5 additions, 5 deletions...gento/Catalog/Api/ProductTierPriceManagementInterface.php
- app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php 3 additions, 0 deletions...talog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
- app/code/Magento/Catalog/Model/Category.php 30 additions, 0 deletionsapp/code/Magento/Catalog/Model/Category.php
- app/code/Magento/Catalog/Model/Product.php 293 additions, 5 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 1 addition, 6 deletions...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
- app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php 62 additions, 189 deletions...gento/Catalog/Model/Product/Gallery/GalleryManagement.php
Please register or sign in to comment