// 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
This commit is contained in:
mDeflotte
2011-12-15 15:26:13 +00:00
parent b7abb129c8
commit 7343f80834
5 changed files with 93 additions and 73 deletions
@@ -167,7 +167,14 @@ class AdminPreferencesControllerCore extends AdminController
),
'PS_ALLOW_MULTISHIPPING' => array(
'title' => $this->l('Allow multi-shipping'),
'desc' => $this->l('Allow the customer to ship is order to multiple addressed or in to deliver the products "in stock" first. This option will transform the customer cart in one or more orders.'),
'desc' => $this->l('Allow the customer to ship his order to multiple addresses. This option will transform the customer cart in one or more orders.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
'PS_SHIP_WHEN_AVAILABLE' => array(
'title' => $this->l('Allow shipping when available'),
'desc' => $this->l('Allow the customer to split his order. One with the products "in stock", and an other with the other products. This option will transform the customer cart in two orders.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'