From 58c35a215224a126b9d4af238bf8bb86ee91abed Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Fri, 18 Nov 2011 18:27:48 +0000
Subject: [PATCH] // HelperForm : 'p' replaced by 'desc'

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10286 b9a71923-0436-4b27-9f14-aed3839534dd
---
 .../themes/template/helper/form/form.tpl      | 12 ++++----
 .../admin/AdminAddressesController.php        | 11 ++++---
 controllers/admin/AdminAliasesController.php  | 10 +++----
 .../admin/AdminAttachmentsController.php      |  4 +--
 .../admin/AdminAttributesGroupsController.php | 10 +++----
 controllers/admin/AdminCarriersController.php | 30 +++++++++----------
 .../admin/AdminCategoriesController.php       |  4 +--
 controllers/admin/AdminContactsController.php |  8 ++---
 .../admin/AdminCountriesController.php        | 12 ++++----
 .../admin/AdminCurrenciesController.php       | 16 +++++-----
 .../admin/AdminCustomersController.php        | 10 +++----
 .../admin/AdminDeliverySlipController.php     |  4 +--
 .../admin/AdminEmployeesController.php        | 10 +++----
 controllers/admin/AdminGendersController.php  |  4 +--
 .../admin/AdminGroupShopController.php        |  8 ++---
 controllers/admin/AdminGroupsController.php   |  4 +--
 controllers/admin/AdminImagesController.php   | 18 +++++------
 controllers/admin/AdminInvoicesController.php |  6 ++--
 .../admin/AdminLanguagesController.php        | 16 +++++-----
 .../admin/AdminManufacturersController.php    |  2 +-
 controllers/admin/AdminMetaController.php     | 10 +++----
 .../admin/AdminPerformanceController.php      | 28 ++++++++---------
 .../admin/AdminRangePriceController.php       |  6 ++--
 .../admin/AdminRangeWeightController.php      |  6 ++--
 .../admin/AdminReferrersController.php        | 12 ++++----
 controllers/admin/AdminReturnController.php   |  4 +--
 controllers/admin/AdminScenesController.php   |  4 +--
 controllers/admin/AdminShopController.php     |  4 +--
 controllers/admin/AdminShopUrlController.php  |  8 ++---
 controllers/admin/AdminSlipController.php     |  4 +--
 controllers/admin/AdminStatesController.php   | 10 +++----
 controllers/admin/AdminStatusesController.php | 10 +++----
 .../admin/AdminStockManagementController.php  | 30 +++++++++----------
 controllers/admin/AdminStockMvtController.php |  2 +-
 controllers/admin/AdminStoresController.php   |  8 ++---
 .../admin/AdminSuppliersController.php        |  4 +--
 .../admin/AdminSupplyOrdersController.php     | 28 ++++++++---------
 controllers/admin/AdminTabsController.php     |  2 +-
 .../admin/AdminTaxRulesGroupController.php    |  2 +-
 controllers/admin/AdminTaxesController.php    |  6 ++--
 .../admin/AdminWarehousesController.php       | 14 ++++-----
 .../admin/AdminWebserviceController.php       |  4 +--
 controllers/admin/AdminZonesController.php    |  4 +--
 43 files changed, 204 insertions(+), 205 deletions(-)

diff --git a/admin-dev/themes/template/helper/form/form.tpl b/admin-dev/themes/template/helper/form/form.tpl
index e996489f5..1a39e617f 100644
--- a/admin-dev/themes/template/helper/form/form.tpl
+++ b/admin-dev/themes/template/helper/form/form.tpl
@@ -107,7 +107,7 @@
 								{if isset($input.options.query) && !$input.options.query && isset($input.empty_message)}
 									{$input.empty_message}
 									{$input.required = false}
-									{$input.p = null}
+									{$input.desc = null}
 								{else}
 									<select name="{$input.name}"
 											id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
@@ -255,10 +255,10 @@
 								{$fields_value[$input.name]}
 							{/if}
 							{if isset($input.required) && $input.required} <sup>*</sup>{/if}
-							{if isset($input.p)}
+							{if isset($input.desc)}
 								<p class="clear">
-									{if is_array($input.p)}
-										{foreach $input.p as $p}
+									{if is_array($input.desc)}
+										{foreach $input.desc as $p}
 											{if is_array($p)}
 												<span id="{$p.id}">{$p.text}</span><br />
 											{else}
@@ -266,7 +266,7 @@
 											{/if}
 										{/foreach}
 									{else}
-										{$input.p}
+										{$input.desc}
 									{/if}
 								</p>
 							{/if}
@@ -285,7 +285,7 @@
 							name="{if isset($field.name)}{$field.name}{else}{$submit_action}{/if}{if isset($field.stay) && $field.stay}AndStay{/if}"
 							{if isset($field.class)}class="{$field.class}"{/if} />
 					</div>
-				{elseif $key == 'p'}
+				{elseif $key == 'desc'}
 					<p class="clear">
 						{if is_array($field)}
 							{foreach $field as $k => $p}
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index a67454f50..bb9bae4e7 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -93,7 +93,7 @@ class AdminAddressesControllerCore extends AdminController
 					'name' => 'dni',
 					'size' => 30,
 					'required' => false,
-					'p' => $this->l('DNI / NIF / NIE')
+					'desc' => $this->l('DNI / NIF / NIE')
 				),
 				array(
 					'type' => 'text',
@@ -124,7 +124,7 @@ class AdminAddressesControllerCore extends AdminController
 					'cols' => 36,
 					'rows' => 4,
 					'required' => false,
-					'p' => '<span class="hint" name="help_box">'.$this->l('Forbidden characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span></span>'
+					'hint' => $this->l('Forbidden characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span>'
 				),
 			),
 			'submit' => array(
@@ -171,14 +171,13 @@ class AdminAddressesControllerCore extends AdminController
 					'name' => 'company',
 					'size' => 33,
 					'required' => false,
-					'p' => '<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span></span>'
+					'hint' => $this->l('Invalid characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span>'
 				);
 				$temp_fields[] = array(
 					'type' => 'text',
 					'label' => $this->l('VAT number'),
 					'name' => 'vat_number',
 					'size' => 33,
-					''
 				);
 			}
 			elseif ($addr_field_item == 'lastname')
@@ -189,7 +188,7 @@ class AdminAddressesControllerCore extends AdminController
 					'name' => 'lastname',
 					'size' => 33,
 					'required' => true,
-					'p' => '<span class="hint" name="help_box">'.$this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:<span class="hint-pointer">&nbsp;</span></span>'
+					'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:<span class="hint-pointer">&nbsp;</span>'
 				);
 			}
 			elseif ($addr_field_item == 'firstname')
@@ -200,7 +199,7 @@ class AdminAddressesControllerCore extends AdminController
 					'name' => 'firstname',
 					'size' => 33,
 					'required' => true,
-					'p' => '<span class="hint" name="help_box">'.$this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:<span class="hint-pointer">&nbsp;</span></span>'
+					'hint' => $this->l('Invalid characters:').' 0-9!<>,;?=+()@#"�{}_$%:<span class="hint-pointer">&nbsp;</span>'
 				);
 			}
 			elseif ($addr_field_item == 'address1')
diff --git a/controllers/admin/AdminAliasesController.php b/controllers/admin/AdminAliasesController.php
index 3faaa26c7..1be41df49 100644
--- a/controllers/admin/AdminAliasesController.php
+++ b/controllers/admin/AdminAliasesController.php
@@ -45,9 +45,9 @@ class AdminAliasesControllerCore extends AdminController
 	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
 
 		$this->fieldsDisplay = array(
-			'alias' => array('title' => $this->l('Aliases'), 'width' => 160),
-			'search' => array('title' => $this->l('Search'), 'width' => 40),
-			'active' => array('title' => $this->l('Status'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
+			'alias' => array('title' => $this->l('Aliases'), 'width' => 'auto'),
+			'search' => array('title' => $this->l('Search'), 'width' => 100),
+			'active' => array('title' => $this->l('Status'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
 		);
 
 		parent::__construct();
@@ -67,7 +67,7 @@ class AdminAliasesControllerCore extends AdminController
 					'name' => 'alias',
 					'size' => 40,
 					'required' => true,
-					'p' => array(
+					'desc' => array(
 						$this->l('Enter each alias separated by a comma (\',\') (e.g., \'prestshop,preztashop,prestasohp\')'),
 						$this->l('Forbidden characters: <>;=#{}')
 					)
@@ -78,7 +78,7 @@ class AdminAliasesControllerCore extends AdminController
 					'name' => 'search',
 					'size' => 15,
 					'required' => true,
-					'p' => $this->l('Search this word instead.')
+					'desc' => $this->l('Search this word instead.')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminAttachmentsController.php b/controllers/admin/AdminAttachmentsController.php
index c5bd0ea7b..2f2df111c 100644
--- a/controllers/admin/AdminAttachmentsController.php
+++ b/controllers/admin/AdminAttachmentsController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -84,7 +84,7 @@ class AdminAttachmentsControllerCore extends AdminController
 					'type' => 'file',
 					'label' => $this->l('File:'),
 					'name' => 'file',
-					'p' => $this->l('Upload file from your computer')
+					'desc' => $this->l('Upload file from your computer')
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index daa018927..2f663360b 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -194,7 +194,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 					'size' => 33,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Term or phrase displayed to the customer')
+					'desc' => $this->l('Term or phrase displayed to the customer')
 				),
 				array(
 					'type' => 'select',
@@ -206,7 +206,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 						'id' => 'id',
 						'name' => 'name'
 					),
-					'p' => $this->l('Choose the type of the attribute group')
+					'desc' => $this->l('Choose the type of the attribute group')
 				)
 			)
 		);
@@ -261,7 +261,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 						'id' => 'id_attribute_group',
 						'name' => 'name'
 					),
