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

// Merge -> revision 7906

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-05 13:26:44 +00:00
parent e4825ac555
commit 239f92eaf1
55 changed files with 174 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/index.php
+1 -1
View File
@@ -47,7 +47,7 @@ if (empty($tab) and !sizeof($_POST))
$bread = '';
foreach ($tabs AS $key => $item)
$bread .= ' <img src="../img/admin/separator_breadcrum.png" style="margin-right:5px" />
$bread .= ' <img src="../img/admin/separator_breadcrum.png" style="margin-right:5px" alt="&gt;" />
'.((sizeof($tabs) - 1 > $key)
? '<a href="?tab='.$item['class_name'].'&token='.Tools::getAdminToken($item['class_name'].intval($item['id_tab']).intval($cookie->id_employee)).'">'
: '').'
admin-dev/tabs/AdminCurrencies.php
+1 -1
View File
@@ -172,7 +172,7 @@ class AdminCurrencies extends AdminTab
</div>
<label>'.$this->l('Symbol:').' </label>
<div class="margin-form">
<input type="text" size="3" maxlength="8" name="sign" value="'.htmlentities($this->getFieldValue($obj, 'sign'), ENT_COMPAT, 'UTF-8').'" /> <sup>*</sup>
<input type="text" size="3" maxlength="8" name="sign" value="'.$this->getFieldValue($obj, 'sign').'" /> <sup>*</sup>
<p class="clear">'.$this->l('Will appear on Front Office, e.g., &euro;, $').'...</p>
</div>
<label>'.$this->l('Conversion rate:').' </label>
admin-dev/tabs/AdminImport.php
+4 -4
View File
@@ -605,7 +605,7 @@ class AdminImport extends AdminTab
if (Tools::getValue('convert'))
$line = $this->utf8_encode_array($line);
$info = self::getMaskedRow($line);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Product::existsInDatabase((int)($info['id'])))
if (array_key_exists('id', $info) AND (int)($info['id']) AND Product::existsInDatabase((int)($info['id']), 'product'))
{
$product = new Product((int)($info['id']));
$categoryData = Product::getProductCategories((int)($product->id));
@@ -753,7 +753,7 @@ class AdminImport extends AdminTab
$product->quantity = 0;
// If id product AND id product already in base, trying to update
if ($product->id AND Product::existsInDatabase((int)($product->id)))
if ($product->id AND Product::existsInDatabase((int)($product->id), 'product'))
{
$datas = Db::getInstance()->getRow('SELECT `date_add` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)($product->id));
@@ -1192,7 +1192,7 @@ class AdminImport extends AdminTab
self::setDefaultValues($info);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Manufacturer::existsInDatabase((int)($info['id'])))
if (array_key_exists('id', $info) AND (int)($info['id']) AND Manufacturer::existsInDatabase((int)($info['id']), 'manufacturer'))
$manufacturer = new Manufacturer((int)($info['id']));
else
$manufacturer = new Manufacturer();
@@ -1247,7 +1247,7 @@ class AdminImport extends AdminTab
self::setDefaultValues($info);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Supplier::existsInDatabase((int)($info['id'])))
if (array_key_exists('id', $info) AND (int)($info['id']) AND Supplier::existsInDatabase((int)($info['id']), 'supplier'))
$supplier = new Supplier((int)($info['id']));
else
$supplier = new Supplier();