Merge pull request #521 from magento-mpi/prs

vpelipenko · vpelipenko · commit cb6cded3854d · 2015-08-12T17:16:47.000+03:00
[GITHUB] Merge public Github PRs
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php b/app/code/Magento/Sales/Model/Order/Pdf/Total/DefaultTotal.php
@@ -145,7 +145,7 @@ public function getFullTaxInfo()
     public function canDisplay()
     {
         $amount = $this->getAmount();
-        return $this->getDisplayZero() || $amount != 0;
+        return $this->getDisplayZero() === 'true' || $amount != 0;
     }
 
     /**
diff --git a/setup/view/magento/setup/create-admin-account.phtml b/setup/view/magento/setup/create-admin-account.phtml
@@ -42,7 +42,7 @@ $passwordWizard = sprintf(
 <h2 class="page-sub-title">{{$state.current.header}}</h2>
 
 <p>
-    Create a new Admin account to manage you store.
+    Create a new Admin account to manage your store.
 </p>
 
 <form

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function getFullTaxInfo()`
`145`	`145`	`public function canDisplay()`
`146`	`146`	`{`
`147`	`147`	`$amount = $this->getAmount();`
`148`		`- return $this->getDisplayZero() \|\| $amount != 0;`
	`148`	`+ return $this->getDisplayZero() === 'true' \|\| $amount != 0;`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`/**`