diff --git a/ChangeLog b/ChangeLog
index 892e37a9eda..803703caf9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,7 +30,7 @@ For users:
 - New: Add link to third party into sells and purchase journal.
 - New: Suggest a method to generate a backup file for user with no access
        to mysqldump binary.
-- New: Can use extrafields on contacts/addresses.
+- New: Can also use extrafields on contacts/addresses and users.
 - New: Support unique field for extrafields.
 - New: Extra fields supports more types (int, string, double, date, datetime).
 - New: Can correct stock of a warehouse from warehouse card.
@@ -62,10 +62,12 @@ For users:
 - New: Can choose menu entry to show with external site module.
 - New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM
        to force margins of generated PDF.
+- New:  [ task #314 ] Can define if prof id are mandatory or not
 New experimental modules:
 - New: Add margin management module.
 - New: Add commissions management module.
 
+
 - Fix: [ bug #499 ]: Supplier order input method not translated
 - Fix: No images into product description lines as PDF generation does
   not work with this.
diff --git a/build/debian/apache.conf b/build/debian/apache.conf
index 249c100245d..560a1c5193c 100644
--- a/build/debian/apache.conf
+++ b/build/debian/apache.conf
@@ -34,16 +34,6 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
   </IfModule>
 
 
-    # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
-    # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
-    #AddType text/javascript .jgz
-    #AddEncoding gzip .jgz
-    
-    # OPTIMIZE: To use gzip compression (on the fly).
-    # Note that you must also enable the module mod_deflate.
-    # You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. 
-    #TODO
-    
     # OPTIMIZE: To use cache on static pages (A259200 = 1 month).
     # Note that you must also enable the module mod_expires.
     #ExpiresActive On
diff --git a/build/debian/conf.php.install b/build/debian/conf.php.install
index 78195f27006..e439e80caef 100755
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -161,12 +161,11 @@ $dolibarr_main_authentication='dolibarr';
 # $dolibarr_main_auth_ldap_filter = '';                        # If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
 # $dolibarr_main_auth_ldap_admin_login='';					# Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com
 # $dolibarr_main_auth_ldap_admin_pass='';					# Required only if anonymous bind disabled. Ex: secret
-
 # $dolibarr_main_auth_ldap_debug='false';
 
 
 # dolibarr_main_demo
-# Login and pass to use in a demo mode
+# Login and pass to use in a demo mode.
 # Default value: ''
 # Examples:
 # $dolibarr_main_demo='autologin,autopass'
diff --git a/build/debian/control.debianbin b/build/debian/control.debianbin
deleted file mode 100755
index 39fe764e088..00000000000
--- a/build/debian/control.debianbin
+++ /dev/null
@@ -1,55 +0,0 @@
-Package: dolibarr
-Version: __VERSION__
-Architecture: all
-Maintainer: Laurent Destailleur <eldy@users.sourceforge.net>
-Installed-Size: 61200
-Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5,
-    php5-mysql | php5-mysqli, 
-    php5-cli, php5-curl, php5-gd, php5-ldap, php-pear, php-mail-mime, php5-geoip,
-	libphp-adodb,
-    libnusoap-php,
-    libphp-pclzip,
-    libjs-jquery, libjs-jquery-ui, ckeditor,
-    ttf-dejavu-core,
-    xdg-utils,
-    mysql-server
-Section: web
-Priority: optional
-Homepage: http://www.dolibarr.org
-Description: Web based software to manage a small company or foundation
- Dolibarr ERP & CRM is an easy to use open source/free software for small 
- and medium companies, foundations or freelances. It includes different 
- features for Enterprise Resource Planning (ERP) and Customer Relationship
- Management (CRM) but also for different other activities.
- It's a web software you can install as a standalone program or on any web
- hosting provider to use it from anywhere with any web browser.
- .
- Dolibarr was designed to be easy to use. Only features you need are 
- visible, depending on which module were activated.
- Most common used modules are:
- .
- Customers, Suppliers or Prospects directory,
- Contacts directory,
- Orders management,
- Commercial proposals management,
- Invoices management,
- Products and services catalog,
- Stock management,
- Foundations members management,
- Bank accounts management,
- Point of Sale,
- Payments management,
- Commercial actions management,
- Contracts management,
- Standing orders management,
- Shipping management,
- Donations management,
- Bookmarks management,
- Mass Emailings,
- Reports,
- Wizards to export and import data,
- LDAP connectivity,
- PDF exports,
- And a lot of more modules...
- .
- You can also add third parties external modules or develop yours.
diff --git a/build/debian/install.forced.php.install b/build/debian/install.forced.php.install
index c62d4760d23..3977caf8430 100755
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -29,13 +29,14 @@ $force_install_lockinstall='444';
 // If we enable/disable libraries declaration during install, we must also check they are 
 // not removed from package (see in rules file),
 // declared into dependencies (see in control file)
+$force_dolibarr_lib_TCPDF_PATH='';
+$force_dolibarr_lib_FPDF_PATH='/usr/share/php/fpdf';
+$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 $force_dolibarr_lib_ADODB_PATH='/usr/share/php/adodb';
-//$force_dolibarr_lib_FPDI_PATH='/usr/share/php/fpdi';
 $force_dolibarr_lib_GEOIP_PATH='';
 $force_dolibarr_lib_NUSOAP_PATH='/usr/share/php/nusoap';
 $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP='/usr/share/php/libphp-pclzip';
 $force_dolibarr_lib_PHPEXCEL_PATH='';
-$force_dolibarr_lib_TCPDF_PATH='';
 $force_dolibarr_js_CKEDITOR='/javascript/ckeditor';
 $force_dolibarr_js_JQUERY='/javascript/jquery';
 $force_dolibarr_js_JQUERY_UI='/javascript/jquery-ui';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b1838928511..30158915f2e 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -547,7 +547,7 @@ if ($action == 'edit' || $action == 'updateedit')
     /*
      *  Local Taxes
      */
-    if ($mysoc->country_code=='ES')
+    if ($mysoc->hasLocalTax(1))
     {
         // Local Tax 1
         print '<br>';
@@ -576,7 +576,9 @@ if ($action == 'edit' || $action == 'updateedit')
         print "</table>";
         print "</td></tr>\n";
         print "</table>";
-
+	}
+    if ($mysoc->hasLocalTax(2))
+    {
         // Local Tax 2
         print '<br>';
         print '<table class="noborder" width="100%">';
@@ -921,7 +923,7 @@ else
     /*
      *  Local Taxes
      */
-    if ($mysoc->country_code=='ES')
+    if ($mysoc->hasLocalTax(1))
     {
         // Local Tax 1
         print '<br>';
@@ -951,7 +953,9 @@ else
         print "</td></tr>\n";
 
         print "</table>";
-
+	}
+    if ($mysoc->hasLocalTax(2))
+    {
         // Local Tax 2
         print '<br>';
         print '<table class="noborder" width="100%">';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index bf9bec788d4..efa6c30c6e2 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -27,7 +27,9 @@
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 $langs->load("admin");
 $langs->load("members");
@@ -35,6 +37,9 @@ $langs->load("users");
 
 if (! $user->admin) accessforbidden();
 
+$extrafields = new ExtraFields($db);
+
+
 /*
  * Action
  */
@@ -71,14 +76,17 @@ if (preg_match('/del_(.*)/',$action,$reg))
  * View
  */
 
-llxHeader();
+$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
+llxHeader('',$langs->trans("UsersSetup"),$help_url);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print_fiche_titre($langs->trans("UsersSetup"),$linkback,'setup');
-print "<br>";
 
 
-print_fiche_titre($langs->trans("MemberMainOptions"),'','');
+$head=user_admin_prepare_head();
+
+dol_fiche_head($head,'card', $langs->trans("User"), 0, 'user');
+
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
@@ -114,7 +122,8 @@ else
 print '</td></tr>';
 
 print '</table>';
-print '<br><br>';
+
+dol_fiche_end();
 
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 0df445e2b28..36dae818cfa 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1565,21 +1565,19 @@ print '<td align="right" nowrap>'.price($object->total_tva).'</td>';
 print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
 // Amount Local Taxes
-if ($mysoc->country_code=='ES')
+if ($mysoc->localtax1_assuj=="1") //Localtax1
 {
-	if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-	{
-		print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-		print '<td align="right" nowrap>'.price($object->total_localtax1).'</td>';
-		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-	{
-		print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-		print '<td align="right" nowrap>'.price($object->total_localtax2).'</td>';
-		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
+	print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
+	print '<td align="right" nowrap>'.price($object->total_localtax1).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 }
+if ($mysoc->localtax2_assuj=="1") //Localtax2
+{
+	print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
+	print '<td align="right" nowrap>'.price($object->total_localtax2).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+}
+
 
 // Amount TTC
 print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 3f77370edf5..e7533d0055d 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1581,18 +1581,16 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
 			print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
-			if ($mysoc->country_code=='ES')
+			if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
 			{
-				if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
-				}
-
-				if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
-				}
+				print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
 			}
+
+			if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
+			{
+				print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
+			}
+
 			print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
 		}
 		else
@@ -1814,11 +1812,8 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			if (! empty($conf->projet->enabled)) $nbrow++;
 
 			//Local taxes
-			if ($mysoc->country_code=='ES')
-			{
-				if($mysoc->localtax1_assuj=="1") $nbrow++;
-				if($mysoc->localtax2_assuj=="1") $nbrow++;
-			}
+			if($mysoc->localtax1_assuj=="1") $nbrow++;
+			if($mysoc->localtax2_assuj=="1") $nbrow++;
 
 			print '<table class="border" width="100%">';
 
@@ -2075,20 +2070,17 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>';
 
 			// Amount Local Taxes
-			if ($mysoc->country_code=='ES')
+			if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
 			{
-				if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-					print '<td align="right">'.price($object->total_localtax1).'</td>';
-					print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-				}
-				if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-				{
-					print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-					print '<td align="right">'.price($object->total_localtax2).'</td>';
-					print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-				}
+				print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
+				print '<td align="right">'.price($object->total_localtax1).'</td>';
+				print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+			}
+			if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
+			{
+				print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
+				print '<td align="right">'.price($object->total_localtax2).'</td>';
+				print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 			}
 
 			// Total TTC
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 67194b610d5..a66f53f7458 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -757,6 +757,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
             $object->amount				= $_POST['amount'];
             $object->remise_absolue		= $_POST['remise_absolue'];
             $object->remise_percent		= $_POST['remise_percent'];
+   			$object->fetch_thirdparty();
 
             // If creation from another object of another module (Example: origin=propal, originid=1)
             if ($_POST['origin'] && $_POST['originid'])
@@ -2078,17 +2079,14 @@ if ($action == 'create')
         print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
         print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
         print '<tr><td>'.$langs->trans('TotalVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
-        if ($mysoc->pays_code=='ES')
+        if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
         {
-            if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
-            {
-                print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
-            }
+            print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
+        }
 
-            if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
-            {
-                print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
-            }
+        if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
+        {
+            print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
         }
         print '<tr><td>'.$langs->trans('TotalTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
     }
@@ -2654,11 +2652,8 @@ else if ($id > 0 || ! empty($ref))
         if (! empty($conf->banque->enabled)) $nbcols++;
 
         //Local taxes
-        if ($mysoc->pays_code=='ES')
-        {
-            if($mysoc->localtax1_assuj=="1") $nbrows++;
-            if($mysoc->localtax2_assuj=="1") $nbrows++;
-        }
+        if($mysoc->localtax1_assuj=="1") $nbrows++;
+        if($mysoc->localtax2_assuj=="1") $nbrows++;
 
         print '<td rowspan="'.$nbrows.'" colspan="2" valign="top">';
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 4e2d80e7bd1..fd8a2c82101 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -127,6 +127,7 @@ class Contact extends CommonObject
 		$sql.= ", priv";
 		$sql.= ", canvas";
 		$sql.= ", entity";
+		$sql.= ", import_key";
 		$sql.= ") VALUES (";
 		$sql.= "'".$this->db->idate($now)."',";
 		if ($this->socid > 0) $sql.= " ".$this->socid.",";
@@ -136,7 +137,8 @@ class Contact extends CommonObject
 		$sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").",";
 		$sql.= " ".$this->priv.",";
         $sql.= " ".($this->canvas?"'".$this->canvas."'":"null").",";
-        $sql.= " ".$conf->entity;
+        $sql.= " ".$conf->entity.",";
+        $sql.= " ".$this->import_key;
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::create sql=".$sql);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0cb132d23c6..600bd44d95c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1516,27 +1516,49 @@ abstract class CommonObject
                 $this->total_localtax2 += $obj->total_localtax2;
                 $this->total_ttc       += $obj->total_ttc;
 
-                // Define vatrates with totals for each line and for all lines
-                // TODO $vatrates and $vatrates_alllines not used ?
-                if (! empty($this->vatrate))
+                // Check if global invoice tax for this vat rate
+                if (! empty($obj->vatrate))
                 {
-                	$vatrates[$this->vatrate][]=array(
-                			'total_ht'       =>$obj->total_ht,
-                			'total_tva'      =>$obj->total_tva,
-                			'total_ttc'      =>$obj->total_ttc,
-                			'total_localtax1'=>$obj->total_localtax1,
-                			'total_localtax2'=>$obj->total_localtax2
-                	);
-                	if (! isset($vatrates_alllines[$this->vatrate]['total_ht']))        $vatrates_alllines[$this->vatrate]['total_ht']=0;
-                	if (! isset($vatrates_alllines[$this->vatrate]['total_tva']))       $vatrates_alllines[$this->vatrate]['total_tva']=0;
-                	if (! isset($vatrates_alllines[$this->vatrate]['total_localtax1'])) $vatrates_alllines[$this->vatrate]['total_localtax1']=0;
-                	if (! isset($vatrates_alllines[$this->vatrate]['total_localtax2'])) $vatrates_alllines[$this->vatrate]['total_localtax2']=0;
-                	if (! isset($vatrates_alllines[$this->vatrate]['total_ttc']))       $vatrates_alllines[$this->vatrate]['total_ttc']=0;
-                	$vatrates_alllines[$this->vatrate]['total_ht']       +=$obj->total_ht;
-                	$vatrates_alllines[$this->vatrate]['total_tva']      +=$obj->total_tva;
-                	$vatrates_alllines[$this->vatrate]['total_localtax1']+=$obj->total_localtax1;
-                	$vatrates_alllines[$this->vatrate]['total_localtax2']+=$obj->total_localtax2;
-                	$vatrates_alllines[$this->vatrate]['total_ttc']      +=$obj->total_ttc;
+                    if ($this->total_localtax1 == 0)
+                    {
+						// Search local taxes
+						$sql  = "SELECT t.localtax1, t.localtax1_type";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$this->client->country_code."'";
+						$sql .= " AND t.taux = ".$obj->vatrate." AND t.active = 1";
+
+						dol_syslog("get_localtax sql=".$sql);
+						$resqlt=$this->db->query($sql);
+						if ($resqlt)
+						{
+							$objt = $this->db->fetch_object($resqlt);
+       						if ($objt->localtax1_type == '7')
+							{
+                 				$this->total_localtax1 += $objt->localtax1;
+                 				$this->total_ttc       += $objt->localtax1;
+							}
+						}
+					}
+                    if ($this->total_localtax2 == 0)
+                    {
+						// Search local taxes
+						$sql  = "SELECT t.localtax2, t.localtax2_type";
+						$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+						$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$this->client->country_code."'";
+						$sql .= " AND t.taux = ".$obj->vatrate." AND t.active = 1";
+
+						dol_syslog("get_localtax sql=".$sql);
+						$resqlt=$this->db->query($sql);
+						if ($resqlt)
+						{
+							$objt = $this->db->fetch_object($resqlt);
+       						if ($objt->localtax2_type == '7')
+							{
+                 				$this->total_localtax2 += $objt->localtax2;
+                 				$this->total_ttc       += $objt->localtax2;
+							}
+						}
+					}
                 }
 
                 $i++;
@@ -1544,21 +1566,6 @@ abstract class CommonObject
 
             $this->db->free($resql);
 
-            // TODO
-            if ($roundingadjust)
-            {
-                // For each vatrate, calculate if two method of calculation differs
-
-
-                // If it differs
-                if (1==2)
-                {
-                    // Adjust a line and update it
-
-
-                }
-            }
-
             // Now update global field total_ht, total_ttc and tva
             $fieldht='total_ht';
             $fieldtva='tva';
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 136d034a0ec..cf3c7b8ba96 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -115,7 +115,8 @@ class HookManager
      * 		@param		Object	&$object		Object to use hooks on
      * 	    @param		string	&$action		Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
      * 		@return		mixed					For doActions,formObjectOptions:    Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO.
-     * 											For printSearchForm,printLeftBlock,printTopRightMenu,...: Return HTML string.
+     * 											For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Must always return an int and things to print into ->resprints. 
+     *                                          Can also return some values into an array ->results.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
 	function executeHooks($method, $parameters=false, &$object='', &$action='')
@@ -127,45 +128,58 @@ class HookManager
 
         // Loop on each hook to qualify modules that declared context
         $modulealreadyexecuted=array();
-        $resaction=0; $resprint='';
+        $resaction=0; $error=0;
+		$this->resPrint=''; $this->resArray=array();
         foreach($this->hooks as $modules)    // this->hooks is an array with context as key and value is an array of modules that handle this context
         {
             if (! empty($modules))
             {
                 foreach($modules as $module => $actionclassinstance)
                 {
-                    // test to avoid to run twice a hook, when a module implements several active contexts
+                	// jump to next class if method does not exists
+                    if (! method_exists($actionclassinstance,$method)) continue;
+                	// test to avoid to run twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
                     $modulealreadyexecuted[$module]=$module;
 
                     // Hooks that return int
-                    if (($method == 'doActions' || $method == 'formObjectOptions') && method_exists($actionclassinstance,$method))
+                    if (($method == 'doActions' || $method == 'formObjectOptions'))
                     {
-                        $resaction+=$actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                        if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-                        {
-                            $this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
-                            if ($method == 'doActions')
-                            {
-                                if ($action=='add')    $action='create';    // TODO this change must be inside the doActions
-                                if ($action=='update') $action='edit';      // TODO this change must be inside the doActions
-                            }
-                        }
+                    	$resaction+=$actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+                    	if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+                    	{
+                    		$error++;
+                    		$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
+                    		// TODO remove this. Change must be inside the method if required
+                    		if ($method == 'doActions')
+                    		{
+                    			if ($action=='add')    $action='create';
+                    			if ($action=='update') $action='edit';
+                    		}
+                    	}
                     }
-                    // Generic hooks that return a string (printSearchForm, printLeftBlock, formBuilddocOptions, ...)
-                    else if (method_exists($actionclassinstance,$method))
+                    // Generic hooks that return a string (printSearchForm, printLeftBlock, printTopRightMenu, formAddObjectLine, formBuilddocOptions, ...)
+                    else
                     {
-                        if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+                    	// TODO. this should be done into the method by returning nothing
+                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+
                     	$result = $actionclassinstance->$method($parameters, $object, $action, $this);
-                    	if (is_array($result)) $this->resArray = array_merge($this->resArray, $result);
-                    	else $resprint.=$result;
+
+                    	if (is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+
+                    	// TODO. remove this. array result must be set into $actionclassinstance->results
+                    	if (is_array($result)) $this->resArray = array_merge($this->resArray, $result);
+                    	// TODO. remove this. result must not be a string. we must use $actionclassinstance->resprint to return a string
+                    	if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result;
                     }
                 }
             }
         }
 
-        if ($method == 'doActions' || $method == 'formObjectOptions') return $resaction;
-        return $resprint;
+        if ($method != 'doActions' && $method != 'formObjectOptions') return $this->resPrint;	// TODO remove this. When there is something to print, ->resPrint is filled. 
+        return ($error?-1:$resaction);
 	}
 
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 838c94f0c6d..8c4f24f3f28 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1541,7 +1541,8 @@ class Form
 
             $num = $this->db->num_rows($result);
 
-            $outselect.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';
+            //$outselect.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
+            $outselect.='<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
             if (! $selected) $outselect.='<option value="0" selected="selected">&nbsp;</option>';
             else $outselect.='<option value="0">&nbsp;</option>';
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 824d326883d..4b5b4f986ce 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -49,8 +49,13 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 
 					// Remove product id before select another product
 					// use keyup instead change to avoid loosing the product id
-					$("input#search_'.$htmlname.'").keyup(function() {
-							$("#'.$htmlname.'").val("").trigger("change");
+					$("input#search_'.$htmlname.'").keydown(function() {
+						//console.log(\'purge_id_after_keydown\');
+						$("#'.$htmlname.'").val("");
+					});
+					$("input#search_'.$htmlname.'").change(function() {
+						//console.log(\'keyup\');
+						$("#'.$htmlname.'").trigger("change");
 					});
 					// Check when keyup
 					$("input#search_'.$htmlname.'").onDelayedKeyup({ handler: function() {
@@ -116,6 +121,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 						dataType: "json",
     					minLength: '.$minLength.',
     					select: function( event, ui ) {
+							//console.log(\'set value of id with \'+ui.item.id);
     						$("#'.$htmlname.'").val(ui.item.id).trigger("change");
     						// Disable an element
     						if (options.option_disabled) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d9d8703680c..7aa197be58f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2722,7 +2722,7 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 	}
 
 	// Search local taxes
-	$sql  = "SELECT t.localtax1, t.localtax2";
+	$sql  = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
 	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$code_country."'";
 	$sql .= " AND t.taux = ".$tva." AND t.active = 1";
@@ -2732,9 +2732,8 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 	if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
-		if ($local==1) return $obj->localtax1;
-		elseif ($local==2) return $obj->localtax2;
-		//else return array($obj->localtax1,$obj->localtax2);
+		if ($local==1 && $obj->localtax1_type != '7') return $obj->localtax1;
+		elseif ($local==2 && $obj->localtax2_type != '7') return $obj->localtax2;
 	}
 
 	return 0;
@@ -4209,6 +4208,35 @@ function getCurrencySymbol($currency_code)
 
 	return $currency_sign;
 }
+/**
+ * Get type of one localtax
+ *
+ *  @param		int	$vatrate			VAT Rate
+ *  @param		int	$number             Number of localtax (1 / 2)
+ *  @param		int	$thirdparty         company object
+ *  @return		array      				array(Type of local tax (1 to 7 / 0 if not found), rate or amount of localtax)
+ */
+
+function getTypeOfLocalTaxFromRate($vatrate, $number, $thirdparty)
+{
+	global $db;
+
+	// Search local taxes
+	$sql  = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+	$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$thirdparty->country_code."'";
+	$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+	$resql=$db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+  		if ($number == 1) return array($obj->localtax1_type, $obj->localtax1);
+  		elseif ($number == 2) return array($obj->localtax2_type, $obj->localtax2);
+	}
+
+	return 0;
+}
 
 if (! function_exists('getmypid'))
 {
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 219602f761e..2613d773ab1 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -80,8 +80,10 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 	if (! empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->MAIN_DISABLE_FPDI))
     	return "Error MAIN_USE_FPDF and MAIN_DISABLE_FPDI can't be set together";
 
-	// We use by default TCPDF
+	// We use by default TCPDF else FPDF
 	if (empty($conf->global->MAIN_USE_FPDF)) require_once TCPDF_PATH.'tcpdf.php';
+	else require_once FPDF_PATH.'fpdf.php';
+
 	// We need to instantiate fpdi object (instead of tcpdf) to use merging features. But we can disable it.
 	if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once FPDI_PATH.'fpdi.php';
 
@@ -90,7 +92,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 	//$metric=$arrayformat['unit'];
 
 	// Protection et encryption du pdf
-	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
+	if (empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->PDF_SECURITY_ENCRYPTION))
 	{
 		/* Permission supported by TCPDF
 		 - print : Print the document;
@@ -103,20 +105,11 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 		 - print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.
 		 - owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.
 		 */
-		if (! empty($conf->global->MAIN_USE_FPDF))
-		{
-			require_once FPDI_PATH.'fpdi_protection.php';
-			$pdf = new FPDI_Protection($pagetype,$metric,$format);
-			// For FPDF, we specify permission we want to open
-			$pdfrights = array('print');
-		}
-		else
-		{
-			if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
-			else $pdf = new TCPDF($pagetype,$metric,$format);
-			// For TCPDF, we specify permission we want to block
-			$pdfrights = array('modify','copy');
-		}
+		if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
+		else $pdf = new TCPDF($pagetype,$metric,$format);
+		// For TCPDF, we specify permission we want to block
+		$pdfrights = array('modify','copy');
+
 		$pdfuserpass = ''; // Mot de passe pour l'utilisateur final
 		$pdfownerpass = NULL; // Mot de passe du proprietaire, cree aleatoirement si pas defini
 		$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass);
@@ -126,9 +119,43 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 		if (class_exists('FPDI')) $pdf = new FPDI($pagetype,$metric,$format);
 		else $pdf = new TCPDF($pagetype,$metric,$format);
 	}
+
+	// If we use FPDF class, we may need to add method writeHTMLCell
+	if (! empty($conf->global->MAIN_USE_FPDF) && ! method_exists($pdf, 'writeHTMLCell'))
+	{
+		// Declare here a class to overwrite FPDFI to add method writeHTMLCell
+		/**
+		 *	This class if a enhanced FPDI class that support method writeHTMLCell
+		 */
+		class FPDI_DolExtended extends FPDI
+		{
+			public function __call($method, $args)
+			{
+				if (isset($this->$method)) {
+					$func = $this->$method;
+					$func($args);
+				}
+			}
+
+			public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
+			{
+				$this->SetXY($x,$y);
+				$val=str_replace('<br>',"\n",$html);
+				$val=dol_string_nohtmltag($val,false,'ISO-8859-1');
+				//print 'eee'.$val;exit;
+				$this->MultiCell($w,$h,$val,$border,$align,$fill);
+			}
+		}
+
+		$pdf2=new FPDI_DolExtended($pagetype,$metric,$format);
+		unset($pdf);
+		$pdf=$pdf2;
+	}
+
 	return $pdf;
 }
 
+
 /**
  *      Return font name to use for PDF generation
  *
@@ -691,7 +718,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	{
 		$pdf->SetFont('','B',7);
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell(200, 2, $line1, 0, 'C', 0);
+		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line1, 0, 'C', 0);
 		$posy-=3;
 		$pdf->SetFont('','',7);
 	}
@@ -700,7 +727,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	{
 		$pdf->SetFont('','B',7);
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell(200, 2, $line2, 0, 'C', 0);
+		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line2, 0, 'C', 0);
 		$posy-=3;
 		$pdf->SetFont('','',7);
 	}
@@ -708,22 +735,23 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	if (! empty($line3))
 	{
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell(200, 2, $line3, 0, 'C', 0);
+		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line3, 0, 'C', 0);
 	}
 
 	if (! empty($line4))
 	{
 		$posy-=3;
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell(200, 2, $line4, 0, 'C', 0);
+		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line4, 0, 'C', 0);
 	}
 
 	// Show page nb only on iso languages (so default Helvetica font)
 	if (pdf_getPDFFont($outputlangs) == 'Helvetica')
 	{
 		$pdf->SetXY(-20,-$posy);
-		$pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-		//print 'xxx'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
+		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
+		if (empty($conf->global->MAIN_USE_FPDF)) $pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+		else $pdf->MultiCell(11, 2, $pdf->PageNo().'/{nb}', 0, 'R', 0);
 	}
 
 	return $marginwithfooter;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index e5dddb11ea5..c051649fb44 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -208,7 +208,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlen
 					//else $labeltoshow.=' ('.$langs->trans("Private").')';
 					if (!empty($selected) && $selected == $obj->rowid && $obj->fk_statut > 0)
 					{
-						print '<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.'</option>';
+						print '<option value="'.$obj->rowid.'" selected="selected">'.$labeltoshow.' - '.dol_trunc($obj->title,$maxlength).'</option>';
 					}
 					else
 					{
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index e0dea4a81cd..7c484b5c923 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -146,6 +146,43 @@ function group_prepare_head($object)
     return $head;
 }
 
+
+
+/**
+ * Prepare array with list of tabs
+ *
+ * @return  array				Array of tabs to shoc
+ */
+function user_admin_prepare_head()
+{
+	global $langs, $conf, $user;
+
+	$langs->load("users");
+	$h=0;
+	
+    $head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'card';
+    $h++;
+	
+    $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
+    
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'useradmin');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'useradmin','remove');
+
+	return $head;
+}
+
+
+
 /**
  * Prepare array with list of tabs
  *
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 6585f703e59..95d92015841 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1,386 +1,404 @@
-<?php
-/* Copyright (C) 2004-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2012	Juanjo Menent		<jmenent@2byte.es>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * or see http://www.gnu.org/
- */
-
-/**
- *	\file       htdocs/core/modules/commande/doc/pdf_einstein.modules.php
- *	\ingroup    commande
- *	\brief      Fichier de la classe permettant de generer les commandes au modele Einstein
- */
-
-require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-
-
-/**
- *	Classe permettant de generer les commandes au modele Einstein
- */
-class pdf_einstein extends ModelePDFCommandes
-{
-    var $db;
-    var $name;
-    var $description;
-    var $type;
-
-    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
-    var $version = 'dolibarr';
-
-    var $page_largeur;
-    var $page_hauteur;
-    var $format;
-	var $marge_gauche;
-	var	$marge_droite;
-	var	$marge_haute;
-	var	$marge_basse;
-
-    var $emetteur;	// Objet societe qui emet
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		$langs->load("main");
-		$langs->load("bills");
-
-		$this->db = $db;
-		$this->name = "einstein";
-		$this->description = $langs->trans('PDFEinsteinDescription');
-
-		// Dimension page pour format A4
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1;                 // Affiche mode reglement
-		$this->option_condreg = 1;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
-
-		$this->franchise=!$mysoc->tva_assuj;
-
-		// Get source company
-		$this->emetteur=$mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
-
-		// Define position of columns
-		$this->posxdesc=$this->marge_gauche+1;
-		$this->posxtva=111;
-		$this->posxup=126;
-		$this->posxqty=145;
-		$this->posxdiscount=162;
-		$this->postotalht=174;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$this->posxtva-=20;
-			$this->posxup-=20;
-			$this->posxqty-=20;
-			$this->posxdiscount-=20;
-			$this->postotalht-=20;
-		}
-
-		$this->tva=array();
-		$this->localtax1=array();
-		$this->localtax2=array();
-		$this->atleastoneratenotnull=0;
-		$this->atleastonediscount=0;
-	}
-
-	/**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
-     *  @return     int             			1=OK, 0=KO
-	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
-	{
-		global $user,$langs,$conf;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		$outputlangs->load("main");
-		$outputlangs->load("dict");
-		$outputlangs->load("companies");
-		$outputlangs->load("bills");
-		$outputlangs->load("products");
-		$outputlangs->load("orders");
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		if ($conf->commande->dir_output)
-		{
-            $object->fetch_thirdparty();
-
-            $deja_regle = "";
-
-            // Definition of $dir and $file
-			if ($object->specimen)
-			{
-				$dir = $conf->commande->dir_output;
-				$file = $dir . "/SPECIMEN.pdf";
-			}
-			else
-			{
-				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->commande->dir_output . "/" . $objectref;
-				$file = $dir . "/" . $objectref . ".pdf";
-			}
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				$nblignes = count($object->lines);
-
-				// Create pdf instance
-				$pdf=pdf_getInstance($this->format);
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
-
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
-
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("Order"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
-
-				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0 ; $i < $nblignes ; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
-						$this->atleastonediscount++;
-					}
-				}
-
-				// New page
-				$pdf->AddPage();
-				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
-
-
-				$tab_top = 90;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
-				$tab_height = 130;
-				$tab_height_newpage = 150;
-
-				// Affiche notes
-				if (! empty($object->note_public))
-				{
-					$tab_top = 88;
-
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($object->note_public), 0, 1);
-					$nexY = $pdf->GetY();
-					$height_note=$nexY-$tab_top;
-
-					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
-				}
-				else
-				{
-					$height_note=0;
-				}
-
-				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
-
-				// Loop on each lines
-				for ($i = 0 ; $i < $nblignes ; $i++)
-				{
-					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
-
-					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
-
-					// Description of product line
-					$curX = $this->posxdesc-1;
-
-					$showpricebeforepagebreak=1;
-
-					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
-					$pageposafter=$pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
-						$pdf->rollbackTransaction(true);
-						$pageposafter=$pageposbefore;
-						//print $pageposafter.'-'.$pageposbefore;exit;
-						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
-						$posyafter=$pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
-							{
-								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
-								$pdf->setPage($pagenb+1);
-							}
-						}
-						else
-						{
-							// We found a page break
-							$showpricebeforepagebreak=0;
-						}
-					}
-					else	// No pagebreak
-					{
-						$pdf->commitTransaction();
-					}
-
-					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
-					$pdf->setPage($pageposbefore);
-					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-
-					// We suppose that a too long description is moved completely on next page
-					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-					}
-
-					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
-
-					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-					{
-						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
-						$pdf->SetXY($this->posxtva, $curY);
-						$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
-					}
-
-					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
-					$pdf->SetXY($this->posxup, $curY);
-					$pdf->MultiCell($this->posxqty-$this->posxup-1, 3, $up_excl_tax, 0, 'R', 0);
-
-					// Quantity
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails, $hookmanager);
-					$pdf->SetXY($this->posxqty, $curY);
-					$pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 3, $qty, 0, 'R');	// Enough for 6 chars
-
-					// Discount on line
-					if ($object->lines[$i]->remise_percent)
-					{
-						$pdf->SetXY($this->posxdiscount-2, $curY);
-						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails, $hookmanager);
-						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
-					}
-
-					// Total HT line
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
-					$pdf->SetXY($this->postotalht, $curY);
-					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
-
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					$tvaligne=$object->lines[$i]->total_tva;
-
-					$localtax1ligne=$object->lines[$i]->total_localtax1;
-					$localtax2ligne=$object->lines[$i]->total_localtax2;
-
-					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
-					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
-
-					$vatrate=(string) $object->lines[$i]->tva_tx;
-					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
-					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
-
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
-					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
-					if (! isset($this->localtax1[$localtax1rate])) 	$this->localtax1[$localtax1rate]='';
-					if (! isset($this->localtax2[$localtax2rate])) 	$this->localtax2[$localtax2rate]='';
-					$this->tva[$vatrate] += $tvaligne;
-					$this->localtax1[$localtax1rate]+=$localtax1ligne;
-					$this->localtax2[$localtax2rate]+=$localtax2ligne;
-
+<?php
+/* Copyright (C) 2004-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin		<regis@dolibarr.fr>
+ * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2012	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+ *	\ingroup    commande
+ *	\brief      Fichier de la classe permettant de generer les commandes au modele Einstein
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Classe permettant de generer les commandes au modele Einstein
+ */
+class pdf_einstein extends ModelePDFCommandes
+{
+    var $db;
+    var $name;
+    var $description;
+    var $type;
+
+    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
+    var $version = 'dolibarr';
+
+    var $page_largeur;
+    var $page_hauteur;
+    var $format;
+	var $marge_gauche;
+	var	$marge_droite;
+	var	$marge_haute;
+	var	$marge_basse;
+
+    var $emetteur;	// Objet societe qui emet
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		global $conf,$langs,$mysoc;
+
+		$langs->load("main");
+		$langs->load("bills");
+
+		$this->db = $db;
+		$this->name = "einstein";
+		$this->description = $langs->trans('PDFEinsteinDescription');
+
+		// Dimension page pour format A4
+		$this->type = 'pdf';
+		$formatarray=pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur,$this->page_hauteur);
+		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+		$this->option_logo = 1;                    // Affiche logo
+		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+		$this->option_modereg = 1;                 // Affiche mode reglement
+		$this->option_condreg = 1;                 // Affiche conditions reglement
+		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_multilang = 1;               // Dispo en plusieurs langues
+		$this->option_escompte = 0;                // Affiche si il y a eu escompte
+		$this->option_credit_note = 0;             // Support credit notes
+		$this->option_freetext = 1;				   // Support add of a personalised text
+		$this->option_draft_watermark = 1;		   // Support add of a watermark on drafts
+
+		$this->franchise=!$mysoc->tva_assuj;
+
+		// Get source company
+		$this->emetteur=$mysoc;
+		if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default, if was not defined
+
+		// Define position of columns
+		$this->posxdesc=$this->marge_gauche+1;
+		$this->posxtva=111;
+		$this->posxup=126;
+		$this->posxqty=145;
+		$this->posxdiscount=162;
+		$this->postotalht=174;
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$this->posxtva-=20;
+			$this->posxup-=20;
+			$this->posxqty-=20;
+			$this->posxdiscount-=20;
+			$this->postotalht-=20;
+		}
+
+		$this->tva=array();
+		$this->localtax1=array();
+		$this->localtax2=array();
+		$this->atleastoneratenotnull=0;
+		$this->atleastonediscount=0;
+	}
+
+	/**
+     *  Function to build pdf onto disk
+     *
+     *  @param		Object		$object				Object to generate
+     *  @param		Translate	$outputlangs		Lang output object
+     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+     *  @param		int			$hidedetails		Do not show line details
+     *  @param		int			$hidedesc			Do not show desc
+     *  @param		int			$hideref			Do not show ref
+     *  @param		object		$hookmanager		Hookmanager object
+     *  @return     int             			1=OK, 0=KO
+	 */
+	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	{
+		global $user,$langs,$conf,$mysoc,$db;
+
+		if (! is_object($outputlangs)) $outputlangs=$langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+		$outputlangs->load("main");
+		$outputlangs->load("dict");
+		$outputlangs->load("companies");
+		$outputlangs->load("bills");
+		$outputlangs->load("products");
+		$outputlangs->load("orders");
+
+		if ($conf->commande->dir_output)
+		{
+            $object->fetch_thirdparty();
+
+            $deja_regle = "";
+
+            // Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->commande->dir_output;
+				$file = $dir . "/SPECIMEN.pdf";
+			}
+			else
+			{
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->commande->dir_output . "/" . $objectref;
+				$file = $dir . "/" . $objectref . ".pdf";
+			}
+
+			if (! file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					return 0;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				$nblignes = count($object->lines);
+
+				// Create pdf instance
+				$pdf=pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$heightforinfotot = 50;	// Height reserved to output the info and total part
+		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+                $pdf->SetAutoPageBreak(1,0);
+
+                if (class_exists('TCPDF'))
+                {
+                    $pdf->setPrintHeader(false);
+                    $pdf->setPrintFooter(false);
+                }
+                $pdf->SetFont(pdf_getPDFFont($outputlangs));
+                // Set path to the background PDF File
+                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+                {
+                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                    $tplidx = $pdf->importPage(1);
+                }
+
+				$pdf->Open();
+				$pagenb=0;
+				$pdf->SetDrawColor(128,128,128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Order"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order"));
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+				// Positionne $this->atleastonediscount si on a au moins une remise
+				for ($i = 0 ; $i < $nblignes ; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
+					}
+				}
+
+				// New page
+				$pdf->AddPage();
+				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, '');		// Set interline to 3
+				$pdf->SetTextColor(0,0,0);
+
+
+				$tab_top = 90;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?42:10);
+				$tab_height = 130;
+				$tab_height_newpage = 150;
+
+				// Affiche notes
+				if (! empty($object->note_public))
+				{
+					$tab_top = 88;
+
+					$pdf->SetFont('','', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc-1, $tab_top, dol_htmlentitiesbr($object->note_public), 0, 1);
+					$nexY = $pdf->GetY();
+					$height_note=$nexY-$tab_top;
+
+					// Rect prend une longueur en 3eme param
+					$pdf->SetDrawColor(192,192,192);
+					$pdf->Rect($this->marge_gauche, $tab_top-1, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY+6;
+				}
+				else
+				{
+					$height_note=0;
+				}
+
+				$iniY = $tab_top + 7;
+				$curY = $tab_top + 7;
+				$nexY = $tab_top + 7;
+
+				// Loop on each lines
+				for ($i = 0 ; $i < $nblignes ; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+					$pdf->SetTextColor(0,0,0);
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
+					$pageposbefore=$pdf->getPage();
+
+					// Description of product line
+					$curX = $this->posxdesc-1;
+
+					$showpricebeforepagebreak=1;
+
+					$pdf->startTransaction();
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+					$pageposafter=$pdf->getPage();
+					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					{
+						$pdf->rollbackTransaction(true);
+						$pageposafter=$pageposbefore;
+						//print $pageposafter.'-'.$pageposbefore;exit;
+						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+						$posyafter=$pdf->GetY();
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
+						{
+							if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+							{
+								$pdf->AddPage('','',true);
+								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+								$pdf->setPage($pagenb+1);
+							}
+						}
+						else
+						{
+							// We found a page break
+							$showpricebeforepagebreak=0;
+						}
+					}
+					else	// No pagebreak
+					{
+						$pdf->commitTransaction();
+					}
+
+					$nexY = $pdf->GetY();
+					$pageposafter=$pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
+
+					// VAT Rate
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+					{
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->SetXY($this->posxtva, $curY);
+						$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
+					}
+
+					// Unit price before discount
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$pdf->SetXY($this->posxup, $curY);
+					$pdf->MultiCell($this->posxqty-$this->posxup-1, 3, $up_excl_tax, 0, 'R', 0);
+
+					// Quantity
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$pdf->SetXY($this->posxqty, $curY);
+					$pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 3, $qty, 0, 'R');	// Enough for 6 chars
+
+					// Discount on line
+					if ($object->lines[$i]->remise_percent)
+					{
+						$pdf->SetXY($this->posxdiscount-2, $curY);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
+					}
+
+					// Total HT line
+					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$pdf->SetXY($this->postotalht, $curY);
+					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$tvaligne=$object->lines[$i]->total_tva;
+
+					$localtax1ligne=$object->lines[$i]->total_localtax1;
+					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
+
+					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
+					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
+
+					$vatrate=(string) $object->lines[$i]->tva_tx;
+
+					// TODO : store local taxes types into object lines and remove this
+					$localtax1_array=getTypeOfLocalTaxFromRate($vatrate,1,$mysoc);
+					$localtax2_array=getTypeOfLocalTaxFromRate($vatrate,2,$mysoc);
+					if (empty($localtax1_type))
+						$localtax1_type = $localtax1_array[0];
+					if (empty($localtax2_type))
+						$localtax2_type = $localtax2_array[0];
+					//end TODO
+
+				    // retrieve global local tax
+					if ($localtax1_type == '7')
+						$localtax1_rate = $localtax1_array[1];
+					if ($localtax2_type == '7')
+						$localtax2_rate = $localtax2_array[1];
+
+					if ($localtax1ligne != 0 || $localtax1_type == '7')
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2ligne != 0 || $localtax2_type == '7')
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
+					$this->tva[$vatrate] += $tvaligne;
+
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
@@ -389,760 +407,841 @@ class pdf_einstein extends ModelePDFCommandes
 						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
 						$pdf->SetLineStyle(array('dash'=>0));
 					}
