Merge branch 'develop' into FearlessKiwis-MAGETWO-32905-Refactor-API-Framework
Showing
- app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml 1 addition, 1 deletion...og/view/base/templates/product/price/amount/default.phtml
- app/code/Magento/OfflineShipping/etc/fieldset.xml 1 addition, 1 deletionapp/code/Magento/OfflineShipping/etc/fieldset.xml
- app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php 5 additions, 2 deletions...Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
- app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php 27 additions, 48 deletions...e/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
- app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php 9 additions, 1 deletionapp/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
- app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php 78 additions, 0 deletions...Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
- app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php 277 additions, 0 deletions...s/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php
- app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php 75 additions, 0 deletions.../Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
- app/code/Magento/Sales/etc/fieldset.xml 0 additions, 89 deletionsapp/code/Magento/Sales/etc/fieldset.xml
- app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml 1 addition, 1 deletion...es/view/adminhtml/templates/order/create/items/grid.phtml
- app/code/Magento/Tax/Model/Observer.php 8 additions, 1 deletionapp/code/Magento/Tax/Model/Observer.php
- app/code/Magento/Tax/Pricing/Render/Adjustment.php 4 additions, 0 deletionsapp/code/Magento/Tax/Pricing/Render/Adjustment.php
- app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml 1 addition, 1 deletion.../adminhtml/templates/order/create/items/price/total.phtml
- app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php 2 additions, 6 deletionsapp/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
- app/code/Magento/Weee/Model/Tax.php 1 addition, 1 deletionapp/code/Magento/Weee/Model/Tax.php
- app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php 2 additions, 3 deletionsapp/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
- app/code/Magento/Weee/Model/Total/Invoice/Weee.php 1 addition, 1 deletionapp/code/Magento/Weee/Model/Total/Invoice/Weee.php
- app/code/Magento/Weee/Setup/InstallSchema.php 3 additions, 9 deletionsapp/code/Magento/Weee/Setup/InstallSchema.php
- app/code/Magento/Weee/Setup/UpgradeSchema.php 0 additions, 33 deletionsapp/code/Magento/Weee/Setup/UpgradeSchema.php
- app/code/Magento/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php 9 additions, 9 deletions...o/Weee/Test/Unit/Model/Attribute/Backend/Weee/TaxTest.php
Please register or sign in to comment