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

classes/Product.php

@@ -3944,7 +3944,10 @@ class ProductCore extends ObjectModel
 				$id_address_delivery = (int)$product_update['id_address_delivery'];
 				$product_quantity = (int)(isset($product_update['cart_quantity']) ? $product_update['cart_quantity'] : $product_update['product_quantity']);
 				$price = isset($product_update['price']) ? $product_update['price'] : $product_update['product_price'];
-				$price_wt = $price * (1 + ((isset($product_update['tax_rate']) ? $product_update['tax_rate'] : $product_update['rate']) * 0.01));
+				if (isset($product_update['price_wt']) && $product_update['price_wt'])
+					$price_wt = $product_update['price_wt'];
+				else
+					$price_wt = $price * (1 + ((isset($product_update['tax_rate']) ? $product_update['tax_rate'] : $product_update['rate']) * 0.01));
 
 				if (isset($customized_datas[$product_id][$product_attribute_id]))
 					foreach ($customized_datas[$product_id][$product_attribute_id][$id_address_delivery] as $customization)

classes/pdf/PDFGenerator.php

@@ -39,7 +39,36 @@ class PDFGeneratorCore extends TCPDF
 	public $content;
 	public $font;
 
-	public $font_by_lang = array('ja' => 'cid0jp', 'bg' => 'freeserif', 'ru' => 'freeserif', 'el' => 'freeserif', 'vn' => 'dejavusans', 'pl' => 'dejavusans');
+	public $font_by_lang = array(
+		'ja' => 'cid0jp', 
+		'bg' => 'freeserif', 
+		'ru' => 'freeserif', 
+		'uk' => 'freeserif', 
+		'mk' => 'freeserif', 
+		'el' => 'freeserif', 
+		'vn' => 'dejavusans', 
+		'pl' => 'dejavusans',
+		'ar' => 'dejavusans',
+		'fa' => 'dejavusans',
+		'ur' => 'dejavusans',
+		'az' => 'dejavusans',
+		'ca' => 'dejavusans',
+		'gl' => 'dejavusans',
+		'hr' => 'dejavusans',
+		'sr' => 'dejavusans',
+		'si' => 'dejavusans',
+		'cs' => 'dejavusans',
+		'sk' => 'dejavusans',
+		'ka' => 'dejavusans',
+		'he' => 'dejavusans',
+		'lo' => 'dejavusans',
+		'lv' => 'dejavusans',
+		'tr' => 'dejavusans',
+		'ko' => 'cid0kr',
+		'zh' => 'cid0cs',
+		'tw' => 'cid0cs',
+		'th' => 'freeserif'
+		);
 
 
 	public function __construct($use_cache = false)

config/config.inc.php

@@ -151,19 +151,18 @@ if (defined('_PS_ADMIN_DIR_'))
 	if ($employee->id_profile != _PS_ADMIN_PROFILE_)
 		Shop::cacheShops(true);
 
-	$language = new Language($employee->id_lang);
-	$context->language = $language;
 	$cookie->id_lang = (int)$employee->id_lang;
 }
-else
-{
-	/* if the language stored in the cookie is not available language, use default language */
-	if (isset($cookie->id_lang) && $cookie->id_lang)
-		$language = new Language($cookie->id_lang);
-	if (!isset($language) || !Validate::isLoadedObject($language))
-		$language = new Language(Configuration::get('PS_LANG_DEFAULT'));
-	$context->language = $language;
 
+/* if the language stored in the cookie is not available language, use default language */
+if (isset($cookie->id_lang) && $cookie->id_lang)
+	$language = new Language($cookie->id_lang);
+if (!isset($language) || !Validate::isLoadedObject($language))
+	$language = new Language(Configuration::get('PS_LANG_DEFAULT'));
+$context->language = $language;
+
+if (!defined('_PS_ADMIN_DIR_'))
+{
 	if (isset($cookie->id_customer) && (int)$cookie->id_customer)
 	{
 		$customer = new Customer($cookie->id_customer);

controllers/admin/AdminProductsController.php

@@ -719,6 +719,8 @@ class AdminProductsControllerCore extends AdminController
 							}
 							if (!count($this->errors))
 								$success &= $product->delete();
+							else
+								$success = 0;
 						}
 					}