-
-					$nexY+=2;    // Passe espace entre les lignes
-
-					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
-						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						$pagenb++;
-						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
-					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
-						}
-						$this->_pagefoot($pdf,$object,$outputlangs,1);
-						// New page
-						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
-					}
-				}
-
-				// Show square
-				if ($pagenb == 1)
-				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-
-				// Affiche zone infos
-				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
-
-				// Affiche zone totaux
-				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
-
-				// Affiche zone versements
-				if ($deja_regle)
-				{
-					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
-				}
-
-				// Pied de page
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				$pdf->AliasNbPages();
-
-				$pdf->Close();
-
-				$pdf->Output($file,'F');
-
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","COMMANDE_OUTPUTDIR");
-			return 0;
-		}
-		$this->error=$langs->trans("ErrorUnknown");
-		return 0;   // Erreur par defaut
-	}
-
-	/**
-	 *  Show payments table
-     *
-	 *  @param	PDF			&$pdf     		Object PDF
-	 *  @param  Object		$object			Object order
-	 *	@param	int			$posy			Position y in PDF
-	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
-	 */
-	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
-	{
-
-	}
-
-
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		PDF			&$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
-	 */
-	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
-	{
-		global $conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$pdf->SetFont('','', $default_font_size - 1);
-
-        // If France, show VAT mention if not applicable
-		if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
-
-			$posy=$pdf->GetY()+4;
-		}
-
-		$posxval=52;
-
-		// Show payments conditions
-		if ($object->cond_reglement_code || $object->cond_reglement)
-		{
-			$pdf->SetFont('','B', $default_font_size - 2);
-			$pdf->SetXY($this->marge_gauche, $posy);
-			$titre = $outputlangs->transnoentities("PaymentConditions").':';
-			$pdf->MultiCell(80, 4, $titre, 0, 'L');
-
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posxval, $posy);
-			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
-			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
-			$pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
-
-			$posy=$pdf->GetY()+3;
-		}
-
-        // Check a payment mode is defined
-        /* Not used with orders
-		if (empty($object->mode_reglement_code)
-        	&& ! $conf->global->FACTURE_CHQ_NUMBER
-        	&& ! $conf->global->FACTURE_RIB_NUMBER)
-		{
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $pdf->SetTextColor(200,0,0);
-            $pdf->SetFont('','B', $default_font_size - 2);
-            $pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
-            $pdf->SetTextColor(0,0,0);
-
-            $posy=$pdf->GetY()+1;
-        }
-		*/
-
-      	// Show payment mode
-        if ($object->mode_reglement_code
-        	 && $object->mode_reglement_code != 'CHQ'
-           	 && $object->mode_reglement_code != 'VIR')
-           	 {
-	            $pdf->SetFont('','B', $default_font_size - 2);
-	            $pdf->SetXY($this->marge_gauche, $posy);
-	            $titre = $outputlangs->transnoentities("PaymentMode").':';
-	            $pdf->MultiCell(80, 5, $titre, 0, 'L');
-
-				$pdf->SetFont('','', $default_font_size - 2);
-	            $pdf->SetXY($posxval, $posy);
-	            $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-	            $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
-
-	            $posy=$pdf->GetY()+2;
-           	 }
-
-		// Show payment mode CHQ
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-        {
-        	// Si mode reglement non force ou si force a CHQ
-	        if (! empty($conf->global->FACTURE_CHQ_NUMBER))
-	        {
-	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-	            {
-	                $account = new Account($this->db);
-	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('','B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
-		            $posy=$pdf->GetY()+1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('','', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
-			            $posy=$pdf->GetY()+2;
-		            }
-	            }
-	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-	            {
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('','B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
-		            $posy=$pdf->GetY()+1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-			            $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('','', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-			            $posy=$pdf->GetY()+2;
-		            }
-	            }
-	        }
-		}
-
-        // If payment mode not forced or forced to VIR, show payment with BAN
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-        {
-	        if (! empty($conf->global->FACTURE_RIB_NUMBER))
-	        {
-                $account = new Account($this->db);
-                $account->fetch($conf->global->FACTURE_RIB_NUMBER);
-
-                $curx=$this->marge_gauche;
-                $cury=$posy;
-
-                $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
-
-                $posy+=2;
-	        }
-		}
-
-		return $posy;
-	}
-
-
-	/**
-	 *	Show total to pay
-	 *
-	 *	@param	PDF			&$pdf           Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
-	{
-	    global $conf,$mysoc;
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		$tab2_top = $posy;
-		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Tableau total
-        $col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x-=20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-
-		$useborder=0;
-		$index = 0;
-
-		// Total HT
-		$pdf->SetFillColor(255,255,255);
-		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
-
-		$pdf->SetXY($col2x, $tab2_top + 0);
-		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, 'R', 1);
-
-		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
-
-		$this->atleastoneratenotnull=0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
-			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
-			{
-				// Nothing to do
-			}
-			else
-			{
-				foreach($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey > 0)    // On affiche pas taux 0
-					{
-						$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl='';
-						if (preg_match('/\*/',$tvakey))
-						{
-							$tvakey=str_replace('*','',$tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
-						$totalvat.=vatrate($tvakey,1).$tvacompl;
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
-					}
-				}
-				if (! $this->atleastoneratenotnull) // If no vat at all
-				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
-
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
-
-					// Total LocalTax1
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on' && $object->total_localtax1>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1);
-					}
-
-					// Total LocalTax2
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on' && $object->total_localtax2>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
-					}
-				}
-				else
-				{
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-					{
-						//Local tax 1
-						foreach($this->localtax1 as $tvakey => $tvaval)
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat =$outputlangs->transnoentities("TotalLT1".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
-							}
-						}
-					}
-
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-					{
-						//Local tax 2
-						foreach($this->localtax2 as $tvakey => $tvaval)
-						{
-							if ($tvakey!=0)    // On affiche pas taux 0
-							{
-								//$this->atleastoneratenotnull++;
-
-								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-								$tvacompl='';
-								if (preg_match('/\*/',$tvakey))
-								{
-									$tvakey=str_replace('*','',$tvakey);
-									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-								}
-								$totalvat =$outputlangs->transnoentities("TotalLT2".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
-							}
-						}
-					}
-				}
-
-				// Total TTC
-				$index++;
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->SetTextColor(0,0,60);
-				$pdf->SetFillColor(224,224,224);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
-
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
-			}
-		}
-
-		$pdf->SetTextColor(0,0,0);
-
-        $creditnoteamount=0;
-        $depositsamount=0;
-		//$creditnoteamount=$object->getSumCreditNotesUsed();
-		//$depositsamount=$object->getSumDepositsUsed();
-		//print "x".$creditnoteamount."-".$depositsamount;exit;
-		$resteapayer = price2num($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (! empty($object->paye)) $resteapayer=0;
-
-		if ($deja_regle > 0)
-		{
-			// Already paid + Deposits
-			$index++;
-
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
-
-			$index++;
-			$pdf->SetTextColor(0,0,60);
-			$pdf->SetFillColor(224,224,224);
-			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
-
-			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
-
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetTextColor(0,0,0);
-		}
-
-		$index++;
-		return ($tab2_top + ($tab2_hl * $index));
-	}
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			&$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y (not used)
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
-	{
-		global $conf;
-
-		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
-
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','', $default_font_size - 2);
-
-		if (empty($hidetop))
-		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
-			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
-			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
-		}
-
-		$pdf->SetDrawColor(128,128,128);
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		// Output Rect
-		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
-
-		if (empty($hidetop))
-		{
-			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
-
-			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
-			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
-		}
-
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
-			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-				$pdf->SetXY($this->posxtva-3, $tab_top+1);
-				$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
-			}
-		}
-
-		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxup-1, $tab_top+1);
-			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
-		}
-
-		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->posxqty-1, $tab_top+1);
-			$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
-		}
-
-		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
-				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
-				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
-			}
-		}
-
-		if ($this->atleastonediscount)
-		{
-			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		}
-		if (empty($hidetop))
-		{
-			$pdf->SetXY($this->postotalht-1, $tab_top+1);
-			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
-		}
-	}
-
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			&$pdf     		Object PDF
-	 *  @param  Object		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @param	object		$hookmanager	Hookmanager object
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
-	{
-		global $conf,$langs;
-
-		$outputlangs->load("main");
-		$outputlangs->load("bills");
-		$outputlangs->load("propal");
-		$outputlangs->load("companies");
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
-
-		// Show Draft Watermark
-		if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
-		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
-		}
-
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
-
-		$posy=$this->marge_haute;
-		$posx=$this->page_largeur-$this->marge_droite-100;
-
-		$pdf->SetXY($this->marge_gauche,$posy);
-
-		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
-			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size -2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
-			}
-		}
-		else
-		{
-			$text=$this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
-		}
-
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$title=$outputlangs->transnoentities("Order");
-		$pdf->MultiCell(100, 3, $title, '', 'R');
-
-		$pdf->SetFont('','B',$default_font_size);
-
-		$posy+=5;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
-
-		$posy+=1;
-		$pdf->SetFont('','', $default_font_size - 1);
-
-		if ($object->ref_client)
-		{
-			$posy+=5;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetTextColor(0,0,60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-		}
-
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
-
-		$posy+=2;
-
-		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
-
-		if ($showaddress)
-		{
-			// Sender properties
-			$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
-
-			// Show sender
-			$posy=42;
-			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
-
-			// Show sender frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx,$posy-5);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFillColor(230,230,230);
-			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-			$pdf->SetTextColor(0,0,60);
-
-			// Show sender name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-
-			// Show sender information
-			$pdf->SetXY($posx+2,$posy+8);
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-
-
-
-			// If CUSTOMER contact defined on order, we use it
-			$usecontact=false;
-			$arrayidcontact=$object->getIdContact('external','CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
-			}
-
-			// Recipient name
-			if (! empty($usecontact))
-			{
-				// On peut utiliser le nom de la societe du contact
-				if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
-				else $socname = $object->client->nom;
-				$carac_client_name=$outputlangs->convToOutputCharset($socname);
-			}
-			else
-			{
-				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
-			}
-
-			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
-
-			// Show recipient
-			$widthrecbox=100;
-			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
-			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
-
-			// Show recipient frame
-			$pdf->SetTextColor(0,0,0);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->SetXY($posx+2,$posy-5);
-			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
-			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
-
-			// Show recipient name
-			$pdf->SetXY($posx+2,$posy+3);
-			$pdf->SetFont('','B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
-
-			// Show recipient information
-			$pdf->SetFont('','', $default_font_size - 1);
-			$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
-		}
-	}
-
-	/**
-	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			&$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	int								Return height of bottom margin including footer text
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		return pdf_pagefoot($pdf,$outputlangs,'COMMANDE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
-	}
-
-}
-
-?>
+
+					$nexY+=2;    // Passe espace entre les lignes
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter)
+					{
+						$pdf->setPage($pagenb);
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+					}
+					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
+					{
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						}
+						else
+						{
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf,$object,$outputlangs,1);
+						// New page
+						$pdf->AddPage();
+						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+					}
+				}
+
+				// Show square
+				if ($pagenb == 1)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				else
+				{
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
+				// Affiche zone infos
+				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Affiche zone totaux
+				$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				// Affiche zone versements
+				if ($deja_regle)
+				{
+					$posy=$this->_tableau_versements($pdf, $object, $posy, $outputlangs);
+				}
+
+				// Pied de page
+				$this->_pagefoot($pdf,$object,$outputlangs);
+				$pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file,'F');
+
+				// Add pdfgeneration hook
+				if (! is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager=new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+				if (! empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				return 1;   // Pas d'erreur
+			}
+			else
+			{
+				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$langs->trans("ErrorConstantNotDefined","COMMANDE_OUTPUTDIR");
+			return 0;
+		}
+		$this->error=$langs->trans("ErrorUnknown");
+		return 0;   // Erreur par defaut
+	}
+
+	/**
+	 *  Show payments table
+     *
+	 *  @param	PDF			&$pdf     		Object PDF
+	 *  @param  Object		$object			Object order
+	 *	@param	int			$posy			Position y in PDF
+	 *	@param	Translate	$outputlangs	Object langs for output
+	 *	@return int							<0 if KO, >0 if OK
+	 */
+	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	{
+
+	}
+
+
+	/**
+	 *   Show miscellaneous information (payment mode, payment term, ...)
+	 *
+	 *   @param		PDF			&$pdf     		Object PDF
+	 *   @param		Object		$object			Object to show
+	 *   @param		int			$posy			Y
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @return	void
+	 */
+	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	{
+		global $conf;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetFont('','', $default_font_size - 1);
+
+        // If France, show VAT mention if not applicable
+		if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
+		{
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+
+			$posy=$pdf->GetY()+4;
+		}
+
+		$posxval=52;
+
+		// Show payments conditions
+		if ($object->cond_reglement_code || $object->cond_reglement)
+		{
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentConditions").':';
+			$pdf->MultiCell(80, 4, $titre, 0, 'L');
+
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$lib_condition_paiement=$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code)!=('PaymentCondition'.$object->cond_reglement_code)?$outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code):$outputlangs->convToOutputCharset($object->cond_reglement_doc);
+			$lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement);
+			$pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L');
+
+			$posy=$pdf->GetY()+3;
+		}
+
+        // Check a payment mode is defined
+        /* Not used with orders
+		if (empty($object->mode_reglement_code)
+        	&& ! $conf->global->FACTURE_CHQ_NUMBER
+        	&& ! $conf->global->FACTURE_RIB_NUMBER)
+		{
+            $pdf->SetXY($this->marge_gauche, $posy);
+            $pdf->SetTextColor(200,0,0);
+            $pdf->SetFont('','B', $default_font_size - 2);
+            $pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
+            $pdf->SetTextColor(0,0,0);
+
+            $posy=$pdf->GetY()+1;
+        }
+		*/
+
+      	// Show payment mode
+        if ($object->mode_reglement_code
+        	 && $object->mode_reglement_code != 'CHQ'
+           	 && $object->mode_reglement_code != 'VIR')
+           	 {
+	            $pdf->SetFont('','B', $default_font_size - 2);
+	            $pdf->SetXY($this->marge_gauche, $posy);
+	            $titre = $outputlangs->transnoentities("PaymentMode").':';
+	            $pdf->MultiCell(80, 5, $titre, 0, 'L');
+
+				$pdf->SetFont('','', $default_font_size - 2);
+	            $pdf->SetXY($posxval, $posy);
+	            $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+	            $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
+
+	            $posy=$pdf->GetY()+2;
+           	 }
+
+		// Show payment mode CHQ
+        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+        {
+        	// Si mode reglement non force ou si force a CHQ
+	        if (! empty($conf->global->FACTURE_CHQ_NUMBER))
+	        {
+	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+	            {
+	                $account = new Account($this->db);
+	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+	                $pdf->SetXY($this->marge_gauche, $posy);
+	                $pdf->SetFont('','B', $default_font_size - 3);
+	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
+		            $posy=$pdf->GetY()+1;
+
+		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+		            {
+		                $pdf->SetXY($this->marge_gauche, $posy);
+		                $pdf->SetFont('','', $default_font_size - 3);
+		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->adresse_proprio), 0, 'L', 0);
+			            $posy=$pdf->GetY()+2;
+		            }
+	            }
+	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+	            {
+	                $pdf->SetXY($this->marge_gauche, $posy);
+	                $pdf->SetFont('','B', $default_font_size - 3);
+	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
+		            $posy=$pdf->GetY()+1;
+
+		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+		            {
+			            $pdf->SetXY($this->marge_gauche, $posy);
+		                $pdf->SetFont('','', $default_font_size - 3);
+		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+			            $posy=$pdf->GetY()+2;
+		            }
+	            }
+	        }
+		}
+
+        // If payment mode not forced or forced to VIR, show payment with BAN
+        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+        {
+	        if (! empty($conf->global->FACTURE_RIB_NUMBER))
+	        {
+                $account = new Account($this->db);
+                $account->fetch($conf->global->FACTURE_RIB_NUMBER);
+
+                $curx=$this->marge_gauche;
+                $cury=$posy;
+
+                $posy=pdf_bank($pdf,$outputlangs,$curx,$cury,$account,0,$default_font_size);
+
+                $posy+=2;
+	        }
+		}
+
+		return $posy;
+	}
+
+
+	/**
+	 *	Show total to pay
+	 *
+	 *	@param	PDF			&$pdf           Object PDF
+	 *	@param  Facture		$object         Object invoice
+	 *	@param  int			$deja_regle     Montant deja regle
+	 *	@param	int			$posy			Position depart
+	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@return int							Position pour suite
+	 */
+	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	{
+	    global $conf,$mysoc;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		// Tableau total
+        $col1x = 120; $col2x = 170;
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$col2x-=20;
+		}
+		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+
+		$useborder=0;
+		$index = 0;
+
+		// Total HT
+		$pdf->SetFillColor(255,255,255);
+		$pdf->SetXY($col1x, $tab2_top + 0);
+		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+
+		$pdf->SetXY($col2x, $tab2_top + 0);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ht + (! empty($object->remise)?$object->remise:0)), 0, 'R', 1);
+
+		// Show VAT by rates and total
+		$pdf->SetFillColor(248,248,248);
+
+		$this->atleastoneratenotnull=0;
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+		{
+			$tvaisnull=((! empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
+			if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_ISNULL) && $tvaisnull)
+			{
+				// Nothing to do
+			}
+			else
+			{
+				//Local tax 1 before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				{
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+							}
+						}
+					}
+	      }
+				//Local tax 2  before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+
+							}
+						}
+					}
+				}
+				// VAT
+				foreach($this->tva as $tvakey => $tvaval)
+				{
+					if ($tvakey > 0)    // On affiche pas taux 0
+					{
+						$this->atleastoneratenotnull++;
+
+						$index++;
+						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
+						$tvacompl='';
+						if (preg_match('/\*/',$tvakey))
+						{
+							$tvakey=str_replace('*','',$tvakey);
+							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+						}
+						$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
+						$totalvat.=vatrate($tvakey,1).$tvacompl;
+						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+					}
+				}
+
+				//Local tax 1 after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				{
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
+							}
+						}
+					}
+	      		}
+				//Local tax 2  after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
+							}
+						}
+					}
+				}
+
+				// Total TTC
+				$index++;
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+				$pdf->SetTextColor(0,0,60);
+				$pdf->SetFillColor(224,224,224);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
+			}
+		}
+
+		$pdf->SetTextColor(0,0,0);
+
+        $creditnoteamount=0;
+        $depositsamount=0;
+		//$creditnoteamount=$object->getSumCreditNotesUsed();
+		//$depositsamount=$object->getSumDepositsUsed();
+		//print "x".$creditnoteamount."-".$depositsamount;exit;
+		$resteapayer = price2num($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
+		if (! empty($object->paye)) $resteapayer=0;
+
+		if ($deja_regle > 0)
+		{
+			// Already paid + Deposits
+			$index++;
+
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle), 0, 'R', 0);
+
+			$index++;
+			$pdf->SetTextColor(0,0,60);
+			$pdf->SetFillColor(224,224,224);
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer), $useborder, 'R', 1);
+
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetTextColor(0,0,0);
+		}
+
+		$index++;
+		return ($tab2_top + ($tab2_hl * $index));
+	}
+
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		PDF			&$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @return	void
+	 */
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	{
+		global $conf;
+
+		// Force to disable hidetop and hidebottom
+		$hidebottom=0;
+		if ($hidetop) $hidetop=-1;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		// Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('','', $default_font_size - 2);
+
+		if (empty($hidetop))
+		{
+			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
+			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+		}
+
+		$pdf->SetDrawColor(128,128,128);
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		// Output Rect
+		$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+
+		if (empty($hidetop))
+		{
+			$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line prend une position y en 2eme param et 4eme param
+
+			$pdf->SetXY($this->posxdesc-1, $tab_top+1);
+			$pdf->MultiCell(108,2, $outputlangs->transnoentities("Designation"),'','L');
+		}
+
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+		{
+			$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxtva-3, $tab_top+1);
+				$pdf->MultiCell($this->posxup-$this->posxtva+3,2, $outputlangs->transnoentities("VAT"),'','C');
+			}
+		}
+
+		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxup-1, $tab_top+1);
+			$pdf->MultiCell($this->posxqty-$this->posxup-1,2, $outputlangs->transnoentities("PriceUHT"),'','C');
+		}
+
+		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxqty-1, $tab_top+1);
+			$pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C');
+		}
+
+		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			if ($this->atleastonediscount)
+			{
+				$pdf->SetXY($this->posxdiscount-1, $tab_top+1);
+				$pdf->MultiCell($this->postotalht-$this->posxdiscount+1,2, $outputlangs->transnoentities("ReductionShort"),'','C');
+			}
+		}
+
+		if ($this->atleastonediscount)
+		{
+			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		}
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->postotalht-1, $tab_top+1);
+			$pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHT"),'','C');
+		}
+	}
+
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	PDF			&$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	object		$hookmanager	Hookmanager object
+	 *  @return	void
+	 */
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
+	{
+		global $conf,$langs;
+
+		$outputlangs->load("main");
+		$outputlangs->load("bills");
+		$outputlangs->load("propal");
+		$outputlangs->load("companies");
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+
+		// Show Draft Watermark
+		if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+		{
+            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+		}
+
+		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('','B', $default_font_size + 3);
+
+		$posy=$this->marge_haute;
+		$posx=$this->page_largeur-$this->marge_droite-100;
+
+		$pdf->SetXY($this->marge_gauche,$posy);
+
+		// Logo
+		$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+		if ($this->emetteur->logo)
+		{
+			if (is_readable($logo))
+			{
+			    $height=pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			}
+			else
+			{
+				$pdf->SetTextColor(200,0,0);
+				$pdf->SetFont('','B', $default_font_size -2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+			}
+		}
+		else
+		{
+			$text=$this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		}
+
+		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$title=$outputlangs->transnoentities("Order");
+		$pdf->MultiCell(100, 3, $title, '', 'R');
+
+		$pdf->SetFont('','B',$default_font_size);
+
+		$posy+=5;
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+		$posy+=1;
+		$pdf->SetFont('','', $default_font_size - 1);
+
+		if ($object->ref_client)
+		{
+			$posy+=5;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+		}
+
+		$posy+=4;
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
+
+		$posy+=2;
+
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
+
+		if ($showaddress)
+		{
+			// Sender properties
+			$carac_emetteur = pdf_build_address($outputlangs,$this->emetteur);
+
+			// Show sender
+			$posy=42;
+			$posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$hautcadre=40;
+
+			// Show sender frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx,$posy-5);
+			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetFillColor(230,230,230);
+			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0,0,60);
+
+			// Show sender name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetFont('','B', $default_font_size);
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+
+			// Show sender information
+			$pdf->SetXY($posx+2,$posy+8);
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+
+
+			// If CUSTOMER contact defined on order, we use it
+			$usecontact=false;
+			$arrayidcontact=$object->getIdContact('external','CUSTOMER');
+			if (count($arrayidcontact) > 0)
+			{
+				$usecontact=true;
+				$result=$object->fetch_contact($arrayidcontact[0]);
+			}
+
+			// Recipient name
+			if (! empty($usecontact))
+			{
+				// On peut utiliser le nom de la societe du contact
+				if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
+				else $socname = $object->client->nom;
+				$carac_client_name=$outputlangs->convToOutputCharset($socname);
+			}
+			else
+			{
+				$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+			}
+
+			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
+
+			// Show recipient
+			$widthrecbox=100;
+			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
+			$posy=42;
+			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
+
+			// Show recipient frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx+2,$posy-5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
+			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+			// Show recipient name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetFont('','B', $default_font_size);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+
+			// Show recipient information
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+		}
+	}
+
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+     *
+	 *   	@param	PDF			&$pdf     			PDF
+	 * 		@param	Object		$object				Object to show
+	 *      @param	Translate	$outputlangs		Object lang for output
+	 *      @param	int			$hidefreetext		1=Hide free text
+	 *      @return	int								Return height of bottom margin including footer text
+	 */
+	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	{
+		return pdf_pagefoot($pdf,$outputlangs,'COMMANDE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,0,$hidefreetext);
+	}
+
+}
+
+?>
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 33827261db1..c7d603f0622 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012	Regis Houssin		<regis@dolibarr.fr>
  * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2012	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -138,7 +139,7 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
