Merge remote-tracking branch 'origin/develop' into S60PR (e468b8ee) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit e468b8ee authored 9 years ago by

Viktor Paladiychuk

Browse files

Merge remote-tracking branch 'origin/develop' into S60PR

parents e63d916e 444e252d

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php 33 additions, 36 deletions

app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
app/code/Magento/Dhl/Model/Carrier.php 38 additions, 18 deletions

app/code/Magento/Dhl/Model/Carrier.php
app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml 22 additions, 28 deletions

.../Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php 12 additions, 1 deletion

app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
app/code/Magento/ImportExport/Model/Import/Source/Csv.php 4 additions, 1 deletion

app/code/Magento/ImportExport/Model/Import/Source/Csv.php
app/code/Magento/Msrp/view/frontend/templates/popup.phtml 3 additions, 4 deletions

app/code/Magento/Msrp/view/frontend/templates/popup.phtml
app/code/Magento/OfflinePayments/i18n/de_DE.csv 1 addition, 1 deletion

app/code/Magento/OfflinePayments/i18n/de_DE.csv
app/code/Magento/OfflinePayments/i18n/en_US.csv 1 addition, 1 deletion

app/code/Magento/OfflinePayments/i18n/en_US.csv
app/code/Magento/OfflinePayments/i18n/es_ES.csv 1 addition, 1 deletion

app/code/Magento/OfflinePayments/i18n/es_ES.csv
app/code/Magento/OfflinePayments/i18n/fr_FR.csv 1 addition, 1 deletion

app/code/Magento/OfflinePayments/i18n/fr_FR.csv
app/code/Magento/OfflinePayments/i18n/nl_NL.csv 1 addition, 1 deletion

app/code/Magento/OfflinePayments/i18n/nl_NL.csv
app/code/Magento/OfflinePayments/i18n/pt_BR.csv 1 addition, 1 deletion

app/code/Magento/OfflinePayments/i18n/pt_BR.csv
app/code/Magento/OfflinePayments/i18n/zh_CN.csv 1 addition, 1 deletion

app/code/Magento/OfflinePayments/i18n/zh_CN.csv
app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml 9 additions, 5 deletions

...Payments/view/adminhtml/templates/form/banktransfer.phtml
app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml 6 additions, 4 deletions

...yments/view/adminhtml/templates/form/cashondelivery.phtml
app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml 7 additions, 5 deletions

...flinePayments/view/adminhtml/templates/form/checkmo.phtml
app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml 7 additions, 5 deletions

...ayments/view/adminhtml/templates/form/purchaseorder.phtml
app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml 8 additions, 4 deletions

...flinePayments/view/adminhtml/templates/info/checkmo.phtml
app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml 6 additions, 4 deletions

...ePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml 4 additions, 1 deletion

...nts/view/adminhtml/templates/info/pdf/purchaseorder.phtml

with 166 additions and 123 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/develop' into S60PR