// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
@@ -453,7 +453,7 @@ abstract class PrepaidServices extends PaymentModule
 			else
 				$order->total_paid_real += $amount;

-			$os = _PS_OS_PAYMENT_;
+			$os = Configuration::get('PS_OS_PAYMENT');
 			if ($order->total_paid != $order->total_paid_real)
 				$os = Configuration::get($this->prefix.'ORDER_STATE_PART_ID');