-		global $user,$langs,$conf;
+		global $user,$langs,$conf,$mysoc,$db;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -365,22 +366,40 @@ class pdf_crabe extends ModelePDFFactures
 					$tvaligne=$object->lines[$i]->total_tva;
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
 
 					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
-					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
-					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
+					
+					// TODO : store local taxes types into object lines and remove this
+					$localtax1_array=getTypeOfLocalTaxFromRate($vatrate,1,$mysoc);
+					$localtax2_array=getTypeOfLocalTaxFromRate($vatrate,2,$mysoc);
+					if (empty($localtax1_type))
+						$localtax1_type = $localtax1_array[0];
+					if (empty($localtax2_type))
+						$localtax2_type = $localtax2_array[0];
+					//end TODO
+
+				    // retrieve global local tax
+					if ($localtax1_type == '7')
+						$localtax1_rate = $localtax1_array[1];
+					if ($localtax2_type == '7')
+						$localtax2_rate = $localtax2_array[1];
+
+					if ($localtax1ligne != 0 || $localtax1_type == '7')
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2ligne != 0 || $localtax2_type == '7')
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
 					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
-					if (! isset($this->localtax1[$localtax1rate])) 	$this->localtax1[$localtax1rate]='';
-					if (! isset($this->localtax2[$localtax2rate])) 	$this->localtax2[$localtax2rate]='';
 					$this->tva[$vatrate] += $tvaligne;
