dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Translations

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15600 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-05-22 09:20:26 +00:00
parent b59423bc94
commit 654b7069c5
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/LocalizationPack.php
+2 -2
View File
@@ -415,7 +415,7 @@ class LocalizationPackCore
if (isset($name) && isset($attributes['value']) && Configuration::get($name) !== false)
if (!Configuration::updateValue($name, (string)$attributes['value']))
$this->_errors[] = Tools::displayError('An error has occured during the configuration setup: '.$name);
$this->_errors[] = Tools::displayError('An error occurred during the configuration setup: '.$name);
}
return true;
@@ -431,7 +431,7 @@ class LocalizationPackCore
$group = new Group((int)_PS_DEFAULT_CUSTOMER_GROUP_);
$group->price_display_method = (int)$attributes['price_display_method'];
if (!$group->save())
$this->_errors[] = Tools::displayError('An error has occurred during the default group update');
$this->_errors[] = Tools::displayError('An error occurred during the default group update');
}
else
$this->_errors[] = Tools::displayError('An error has occurred during the default group update');
classes/ObjectModel.php
+1 -1
View File
@@ -686,7 +686,7 @@ abstract class ObjectModelCore
{
// Object must have a variable called 'active'
if (!array_key_exists('active', $this))
throw new PrestaShopException('property "active is missing in object '.get_class($this));
throw new PrestaShopException('property "active" is missing in object '.get_class($this));
// Update active status on object
$this->active = !(int)$this->active;
classes/stock/StockManagerInterface.php
+1 -1
View File
@@ -64,7 +64,7 @@ interface StockManagerInterface
* @param int $id_stock_movement_reason
* @param bool $is_usable
* @param int $id_order Optionnal
* @return array - empty if an error occured | details of removed products quantities with corresponding prices otherwise
* @return array - empty if an error occurred | details of removed products quantities with corresponding prices otherwise
*/
public function removeProduct($id_product, $id_product_attribute, Warehouse $warehouse, $quantity, $id_stock_movement_reason, $is_usable = true, $id_order = null);