-					'p' => $this->l('Choose the type of the attribute group')
+					'desc' => $this->l('Choose the type of the attribute group')
 				)
 			)
 		);
@@ -281,14 +281,14 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			'label' => $this->l('Color:'),
 			'name' => 'color',
 			'size' => 33,
-			'p' => $this->l('HTML colors only (e.g.,').' "lightblue", "#CC6600")'
+			'desc' => $this->l('HTML colors only (e.g.,').' "lightblue", "#CC6600")'
 		);
 
 		$this->fields_form['input'][] = array(
 			'type' => 'file',
 			'label' => $this->l('Texture:'),
 			'name' => 'texture',
-			'p' => array(
+			'desc' => array(
 				$this->l('Upload color texture from your computer'),
 				$this->l('This will override the HTML color!')
 			)
diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
index 6ee2c8cbb..7c4bb2682 100644
--- a/controllers/admin/AdminCarriersController.php
+++ b/controllers/admin/AdminCarriersController.php
@@ -192,7 +192,7 @@ class AdminCarriersControllerCore extends AdminController
 					'size' => 25,
 					'required' => true,
 					'hint' => $this->l('Allowed characters: letters, spaces and').' ().-',
-					'p' => array(
+					'desc' => array(
 						$this->l('Carrier name displayed during checkout'),
 						$this->l('With a value of 0, the carrier name will be replaced by the shop name')
 					)
@@ -201,7 +201,7 @@ class AdminCarriersControllerCore extends AdminController
 					'type' => 'file',
 					'label' => $this->l('Logo:'),
 					'name' => 'logo',
-					'p' => $this->l('Upload logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
+					'desc' => $this->l('Upload logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
 				),
 				array(
 					'type' => 'text',
@@ -211,7 +211,7 @@ class AdminCarriersControllerCore extends AdminController
 					'required' => true,
 					'size' => 41,
 					'maxlength' => 128,
-					'p' => $this->l('Time taken for product delivery; displayed during checkout')
+					'desc' => $this->l('Time taken for product delivery; displayed during checkout')
 				),
 				array(
 					'type' => 'text',
@@ -219,14 +219,14 @@ class AdminCarriersControllerCore extends AdminController
 					'name' => 'grade',
 					'required' => false,
 					'size' => 1,
-					'p' => $this->l('"0" for a longest shipping delay,"9" for the shortest shipping delay.')
+					'desc' => $this->l('"0" for a longest shipping delay,"9" for the shortest shipping delay.')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('URL:'),
 					'name' => 'url',
 					'size' => 40,
-					'p' => $this->l('URL for the tracking number; type \'@\' where the tracking number will appear')
+					'desc' => $this->l('URL for the tracking number; type \'@\' where the tracking number will appear')
 				),
 				array(
 					'type' => 'checkbox',
@@ -237,14 +237,14 @@ class AdminCarriersControllerCore extends AdminController
 						'id' => 'id_zone',
 						'name' => 'name'
 					),
-					'p' => $this->l('The zone in which this carrier is to be used')
+					'desc' => $this->l('The zone in which this carrier is to be used')
 				),
 				array(
 					'type' => 'group',
 					'label' => $this->l('Group access:'),
 					'name' => 'groupBox',
 					'values' => Group::getGroups(Context::getContext()->language->id),
-					'p' => $this->l('Mark all groups you want to give access to this carrier')
+					'desc' => $this->l('Mark all groups you want to give access to this carrier')
 				),
 				array(
 					'type' => 'radio',
@@ -265,7 +265,7 @@ class AdminCarriersControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Include or exclude carrier from list of carriers on Front Office')
+					'desc' => $this->l('Include or exclude carrier from list of carriers on Front Office')
 				),
 				array(
 					'type' => 'radio',
@@ -285,7 +285,7 @@ class AdminCarriersControllerCore extends AdminController
 							'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
 						)
 					),
-					'p' => $this->l('Apply shipping costs and additional shipping costs by products in carrier price')
+					'desc' => $this->l('Apply shipping costs and additional shipping costs by products in carrier price')
 				),
 				array(
 					'type' => 'select',
@@ -320,7 +320,7 @@ class AdminCarriersControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Include the shipping & handling costs in carrier price')
+					'desc' => $this->l('Include the shipping & handling costs in carrier price')
 				),
 				array(
 					'type' => 'radio',
@@ -365,7 +365,7 @@ class AdminCarriersControllerCore extends AdminController
 						'id' => 'id',
 						'name' => 'name'
 					),
-					'p' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)')
+					'desc' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)')
 				),
 				array(
 					'type' => 'text',
@@ -373,7 +373,7 @@ class AdminCarriersControllerCore extends AdminController
 					'name' => 'max_height',
 					'required' => false,
 					'size' => 10,
-					'p' => $this->l('Maximum height managed by this carrier. Set "0" or nothing, to ignore this field.')
+					'desc' => $this->l('Maximum height managed by this carrier. Set "0" or nothing, to ignore this field.')
 				),
 				array(
 					'type' => 'text',
@@ -381,7 +381,7 @@ class AdminCarriersControllerCore extends AdminController
 					'name' => 'max_width',
 					'required' => false,
 					'size' => 10,
-					'p' => $this->l('Maximum width managed by this carrier. Set "0" or nothing, to ignore this field.')
+					'desc' => $this->l('Maximum width managed by this carrier. Set "0" or nothing, to ignore this field.')
 				),
 				array(
 					'type' => 'text',
@@ -389,7 +389,7 @@ class AdminCarriersControllerCore extends AdminController
 					'name' => 'max_deep',
 					'required' => false,
 					'size' => 10,
-					'p' => $this->l('Maximum deep managed by this carrier. Set "0" or nothing, to ignore this field.')
+					'desc' => $this->l('Maximum deep managed by this carrier. Set "0" or nothing, to ignore this field.')
 				),
 				array(
 					'type' => 'text',
@@ -397,7 +397,7 @@ class AdminCarriersControllerCore extends AdminController
 					'name' => 'max_weight',
 					'required' => false,
 					'size' => 10,
-					'p' => $this->l('Maximum weight managed by this carrier. Set "0" or nothing, to ignore this field.')
+					'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or nothing, to ignore this field.')
 				),
 				array(
 					'type' => 'hidden',
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index 4f4a1a6a9..85668d5e4 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -233,7 +233,7 @@ class AdminCategoriesControllerCore extends AdminController
 					'label' => $this->l('Image:'),
 					'name' => 'image',
 					'display_image' => true,
-					'p' => $this->l('Upload category logo from your computer')
+					'desc' => $this->l('Upload category logo from your computer')
 				),
 				array(
 					'type' => 'text',
@@ -269,7 +269,7 @@ class AdminCategoriesControllerCore extends AdminController
 					'label' => $this->l('Group access:'),
 					'name' => 'groupBox',
 					'values' => Group::getGroups(Context::getContext()->language->id),
-					'p' => $this->l('Mark all groups you want to give access to this category')
+					'desc' => $this->l('Mark all groups you want to give access to this category')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php
index 490914a0c..4f3be3437 100644
--- a/controllers/admin/AdminContactsController.php
+++ b/controllers/admin/AdminContactsController.php
@@ -61,7 +61,7 @@ class AdminContactsControllerCore extends AdminController
 					'size' => 33,
 					'required' => true,
 					'lang' => true,
-					'p' => $this->l('Contact name, e.g., Technical Support'),
+					'desc' => $this->l('Contact name, e.g., Technical Support'),
 				),
 				array(
 					'type' => 'text',
@@ -69,7 +69,7 @@ class AdminContactsControllerCore extends AdminController
 					'name' => 'email',
 					'size' => 33,
 					'required' => false,
-					'p' => $this->l('E-mails will be sent to this address'),
+					'desc' => $this->l('E-mails will be sent to this address'),
 				),
 				array(
 					'type' => 'radio',
@@ -78,7 +78,7 @@ class AdminContactsControllerCore extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('The messages will be saved in the Customer Service tab'),
+					'desc' => $this->l('The messages will be saved in the Customer Service tab'),
 					'values' => array(
 						array(
 							'id' => 'customer_service_on',
@@ -100,7 +100,7 @@ class AdminContactsControllerCore extends AdminController
 					'lang' => true,
 					'cols' => 36,
 					'rows' => 5,
-					'p' => $this->l('Additional information about this contact'),
+					'desc' => $this->l('Additional information about this contact'),
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index aa9f81e46..50e95e4f9 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -157,7 +157,7 @@ class AdminCountriesControllerCore extends AdminController
 					'size' => 30,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Name of country')
+					'desc' => $this->l('Name of country')
 				),
 				array(
 					'type' => 'text',
@@ -167,7 +167,7 @@ class AdminCountriesControllerCore extends AdminController
 					'maxlength' => 3,
 					'class' => 'uppercase',
 					'required' => true,
-					'p' => $this->l('2- or 3-letter ISO code, e.g., FR for France').'.
+					'desc' => $this->l('2- or 3-letter ISO code, e.g., FR for France').'.
 							<a href="http://www.iso.org/iso/country_codes/iso_3166_code_lists/country_names_and_code_elements.htm" target="_blank">'.
 								$this->l('Official list here').'
 							</a>.'
@@ -180,7 +180,7 @@ class AdminCountriesControllerCore extends AdminController
 					'maxlength' => 3,
 					'class' => 'uppercase',
 					'required' => true,
-					'p' => $this->l('International call prefix, e.g., 33 for France.')
+					'desc' => $this->l('International call prefix, e.g., 33 for France.')
 				),
 				array(
 					'type' => 'select',
@@ -205,7 +205,7 @@ class AdminCountriesControllerCore extends AdminController
 						'id' => 'id_zone',
 						'name' => 'name'
 					),
-					'p' => $this->l('Geographical zone where country is located')
+					'desc' => $this->l('Geographical zone where country is located')
 				),
 				array(
 					'type' => 'radio',
@@ -233,7 +233,7 @@ class AdminCountriesControllerCore extends AdminController
 					'name' => 'zip_code_format',
 					'class' => 'uppercase',
 					'required' => true,
-					'p' => $this->l('National zip code (L for a letter, N for a number and C for the Iso code), e.g., NNNNN for France.
+					'desc' => $this->l('National zip code (L for a letter, N for a number and C for the Iso code), e.g., NNNNN for France.
 									No verification if undefined')
 				),
 				array(
@@ -264,7 +264,7 @@ class AdminCountriesControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Display or not this store')
+					'desc' => $this->l('Display or not this store')
 				),
 				array(
 					'type' => 'radio',
diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php
index f86c09cb1..806d0f089 100644
--- a/controllers/admin/AdminCurrenciesController.php
+++ b/controllers/admin/AdminCurrenciesController.php
@@ -109,7 +109,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'maxlength' => 32,
 					'required' => true,
 					'hint' => $this->l('Only letters and the minus character are allowed'),
-					'p' => $this->l('Will appear on Front Office, e.g., euro, dollar').'...',
+					'desc' => $this->l('Will appear on Front Office, e.g., euro, dollar').'...',
 				),
 				array(
 					'type' => 'text',
@@ -118,7 +118,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'size' => 30,
 					'maxlength' => 32,
 					'required' => true,
-					'p' => $this->l('ISO code, e.g., USD for dollar, EUR for euro').'...',
+					'desc' => $this->l('ISO code, e.g., USD for dollar, EUR for euro').'...',
 				),
 				array(
 					'type' => 'text',
@@ -127,7 +127,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'size' => 30,
 					'maxlength' => 32,
 					'required' => true,
-					'p' => $this->l('Numeric ISO code, e.g., 840 for dollar, 978 for euro').'...',
+					'desc' => $this->l('Numeric ISO code, e.g., 840 for dollar, 978 for euro').'...',
 				),
 				array(
 					'type' => 'text',
@@ -136,7 +136,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'size' => 3,
 					'maxlength' => 8,
 					'required' => true,
-					'p' => $this->l('Will appear on Front Office, e.g., &euro;, $').'...',
+					'desc' => $this->l('Will appear on Front Office, e.g., &euro;, $').'...',
 				),
 				array(
 					'type' => 'text',
@@ -145,7 +145,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'size' => 3,
 					'maxlength' => 11,
 					'required' => true,
-					'p' => $this->l('Conversion rate from one unit of your shop\'s default currency (for example, 1€) to this currency. 
+					'desc' => $this->l('Conversion rate from one unit of your shop\'s default currency (for example, 1€) to this currency. 
 						For example, if the default currency is euros and this currency is dollars, type \'1.20\'').' 1&euro; = $1.20',
 				),
 				array(
@@ -155,7 +155,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'size' => 3,
 					'maxlength' => 11,
 					'required' => true,
-					'p' =>$this->l('Applies to all prices, e.g.,').' $1,240.15',
+					'desc' =>$this->l('Applies to all prices, e.g.,').' $1,240.15',
 					'options' => array(
 						'query' => array(
 							array('key' => 1, 'name' => 'X0,000.00 ('.$this->l('as with dollars').')'),
@@ -174,7 +174,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('Display decimals on prices'),
+					'desc' => $this->l('Display decimals on prices'),
 					'values' => array(
 						array(
 							'id' => 'decimals_on',
@@ -195,7 +195,7 @@ class AdminCurrenciesControllerCore extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('Include a blank between sign and price, e.g.,').'<br />$1,240.15 -> $ 1,240.15',
+					'desc' => $this->l('Include a blank between sign and price, e.g.,').'<br />$1,240.15 -> $ 1,240.15',
 					'values' => array(
 						array(
 							'id' => 'blank_on',
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 8ea6ab5e2..21d7eea15 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -220,7 +220,7 @@ class AdminCustomersControllerCore extends AdminController
 					'label' => $this->l('Password:'),
 					'name' => 'passwd',
 					'size' => 33,
-					'p' => ($obj->id ? $this->l('Leave blank if no change') : $this->l('5 characters min., only letters, numbers, or').' -_')
+					'desc' => ($obj->id ? $this->l('Leave blank if no change') : $this->l('5 characters min., only letters, numbers, or').' -_')
 				),
 				array(
 					'type' => 'text',
@@ -258,7 +258,7 @@ class AdminCustomersControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Allow or disallow this customer to log in')
+					'desc' => $this->l('Allow or disallow this customer to log in')
 				),
 				array(
 					'type' => 'radio',
@@ -279,7 +279,7 @@ class AdminCustomersControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Customer will receive your newsletter via e-mail')
+					'desc' => $this->l('Customer will receive your newsletter via e-mail')
 				),
 				array(
 					'type' => 'radio',
@@ -300,7 +300,7 @@ class AdminCustomersControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Customer will receive your ads via e-mail')
+					'desc' => $this->l('Customer will receive your ads via e-mail')
 				),
 				array(
 					'type' => 'select',
@@ -319,7 +319,7 @@ class AdminCustomersControllerCore extends AdminController
 					'name' => 'groupBox',
 					'values' => $groups,
 					'required' => true,
-					'p' => $this->l('Check all the box(es) of groups of which the customer is to be a member')
+					'desc' => $this->l('Check all the box(es) of groups of which the customer is to be a member')
 				)
 			)
 		);
diff --git a/controllers/admin/AdminDeliverySlipController.php b/controllers/admin/AdminDeliverySlipController.php
index 089255fd2..3fa6cc65a 100644
--- a/controllers/admin/AdminDeliverySlipController.php
+++ b/controllers/admin/AdminDeliverySlipController.php
@@ -72,7 +72,7 @@ class AdminDeliverySlipControllerCore extends AdminController
 					'size' => 20,
 					'maxlength' => 10,
 					'required' => true,
-					'p' => $this->l('Format: 2007-12-31 (inclusive)')
+					'desc' => $this->l('Format: 2007-12-31 (inclusive)')
 				),
 				array(
 					'type' => 'text',
@@ -81,7 +81,7 @@ class AdminDeliverySlipControllerCore extends AdminController
 					'size' => 20,
 					'maxlength' => 10,
 					'required' => true,
-					'p' => $this->l('Format: 2008-12-31 (inclusive)')
+					'desc' => $this->l('Format: 2008-12-31 (inclusive)')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index c77541c80..367797eb5 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -141,7 +141,7 @@ class AdminEmployeesControllerCore extends AdminController
 					'name' => 'passwd',
 					'required' => true,
 					'size' => 33,
-					'p' => ($obj->id ?
+					'desc' => ($obj->id ?
 								$this->l('Leave blank if you do not want to change your password') :
 									$this->l('Min. 8 characters; use only letters, numbers or').' -_')
 				),
@@ -158,7 +158,7 @@ class AdminEmployeesControllerCore extends AdminController
 					'name' => 'bo_color',
 					'class' => 'color mColorPickerInput',
 					'size' => 20,
-					'p' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
+					'desc' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
 				),
 				array(
 					'type' => 'select',
@@ -176,7 +176,7 @@ class AdminEmployeesControllerCore extends AdminController
 					'label' => $this->l('Theme:'),
 					'name' => 'bo_theme',
 					'options' => array('query' => $this->themes),
-					'p' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)')
+					'desc' => $this->l('Out-of-range behavior when none is defined (e.g., when a customer\'s cart weight is greater than the highest range limit)')
 				)
 			)
 		);
@@ -202,7 +202,7 @@ class AdminEmployeesControllerCore extends AdminController
 						'label' => $this->l('Disabled')
 					)
 				),
-				'p' => $this->l('Show the welcome video on the dashbord of the back office')
+				'desc' => $this->l('Show the welcome video on the dashbord of the back office')
 			);
 
 			$this->fields_form['input'][] = array(
@@ -224,7 +224,7 @@ class AdminEmployeesControllerCore extends AdminController
 						'label' => $this->l('Disabled')
 					)
 				),