-					$this->localtax1[$localtax1rate]+=$localtax1ligne;
-					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -822,6 +841,84 @@ class pdf_crabe extends ModelePDFFactures
 			}
 			else
 			{
+				//Local tax 1 before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				{
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+							}
+						}
+					}
+	      }
+				//Local tax 2  before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+
+							}
+						}
+					}
+				}
+				// VAT
 				foreach($this->tva as $tvakey => $tvaval)
 				{
 					if ($tvakey > 0)    // On affiche pas taux 0
@@ -830,6 +927,7 @@ class pdf_crabe extends ModelePDFFactures
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+
 						$tvacompl='';
 						if (preg_match('/\*/',$tvakey))
 						{
@@ -839,52 +937,31 @@ class pdf_crabe extends ModelePDFFactures
 						$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
 						$totalvat.=vatrate($tvakey,1).$tvacompl;
 						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
 						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
 					}
 				}
 
-				if (! $this->atleastoneratenotnull)	// If no vat at all
+				//Local tax 1 after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_tva), 0, 'R', 1);
-
-					// Total LocalTax1
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on' && $object->total_localtax1>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_localtax1), $useborder, 'R', 1);
-					}
-
-					// Total LocalTax2
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on' && $object->total_localtax2>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_localtax2), $useborder, 'R', 1);
-					}
-				}
-				else
-				{
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-					{
-						//Local tax 1
-						foreach($this->localtax1 as $tvakey => $tvaval)
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey>0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
 								if (preg_match('/\*/',$tvakey))
@@ -892,27 +969,44 @@ class pdf_crabe extends ModelePDFFactures
 									$tvakey=str_replace('*','',$tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat =$outputlangs->transnoentities("TotalLT1".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
 							}
 						}
 					}
-
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-					{
-						//Local tax 2
-						foreach($this->localtax2 as $tvakey => $tvaval)
+	      		}
+				//Local tax 2  after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+						    // retrieve global local tax
+							if ($tvakey>0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
 								if (preg_match('/\*/',$tvakey))
@@ -920,12 +1014,21 @@ class pdf_crabe extends ModelePDFFactures
 									$tvakey=str_replace('*','',$tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat =$outputlangs->transnoentities("TotalLT2".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
 
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
 							}
 						}
 					}
@@ -936,11 +1039,10 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0,0,60);
 				$pdf->SetFillColor(224,224,224);
-				$text=$outputlangs->transnoentities("TotalTTC");
-				if ($object->type == 2) $text=$outputlangs->transnoentities("TotalTTCToYourCredit");
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $text, $useborder, 'L', 1);
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
 			}
 		}
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 8535e1e7500..93a415bd7c1 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2008      Raphael Bertrand     <raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2012 Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -136,7 +137,7 @@ class pdf_azur extends ModelePDFPropales
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
-		global $user,$langs,$conf;
+		global $user,$langs,$conf,$mysoc,$db;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -362,22 +363,39 @@ class pdf_azur extends ModelePDFPropales
 					$tvaligne=$object->lines[$i]->total_tva;
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
 					$localtax2ligne=$object->lines[$i]->total_localtax2;
+					$localtax1_rate=$object->lines[$i]->localtax1_tx;
+					$localtax2_rate=$object->lines[$i]->localtax2_tx;
+					$localtax1_type=$object->lines[$i]->localtax1_type;
+					$localtax2_type=$object->lines[$i]->localtax2_type;
 
 					if ($object->remise_percent) $tvaligne-=($tvaligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax1ligne-=($localtax1ligne*$object->remise_percent)/100;
 					if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
 
 					$vatrate=(string) $object->lines[$i]->tva_tx;
-					$localtax1rate=(string) $object->lines[$i]->localtax1_tx;
-					$localtax2rate=(string) $object->lines[$i]->localtax2_tx;
+					// TODO : store local taxes types into object lines and remove this
+					$localtax1_array=getTypeOfLocalTaxFromRate($vatrate,1,$mysoc);
+					$localtax2_array=getTypeOfLocalTaxFromRate($vatrate,2,$mysoc);
+					if (empty($localtax1_type))
+						$localtax1_type = $localtax1_array[0];
+					if (empty($localtax2_type))
+						$localtax2_type = $localtax2_array[0];
+					//end TODO
+
+				    // retrieve global local tax
+					if ($localtax1_type == '7')
+						$localtax1_rate = $localtax1_array[1];
+					if ($localtax2_type == '7')
+						$localtax2_rate = $localtax2_array[1];
+
+					if ($localtax1ligne != 0 || $localtax1_type == '7')
+						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
+					if ($localtax2ligne != 0 || $localtax2_type == '7')
+						$this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne;
 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
 					if (! isset($this->tva[$vatrate]))				$this->tva[$vatrate]='';
-					if (! isset($this->localtax1[$localtax1rate]))	$this->localtax1[$localtax1rate]='';
-					if (! isset($this->localtax2[$localtax2rate]))	$this->localtax2[$localtax2rate]='';
 					$this->tva[$vatrate] += $tvaligne;
-					$this->localtax1[$localtax1rate]+=$localtax1ligne;
-					$this->localtax2[$localtax2rate]+=$localtax2ligne;
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -735,6 +753,84 @@ class pdf_azur extends ModelePDFPropales
 			}
 			else
 			{
+				//Local tax 1 before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				{
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+							}
+						}
+					}
+	      }
+				//Local tax 2  before VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '1':
+							case '3':
+							case '5':
+							case '7':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
+						{
+							if ($tvakey>0)    // On affiche pas taux 0
+							{
+								//$this->atleastoneratenotnull++;
+
+
+
+								$index++;
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
+
+								$tvacompl='';
+								if (preg_match('/\*/',$tvakey))
+								{
+									$tvakey=str_replace('*','',$tvakey);
+									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
+								}
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+
+								$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+
+							}
+						}
+					}
+				}
+				// VAT
 				foreach($this->tva as $tvakey => $tvaval)
 				{
 					if ($tvakey > 0)    // On affiche pas taux 0
@@ -759,48 +855,25 @@ class pdf_azur extends ModelePDFPropales
 					}
 				}
 
-				if (! $this->atleastoneratenotnull) // If no vat at all
+				//Local tax 1 after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				{
-					$index++;
-					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalVAT"), 0, 'L', 1);
-
-					$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-					$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
-
-					// Total LocalTax1
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on' && $object->total_localtax1>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT1".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax1), $useborder, 'R', 1);
-					}
-
-					// Total LocalTax2
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on' && $object->total_localtax2>0)
-					{
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalLT2".$mysoc->country_code), $useborder, 'L', 1);
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
-					}
-				}
-				else
-				{
-					if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
-					{
-						//Local tax 1
-						foreach($this->localtax1 as $tvakey => $tvaval)
+					foreach( $this->localtax1 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey>0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
 								if (preg_match('/\*/',$tvakey))
@@ -808,27 +881,43 @@ class pdf_azur extends ModelePDFPropales
 									$tvakey=str_replace('*','',$tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transnoentities("TotalLT1".$mysoc->pays_code).' ';
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
 							}
 						}
 					}
-
-					if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
-					{
-						//Local tax 2
-						foreach($this->localtax2 as $tvakey => $tvaval)
+	      		}
+				//Local tax 2  after VAT
+				if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				{
+					foreach( $this->localtax2 as $localtax_type => $localtax_rate ) {
+						switch ($localtax_type) {
+							case '2':
+							case '4':
+							case '6':
+								continue 2;
+								break;
+						}
+						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-							if ($tvakey!=0)    // On affiche pas taux 0
+							if ($tvakey>0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
 
 								$index++;
-								$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+								$pdf->SetXY ($col1x, $tab2_top + $tab2_hl * $index);
 
 								$tvacompl='';
 								if (preg_match('/\*/',$tvakey))
@@ -836,13 +925,21 @@ class pdf_azur extends ModelePDFPropales
 									$tvakey=str_replace('*','',$tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat =$outputlangs->transnoentities("TotalLT2".$mysoc->country_code).' ';
-								$totalvat.=vatrate($tvakey,1).$tvacompl;
-								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
 
-								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-								$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								if ($localtax_type == '7') {  // amount on order
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvakey), 0, 'R', 1);
+								}
+								else
+								{
+									$totalvat.=vatrate($tvakey,1).$tvacompl;
+									$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
+									$pdf->SetXY ($col2x, $tab2_top + $tab2_hl * $index);
+									$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
+								}
 							}
 						}
 					}
diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php
index 601f463682d..6897a523b56 100644
--- a/htdocs/core/tpl/predefinedproductline_create.tpl.php
+++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin		<regis@dolibarr.fr>
- * Copyright (C) 2010-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -42,15 +42,14 @@
 	<td align="right"><?php echo $langs->trans('ReductionShort'); ?></td>
 <?php
 $colspan = 4;
-if (! empty($conf->margin->enabled)) {
+if (! empty($conf->margin->enabled)) 
+{
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+	if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
 ?>
 	<td align="right"><?php echo $langs->trans('BuyingPrice'); ?></td>
-<?php
-  if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    $colspan++;
-  if (! empty($conf->global->DISPLAY_MARK_RATES))
-    $colspan++;
-}
+<?php 
+} 
 ?>
 	<td colspan="<?php echo $colspan; ?>">&nbsp;</td>
 </tr>
