diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl index 66fefae89..5f2212a0d 100644 --- a/admin-dev/themes/default/template/footer.tpl +++ b/admin-dev/themes/default/template/footer.tpl @@ -35,12 +35,12 @@
{if $iso_is_fr} - Questions / Renseignements / Formations : +33 (0)1.40.18.30.04 de 09h à 18h + Questions / Renseignements / Formations : +33 (0)1.40.18.30.04 {/if} - | {l s='Contact'} - | {l s='Bug Tracker'} - | {l s='Forum'} - | {l s='Addons'} + | {l s='Contact'} + | {l s='Bug Tracker'} + | {l s='Forum'} + | {l s='Addons'}
diff --git a/classes/Product.php b/classes/Product.php index d46ab18c2..74e65ee20 100644 --- a/classes/Product.php +++ b/classes/Product.php @@ -347,7 +347,7 @@ class ProductCore extends ObjectModel ), 'id_tax_rules_group' => array( 'xlink_resource' => array( - 'resourceName' => 'tax_rules_group' + 'resourceName' => 'tax_rule_groups' ) ), 'position_in_category' => array( diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index b4e61d1ce..0508ecaab 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1535,6 +1535,16 @@ class AdminControllerCore extends Controller protected function addToolBarModulesListButton() { + + if (!$this->isFresh(Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, 86400)) + file_put_contents(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST, Tools::addonsRequest('native')); + + $country_module_list_xml = simplexml_load_file(_PS_ROOT_DIR_.Module::CACHE_FILE_DEFAULT_COUNTRY_MODULES_LIST); + $country_module_list = array(); + foreach ($country_module_list_xml->module as $k => $m) + $country_module_list[] = (string)$m->name; + $this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list); + if (is_array($this->tab_modules_list['slider_list']) && count($this->tab_modules_list['slider_list'])) $this->toolbar_btn['modules-list'] = array( 'href' => '#', diff --git a/controllers/admin/AdminModulesPositionsController.php b/controllers/admin/AdminModulesPositionsController.php index 72536b180..30d16107b 100644 --- a/controllers/admin/AdminModulesPositionsController.php +++ b/controllers/admin/AdminModulesPositionsController.php @@ -302,14 +302,13 @@ class AdminModulesPositionsControllerCore extends AdminController public function getLiveEditUrl($live_edit_params) { - $lang = ''; + $lang = ''; $admin_dir = dirname($_SERVER['PHP_SELF']); $admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1); $dir = str_replace($admin_dir, '', dirname($_SERVER['SCRIPT_NAME'])); if (Configuration::get('PS_REWRITING_SETTINGS') && count(Language::getLanguages(true)) > 1) $lang = Language::getIsoById($this->context->employee->id_lang).'/'; $url = Tools::getCurrentUrlProtocolPrefix().Tools::getHttpHost().$dir.$lang.Dispatcher::getInstance()->createUrl('index', (int)$this->context->language->id, $live_edit_params); - return $url; } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index a78cbff35..b95d88942 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -863,6 +863,12 @@ class AdminProductsControllerCore extends AdminController { $combination = new Combination((int)$id_product_attribute); $combination->setAttributes(Tools::getValue('attribute_combination_list')); + + // images could be deleted before + $id_images = Tools::getValue('id_image_attr'); + if (!empty($id_images)) + $combination->setImages($id_images); + $product->checkDefaultAttributes(); if (Tools::getValue('attribute_default')) { diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml index 62ec8b354..828538b0e 100644 --- a/install-dev/data/xml/configuration.xml +++ b/install-dev/data/xml/configuration.xml @@ -689,7 +689,7 @@ Country 7700 - 1.5.0.9 + 1.5.5.0 m @@ -701,7 +701,7 @@ Country localhost - 1.5.0.9 + 1.5.5.0 PrestaShop diff --git a/install-dev/langs/br/data/tab.xml b/install-dev/langs/br/data/tab.xml index e7a311c62..d0dd5591e 100644 --- a/install-dev/langs/br/data/tab.xml +++ b/install-dev/langs/br/data/tab.xml @@ -74,8 +74,8 @@ - - + + diff --git a/install-dev/langs/de/data/tab.xml b/install-dev/langs/de/data/tab.xml index 77e9e2a2c..237e792eb 100644 --- a/install-dev/langs/de/data/tab.xml +++ b/install-dev/langs/de/data/tab.xml @@ -74,8 +74,8 @@ - - + + diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml index 8a8a26d53..4eaf19c75 100644 --- a/install-dev/langs/en/data/tab.xml +++ b/install-dev/langs/en/data/tab.xml @@ -12,7 +12,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/install-dev/langs/es/data/tab.xml b/install-dev/langs/es/data/tab.xml index a6b338ef1..6d0c59194 100644 --- a/install-dev/langs/es/data/tab.xml +++ b/install-dev/langs/es/data/tab.xml @@ -74,8 +74,8 @@ - - + + diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml index af30db6ef..db545d6b9 100644 --- a/install-dev/langs/fr/data/tab.xml +++ b/install-dev/langs/fr/data/tab.xml @@ -74,8 +74,8 @@ - - + + diff --git a/install-dev/langs/it/data/tab.xml b/install-dev/langs/it/data/tab.xml index 7680fd02a..d92e19771 100644 --- a/install-dev/langs/it/data/tab.xml +++ b/install-dev/langs/it/data/tab.xml @@ -74,8 +74,8 @@ - - + + diff --git a/install-dev/langs/nl/data/tab.xml b/install-dev/langs/nl/data/tab.xml index a574d957d..ddb0ba5fa 100644 --- a/install-dev/langs/nl/data/tab.xml +++ b/install-dev/langs/nl/data/tab.xml @@ -12,7 +12,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/install-dev/langs/pl/data/tab.xml b/install-dev/langs/pl/data/tab.xml index 6e8b4ea69..5594c813a 100644 --- a/install-dev/langs/pl/data/tab.xml +++ b/install-dev/langs/pl/data/tab.xml @@ -74,8 +74,8 @@ - - + + diff --git a/install-dev/langs/ru/data/tab.xml b/install-dev/langs/ru/data/tab.xml index 61a47ddd3..61e2c4856 100644 --- a/install-dev/langs/ru/data/tab.xml +++ b/install-dev/langs/ru/data/tab.xml @@ -74,8 +74,8 @@ - - + + diff --git a/translations/br.gzip b/translations/br.gzip index f1dee49a1..8c1772ee4 100644 Binary files a/translations/br.gzip and b/translations/br.gzip differ diff --git a/translations/de.gzip b/translations/de.gzip index 0ba30b609..bafdfd1b9 100644 Binary files a/translations/de.gzip and b/translations/de.gzip differ diff --git a/translations/en.gzip b/translations/en.gzip index d4c0f9654..a43fe55a1 100644 Binary files a/translations/en.gzip and b/translations/en.gzip differ diff --git a/translations/es.gzip b/translations/es.gzip index 4aa6cb88a..1dffffe1c 100644 Binary files a/translations/es.gzip and b/translations/es.gzip differ diff --git a/translations/fr.gzip b/translations/fr.gzip index f2f864c50..733390e04 100644 Binary files a/translations/fr.gzip and b/translations/fr.gzip differ diff --git a/translations/it.gzip b/translations/it.gzip index bac0effcf..96285a813 100644 Binary files a/translations/it.gzip and b/translations/it.gzip differ diff --git a/translations/nl.gzip b/translations/nl.gzip index 686fc298e..bb17d5865 100644 Binary files a/translations/nl.gzip and b/translations/nl.gzip differ diff --git a/translations/pl.gzip b/translations/pl.gzip index 7792315b0..f38d6f128 100644 Binary files a/translations/pl.gzip and b/translations/pl.gzip differ diff --git a/translations/ru.gzip b/translations/ru.gzip index 5ceb1636b..1af1cb113 100644 Binary files a/translations/ru.gzip and b/translations/ru.gzip differ