-				'p' => $this->l('Allow or disallow this employee to log into this Back Office')
+				'desc' => $this->l('Allow or disallow this employee to log into this Back Office')
 			);
 
 			$this->fields_form['input'][] = array(
diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php
index 5bf02bcd1..09aa6135e 100644
--- a/controllers/admin/AdminGendersController.php
+++ b/controllers/admin/AdminGendersController.php
@@ -141,14 +141,14 @@ class AdminGendersController extends AdminController
 					'label' => $this->l('Image Width:'),
 					'name' => 'img_width',
 					'size' => 4,
-					'p' => $this->l('Image width in pixel. "0" to use original size')
+					'desc' => $this->l('Image width in pixel. "0" to use original size')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Image Height:'),
 					'name' => 'img_height',
 					'size' => 4,
-					'p' => $this->l('Image height in pixel. "0" to use original size')
+					'desc' => $this->l('Image height in pixel. "0" to use original size')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminGroupShopController.php b/controllers/admin/AdminGroupShopController.php
index 899da1a2b..87c63227c 100644
--- a/controllers/admin/AdminGroupShopController.php
+++ b/controllers/admin/AdminGroupShopController.php
@@ -81,7 +81,7 @@ class AdminGroupShopControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Share customers between shops of this group')
+					'desc' => $this->l('Share customers between shops of this group')
 				),
 				array(
 					'type' => 'radio',
@@ -102,7 +102,7 @@ class AdminGroupShopControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Share orders and carts between shops of this group (you can share orders only if you share customers and stock)')
+					'desc' => $this->l('Share orders and carts between shops of this group (you can share orders only if you share customers and stock)')
 				),
 				array(
 					'type' => 'radio',
@@ -123,7 +123,7 @@ class AdminGroupShopControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Enable or disable shop')
+					'desc' => $this->l('Enable or disable shop')
 				)
 			),
 			'submit' => array(
@@ -179,7 +179,7 @@ class AdminGroupShopControllerCore extends AdminController
 				'type' => 'checkbox',
 				'values' => $import_data
 			),
