// Merge -> revision 7875

This commit is contained in:
rMalie
2011-08-03 16:16:49 +00:00
parent 85a22c5f05
commit 83734c7bb9
38 changed files with 320 additions and 85 deletions
+1 -2
View File
@@ -310,8 +310,7 @@ class DateOfDelivery extends Module
private function _setCarrierRuleForm()
{
$carriers = Carrier::getCarriers($this->context->language->id, true , false,false, NULL, ALL_CARRIERS);
$carriers = Carrier::getCarriers($this->context->language->id, true, false, false, null, Carrier::ALL_CARRIERS);
if (Tools::isSubmit('editCarrierRule') AND $this->_isCarrierRuleExists(Tools::getValue('id_carrier_rule')))
$carrier_rule = $this->_getCarrierRule(Tools::getValue('id_carrier_rule'));