- {l s='Assign features to this product:'}
-
+ {l s='Assign features to this product:'}
+
- {l s='You can specify a value for each relevant feature regarding this product, empty fields will not be displayed.'}
- {l s='You can either set a specific value, or select among existing pre-defined values you added previously.'}
diff --git a/admin-dev/themes/template/products/images.tpl b/admin-dev/themes/template/products/images.tpl
index af37281f5..a965eed42 100644
--- a/admin-dev/themes/template/products/images.tpl
+++ b/admin-dev/themes/template/products/images.tpl
@@ -1,11 +1,6 @@
2. {l s='Images'} ({$countImages})
-
-
- | {if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if} |
-
-
-
+ {if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}
|
@@ -17,7 +12,7 @@
00
-
+
{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size / 1000}{l s='Kb max.'}
diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl
index 045396f60..4b5db87c5 100644
--- a/admin-dev/themes/template/products/informations.tpl
+++ b/admin-dev/themes/template/products/informations.tpl
@@ -83,7 +83,7 @@
-
+
{* global information *}
|
@@ -387,7 +387,7 @@ $(document).ready(function(){
{* [begin] physical product infos *}
productDownload->id && $product->productDownload->active}style="display:none"{/if} >
-
+
|
@@ -432,7 +432,7 @@ $(document).ready(function(){
{* [begin] virtual product *}
productDownload->id || $product->productDownload->active}style="display:none"{/if} >
-
+
{l s='Does this product has an associated file ?'}
{l s='Yes'}
@@ -459,7 +459,7 @@ $(document).ready(function(){
{/if}
{if !$product->productDownload->checkFile()}
-
+
{l s='Your server\'s maximum upload file size is'}: {$upload_max_filesize}
{if $show_file_input}
@@ -580,7 +580,7 @@ $(document).ready(function(){
|
{$currency->prefix}{$currency->suffix}
- {l s='The wholesale price at which you bought this product'}
+ {l s='The wholesale price at which you bought this product'}
|
|
@@ -588,7 +588,7 @@ $(document).ready(function(){
|
{$currency->prefix}{$currency->suffix} *
- {l s='The pre-tax retail price to sell this product'}
+ {l s='The pre-tax retail price to sell this product'}
|
@@ -697,7 +697,7 @@ $(document).ready(function(){
|
- {l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}
+ {l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}
|
{/if}
@@ -970,7 +970,7 @@ $(document).ready(function(){
{l s='Forbidden characters:'} !<;>;?=+#"°{}_$%
{/foreach}
- {l s='Tags separated by commas (e.g., dvd, dvd player, hifi)'}
+ {l s='Tags separated by commas (e.g., dvd, dvd player, hifi)'}
diff --git a/admin-dev/themes/template/products/prices.tpl b/admin-dev/themes/template/products/prices.tpl
index 83753dc5e..a6e9732dc 100644
--- a/admin-dev/themes/template/products/prices.tpl
+++ b/admin-dev/themes/template/products/prices.tpl
@@ -1,10 +1,14 @@
-
 {l s='Add a new specific price'}
+
@@ -102,9 +106,6 @@ var product_prices = new Array();
-
-
- {l s='Current specific prices'}
diff --git a/admin-dev/themes/template/products/quantities.tpl b/admin-dev/themes/template/products/quantities.tpl
index 36c6b0e86..37dd72454 100644
--- a/admin-dev/themes/template/products/quantities.tpl
+++ b/admin-dev/themes/template/products/quantities.tpl
@@ -5,15 +5,8 @@
{l s='In this case, the quantities correspond to the quantitites of the real stock in the warehouses associated to the current shop.'}
-
-
-
- |
- {l s='Available quantities for sale'}
- |
-
-
-
+
+ {l s='Available quantities for sale'}
@@ -36,11 +29,15 @@
-
-
+
+
+
+
+
+
- | {l s='Quantity'} |
+ {l s='Quantity'} |
{l s='Designation'} |
diff --git a/admin-dev/themes/template/products/suppliers.tpl b/admin-dev/themes/template/products/suppliers.tpl
index ec6b35d7c..1d3d076d2 100644
--- a/admin-dev/themes/template/products/suppliers.tpl
+++ b/admin-dev/themes/template/products/suppliers.tpl
@@ -3,15 +3,7 @@
{l s='It is also possible to specify for each product/product combinations the supplier reference according to previously associated suppliers.'}
-
-
-
- |
- {l s='Suppliers of the current product'}
- |
-
-
-
+ {l s='Suppliers of the current product'}
{l s='Please choose the suppliers associated to this product, and the default one.'}
{assign var=confirm value="Are you sure you want to delete entered product information?"}
@@ -21,8 +13,8 @@
-
-
+
+
| {l s='Selected'} |
@@ -45,15 +37,7 @@
-
-
-
- |
- {l s='Product reference(s)'}
- |
-
-
-
+ {l s='Product reference(s)'}
{l s='You can specify product reference(s) for each supplier associated.'}
diff --git a/admin-dev/themes/template/products/warehouses.tpl b/admin-dev/themes/template/products/warehouses.tpl
index 10e3cb826..e85c3217d 100644
--- a/admin-dev/themes/template/products/warehouses.tpl
+++ b/admin-dev/themes/template/products/warehouses.tpl
@@ -3,16 +3,8 @@
{l s='It is also possible to specify for each product/product combinations its location in each warehouse.'}
-
-
-
- |
- {l s='Product location in warehouses'}
- |
-
-
-
-
+ {l s='Product location in warehouses'}
+
{l s='Please choose the warehouses associated to this product, and the default one.'}
{assign var=confirm value="Are you sure you want to delete entered product information?"}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index d51fc6c69..76562c43c 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2371,7 +2371,7 @@ class AdminProductsControllerCore extends AdminController
$content .= '
'.$this->l('Priorities management').'
-
+
'.$this->l('Sometimes one customer could fit in multiple rules, priorities allows you to define which rule to apply.').'
@@ -2480,25 +2480,22 @@ class AdminProductsControllerCore extends AdminController
$hasTextLabels = (int)($this->getFieldValue($obj, 'text_fields'));
$content .= '
-
-
- | '.$this->l('Add or modify customizable properties').' |
-
-
+ '.$this->l('Add or modify customizable properties').'
+
| | | | | |
{l s='Product combinations generator'}
-