-			'p' => $this->l('Use this option to associate data (products, modules, etc.) the same way as the selected shop')
+			'desc' => $this->l('Use this option to associate data (products, modules, etc.) the same way as the selected shop')
 		);
 
 		$this->tpl_form_vars = array(
diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
index af8d8842d..93758fad1 100644
--- a/controllers/admin/AdminGroupsController.php
+++ b/controllers/admin/AdminGroupsController.php
@@ -143,13 +143,13 @@ class AdminGroupsController extends AdminController
 					'label' => $this->l('Discount:'),
 					'name' => 'reduction',
 					'size' => 33,
-					'p' => $this->l('Will automatically apply this value as a discount on ALL shop\'s products for this group\'s members.')
+					'desc' => $this->l('Will automatically apply this value as a discount on ALL shop\'s products for this group\'s members.')
 				),
 				array(
 					'type' => 'select',
 					'label' => $this->l('Price display method:'),
 					'name' => 'price_display_method',
-					'p' => $this->l('How the prices are displayed on order summary for this customer group (tax included or excluded).'),
+					'desc' => $this->l('How the prices are displayed on order summary for this customer group (tax included or excluded).'),
 					'options' => array(
 						'query' => array(array('id_method' => PS_TAX_EXC, 'name' => $this->l('Tax excluded'), array('id_method' => PS_TAX_INC, 'name' => $this->l('Tax included')))),
 						'id' => 'id_method',
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index d56399af1..86ab8529d 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -75,7 +75,7 @@ class AdminImagesController extends AdminController
 					'label' => $this->l('Type name:'),
 					'name' => 'name',
 					'required' => true,
-					'p' => $this->l('Letters only (e.g., small, medium, large, extra-large)')
+					'desc' => $this->l('Letters only (e.g., small, medium, large, extra-large)')
 				),
 				array(
 					'type' => 'text',
@@ -84,7 +84,7 @@ class AdminImagesController extends AdminController
 					'required' => true,
 					'size' => 4,
 					'maxlength' => 5,
-					'p' => $this->l('Maximum image width in pixels')
+					'desc' => $this->l('Maximum image width in pixels')
 				),
 				array(
 					'type' => 'text',
@@ -93,7 +93,7 @@ class AdminImagesController extends AdminController
 					'required' => true,
 					'size' => 4,
 					'maxlength' => 5,
-					'p' => $this->l('Maximum image height in pixels')
+					'desc' => $this->l('Maximum image height in pixels')
 				),
 				array(
 					'type' => 'radio',
@@ -102,7 +102,7 @@ class AdminImagesController extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('This type will be applied to product images'),
+					'desc' => $this->l('This type will be applied to product images'),
 					'values' => array(
 						array(
 							'id' => 'products_on',
@@ -123,7 +123,7 @@ class AdminImagesController extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('This type will be applied to categories images'),
+					'desc' => $this->l('This type will be applied to categories images'),
 					'values' => array(
 						array(
 							'id' => 'categories_on',
@@ -144,7 +144,7 @@ class AdminImagesController extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('This type will be applied to manufacturers images'),
+					'desc' => $this->l('This type will be applied to manufacturers images'),
 					'values' => array(
 						array(
 							'id' => 'manufacturers_on',
@@ -165,7 +165,7 @@ class AdminImagesController extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('This type will be applied to suppliers images'),
+					'desc' => $this->l('This type will be applied to suppliers images'),
 					'values' => array(
 						array(
 							'id' => 'suppliers_on',
@@ -186,7 +186,7 @@ class AdminImagesController extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('This type will be applied to scenes images'),
+					'desc' => $this->l('This type will be applied to scenes images'),
 					'values' => array(
 						array(
 							'id' => 'scenes_on',
@@ -207,7 +207,7 @@ class AdminImagesController extends AdminController
 					'required' => false,
 					'class' => 't',
 					'is_bool' => true,
-					'p' => $this->l('This type will be applied to stores images'),
+					'desc' => $this->l('This type will be applied to stores images'),
 					'values' => array(
 						array(
 							'id' => 'stores_on',
diff --git a/controllers/admin/AdminInvoicesController.php b/controllers/admin/AdminInvoicesController.php
index 87445519a..ade26d2db 100644
--- a/controllers/admin/AdminInvoicesController.php
+++ b/controllers/admin/AdminInvoicesController.php
@@ -86,7 +86,7 @@ class AdminInvoicesControllerCore extends AdminController
 					'size' => 20,
 					'maxlength' => 10,
 					'required' => true,
-					'p' => $this->l('Format: 2007-12-31 (inclusive)')
+					'desc' => $this->l('Format: 2007-12-31 (inclusive)')
 				),
 				array(
 					'type' => 'text',
@@ -95,7 +95,7 @@ class AdminInvoicesControllerCore extends AdminController
 					'size' => 20,
 					'maxlength' => 10,
 					'required' => true,
-					'p' => $this->l('Format: 2008-12-31 (inclusive)')
+					'desc' => $this->l('Format: 2008-12-31 (inclusive)')
 				)
 			),
 			'submit' => array(
@@ -133,7 +133,7 @@ class AdminInvoicesControllerCore extends AdminController
 						'id' => 'id_order_state',
 						'name' => 'name'
 					),
-					'p' => $this->l('You can also export orders which have not been charged yet').' (<img src="../img/admin/charged_ko.gif" alt="" />).'
+					'desc' => $this->l('You can also export orders which have not been charged yet').' (<img src="../img/admin/charged_ko.gif" alt="" />).'
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index 12154294b..714fbfbc3 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -149,7 +149,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'required' => true,
 					'size' => 4,
 					'maxlength' => 2,
-					'p' => $this->l('2-letter ISO code (e.g., fr, en, de)')
+					'desc' => $this->l('2-letter ISO code (e.g., fr, en, de)')
 				),
 				array(
 					'type' => 'text',
@@ -158,7 +158,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'required' => true,
 					'size' => 10,
 					'maxlength' => 5,
-					'p' => $this->l('Full language code (e.g., en-us, pt-br)')
+					'desc' => $this->l('Full language code (e.g., en-us, pt-br)')
 				),
 				array(
 					'type' => 'text',
@@ -166,7 +166,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'name' => 'date_format_lite',
 					'required' => true,
 					'size' => 15,
-					'p' => $this->l('Date format, lite (e.g., Y-m-d, d/m/Y)')
+					'desc' => $this->l('Date format, lite (e.g., Y-m-d, d/m/Y)')
 				),
 				array(
 					'type' => 'text',
@@ -174,21 +174,21 @@ class AdminLanguagesControllerCore extends AdminController
 					'name' => 'date_format_full',
 					'required' => true,
 					'size' => 25,
-					'p' => $this->l('Date format, full (e.g., Y-m-d H:i:s, d/m/Y H:i)')
+					'desc' => $this->l('Date format, full (e.g., Y-m-d H:i:s, d/m/Y H:i)')
 				),
 				array(
 					'type' => 'file',
 					'label' => $this->l('Flag:'),
 					'name' => 'flag',
 					'required' => true,
-					'p' => $this->l('Upload country flag from your computer')
+					'desc' => $this->l('Upload country flag from your computer')
 				),
 				array(
 					'type' => 'file',
 					'label' => $this->l('"No-picture" image:'),
 					'name' => 'no-picture',
 					'required' => true,
-					'p' => $this->l('Image displayed when "no picture found"')
+					'desc' => $this->l('Image displayed when "no picture found"')
 				),
 				array(
 					'type' => 'radio',
@@ -209,7 +209,7 @@ class AdminLanguagesControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('To active if this language is a right to left language').' '.
+					'desc' => $this->l('To active if this language is a right to left language').' '.
 							$this->l('(Experimental: your theme must be compliant with RTL language)')
 				),
 				array(
@@ -231,7 +231,7 @@ class AdminLanguagesControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Allow or disallow this language to be selected by the customer')
+					'desc' => $this->l('Allow or disallow this language to be selected by the customer')
 				),
 				array(
 					'type' => 'special',
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index cd49b7eff..a9070d1d2 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -267,7 +267,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'label' => $this->l('Logo:'),
 					'name' => 'logo',
 					'display_image' => true,
-					'p' => $this->l('Upload manufacturer logo from your computer')
+					'desc' => $this->l('Upload manufacturer logo from your computer')
 				),
 				array(
 					'type' => 'text',
diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php
index 349de8598..2977a8c3d 100644
--- a/controllers/admin/AdminMetaController.php
+++ b/controllers/admin/AdminMetaController.php
@@ -119,7 +119,7 @@ class AdminMetaControllerCore extends AdminController
 						'id' => 'page',
 						'name' => 'page',
 					),
-					'p' => $this->l('Name of the related page'),
+					'desc' => $this->l('Name of the related page'),
 					'required' => true,
 					'empty_message' => '<p>'.$this->l('There is no page available!').'</p>',
 					'size' => 30
@@ -130,7 +130,7 @@ class AdminMetaControllerCore extends AdminController
 					'name' => 'title',
 					'lang' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Title of this page'),
+					'desc' => $this->l('Title of this page'),
 					'size' => 30
 				),
 				array(
@@ -139,7 +139,7 @@ class AdminMetaControllerCore extends AdminController
 					'name' => 'description',
 					'lang' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('A short description'),
+					'desc' => $this->l('A short description'),
 					'size' => 50
 				),
 				array(
@@ -148,7 +148,7 @@ class AdminMetaControllerCore extends AdminController
 					'name' => 'keywords',
 					'lang' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('List of keywords'),
+					'desc' => $this->l('List of keywords'),
 					'size' => 50
 				),
 				array(
@@ -157,7 +157,7 @@ class AdminMetaControllerCore extends AdminController
 					'name' => 'url_rewrite',
 					'lang' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Example : "contacts" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'),
+					'desc' => $this->l('Example : "contacts" for http://mysite.com/shop/contacts to redirect to http://mysite.com/shop/contact-form.php'),
 					'size' => 50
 				),
 			),
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index b89b881a4..5d3e91914 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -101,19 +101,19 @@ class AdminPerformanceController extends AdminController
 							'id' => 'smarty_force_compile_'._PS_SMARTY_NO_COMPILE_,
 							'value' => _PS_SMARTY_NO_COMPILE_,
 							'label' => $this->l('Never compile cache'),
-							'p' => $this->l('Templates are never recompiled, performance are better and this option should be used in production environement')
+							'desc' => $this->l('Templates are never recompiled, performance are better and this option should be used in production environement')
 						),
 						array(
 							'id' => 'smarty_force_compile_'._PS_SMARTY_CHECK_COMPILE_,
 							'value' => _PS_SMARTY_CHECK_COMPILE_,
 							'label' => $this->l('Compile cache if templates are updated'),
-							'p' => $this->l('Templates are recompiled when they are updated, if you experience compilation troubles when you update your templates files, you should use force compile instead of this option.  It should never be used in a production environment.')
+							'desc' => $this->l('Templates are recompiled when they are updated, if you experience compilation troubles when you update your templates files, you should use force compile instead of this option.  It should never be used in a production environment.')
 						),
 						array(
 							'id' => 'smarty_force_compile_'._PS_SMARTY_FORCE_COMPILE_,
 							'value' => _PS_SMARTY_FORCE_COMPILE_,
 							'label' => $this->l('Force compile'),
-							'p' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. It should never be used in a production environment.')
+							'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. It should never be used in a production environment.')
 						)
 					)
 				),
@@ -135,7 +135,7 @@ class AdminPerformanceController extends AdminController
 							'label' => $this->l('No')
 						)
 					),
-					'p' => $this->l('Should be enabled except for debugging.')
+					'desc' => $this->l('Should be enabled except for debugging.')
 				)
 			),
 			'submit' => array(
@@ -179,7 +179,7 @@ class AdminPerformanceController extends AdminController
 				'title' => $this->l('Features detachables'),
 				'image' => '../img/admin/tab-plugins.gif'
 			),
-			'p' => $this->l('Some features can be disabled in order to improve performance.'),
+			'desc' => $this->l('Some features can be disabled in order to improve performance.'),
 			'input' => array(
 				array(
 					'type' => 'radio',
@@ -200,7 +200,7 @@ class AdminPerformanceController extends AdminController
 							'label' => $this->l('No')
 						)
 					),
-					'p' => $this->l('These features are going to be disabled:')
+					'desc' => $this->l('These features are going to be disabled:')
 				),
 				array(
 					'type' => 'radio',
@@ -220,7 +220,7 @@ class AdminPerformanceController extends AdminController
 							'label' => $this->l('No')
 						)
 					),