@@ -63,7 +62,7 @@ if (! empty($conf->margin->enabled)) {
 <script type="text/javascript">
 jQuery(document).ready(function() {
 	jQuery('#idprod').change(function() {
-		  jQuery('#np_desc').focus();
+		  if (jQuery('#idprod').val() > 0) jQuery('#np_desc').focus();
 	});
 });
 </script>
@@ -97,17 +96,16 @@ jQuery(document).ready(function() {
 	<td align="right" nowrap><input type="text" size="1" name="remise_percent" value="<?php echo $buyer->remise_client; ?>">%</td>
 <?php
 $colspan = 4;
-if (! empty($conf->margin->enabled)) {
+if (! empty($conf->margin->enabled)) 
+{
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+	if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
 ?>
 	<td align="right">
 		<select id="fournprice" name="fournprice" style="display: none;"></select>
 		<input type="text" size="5" id="buying_price" name="buying_price" value="<?php echo (isset($_POST["buying_price"])?$_POST["buying_price"]:''); ?>">
 	</td>
 <?php
-  if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-    $colspan++;
-  if (! empty($conf->global->DISPLAY_MARK_RATES))
-    $colspan++;
 }
 ?>
 	<td align="center" valign="middle" colspan="<?php echo $colspan; ?>">
@@ -115,18 +113,17 @@ if (! empty($conf->margin->enabled)) {
 	</td>
 </tr>
 
-<?php if (! empty($conf->service->enabled) && $dateSelector) {
-if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-	$colspan = 10;
-else
-	$colspan = 9;
-if (! empty($conf->margin->enabled)) {
-	$colspan++; // For the buying price
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		$colspan++;
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		$colspan++;
-}
+<?php 
+if (! empty($conf->service->enabled) && $dateSelector) 
+{
+	if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
+	else $colspan = 9;
+	if (! empty($conf->margin->enabled))
+	{
+		$colspan++; // For the buying price
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+		if (! empty($conf->global->DISPLAY_MARK_RATES))   $colspan++;
+	}
 ?>
 <tr <?php echo $bcnd[$var]; ?>>
 	<td colspan="<?php echo $colspan; ?>">
@@ -138,11 +135,15 @@ if (! empty($conf->margin->enabled)) {
 	?>
 	</td>
 </tr>
-<?php } ?>
+<?php
+} 
+?>
 
 </form>
+
 <?php
-if (! empty($conf->margin->enabled)) {
+if (! empty($conf->margin->enabled)) 
+{
 ?>
 <script type="text/javascript">
 $("#idprod").change(function() {
@@ -177,5 +178,7 @@ $("#idprod").change(function() {
   'json');
 });
 </script>
-<?php } ?>
+<?php
+} 
+?>
 <!-- END PHP TEMPLATE predefinedproductline_create.tpl.php -->
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 62eec4ebaaf..ba260ea4f19 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -207,6 +207,7 @@ define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
 // Path to root libraries
 if (! defined('ADODB_PATH'))           { define('ADODB_PATH',           (!isset($dolibarr_lib_ADODB_PATH))?DOL_DOCUMENT_ROOT.'/includes/adodbtime/':(empty($dolibarr_lib_ADODB_PATH)?'':$dolibarr_lib_ADODB_PATH.'/')); }
 if (! defined('TCPDF_PATH'))           { define('TCPDF_PATH',           (!isset($dolibarr_lib_TCPDF_PATH))?DOL_DOCUMENT_ROOT.'/includes/tcpdf/':(empty($dolibarr_lib_TCPDF_PATH)?'':$dolibarr_lib_TCPDF_PATH.'/')); }
+if (! defined('FPDF_PATH'))            { define('FPDF_PATH',            (!isset($dolibarr_lib_FPDF_PATH))?DOL_DOCUMENT_ROOT.'/includes/fpdf/':(empty($dolibarr_lib_FPDF_PATH)?'':$dolibarr_lib_FPDF_PATH.'/')); }	// Used only for package that can't include tcpdf
 if (! defined('FPDI_PATH'))            { define('FPDI_PATH',            (!isset($dolibarr_lib_FPDI_PATH))?DOL_DOCUMENT_ROOT.'/includes/fpdfi/':(empty($dolibarr_lib_FPDI_PATH)?'':$dolibarr_lib_FPDI_PATH.'/')); }
 if (! defined('NUSOAP_PATH'))          { define('NUSOAP_PATH',          (!isset($dolibarr_lib_NUSOAP_PATH))?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/':(empty($dolibarr_lib_NUSOAP_PATH)?'':$dolibarr_lib_NUSOAP_PATH.'/')); }
 if (! defined('PHPEXCEL_PATH'))        { define('PHPEXCEL_PATH',        (!isset($dolibarr_lib_PHPEXCEL_PATH))?DOL_DOCUMENT_ROOT.'/includes/phpexcel/':(empty($dolibarr_lib_PHPEXCEL_PATH)?'':$dolibarr_lib_PHPEXCEL_PATH.'/')); }
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index c57d9e12bfc..e9e11a5d557 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1461,12 +1461,22 @@ if ($id > 0 || ! empty($ref))
             print '<td colspan="4">&nbsp;</td>';
             print '</tr>';
 
+            // TODO Use the predefinedproductline_create.tpl.php file
+            
             // Add free products/services form
             print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#add" method="post">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden"	name="action" value="addline">';
             print '<input type="hidden"	name="id" value="'.$object->id.'">';
 
+            print '<script type="text/javascript">
+            	jQuery(document).ready(function() {
+            		jQuery(\'#idprodfournprice\').change(function() {
+            			if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
+            		});
+            	});
+            </script>';
+                        
             $var=true;
             print '<tr '.$bc[$var].'>';
             print '<td>';
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 4e3d60848f6..648df36f946 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -466,10 +466,19 @@ elseif ($action == 'addline')
     }
     $ret=$object->fetch_thirdparty();
 
-    if ($_POST['idprodfournprice'])	// > 0 or -1
+    if (GETPOST('search_idprodfournprice') || GETPOST('idprodfournprice'))	// With combolist idprodfournprice is > 0 or -1, with autocomplete, idprodfournprice is > 0 or ''
     {
-        $product=new Product($db);
-        $idprod=$product->get_buyprice($_POST['idprodfournprice'], $_POST['qty']);    // Just to see if a price exists for the quantity. Not used to found vat
+    	$idprod=0;
+    	$product=new Product($db);
+
+    	if (GETPOST('idprodfournprice') == '')
+		{
+			$idprod=-1;
+		}
+    	if (GETPOST('idprodfournprice') > 0)
+        {
+    	    $idprod=$product->get_buyprice(GETPOST('idprodfournprice'), $_POST['qty']);    // Just to see if a price exists for the quantity. Not used to found vat
+        }
 
         if ($idprod > 0)
         {
@@ -1805,10 +1814,20 @@ else
                 print '<td colspan="4">&nbsp;</td>';
                 print '</tr>';
 
+                // TODO Use the predefinedproductline_create.tpl.php file
                 print '<form name="addline_predef" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addline" method="post">';
                 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                 print '<input type="hidden" name="socid" value="'. $object->socid .'">';
                 print '<input type="hidden" name="facid" value="'.$object->id.'">';
+                
+                print '<script type="text/javascript">
+                		jQuery(document).ready(function() {
+                			jQuery(\'#idprodfournprice\').change(function() {
+                				if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
+                			});
+                		});
+                </script>';
+                           
                 $var=! $var;
                 print '<tr '.$bc[$var].'>';
                 print '<td colspan="4">';
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 56fe19f37eb..c566735c3e3 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -874,6 +874,15 @@ function write_conf_file($conffile)
 
         // Write params to overwrites default lib path
         fputs($fp,"\n");
+        if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH=''; }
+        fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
+        fputs($fp,"\n");
+        if (empty($force_dolibarr_lib_FPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH=''; }
+        fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
+        fputs($fp,"\n");
+        if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH=''; }
+        fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
+        fputs($fp,"\n");
         if (empty($force_dolibarr_lib_ADODB_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_ADODB_PATH=''; }
         fputs($fp, '$dolibarr_lib_ADODB_PATH=\''.$force_dolibarr_lib_ADODB_PATH.'\';');
         fputs($fp,"\n");
@@ -883,9 +892,6 @@ function write_conf_file($conffile)
         if (empty($force_dolibarr_lib_NUSOAP_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH=''; }
         fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
         fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_FPDI_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH=''; }
-        fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
-        fputs($fp,"\n");
         if (empty($force_dolibarr_lib_PHPEXCEL_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_PHPEXCEL_PATH=''; }
         fputs($fp, '$dolibarr_lib_PHPEXCEL_PATH=\''.$force_dolibarr_lib_PHPEXCEL_PATH.'\';');
         fputs($fp,"\n");
@@ -895,9 +901,6 @@ function write_conf_file($conffile)
         if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) { fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP=''; }
         fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
         fputs($fp,"\n");
-        if (empty($force_dolibarr_lib_TCPDF_PATH)) { fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH=''; }
-        fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
-        fputs($fp,"\n");
         if (empty($force_dolibarr_js_CKEDITOR)) { fputs($fp, '//'); $force_dolibarr_js_CKEDITOR=''; }
         fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
         fputs($fp,"\n");
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index 014093ee5ba..607b57c0d26 100755
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -857,3 +857,13 @@ INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active)
 
 -- increase field size
 ALTER TABLE llx_bank_account MODIFY COLUMN code_banque varchar(8);
+
+create table llx_user_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp,
+  fk_object        integer NOT NULL,    -- member id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;
+
+ALTER TABLE llx_user_extrafields ADD INDEX idx_user_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.key.sql b/htdocs/install/mysql/tables/llx_user_extrafields.key.sql
new file mode 100644
index 00000000000..a4af69a614a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_user_extrafields.key.sql
@@ -0,0 +1,23 @@
+-- ===================================================================
+-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
+-- Copyright (C) 2011      Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_user_extrafields ADD INDEX idx_user_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.sql b/htdocs/install/mysql/tables/llx_user_extrafields.sql
new file mode 100644
index 00000000000..96b4ec69601
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_user_extrafields.sql
@@ -0,0 +1,27 @@
+-- ===================================================================
+-- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_user_extrafields
+(
+  rowid            integer AUTO_INCREMENT PRIMARY KEY,
+  tms              timestamp,
+  fk_object        integer NOT NULL,    -- member id
+  import_key       varchar(14)      	-- import key
+)ENGINE=innodb;
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 5929a7d55d3..c4ac7827029 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -14,7 +14,6 @@ Supplier=المورد
 AddSupplier=إضافة مورد
 SupplierRemoved=إزالة المورد
 SuppliersInvoice=فاتورة الموردين
-SuppliersInvoices=فواتير الموردين
 NewSupplier=مورد جديد
 History=التاريخ
 ListOfSuppliers=قائمة الموردين
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index 283ada1c1c5..e279ad69213 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=Снабдител
 AddSupplier=Добави доставчик
 SupplierRemoved=Изтрити доставчик
 SuppliersInvoice=Фактура
-SuppliersInvoices=Фактури
 NewSupplier=Нов доставчик
 History=Исторически
 ListOfSuppliers=Списък на доставчиците
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 06873ef9f89..c5dce9389a6 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -949,6 +949,7 @@ DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .O
 WatermarkOnDraft=Marca d'aigua en els documents esborrany
 CompanyIdProfChecker=Id Professional únic
 MustBeUnique=Ha de ser únic?
+MustBeMandatory=Ha de ser obligatori?
 Miscellanous=Miscel·lània
 ##### Webcal setup #####
 WebCalSetup=Configuració d'enllaç amb el calendari webcalendar
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index f6ce99e3c04..d8d87882d13 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -47,7 +47,7 @@ InvoiceCustomer=Factura a client
 CustomerInvoice=Factura a client
 CustomersInvoices=Factures a clientes
 SupplierInvoice=Factura de proveïdor
-SuppliersInvoices=Factures de proveïdors
+SuppliersInvoices=Factures proveïdors
 SupplierBill=Factura de proveïdor
 SupplierBills=Factures de proveïdors
 Payment=Pagament
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index caa0cfe0174..63ae033cd98 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -108,42 +108,49 @@ ProfId2AR=Ingressos bruts
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
+ProfId6AR=-
 ProfId1AU=ABN
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
+ProfId6AU=-
 ProfId1BE=N° col·legiat
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
 ProfId5BE=-
-ProfId1BR=CNPJ
+ProfId6BE=-
+ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
 ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
-#ProfId5BR=CNAE=
-#ProfId6BR=INSS=
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
 ProfId3CH=Número federat
 ProfId4CH=Num registre de comerç
 ProfId5CH=-
+ProfId6CH=-
 ProfId1CL=R.U.T.
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
+ProfId6CL=-
 ProfId1CO=R.U.T.
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
+ProfId6CO=-
 ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
+ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Núm seguretat social
 ProfId3ES=CNAE
@@ -161,51 +168,61 @@ ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
+ProfId6GB=-
 ProfId1HN=RTN
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
+ProfId6HN=-
 ProfId1IN=Id prof. 1 (TIN)
-ProfId2IN=Id prof. 2
-ProfId3IN=Id prof. 3
+ProfId2IN=Id prof. 2 (PAN)
+ProfId3IN=Id prof. 3 (SRVC TAX)
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
+ProfId6IN=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
 ProfId5MA=-
+ProfId6MA=-
 ProfId1MX=R.F.C.
 ProfId2MX=Registre Patronal IMSS
 ProfId3MX=Cèdula Professional
 ProfId4MX=-
 ProfId5MX=-
+ProfId6MX=-
 ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
 ProfId5NL=-
+ProfId6NL=-
 ProfId1PT=NIPC
 ProfId2PT=Núm seguretat social
 ProfId3PT=Num reg. comercial
 ProfId4PT=Conservatori
 ProfId5PT=-
+ProfId6PT=-
 ProfId1RU=OGRN
 ProfId2RU=INN
 ProfId3RU=KPP
 ProfId4RU=OKPO
 ProfId5RU=-
+ProfId6RU=-
 ProfId1SN=RC
 ProfId2SN=NINEA
 ProfId3SN=- 
 ProfId4SN=- 
 ProfId5SN=- 
+ProfId6SN=-
 ProfId1TN=RC
 ProfId2TN=Matrícula fiscal
 ProfId3TN=Codi en aduana
 ProfId4TN=CCC
 ProfId5TN=-
+ProfId6TN=-
 VATIntra=NIF intracomunitari
 VATIntraShort=NIF intra.
 VATIntraVeryShort=NIF intra.
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index fd43de81c10..ec04e3ff9ce 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -21,6 +21,7 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Aquest contacte ja està definit com
 ErrorCashAccountAcceptsOnlyCashMoney=Aquesta compte bancari és de tipus caixa i només accepta el mètode de pagament de tipus <b>espècie</b>.
 ErrorFromToAccountsMustDiffers=El compte origen i destinació han de ser diferents.
 ErrorBadThirdPartyName=Nom de tercer incorrecte
+ErrorProdIdIsMandatory=El %s es obligatori
 ErrorBadCustomerCodeSyntax=La sintaxi del codi client és incorrecta
 ErrorCustomerCodeRequired=Codi client obligatori
 ErrorCustomerCodeAlreadyUsed=Codi de client ja utilitzat
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index f502a3274bf..62bb253a587 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -46,4 +46,8 @@ MargeNette=Marge net
 MARGIN_TYPE_DETAILS=Marge brut: Preu de venda sense IVA - Preu de compra sense IVA <br/> Marge net: Preu de venda sense IVA - Costos
 
 BuyingCost=Costos
-UnitCharges=Càrrega unitària
\ No newline at end of file
+UnitCharges=Càrrega unitària
+Charges=Càrreges
+
+AgentContactType=Tipus de contacte comissionat
+AgentContactTypeDetails=Indica el tipus de contacte enllaçat a les factures que seran associats als agents comercials
\ No newline at end of file
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index f1c0fbb0616..71d8d426d2c 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -146,6 +146,8 @@ ProductSpecial=Especial
 QtyMin=Quantitat mínima
 PriceQty=Preu per la quantitat
 PriceQtyMin=Preu quantitat min.
+DiscountQtyMin=Descompte per defecte quantitat min.
+VATRateForSupplierProduct=Taxa IVA (per aquest producte/proveïdor) 
 NoPriceDefinedForThisSupplier=Cap preu/quant. definit per a aquest proveïdor/producte
 NoSupplierPriceDefinedForThisProduct=Cap preu/quant. proveïdor definit per a aquest producte
 RecordedProducts=Productes en venda
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index be740e4eab1..065d0404862 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Proveïdor
 AddSupplier=Afegir proveïdor
 SupplierRemoved=Proveïdor eliminat
 SuppliersInvoice=Factura proveïdor
-SuppliersInvoices=Factures proveïdors
 NewSupplier=Nou proveïdor
 History=Històric
 ListOfSuppliers=Llistat de proveïdors
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index cc435074e79..5b06a4bfdba 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -16,7 +16,6 @@ Supplier=Leverandør
 AddSupplier=Tilføj en leverandør
 SupplierRemoved=Leverandør fjernet
 SuppliersInvoice=Leverandører faktura
-SuppliersInvoices=Leverandører fakturaer
 NewSupplier=Ny leverandør
 History=Historie
 ListOfSuppliers=Liste over leverandører
diff --git a/htdocs/langs/de_AT/suppliers.lang b/htdocs/langs/de_AT/suppliers.lang
index 6a960705d76..5d17837ec06 100644
--- a/htdocs/langs/de_AT/suppliers.lang
+++ b/htdocs/langs/de_AT/suppliers.lang
@@ -12,7 +12,6 @@ Supplier=Lieferant
 AddSupplier=Lieferanten hinzufügen
 SupplierRemoved=Lieferant entfernt
 SuppliersInvoice=Lieferantenrechnung
-SuppliersInvoices=Lieferantenrechnungen
 NewSupplier=Neuer Lieferant
 History=Verlauf
 ListOfSuppliers=Lieferantenliste
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 945bea65fcd..e44f7ed7ccb 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -12,7 +12,6 @@ Supplier=Lieferant
 AddSupplier=Lieferanten hinzufügen
 SupplierRemoved=Lieferant entfernt
 SuppliersInvoice=Lieferantenrechnung
-SuppliersInvoices=Lieferantenrechnungen
 NewSupplier=Neuer Lieferant
 History=Verlauf
 ListOfSuppliers=Lieferantenliste
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 5a42434f340..9db72404188 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Προμηθευτής
 AddSupplier=Προσθήκη προμηθευτή
 SupplierRemoved=Ο προμηθευτής αφαιρέθηκε
 SuppliersInvoice=Τιμολόγιο προμηθευτή
-SuppliersInvoices=Τιμολόγια προμηθευτών
 NewSupplier=Νέος προμηθευτής
 History=Ιστορικό
 ListOfSuppliers=Λίστα προμηθευτών
diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang
new file mode 100644
index 00000000000..5ae5fd3a44e
--- /dev/null
+++ b/htdocs/langs/en_SA/main.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - en_WW - main
+CHARSET=UTF-8
+DIRECTION=ltr
+FONTFORPDF=DejaVuSans
+FONTSIZEFORPDF=9
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
\ No newline at end of file
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6a50d4b087a..b07c69d7259 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -939,6 +939,7 @@ DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT files for
 WatermarkOnDraft=Watermark on draft document
 CompanyIdProfChecker=Professional Id unique
 MustBeUnique=Must be unique ?
+MustBeMandatory=Must be mandatory ?
 Miscellanous=Miscellaneous
 ##### Webcal setup #####
 WebCalSetup=Webcalendar link setup
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 6195a5147b9..01cbb6950d4 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -49,9 +49,9 @@ Invoices=Invoices
 InvoiceLine=Invoice line
 InvoiceCustomer=Customer invoice
 CustomerInvoice=Customer invoice
-CustomersInvoices=Customer's invoices
+CustomersInvoices=Customers invoices
 SupplierInvoice=Supplier invoice
-SuppliersInvoices=Supplier's invoices
+SuppliersInvoices=Suppliers invoices
 SupplierBill=Supplier invoice
 SupplierBills=suppliers invoices
 Payment=Payment
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 19a36f64c22..f2f537453e7 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -25,6 +25,7 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
 ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
 ErrorBadThirdPartyName=Bad value for third party name
+ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad syntax for customer code
 ErrorCustomerCodeRequired=Customer code required
 ErrorCustomerCodeAlreadyUsed=Customer code already used
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index e2f8cd0a510..8f79cd99fe0 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -14,6 +14,7 @@ Language_en_AU=English (Australia)
 Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
+Language_en_SA=English (Saudi Arabia)
 Language_en_US=English (United States)
 Language_es_ES=Spanish
 Language_es_AR=Spanish (Argentina)
diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index 41203847ba5..10a8112f87e 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -47,6 +47,7 @@ MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : S
 
 BuyingCost=Cost price
 UnitCharges=Unit charges
+Charges=Charges
 
 AgentContactType=Contact type used for commissioning
 AgentContactTypeDetails=Défine what contact type (linked on invoices) will be associated with commercial agents
\ No newline at end of file
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index fd5a35d3f53..8f05c209b95 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Supplier
 AddSupplier=Add a supplier
 SupplierRemoved=Supplier removed
 SuppliersInvoice=Suppliers invoice
-SuppliersInvoices=Suppliers invoices
 NewSupplier=New supplier
 History=History
 ListOfSuppliers=List of suppliers
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index d5a9df404a9..3a43d9c67b3 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -952,6 +952,7 @@ DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT Ope
 WatermarkOnDraft=Marca de agua en los documentos borrador
 CompanyIdProfChecker=Id Profesional único
 MustBeUnique=¿Debe ser único?
+MustBeMandatory=¿Debe ser obligatorio?
 Miscellanous=Miscelánea
 ##### Webcal setup #####
 WebCalSetup=Configuración de enlace con el calendario Webcalendar
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 63a33d062b0..42e5f4c60ba 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -47,7 +47,7 @@ InvoiceCustomer=Factura a cliente
 CustomerInvoice=Factura a cliente
 CustomersInvoices=Facturas a clientes
 SupplierInvoice=Factura de proveedor
-SuppliersInvoices=Facturas de proveedores
+SuppliersInvoices=Facturas proveedores
 SupplierBill=Factura de proveedor
 SupplierBills=Facturas de proveedores
 Payment=Pago
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 9313df97434..511921a014b 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -109,17 +109,20 @@ ProfId2AR=Ingresos brutos
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
+ProfId6AR=-
 ProfId1AU=ABN
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
+ProfId6AU=-
 ProfId1BE=N° colegiado
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
 ProfId5BE=-
-ProfId1BR=CNPJ
+ProfId6BE=-
+ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
 ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
@@ -130,21 +133,25 @@ ProfId2CH=-
 ProfId3CH=Número federado
 ProfId4CH=Num registro de comercio
 ProfId5CH=-
+ProfId6CH=-
 ProfId1CL=R.U.T.
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
+ProfId6CL=-
 ProfId1CO=R.U.T.
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
+ProfId6CO=-
 ProfId1DE=Id prof. 1 (USt.-IdNr)
 ProfId2DE=Id prof. 2 (USt.-Nr)
 ProfId3DE=Id prof. 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
+ProfId6DE=-
 ProfId1ES=CIF/NIF
 ProfId2ES=Núm seguridad social
 ProfId3ES=CNAE
@@ -162,51 +169,61 @@ ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
+ProfId6GB=-
 ProfId1HN=RTN
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
+ProfId6HN=-
 ProfId1IN=Id prof. 1 (TIN)
 ProfId2IN=Id prof. 2
 ProfId3IN=Id prof. 3
 ProfId4IN=Id prof. 4
 ProfId5IN=Id prof. 5
+ProfId6IN=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id prof. 5
+ProfId5MA=-
+ProfId6MA=-
 ProfId1MX=R.F.C.
 ProfId2MX=Registro Patronal IMSS
 ProfId3MX=Cédula Profesional
 ProfId4MX=-
 ProfId5MX=-
+ProfId6MX=-
 ProfId1NL=Número KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=-
 ProfId5NL=-
+ProfId6NL=-
 ProfId1PT=NIPC
 ProfId2PT=Núm. seguridad social
 ProfId3PT=Num reg. comercial
 ProfId4PT=Conservatorio
 ProfId5PT=-
+ProfId6PT=-
 ProfId1RU=OGRN
 ProfId2RU=INN
 ProfId3RU=KPP
 ProfId4RU=OKPO
 ProfId5RU=-
+ProfId6RU=-
 ProfId1SN=RC
 ProfId2SN=NINEA
 ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
+ProfId6SN=-
 ProfId1TN=RC
 ProfId2TN=Matrícula fiscal
 ProfId3TN=Código en aduana
 ProfId4TN=CCC
 ProfId5TN=-
+ProfId6TN=-
 VATIntra=NIF intracomunitario
 VATIntraShort=NIF intra.
 VATIntraVeryShort=NIF intra.
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 580627e6cab..d723910a5bd 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -21,6 +21,7 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto ya está definido como
 ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es de tipo caja y solo acepta el método de pago de tipo <b>especie</b>.
 ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes.
 ErrorBadThirdPartyName=Nombre de tercero incorrecto
+ErrorProdIdIsMandatory=El %s es obligatorio
 ErrorBadCustomerCodeSyntax=La sintaxis del código cliente es incorrecta
 ErrorCustomerCodeRequired=Código cliente obligatorio
 ErrorCustomerCodeAlreadyUsed=Código de cliente ya utilizado
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 5ff7b74b7d4..0dc08481c46 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -46,4 +46,8 @@ MargeNette=Margen neto
 MARGIN_TYPE_DETAILS=Margen bruto : Precio de venta sin IVA - Precio de compra sin IVA<br/>Margen neto : Precio de venta sin IVA - Costos
 
 BuyingCost=Costos
-UnitCharges=Carga unitaria
\ No newline at end of file
+UnitCharges=Carga unitaria
+Charges=Cargas
+
+AgentContactType=Tipo de contacto comisionado
+AgentContactTypeDetails=Indica el tipo de contacto enlazado a las facturas que serán asociados a los agentes comerciales
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 97d4586bae6..a3c2bf41eb7 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -146,6 +146,8 @@ ProductSpecial=Especial
 QtyMin=Cantidad mínima
 PriceQty=Precio para la cantidad
 PriceQtyMin=Precio cantidad mín.
+DiscountQtyMin=Descuento por defecto cantidad mín.
+VATRateForSupplierProduct=Tasa IVA (para este producto/proveedor) 
 NoPriceDefinedForThisSupplier=Ningún precio/cant. definido para este proveedor/producto
 NoSupplierPriceDefinedForThisProduct=Ningún precio/cant. proveedor definida para este producto
 RecordedProducts=Productos en venta
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index a03eccb719f..e500aea17bb 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Proveedor
 AddSupplier=Añadir proveedor
 SupplierRemoved=Proveedor eliminado
 SuppliersInvoice=Factura proveedor
-SuppliersInvoices=Facturas proveedores
 NewSupplier=Nuevo proveedor
 History=Histórico
 ListOfSuppliers=Listado de proveedores
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 57f6ab11194..c9487dad634 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=Tarnija
 AddSupplier=Lisa tarnija
 SupplierRemoved=Tarnija välja
 SuppliersInvoice=Tarnijate arve
-SuppliersInvoices=Tarnijate arvete
 NewSupplier=New tarnija
 History=Ajalugu
 ListOfSuppliers=Tarnijate
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 327d6ecc56e..d24ea173e77 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -14,7 +14,6 @@ Supplier=المورد
 AddSupplier=إضافة مورد
 SupplierRemoved=إزالة المورد
 SuppliersInvoice=فاتورة الموردين
-SuppliersInvoices=فواتير الموردين
 NewSupplier=مورد جديد
 History=التاريخ
 ListOfSuppliers=قائمة الموردين
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index 8d8d8e5fb0d..43e75c7d246 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -14,7 +14,6 @@ Supplier=Toimittaja
 AddSupplier=Lisää toimittaja
 SupplierRemoved=Toimittaja poistettu
 SuppliersInvoice=Tavarantoimittajat lasku
-SuppliersInvoices=Tavarantoimittajat laskut
 NewSupplier=Uuden toimittajan
 History=Historia
 ListOfSuppliers=Luettelo toimittajat
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6afab6c47ab..000a58860f9 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -946,6 +946,7 @@ DocumentModelOdt=Genération depuis des modèles OpenDocument (Fichier .ODT Open
 WatermarkOnDraft=Filigrane sur les documents brouillons
 CompanyIdProfChecker=Id professionel unique 
 MustBeUnique=Doit être unique ?
+MustBeMandatory=Doit être obligatoire?
 Miscellanous=Divers
 ##### Webcal setup #####
 WebCalSetup= Configuration du lien vers le calendrier Webcalendar
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 866773ee131..30786b6e542 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -47,7 +47,6 @@ InvoiceCustomer=Facture client
 CustomerInvoice=Facture client
 CustomersInvoices=Factures clients
 SupplierInvoice=Facture fournisseur
-SuppliersInvoices=Factures fournisseurs
 SupplierBill=Facture fournisseur
 SupplierBills=Factures fournisseurs
 Payment=Règlement
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 87715bea1fe..b6fcbb6611b 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -26,6 +26,7 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ce contact est déjà défini comme c
 ErrorCashAccountAcceptsOnlyCashMoney=Ce compte bancaire est de type caisse et n'accepte que les mode de règlement de type <b>espèce</b>.
 ErrorFromToAccountsMustDiffers=Le compte source et destination doivent être différents.
 ErrorBadThirdPartyName=Nom de tiers incorrect
+ErrorProdIdIsMandatory=Le %s est obligatoire
 ErrorBadCustomerCodeSyntax=La syntaxe du code client est incorrecte
 ErrorCustomerCodeRequired=Code client obligatoire
 ErrorCustomerCodeAlreadyUsed=Code client déjà utilisé
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 09231867347..40efc72e533 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -14,6 +14,7 @@ Language_en_AU=Anglais (Australie)
 Language_en_GB=Anglais (Royaume-Uni)
 Language_en_IN=Anglais (Inde)
 Language_en_NZ=Anglais (Nouvelle Zeland)
+Language_en_SA=Anglais (Arabie Saoudite)
 Language_en_US=Anglais (Etats-Unis)
 Language_es_ES=Espagnol
 Language_es_AR=Espagnol (Argentine)
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index 02dfedbbe9a..3c81a9a1e4d 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -47,6 +47,7 @@ MARGIN_TYPE_DETAILS=Marge brute : Prix de vente HT - Prix d'achat HT<br/>Marge n
 
 BuyingCost=Coût de revient
 UnitCharges=Charge unitaire
+Charges=Charges
 
 AgentContactType=Type de contact commissionné
 AgentContactTypeDetails=Permet de définir le type de contact associé aux factures qui sera associé aux agents commerciaux
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index c042b74ea89..932615ff181 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Fournisseur
 AddSupplier=Ajouter un fournisseur
 SupplierRemoved=Fournisseur supprimé
 SuppliersInvoice=Facture fournisseur
-SuppliersInvoices=Factures fournisseurs
 NewSupplier=Nouveau fournisseur
 History=Historique
 ListOfSuppliers=Liste des fournisseurs
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 0949262da42..3706da71c41 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=ספק
 AddSupplier=הוסף הספק
 SupplierRemoved=הספק הוסר
 SuppliersInvoice=ספקים חשבונית
-SuppliersInvoices=חשבוניות ספקים
 NewSupplier=חדש הספק
 History=היסטוריה
 ListOfSuppliers=רשימת הספקים
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 9a0c2643fc7..89bdd570292 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Beszállító
 AddSupplier=Beszállító hozzáadása
 SupplierRemoved=Beszállító eltávolítva
 SuppliersInvoice=Beszállító számla
-SuppliersInvoices=Beszállítók számlái
 NewSupplier=Új beszállító
 History=Történet
 ListOfSuppliers=Beszállító listája
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 625ded3432e..a33597212b3 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=Birgir
 AddSupplier=Bæta við birgja
 SupplierRemoved=Birgir fjarri
 SuppliersInvoice=Birgjar Reikningar
-SuppliersInvoices=Birgjar reikningum
 NewSupplier=New birgir
 History=Saga
 ListOfSuppliers=Listi yfir birgja
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 7f21a0f73c3..8771326292b 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -39,4 +39,3 @@ SupplierRemoved					=Fornitore rimosso
 SuppliersArea					=Area fornitori
 Suppliers					=Fornitori
 SuppliersInvoice				=Fattura Fornitore
-SuppliersInvoices				=Fatture fornitori
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 3cb36fb8a85..70416c864a9 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=サプライヤー
 AddSupplier=サプライヤーを追加します。
 SupplierRemoved=サプライヤーは、削除
 SuppliersInvoice=仕入先の請求書
-SuppliersInvoices=仕入先の請求書
 NewSupplier=新しいサプライヤー
 History=歴史
 ListOfSuppliers=サプライヤーのリスト
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 120b83656a5..9ee3898c986 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Leverandør
 AddSupplier=Legg til en leverandør
 SupplierRemoved=Leverandør slettet
 SuppliersInvoice=Leverandørfaktura
-SuppliersInvoices=Leverandørfakturaer
 NewSupplier=Ny leverandør
 History=Historikk
 ListOfSuppliers=Leverandøroversikt
diff --git a/htdocs/langs/nl_BE/suppliers.lang b/htdocs/langs/nl_BE/suppliers.lang
index 2c3a226584f..5326e9b7fe5 100644
--- a/htdocs/langs/nl_BE/suppliers.lang
+++ b/htdocs/langs/nl_BE/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Leverancier
 AddSupplier=Voeg een leverancier toe
 SupplierRemoved=Leverancier verwijderd
 SuppliersInvoice=Leveranciers factuur
-SuppliersInvoices=Leveranciers facturen
 NewSupplier=Nieuwe leverancier
 History=Geschiedenis
 ListOfSuppliers=Lijst van de leveranciers
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index 6d43ab7831b..1d8f1a032d8 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -5,7 +5,6 @@ Supplier = Leverancier
 AddSupplier = Voeg een leverancier toe
 SupplierRemoved = Leverancier verwijderd
 SuppliersInvoice = Leveranciersfactuur
-SuppliersInvoices = Leveranciersfacturen
 NewSupplier = Nieuwe leverancier
 History = Geschiedenis
 ListOfSuppliers = Leverancierslijst
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index 88c424f5ab0..ce47c187730 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -16,7 +16,6 @@ Supplier=Dostawca
 AddSupplier=Dodaj dostawcy
 SupplierRemoved=Dostawca usunięte
 SuppliersInvoice=Dostawcy faktury
-SuppliersInvoices=Dostawcy faktur
 NewSupplier=Nowy dostawca
 History=Historia
 ListOfSuppliers=Lista dostawców
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index acc5ad3d5e6..537a39c03f8 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Fornecedor
 AddSupplier=Adicionar Fornecedor
 SupplierRemoved=Fornecedor Eliminado
 SuppliersInvoice=Faturas do Fornecedor
-SuppliersInvoices=Faturas de Fornecedores
 NewSupplier=Novo Fornecedor
 History=Histórico
 ListOfSuppliers=Lista de Fornecedores
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index faab981a749..85dfde74227 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -5,7 +5,6 @@ Supplier=Fornecedor
 AddSupplier=Adicionar Fornecedor
 SupplierRemoved=Fornecedor Eliminado
 SuppliersInvoice=Facturas do Fornecedor
-SuppliersInvoices=Facturas de Fornecedores
 NewSupplier=Novo Fornecedor
 History=Histórico
 ListOfSuppliers=Lista de Fornecedores
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 9603ceaeb1d..e1a10dc72be 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -14,7 +14,6 @@ Supplier=Furnizor
 AddSupplier=Adauga un furnizor
 SupplierRemoved=Furnizor eliminat
 SuppliersInvoice=Furnizori de factură
-SuppliersInvoices=Furnizori facturi
 NewSupplier=New furnizor
 History=Istorie
 ListOfSuppliers=Lista de furnizori
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index 252c838ad1e..c118f0af1a9 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -14,7 +14,6 @@ Supplier=Поставщик
 AddSupplier=Добавить поставщиком
 SupplierRemoved=Поставщик удален
 SuppliersInvoice=Поставщики счета
-SuppliersInvoices=Поставщики счета
 NewSupplier=Новый поставщик
 History=История
 ListOfSuppliers=Список поставщиков
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index 42e73cd433e..4df1bc83641 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -5,7 +5,6 @@ Supplier = Dobavitelj
 AddSupplier = Dodaj dobavitelja
 SupplierRemoved = Dobavitelj odstranjen
 SuppliersInvoice = Računi dobavitelja
-SuppliersInvoices = Računi dobaviteljev
 NewSupplier = Nov dobavitelj
 History = Zgodovina
 ListOfSuppliers = Seznam dobaviteljev
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 159fff54da5..3d99a40f5fe 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=Leverantör
 AddSupplier=Lägg till en leverantör
 SupplierRemoved=Leverantör bort
 SuppliersInvoice=Leverantörer faktura
-SuppliersInvoices=Leverantörer fakturor
 NewSupplier=Ny leverantör
 History=Historia
 ListOfSuppliers=Lista över leverantörer
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index f9543986615..fb3f2aa2945 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -12,7 +12,6 @@ Supplier=Tedarikçi
 AddSupplier=Bir tedarikçi ekle
 SupplierRemoved=Tedarikçi kaldırıldı
 SuppliersInvoice=Tedarikçi faturası
-SuppliersInvoices=Tedarikçi faturaları
 NewSupplier=Yeni tedarikçi
 History=Geçmiş
 ListOfSuppliers=Tedarikçiler listesi
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index be4673ed4e4..49769de806b 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=供应商
 AddSupplier=新增供应商
 SupplierRemoved=供应商删除
 SuppliersInvoice=供应商发票
-SuppliersInvoices=供应商发票
 NewSupplier=新供应商
 History=历史
 ListOfSuppliers=供应商名单
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 8a3e4b5ee2f..24bb921b63c 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -13,7 +13,6 @@ Supplier=供應商
 AddSupplier=新增供應商
 SupplierRemoved=供應商刪除
 SuppliersInvoice=供應商的發票
-SuppliersInvoices=供應商的發票
 NewSupplier=新供應商
 History=歷史
 ListOfSuppliers=供應商名單
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index ce68665cb69..443b0bc4be4 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -1380,7 +1380,7 @@ print "\n</div><br>\n";
  * All the "Add to" areas
  */
 
-if ($id && ($action == '' || $action == 'view') && $object->status)
+if ($object->id && ($action == '' || $action == 'view') && $object->status)
 {
     print '<table width="100%" class="noborder">';
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 4f631358c9f..380fb625b21 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
- * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 $langs->load("products");
 $langs->load("suppliers");
 $langs->load("bills");
+// Charges ????
+if (! empty($conf->margin->enabled)) $langs->load("margins");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index b34bfb472ec..c7990224d69 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -165,8 +165,7 @@ if ($id > 0 || ! empty($ref))
                     print "<td align=\"center\">";
                     print dol_print_date($db->jdate($objp->datef))."</td>";
                     print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
-                    $fac=new Facture($db);
-                    print '<td align="right">'.$fac->LibStatut($objp->paye,$objp->statut,5).'</td>';
+                    print '<td align="right">'.$supplierinvoicestatic->LibStatut($objp->paye,$objp->statut,5).'</td>';
                     print "</tr>\n";
                     $i++;
                 }
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index bfff310636f..32ad23eafbe 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -195,6 +195,23 @@ if ($action == 'setprofid')
 	}
 }
 
+//Activate ProfId
+if ($action == 'setprofidmandatory')
+{
+	$status = GETPOST('status','alpha');
+
+	$idprof="SOCIETE_IDPROF".$value."_MANDATORY";
+	if (dolibarr_set_const($db, $idprof,$status,'chaine',0,'',$conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
 
 /*
  * 	View
@@ -522,6 +539,7 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td align="center">'.$langs->trans("MustBeUnique").'</td>';
+print '<td align="center">'.$langs->trans("MustBeMandatory").'</td>';
 print "</tr>\n";
 
 $profid[0][0]=$langs->trans("ProfId1");
@@ -532,6 +550,10 @@ $profid[2][0]=$langs->trans("ProfId3");
 $profid[2][1]=$langs->transcountry('ProfId3', $mysoc->country_code);
 $profid[3][0]=$langs->trans("ProfId4");
 $profid[3][1]=$langs->transcountry('ProfId4', $mysoc->country_code);
+$profid[4][0]=$langs->trans("ProfId5");
+$profid[4][1]=$langs->transcountry('ProfId5', $mysoc->country_code);
+$profid[5][0]=$langs->trans("ProfId6");
+$profid[5][1]=$langs->transcountry('ProfId6', $mysoc->country_code);
 
 $var = true;
 $i=0;
@@ -539,42 +561,47 @@ $i=0;
 $nbofloop=count($profid);
 while ($i < $nbofloop)
 {
-	$var = !$var;
-
-	print '<tr '.$bc[$var].'>';
-	print '<td>'.$profid[$i][0]."</td><td>\n";
-	print $profid[$i][1];
-	print '</td>';
-
-	switch($i)
+	if ($profid[$i][1]!='-')
 	{
-        case 0:
-        	$verif=(empty($conf->global->SOCIETE_IDPROF1_UNIQUE)?false:true);
-        	break;
-        case 1:
-        	$verif=(empty($conf->global->SOCIETE_IDPROF2_UNIQUE)?false:true);
-        	break;
-        case 2:
-        	$verif=(empty($conf->global->SOCIETE_IDPROF3_UNIQUE)?false:true);
-        	break;
-        case 3:
-        	$verif=(empty($conf->global->SOCIETE_IDPROF4_UNIQUE)?false:true);
-        	break;
+		$var = !$var;
+	
+		print '<tr '.$bc[$var].'>';
+		print '<td>'.$profid[$i][0]."</td><td>\n";
+		print $profid[$i][1];
+		print '</td>';
+	
+		$idprof_unique ='SOCIETE_IDPROF'.($i+1).'_UNIQUE';
+		$idprof_mandatory ='SOCIETE_IDPROF'.($i+1).'_MANDATORY';
+		$verif=(empty($conf->global->$idprof_unique)?false:true);
+		$mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
+	
+		if ($verif)
+		{
+			print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.($i+1).'&status=0">';
+			print img_picto($langs->trans("Activated"),'switch_on');
+			print '</a></td>';
+		}
+		else
+		{
+			print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.($i+1).'&status=1">';
+			print img_picto($langs->trans("Disabled"),'switch_off');
+			print '</a></td>';
+		}
+		
+		if ($mandatory)
+		{
+			print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.($i+1).'&status=0">';
+			print img_picto($langs->trans("Activated"),'switch_on');
+			print '</a></td>';
+		}
+		else
+		{
+			print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.($i+1).'&status=1">';
+			print img_picto($langs->trans("Disabled"),'switch_off');
+			print '</a></td>';
+		}
+		print "</tr>\n";
 	}
-
-	if ($verif)
-	{
-		print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.($i+1).'&status=0">';
-		print img_picto($langs->trans("Activated"),'switch_on');
-		print '</a></td>';
-	}
-	else
-	{
-		print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.($i+1).'&status=1">';
-		print img_picto($langs->trans("Disabled"),'switch_off');
-		print '</a></td>';
-	}
-	print "</tr>\n";
 	$i++;
 }
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 378cae1f8b0..9e12a508db5 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2569,6 +2569,43 @@ class Societe extends CommonObject
         $this->idprof5='idprof5';
         $this->idprof6='idprof6';
     }
+    
+    /**
+     *  Check if localtax define for company
+     *  Used to build previews or test instances.
+     *	id must be 0 if object instance is a specimen.
+     *
+     *  @param	localTaxNum	$localTaxNum        1 or 2
+     *  @return boolean             			true / false
+     */
+    function hasLocalTax($localTaxNum) {
+        global $user,$langs,$conf;
+        
+        // check parameter
+        if ($localTaxNum != 1 && $localTaxNum != 2)
+            return false;
+        
+		// Search local taxes
+		$sql  = "SELECT t.localtax1, t.localtax2";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p";
+		$sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$this->country_code."'";
+		$sql .= " AND t.active = 1";
+        if ($localTaxNum == 1)
+            $sql .= " AND t.localtax1 <> 0";
+        elseif ($localTaxNum == 2)
+            $sql .= " AND t.localtax2 <> 0";
+
+		dol_syslog("get_localtax sql=".$sql);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+   			return ($this->db->num_rows($resql) > 0);
+   			
+		}
+		else
+		    return false;
+
+	}
 
 }
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index a916a7377c3..26c453607ec 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2008	   Patrick Raguin       <patrick.raguin@auguria.net>
- * Copyright (C) 2010-2011 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -202,9 +202,18 @@ if (empty($reshook))
                 $error++; $errors[] = $langs->trans("ErrorSupplierModuleNotEnabled");
                 $action = ($action=='add'?'create':'edit');
             }
+            
+            // We set country_id, country_code and country for the selected country
+            $object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
+            if ($object->country_id)
+            {
+            	$tmparray=getCountry($object->country_id,'all');
+            	$object->country_code=$tmparray['code'];
+            	$object->country=$tmparray['label'];
+            }
 
-            // Check for duplicate prof id
-        	for ($i = 1; $i < 3; $i++)
+            // Check for duplicate or mandatory prof id
+        	for ($i = 1; $i < 5; $i++)
         	{
         	    $slabel="idprof".$i;
     			$_POST[$slabel]=trim($_POST[$slabel]);
@@ -218,8 +227,18 @@ if (empty($reshook))
                 		$action = ($action=='add'?'create':'edit');
 					}
 				}
+				
+				$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+				if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+				{
+					$langs->load("errors");
+					$error++;
+					$errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $object->country_code));
+					$action = ($action=='add'?'create':'edit');
+				}
 			}
         }
+          
         if (! $error)
         {
             if ($action == 'add')
@@ -293,7 +312,7 @@ if (empty($reshook))
                     // Gestion du logo de la société
                 }
                 else
-                {
+				{
                     $error=$object->error; $errors=$object->errors;
                 }
 
@@ -834,7 +853,13 @@ else
             if ($idprof!='-')
             {
                 if (($j % 2) == 0) print '<tr>';
-                print '<td>'.$idprof.'</td><td>';
+                
+                $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+               	if(empty($conf->global->$idprof_mandatory))
+                	print '<td>'.$idprof.'</td><td>';
+                else
+                print '<td><span class="fieldrequired">'.$idprof.'</td><td>';
+                
                 $key='idprof'.$i;
                 print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
                 print '</td>';
@@ -907,30 +932,26 @@ else
         print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
         // Local Taxes
-        // TODO add specific function by country
-        if($mysoc->country_code=='ES')
+        if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
         {
-            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-            {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                print $form->selectyesno('localtax1assuj_value',0,1);
-                print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-                print $form->selectyesno('localtax2assuj_value',0,1);
-                print '</td></tr>';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+            print $form->selectyesno('localtax1assuj_value',0,1);
+            print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+            print $form->selectyesno('localtax2assuj_value',0,1);
+            print '</td></tr>';
 
-            }
-            elseif($mysoc->localtax1_assuj=="1")
-            {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-                print $form->selectyesno('localtax1assuj_value',0,1);
-                print '</td><tr>';
-            }
-            elseif($mysoc->localtax2_assuj=="1")
-            {
-                print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-                print $form->selectyesno('localtax2assuj_value',0,1);
-                print '</td><tr>';
-            }
+        }
+        elseif($mysoc->localtax1_assuj=="1")
+        {
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+            print $form->selectyesno('localtax1assuj_value',0,1);
+            print '</td><tr>';
+        }
+        elseif($mysoc->localtax2_assuj=="1")
+        {
+            print '<tr><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+            print $form->selectyesno('localtax2assuj_value',0,1);
+            print '</td><tr>';
         }
 
         if (! empty($conf->global->MAIN_MULTILANGS))
@@ -1121,7 +1142,7 @@ else
             print '<table class="border" width="100%">';
 
             // Name
-            print '<tr><td><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="'.$object->name.'"></td></tr>';
+            print '<tr><td><span class="fieldrequired">'.$langs->trans('ThirdPartyName').'</span></td><td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="'.dol_escape_htmltag($object->name).'"></td></tr>';
 
             // Prefix
             if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -1130,12 +1151,12 @@ else
                 // It does not change the prefix mode using the auto numbering prefix
                 if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
                 {
-                    print '<input type="hidden" name="prefix_comm" value="'.$object->prefix_comm.'">';
+                    print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                     print $object->prefix_comm;
                 }
                 else
                 {
-                    print '<input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'">';
+                    print '<input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
                 print '</td>';
             }
@@ -1275,7 +1296,13 @@ else
                 if ($idprof!='-')
                 {
                     if (($j % 2) == 0) print '<tr>';
-                    print '<td>'.$idprof.'</td><td>';
+                    
+					$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+					if(empty($conf->global->$idprof_mandatory))
+						print '<td>'.$idprof.'</td><td>';
+					else
+						print '<td><span class="fieldrequired">'.$idprof.'</td><td>';
+                    
                     $key='idprof'.$i;
                     print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
                     print '</td>';
@@ -1322,31 +1349,27 @@ else
             print '</tr>';
 
             // Local Taxes
-            // TODO add specific function by country
-            if($mysoc->country_code=='ES')
+            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
             {
-                if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-                {
-                    print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                    print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                    print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-                    print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
-                    print '</td></tr>';
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+                print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
+                print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+                print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
+                print '</td></tr>';
 
-                }
-                elseif($mysoc->localtax1_assuj=="1")
-                {
-                    print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-                    print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                    print '</td></tr>';
+            }
+            elseif($mysoc->localtax1_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+                print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
+                print '</td></tr>';
 
-                }
-                elseif($mysoc->localtax2_assuj=="1")
-                {
-                    print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-                    print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
-                    print '</td></tr>';
-                }
+            }
+            elseif($mysoc->localtax2_assuj=="1")
+            {
+                print '<tr><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+                print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
+                print '</td></tr>';
             }
 
             // Type - Size
@@ -1642,30 +1665,26 @@ else
         print '</tr>';
 
         // Local Taxes
-        // TODO add specific function by country
-        if($mysoc->country_code=='ES')
+        if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
         {
-            if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
-            {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
-                print yn($object->localtax1_assuj);
-                print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
-                print yn($object->localtax2_assuj);
-                print '</td></tr>';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+            print yn($object->localtax1_assuj);
+            print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+            print yn($object->localtax2_assuj);
+            print '</td></tr>';
 
-            }
-            elseif($mysoc->localtax1_assuj=="1")
-            {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
-                print yn($object->localtax1_assuj);
-                print '</td><tr>';
-            }
-            elseif($mysoc->localtax2_assuj=="1")
-            {
-                print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
-                print yn($object->localtax2_assuj);
-                print '</td><tr>';
-            }
+        }
+        elseif($mysoc->localtax1_assuj=="1")
+        {
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+            print yn($object->localtax1_assuj);
+            print '</td><tr>';
+        }
+        elseif($mysoc->localtax2_assuj=="1")
+        {
+            print '<tr><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+            print yn($object->localtax2_assuj);
+            print '</td><tr>';
         }
 
         // Type + Staff
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
new file mode 100644
index 00000000000..dbe4ace030b
--- /dev/null
+++ b/htdocs/user/admin/user_extrafields.php
@@ -0,0 +1,157 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis@dolibarr.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/adherents/admin/adherent_extrafields.php
+ *		\ingroup    member
+ *		\brief      Page to setup extra fields of members
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+$langs->load("users");
+$langs->load("admin");
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=getStaticMember(get_class($extrafields),'type2label');
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='user';
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject=$langs->transnoentitiesnoconv("Users");
+
+$help_url='EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
+llxHeader('',$langs->trans("UsersSetup"),$help_url);
+
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print_fiche_titre($langs->trans("UsersSetup"),$linkback,'setup');
+
+
+$head = user_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes', $langs->trans("User"), 0, 'user');
+
+
+print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print '<br>';
+
+dol_htmloutput_errors($mesg);
+
+// Load attribute_label
+$extrafields->fetch_name_optionals_label($elementtype);
+
+print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
+
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("AttributeCode").'</td>';
+print '<td>'.$langs->trans("Type").'</td>';
+print '<td align="right">'.$langs->trans("Size").'</td>';
+print '<td align="center">'.$langs->trans("Unique").'</td>';
+print '<td align="center">'.$langs->trans("Required").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+$var=True;
+foreach($extrafields->attribute_type as $key => $value)
+{
+	$var=!$var;
+	print "<tr ".$bc[$var].">";
+    print "<td>".$extrafields->attribute_label[$key]."</td>\n";
+	print "<td>".$key."</td>\n";
+	print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";
+	print '<td align="right">'.$extrafields->attribute_size[$key]."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_unique[$key])."</td>\n";
+    print '<td align="center">'.yn($extrafields->attribute_required[$key])."</td>\n";
+	print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'">'.img_edit().'</a>';
+	print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=".$key."\">".img_delete()."</a></td>\n";
+	print "</tr>";
+	//      $i++;
+}
+
+print "</table>";
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation d'un champ optionnel
+ /*                                                                            */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+	print "<br>";
+	print_titre($langs->trans('NewAttribute'));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition d'un champ optionnel                                               */
+/*                                                                            */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+	print "<br>";
+	print_titre($langs->trans("FieldEdition", $attrname));
+
+    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+llxFooter();
+
+$db->close();
+?>
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 314a8b6d584..abf8ef515c8 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1189,6 +1189,25 @@ class User extends CommonObject
 				}
 			}
 
+			// Actions on extra fields (by external module or standard code)
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager=new HookManager($this->db);
+			$hookmanager->initHooks(array('userdao'));
+			$parameters=array('socid'=>$this->id);
+			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			if (empty($reshook))
+			{
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				{
+					$result=$this->insertExtraFields();
+					if ($result < 0)
+					{
+						$error++;
+					}
+				}
+			}
+			else if ($reshook < 0) $error++;
+
 			if (! $error && ! $notrigger)
 			{
 				// Appel des triggers
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 3921afa6a6b..778617f686d 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 if (! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php');
@@ -85,6 +86,8 @@ $langs->load("companies");
 $langs->load("ldap");
 
 $form = new Form($db);
+$object = new User($db);
+$extrafields = new ExtraFields($db);
 
 
 /**
@@ -95,9 +98,8 @@ if ($action == 'confirm_disable' && $confirm == "yes" && $candisableuser)
 {
     if ($id <> $user->id)
     {
-        $edituser = new User($db);
-        $edituser->fetch($id);
-        $edituser->setstatus(0);
+        $object->fetch($id);
+        $object->setstatus(0);
         header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
         exit;
     }
@@ -106,12 +108,11 @@ if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser)
 {
     if ($id <> $user->id)
     {
-        $edituser = new User($db);
-        $edituser->fetch($id);
+        $object->fetch($id);
 
         if (!empty($conf->file->main_limit_users))
         {
-            $nb = $edituser->getNbOfUsers("active");
+            $nb = $object->getNbOfUsers("active");
             if ($nb >= $conf->file->main_limit_users)
             {
                 $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';
@@ -120,7 +121,7 @@ if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser)
 
         if (! $message)
         {
-            $edituser->setstatus(1);
+            $object->setstatus(1);
             header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
             exit;
         }
@@ -131,9 +132,9 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser)
 {
     if ($id <> $user->id)
     {
-        $edituser = new User($db);
-        $edituser->id=$id;
-        $result = $edituser->delete();
+        $object = new User($db);
+        $object->id=$id;
+        $result = $object->delete();
         if ($result < 0)
         {
             $langs->load("errors");
@@ -161,11 +162,9 @@ if ($action == 'add' && $canadduser)
         $action="create";       // Go back to create page
     }
 
-    $edituser = new User($db);
-
     if (! empty($conf->file->main_limit_users)) // If option to limit users is set
     {
-        $nb = $edituser->getNbOfUsers("active");
+        $nb = $object->getNbOfUsers("active");
         if ($nb >= $conf->file->main_limit_users)
         {
             $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';
@@ -175,57 +174,66 @@ if ($action == 'add' && $canadduser)
 
     if (! $message)
     {
-        $edituser->lastname		= $_POST["nom"];
-        $edituser->firstname	= $_POST["prenom"];
-        $edituser->login		= $_POST["login"];
-        $edituser->admin		= $_POST["admin"];
-        $edituser->office_phone	= $_POST["office_phone"];
-        $edituser->office_fax	= $_POST["office_fax"];
-        $edituser->user_mobile	= $_POST["user_mobile"];
-        $edituser->email		= $_POST["email"];
-        $edituser->job			= $_POST["job"];
-        $edituser->signature	= $_POST["signature"];
-        $edituser->note			= $_POST["note"];
-        $edituser->ldap_sid		= $_POST["ldap_sid"];
+        $object->lastname		= $_POST["nom"];
+        $object->firstname	= $_POST["prenom"];
+        $object->login		= $_POST["login"];
+        $object->admin		= $_POST["admin"];
+        $object->office_phone	= $_POST["office_phone"];
+        $object->office_fax	= $_POST["office_fax"];
+        $object->user_mobile	= $_POST["user_mobile"];
+        $object->email		= $_POST["email"];
+        $object->job			= $_POST["job"];
+        $object->signature	= $_POST["signature"];
+        $object->note			= $_POST["note"];
+        $object->ldap_sid		= $_POST["ldap_sid"];
 
+        // Get extra fields
+        foreach($_POST as $key => $value)
+        {
+        	if (preg_match("/^options_/",$key))
+        	{
+        		$object->array_options[$key]=GETPOST($key);
+        	}
+        }
+                
         // FIXME external module
-        $edituser->webcal_login	= $_POST["webcal_login"];
-        $edituser->phenix_login	= $_POST["phenix_login"];
-        $edituser->phenix_pass	= $_POST["phenix_pass"];
+        $object->webcal_login	= $_POST["webcal_login"];
+        $object->phenix_login	= $_POST["phenix_login"];
+        $object->phenix_pass	= $_POST["phenix_pass"];
 
         // If multicompany is off, admin users must all be on entity 0.
         if (! empty($conf->multicompany->enabled))
         {
         	if (! empty($_POST["superadmin"]))
         	{
-        		$edituser->entity = 0;
+        		$object->entity = 0;
         	}
         	else if ($conf->multicompany->transverse_mode)
         	{
-        		$edituser->entity = 1; // all users in master entity
+        		$object->entity = 1; // all users in master entity
         	}
         	else
         	{
-        		$edituser->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
+        		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
         	}
         }
         else if (! empty($_POST["admin"]))
         {
-        	$edituser->entity=0;
+        	$object->entity=0;
         }
         else
         {
-        	$edituser->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
+        	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
         }
 
         $db->begin();
 
-        $id = $edituser->create($user);
+        $id = $object->create($user);
         if ($id > 0)
         {
             if (isset($_POST['password']) && trim($_POST['password']))
             {
-                $edituser->setPassword($user,trim($_POST['password']));
+                $object->setPassword($user,trim($_POST['password']));
             }
 
             $db->commit();
@@ -237,8 +245,8 @@ if ($action == 'add' && $canadduser)
         {
             $langs->load("errors");
             $db->rollback();
-            if (is_array($edituser->errors) && count($edituser->errors)) $message='<div class="error">'.join('<br>',$langs->trans($edituser->errors)).'</div>';
-            else $message='<div class="error">'.$langs->trans($edituser->error).'</div>';
+            if (is_array($object->errors) && count($object->errors)) $message='<div class="error">'.join('<br>',$langs->trans($object->errors)).'</div>';
+            else $message='<div class="error">'.$langs->trans($object->error).'</div>';
             $action="create";       // Go back to create page
         }
 
@@ -254,10 +262,9 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
         $editgroup->fetch($group);
         $editgroup->oldcopy=dol_clone($editgroup);
 
-        $edituser = new User($db);
-        $edituser->fetch($id);
-        if ($action == 'addgroup')    $edituser->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
-        if ($action == 'removegroup') $edituser->RemoveFromGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
+        $object->fetch($id);
+        if ($action == 'addgroup')    $object->SetInGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
+        if ($action == 'removegroup') $object->RemoveFromGroup($group,($conf->multicompany->transverse_mode?GETPOST("entity"):$editgroup->entity));
 
         if ($result > 0)
         {
@@ -266,7 +273,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
         }
         else
         {
-            $message.=$edituser->error;
+            $message.=$object->error;
         }
     }
 }
@@ -291,83 +298,91 @@ if ($action == 'update' && ! $_POST["cancel"])
         if (! $message)
         {
             $db->begin();
-            $edituser = new User($db);
-            $edituser->fetch($id);
+            $object->fetch($id);
 
-            $edituser->oldcopy=dol_clone($edituser);
+            $object->oldcopy=dol_clone($object);
 
-            $edituser->lastname		= $_POST["nom"];
-            $edituser->firstname	= $_POST["prenom"];
-            $edituser->login		= $_POST["login"];
-            $edituser->pass			= $_POST["password"];
-            $edituser->admin		= $_POST["admin"];
-            $edituser->office_phone	= $_POST["office_phone"];
-            $edituser->office_fax	= $_POST["office_fax"];
-            $edituser->user_mobile	= $_POST["user_mobile"];
-            $edituser->email		= $_POST["email"];
-            $edituser->job			= $_POST["job"];
-            $edituser->signature	= $_POST["signature"];
-            $edituser->openid		= $_POST["openid"];
+            $object->lastname		= $_POST["nom"];
+            $object->firstname	= $_POST["prenom"];
+            $object->login		= $_POST["login"];
+            $object->pass			= $_POST["password"];
+            $object->admin		= $_POST["admin"];
+            $object->office_phone	= $_POST["office_phone"];
+            $object->office_fax	= $_POST["office_fax"];
+            $object->user_mobile	= $_POST["user_mobile"];
+            $object->email		= $_POST["email"];
+            $object->job			= $_POST["job"];
+            $object->signature	= $_POST["signature"];
+            $object->openid		= $_POST["openid"];
 
+            // Get extra fields
+            foreach($_POST as $key => $value)
+            {
+            	if (preg_match("/^options_/",$key))
+            	{
+            		$object->array_options[$key]=GETPOST($key);
+            	}
+            }
+                        
             // FIXME external module
-            $edituser->webcal_login	= $_POST["webcal_login"];
-            $edituser->phenix_login	= $_POST["phenix_login"];
-            $edituser->phenix_pass	= $_POST["phenix_pass"];
+            $object->webcal_login	= $_POST["webcal_login"];
+            $object->phenix_login	= $_POST["phenix_login"];
+            $object->phenix_pass	= $_POST["phenix_pass"];
 
             if (! empty($conf->multicompany->enabled))
             {
             	if (! empty($_POST["superadmin"]))
             	{
-            		$edituser->entity = 0;
+            		$object->entity = 0;
             	}
             	else if ($conf->multicompany->transverse_mode)
             	{
-            		$edituser->entity = 1; // all users in master entity
+            		$object->entity = 1; // all users in master entity
             	}
             	else
             	{
-            		$edituser->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
+            		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
             	}
             }
             else if(! empty($_POST["admin"]))
             {
-            	$edituser->entity=0;
+            	$object->entity=0;
             }
             else
             {
-            	$edituser->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
+            	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
             }
 
-            if (GETPOST('deletephoto')) $edituser->photo='';
-            if (! empty($_FILES['photo']['name'])) $edituser->photo = dol_sanitizeFileName($_FILES['photo']['name']);
+            if (GETPOST('deletephoto')) $object->photo='';
+            if (! empty($_FILES['photo']['name'])) $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 
-            $ret=$edituser->update($user);
+            $ret=$object->update($user);
             if ($ret < 0)
             {
                 if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                 {
                     $langs->load("errors");
-                    $message.='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'</div>';
+                    $message.='<div class="error">'.$langs->trans("ErrorLoginAlreadyExists",$object->login).'</div>';
                 }
                 else
               {
-                    $message.='<div class="error">'.$edituser->error.'</div>';
+                    $message.='<div class="error">'.$object->error.'</div>';
                 }
             }
 
-            if ($ret >=0 && ! count($edituser->errors))
+            if ($ret >=0 && ! count($object->errors))
             {
-                if (GETPOST('deletephoto') && $edituser->photo)
+                if (GETPOST('deletephoto') && $object->photo)
                 {
-                    $fileimg=$conf->user->dir_output.'/'.get_exdir($edituser->id,2,0,1).'/logos/'.$edituser->photo;
-                    $dirthumbs=$conf->user->dir_output.'/'.get_exdir($edituser->id,2,0,1).'/logos/thumbs';
+                    $fileimg=$conf->user->dir_output.'/'.get_exdir($object->id,2,0,1).'/logos/'.$object->photo;
+                    $dirthumbs=$conf->user->dir_output.'/'.get_exdir($object->id,2,0,1).'/logos/thumbs';
                     dol_delete_file($fileimg);
                     dol_delete_dir_recursive($dirthumbs);
                 }
 
                 if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name']))
                 {
-                    $dir= $conf->user->dir_output . '/' . get_exdir($edituser->id,2,0,1);
+                    $dir= $conf->user->dir_output . '/' . get_exdir($object->id,2,0,1);
 
                     dol_mkdir($dir);
 
@@ -394,7 +409,7 @@ if ($action == 'update' && ! $_POST["cancel"])
                 }
             }
 
-            if ($ret >= 0 && ! count($edituser->errors))
+            if ($ret >= 0 && ! count($object->errors))
             {
                 $message.='<div class="ok">'.$langs->trans("UserModified").'</div>';
                 $db->commit();
@@ -407,15 +422,14 @@ if ($action == 'update' && ! $_POST["cancel"])
     }
     else if ($caneditpassword)	// Case we can edit only password
     {
-        $edituser = new User($db);
-        $edituser->fetch($id);
+        $object->fetch($id);
 
-        $edituser->oldcopy=dol_clone($edituser);
+        $object->oldcopy=dol_clone($object);
 
-        $ret=$edituser->setPassword($user,$_POST["password"]);
+        $ret=$object->setPassword($user,$_POST["password"]);
         if ($ret < 0)
         {
-            $message.='<div class="error">'.$edituser->error.'</div>';
+            $message.='<div class="error">'.$object->error.'</div>';
         }
     }
 }
@@ -424,10 +438,9 @@ if ($action == 'update' && ! $_POST["cancel"])
 if ((($action == 'confirm_password' && $confirm == 'yes')
 || ($action == 'confirm_passwordsend' && $confirm == 'yes')) && $caneditpassword)
 {
-    $edituser = new User($db);
-    $edituser->fetch($id);
+    $object->fetch($id);
 
-    $newpassword=$edituser->setPassword($user,'');
+    $newpassword=$object->setPassword($user,'');
     if ($newpassword < 0)
     {
         // Echec
@@ -438,15 +451,15 @@ if ((($action == 'confirm_password' && $confirm == 'yes')
         // Succes
         if ($action == 'confirm_passwordsend' && $confirm == 'yes')
         {
-            if ($edituser->send_password($user,$newpassword) > 0)
+            if ($object->send_password($user,$newpassword) > 0)
             {
-                $message = '<div class="ok">'.$langs->trans("PasswordChangedAndSentTo",$edituser->email).'</div>';
+                $message = '<div class="ok">'.$langs->trans("PasswordChangedAndSentTo",$object->email).'</div>';
                 //$message.=$newpassword;
             }
             else
             {
                 $message = '<div class="ok">'.$langs->trans("PasswordChangedTo",$newpassword).'</div>';
-                $message.= '<div class="error">'.$edituser->error.'</div>';
+                $message.= '<div class="error">'.$object->error.'</div>';
             }
         }
         else
@@ -517,6 +530,9 @@ if ($action == 'adduserldap')
  * View
  */
 
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label('user');
+
 llxHeader('',$langs->trans("UserCard"));
 
 $form = new Form($db);
@@ -853,8 +869,22 @@ if (($action == 'create') || ($action == 'adduserldap'))
     $doleditor->Create();
     print "</td></tr>\n";
 
-    // Autres caracteristiques issus des autres modules
-
+    // Other attributes
+    $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook) && ! empty($extrafields->attribute_label))
+    {
+    	foreach($extrafields->attribute_label as $key=>$label)
+    	{
+    		$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+    		print '<tr><td';
+    		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+    		print '>'.$label.'</td><td colspan="3">';
+    		print $extrafields->showInputField($key,$value);
+    		print '</td></tr>'."\n";
+    	}
+    }
+    
     // Module Webcalendar
     // TODO external module
     if (! empty($conf->webcalendar->enabled))
@@ -888,19 +918,20 @@ else
 
     if ($id)
     {
-        $fuser = new User($db);
-        $fuser->fetch($id);
-
+        $object->fetch($id);
+        if ($res < 0) { dol_print_error($db,$object->error); exit; }
+        $res=$object->fetch_optionals($object->id,$extralabels);
+        
         // Connexion ldap
         // pour recuperer passDoNotExpire et userChangePassNextLogon
-        if (! empty($conf->ldap->enabled) && ! empty($fuser->ldap_sid))
+        if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid))
         {
             $ldap = new Ldap();
             $result=$ldap->connect_bind();
             if ($result > 0)
             {
-                $userSearchFilter = '('.$conf->global->LDAP_FILTER_CONNECTION.'('.$ldap->getUserIdentifier().'='.$fuser->login.'))';
-                $entries = $ldap->fetch($fuser->login,$userSearchFilter);
+                $userSearchFilter = '('.$conf->global->LDAP_FILTER_CONNECTION.'('.$ldap->getUserIdentifier().'='.$object->login.'))';
+                $entries = $ldap->fetch($object->login,$userSearchFilter);
                 if (! $entries)
                 {
                     $message .= $ldap->error;
@@ -937,7 +968,7 @@ else
         }
 
         // Show tabs
-        $head = user_prepare_head($fuser);
+        $head = user_prepare_head($object);
 
         $title = $langs->trans("User");
         dol_fiche_head($head, 'user', $title, 0, 'user');
@@ -947,7 +978,7 @@ else
          */
         if ($action == 'password')
         {
-            $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$fuser->login),"confirm_password", '', 0, 1);
+            $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("ReinitPassword"),$langs->trans("ConfirmReinitPassword",$object->login),"confirm_password", '', 0, 1);
             if ($ret == 'html') print '<br>';
         }
 
