// Add Core prefix for Stock and ProductCompare classes + fix main URL on shop URL + add some translation

admin-dev/tabs/AdminShopUrl.php

@@ -52,21 +52,46 @@ class AdminShopUrl extends AdminTab
 	
 	public function postProcess()
 	{
+		$token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
 		if (Tools::isSubmit('submitAdd'.$this->table))
 		{
 			$object = $this->loadObject(true);
-			if ($object->id)
+			if ($object->id && Tools::getValue('main'))
-			{
+				$object->setMain();
-				$beforeUpdate = new ShopUrl((int)$object->id);
+				
-				if ($beforeUpdate->main AND !Tools::getValue('main'))
+			if ($object->main && !Tools::getValue('main'))
-					$this->_errors[] = Tools::displayError('You must have a main url per shop');
+				$this->_errors[] = Tools::displayError('You can\'t change a main url to a non main url, you have to set an other url as main url for selected shop');
-			}
+				
+			if (($object->main || Tools::getValue('main')) && !Tools::getValue('active'))
+				$this->_errors[] = Tools::displayError('You can\'t disable a main url');
+
 			if ($object->canAddThisUrl(Tools::getValue('domain'), Tools::getValue('domain_ssl'), Tools::getValue('physical_uri'), Tools::getValue('virtual_uri')))
 				$this->_errors[] = Tools::displayError('A shop url that use this domain and uri already exists');
 			
+			parent::postProcess();
 			Tools::generateHtaccess(dirname(__FILE__).'/../../.htaccess', Configuration::get('PS_REWRITING_SETTINGS'), Configuration::get('PS_HTACCESS_CACHE_CONTROL'), '');
 		}
-		return parent::postProcess();
+		elseif ((isset($_GET['status'.$this->table]) OR isset($_GET['status'])) AND Tools::getValue($this->identifier))
+		{
+			if ($this->tabAccess['edit'] === '1')
+			{
+				if (Validate::isLoadedObject($object = $this->loadObject()))
+				{
+					if ($object->main)
+						$this->_errors[] = Tools::displayError('You can\'t disable a main url');
+					else if ($object->toggleStatus())
+						Tools::redirectAdmin(self::$currentIndex.'&conf=5&token='.$token);
+					else
+						$this->_errors[] = Tools::displayError('An error occurred while updating status.');
+				}
+				else
+					$this->_errors[] = Tools::displayError('An error occurred while updating status for object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
+			}
+			else
+				$this->_errors[] = Tools::displayError('You do not have permission to edit here.');
+		}
+		else
+			return parent::postProcess();
 	}
 	
 	protected function afterUpdate($object)
@@ -81,25 +106,56 @@ class AdminShopUrl extends AdminTab
 
 		if (!($obj = $this->loadObject(true)))
 			return;
+		$currentShop = Shop::initialize();
+
+		$listShopWithUrl = array();
+		foreach (Shop::getShops(false, null, true) as $id)
+			$listShopWithUrl[$id] = (bool)count(ShopUrl::getShopUrls($id));
+		$jsShopUrl = Tools::jsonEncode($listShopWithUrl);
 
 		echo <<<EOF
 		<script type="text/javascript">
 		//<![CDATA[
+		function fillShopUrl()
+		{
+			var domain = $('#domain').val();
+			var physical = $('#physical_uri').val();
+			var virtual = $('#virtual_uri').val();
+			url = ((domain) ? domain : '???');
+			if (physical)
+				url += '/'+physical;
+			if (virtual)
+				url += '/'+virtual;
+			url = url.replace(/\/+/g, "/");
+			$('#final_url').val('http://'+url);
+		};
+
+		var shopUrl = {$jsShopUrl};
+		function checkMainUrlInfo(shopID)
+		{
+			if (!shopID)
+				shopID = $('#id_shop').val();
+
+			if (!shopUrl[shopID])
+			{
+				$('#main_off').attr('disabled', true);
+				$('#main_on').attr('checked', true);
+				$('#mainUrlInfo').css('display', 'block');
+				$('#mainUrlInfoExplain').css('display', 'none');
+			}
+			else
+			{
+				$('#main_off').attr('disabled', false);
+				$('#mainUrlInfo').css('display', 'none');
+				$('#mainUrlInfoExplain').css('display', 'block');
+			}
+		}
+
 		$().ready(function()
 		{
-			$('#domain, #physical_uri, #virtual_uri').keyup(function()
+			fillShopUrl();
-			{
+			checkMainUrlInfo();
-				var domain = $('#domain').val();
+			$('#domain, #physical_uri, #virtual_uri').keyup(fillShopUrl);
-				var physical = $('#physical_uri').val();
-				var virtual = $('#virtual_uri').val();
-				url = ((domain) ? domain : '???');
-				if (physical)
-					url += '/'+physical;
-				if (virtual)
-					url += '/'+virtual;
-				url = url.replace(/\/+/g, "/");
-				$('#final_url').val('http://'+url);
-			});
 		});
 		//]]>
 		</script>
@@ -111,32 +167,29 @@ EOF;
 			<fieldset><legend>'.$this->l('Shop Url').'</legend>
 				<label for="domain">'.$this->l('Domain').'</label>
 				<div class="margin-form">
-					<input type="text" name="domain" id="domain" value="'.$this->getFieldValue($obj, 'domain').'" />
+					<input type="text" name="domain" id="domain" value="'.((Validate::isLoadedObject($obj)) ? $this->getFieldValue($obj, 'domain') : $currentShop->domain).'" />
 				</div>
 				<label for="domain">'.$this->l('Domain SSL').'</label>
 				<div class="margin-form">
-					<input type="text" name="domain_ssl" id="domain_ssl" value="'.$this->getFieldValue($obj, 'domain_ssl').'" />
+					<input type="text" name="domain_ssl" id="domain_ssl" value="'.((Validate::isLoadedObject($obj)) ? $this->getFieldValue($obj, 'domain_ssl') : $currentShop->domain_ssl).'" />
 				</div>
 				<label for="physical_uri">'.$this->l('Physical URI').'</label>
 				<div class="margin-form">
-					<input type="text" name="physical_uri" id="physical_uri" value="'.$this->getFieldValue($obj, 'physical_uri').'" />
+					<input type="text" name="physical_uri" id="physical_uri" value="'.((Validate::isLoadedObject($obj)) ? $this->getFieldValue($obj, 'physical_uri') : $currentShop->physical_uri).'" />
 					<p>'.$this->l('Physical folder of your store on your server. Leave this field empty if your store is installed on root path.').'</p>
 				</div>';
-		if (Shop::isMultiShopActivated())
-		{
 			echo '<label for="virtual_uri">'.$this->l('Virtual URI').'</label>
 				<div class="margin-form">
 					<input type="text" name="virtual_uri" id="virtual_uri" value="'.$this->getFieldValue($obj, 'virtual_uri').'" />
 					<p>'.$this->l('This virtual folder must not exist on your server and is used to associate an URI to a shop.').'<br /><b>'.$this->l('URL rewriting must be activated on your server to use this feature.').'</b></p>
 				</div>';
-		}
 		echo '	<label>'.$this->l('Your final URL will be').'</label>
 				<div class="margin-form">
-					<input type="text" readonly="readonly" id="final_url" style="width: 400px" value="'.$obj->getURL().'" /> 
+					<input type="text" readonly="readonly" id="final_url" style="width: 400px" /> 
 				</div>
 				<label for="id_shop">'.$this->l('Shop').'</label>
 				<div class="margin-form">
-					<select name="id_shop" id="id_shop">';
+					<select name="id_shop" id="id_shop" onchange="checkMainUrlInfo(this.value)">';
 		foreach (Shop::getTree() AS $gID => $gData)
 		{
 			echo '<optgroup label="'.$gData['name'].'">';
@@ -153,7 +206,9 @@ EOF;
 					<label class="t" for="main_on"> <img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" /></label>
 					<input type="radio" name="main" id="main_off" value="0" '.(!$this->getFieldValue($obj, 'main') ? 'checked="checked" ' : '').'/>
 					<label class="t" for="main_off"> <img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" /></label>
-					<p>'.$this->l('Set this url as main, all urls set to this shop will be redirected to this url.').'</p>
+					<p>'.$this->l('If you set this url as main url for selected shop, all urls set to this shop will be redirected to this url (you can only have one main url per shop).').'</p>
+					<p id="mainUrlInfo">'.$this->l('Since the selected shop has no main url, you have to set this url as main').'</p>
+					<p id="mainUrlInfoExplain">'.$this->l('The selected shop has already a main url, if you set this one as main url, the older one will be set as normal url').'</p>
 				</div>
 				<label>'.$this->l('Status:').' </label>
 				<div class="margin-form">

classes/CompareProduct.php

@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class CompareProduct extends ObjectModel
+class CompareProductCore extends ObjectModel
 {
 	public		$id;
 	

classes/Shop.php

@@ -37,9 +37,11 @@ class ShopCore extends ObjectModel
 	public	$id_category;
 	public	$deleted;
 
-	protected $theme_name;
+	public $theme_name;
-	protected $physical_uri;
+	public $physical_uri;
-	protected $virtual_uri;
+	public $virtual_uri;
+	public $domain;
+	public $domain_ssl;
 
 	/**
 	 * @var GroupShop
@@ -120,6 +122,31 @@ class ShopCore extends ObjectModel
 		return $fields;
 	}
 	
+	public function __construct($id = NULL, $id_lang = NULL, $id_shop = NULL)
+	{
+		parent::__construct($id, $id_lang, $id_shop);
+
+		if ($this->id)
+		{
+			$sql = 'SELECT su.physical_uri, su.virtual_uri, su.domain, su.domain_ssl, t.name
+					FROM '._DB_PREFIX_.'shop s
+					LEFT JOIN '._DB_PREFIX_.'shop_url su ON (s.id_shop = su.id_shop)
+					LEFT JOIN '._DB_PREFIX_.'theme t ON (t.id_theme = s.id_theme)
+					WHERE s.id_shop = '.$this->id.'
+						AND s.active = 1
+						AND s.deleted = 0
+						AND su.main = 1';
+			if (!$row = Db::getInstance()->getRow($sql))
+				return ;
+	
+			$this->theme_name = $row['name'];
+			$this->physical_uri = $row['physical_uri'];
+			$this->virtual_uri = $row['virtual_uri'];
+			$this->domain = $row['domain'];
+			$this->domain_ssl = $row['domain_ssl'];
+		}
+	}
+
 	public function add($autodate = true, $nullValues = false)
 	{
 		$res = parent::add();
@@ -182,7 +209,7 @@ class ShopCore extends ObjectModel
 				$excluded_uris[] = $directory;
 
 		// Find current shop from URL
-		if (!$id_shop = Tools::getValue('id_shop'))
+		if (!$id_shop = Tools::getValue('id_shop') && !defined('PS_ADMIN_DIR'))
 		{
 			$sql = 'SELECT s.id_shop, CONCAT(su.physical_uri, su.virtual_uri) AS uri
 					FROM '._DB_PREFIX_.'shop_url su
@@ -211,30 +238,6 @@ class ShopCore extends ObjectModel
 		return $shop;
 	}
 
-	/**
-	 * Load some additional data of current shop (theme name, shop uri)
-	 *
-	 * @return bool
-	 */
-	protected function loadShopInfos()
-	{
-		$sql = 'SELECT su.physical_uri, su.virtual_uri, t.name
-				FROM '._DB_PREFIX_.'shop s
-				LEFT JOIN '._DB_PREFIX_.'shop_url su ON (s.id_shop = su.id_shop)
-				LEFT JOIN '._DB_PREFIX_.'theme t ON (t.id_theme = s.id_theme)
-				WHERE s.id_shop = '.$this->id.'
-					AND s.active = 1
-					AND s.deleted = 0
-					AND su.main = 1';
-		if (!$row = Db::getInstance()->getRow($sql))
-			return false;
-
-		$this->theme_name = $row['name'];
-		$this->physical_uri = $row['physical_uri'];
-		$this->virtual_uri = $row['virtual_uri'];
-		return true;
-	}
-
 	/**
 	 * Get shop theme name
 	 *
@@ -242,8 +245,6 @@ class ShopCore extends ObjectModel
 	 */
 	public function getTheme()
 	{
-		if (!$this->theme_name)
-			$this->loadShopInfos();
 		return $this->theme_name;
 	}
 
@@ -255,8 +256,6 @@ class ShopCore extends ObjectModel
 	 */
 	public function getBaseURI()
 	{
-		if (!$this->theme_name)
-			$this->loadShopInfos();
 		return $this->physical_uri.$this->virtual_uri;
 	}
 

classes/ShopUrl.php

@@ -90,8 +90,10 @@ class ShopUrlCore extends ObjectModel
 		
 	public function setMain()
 	{
-		$res = Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'shop_url SET main=0 WHERE id_shop = '.(int)$this->id_shop);
+		$res = Db::getInstance()->autoExecute(_DB_PREFIX_.'shop_url', array('main' => 0), 'UPDATE', 'id_shop = '.(int)$this->id_shop);
-		$res &= Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'shop_url SET main=1 WHERE id_shop_url = '.(int)$this->id);
+		$res &= Db::getInstance()->autoExecute(_DB_PREFIX_.'shop_url', array('main' => 1), 'UPDATE', 'id_shop_url = '.(int)$this->id);
+		$this->main = true;
+
 		return $res;
 	}
 		
@@ -121,7 +123,7 @@ class ShopUrlCore extends ObjectModel
 		if (!self::$main_domain)
 			self::$main_domain = Db::getInstance()->getValue('SELECT domain
 															FROM '._DB_PREFIX_.'shop_url
-															WHERE main=1 AND id_shop = '.Context::getContext()->shop->getID());
+															WHERE main=1 AND id_shop = '.Context::getContext()->shop->getID(true));
 		return self::$main_domain;
 	}
 	

classes/Stock.php

@@ -28,7 +28,7 @@
 /**
  * @since 1.5.0
  */
-class Stock extends ObjectModel
+class StockCore extends ObjectModel
 {
 	public $id_product;
 	public $id_product_attribute;

translations/fr/admin.php

@@ -684,6 +684,7 @@ $_LANGADM['AdminCustomers3edf8ca26a1ec14dd6e91dd277ae1de6'] = 'Origine';
 $_LANGADM['AdminCustomers5b8c99dad1893a85076709b2d3c2d2d0'] = 'Adresse IP';
 $_LANGADM['AdminCustomers14542f5997c4a02d4276da364657f501'] = 'Lien direct';
 $_LANGADM['AdminCustomersff398a1c3434e160c655aa1613e0eace'] = 'Affiliés';
+$_LANGADM['AdminCustomers9f82518d468b9fee614fcc92f76bb163'] = 'Boutiques';
 $_LANGADM['AdminCustomerse239a881630d41e28d0664273bdcf625'] = 'Retour à la liste des clients';
 $_LANGADM['AdminCustomersce26601dac0dea138b7295f02b7620a7'] = 'Client';
 $_LANGADM['AdminCustomerscaa5b7a48ce4b1c1492c445446433fb5'] = 'Sexe :';
@@ -811,6 +812,7 @@ $_LANGADM['AdminDiscounts00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminDiscountsb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
 $_LANGADM['AdminDiscounts24a23d787190f2c4812ff9ab11847a72'] = 'Statut :';
 $_LANGADM['AdminDiscountse398b74759e89e64fbf671008726912a'] = 'Activer ou désactiver le bon de réduction';
+$_LANGADM['AdminDiscountsf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutiques associées';
 $_LANGADM['AdminDiscounts38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminDiscounts19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
 $_LANGADM['AdminEmails1e884e3078d9978e216a027ecd57fb34'] = 'Adresse e-mail';
@@ -966,9 +968,13 @@ $_LANGADM['AdminGroupShop00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé';
 $_LANGADM['AdminGroupShop791a9f4aec774fbe5591d239f3cf0113'] = 'Groupe de boutiques';
 $_LANGADM['AdminGroupShopfa2428e247e092ba7b8380481f5d2c23'] = 'Vous ne pouvez pas éditer ce groupe de boutiques lorque que vous avez plus d\'une boutique';
 $_LANGADM['AdminGroupShop677c9a43ef87f39833e514afc74569be'] = 'Nom du groupe de boutiques';
+$_LANGADM['AdminGroupShop5b55607ff39362e86c0693626a6cc20f'] = 'Partager les clients';
 $_LANGADM['AdminGroupShopb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
+$_LANGADM['AdminGroupShop934514d7bd6af6a23fca1b985ec2d640'] = 'Partager les comptes clients entre les différentes boutiques de ce groupe';
 $_LANGADM['AdminGroupShop97dd1ad98c5cdd8fae3bbe74174979f0'] = 'Stock partagé';
 $_LANGADM['AdminGroupShop468c3f9dcd67b3f768d2161908d820eb'] = 'Stock partagé entre les magasins de ce groupe';
+$_LANGADM['AdminGroupShopa23a8100bb34ea482c8fb134da89710e'] = 'Partager les commandes';
+$_LANGADM['AdminGroupShop6cbbf7ff5d60b20ff3b8dcb3484eafdb'] = 'Partager les commandes et les paniers entre les différentes boutiques de ce groupe (vous ne pouvez partager les commandes que si vous partagez les clients et les stocks)';
 $_LANGADM['AdminGroupShop24a23d787190f2c4812ff9ab11847a72'] = 'Statut:';
 $_LANGADM['AdminGroupShop37c0e2b9736bc4cc2005f7be3fd66fe5'] = 'Activer ou désactiver la boutique';
 $_LANGADM['AdminGroupShop38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
@@ -995,8 +1001,8 @@ $_LANGADM['AdminGroups2dc9a383d693a2ded8b1ef832926ea93'] = 'Affichage des prix:'
 $_LANGADM['AdminGroupsbefcac0f9644a7abee43e69f49252ac4'] = 'taxes exclues';
 $_LANGADM['AdminGroupsf4a0d7cb0cd45214c8ca5912c970de13'] = 'taxes inclues';
 $_LANGADM['AdminGroups35756bfdf07485441e0b1dd219025374'] = 'Comment afficher les prix pour ce groupe de client dans le détail de commande (taxes inclues / exclues).';
-$_LANGADM['AdminGroups38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminGroups817b35caca2afa11b6c1efc428315470'] = 'Groupe de boutiques associé';
+$_LANGADM['AdminGroups38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminGroups19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
 $_LANGADM['AdminGroupsc53a3dc4f27d93e065c2c5be5a78b74f'] = 'Nouvelle réduction de groupe';
 $_LANGADM['AdminGroups56a8a9eb05f9014da51a4f9b57322ac7'] = 'Catégorie :';
@@ -2372,6 +2378,7 @@ $_LANGADM['AdminReferrers2e27c4006a026eacfc1f85b41bf9bc4c'] = 'Rémunération de
 $_LANGADM['AdminReferrers4b11cf76a471c13ba29b799772c90ddf'] = 'Pour chaque commande passée.';
 $_LANGADM['AdminReferrers86190054fc32554662ffbb12b717e8d0'] = 'Rémunération en %';
 $_LANGADM['AdminReferrersab20dd433a5e44c6166509b6c0075b9d'] = 'Pourcentage de la commande reversé.';
+$_LANGADM['AdminReferrersf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutiques associées';
 $_LANGADM['AdminReferrers6a26f548831e6a8c26bfbbd9f6ec61e0'] = 'Aide';
 $_LANGADM['AdminReferrersa1b58c5793a9c4b1596f555d3c46ca7c'] = 'Définitions';
 $_LANGADM['AdminReferrers62508131fde00888d0811939026f2f60'] = 'Le champ `http_referer`représente le site par lequel le visiteur est arrivé.';
@@ -2482,6 +2489,7 @@ $_LANGADM['AdminScenes8a5c9824486e8c1f74cb4c4ec8f9e465'] = '(hauteur x largeur)'
 $_LANGADM['AdminScenesa5394858079fa378684b20a1abc0e9be'] = 'Note : Pour changer la dimension de base des images de scènes,  veuillez modifier le paramètre \'large_scene\' avec les dimensions souhaitées (dans le Back office : Onglet \'Préférences\' > Onglet \'Image\').';
 $_LANGADM['AdminScenes56a8a9eb05f9014da51a4f9b57322ac7'] = 'Catégorie(s) :';
 $_LANGADM['AdminScenes19f2cd1d239a894f67d4ac73058af014'] = 'Cochez les cases des catégories dans lesquelles la scène doit apparaître.';
+$_LANGADM['AdminScenesf16b5952df8d25ea30b25ff95ee8fedf'] = 'Boutiques associées';
 $_LANGADM['AdminScenesdf41d831253828e9852a25c72393fde8'] = 'Enregistrez la scène';
 $_LANGADM['AdminScenesf5dae0e1b3d4bc66fadd2840b4f79227'] = 'Veuillez ajouter une image pour continuer';
 $_LANGADM['AdminScenes19f823c6453c2b1ffd09cb715214813d'] = 'Champs requis';
@@ -2597,10 +2605,12 @@ $_LANGADM['AdminShopd721757161f7f70c5b0949fdb6ec2c30'] = 'Thème';
 $_LANGADM['AdminShop38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
 $_LANGADM['AdminShop19f823c6453c2b1ffd09cb715214813d'] = 'Champ obligatoire';
 $_LANGADM['AdminShop1d6af794b2599c1407a83029a09d1ecf'] = 'Transporteurs';
+$_LANGADM['AdminShopb8ddfef634372f5719de857ea26c99be'] = 'Langues des catégories';
 $_LANGADM['AdminShop622f3c75de9f3481ffc58c1f292c1c2b'] = 'Page CMS';
 $_LANGADM['AdminShopbbaff12800505b22a853e8b7f4eb6a22'] = 'Contact';
 $_LANGADM['AdminShop790d59ef178acbc75d233bf4211763c6'] = 'Pays';
 $_LANGADM['AdminShopdfcfc43722eef1eab1e4a12e50a068b1'] = 'Devises';
+$_LANGADM['AdminShop9d5bf15117441a1b52eb1f0808e4aad3'] = 'Réductions';
 $_LANGADM['AdminShopfff0d600f8a0b5e19e88bfb821dd1157'] = 'Images';
 $_LANGADM['AdminShop92318dc9b42eb05bb1c958f0a15d19b9'] = 'Langues';
 $_LANGADM['AdminShop2377be3c2ad9b435ba277a73f0f1ca76'] = 'Fabricants';
@@ -2613,9 +2623,12 @@ $_LANGADM['AdminShop72cfee7e99f1d0a9df6cb5434fac3665'] = 'Restrictions des group
 $_LANGADM['AdminShop9e43e210cf7bd16b8896636cae3e46b8'] = 'Restrictions des devises pour le module de paiement';
 $_LANGADM['AdminShop068f80c7519d0528fb08e82137a72131'] = 'Produits';
 $_LANGADM['AdminShop511e7adbb96dafc5569e4be09da8dc93'] = 'Langue des produits';
+$_LANGADM['AdminShopbb34f602e45a9fbcb2cdfee7a48673fc'] = 'Scènes';
 $_LANGADM['AdminShop27ce7f8b5623b2e2df568d64cf051607'] = 'Stock';
 $_LANGADM['AdminShop821b8ee6937cec96c30fdafbfe836d68'] = 'Magasins';
 $_LANGADM['AdminShopdad1f8d794ee0dd7753fe75e73b78f31'] = 'Zones';
+$_LANGADM['AdminShop99104e1966b34f0320d33c5892946a82'] = 'Importer les informations associées (produits, etc.) depuis une autre boutique';
+$_LANGADM['AdminShop8409f0f4c1b13db73d10a0f148b67dda'] = 'Importer les informations de la boutique';
 $_LANGADM['AdminShopff8be7dc0dfd076e494b88721b257237'] = 'Utilisez cette option pour associer  les données (produits, modules etc) de la même façon que la boutique sélectionnée';
 $_LANGADM['AdminShop652342e19bf26f8d1b350e60aad3e3bf'] = 'Ajouter une nouvelle boutique';
 $_LANGADM['AdminShopUrlb718adec73e04ce3ec720dd11a06a308'] = 'ID';
@@ -2635,7 +2648,9 @@ $_LANGADM['AdminShopUrl6c2f1301971c801a2d1390c39680116f'] = 'L\'URL de votre mag
 $_LANGADM['AdminShopUrl9f82518d468b9fee614fcc92f76bb163'] = 'Boutique';
 $_LANGADM['AdminShopUrl9efaaad2d5b51cd643529cd6872e169a'] = 'URL principale:';
 $_LANGADM['AdminShopUrlb9f5c797ebbf55adccdd8539a65a0241'] = 'Désactivé';
-$_LANGADM['AdminShopUrl8500be40b2c3dc6d0e069e9ec893f456'] = 'Configurer cette url comme principale, toutes les URL configurées sur cette boutique seront redirigé vers cette url.';
+$_LANGADM['AdminShopUrl3648bf7fbf02a7ae9cdfecf803561031'] = 'Si vous choisissez cette URL comme URL principale pour cette boutique, toutes les autres URL de cette boutiques seront redirigées vers celle ci (vous ne pouvez avoir qu\'une URL principale par magasin).';
+$_LANGADM['AdminShopUrl134a0349fbc36ef37c862a7321e5e142'] = 'Puisque la boutique sélectionné ne possède aucune URL principale, l\'URL que vous créez sera automatiquement mise en tant qu\'URL principale';
+$_LANGADM['AdminShopUrl681a2f774a1323b8c265610dc0a0d5cb'] = 'La boutique sélectionnée a déjà une URL principale, si vous choisissez l\'URL courante comme étant principale pour cette boutique, l\'ancienne URL principale sera remise en tant qu\'URL normale';
 $_LANGADM['AdminShopUrl24a23d787190f2c4812ff9ab11847a72'] = 'Statut:';
 $_LANGADM['AdminShopUrlad02fa652079de031f48cc5cf9396598'] = 'Activer ou désactiver l\'URL';
 $_LANGADM['AdminShopUrl38fb7d24e0d60a048f540ecb18e13376'] = 'Enregistrer';
@@ -2727,6 +2742,7 @@ $_LANGADM['AdminStockMvtf78c5ca37035326bca5e672deb6f2705'] = 'Calculer le mouvem
 $_LANGADM['AdminStockMvta4d3b161ce1309df1c4e25df28694b7b'] = 'Valider';
 $_LANGADM['AdminStockMvt31c6b3fdfaaa80dba2dbf92a4600524c'] = 'Signe';
 $_LANGADM['AdminStockMvt49ee3087348e8d44e1feda1917443987'] = 'Nom';
+$_LANGADM['AdminStockMvtdae8ace18bdcbcc6ae5aece263e14fe8'] = 'Options';
 $_LANGADM['AdminStockMvtd7319ffe5be44fae23cc7d312c312026'] = 'Raison par défaut pour un mouvement de stock :';
 $_LANGADM['AdminStockMvtad800300cd0f25f7847c4de9abae4fab'] = 'Raison pour les mouvements de stock';
 $_LANGADM['AdminStoresb718adec73e04ce3ec720dd11a06a308'] = 'ID';
@@ -3315,6 +3331,7 @@ $_LANGADM['AdminTabb51d77dc443d4051900f1bad9fe885aa'] = 'Vous êtes actuellement
 $_LANGADM['AdminTab6aa5c0d2cbc4a0f53206777be432056a'] = 'Celui-ci est différent du nom de domaine principal de la boutique présent dans l\'onglet \"Préférences > SEO & URLs\".';
 $_LANGADM['AdminTab7e4b7faf0fc36dc296e66f6ea3096dcd'] = 'Cliquez ici si vous souhaitez modifier le nom de domaine principal de la boutique';
 $_LANGADM['AdminTab9f82518d468b9fee614fcc92f76bb163'] = 'Boutique';
+$_LANGADM['AdminTab804ccd6219996d12eda865d1c0707423'] = 'Toutes les boutiques';
 $_LANGADM['AdminTab4483a6be5e4574762e7dbcf4879918e8'] = 'Ce champs sera changé pour la boutique';
 $_LANGADM['index86bbc77fd75ac02c21b84a37b260eadd'] = 'Panneau d\'administration';
 $_LANGADM['index4236a440a662cc8253d7536e5aa17942'] = 'déconnexion';