-					'p' => $this->l('These features are going to be disabled:')
+					'desc' => $this->l('These features are going to be disabled:')
 				)
 			),
 			'submit' => array(
@@ -268,7 +268,7 @@ class AdminPerformanceController extends AdminController
 				'title' => $this->l('CCC (Combine, Compress and Cache)'),
 				'image' => '../img/admin/arrow_in.png'
 			),
-			'p' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. 
+			'desc' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. 
 				Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
 			'input' => array(
 				array(
@@ -413,28 +413,28 @@ class AdminPerformanceController extends AdminController
 				'title' => $this->l('Media servers (used only with CCC)'),
 				'image' => '../img/admin/subdomain.gif'
 			),
-			'p' => $this->l('You must enter another domain or subdomain in order to use cookieless static content.'),
+			'desc' => $this->l('You must enter another domain or subdomain in order to use cookieless static content.'),
 			'input' => array(
 				array(
 					'type' => 'text',
 					'label' => $this->l('Media server #1:'),
 					'name' => '_MEDIA_SERVER_1_',
 					'size' => 30,
-					'p' => $this->l('Name of the second domain of your shop, (e.g., myshop-media-server-1.com). If you do not have another domain, leave this field blank')
+					'desc' => $this->l('Name of the second domain of your shop, (e.g., myshop-media-server-1.com). If you do not have another domain, leave this field blank')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Media server #2:'),
 					'name' => '_MEDIA_SERVER_2_',
 					'size' => 30,
-					'p' => $this->l('Name of the third domain of your shop, (e.g., myshop-media-server-2.com). If you do not have another domain, leave this field blank')
+					'desc' => $this->l('Name of the third domain of your shop, (e.g., myshop-media-server-2.com). If you do not have another domain, leave this field blank')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Media server #3:'),
 					'name' => '_MEDIA_SERVER_3_',
 					'size' => 30,
-					'p' => $this->l('Name of the fourth domain of your shop, (e.g., myshop-media-server-3.com). If you do not have another domain, leave this field blank')
+					'desc' => $this->l('Name of the fourth domain of your shop, (e.g., myshop-media-server-3.com). If you do not have another domain, leave this field blank')
 				),
 			),
 			'submit' => array(
@@ -481,7 +481,7 @@ class AdminPerformanceController extends AdminController
 				'title' => $this->l('Ciphering'),
 				'image' => '../img/admin/computer_key.png'
 			),
-			'p' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
+			'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
 			'input' => array(
 				array(
 					'type' => 'radio',
@@ -581,7 +581,7 @@ class AdminPerformanceController extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Enable or disable caching system')
+					'desc' => $this->l('Enable or disable caching system')
 				),
 				array(
 					'type' => 'select',
diff --git a/controllers/admin/AdminRangePriceController.php b/controllers/admin/AdminRangePriceController.php
index 147663250..e0bf2d15e 100644
--- a/controllers/admin/AdminRangePriceController.php
+++ b/controllers/admin/AdminRangePriceController.php
@@ -70,7 +70,7 @@ class AdminRangePriceControllerCore extends AdminController
 					'label' => $this->l('Carrier:'),
 					'name' => 'id_carrier',
 					'required' => false,
-					'p' => $this->l('Carrier to which this range will be applied'),
+					'desc' => $this->l('Carrier to which this range will be applied'),
 					'options' => array(
 						'query' => $carriers,
 						'id' => 'id_carrier',
@@ -85,7 +85,7 @@ class AdminRangePriceControllerCore extends AdminController
 					'size' => 5,
 					'required' => true,
 					'suffix' => $currency->getSign('right'),
-					'p' => $this->l('Range start (included)'),
+					'desc' => $this->l('Range start (included)'),
 				),
 				array(
 					'type' => 'text',
@@ -94,7 +94,7 @@ class AdminRangePriceControllerCore extends AdminController
 					'size' => 5,
 					'required' => true,
 					'suffix' => $currency->getSign('right'),
-					'p' => $this->l('Range end (excluded)'),
+					'desc' => $this->l('Range end (excluded)'),
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminRangeWeightController.php b/controllers/admin/AdminRangeWeightController.php
index 9879db8fe..903235ecd 100644
--- a/controllers/admin/AdminRangeWeightController.php
+++ b/controllers/admin/AdminRangeWeightController.php
@@ -68,7 +68,7 @@ class AdminRangeWeightControllerCore extends AdminController
 					'label' => $this->l('Carrier:'),
 					'name' => 'id_carrier',
 					'required' => false,
-					'p' => $this->l('Carrier to which this range will be applied'),
+					'desc' => $this->l('Carrier to which this range will be applied'),
 					'options' => array(
 						'query' => $carriers,
 						'id' => 'id_carrier',
@@ -83,7 +83,7 @@ class AdminRangeWeightControllerCore extends AdminController
 					'size' => 5,
 					'required' => true,
 					'suffix' => Configuration::get('PS_WEIGHT_UNIT'),
-					'p' => $this->l('Range start (included)'),
+					'desc' => $this->l('Range start (included)'),
 				),
 				array(
 					'type' => 'text',
@@ -92,7 +92,7 @@ class AdminRangeWeightControllerCore extends AdminController
 					'size' => 5,
 					'required' => true,
 					'suffix' => Configuration::get('PS_WEIGHT_UNIT'),
-					'p' => $this->l('Range end (excluded)'),
+					'desc' => $this->l('Range end (excluded)'),
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php
index 350beaec5..817a84d50 100644
--- a/controllers/admin/AdminReferrersController.php
+++ b/controllers/admin/AdminReferrersController.php
@@ -211,10 +211,10 @@ class AdminReferrersControllerCore extends AdminController
 					'label' => $this->l('Password:'),
 					'name' => 'passwd',
 					'size' => 20,
-					'p' => $this->l('Leave blank if no change')
+					'desc' => $this->l('Leave blank if no change')
 				)
 			),
-			'p' => array(
+			'desc' => array(
 				$this->l('Affiliates can access their own data with this name and password.'),
 				$this->l('Front access:').' <a href="'.$uri.'modules/trackingfront/stats.php" style="font-style: italic;">'.$uri.'modules/trackingfront/stats.php</a>'
 			)
@@ -231,21 +231,21 @@ class AdminReferrersControllerCore extends AdminController
 					'label' => $this->l('Click fee:'),
 					'name' => 'click_fee',
 					'size' => 8,
-					'p' => $this->l('Fee given for each visit.')
+					'desc' => $this->l('Fee given for each visit.')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Base fee:'),
 					'name' => 'base_fee',
 					'size' => 8,
-					'p' => $this->l('Fee given for each order placed.')
+					'desc' => $this->l('Fee given for each order placed.')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Percent fee:'),
 					'name' => 'percent_fee',
 					'size' => 8,
-					'p' => $this->l('Percent of the sales.')
+					'desc' => $this->l('Percent of the sales.')
 				)
 			)
 		));
