// Some translations + Split multi-shipping activation in two differente option (one for allowing multi-delivering and one for allowing to deliver the available products first)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11270 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:26:13 +00:00
parent b7abb129c8
commit 7343f80834
5 changed files with 93 additions and 73 deletions
@@ -132,7 +132,7 @@ class CartControllerCore extends FrontController
 	
 	protected function processAllowSeperatedPackage()
 	{
-		if (!Configuration::get('PS_ALLOW_MULTISHIPPING'))
+		if (!Configuration::get('PS_SHIP_WHEN_AVAILABLE'))
 			return;
 		
 		if (Tools::getValue('value') === false)