// MERGE with trunk revision 7754

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 12:48:42 +00:00
parent 4ade3a0ea0
commit e159c925d8
182 changed files with 6179 additions and 1333 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');