Merge remote-tracking branch 'main/develop' into MAGETWO-49845
Showing
- app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php 5 additions, 0 deletions...dle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
- app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php 10 additions, 1 deletion...undle/Ui/DataProvider/Product/Form/Modifier/Composite.php
- app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml 1 addition, 1 deletion...html/templates/product/edit/bundle/option/selection.phtml
- app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-option-qty.js 26 additions, 0 deletions...dle/view/adminhtml/web/js/components/bundle-option-qty.js
- app/code/Magento/Catalog/view/base/web/js/price-utils.js 8 additions, 3 deletionsapp/code/Magento/Catalog/view/base/web/js/price-utils.js
- app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/configurable.js 1 addition, 1 deletion...ConfigurableProduct/view/adminhtml/web/js/configurable.js
- app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js 1 addition, 1 deletion...bleProduct/view/adminhtml/web/js/variations/variations.js
- app/code/Magento/Eav/Model/Entity/AbstractEntity.php 3 additions, 3 deletionsapp/code/Magento/Eav/Model/Entity/AbstractEntity.php
- app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php 2 additions, 0 deletionsapp/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
- app/code/Magento/Quote/etc/fieldset.xml 3 additions, 0 deletionsapp/code/Magento/Quote/etc/fieldset.xml
- app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php 68 additions, 31 deletions...e/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
- app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php 134 additions, 12 deletions...s/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php
- app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js 1 addition, 1 deletion.../Magento/Sales/view/adminhtml/web/order/create/scripts.js
- app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js 3 additions, 3 deletions...de/Magento/Shipping/view/adminhtml/web/order/packaging.js
- app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php 36 additions, 34 deletionsapp/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
- app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php 2 additions, 2 deletions...Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
- app/code/Magento/Tax/Test/Unit/Model/Sales/Order/TaxManagementTest.php 104 additions, 77 deletions...nto/Tax/Test/Unit/Model/Sales/Order/TaxManagementTest.php
- app/code/Magento/Ui/Component/AbstractComponent.php 4 additions, 0 deletionsapp/code/Magento/Ui/Component/AbstractComponent.php
- app/code/Magento/Ui/Component/Control/ActionPool.php 15 additions, 0 deletionsapp/code/Magento/Ui/Component/Control/ActionPool.php
- app/code/Magento/Ui/view/base/web/js/form/components/insert-form.js 1 addition, 1 deletion...agento/Ui/view/base/web/js/form/components/insert-form.js
Please register or sign in to comment