Skip to content

Commit 76e8fe3

Browse files
authored
Set page title for credit memo and shipment same as invoice (OpenMage#1416)
1 parent 0eda1e5 commit 76e8fe3

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,7 @@ public function viewAction()
187187
{
188188
$creditmemo = $this->_initCreditmemo();
189189
if ($creditmemo) {
190-
if ($creditmemo->getInvoice()) {
191-
$this->_title($this->__("View Memo for #%s", $creditmemo->getInvoice()->getIncrementId()));
192-
} else {
193-
$this->_title($this->__("View Memo"));
194-
}
190+
$this->_title(sprintf("#%s", $creditmemo->getIncrementId()));
195191

196192
$this->loadLayout();
197193
$this->getLayout()->getBlock('sales_creditmemo_view')

app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ protected function _saveShipment($shipment)
127127
*/
128128
public function viewAction()
129129
{
130-
if ($this->_initShipment()) {
131-
$this->_title($this->__('View Shipment'));
130+
$shipment = $this->_initShipment();
131+
if ($shipment) {
132+
$this->_title(sprintf("#%s", $shipment->getIncrementId()));
132133

133134
$this->loadLayout();
134135
$this->getLayout()->getBlock('sales_shipment_view')

app/locale/en_US/Mage_Adminhtml.csv

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,9 +1222,6 @@
12221222
"Verifier code: %s","Verifier code: %s"
12231223
"View Actions XML","View Actions XML"
12241224
"View Full Size","View Full Size"
1225-
"View Memo","View Memo"
1226-
"View Memo for #%s","View Memo for #%s"
1227-
"View Shipment","View Shipment"
12281225
"View Statistics For:","View Statistics For:"
12291226
"Visibility:","Visibility:"
12301227
"Warning","Warning"

0 commit comments

Comments
 (0)