File tree Expand file tree Collapse file tree 3 files changed +4
-10
lines changed
code/core/Mage/Adminhtml/controllers/Sales/Order Expand file tree Collapse file tree 3 files changed +4
-10
lines changed Original file line number Diff line number Diff line change @@ -187,11 +187,7 @@ public function viewAction()
187
187
{
188
188
$ creditmemo = $ this ->_initCreditmemo ();
189
189
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 ()));
195
191
196
192
$ this ->loadLayout ();
197
193
$ this ->getLayout ()->getBlock ('sales_creditmemo_view ' )
Original file line number Diff line number Diff line change @@ -127,8 +127,9 @@ protected function _saveShipment($shipment)
127
127
*/
128
128
public function viewAction ()
129
129
{
130
- if ($ this ->_initShipment ()) {
131
- $ this ->_title ($ this ->__ ('View Shipment ' ));
130
+ $ shipment = $ this ->_initShipment ();
131
+ if ($ shipment ) {
132
+ $ this ->_title (sprintf ("#%s " , $ shipment ->getIncrementId ()));
132
133
133
134
$ this ->loadLayout ();
134
135
$ this ->getLayout ()->getBlock ('sales_shipment_view ' )
Original file line number Diff line number Diff line change 1222
1222
"Verifier code: %s","Verifier code: %s"
1223
1223
"View Actions XML","View Actions XML"
1224
1224
"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"
1228
1225
"View Statistics For:","View Statistics For:"
1229
1226
"Visibility:","Visibility:"
1230
1227
"Warning","Warning"
You can’t perform that action at this time.
0 commit comments