@@ -298,7 +298,7 @@ class AdminReferrersControllerCore extends AdminController
 					'rows' => 1
 				)
 			),
-			'p' => $this->l('If you know how to use MySQL regular expressions, you can use the').' 
+			'desc' => $this->l('If you know how to use MySQL regular expressions, you can use the').' 
 					<a style="cursor: pointer; font-weight: bold;" onclick="$(\'#tracking_expert\').slideToggle();">'.$this->l('expert mode').'.</a>',
 			'submit' => array(
 				'title' => $this->l('   Save   '),
diff --git a/controllers/admin/AdminReturnController.php b/controllers/admin/AdminReturnController.php
index cf66b5da9..8563f8e8e 100644
--- a/controllers/admin/AdminReturnController.php
+++ b/controllers/admin/AdminReturnController.php
@@ -104,7 +104,7 @@ class AdminReturnControllerCore extends AdminController
 						'id' => 'id_order_return_state',
 						'name' => 'name'
 					),
-					'p' => $this->l('Merchandise return (RMA) status')
+					'desc' => $this->l('Merchandise return (RMA) status')
 				),
 				array(
 					'type' => 'list_products',
@@ -112,7 +112,7 @@ class AdminReturnControllerCore extends AdminController
 					'name' => '',
 					'size' => '',
 					'required' => false,
-					'p' => $this->l('List of products in return package')
+					'desc' => $this->l('List of products in return package')
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php
index f6c910e92..bda116cb2 100644
--- a/controllers/admin/AdminScenesController.php
+++ b/controllers/admin/AdminScenesController.php
@@ -185,7 +185,7 @@ class AdminScenesControllerCore extends AdminController
 				'type' => 'file',
 				'label' => $this->l('Alternative thumbnail:'),
 				'name' => 'thumb',
-				'p' => $img_alt_desc
+				'desc' => $img_alt_desc
 			);
 
 			$selectedCat = array();
@@ -240,7 +240,7 @@ class AdminScenesControllerCore extends AdminController
 			'label' => $this->l('Image to be mapped:'),
 			'name' => 'image',
 			'display_image' => true,
-			'p' => $image_to_map_desc,
+			'desc' => $image_to_map_desc,
 		);
 
 		if(isset($input_img_alt))
diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php
index 55b49bddd..4761b739a 100755
--- a/controllers/admin/AdminShopController.php
+++ b/controllers/admin/AdminShopController.php
@@ -222,7 +222,7 @@ class AdminShopControllerCore extends AdminController
 					'label' => $this->l('Disabled')
 				)
 			),
-			'p' => $this->l('Enable or disable shop')
+			'desc' => $this->l('Enable or disable shop')
 		);
 
 		$themes = Theme::getThemes();
@@ -299,7 +299,7 @@ class AdminShopControllerCore extends AdminController
 				'type' => 'checkbox',
 				'values' => $import_data
 			),
-			'p' => $this->l('Use this option to associate data (products, modules, etc.) the same way as the selected shop')
+			'desc' => $this->l('Use this option to associate data (products, modules, etc.) the same way as the selected shop')
 		);
 
 		$this->fields_value = array(
diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php
index 2c3a41d33..6b6313b20 100644
--- a/controllers/admin/AdminShopUrlController.php
+++ b/controllers/admin/AdminShopUrlController.php
@@ -87,13 +87,13 @@ class AdminShopUrlControllerCore extends AdminController
 					'type' => 'text',
 					'label' => $this->l('Physical URI:'),
 					'name' => '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.')
+					'desc' => $this->l('Physical folder of your store on your server. Leave this field empty if your store is installed on root path.')
 				),
 				array(
 					'type' => 'text',
 					'label' => $this->l('Virtual URI:'),
 					'name' => 'virtual_uri',
-					'p' => array(
+					'desc' => array(
 						$this->l('This virtual folder must not exist on your server and is used to associate an URI to a shop.'),
 						'<strong>'.$this->l('URL rewriting must be activated on your server to use this feature.').'</strong>'
 					)
@@ -139,7 +139,7 @@ class AdminShopUrlControllerCore extends AdminController
 							'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" />'
 						)
 					),
-					'p' => array(
+					'desc' => array(
 						$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).'),
 						array(
@@ -170,7 +170,7 @@ class AdminShopUrlControllerCore extends AdminController
 							'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" />'
 						)
 					),
-					'p' => $this->l('Enabled or disabled')
+					'desc' => $this->l('Enabled or disabled')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php
index 69dcedbd6..5a552aa60 100644
--- a/controllers/admin/AdminSlipController.php
+++ b/controllers/admin/AdminSlipController.php
@@ -80,7 +80,7 @@ class AdminSlipControllerCore extends AdminController
 					'size' => 20,
 					'maxlength' => 10,
 					'required' => true,
-					'p' => $this->l('Format: 2007-12-31 (inclusive)')
+					'desc' => $this->l('Format: 2007-12-31 (inclusive)')
 				),
 				array(
 					'type' => 'text',
@@ -89,7 +89,7 @@ class AdminSlipControllerCore extends AdminController
 					'size' => 20,
 					'maxlength' => 10,
 					'required' => true,
-					'p' => $this->l('Format: 2008-12-31 (inclusive)')
+					'desc' => $this->l('Format: 2008-12-31 (inclusive)')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php
index 39c3513c4..6e2a2ca60 100644
--- a/controllers/admin/AdminStatesController.php
+++ b/controllers/admin/AdminStatesController.php
@@ -77,7 +77,7 @@ class AdminStatesControllerCore extends AdminController
 					'size' => 30,
 					'maxlength' => 32,
 					'required' => true,
-					'p' => $this->l('State name to display in addresses and on invoices')
+					'desc' => $this->l('State name to display in addresses and on invoices')
 				),
 				array(
 					'type' => 'text',
@@ -87,7 +87,7 @@ class AdminStatesControllerCore extends AdminController
 					'maxlength' => 4,
 					'required' => true,
 					'class' => 'uppercase',
-					'p' => $this->l('1 to 4 letter ISO code (search on Wikipedia if you don\'t know)')
+					'desc' => $this->l('1 to 4 letter ISO code (search on Wikipedia if you don\'t know)')
 				),
 				array(
 					'type' => 'select',
@@ -99,7 +99,7 @@ class AdminStatesControllerCore extends AdminController
 						'id' => 'id_country',
 						'name' => 'name'
 					),
-					'p' => $this->l('Country where state, region or city is located')
+					'desc' => $this->l('Country where state, region or city is located')
 				),
 				array(
 					'type' => 'select',
@@ -111,7 +111,7 @@ class AdminStatesControllerCore extends AdminController
 						'id' => 'id_zone',
 						'name' => 'name'
 					),
-					'p' => array(
+					'desc' => array(
 						$this->l('Geographical zone where this state is located'),
 						$this->l('Used for shipping')
 					)
@@ -134,7 +134,7 @@ class AdminStatesControllerCore extends AdminController
 							'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" />'
 						)
 					),
-					'p' => $this->l('Enabled or disabled')
+					'desc' => $this->l('Enabled or disabled')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php
index cedaa3f9c..4fcc137b7 100644
--- a/controllers/admin/AdminStatusesController.php
+++ b/controllers/admin/AdminStatusesController.php
@@ -193,20 +193,20 @@ class AdminStatusesControllerCore extends AdminController
 					'size' => 40,
 					'required' => true,
 					'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
-					'p' => $this->l('Order status (e.g., \'Pending\')')
+					'desc' => $this->l('Order status (e.g., \'Pending\')')
 				),
 				array(
 					'type' => 'file',
 					'label' => $this->l('Icon:'),
 					'name' => 'icon',
-					'p' => $this->l('Upload an icon from your computer (File type: .gif, suggested size: 16x16)')
+					'desc' => $this->l('Upload an icon from your computer (File type: .gif, suggested size: 16x16)')
 				),
 				array(
 					'type' => 'color',
 					'label' => $this->l('Color:'),
 					'name' => 'color',
 					'size' => 30,
-					'p' => $this->l('Status will be highlighted in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
+					'desc' => $this->l('Status will be highlighted in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
 				),
 				array(
 					'type' => 'checkbox',
@@ -294,7 +294,7 @@ class AdminStatusesControllerCore extends AdminController
 						'name' => 'name'
 					),
 					'hint' => $this->l('Only letters, number and -_ are allowed'),
-					'p' => $this->l('E-mail template for both .html and .txt')
+					'desc' => $this->l('E-mail template for both .html and .txt')
 				)
 			),
 			'submit' => array(
@@ -339,7 +339,7 @@ class AdminStatusesControllerCore extends AdminController
 					'size' => 40,
 					'required' => true,
 					'hint' => $this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:',
-					'p' => $this->l('Order return status name')
+					'desc' => $this->l('Order return status name')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php
index 089bef57a..241cd8a4e 100644
--- a/controllers/admin/AdminStockManagementController.php
+++ b/controllers/admin/AdminStockManagementController.php
@@ -188,7 +188,7 @@ class AdminStockManagementControllerCore extends AdminController
 							'size' => 10,
 							'maxlength' => 6,
 							'required' => true,
-							'p' => $this->l('Physical quantity to add')
+							'desc' => $this->l('Physical quantity to add')
 						),
 						array(
 							'type' => 'radio',
@@ -209,7 +209,7 @@ class AdminStockManagementControllerCore extends AdminController
 									'label' => $this->l('Disabled')
 								)
 							),
