Merge remote-tracking branch... (96da5d7e) · Commits · KIII-12 / Magento · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Magento
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

KIII-12
Magento
Commits
96da5d7e

Commit 96da5d7e authored 10 years ago by

Yu Tang

Downloads
- Plain Diff

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/FearlessKiwis-MAGETWO-18521-Incorrect-tax-calculation-with-discount2' into develop

parents dd76d3fb 1a43d6e3

Branches

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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/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/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/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/view/adminhtml/templates/order/create/items/price/total.phtml 1 addition, 1 deletion

.../adminhtml/templates/order/create/items/price/total.phtml

with 86 additions and 5 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment