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

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
djfm
2013-08-22 12:31:28 +00:00
parent 5faaef9f21 4de8013b5e
commit 47827a1a1b
12 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+1 -1
View File
@@ -718,7 +718,7 @@ class AdminCarrierWizardControllerCore extends AdminController
&& (!isset($logo['error']) || !$logo['error'])
&& preg_match('/\.(jpe?g|gif|png)$/', $logo['name'])
&& is_uploaded_file($logo['tmp_name'])
&& ImageManager::isRealImage($logo['tmp_name']))
&& ImageManager::isRealImage($logo['tmp_name'], $logo['type']))
{
$file = $logo['tmp_name'];
do $tmp_name = uniqid().'.jpg';
controllers/admin/AdminCategoriesController.php
+1 -1
View File
@@ -557,7 +557,7 @@ class AdminCategoriesControllerCore extends AdminController
$id_parent = (int)Tools::getValue('id_parent');
// if true, we are in a root category creation
if (!$id_parent && !Tools::isSubmit('is_root_category'))
if (!$id_parent)
{
$_POST['is_root_category'] = $_POST['level_depth'] = 1;
$_POST['id_parent'] = $id_parent = (int)Configuration::get('PS_ROOT_CATEGORY');
controllers/admin/AdminLogsController.php
-3
View File
@@ -33,9 +33,6 @@ class AdminLogsControllerCore extends AdminController
$this->lang = false;
$this->noLink = true;
$this->addRowAction('delete');
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fields_list = array(
'id_log' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'employee' => array('title' => $this->l('Employee'), 'align' => 'center', 'width' => 100),
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2993,7 +2993,7 @@ class AdminProductsControllerCore extends AdminController
$data->assign(array(
'link' => $this->context->link,
'currency' => $currency = $this->context->currency,
'tax_rules_groups' => TaxRulesGroup::getTaxRulesGroups(true, true),
'tax_rules_groups' => TaxRulesGroup::getTaxRulesGroups(true),
'taxesRatesByGroup' => TaxRulesGroup::getAssociatedTaxRatesByIdCountry($this->context->country->id),
'ecotaxTaxRate' => Tax::getProductEcotaxRate(),
'tax_exclude_taxe_option' => Tax::excludeTaxeOption(),
controllers/admin/AdminTaxRulesGroupController.php
+9
View File
@@ -179,6 +179,15 @@ class AdminTaxRulesGroupControllerCore extends AdminController
'stay' => true
)
);
if (Shop::isFeatureActive())
{
$this->fields_form['input'][] = array(
'type' => 'shop',
'label' => $this->l('Shop association:'),
'name' => 'checkBoxShopAsso',
);
}
if (!($obj = $this->loadObject(true)))
return;