@@ -956,7 +987,7 @@ else
          */
         if ($action == 'passwordsend')
         {
-            $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$fuser->login),"confirm_passwordsend", '', 0, 1);
+            $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("SendNewPassword"),$langs->trans("ConfirmSendNewPassword",$object->login),"confirm_passwordsend", '', 0, 1);
             if ($ret == 'html') print '<br>';
         }
 
@@ -965,7 +996,7 @@ else
          */
         if ($action == 'disable')
         {
-            $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$fuser->login),"confirm_disable", '', 0, 1);
+            $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("DisableAUser"),$langs->trans("ConfirmDisableUser",$object->login),"confirm_disable", '', 0, 1);
             if ($ret == 'html') print '<br>';
         }
 
@@ -974,7 +1005,7 @@ else
          */
         if ($action == 'enable')
         {
-            $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$fuser->login),"confirm_enable", '', 0, 1);
+            $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("EnableAUser"),$langs->trans("ConfirmEnableUser",$object->login),"confirm_enable", '', 0, 1);
             if ($ret == 'html') print '<br>';
         }
 
@@ -983,7 +1014,7 @@ else
          */
         if ($action == 'delete')
         {
-            $ret=$form->form_confirm("fiche.php?id=$fuser->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$fuser->login),"confirm_delete", '', 0, 1);
+            $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("DeleteAUser"),$langs->trans("ConfirmDeleteUser",$object->login),"confirm_delete", '', 0, 1);
             if ($ret == 'html') print '<br>';
         }
 
@@ -999,52 +1030,54 @@ else
             // Ref
             print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
             print '<td colspan="2">';
-            print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+            print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
             print '</td>';
             print '</tr>'."\n";
 
-            $rowspan=14;
+            $rowspan=15;
+            if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode)) $rowspan++;
             if (! empty($conf->societe->enabled)) $rowspan++;
             if (! empty($conf->adherent->enabled)) $rowspan++;
             if (! empty($conf->webcalendar->enabled)) $rowspan++;	// TODO external module
             if (! empty($conf->phenix->enabled)) $rowspan+=2;		// TODO external module
 
+            
             // Lastname
             print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>';
-            print '<td>'.$fuser->nom.'</td>';
+            print '<td>'.$object->nom.'</td>';
 
             // Photo
             print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
-            print $form->showphoto('userphoto',$fuser,100);
+            print $form->showphoto('userphoto',$object,100);
             print '</td>';
 
             print '</tr>'."\n";
 
             // Firstname
             print '<tr><td valign="top">'.$langs->trans("Firstname").'</td>';
-            print '<td>'.$fuser->prenom.'</td>';
+            print '<td>'.$object->prenom.'</td>';
             print '</tr>'."\n";
 
             // Position/Job
             print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
-            print '<td>'.$fuser->job.'</td>';
+            print '<td>'.$object->job.'</td>';
             print '</tr>'."\n";
 
             // Login
             print '<tr><td valign="top">'.$langs->trans("Login").'</td>';
-            if (! empty($fuser->ldap_sid) && $fuser->statut==0)
+            if (! empty($object->ldap_sid) && $object->statut==0)
             {
                 print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
             }
             else
             {
-                print '<td>'.$fuser->login.'</td>';
+                print '<td>'.$object->login.'</td>';
             }
             print '</tr>'."\n";
 
             // Password
             print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