-							'p' => $this->l('Is this quantity usable for sale on shops, or reserved in the warehouse for other purposes?')
+							'desc' => $this->l('Is this quantity usable for sale on shops, or reserved in the warehouse for other purposes?')
 						),
 						array(
 							'type' => 'select',
@@ -221,7 +221,7 @@ class AdminStockManagementControllerCore extends AdminController
 								'id' => 'id_warehouse',
 								'name' => 'name'
 							),
-							'p' => $this->l('Select the warehouse where you want to add the product into')
+							'desc' => $this->l('Select the warehouse where you want to add the product into')
 						),
 						array(
 							'type' => 'text',
@@ -230,7 +230,7 @@ class AdminStockManagementControllerCore extends AdminController
 							'required' => true,
 							'size' => 10,
 							'maxlength' => 10,
-							'p' => $this->l('Unit purchase price or unit manufacturing cost for this product, tax excluded')
+							'desc' => $this->l('Unit purchase price or unit manufacturing cost for this product, tax excluded')
 						),
 						array(
 							'type' => 'select',
@@ -242,7 +242,7 @@ class AdminStockManagementControllerCore extends AdminController
 								'id' => 'id_currency',
 								'name' => 'name'
 							),
-							'p' => $this->l('The currency associated to the product unit price'),
+							'desc' => $this->l('The currency associated to the product unit price'),
 						),
 						array(
 							'type' => 'select',
@@ -256,7 +256,7 @@ class AdminStockManagementControllerCore extends AdminController
 								'id' => 'id_stock_mvt_reason',
 								'name' => 'name'
 							),
-							'p' => $this->l('Reason used in stock movements'),
+							'desc' => $this->l('Reason used in stock movements'),
 						),
 					),
 					'submit' => array(
@@ -324,7 +324,7 @@ class AdminStockManagementControllerCore extends AdminController
 							'size' => 10,
 							'maxlength' => 6,
 							'required' => true,
-							'p' => $this->l('Physical quantity to remove')
+							'desc' => $this->l('Physical quantity to remove')
 						),
 						array(
 							'type' => 'radio',
@@ -345,7 +345,7 @@ class AdminStockManagementControllerCore extends AdminController
 									'label' => $this->l('Disabled')
 								)
 							),
-							'p' => $this->l('Do you want to remove this quantity from the usable quantity(yes) or the physical quantity(no)?')
+							'desc' => $this->l('Do you want to remove this quantity from the usable quantity(yes) or the physical quantity(no)?')
 						),
 						array(
 							'type' => 'select',
@@ -357,7 +357,7 @@ class AdminStockManagementControllerCore extends AdminController
 								'id' => 'id_warehouse',
 								'name' => 'name'
 							),
-							'p' => $this->l('Select the warehouse from where you want to remove the product')
+							'desc' => $this->l('Select the warehouse from where you want to remove the product')
 						),
 						array(
 							'type' => 'select',
@@ -371,7 +371,7 @@ class AdminStockManagementControllerCore extends AdminController
 								'id' => 'id_stock_mvt_reason',
 								'name' => 'name'
 							),
-							'p' => $this->l('Reason used in stock movements'),
+							'desc' => $this->l('Reason used in stock movements'),
 						),
 					),
 					'submit' => array(
@@ -439,7 +439,7 @@ class AdminStockManagementControllerCore extends AdminController
 							'size' => 10,
 							'maxlength' => 6,
 							'required' => true,
-							'p' => $this->l('Physical quantity to transfer.')
+							'desc' => $this->l('Physical quantity to transfer.')
 						),
 						array(
 							'type' => 'select',
@@ -451,7 +451,7 @@ class AdminStockManagementControllerCore extends AdminController
 								'id' => 'id_warehouse',
 								'name' => 'name'
 							),
-							'p' => $this->l('Select the warehouse want to transfer the product from.')
+							'desc' => $this->l('Select the warehouse want to transfer the product from.')
 						),
 						array(
 							'type' => 'radio',
@@ -472,7 +472,7 @@ class AdminStockManagementControllerCore extends AdminController
 									'label' => $this->l('Disabled')
 								)
 							),
-							'p' => $this->l('Is this a usable quantity for sale?')
+							'desc' => $this->l('Is this a usable quantity for sale?')
 						),
 						array(
 							'type' => 'select',
@@ -484,7 +484,7 @@ class AdminStockManagementControllerCore extends AdminController
 								'id' => 'id_warehouse',
 								'name' => 'name'
 							),
-							'p' => $this->l('Select the warehouse to transfer the product to.')
+							'desc' => $this->l('Select the warehouse to transfer the product to.')
 						),
 						array(
 							'type' => 'radio',
@@ -505,7 +505,7 @@ class AdminStockManagementControllerCore extends AdminController
 									'label' => $this->l('Disabled')
 								)
 							),
-							'p' => $this->l('Do you want it to be usable for sale?')
+							'desc' => $this->l('Do you want it to be usable for sale?')
 						),
 					),
 					'submit' => array(
diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php
index cfa144fa2..5249e3fd1 100644
--- a/controllers/admin/AdminStockMvtController.php
+++ b/controllers/admin/AdminStockMvtController.php
@@ -159,7 +159,7 @@ class AdminStockMvtControllerCore extends AdminController
 						'id' => 'id',
 						'name' => 'name'
 					),
-					'p' => $this->l('Select the corresponding action : increments or decrements stock.')
+					'desc' => $this->l('Select the corresponding action : increments or decrements stock.')
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php
index dc5be3a5c..8476060cf 100644
--- a/controllers/admin/AdminStoresController.php
+++ b/controllers/admin/AdminStoresController.php
@@ -145,7 +145,7 @@ class AdminStoresControllerCore extends AdminController
 					'size' => 33,
 					'required' => false,
 					'hint' => $this->l('Allowed characters: letters, spaces and').' (-)',
-					'p' => $this->l('Store name, e.g. Citycentre Mall Store')
+					'desc' => $this->l('Store name, e.g. Citycentre Mall Store')
 				),
 				array(
 					'type' => 'text',
@@ -202,7 +202,7 @@ class AdminStoresControllerCore extends AdminController
 					'required' => true,
 					'size' => 11,
 					'maxlength' => 12,
-					'p' => $this->l('Store coords, eg. 45.265469 / -47.226478')
+					'desc' => $this->l('Store coords, eg. 45.265469 / -47.226478')
 				),
 				array(
 					'type' => 'text',
@@ -248,7 +248,7 @@ class AdminStoresControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Display or not this store')
+					'desc' => $this->l('Display or not this store')
 				)
 			),
 			'rightCols' => array (
@@ -256,7 +256,7 @@ class AdminStoresControllerCore extends AdminController
 					'type' => 'file',
 					'label' => $this->l('Picture:'),
 					'name' => 'image',
-					'p' => $this->l('Store window picture')
+					'desc' => $this->l('Store window picture')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index 82842ff49..88babcd42 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -77,14 +77,14 @@ class AdminSuppliersControllerCore extends AdminController
 					'size' => 33,
 					'lang' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Will appear in supplier list')
+					'desc' => $this->l('Will appear in supplier list')
 				),
 				array(
 					'type' => 'file',
 					'label' => $this->l('Logo:'),
 					'name' => 'logo',
 					'display_image' => true,
-					'p' => $this->l('Upload supplier logo from your computer')
+					'desc' => $this->l('Upload supplier logo from your computer')
 				),
 				array(
 					'type' => 'text',
diff --git a/controllers/admin/AdminSupplyOrdersController.php b/controllers/admin/AdminSupplyOrdersController.php
index e5abfb32d..8441ed383 100644
--- a/controllers/admin/AdminSupplyOrdersController.php
+++ b/controllers/admin/AdminSupplyOrdersController.php
@@ -170,7 +170,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 						'label' => $this->l('Back office color:'),
 						'name' => 'color',
 						'size' => 20,
-						'p' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
+						'desc' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
 					),
 					array(
 						'type' => 'radio',
@@ -191,7 +191,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 								'label' => $this->l('No')
 							)
 						),
-						'p' => $this->l('You have to define if it is possible to edit the order in this state.
+						'desc' => $this->l('You have to define if it is possible to edit the order in this state.
 										An editable order is an order not valid to send to the supplier.')
 					),
 					array(
@@ -213,7 +213,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 								'label' => $this->l('No')
 							)
 						),
-						'p' => $this->l('You have to define if it is possible to generate the delivery note of the order in this state.
+						'desc' => $this->l('You have to define if it is possible to generate the delivery note of the order in this state.
 										The order has to be valid to use this function.')
 					),
 					array(
@@ -235,7 +235,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 								'label' => $this->l('No')
 							)
 						),
