Merge remote-tracking branch... (b63de1d7) · 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
b63de1d7

Commit b63de1d7 authored 10 years ago by

Yu Tang

Downloads
- Plain Diff

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/FearlessKiwis-MAGETWO-31458-fpt-display-on-partial-invoice' into develop

parents 2f51a48a a8bbbf2b

Branches

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Sales/Model/Order/Creditmemo/Item.php 1 addition, 1 deletion

app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php 43 additions, 16 deletions

...gento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php
app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php 8 additions, 14 deletions

app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
app/code/Magento/Weee/Model/Total/Invoice/Weee.php 2 additions, 1 deletion

app/code/Magento/Weee/Model/Total/Invoice/Weee.php
app/code/Magento/Weee/Test/Unit/Model/Total/Creditmemo/WeeeTest.php 73 additions, 5 deletions

...agento/Weee/Test/Unit/Model/Total/Creditmemo/WeeeTest.php
app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php 92 additions, 5 deletions

...e/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php

with 219 additions and 42 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