-            if (! empty($fuser->ldap_sid))
+            if (! empty($object->ldap_sid))
             {
                 if ($passDoNotExpire)
                 {
@@ -1066,10 +1099,10 @@ else
             else
             {
                 print '<td>';
-                if ($fuser->pass) print preg_replace('/./i','*',$fuser->pass);
+                if ($object->pass) print preg_replace('/./i','*',$object->pass);
                 else
                 {
-                    if ($user->admin) print $langs->trans("Crypted").': '.$fuser->pass_indatabase_crypted;
+                    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
                     else print $langs->trans("Hidden");
                 }
                 print "</td>";
@@ -1078,17 +1111,17 @@ else
 
             // Administrator
             print '<tr><td valign="top">'.$langs->trans("Administrator").'</td><td>';
-            if (! empty($conf->multicompany->enabled) && $fuser->admin && ! $fuser->entity)
+            if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity)
             {
-                print $form->textwithpicto(yn($fuser->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
+                print $form->textwithpicto(yn($object->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
             }
-            else if ($fuser->admin)
+            else if ($object->admin)
             {
-                print $form->textwithpicto(yn($fuser->admin),$langs->trans("AdministratorDesc"),1,"admin");
+                print $form->textwithpicto(yn($object->admin),$langs->trans("AdministratorDesc"),1,"admin");
             }
             else
             {
-                print yn($fuser->admin);
+                print yn($object->admin);
             }
             print '</td></tr>'."\n";
 
@@ -1096,13 +1129,13 @@ else
             if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
             {
             	print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
-            	if ($fuser->admin && ! $fuser->entity)
+            	if ($object->admin && ! $object->entity)
             	{
             		print $langs->trans("AllEntities");
             	}
             	else
             	{
-            		$mc->getInfo($fuser->entity);
+            		$mc->getInfo($object->entity);
             		print $mc->label;
             	}
             	print "</td></tr>\n";
@@ -1110,11 +1143,11 @@ else
 
             // Type
             print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>';
-            if ($fuser->societe_id)
+            if ($object->societe_id)
             {
                 print $form->textwithpicto($langs->trans("External"),$langs->trans("InternalExternalDesc"));
             }
-            else if ($fuser->ldap_sid)
+            else if ($object->ldap_sid)
             {
                 print $langs->trans("DomainUser",$ldap->domainFQDN);
             }
@@ -1126,52 +1159,51 @@ else
 
             // Tel pro
             print '<tr><td valign="top">'.$langs->trans("PhonePro").'</td>';
-            print '<td>'.dol_print_phone($fuser->office_phone,'',0,0,1).'</td>';
+            print '<td>'.dol_print_phone($object->office_phone,'',0,0,1).'</td>';
             print '</tr>'."\n";
 
             // Tel mobile
             print '<tr><td valign="top">'.$langs->trans("PhoneMobile").'</td>';
-            print '<td>'.dol_print_phone($fuser->user_mobile,'',0,0,1).'</td>';
+            print '<td>'.dol_print_phone($object->user_mobile,'',0,0,1).'</td>';
             print '</tr>'."\n";
 
             // Fax
             print '<tr><td valign="top">'.$langs->trans("Fax").'</td>';
-            print '<td>'.dol_print_phone($fuser->office_fax,'',0,0,1).'</td>';
+            print '<td>'.dol_print_phone($object->office_fax,'',0,0,1).'</td>';
             print '</tr>'."\n";
 
             // EMail
             print '<tr><td valign="top">'.$langs->trans("EMail").'</td>';
-            print '<td>'.dol_print_email($fuser->email,0,0,1).'</td>';
+            print '<td>'.dol_print_email($object->email,0,0,1).'</td>';
             print "</tr>\n";
 
             // Signature
             print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
-            print dol_textishtml($fuser->signature)?$fuser->signature:dol_nl2br($fuser->signature,1,false);
+            print dol_textishtml($object->signature)?$object->signature:dol_nl2br($object->signature,1,false);
             print "</td></tr>\n";
 
             // Statut
             print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
             print '<td>';
-            print $fuser->getLibStatut(4);
+            print $object->getLibStatut(4);
             print '</td>';
             print '</tr>'."\n";
 
             print '<tr><td valign="top">'.$langs->trans("LastConnexion").'</td>';
-            print '<td>'.dol_print_date($fuser->datelastlogin,"dayhour").'</td>';
+            print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
             print "</tr>\n";
 
             print '<tr><td valign="top">'.$langs->trans("PreviousConnexion").'</td>';
-            print '<td>'.dol_print_date($fuser->datepreviouslogin,"dayhour").'</td>';
+            print '<td>'.dol_print_date($object->datepreviouslogin,"dayhour").'</td>';
             print "</tr>\n";
 
 
             if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode))
             {
                 print '<tr><td valign="top">'.$langs->trans("url_openid").'</td>';
-                print '<td>'.$fuser->openid.'</td>';
+                print '<td>'.$object->openid.'</td>';
                 print "</tr>\n";
             }
-            // Autres caracteristiques issus des autres modules
 
             // Module Webcalendar
             // TODO external module
@@ -1179,7 +1211,7 @@ else
             {
                 $langs->load("other");
                 print '<tr><td valign="top">'.$langs->trans("LoginWebcal").'</td>';
-                print '<td>'.$fuser->webcal_login.'&nbsp;</td>';
+                print '<td>'.$object->webcal_login.'&nbsp;</td>';
                 print '</tr>'."\n";
             }
 
@@ -1189,10 +1221,10 @@ else
             {
                 $langs->load("other");
                 print '<tr><td valign="top">'.$langs->trans("LoginPhenix").'</td>';
-                print '<td>'.$fuser->phenix_login.'&nbsp;</td>';
+                print '<td>'.$object->phenix_login.'&nbsp;</td>';
                 print "</tr>\n";
                 print '<tr><td valign="top">'.$langs->trans("PassPhenix").'</td>';
-                print '<td>'.preg_replace('/./i','*',$fuser->phenix_pass_crypted).'&nbsp;</td>';
+                print '<td>'.preg_replace('/./i','*',$object->phenix_pass_crypted).'&nbsp;</td>';
                 print '</tr>'."\n";
             }
 
@@ -1201,23 +1233,23 @@ else
             {
                 print '<tr><td valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
-                if (isset($fuser->societe_id) && $fuser->societe_id > 0)
+                if (isset($object->societe_id) && $object->societe_id > 0)
                 {
                     $societe = new Societe($db);
-                    $societe->fetch($fuser->societe_id);
+                    $societe->fetch($object->societe_id);
                     print $societe->getNomUrl(1,'');
                 }
                 else
                 {
                     print $langs->trans("ThisUserIsNot");
                 }
-                if (! empty($fuser->contact_id))
+                if (! empty($object->contact_id))
                 {
                     $contact = new Contact($db);
-                    $contact->fetch($fuser->contact_id);
-                    if ($fuser->societe_id > 0) print ' / ';
+                    $contact->fetch($object->contact_id);
+                    if ($object->societe_id > 0) print ' / ';
                     else print '<br>';
-                    print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$fuser->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                    print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
                 }
                 print '</td>';
                 print '</tr>'."\n";
@@ -1229,10 +1261,10 @@ else
                 $langs->load("members");
                 print '<tr><td valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
                 print '<td>';
-                if ($fuser->fk_member)
+                if ($object->fk_member)
                 {
                     $adh=new Adherent($db);
-                    $adh->fetch($fuser->fk_member);
+                    $adh->fetch($object->fk_member);
                     $adh->ref=$adh->getFullname($langs);	// Force to show login instead of id
                     print $adh->getNomUrl(1);
                 }
@@ -1244,7 +1276,23 @@ else
                 print '</tr>'."\n";
             }
 
-            print "</table>\n";
+          	// Other attributes
+			$parameters=array('colspan' => ' colspan="2"');
+			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+			if (empty($reshook) && ! empty($extrafields->attribute_label))
+			{
+				foreach($extrafields->attribute_label as $key=>$label)
+				{
+					$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+            		print '<tr><td';
+            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+            		print '>'.$label.'</td><td colspan="3">';
+					print $extrafields->showOutputField($key,$value);
+					print '</td></tr>'."\n";
+				}
+			}
+            
+			print "</table>\n";
 
             print "</div>\n";
 
@@ -1255,7 +1303,7 @@ else
 
             print '<div class="tabsAction">';
 
-            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($fuser->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1263,57 +1311,57 @@ else
                 }
                 else
                 {
-                    print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+                    print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
                 }
             }
-            elseif ($caneditpassword && ! $fuser->ldap_sid &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($fuser->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            elseif ($caneditpassword && ! $object->ldap_sid &&
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
+                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
             }
 
             // Si on a un gestionnaire de generation de mot de passe actif
             if ($conf->global->USER_PASSWORD_GENERATED != 'none')
             {
-				if ($fuser->statut == 0)
+				if ($object->statut == 0)
 				{
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a>';
 				}
-                elseif (($user->id != $id && $caneditpassword) && $fuser->login && !$fuser->ldap_sid &&
-                (empty($conf->multicompany->enabled) || ! $user->entity || ($fuser->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
-                    print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
+                    print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
                 }
 
-				if ($fuser->statut == 0)
+				if ($object->statut == 0)
 				{
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a>';
 				}
-                else if (($user->id != $id && $caneditpassword) && $fuser->login && !$fuser->ldap_sid &&
-                (empty($conf->multicompany->enabled) || ! $user->entity || ($fuser->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
-                    if ($fuser->email) print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
+                    if ($object->email) print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
                     else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a>';
                 }
             }
 
             // Activer
-            if ($user->id <> $id && $candisableuser && $fuser->statut == 0 &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($fuser->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
+                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
             }
             // Desactiver
-            if ($user->id <> $id && $candisableuser && $fuser->statut == 1 &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($fuser->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butActionDelete" href="fiche.php?action=disable&amp;id='.$fuser->id.'">'.$langs->trans("DisableUser").'</a>';
+                print '<a class="butActionDelete" href="fiche.php?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($fuser->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butActionDelete" href="fiche.php?action=delete&amp;id='.$fuser->id.'">'.$langs->trans("DeleteUser").'</a>';
+                print '<a class="butActionDelete" href="fiche.php?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a>';
             }
 
             print "</div>\n";
@@ -1333,7 +1381,7 @@ else
                 $exclude = array();
 
                 $usergroup=new UserGroup($db);
-                $groupslist = $usergroup->listGroupsForUser($fuser->id);
+                $groupslist = $usergroup->listGroupsForUser($object->id);
 
                 if (! empty($groupslist))
                 {
@@ -1355,7 +1403,7 @@ else
                     print '<table class="noborder" width="100%">'."\n";
                     print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n";
                     print '<th>';
-                    print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $fuser->entity);
+                    print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
                     print ' &nbsp; ';
                     // Multicompany
                     if (! empty($conf->multicompany->enabled))
@@ -1422,7 +1470,7 @@ else
                         		{
                         			$mc->getInfo($group_entity);
                         			print ($nb > 0 ? ', ' : '').$mc->label;
-                        			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
+                        			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'&amp;entity='.$group_entity.'">';
                         			print img_delete($langs->trans("RemoveFromGroup"));
                         			print '</a>';
                         			$nb++;
@@ -1432,7 +1480,7 @@ else
                         print '<td align="right">';
                         if ($caneditgroup && empty($conf->multicompany->transverse_mode))
                         {
-                            print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
+                            print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
                             print img_delete($langs->trans("RemoveFromGroup"));
                             print '</a>';
                         }
@@ -1457,15 +1505,15 @@ else
          * Fiche en mode edition
          */
 
-        if ($action == 'edit' && ($canedituser || ($user->id == $fuser->id)))
+        if ($action == 'edit' && ($canedituser || ($user->id == $object->id)))
         {
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$fuser->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
             print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
             print '<table width="100%" class="border">';
 
-            $rowspan=12;
+            $rowspan=13;
 
             if (! empty($conf->societe->enabled)) $rowspan++;
             if (! empty($conf->adherent->enabled)) $rowspan++;
@@ -1474,7 +1522,7 @@ else
 
             print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
             print '<td colspan="2">';
-            print $fuser->id;
+            print $object->id;
             print '</td>';
             print '</tr>';
 
@@ -1482,24 +1530,24 @@ else
             print "<tr>";
             print '<td valign="top" class="fieldrequired">'.$langs->trans("Lastname").'</td>';
             print '<td>';
-            if ($caneditfield && !$fuser->ldap_sid)
+            if ($caneditfield && !$object->ldap_sid)
             {
-                print '<input size="30" type="text" class="flat" name="nom" value="'.$fuser->nom.'">';
+                print '<input size="30" type="text" class="flat" name="nom" value="'.$object->nom.'">';
             }
             else
             {
-                print '<input type="hidden" name="nom" value="'.$fuser->nom.'">';
-                print $fuser->nom;
+                print '<input type="hidden" name="nom" value="'.$object->nom.'">';
+                print $object->nom;
             }
             print '</td>';
             // Photo
             print '<td align="center" valign="middle" width="25%" rowspan="'.$rowspan.'">';
-            print $form->showphoto('userphoto',$fuser);
+            print $form->showphoto('userphoto',$object);
             if ($caneditfield)
             {
-                if ($fuser->photo) print "<br>\n";
+                if ($object->photo) print "<br>\n";
                 print '<table class="nobordernopadding">';
-                if ($fuser->photo) print '<tr><td align="center"><input type="checkbox" class="flat" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+                if ($object->photo) print '<tr><td align="center"><input type="checkbox" class="flat" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
                 print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
                 print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
                 print '</table>';
@@ -1511,34 +1559,34 @@ else
             // Firstname
             print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>';
             print '<td>';
-            if ($caneditfield && !$fuser->ldap_sid)
+            if ($caneditfield && !$object->ldap_sid)
             {
-                print '<input size="30" type="text" class="flat" name="prenom" value="'.$fuser->prenom.'">';
+                print '<input size="30" type="text" class="flat" name="prenom" value="'.$object->prenom.'">';
             }
             else
             {
-                print '<input type="hidden" name="prenom" value="'.$fuser->prenom.'">';
-                print $fuser->prenom;
+                print '<input type="hidden" name="prenom" value="'.$object->prenom.'">';
+                print $object->prenom;
             }
             print '</td></tr>';
 
             // Position/Job
             print '<tr><td valign="top">'.$langs->trans("PostOrFunction").'</td>';
             print '<td>';
-            print '<input size="30" type="text" name="job" value="'.$fuser->job.'">';
+            print '<input size="30" type="text" name="job" value="'.$object->job.'">';
             print '</td></tr>';
 
             // Login
             print "<tr>".'<td valign="top"><span class="fieldrequired">'.$langs->trans("Login").'</span></td>';
             print '<td>';
-            if ($user->admin  && !$fuser->ldap_sid)
+            if ($user->admin  && !$object->ldap_sid)
             {
-                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$fuser->login.'">';
+                print '<input size="12" maxlength="24" type="text" class="flat" name="login" value="'.$object->login.'">';
             }
             else
             {
-                print '<input type="hidden" name="login" value="'.$fuser->login.'">';
-                print $fuser->login;
+                print '<input type="hidden" name="login" value="'.$object->login.'">';
+                print $object->login;
             }
             print '</td>';
             print '</tr>';
@@ -1546,13 +1594,13 @@ else
             // Pass
             print '<tr><td valign="top">'.$langs->trans("Password").'</td>';
             print '<td>';
-            if ($fuser->ldap_sid)
+            if ($object->ldap_sid)
             {
                 $text=$langs->trans("DomainPassword");
             }
             else if ($caneditpassword)
             {
-                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$fuser->pass.'">';
+                $text='<input size="12" maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'">';
                 if ($dolibarr_main_authentication && $dolibarr_main_authentication == 'http')
                 {
                     $text=$form->textwithpicto($text,$langs->trans("DolibarrInHttpAuthenticationSoPasswordUseless",$dolibarr_main_authentication),1,'warning');
@@ -1560,17 +1608,17 @@ else
             }
             else
             {
-                $text=preg_replace('/./i','*',$fuser->pass);
+                $text=preg_replace('/./i','*',$object->pass);
             }
             print $text;
             print "</td></tr>\n";
 
             // Administrator
             print '<tr><td valign="top">'.$langs->trans("Administrator").'</td>';
-            if ($fuser->societe_id > 0)
+            if ($object->societe_id > 0)
             {
                 print '<td>';
-                print '<input type="hidden" name="admin" value="'.$fuser->admin.'">'.yn($fuser->admin);
+                print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
                 print ' ('.$langs->trans("ExternalUser").')';
                 print '</td></tr>';
             }
@@ -1579,11 +1627,11 @@ else
                 print '<td>';
                 $nbSuperAdmin = $user->getNbOfUsers('superadmin');
                 if ($user->admin
-                && ($user->id != $fuser->id)                    // Don't downgrade ourself
-                && ($fuser->entity > 0 || $nbSuperAdmin > 1)    // Don't downgrade a superadmin if alone
+                && ($user->id != $object->id)                    // Don't downgrade ourself
+                && ($object->entity > 0 || $nbSuperAdmin > 1)    // Don't downgrade a superadmin if alone
                 )
                 {
-                    print $form->selectyesno('admin',$fuser->admin,1);
+                    print $form->selectyesno('admin',$object->admin,1);
 
                     if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->multicompany->transverse_mode))
                     {
@@ -1626,16 +1674,16 @@ else
 								</script>';
                         }
 
-                        $checked=(($fuser->admin && ! $fuser->entity) ? ' checked' : '');
+                        $checked=(($object->admin && ! $object->entity) ? ' checked' : '');
                         print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
                     }
                 }
                 else
                 {
-                    $yn = yn($fuser->admin);
-                    print '<input type="hidden" name="admin" value="'.$fuser->admin.'">';
-                    print '<input type="hidden" name="superadmin" value="'.(empty($fuser->entity) ? 1 : 0).'">';
-                    if (! empty($conf->multicompany->enabled) && empty($fuser->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
+                    $yn = yn($object->admin);
+                    print '<input type="hidden" name="admin" value="'.$object->admin.'">';
+                    print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
+                    if (! empty($conf->multicompany->enabled) && empty($object->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning');
                     else print $yn;
                 }
                 print '</td></tr>';
@@ -1647,7 +1695,7 @@ else
             	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
             	{
             		print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-            		print "<td>".$mc->select_entities($fuser->entity);
+            		print "<td>".$mc->select_entities($object->entity);
             		print "</td></tr>\n";
             	}
             	else
@@ -1660,11 +1708,11 @@ else
             	// Type
             	print '<tr><td width="25%" valign="top">'.$langs->trans("Type").'</td>';
             	print '<td>';
-            	if ($fuser->societe_id)
+            	if ($object->societe_id)
             	{
             		print $langs->trans("External");
             	}
-            	else if ($fuser->ldap_sid)
+            	else if ($object->ldap_sid)
             	{
             		print $langs->trans("DomainUser");
             	}
@@ -1678,63 +1726,63 @@ else
             // Tel pro
             print "<tr>".'<td valign="top">'.$langs->trans("PhonePro").'</td>';
             print '<td>';
-            if ($caneditfield  && empty($fuser->ldap_sid))
+            if ($caneditfield  && empty($object->ldap_sid))
             {
-                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$fuser->office_phone.'">';
+                print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
             }
             else
             {
-                print '<input type="hidden" name="office_phone" value="'.$fuser->office_phone.'">';
-                print $fuser->office_phone;
+                print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
+                print $object->office_phone;
             }
             print '</td></tr>';
 
             // Tel mobile
             print "<tr>".'<td valign="top">'.$langs->trans("PhoneMobile").'</td>';
             print '<td>';
-            if ($caneditfield && empty($fuser->ldap_sid))
+            if ($caneditfield && empty($object->ldap_sid))
             {
-                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$fuser->user_mobile.'">';
+                print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
             }
             else
             {
-                print '<input type="hidden" name="user_mobile" value="'.$fuser->user_mobile.'">';
-                print $fuser->user_mobile;
+                print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
+                print $object->user_mobile;
             }
             print '</td></tr>';
 
             // Fax
             print "<tr>".'<td valign="top">'.$langs->trans("Fax").'</td>';
             print '<td>';
-            if ($caneditfield  && empty($fuser->ldap_sid))
+            if ($caneditfield  && empty($object->ldap_sid))
             {
-                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$fuser->office_fax.'">';
+                print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
             }
             else
             {
-                print '<input type="hidden" name="office_fax" value="'.$fuser->office_fax.'">';
-                print $fuser->office_fax;
+                print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
+                print $object->office_fax;
             }
             print '</td></tr>';
 
             // EMail
             print "<tr>".'<td valign="top"'.(! empty($conf->global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").'</td>';
             print '<td>';
-            if ($caneditfield  && empty($fuser->ldap_sid))
+            if ($caneditfield  && empty($object->ldap_sid))
             {
-                print '<input size="40" type="text" name="email" class="flat" value="'.$fuser->email.'">';
+                print '<input size="40" type="text" name="email" class="flat" value="'.$object->email.'">';
             }
             else
             {
-                print '<input type="hidden" name="email" value="'.$fuser->email.'">';
-                print $fuser->email;
+                print '<input type="hidden" name="email" value="'.$object->email.'">';
+                print $object->email;
             }
             print '</td></tr>';
 
             // Signature
             print "<tr>".'<td valign="top">'.$langs->trans("Signature").'</td>';
             print '<td>';
-            print '<textarea name="signature" rows="5" cols="90">'.dol_htmlentitiesbr_decode($fuser->signature).'</textarea>';
+            print '<textarea name="signature" rows="5" cols="90">'.dol_htmlentitiesbr_decode($object->signature).'</textarea>';
             print '</td></tr>';
 
             // openid
@@ -1742,14 +1790,14 @@ else
             {
                 print "<tr>".'<td valign="top">'.$langs->trans("url_openid").'</td>';
                 print '<td>';
-                if ($caneditfield  && !$fuser->ldap_sid)
+                if ($caneditfield  && !$object->ldap_sid)
                 {
-                    print '<input size="40" type="text" name="openid" class="flat" value="'.$fuser->openid.'">';
+                    print '<input size="40" type="text" name="openid" class="flat" value="'.$object->openid.'">';
                 }
                 else
                 {
-                    print '<input type="hidden" name="openid" value="'.$fuser->openid.'">';
-                    print $fuser->openid;
+                    print '<input type="hidden" name="openid" value="'.$object->openid.'">';
+                    print $object->openid;
                 }
                 print '</td></tr>';
             }
@@ -1757,11 +1805,9 @@ else
             // Statut
             print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
             print '<td>';
-            print $fuser->getLibStatut(4);
+            print $object->getLibStatut(4);
             print '</td></tr>';
 
-            // Autres caracteristiques issus des autres modules
-
             // Module Webcalendar
             // TODO external module
             if (! empty($conf->webcalendar->enabled))
@@ -1769,8 +1815,8 @@ else
                 $langs->load("other");
                 print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>';
                 print '<td>';
-                if ($caneditfield) print '<input size="30" type="text" class="flat" name="webcal_login" value="'.$fuser->webcal_login.'">';
-                else print $fuser->webcal_login;
+                if ($caneditfield) print '<input size="30" type="text" class="flat" name="webcal_login" value="'.$object->webcal_login.'">';
+                else print $object->webcal_login;
                 print '</td></tr>';
             }
 
@@ -1781,13 +1827,13 @@ else
                 $langs->load("other");
                 print "<tr>".'<td valign="top">'.$langs->trans("LoginPhenix").'</td>';
                 print '<td>';
-                if ($caneditfield) print '<input size="30" type="text" class="flat" name="phenix_login" value="'.$fuser->phenix_login.'">';
-                else print $fuser->phenix_login;
+                if ($caneditfield) print '<input size="30" type="text" class="flat" name="phenix_login" value="'.$object->phenix_login.'">';
+                else print $object->phenix_login;
                 print '</td></tr>';
                 print "<tr>".'<td valign="top">'.$langs->trans("PassPhenix").'</td>';
                 print '<td>';
-                if ($caneditfield) print '<input size="30" type="password" class="flat" name="phenix_pass" value="'.$fuser->phenix_pass_crypted.'">';
-                else print preg_replace('/./i','*',$fuser->phenix_pass_crypted);
+                if ($caneditfield) print '<input size="30" type="password" class="flat" name="phenix_pass" value="'.$object->phenix_pass_crypted.'">';
+                else print preg_replace('/./i','*',$object->phenix_pass_crypted);
                 print '</td></tr>';
             }
 
@@ -1796,16 +1842,16 @@ else
             {
                 print '<tr><td width="25%" valign="top">'.$langs->trans("LinkToCompanyContact").'</td>';
                 print '<td>';
-                if ($fuser->societe_id > 0)
+                if ($object->societe_id > 0)
                 {
                     $societe = new Societe($db);
-                    $societe->fetch($fuser->societe_id);
+                    $societe->fetch($object->societe_id);
                     print $societe->getNomUrl(1,'');
-                    if ($fuser->contact_id)
+                    if ($object->contact_id)
                     {
                         $contact = new Contact($db);
-                        $contact->fetch($fuser->contact_id);
-                        print ' / <a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$fuser->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
+                        $contact->fetch($object->contact_id);
+                        print ' / <a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"),'contact').' '.dol_trunc($contact->getFullName($langs),32).'</a>';
                     }
                 }
                 else
@@ -1822,10 +1868,10 @@ else
                 $langs->load("members");
                 print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
                 print '<td>';
-                if ($fuser->fk_member)
+                if ($object->fk_member)
                 {
                     $adh=new Adherent($db);
-                    $adh->fetch($fuser->fk_member);
+                    $adh->fetch($object->fk_member);
                     $adh->ref=$adh->login;	// Force to show login instead of id
                     print $adh->getNomUrl(1);
                 }
@@ -1837,6 +1883,22 @@ else
                 print "</tr>\n";
             }
 
+            // Other attributes
+            $parameters=array('colspan' => ' colspan="2"');
+            $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+            if (empty($reshook) && ! empty($extrafields->attribute_label))
+            {
+            	foreach($extrafields->attribute_label as $key=>$label)
+            	{
+            		$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+            		print '<tr><td';
+            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+            		print '>'.$label.'</td><td colspan="3">';
+            		print $extrafields->showInputField($key,$value);
+            		print '</td></tr>'."\n";
+            	}
+            }
+                        
             print '</table>';
 
             print '<br><center>';
@@ -1850,7 +1912,7 @@ else
             print '</div>';
         }
 
-		if (! empty($conf->ldap->enabled) && ! empty($fuser->ldap_sid)) $ldap->close;
+		if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) $ldap->close;
     }
 }