-						'p' => $this->l('You have to define if this state correspond to a product receipt on this order (partial or complete).
+						'desc' => $this->l('You have to define if this state correspond to a product receipt on this order (partial or complete).
 										This permit to know if the concerned products have to be added in stock.')
 					),
 					array(
@@ -257,7 +257,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 								'label' => $this->l('No')
 							)
 						),
-						'p' => $this->l('You have to define if some products are pending receipt in this state.')
+						'desc' => $this->l('You have to define if some products are pending receipt in this state.')
 					),
 				),
 				'submit' => array(
@@ -296,7 +296,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 								'label' => $this->l('Back office color:'),
 								'name' => 'color',
 								'size' => 20,
-								'p' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
+								'desc' => $this->l('Back office background will be displayed in this color. HTML colors only (e.g.,').' "lightblue", "#CC6600")'
 							),
 						),
 						'submit' => array(
@@ -348,7 +348,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 						'name' => 'reference',
 						'size' => 50,
 						'required' => true,
-						'p' => $this->l('This is the reference of your order.'),
+						'desc' => $this->l('This is the reference of your order.'),
 					),
 					array(
 						'type' => 'select',
@@ -360,7 +360,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 							'id' => 'id_supplier',
 							'name' => 'name'
 						),
-						'p' => $this->l('Select the supplier you are buying product from'),
+						'desc' => $this->l('Select the supplier you are buying product from'),
 						'hint' => $this->l('Be careful ! When changing this field, all products already added to the order will be removed.')
 					),
 					array(
@@ -373,7 +373,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 							'id' => 'id_warehouse',
 							'name' => 'name'
 						),
-						'p' => $this->l('Select the warehouse where you want the order to be sent to.'),
+						'desc' => $this->l('Select the warehouse where you want the order to be sent to.'),
 					),
 					array(
 						'type' => 'select',
@@ -385,7 +385,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 							'id' => 'id_currency',
 							'name' => 'name'
 						),
-						'p' => $this->l('The currency of the order'),
+						'desc' => $this->l('The currency of the order'),
 						'hint' => $this->l('Be careful ! When changing this field, all products already added to the order will be removed.')
 					),
 					array(
@@ -398,7 +398,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 							'id' => 'id_lang',
 							'name' => 'name'
 						),
-						'p' => $this->l('The language of the order')
+						'desc' => $this->l('The language of the order')
 					),
 					array(
 						'type' => 'date',
@@ -406,7 +406,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 						'name' => 'date_delivery_expected',
 						'size' => 20,
 						'required' => true,
-						'p' => $this->l('This is the expected delivery date for this order'),
+						'desc' => $this->l('This is the expected delivery date for this order'),
 					),
 					array(
 						'type' => 'text',
@@ -414,7 +414,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 						'name' => 'discount_rate',
 						'size' => 7,
 						'required' => true,
-						'p' => $this->l('This is the global discount rate in percents for the order.'),
+						'desc' => $this->l('This is the global discount rate in percents for the order.'),
 					),
 				),
 				'submit' => array(
@@ -657,7 +657,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 						'id' => 'id_supply_order_state',
 						'name' => 'name'
 					),
-					'p' => $this->l('Choose the new state of your order')
+					'desc' => $this->l('Choose the new state of your order')
 				),
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminTabsController.php b/controllers/admin/AdminTabsController.php
index e2907981e..a6f0587cc 100644
--- a/controllers/admin/AdminTabsController.php
+++ b/controllers/admin/AdminTabsController.php
@@ -121,7 +121,7 @@ class AdminTabsControllerCore extends AdminController
 					'type' => 'file',
 					'label' => $this->l('Icon:'),
 					'name' => 'icon',
-					'p' => $this->l('Upload logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
+					'desc' => $this->l('Upload logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
 				),
 				array(
 					'type' => 'select',
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index c6b109e50..c553f5279 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -306,7 +306,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 							'label' => $this->l('No Tax')
 						)
 					),
-					'p' => $this->l('(Total tax:').'9%)'
+					'desc' => $this->l('(Total tax:').'9%)'
 				),
 				array(
 					'type' => 'text',
diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php
index a263f786d..0f4d87cf6 100644
--- a/controllers/admin/AdminTaxesController.php
+++ b/controllers/admin/AdminTaxesController.php
@@ -131,7 +131,7 @@ class AdminTaxesControllerCore extends AdminController
 					'required' => true,
 					'lang' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Tax name to display in cart and on invoice, e.g., VAT')
+					'desc' => $this->l('Tax name to display in cart and on invoice, e.g., VAT')
 				),
 				array(
 					'type' => 'text',
@@ -141,7 +141,7 @@ class AdminTaxesControllerCore extends AdminController
 					'maxlength' => 6,
 					'required' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Format: XX.XX or XX.XXX (e.g., 19.60 or 13.925)')
+					'desc' => $this->l('Format: XX.XX or XX.XXX (e.g., 19.60 or 13.925)')
 				),
 				array(
 					'type' => 'radio',
@@ -171,7 +171,7 @@ class AdminTaxesControllerCore extends AdminController
 					'maxlength' => 64,
 					'required' => false,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'p' => $this->l('Used for the accounting export')
+					'desc' => $this->l('Used for the accounting export')
 				)
 			),
 			'submit' => array(
diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php
index 2d52fda3b..03dab5e29 100644
--- a/controllers/admin/AdminWarehousesController.php
+++ b/controllers/admin/AdminWarehousesController.php
@@ -158,7 +158,7 @@ class AdminWarehousesControllerCore extends AdminController
 					'size' => 30,
 					'maxlength' => 32,
 					'required' => true,
-					'p' => $this->l('Reference of this warehouse'),
+					'desc' => $this->l('Reference of this warehouse'),
 				),
 				array(
 					'type' => 'text',
@@ -167,7 +167,7 @@ class AdminWarehousesControllerCore extends AdminController
 					'size' => 40,
 					'maxlength' => 45,
 					'required' => true,
-					'p' => $this->l('Name of this warehouse')
+					'desc' => $this->l('Name of this warehouse')
 				),
 				array(
 					'type' => 'text',
@@ -175,7 +175,7 @@ class AdminWarehousesControllerCore extends AdminController
 					'name' => 'phone',
 					'size' => 15,
 					'maxlength' => 16,
-					'p' => $this->l('Phone number of this warehouse')
+					'desc' => $this->l('Phone number of this warehouse')
 				),
 				array(
 					'type' => 'text',
@@ -218,7 +218,7 @@ class AdminWarehousesControllerCore extends AdminController
 						'id' => 'id_country',
 						'name' => 'name'
 					),
-					'p' => $this->l('Country where the state, region or city is located')
+					'desc' => $this->l('Country where the state, region or city is located')
 				),
 				array(
 					'type' => 'select',
@@ -252,7 +252,7 @@ class AdminWarehousesControllerCore extends AdminController
 						'id' => 'id_shop',
 						'name' => 'name'
 					),
-					'p' => $this->l('Shops'),
+					'desc' => $this->l('Shops'),
 					'hint' => $this->l('By associating a shop to a warehouse, all products in the warehouse will be available
 						for sale in it. It is also possible to ship orders of this shop from this warehouse'),
 				),
@@ -267,7 +267,7 @@ class AdminWarehousesControllerCore extends AdminController
 						'id' => 'id_reference',
 						'name' => 'name'
 					),
-					'p' => $this->l('Associated carriers'),
+					'desc' => $this->l('Associated carriers'),
 					'hint' => $this->l('You can specifiy the carriers available to ship orders from this warehouse'),
 				),
 			),
@@ -300,7 +300,7 @@ class AdminWarehousesControllerCore extends AdminController
 					'id' => 'id',
 					'name' => 'name'
 				),
-				'p' => $this->l('Inventory valuation method')
+				'desc' => $this->l('Inventory valuation method')
 			);
 
 			$this->fields_form['input'][] = array(
diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php
index 8e71819df..e26538b27 100755
--- a/controllers/admin/AdminWebserviceController.php
+++ b/controllers/admin/AdminWebserviceController.php
@@ -94,7 +94,7 @@ class AdminWebserviceControllerCore extends AdminController
 					'id' => 'code',
 					'size' => 32,
 					'required' => true,
-					'p' => $this->l('Webservice account key'),
+					'desc' => $this->l('Webservice account key'),
 				),
 				array(
 					'type' => 'textarea',
@@ -102,7 +102,7 @@ class AdminWebserviceControllerCore extends AdminController
 					'name' => 'description',
 					'rows' => 3,
 					'cols' => 110,
-					'p' => $this->l('Key description'),
+					'desc' => $this->l('Key description'),
 				),
 				array(
 					'type' => 'radio',
diff --git a/controllers/admin/AdminZonesController.php b/controllers/admin/AdminZonesController.php
index f191fcd85..471781285 100644
--- a/controllers/admin/AdminZonesController.php
+++ b/controllers/admin/AdminZonesController.php
@@ -82,7 +82,7 @@ class AdminZonesControllerCore extends AdminController
 					'name' => 'name',
 					'size' => 33,
 					'required' => true,
-					'p' => $this->l('Zone name, e.g., Africa, West Coast, Neighboring Countries'),
+					'desc' => $this->l('Zone name, e.g., Africa, West Coast, Neighboring Countries'),
 				),
 				array(
 					'type' => 'radio',
@@ -103,7 +103,7 @@ class AdminZonesControllerCore extends AdminController
 							'label' => $this->l('Disabled')
 						)
 					),
-					'p' => $this->l('Allow or disallow shipping to this zone')
+					'desc' => $this->l('Allow or disallow shipping to this zone')
 				)
 			)
 		);