diff --git a/ChangeLog b/ChangeLog
index 803703caf9d..361cd1145ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,12 +62,10 @@ 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 560a1c5193c..249c100245d 100644
--- a/build/debian/apache.conf
+++ b/build/debian/apache.conf
@@ -34,6 +34,16 @@ 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 e439e80caef..78195f27006 100755
--- a/build/debian/conf.php.install
+++ b/build/debian/conf.php.install
@@ -161,11 +161,12 @@ $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/install.forced.php.install b/build/debian/install.forced.php.install
index 3977caf8430..c62d4760d23 100755
--- a/build/debian/install.forced.php.install
+++ b/build/debian/install.forced.php.install
@@ -29,14 +29,13 @@ $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/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 6107560d656..9200524f259 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -111,9 +111,9 @@ class modMyModule extends DolibarrModules
 		$this->const = array();
 
 		// Array to add new pages in new tabs
-		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  // To add a new tab identified by code tabname1
-        //                              'objecttype:+tabname2:Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  // To add another new tab identified by code tabname2
-        //                              'objecttype:-tabname');                                                     // To remove an existing tab identified by code tabname
+		// Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__',  	// To add a new tab identified by code tabname1
+        //                              'objecttype:+tabname2:Title2:mylangfile@mymodule:$user->rights->othermodule->read:/mymodule/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2
+        //                              'objecttype:-tabname':NU:conditiontoremove);                                                     						// To remove an existing tab identified by code tabname
 		// where objecttype can be
 		// 'thirdparty'       to add a tab in third party view
 		// 'intervention'     to add a tab in intervention view
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 302992a707b..dcc25501d84 100755
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -22,8 +22,8 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 $graphwidth = 700;
 $mapratio = 0.5;
@@ -83,8 +83,8 @@ if ($resql)
 	{
 		$obj=$db->fetch_object($resql);
 
-		if ($obj->code == 'phy') $foundphy++;
-		if ($obj->code == 'mor') $foundmor++;
+		if ($obj->code == 'phy') $foundphy++;
+		if ($obj->code == 'mor') $foundmor++;
 
 		$data[]=array('label'=>$obj->code, 'nb'=>$obj->nb, 'lastdate'=>$db->jdate($obj->lastdate));
 
@@ -122,8 +122,8 @@ print '<td align="center">'.$langs->trans("NbOfMembers").'</td>';
 print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
 print '</tr>';
 
-if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
-if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
+if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
+if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
 
 $oldyear=0;
 $var=true;
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index c0d9d389627..5af5b8a5787 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -94,6 +94,34 @@ if ($action == "save" && empty($cancel))
     }
 }
 
+if (preg_match('/set_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	$value=(GETPOST($code) ? GETPOST($code) : 1);
+	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+
+if (preg_match('/del_(.*)/',$action,$reg))
+{
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
 
 
 /**
@@ -159,6 +187,46 @@ print "</form>\n";
 
 print '</div>';
 
+/*
+ * Other options
+*/
+
+print_titre($langs->trans("OtherOptions"));
+
+$var=true;
+
+print '<table class="noborder allwidth">'."\n";
+print '<tr class="liste_titre">'."\n";
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>'."\n";
+print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
+print '</tr>'."\n";
+
+// Manual or automatic
+$var=!$var;
+print '<tr '.$bc[$var].'>'."\n";
+print '<td>'.$langs->trans("AGENDA_USE_EVENT_TYPE").'</td>'."\n";
+print '<td align="center" width="20">&nbsp;</td>'."\n";
+
+print '<td align="center" width="100">'."\n";
+if ($conf->use_javascript_ajax)
+{
+	print ajax_constantonoff('AGENDA_USE_EVENT_TYPE');
+}
+else
+{
+	if($conf->global->AGENDA_USE_EVENT_TYPE == 0)
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+	}
+	else if($conf->global->BUSINESS_VISIBLE_TO_ALL_BY_DEFAULT == 1)
+	{
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+	}
+}
+print '</td></tr>'."\n";
+
+
 print "<br>";
 
 dol_htmloutput_mesg($mesg);
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 30158915f2e..0bee6992ec1 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -563,7 +563,8 @@ if ($action == 'edit' || $action == 'updateedit')
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
 
@@ -572,7 +573,8 @@ if ($action == 'edit' || $action == 'updateedit')
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
         print "</table>";
@@ -593,7 +595,8 @@ if ($action == 'edit' || $action == 'updateedit')
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
 
@@ -602,7 +605,8 @@ if ($action == 'edit' || $action == 'updateedit')
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
         print "</table>";
@@ -939,7 +943,8 @@ else
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example",$mysoc->country_code).': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax1IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
 
@@ -948,7 +953,8 @@ else
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax1IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example",$mysoc->country_code).': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax1IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
 
@@ -970,7 +976,8 @@ else
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax2IsUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax2IsUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
 
@@ -979,7 +986,8 @@ else
         print '<td colspan="2">';
         print "<table>";
         print "<tr><td>".$langs->transcountry("LocalTax2IsNotUsedDesc",$mysoc->country_code)."</td></tr>";
-        print "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n";
+        $example=$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code);
+        print ($example!="LocalTax2IsNotUsedExample"?"<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample",$mysoc->country_code)."</i></td></tr>\n":"");
         print "</table>";
         print "</td></tr>\n";
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 92111cd9a2c..e18420285c0 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1066,7 +1066,6 @@ if ($id)
                         }
                     }
 
-                    print '<td align="center" nowrap="nowrap">';
                     // Est-ce une entree du dictionnaire qui peut etre desactivee ?
                     $iserasable=1;  // Oui par defaut
                     if (isset($obj->code) && ($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i',$obj->code))) $iserasable=0;
@@ -1074,8 +1073,14 @@ if ($id)
                     if (isset($obj->code) && $obj->code == 'EF0') $iserasable=0;
                     if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0;
 
+                    // Active
+                    print '<td align="center" nowrap="nowrap">';
                     if ($iserasable) print '<a href="'.$_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&amp;code='.(! empty($obj->code)?$obj->code:'').'&amp;id='.$id.'&amp;action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else print $langs->trans("AlwaysActive");
+                    else
+                 	{
+                  		if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+                    	else print $langs->trans("AlwaysActive");
+                    }
                     print "</td>";
 
                     // Modify link
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 760651a7f2b..a79650fa893 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -477,12 +477,14 @@ class ActionComm extends CommonObject
      * 	 @param		int		$fk_element		Id of element action is linked to
      *   @param		string	$elementtype	Type of element action is linked to
      *   @param		string	$filter			Other filter
-     *   @return	int						<0 if KO, >0 if OK
+     *   @return	array					<0 if KO, array with actions
      */
-    function getActions($socid=0, $fk_element=0, $elementtype='', $filter='')
+    static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='')
     {
         global $conf, $langs;
 
+        $resarray=array();
+
         $sql = "SELECT a.id";
         $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
         $sql.= " WHERE a.entity = ".$conf->entity;
@@ -495,27 +497,27 @@ class ActionComm extends CommonObject
         if (! empty($filter)) $sql.= $filter;
 
         dol_syslog(get_class($this)."::getActions sql=".$sql);
-        $resql=$this->db->query($sql);
+        $resql=$db->query($sql);
         if ($resql)
         {
-            $num = $this->db->num_rows($resql);
+            $num = $db->num_rows($resql);
 
             if ($num)
             {
                 for($i=0;$i<$num;$i++)
                 {
-                    $obj = $this->db->fetch_object($resql);
-                    $actioncommstatic = new ActionComm($this->db);
+                    $obj = $db->fetch_object($resql);
+                    $actioncommstatic = new ActionComm($db);
                     $actioncommstatic->fetch($obj->id);
-                    $this->actions[$i] = $actioncommstatic;
+                    $resarray[$i] = $actioncommstatic;
                 }
             }
-            $this->db->free($resql);
-            return 1;
+            $db->free($resql);
+            return $resarray;
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error=$db->lasterror();
             return -1;
         }
     }
@@ -707,26 +709,34 @@ class ActionComm extends CommonObject
         if ($option=='birthday') $lien = '<a '.($classname?'class="'.$classname.'" ':'').'href="'.DOL_URL_ROOT.'/contact/perso.php?id='.$this->id.'">';
         else $lien = '<a '.($classname?'class="'.$classname.'" ':'').'href="'.DOL_URL_ROOT.'/comm/action/fiche.php?id='.$this->id.'">';
         $lienfin='</a>';
-        //print $this->libelle;
+        $label=$this->label;
+        if (empty($label)) $label=$this->libelle;	// Fro backward compatibility
+        //print 'rrr'.$this->libelle;
+
         if ($withpicto == 2)
         {
-            $libelle=$langs->trans("Action".$this->type_code);
+            $libelle=$label;
+        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->trans("Action".$this->type_code);
             $libelleshort='';
         }
         else if (empty($this->libelle))
         {
-            $libelle=$langs->trans("Action".$this->type_code);
-            $libelleshort=$langs->trans("Action".$this->type_code,'','','','',$maxlength);
+            $libelle=$label;
+        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle=$langs->trans("Action".$this->type_code);
+        	$libelleshort=dol_trunc($label, $maxlength);
         }
         else
-        {
-            $libelle=$this->libelle;
-            $libelleshort=dol_trunc($this->libelle,$maxlength);
+       {
+            $libelle=$label;
+            $libelleshort=dol_trunc($label,$maxlength);
         }
 
         if ($withpicto)
         {
-            $libelle.=(($this->type_code && $libelle!=$langs->trans("Action".$this->type_code) && $langs->trans("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->trans("Action".$this->type_code).')':'');
+        	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+        	{
+        		 $libelle.=(($this->type_code && $libelle!=$langs->trans("Action".$this->type_code) && $langs->trans("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->trans("Action".$this->type_code).')':'');
+        	}
             $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'action')).$lienfin;
         }
         if ($withpicto==1) $result.=' ';
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 50f9f077785..f1c8a4abbaf 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -100,9 +100,10 @@ class CActionComm
      *  @param	int			$active     	1 or 0 to filter on event state active or not ('' by default = no filter)
      *  @param	string		$idorcode		'id' or 'code'
      *  @param	string		$excludetype	Type to exclude
+     *  @param	string		$onlyautoornot	Group list by auto events or not
      *  @return array      					Array of all event types if OK, <0 if KO
      */
-    function liste_array($active='',$idorcode='id',$excludetype='')
+    function liste_array($active='',$idorcode='id',$excludetype='',$onlyautoornot=0)
     {
         global $langs,$conf;
         $langs->load("commercial");
@@ -110,7 +111,7 @@ class CActionComm
         $repid = array();
         $repcode = array();
 
-        $sql = "SELECT id, code, libelle, module";
+        $sql = "SELECT id, code, libelle, module, type";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
         if ($active != '') $sql.=" WHERE active=".$active;
         if (! empty($excludetype)) $sql.=($active != ''?" AND":" WHERE")." type <> '".$excludetype."'";
@@ -127,20 +128,31 @@ class CActionComm
                 while ($i < $nump)
                 {
                     $obj = $this->db->fetch_object($resql);
+
                     $qualified=1;
-                    if ($obj->module)
+
+                    // $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
+                    if ($qualified && $onlyautoornot && preg_match('/^system/',$obj->type) && ! preg_match('/^AC_OTH/',$obj->code)) $qualified=0;	// We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTHER)
+
+                    if ($qualified && $obj->module)
                     {
                         if ($obj->module == 'invoice' && ! $conf->facture->enabled)	 $qualified=0;
                         if ($obj->module == 'order'   && ! $conf->commande->enabled) $qualified=0;
                         if ($obj->module == 'propal'  && ! $conf->propal->enabled)	 $qualified=0;
                         if ($obj->module == 'invoice_supplier' && ! $conf->fournisseur->enabled)   $qualified=0;
                         if ($obj->module == 'order_supplier'   && ! $conf->fournisseur->enabled)   $qualified=0;
+                        if ($obj->module == 'shipping'  && ! $conf->expedition->enabled)	 $qualified=0;
                     }
+
                     if ($qualified)
                     {
-                        $transcode=$langs->trans("Action".$obj->code);
-                        $repid[$obj->id] = ($transcode!="Action".$obj->code?$transcode:$langs->trans($obj->libelle));
-                        $repcode[$obj->code] = ($transcode!="Action".$obj->code?$transcode:$langs->trans($obj->libelle));
+                    	$code=$obj->code;
+                    	if ($onlyautoornot && $code == 'AC_OTH') $code='AC_MANUAL';
+                    	if ($onlyautoornot && $code == 'AC_OTH_AUTO') $code='AC_AUTO';
+                    	$transcode=$langs->trans("Action".$code);
+                        $repid[$obj->id] = ($transcode!="Action".$code?$transcode:$langs->trans($obj->libelle));
+                        $repcode[$obj->code] = ($transcode!="Action".$code?$transcode:$langs->trans($obj->libelle));
+                        if ($onlyautoornot && preg_match('/^module/',$obj->type) && $obj->module) $repcode[$obj->code].=' ('.$langs->trans("Module").': '.$obj->module.')';
                     }
                     $i++;
                 }
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 7fa1a71c5f3..db2e459f551 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -127,7 +127,10 @@ if ($objectid > 0)
 		print '</td></tr>';
 
 		// Type
-		print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+		{
+			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+		}
 
 		// Title
 		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$act->label.'</td></tr>';
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 53b0dae69ab..5b5ebee90ee 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -107,6 +107,13 @@ if ($action == 'add_action')
 		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("DateEnd")).'</div>';
 	}
 
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! GETPOST('label'))
+	{
+		$error++;
+		$action = 'create';
+		$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'</div>';
+	}
+
 	// Initialisation objet cactioncomm
 	if (! GETPOST('actioncode'))
 	{
@@ -122,13 +129,13 @@ if ($action == 'add_action')
 	// Initialisation objet actioncomm
 	$actioncomm->type_id = $cactioncomm->id;
 	$actioncomm->type_code = $cactioncomm->code;
-	$actioncomm->priority = isset($_POST["priority"])?$_POST["priority"]:0;
+	$actioncomm->priority = GETPOST("priority")?GETPOST("priority"):0;
 	$actioncomm->fulldayevent = (! empty($fulldayevent)?1:0);
-	$actioncomm->location = isset($_POST["location"])?$_POST["location"]:'';
-	$actioncomm->label = trim($_POST["label"]);
-	if (! $_POST["label"])
+	$actioncomm->location = GETPOST("location");
+	$actioncomm->label = trim(GETPOST('label'));
+	if (! GETPOST('label'))
 	{
-		if ($_POST["actioncode"] == 'AC_RDV' && $contact->getFullName($langs))
+		if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs))
 		{
 			$actioncomm->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
 		}
@@ -390,11 +397,13 @@ if ($action == 'create')
 	            			$(".fulldaystartmin").removeAttr("disabled");
 	            			$(".fulldayendhour").removeAttr("disabled");
 	            			$(".fulldayendmin").removeAttr("disabled");
+	            			$("#p2").removeAttr("disabled");
 	            		} else {
 	            			$(".fulldaystarthour").attr("disabled","disabled").val("00");
 	            			$(".fulldaystartmin").attr("disabled","disabled").val("00");
 	            			$(".fulldayendhour").attr("disabled","disabled").val("23");
 	            			$(".fulldayendmin").attr("disabled","disabled").val("59");
+	            			$("#p2").attr("disabled","disabled").val("");
 	            		}
 	            	}
                     setdatefields();
@@ -432,21 +441,25 @@ if ($action == 'create')
 	print '<table class="border" width="100%">';
 
 	// Type d'action actifs
-	print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
-	if (GETPOST("actioncode"))
+	if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
-		print '<input type="hidden" name="actioncode" value="'.GETPOST("actioncode").'">'."\n";
-		$cactioncomm->fetch(GETPOST("actioncode"));
-		print $cactioncomm->getNomUrl();
+		print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
+		if (GETPOST("actioncode"))
+		{
+			print '<input type="hidden" name="actioncode" value="'.GETPOST("actioncode").'">'."\n";
+			$cactioncomm->fetch(GETPOST("actioncode"));
+			print $cactioncomm->getNomUrl();
+		}
+		else
+		{
+			$htmlactions->select_type_actions($actioncomm->type_code, "actioncode","systemauto");
+		}
+		print '</td></tr>';
 	}
-	else
-	{
-		$htmlactions->select_type_actions($actioncomm->type_code, "actioncode","systemauto");
-	}
-	print '</td></tr>';
+	else print '<input type="hidden" name="actioncode" value="AC_OTH">';
 
 	// Title
-	print '<tr><td>'.$langs->trans("Title").'</td><td><input type="text" name="label" size="60" value="'.GETPOST('label').'"></td></tr>';
+	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td><input type="text" name="label" size="60" value="'.GETPOST('label').'"></td></tr>';
 
     // Full day
     print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday')?' checked="checked"':'').'></td></tr>';
@@ -678,10 +691,13 @@ if ($id)
 		print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$act->id.'</td></tr>';
 
 		// Type
-		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+		{
+			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+		}
 
 		// Title
-		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$act->label.'"></td></tr>';
+		print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" size="50" value="'.$act->label.'"></td></tr>';
 
         // Full day event
         print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($act->fulldayevent?' checked="checked"':'').'></td></tr>';
@@ -797,7 +813,10 @@ if ($id)
 		print '</td></tr>';
 
 		// Type
-		print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+		{
+			print '<tr><td>'.$langs->trans("Type").'</td><td colspan="3">'.$act->type.'</td></tr>';
+		}
 
 		// Title
 		print '<tr><td>'.$langs->trans("Title").'</td><td colspan="3">'.$act->label.'</td></tr>';
diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 7d03960dd11..a3f7c8ef647 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -340,6 +340,7 @@ if ($action == 'create')
 	$langs->load("bills");
 	print '<center>';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
+	print '&nbsp;<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	print '</center>';
 
 	print "</form>";
diff --git a/htdocs/commissions/lib/commissions.lib.php b/htdocs/commissions/lib/commissions.lib.php
index 89fba20a60c..ef99fd6ee3a 100644
--- a/htdocs/commissions/lib/commissions.lib.php
+++ b/htdocs/commissions/lib/commissions.lib.php
@@ -41,8 +41,10 @@ function commissions_admin_prepare_head()
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,'',$head,$h,'commissionsadmin');
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,'',$head,$h,'commissionsadmin');
+
+    complete_head_from_modules($conf,$langs,'',$head,$h,'commissionsadmin','remove');
 
     return $head;
 }
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0f12ab0cfc8..25153612f56 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -546,17 +546,12 @@ class BonPrelevement extends CommonObject
                 // TODO Call trigger to create a notification using notification module
             }
             else
-            {
+           {
                 dol_syslog(get_class($this)."::set_infotrans Erreur 1", LOG_ERR);
                 dol_syslog($this->db->error());
                 $error++;
             }
 
-            /*
-             * End of procedure
-             *
-             */
-
             if ($error == 0)
             {
                 $this->db->commit();
@@ -1047,6 +1042,44 @@ class BonPrelevement extends CommonObject
     }
 
 
+    /**
+     *	Get object and lines from database
+     *
+     *	@return	int					>0 if OK, <0 if KO
+     */
+    function delete()
+    {
+    	$this->db->begin();
+
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = '".$this->id."')";
+    	$resql1=$this->db->query($sql);
+    	if (! $resql1) dol_print_error($this->db);
+
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = '".$this->id."'";
+    	$resql2=$this->db->query($sql);
+    	if (! $resql2) dol_print_error($this->db);
+
+    	$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = '".$this->id."'";
+    	$resql3=$this->db->query($sql);
+		if (! $resql3) dol_print_error($this->db);
+
+    	$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = '".$this->id."'";
+    	$resql4=$this->db->query($sql);
+		if (! $resql4) dol_print_error($this->db);
+
+		if ($resql1 && $resql2 && $resql3)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+    }
+
+
     /**
      *	Returns clickable name (with picto)
      *
@@ -1595,20 +1628,20 @@ class BonPrelevement extends CommonObject
         {
             if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0').' '.$langs->trans($this->labelstatut[$statut]);
             if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
-            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut4').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]);
         }
         if ($mode == 2)
         {
             if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
             if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
-            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut4');
+            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
         }
 
         if ($mode == 3)
         {
             if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut0');
             if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
-            if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut4');
+            if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
         }
     }
 
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index aed9237e028..e30e3f05d82 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -55,27 +55,21 @@ if ($prev_id)
       	dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment');
 
       	print '<table class="border" width="100%">';
-      	print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+
+		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-
-		$relativepath = 'receipts/'.$bon->ref;
-
-		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
-
-		print '</td></tr>';
-
+	
 		// Status
 		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
 		print '<td>'.$bon->getLibStatut(1).'</td>';
 		print '</tr>';
-
+	
 		if($bon->date_trans <> 0)
 		{
 			$muser = new User($db);
 			$muser->fetch($bon->user_trans);
-
+	
 			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($bon->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
@@ -89,10 +83,19 @@ if ($prev_id)
 			print dol_print_date($bon->date_credit,'day');
 			print '</td></tr>';
 		}
-
-      	print '</table>';
-
-      	print '</div>';
+	
+		print '</table>';
+	
+		print '<br>';
+	
+		print '<table class="border" width="100%"><tr><td width="20%">';
+		print $langs->trans("WithdrawalFile").'</td><td>';
+		$relativepath = 'receipts/'.$bon->ref;
+		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+		print '</td></tr></table>';
+	
+		dol_fiche_end();
+      	
     }
   	else
     {
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 2ca9479f441..5ff3d5544d9 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -54,27 +54,21 @@ if ($prev_id)
       	dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalReceipt"), '', 'payment');
 
       	print '<table class="border" width="100%">';
-      	print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+
+		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-
-		$relativepath = 'receipts/'.$bon->ref;
-
-		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
-
-		print '</td></tr>';
-
+	
 		// Status
 		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
 		print '<td>'.$bon->getLibStatut(1).'</td>';
 		print '</tr>';
-
+	
 		if($bon->date_trans <> 0)
 		{
 			$muser = new User($db);
 			$muser->fetch($bon->user_trans);
-
+	
 			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($bon->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
@@ -88,10 +82,19 @@ if ($prev_id)
 			print dol_print_date($bon->date_credit,'day');
 			print '</td></tr>';
 		}
-
-      	print '</table>';
-
-      	print '</div>';
+	
+		print '</table>';
+	
+		print '<br>';
+	
+		print '<table class="border" width="100%"><tr><td width="20%">';
+		print $langs->trans("WithdrawalFile").'</td><td>';
+		$relativepath = 'receipts/'.$bon->ref;
+		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+		print '</td></tr></table>';
+	
+		dol_fiche_end();
+      	
     }
   	else
     {
@@ -103,8 +106,6 @@ $rej = new RejetPrelevement($db, $user);
 
 /*
  * Liste des factures
- *
- *
  */
 $sql = "SELECT pl.rowid, pl.amount, pl.statut";
 $sql.= " , s.rowid as socid, s.nom";
@@ -141,10 +142,10 @@ if ($resql)
     {
 		$obj = $db->fetch_object($resql);
 
-		print "<tr $bc[$var]><td>";
-		print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a>&nbsp;';
-		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
+		print "<tr ".$bc[$var]."><td>";
 
+		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
+		print img_picto('', 'statut'.$obj->statut).' ';
 		print substr('000000'.$obj->rowid, -6);
 		print '</a></td>';
 		print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
@@ -164,7 +165,7 @@ if ($resql)
 	print '<tr class="liste_total"><td>&nbsp;</td>';
 	print '<td class="liste_total">'.$langs->trans("Total").'</td>';
 	print '<td align="right">'.price($total)."</td>\n";
-	print '<td>&nbsp;</td>';
+	print '<td colspan="3">&nbsp;</td>';
 	print "</tr>\n</table>\n";
 	$db->free($resql);
 }
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 5497b1acf2a..eab046c7d45 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -58,24 +58,17 @@ if ($prev_id)
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-
-		$relativepath = 'receipts/'.$bon->ref;
-
-		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
-
-		print '</td></tr>';
-
+	
 		// Status
 		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
 		print '<td>'.$bon->getLibStatut(1).'</td>';
 		print '</tr>';
-
+	
 		if($bon->date_trans <> 0)
 		{
 			$muser = new User($db);
 			$muser->fetch($bon->user_trans);
-
+	
 			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($bon->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
@@ -89,10 +82,19 @@ if ($prev_id)
 			print dol_print_date($bon->date_credit,'day');
 			print '</td></tr>';
 		}
-
+	
 		print '</table>';
-
-		print '</div>';
+	
+		print '<br>';
+	
+		print '<table class="border" width="100%"><tr><td width="20%">';
+		print $langs->trans("WithdrawalFile").'</td><td>';
+		$relativepath = 'receipts/'.$bon->ref;
+		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+		print '</td></tr></table>';
+	
+		dol_fiche_end();
+		
 	}
 	else
 	{
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index cd99849de9c..73450228480 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -42,14 +42,28 @@ if ($user->societe_id > 0) accessforbidden();
 $action = GETPOST('action','alpha');
 $id = GETPOST('id','int');
 
+
 /*
  * Actions
  */
+if ( $action == 'confirm_delete' )
+{
+	$bon = new BonPrelevement($db,"");
+	$bon->fetch($id);
+
+	$res=$bon->delete();
+	if ($res > 0)
+	{
+		header("Location: index.php");
+		exit;
+	}
+}
 
 if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes')
 {
 	$bon = new BonPrelevement($db,"");
-	$bon->id = $id;
+	$bon->fetch($id);
+
 	$bon->set_credite();
 
 	header("Location: fiche.php?id=".$id);
@@ -63,14 +77,15 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
 	$bon = new BonPrelevement($db,"");
 	$bon->fetch($id);
 
+	$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
+
+	/*
 	if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $bon->ref)
 	{
 		$dir = $conf->prelevement->dir_output.'/receipts';
 
 		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
 		{
-			$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
-
 			$bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
 		}
 
@@ -81,6 +96,14 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
 	{
 		dol_syslog("Fichier invalide",LOG_WARNING);
 		$mesg='BadFile';
+	}*/
+
+	$error = $bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+
+	if ($error)
+	{
+		header("Location: fiche.php?id=".$id."&error=$error");
+		exit;
 	}
 }
 
@@ -92,15 +115,11 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
 
 	$error = $bon->set_infocredit($user, $dt);
 
-	if ($error == 0)
-	{
-		header("Location: fiche.php?id=".$id);
-	}
-	else
+	if ($error)
 	{
 		header("Location: fiche.php?id=".$id."&error=$error");
+		exit;
 	}
-	exit;
 }
 
 
@@ -108,132 +127,139 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
  * View
  */
 
-llxHeader('',$langs->trans("WithdrawalReceipt"));
-
+$bon = new BonPrelevement($db,"");
 $form = new Form($db);
 
-if ($id)
+llxHeader('',$langs->trans("WithdrawalReceipt"));
+
+
+if ($id > 0)
 {
-	$bon = new BonPrelevement($db,"");
+	$bon->fetch($id);
 
-	if ($bon->fetch($id) == 0)
+	$head = prelevement_prepare_head($bon);
+	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipt"), '', 'payment');
+
+	if (GETPOST('error','alpha')!='')
 	{
-		$head = prelevement_prepare_head($bon);
-		dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipt"), '', 'payment');
+		print '<div class="error">'.$bon->ReadError(GETPOST('error','alpha')).'</div>';
+	}
 
-		if (GETPOST('error','alpha')!='')
-		{
-			print '<div class="error">'.$bon->ReadError(GETPOST('error','alpha')).'</div>';
-		}
+	/*if ($action == 'credite')
+	{
+		$ret=$form->form_confirm("fiche.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
+		if ($ret == 'html') print '<br>';
+	}*/
 
-		if ($action == 'credite')
-		{
-			$ret=$form->form_confirm("fiche.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
-			if ($ret == 'html') print '<br>';
-		}
+	print '<table class="border" width="100%">';
 
-		print '<table class="border" width="100%">';
+	print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
+	print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
 
-		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
+	// Status
+	print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
+	print '<td>'.$bon->getLibStatut(1).'</td>';
+	print '</tr>';
 
-		$relativepath = 'receipts/'.$bon->ref;
-
-		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+	if($bon->date_trans <> 0)
+	{
+		$muser = new User($db);
+		$muser->fetch($bon->user_trans);
 
+		print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+		print dol_print_date($bon->date_trans,'day');
+		print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+		print $bon->methodes_trans[$bon->method_trans];
 		print '</td></tr>';
-
-		// Status
-		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
-		print '<td>'.$bon->getLibStatut(1).'</td>';
-		print '</tr>';
-
-		if($bon->date_trans <> 0)
-		{
-			$muser = new User($db);
-			$muser->fetch($bon->user_trans);
-
-			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
-			print dol_print_date($bon->date_trans,'day');
-			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
-			print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
-			print $bon->methodes_trans[$bon->method_trans];
-			print '</td></tr>';
-		}
-		if($bon->date_credit <> 0)
-		{
-			print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
-			print dol_print_date($bon->date_credit,'day');
-			print '</td></tr>';
-		}
-
-		print '</table>';
-		dol_fiche_end();
-
-		if($bon->date_trans == 0  && $user->rights->prelevement->bons->send)
-		{
-			print '<form method="post" name="userfile" action="fiche.php?id='.$bon->id.'" enctype="multipart/form-data">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="infotrans">';
-			print '<table class="border" width="100%">';
-			print '<tr class="liste_titre">';
-			print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
-			print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
-			print $form->select_date('','','','','',"userfile");
-			print '</td></tr>';
-			print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
-			print $form->selectarray("methode",$bon->methodes_trans);
-			print '</td></tr>';
-			print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-			print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
-			print '<input class="flat" type="file" name="userfile"><br>';
-			print '</td></tr>';
-			print '</table><br>';
-			print '<center><input type="submit" class="button" value="'.$langs->trans("Send").'">';
-			print '</form>';
-		}
-
-		if($bon->date_trans <> 0 && $bon->date_credit == 0 && $user->rights->prelevement->bons->credit)
-		{
-			print '<form name="infocredit" method="post" action="fiche.php?id='.$bon->id.'">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="action" value="infocredit">';
-			print '<table class="border" width="100%">';
-			print '<tr class="liste_titre">';
-			print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
-			print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
-			print $form->select_date('','','','','',"infocredit");
-			print '</td></tr>';
-			print '</table><br>';
-			print '<center><input type="submit" class="button" value="'.$langs->trans("ClassCredited").'">';
-			print '</form>';
-		}
 	}
-	else
+	if($bon->date_credit <> 0)
 	{
-		dol_print_error($db);
+		print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+		print dol_print_date($bon->date_credit,'day');
+		print '</td></tr>';
+	}
+
+	print '</table>';
+
+	print '<br>';
+
+	print '<table class="border" width="100%"><tr><td width="20%">';
+	print $langs->trans("WithdrawalFile").'</td><td>';
+	$relativepath = 'receipts/'.$bon->ref;
+	print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+	print '</td></tr></table>';
+
+	dol_fiche_end();
+
+
+
+
+	if (empty($bon->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted')
+	{
+		print '<form method="post" name="userfile" action="fiche.php?id='.$bon->id.'" enctype="multipart/form-data">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="infotrans">';
+		print '<table class="border" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
+		print $form->select_date('','','','','',"userfile",1,1);
+		print '</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
+		print $form->selectarray("methode",$bon->methodes_trans);
+		print '</td></tr>';
+/*			print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
+		print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
+		print '<input class="flat" type="file" name="userfile"><br>';
+		print '</td></tr>';*/
+		print '</table><br>';
+		print '<center><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("SetToStatusSent")).'">';
+		print '</form>';
+	}
+
+	if (! empty($bon->date_trans) && $bon->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited')
+	{
+		print '<form name="infocredit" method="post" action="fiche.php?id='.$bon->id.'">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="infocredit">';
+		print '<table class="border" width="100%">';
+		print '<tr class="liste_titre">';
+		print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
+		print '<tr><td width="20%">'.$langs->trans('CreditDate').'</td><td>';
+		print $form->select_date('','','','','',"infocredit",1,1);
+		print '</td></tr>';
+		print '</table>';
+		print '<br>'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice");
+		print '<center><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("ClassCredited")).'">';
+		print '</form>';
+	}
+
+
+	// Actions
+	if ($action != 'settransmitted' && $action != 'setcredited')
+	{
+		print "\n<div class=\"tabsAction\">\n";
+
+		if (empty($bon->date_trans) && $user->rights->prelevement->bons->send)
+		{
+			print "<a class=\"butAction\" href=\"fiche.php?action=settransmitted&id=".$bon->id."\">".$langs->trans("SetToStatusSent")."</a>";
+		}
+
+		if (! empty($bon->date_trans) && $bon->date_credit == 0)
+		{
+			print "<a class=\"butAction\" href=\"fiche.php?action=setcredited&id=".$bon->id."\">".$langs->trans("ClassCredited")."</a>";
+		}
+
+		print "<a class=\"butActionDelete\" href=\"fiche.php?action=confirm_delete&id=".$bon->id."\">".$langs->trans("Delete")."</a>";
+
+		print "</div>";
 	}
 }
 
-/* ************************************************************************** */
-/*                                                                            */
-/* Barre d'action                                                             */
-/*                                                                            */
-/* ************************************************************************** */
-
-/*
-print "\n</div>\n<div class=\"tabsAction\">\n";
-
-if ($bon->statut == 0)
-{
-	print "<a class=\"butAction\" href=\"fiche.php?action=credite&amp;id=$bon->id\">".$langs->trans("ClassCredited")."</a>";
-}
-*/
-print "</div>";
-
-$db->close();
 
 llxFooter();
+
+$db->close();
 ?>
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 8dba0b37cae..2f2dd82fcb7 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  * Copyright (C) 2011      Juanjo Menent		<jmenent@2byte.es>
  *
@@ -93,10 +93,10 @@ print '</td><td valign="top" width="70%">';
  * Withdraw receipts
  */
 $limit=5;
-$sql = "SELECT p.rowid, p.ref, p.amount, p.datec";
-$sql .= " ,p.statut ";
-$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-$sql .= " ORDER BY datec DESC LIMIT ".$limit;
+$sql = "SELECT p.rowid, p.ref, p.amount, p.datec, p.statut";
+$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+$sql.= " ORDER BY datec DESC";
+$sql.= $db->plimit($limit);
 
 $result = $db->query($sql);
 if ($result)
@@ -110,6 +110,7 @@ if ($result)
     print '<tr class="liste_titre"><td>'.$langs->trans("LastWithdrawalReceipt",$limit).'</td>';
     print '<td>'.$langs->trans("Date").'</td>';
     print '<td align="right">'.$langs->trans("Amount").'</td>';
+    print '<td align="right">'.$langs->trans("Status").'</td>';
     print '</tr>';
 
     while ($i < min($num,$limit))
@@ -117,15 +118,17 @@ if ($result)
         $obj = $db->fetch_object($result);
         $var=!$var;
 
-        print "<tr $bc[$var]><td>";
-
-        print '<img border="0" src="./img/statut'.$obj->statut.'.png"></a>&nbsp;';
-
-        print '<a href="fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
+        print "<tr ".$bc[$var].">";
 
+        print "<td>";
+        $bprev->id=$obj->rowid;
+        $bprev->ref=$obj->ref;
+        $bprev->statut=$obj->statut;
+        print $bprev->getNomUrl(1);
+        print "</td>\n";
         print '<td>'.dol_print_date($db->jdate($obj->datec),"dayhour")."</td>\n";
-
         print '<td align="right">'.price($obj->amount)."</td>\n";
+        print '<td align="right">'.$bprev->getLibStatut(3)."</td>\n";
 
         print "</tr>\n";
         $i++;
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index 4e9636af6a4..6276e745d72 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -65,13 +65,6 @@ if ($prev_id)
 		print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
 		print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-		print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
-
-		$relativepath = 'receipts/'.$bon->ref;
-
-		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
-
-		print '</td></tr>';
 
 		// Status
 		print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
@@ -99,7 +92,16 @@ if ($prev_id)
 
 		print '</table>';
 
-		print '</div>';
+		print '<br>';
+
+		print '<table class="border" width="100%"><tr><td width="20%">';
+		print $langs->trans("WithdrawalFile").'</td><td>';
+		$relativepath = 'receipts/'.$bon->ref;
+		print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+		print '</td></tr></table>';
+
+		dol_fiche_end();
+		
 	}
 	else
 	{
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 3027eb22026..2e28c7e2a5c 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -361,7 +361,7 @@ else
             $object->state_id = $_POST["state_id"];
 
             // We set country_id, country_code and label for the selected country
-            $object->country_id=$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id;
+            $object->country_id=$_POST["country_id"]?$_POST["country_id"]:(empty($objsoc->country_id)?$mysoc->country_id:$objsoc->country_id);
             if ($object->country_id)
             {
             	$tmparray=getCountry($object->country_id,'all');
@@ -434,7 +434,7 @@ else
 
             $colspan=3;
             if ($conf->use_javascript_ajax && $socid > 0) $colspan=2;
-            
+
             // Address
             if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) $object->address = $objsoc->address;	// Predefined with third party
             print '<tr><td>'.$langs->trans("Address");
@@ -442,9 +442,9 @@ else
 
             if ($conf->use_javascript_ajax && $socid > 0)
             {
-	            $rowspan=3; 
+	            $rowspan=3;
 	    		if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
-	
+
 	            print '<td valign="middle" align="center" rowspan="'.$rowspan.'">';
 		        print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
 	            print '</td>';
@@ -460,7 +460,6 @@ else
             print '</td></tr>';
 
             // Country
-            if (dol_strlen(trim($object->fk_pays)) == 0) $object->fk_pays = $objsoc->country_id;	// Predefined with third party
             print '<tr><td>'.$langs->trans("Country").'</td><td colspan="'.$colspan.'">';
             print $form->select_country((isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id),'country_id');
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 600bd44d95c..eb1c4c9e435 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -221,14 +221,16 @@ abstract class CommonObject
      *      @param	int		$rowid              Id of line contact-element
      * 		@param	int		$statut	            New status of link
      *      @param  int		$type_contact_id    Id of contact type (not modified if 0)
+     *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)
      *      @return int                 		<0 if KO, >= 0 if OK
      */
-    function update_contact($rowid, $statut, $type_contact_id=0)
+    function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)
     {
         // Insertion dans la base
         $sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
         $sql.= " statut = ".$statut;
         if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
+        if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
         $sql.= " where rowid = ".$rowid;
         $resql=$this->db->query($sql);
         if ($resql)
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index cf3c7b8ba96..671334982e9 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -170,7 +170,7 @@ class HookManager
                     	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);
+                    	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;
                     }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d2afb9a8633..f031750cb5b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -165,6 +165,10 @@ class Form
                 {
                     $ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname);
                 }
+                else if ($typeofdata == 'datehourpicker')
+                {
+                	$ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname,1,1);
+                }
                 else if (preg_match('/^select;/',$typeofdata))
                 {
                      $arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
@@ -183,7 +187,7 @@ class Form
                     $ret.=$doleditor->Create(1);
                 }
                 $ret.='</td>';
-                if ($typeofdata != 'day' && $typeofdata != 'datepicker') $ret.='<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+                if ($typeofdata != 'day' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker') $ret.='<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
                 $ret.='</tr></table>'."\n";
                 $ret.='</form>'."\n";
             }
@@ -192,6 +196,7 @@ class Form
                 if ($typeofdata == 'email')   $ret.=dol_print_email($value,0,0,0,0,1);
                 elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata))  $ret.=dol_htmlentitiesbr($value);
                 elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');
+                elseif ($typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
                 else if (preg_match('/^select;/',$typeofdata))
                 {
                     $arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
@@ -272,7 +277,7 @@ class Form
                 if (! empty($tmp[1])) $inputOption=$tmp[1];
                 if (! empty($tmp[2])) $savemethod=$tmp[2];
             }
-            else if (preg_match('/^datepicker/',$inputType))
+            else if ((preg_match('/^datepicker/',$inputType)) || (preg_match('/^datehourpicker/',$inputType)))
             {
                 $tmp=explode(':',$inputType);
                 $inputType=$tmp[0];
@@ -2233,7 +2238,7 @@ class Form
         $inputko=array();
 
         // Clean parameters
-        $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
+        $newselectedchoice=empty($selectedchoice)?"no":$selectedchoice;
         
         if (is_array($formquestion) && ! empty($formquestion))
         {
@@ -2613,9 +2618,11 @@ class Form
      *    @param	string		$page        Page
      *    @param	string		$selected    Date preselected
      *    @param    string		$htmlname    Name of input html field
+     *    @param    int			$displayhour Display hour selector
+     *    @param    int			$displaymin	 Display minutes selector
      *    @return	void
      */
-    function form_date($page, $selected, $htmlname)
+    function form_date($page, $selected, $htmlname,$displayhour=0,$displaymin=0)
     {
         global $langs;
 
@@ -2626,7 +2633,7 @@ class Form
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
             print '<tr><td>';
-            print $this->select_date($selected,$htmlname,0,0,1,'form'.$htmlname);
+            print $this->select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname);
             print '</td>';
             print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
             print '</tr></table></form>';
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 09213bdd0b9..5916159bd6e 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -144,10 +144,10 @@ class FormActions
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-        $actioncomm = new ActionComm($this->db);
-        $actioncomm->getActions($socid, $object->id, $typeelement);
+        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement);
+		if (is_numeric($listofactions) && $listofactions < 0) dol_print_error($this->db,'FailedToGetActions');
 
-        $num = count($actioncomm->actions);
+        $num = count($listofactions);
         if ($num)
         {
         	if ($typeelement == 'invoice')   $title=$langs->trans('ActionsOnBill');
@@ -164,17 +164,29 @@ class FormActions
 
         	$total = 0;	$var=true;
         	print '<table class="noborder" width="100%">';
-        	print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans('Ref').'</th><th class="liste_titre">'.$langs->trans('Date').'</th><th class="liste_titre">'.$langs->trans('Action').'</th><th class="liste_titre">'.$langs->trans('By').'</th></tr>';
+        	print '<tr class="liste_titre">';
+        	print '<th class="liste_titre">'.$langs->trans('Ref').'</th>';
+        	print '<th class="liste_titre">'.$langs->trans('Action').'</th>';
+        	print '<th class="liste_titre">'.$langs->trans('Date').'</th>';
+        	print '<th class="liste_titre">'.$langs->trans('By').'</th>';
+        	print '</tr>';
         	print "\n";
 
-        	foreach($actioncomm->actions as $action)
+        	$userstatic = new User($this->db);
+
+        	foreach($listofactions as $action)
         	{
+        		$savlabel=$action->label;
+        		$action->label=$action->ref;
+        		$ref=$action->getNomUrl(1);
+        		$action->label=$savlabel;
+        		$label=$action->getNomUrl(0,38);
+
         		$var=!$var;
         		print '<tr '.$bc[$var].'>';
-        		print '<td>'.$action->getNomUrl(1).'</td>';
+				print '<td>'.$ref.'</td>';
+        		print '<td>'.$label.'</td>';
         		print '<td>'.dol_print_date($action->datep,'day').'</td>';
-        		print '<td title="'.dol_escape_htmltag($action->label).'">'.dol_trunc($action->label,32).'</td>';
-        		$userstatic = new User($this->db);
         		$userstatic->id = $action->author->id;
         		$userstatic->firstname = $action->author->firstname;
         		$userstatic->lastname = $action->author->lastname;
@@ -194,9 +206,10 @@ class FormActions
      *  @param	string		$selected       Type pre-selectionne
      *  @param  string		$htmlname       Nom champ formulaire
      *  @param	string		$excludetype	Type to exclude
+     *  @param	string		$onlyautoornot	Group list by auto events or not
      * 	@return	void
      */
-    function select_type_actions($selected='',$htmlname='actioncode',$excludetype='')
+    function select_type_actions($selected='',$htmlname='actioncode',$excludetype='',$onlyautoornot=0)
     {
         global $langs,$user;
 
@@ -205,12 +218,13 @@ class FormActions
         $caction=new CActionComm($this->db);
         $form=new Form($this->db);
 
-        $arraylist=$caction->liste_array(1, 'code', $excludetype);
-        array_unshift($arraylist,'&nbsp;');     // Add empty line at start
-        //asort($arraylist);
+       	// Suggest a list with manual event or all auto events
+       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+       	//asort($arraylist);
 
         print $form->selectarray($htmlname, $arraylist, $selected);
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
+        if ($user->admin && empty($onlyautoornot)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
     }
 
 }
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index d454cc3d005..ae43f9f34e7 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -143,6 +143,9 @@ class Translate
 	 *  If data for file already loaded, do nothing.
 	 * 	All data in translation array are stored in UTF-8 format.
      *  tab_loaded is completed with $domain key.
+     *  Warning: MAIN_USE_CUSTOM_TRANSLATION is an old deprecated feature. Do not use it. It will revert 
+     *  rule "we keep first entry found with we keep last entry found" so it is probably not what you want to do.
+     *
      *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
      *
 	 *  @param	string	$domain      		File name to load (.lang file). Must be "file" or "file@module" for module language files:
@@ -198,13 +201,14 @@ class Translate
 			// Directory of translation files
 			$file_lang = $searchdir.($modulename?'/'.$modulename:'')."/langs/".$langofdir."/".$newdomain.".lang";
 			$file_lang_osencoded=dol_osencode($file_lang);
+
 			$filelangexists=is_file($file_lang_osencoded);
 
 			//dol_syslog('Translate::Load Try to read for alt='.$alt.' langofdir='.$langofdir.' file_lang='.$file_lang." => filelangexists=".$filelangexists);
 
 			if ($filelangexists)
 			{
-				// TODO Move cache read out of loop on dirs
+				// TODO Move cache read out of loop on dirs or at least filelangexists
 			    $found=false;
 
 				// Enable caching of lang file in memory (not by default)
diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index d9088ba83ba..d03baa648c4 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -729,6 +729,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 				modal: true,
 				buttons: [
 					{
+						id : 'yesButton_' + code,
 						text : yesButton,
 						click : function() {
 							if (action == "set") {
@@ -748,6 +749,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 						}
 					},
 					{
+						id : 'noButton_' + code,
 						text : noButton,
 						click : function() {
 							$(this).dialog("close");
@@ -755,6 +757,10 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 					}
 				]
 			});
+	// For information dialog box only, hide the noButton
+	if (boxConfirm.info) {
+		$("#noButton_" + code).button().hide();
+	}
 }
 
 /* 
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index dba22075612..a44c45128c1 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -93,7 +93,10 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt
 				print '<td nowrap="nowrap">';
 				print $langs->trans("Type");
 				print ' &nbsp;</td><td nowrap="nowrap">';
-				print $formactions->select_type_actions(GETPOST('actioncode'), "actioncode");
+
+				// print $formactions->select_type_actions(GETPOST('actioncode'), "actioncode");
+				print $formactions->select_type_actions(GETPOST('actioncode')?GETPOST('actioncode'):'manual', "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0));
+
 				print '</td></tr>';
 			}
 
@@ -440,9 +443,11 @@ function calendars_prepare_head($param)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'agenda');
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'agenda','remove');
+
     return $head;
 }
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 4b5b4f986ce..ba9511d8d66 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -375,6 +375,11 @@ function ajax_constantonoff($code, $input=array(), $entity=false)
 			// Set constant
 			$("#set_" + code).click(function() {
 				if (input.alert && input.alert.set) {
+					// Posibility to force label of buttons
+					if (input.alert.set.yesButton)
+						yesButton = input.alert.set.yesButton;
+					if (input.alert.set.noButton)
+						noButton = input.alert.set.noButton;
 					confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton);
 				} else {
 					setConstant(url, code, input, entity);
@@ -384,6 +389,11 @@ function ajax_constantonoff($code, $input=array(), $entity=false)
 			// Del constant
 			$("#del_" + code).click(function() {
 				if (input.alert && input.alert.del) {
+					// Posibility to force label of buttons
+					if (input.alert.del.yesButton)
+						yesButton = input.alert.del.yesButton;
+					if (input.alert.del.noButton)
+						noButton = input.alert.del.noButton;
 					confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton);
 				} else {
 					delConstant(url, code, input, entity);
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index ba3f0de1145..c330e55a388 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -51,9 +51,11 @@ function categories_prepare_head($object,$type)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'categories_'.$type);
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'categories_'.$type,'remove');
+
 	return $head;
 }
 
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index a5fe3c5d1f2..8ddf40e2abf 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -777,7 +777,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0)
         if (get_class($object) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
         if (get_class($object) == 'Societe')  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
         $sql.= " WHERE u.rowid = a.fk_user_author";
-        $sql.= " AND a.entity IN (".getEntity('actioncomm').")";
+        $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
         if (get_class($object) == 'Adherent') {
         	$sql.= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
         	if (! empty($object->id))
@@ -916,7 +916,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
         if (get_class($object) == 'Adherent') $sql.= ", ".MAIN_DB_PREFIX."adherent as m";
         if (get_class($object) == 'Societe')  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
         $sql.= " WHERE u.rowid = a.fk_user_author";
-        $sql.= " AND a.entity IN (".getEntity('actioncomm').")";
+        $sql.= " AND a.entity IN (".getEntity('agenda', 1).")";
         if (get_class($object) == 'Adherent') $sql.= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
         if (get_class($object) == 'Adherent' && $object->id) $sql.= " AND a.fk_element = ".$object->id;
         if (get_class($object) == 'Societe'  && $object->id) $sql.= " AND a.fk_soc = ".$object->id;
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 8009ba6e31d..2e41d7276fa 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -63,7 +63,7 @@ function contact_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'contact');
 
     $head[$h][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;
@@ -71,7 +71,7 @@ function contact_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'contact','remove');
 
 	return $head;
 }
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index 90a15cf958e..238bfb2a7b3 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -38,7 +38,7 @@ function contract_prepare_head($object)
 	$head[$h][1] = $langs->trans("ContractCard");
 	$head[$h][2] = 'card';
 	$h++;
-	
+
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
@@ -50,9 +50,9 @@ function contract_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'contract');
-    
+
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
@@ -71,6 +71,8 @@ function contract_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'contract','remove');
+
 	return $head;
 }
 
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 08732c271af..463375baca0 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -42,7 +42,7 @@ function fichinter_prepare_head($object)
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
-	
+
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
@@ -62,9 +62,9 @@ function fichinter_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention');
-    
+
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
@@ -83,7 +83,9 @@ function fichinter_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-	return $head;
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention','remove');
+
+    return $head;
 }
 
 ?>
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 887cae3115d..21db6d63fb8 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -52,7 +52,7 @@ function facturefourn_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_invoice');
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -77,7 +77,9 @@ function facturefourn_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-	return $head;
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_invoice','remove');
+
+    return $head;
 }
 
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7aa197be58f..715d84e3067 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2703,9 +2703,8 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="")
 	// Some test to guess with no need to make database access
 	if ($mysoc->country_code == 'ES') // For spain, localtaxes are qualified if both supplier and seller use local taxe
 	{
-		if ($local == 1 && (! $thirdparty_seller->localtax1_assuj || ! $thirdparty_buyer->localtax1_assuj)) return 0;
-		if ($local == 2 && (! $thirdparty_seller->localtax2_assuj || ! $thirdparty_buyer->localtax2_assuj)) return 0;
-	
+		if ($local == 1 && ! $thirdparty_buyer->localtax1_assuj) return 0;
+		if ($local == 2 && ! $thirdparty_seller->localtax2_assuj) return 0;
 	}
 	else 
 	{
@@ -2994,18 +2993,27 @@ function get_default_npr($thirdparty_seller, $thirdparty_buyer, $idprod)
  */
 function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $idprod=0)
 {
+	global $mysoc;
+	
 	if (!is_object($thirdparty_seller)) return -1;
 	if (!is_object($thirdparty_buyer)) return -1;
 
-	if ($local==1) //RE
+	if ($local==1) // Localtax 1
 	{
-		// Si vendeur non assujeti a RE, localtax1 par default=0
-		if (is_numeric($thirdparty_seller->localtax1_assuj) && ! $thirdparty_seller->localtax1_assuj) return 0;
-		if (! is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj=='localtax1off') return 0;
+		if ($mysoc->country_code == 'ES')
+		{
+			if (is_numeric($thirdparty_buyer->localtax1_assuj) && ! $thirdparty_buyer->localtax1_assuj) return 0;
+		}
+		else 
+		{
+			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
+			if (is_numeric($thirdparty_seller->localtax1_assuj) && ! $thirdparty_seller->localtax1_assuj) return 0;
+			if (! is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj=='localtax1off') return 0;
+		}
 	}
-	elseif ($local==2) //IRPF
+	elseif ($local==2) //I Localtax 2
 	{
-		// Si vendeur non assujeti a IRPF, localtax2 par default=0
+		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
 		if (is_numeric($thirdparty_seller->localtax2_assuj) && ! $thirdparty_seller->localtax2_assuj) return 0;
 		if (! is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj=='localtax2off') return 0;
 	}
@@ -4208,35 +4216,6 @@ 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/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 8d3990942c1..7fd7ab97248 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -39,7 +39,7 @@ function facture_prepare_head($object)
 	$head[$h][1] = $langs->trans('CardBill');
 	$head[$h][2] = 'compta';
 	$h++;
-	
+
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
@@ -68,9 +68,9 @@ function facture_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice');
-    
+
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
     	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
@@ -93,6 +93,8 @@ function facture_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice','remove');
+
 	return $head;
 }
 
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 88e740c1245..835708295c3 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -183,9 +183,11 @@ function member_stats_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'member_stats');
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'member_stats','remove');
+
     return $head;
 }
 ?>
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 3fc1bc73f04..f5c8b41f0ec 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -67,7 +67,7 @@ function commande_prepare_head($object)
 		$head[$h][2] = 'preview';
 		$h++;
 	}
-	
+
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
@@ -79,7 +79,7 @@ function commande_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'order');
 
     $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
@@ -90,7 +90,7 @@ function commande_prepare_head($object)
 	$head[$h][1] = $langs->trans('Documents');
 	$head[$h][2] = 'documents';
 	$h++;
-	
+
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id;
@@ -104,7 +104,9 @@ function commande_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-	return $head;
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
+
+    return $head;
 }
 
 ?>
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 2613d773ab1..219602f761e 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -80,10 +80,8 @@ 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 else FPDF
+	// We use by default TCPDF
 	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';
 
@@ -92,7 +90,7 @@ function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 	//$metric=$arrayformat['unit'];
 
 	// Protection et encryption du pdf
-	if (empty($conf->global->MAIN_USE_FPDF) && ! empty($conf->global->PDF_SECURITY_ENCRYPTION))
+	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
 	{
 		/* Permission supported by TCPDF
 		 - print : Print the document;
@@ -105,11 +103,20 @@ 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 (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 (! 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');
+		}
 		$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);
@@ -119,43 +126,9 @@ 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
  *
@@ -718,7 +691,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	{
 		$pdf->SetFont('','B',7);
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line1, 0, 'C', 0);
+		$pdf->MultiCell(200, 2, $line1, 0, 'C', 0);
 		$posy-=3;
 		$pdf->SetFont('','',7);
 	}
@@ -727,7 +700,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	{
 		$pdf->SetFont('','B',7);
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line2, 0, 'C', 0);
+		$pdf->MultiCell(200, 2, $line2, 0, 'C', 0);
 		$posy-=3;
 		$pdf->SetFont('','',7);
 	}
@@ -735,23 +708,22 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
 	if (! empty($line3))
 	{
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line3, 0, 'C', 0);
+		$pdf->MultiCell(200, 2, $line3, 0, 'C', 0);
 	}
 
 	if (! empty($line4))
 	{
 		$posy-=3;
 		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm'], 2, $line4, 0, 'C', 0);
+		$pdf->MultiCell(200, 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);
-		//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);
+		$pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+		//print 'xxx'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
 	}
 
 	return $marginwithfooter;
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index c370172430a..2b4f6264068 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -75,9 +75,11 @@ function prelevement_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement');
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'prelevement','remove');
+
     return $head;
 }
 
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index cb345399733..ee547ca49d7 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -113,7 +113,7 @@ function product_prepare_head($object, $user)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'product');
 
     $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
@@ -158,8 +158,8 @@ function product_admin_prepare_head($object=null)
 
 	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $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,'product_admin');
 
 	$head[$h][0] = DOL_URL_ROOT.'/product/admin/product_extrafields.php';
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index c051649fb44..6265ecdb52b 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -61,7 +61,7 @@ function project_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'project');
 
     $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
@@ -96,7 +96,9 @@ function project_prepare_head($object)
    	$head[$h][2] = 'gantt';
    	$h++;
 
-   	return $head;
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
+
+    return $head;
 }
 
 
@@ -130,7 +132,7 @@ function task_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
 
     $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');;
@@ -147,6 +149,8 @@ function task_prepare_head($object)
     $head[$h][2] = 'task_notes';
     $h++;
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
+
     return $head;
 }
 
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index a0922fc4c4c..9c44b578f14 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -73,7 +73,7 @@ function propal_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'propal');
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -98,6 +98,8 @@ function propal_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'propal','remove');
+
 	return $head;
 }
 
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index d031bdd167c..5ba774d1b3e 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -66,10 +66,12 @@ function shipping_prepare_head($object)
 
 	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $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,'delivery');
 
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
+
 	return $head;
 }
 
@@ -105,10 +107,12 @@ function delivery_prepare_head($object)
 
 	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $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,'delivery');
 
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'delivery','remove');
+
 	return $head;
 }
 
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 7fb81297cb3..22694c39217 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -66,7 +66,7 @@ function stock_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'stock');
 
     $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
@@ -74,7 +74,9 @@ function stock_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-	return $head;
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'stock','remove');
+
+    return $head;
 }
 
 ?>
\ No newline at end of file
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index eab91d27d4b..96ae34899fb 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -45,7 +45,7 @@ function tax_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'tax');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
@@ -58,6 +58,8 @@ function tax_prepare_head($object)
     $head[$h][2] = 'info';
     $h++;
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'tax','remove');
+
     return $head;
 }
 
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index d2c150cf7da..e0380e6ef55 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -33,23 +33,25 @@ function trip_prepare_head($object)
 
 	$h = 0;
 	$head = array();
-	
+
 	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/fiche.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $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,'trip');
-	
+
 	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
+
 	return $head;
 }
 
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 7c484b5c923..a4e6a9623c5 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -81,8 +81,8 @@ function user_prepare_head($object)
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:conditiontoshow:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname:Title:@mymodule:conditiontoshow:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $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,'user');
 
     if (! empty($user->societe_id))
@@ -98,6 +98,8 @@ function user_prepare_head($object)
     	$h++;
     }
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'user','remove');
+
 	return $head;
 }
 
@@ -140,9 +142,11 @@ function group_prepare_head($object)
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'group');
 
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'group','remove');
+
     return $head;
 }
 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 95d92015841..60d28a6c07b 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1,1247 +1,1238 @@
-<?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))
-					{
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
-						//$pdf->SetDrawColor(190,190,200);
-						$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
-			{
-				//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);
-	}
-
-}
-
-?>
+<?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->localtax1_type=array();
+		$this->localtax2_type=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");
+
+		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;
+
+					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;
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*';
+					if (! isset($this->tva[$vatrate])) 				$this->tva[$vatrate]='';
+					$this->tva[$vatrate] += $tvaligne;
+
+					// 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 = '".$object->client->country_code."'";
+					$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+					$resqlt=$this->db->query($sql);
+					if ($resqlt)
+					{
+						$objt = $this->db->fetch_object($resqlt);
+						$this->localtax1[$objt->localtax1_type][$objt->localtax1]+=$localtax1ligne;
+						$this->localtax2[$objt->localtax2_type][$objt->localtax2]+=$localtax2ligne;
+					}
+
+					// Add line
+					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
+					{
+						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
+						//$pdf->SetDrawColor(190,190,200);
+						$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
+			{
+				//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/expedition/doc/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
index 374474e1337..a15f13a5cda 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
@@ -84,7 +84,6 @@ class pdf_expedition_merou extends ModelePdfExpedition
 	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
 		global $user,$conf,$langs,$mysoc;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$object->fetch_thirdparty();
 
@@ -147,6 +146,7 @@ class pdf_expedition_merou extends ModelePdfExpedition
 				$nblignes = count($object->lines);
 
 				$pdf=pdf_getInstance($this->format,'mm','l');
+				$default_font_size = pdf_getPDFFontSize($outputlangs);
 				$heightforinfotot = 0;	// 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)
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
index 6cac5d287d9..d84905a53a8 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
@@ -87,7 +87,6 @@ class pdf_expedition_rouget extends ModelePdfExpedition
 	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
 		global $user,$conf,$langs;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$object->fetch_thirdparty();
 
@@ -133,7 +132,8 @@ class pdf_expedition_rouget extends ModelePdfExpedition
 				$nblignes = count($object->lines);
 
 				$pdf=pdf_getInstance($this->format);
-                $heightforinfotot = 0;	// Height reserved to output the info and total part
+				$default_font_size = pdf_getPDFFontSize($outputlangs);
+				$heightforinfotot = 0;	// 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);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index c7d603f0622..13ec3392364 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -3,7 +3,6 @@
  * 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
@@ -139,7 +138,7 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
-		global $user,$langs,$conf,$mysoc,$db;
+		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
@@ -151,8 +150,6 @@ class pdf_crabe extends ModelePDFFactures
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
 		if ($conf->facture->dir_output)
 		{
 			$object->fetch_thirdparty();
@@ -187,6 +184,7 @@ class pdf_crabe extends ModelePDFFactures
 				$nblignes = count($object->lines);
 
                 $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)
@@ -198,6 +196,7 @@ class pdf_crabe extends ModelePDFFactures
                     $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))
                 {
@@ -366,40 +365,22 @@ 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;
-					
-					// 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;
+					$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;
 
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
@@ -841,84 +822,6 @@ 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
@@ -927,7 +830,6 @@ class pdf_crabe extends ModelePDFFactures
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
 						$tvacompl='';
 						if (preg_match('/\*/',$tvakey))
 						{
@@ -937,31 +839,52 @@ 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($tvaval), 0, 'R', 1);
+						$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
 					}
 				}
 
-				//Local tax 1 after VAT
-				if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				if (! $this->atleastoneratenotnull)	// If no vat at all
 				{
-					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 )
+					$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)
 						{
-							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))
@@ -969,44 +892,27 @@ class pdf_crabe extends ModelePDFFactures
 									$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);
+								$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($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);
-								}
+								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $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 (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+					{
+						//Local tax 2
+						foreach($this->localtax2 as $tvakey => $tvaval)
 						{
-						    // retrieve global local tax
-							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))
@@ -1014,21 +920,12 @@ class pdf_crabe extends ModelePDFFactures
 									$tvakey=str_replace('*','',$tvakey);
 									$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 								}
-								$totalvat = $outputlangs->transnoentities("TotalLT2".$mysoc->pays_code).' ';
+								$totalvat =$outputlangs->transnoentities("TotalLT2".$mysoc->country_code).' ';
+								$totalvat.=vatrate($tvakey,1).$tvacompl;
+								$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 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);
-								}
+								$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+								$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $tvaval), 0, 'R', 1);
 							}
 						}
 					}
@@ -1039,10 +936,11 @@ class pdf_crabe extends ModelePDFFactures
 				$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);
-
+				$text=$outputlangs->transnoentities("TotalTTC");
+				if ($object->type == 2) $text=$outputlangs->transnoentities("TotalTTCToYourCredit");
+				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $text, $useborder, 'L', 1);
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc), $useborder, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $object->total_ttc), $useborder, 'R', 1);
 			}
 		}
 
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 5d3246297bf..130f4409386 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -117,8 +117,6 @@ class pdf_soleil extends ModelePDFFicheinter
 		$outputlangs->load("companies");
 		$outputlangs->load("interventions");
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
 		if ($conf->ficheinter->dir_output)
 		{
             $object->fetch_thirdparty();
@@ -140,6 +138,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			if (file_exists($dir))
 			{
                 $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)
diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
index a71f7be8aa7..3a1ed05dffa 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
@@ -113,7 +113,6 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	function write_file($object,$outputlangs)
 	{
 		global $user,$langs,$conf;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		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
@@ -150,6 +149,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			if (file_exists($dir))
 			{
                 $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)
diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
index 6a38cd9f705..888dadc62d6 100644
--- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
@@ -108,8 +108,6 @@ class pdf_baleine extends ModelePDFProjects
 		{
 			$nblignes = count($object->lines);
 
-			$default_font_size = pdf_getPDFFontsize($outputlangs);
-
 			$objectref = dol_sanitizeFileName($object->ref);
 			$dir = $conf->projet->dir_output;
 			if (! preg_match('/specimen/i',$objectref)) $dir.= "/" . $objectref;
@@ -127,6 +125,7 @@ class pdf_baleine extends ModelePDFProjects
 			if (file_exists($dir))
 			{
                 $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)
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 93a415bd7c1..fbe8534923d 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -119,6 +119,8 @@ class pdf_azur extends ModelePDFPropales
 		$this->tva=array();
 		$this->localtax1=array();
 		$this->localtax2=array();
+		$this->localtax1_type=array();
+		$this->localtax2_type=array();
 		$this->atleastoneratenotnull=0;
 		$this->atleastonediscount=0;
 	}
@@ -137,7 +139,7 @@ class pdf_azur extends ModelePDFPropales
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
 	{
-		global $user,$langs,$conf,$mysoc,$db;
+		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
@@ -150,8 +152,6 @@ class pdf_azur extends ModelePDFPropales
 		$outputlangs->load("propal");
 		$outputlangs->load("products");
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
 		if ($conf->propal->dir_output)
 		{
 			$object->fetch_thirdparty();
@@ -186,6 +186,7 @@ class pdf_azur extends ModelePDFPropales
 
 				// 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)
@@ -363,40 +364,31 @@ 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;
-					// 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;
 
+					// 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 = '".$object->client->country_code."'";
+					$sql .= " AND t.taux = ".$vatrate." AND t.active = 1";
+
+					$resqlt=$this->db->query($sql);
+					if ($resqlt)
+					{
+						$objt = $this->db->fetch_object($resqlt);
+						$this->localtax1[$objt->localtax1_type][$objt->localtax1]+=$localtax1ligne;
+						$this->localtax2[$objt->localtax2_type][$objt->localtax2]+=$localtax2ligne;
+					}
+
 					// Add line
 					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
 					{
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index d210a14a7f4..0a723add648 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -146,8 +146,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
 		if ($conf->fournisseur->dir_output.'/facture')
 		{
 			$object->fetch_thirdparty();
@@ -184,6 +182,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$nblignes = count($object->lines);
 
                 $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)
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index eb35a4b8b3b..69dcbaf2903 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -156,8 +156,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$outputlangs->load("products");
 		$outputlangs->load("orders");
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
-
 		if ($conf->fournisseur->dir_output.'/commande')
 		{
 			$object->fetch_thirdparty();
@@ -196,6 +194,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$nblignes = count($object->lines);
 
                 $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)
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index b3e2633fe9d..e3bf26df606 100755
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -127,7 +127,7 @@ class InterfaceActionsAuto
             $langs->load("other");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->nom);
             $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->nom);
             if ($object->prefix) $object->actionmsg.=" (".$object->prefix.")";
@@ -146,7 +146,7 @@ class InterfaceActionsAuto
             $langs->load("contracts");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -160,7 +160,7 @@ class InterfaceActionsAuto
             $langs->load("propal");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -174,7 +174,7 @@ class InterfaceActionsAuto
             $langs->load("propal");
             $langs->load("agenda");
 
-            $object->actiontypecode='AC_EMAIL';
+            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -192,7 +192,7 @@ class InterfaceActionsAuto
             $langs->load("propal");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -206,7 +206,7 @@ class InterfaceActionsAuto
             $langs->load("propal");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -220,7 +220,7 @@ class InterfaceActionsAuto
             $langs->load("orders");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -234,7 +234,7 @@ class InterfaceActionsAuto
             $langs->load("orders");
             $langs->load("agenda");
 
-            $object->actiontypecode='AC_EMAIL';
+            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -253,7 +253,7 @@ class InterfaceActionsAuto
             $langs->load("bills");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -268,7 +268,7 @@ class InterfaceActionsAuto
             $langs->load("bills");
             $langs->load("agenda");
 
-            $object->actiontypecode='AC_EMAIL';
+            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -288,7 +288,7 @@ class InterfaceActionsAuto
             $langs->load("agenda");
 
             // Values for this action can't be defined by caller.
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -303,7 +303,7 @@ class InterfaceActionsAuto
             $langs->load("bills");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -318,7 +318,7 @@ class InterfaceActionsAuto
             $langs->load("interventions");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -335,7 +335,7 @@ class InterfaceActionsAuto
             $langs->load("interventions");
             $langs->load("agenda");
 
-            $object->actiontypecode='AC_EMAIL';
+            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -351,7 +351,7 @@ class InterfaceActionsAuto
             $langs->load("sendings");
             $langs->load("agenda");
 
-            $object->actiontypecode='AC_SHIP';
+            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -369,7 +369,7 @@ class InterfaceActionsAuto
             $langs->load("orders");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -385,7 +385,7 @@ class InterfaceActionsAuto
             $langs->load("agenda");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_EMAIL';
+            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -404,7 +404,7 @@ class InterfaceActionsAuto
             $langs->load("bills");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -420,7 +420,7 @@ class InterfaceActionsAuto
             $langs->load("agenda");
             $langs->load("orders");
 
-            $object->actiontypecode='AC_EMAIL';
+            $object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
             if (empty($object->actionmsg))
             {
@@ -439,7 +439,7 @@ class InterfaceActionsAuto
             $langs->load("bills");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -454,7 +454,7 @@ class InterfaceActionsAuto
             $langs->load("bills");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
@@ -471,7 +471,7 @@ class InterfaceActionsAuto
             $langs->load("members");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -488,7 +488,7 @@ class InterfaceActionsAuto
             $langs->load("members");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -511,7 +511,7 @@ class InterfaceActionsAuto
             $langs->load("members");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
@@ -528,7 +528,7 @@ class InterfaceActionsAuto
             $langs->load("members");
             $langs->load("agenda");
 
-			$object->actiontypecode='AC_OTH';
+			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->ref);
             $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 2bd5b27537c..721a0c94e52 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -294,7 +294,7 @@ class Export
 				}
 				break;
 			case 'Boolean':
-				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
 				break;
 			case 'Status':
 			case 'List':
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 8f4ceefcba6..6ffcc39e1c8 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1122,7 +1122,7 @@ print '<br>';
 
 llxFooter();
 
-$db->close();
+$db->close();
 
 
 /**
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index ba260ea4f19..62eec4ebaaf 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -207,7 +207,6 @@ 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/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index d8eaef777ad..775116d8667 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -889,7 +889,7 @@ class CommandeFournisseur extends CommonOrder
             dol_syslog(get_class($this)."::commande sql=".$sql, LOG_DEBUG);
             if ($this->db->query($sql))
             {
-                $result = 0;
+                $result = 1;
                 $this->log($user, 3, $date, $comment);
             }
             else
@@ -954,34 +954,67 @@ class CommandeFournisseur extends CommonOrder
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql.= " SET ref='(PROV".$this->id.")'";
-            $sql.= " WHERE rowid=".$this->id;
-            dol_syslog(get_class($this)."::create sql=".$sql);
-            if ($this->db->query($sql))
-            {
-                // On logue creation pour historique
-                $this->log($user, 0, time());
+			if ($this->id) {
+				$num=count($this->lines);
 
-                if (! $notrigger)
-                {
-                    // Appel des triggers
-                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-                    $interface=new Interfaces($this->db);
-                    $result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
-                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
-                    // Fin appel triggers
-                }
+	            /*
+	             *  Insertion du detail des produits dans la base
+	             */
+	            for ($i=0;$i<$num;$i++)
+	            {
+	                $result = $this->addline(
+	                    $this->lines[$i]->desc,
+	                    $this->lines[$i]->subprice,
+	                    $this->lines[$i]->qty,
+	                    $this->lines[$i]->tva_tx,
+	                    $this->lines[$i]->localtax1_tx,
+	                    $this->lines[$i]->localtax2_tx,
+	                    $this->lines[$i]->fk_product,
+	                    0,
+	                    $this->lines[$i]->ref_fourn,
+	                    $this->lines[$i]->remise_percent,
+	                    'HT',
+	                    0,
+	                    $this->lines[$i]->info_bits
+	                );
+	                if ($result < 0)
+	                {
+	                    $this->error=$this->db->lasterror();
+	                    dol_print_error($this->db);
+	                    $this->db->rollback();
+	                    return -1;
+	                }
+	            }
 
-                $this->db->commit();
-                return $this->id;
-            }
-            else
-            {
-                $this->error=$this->db->error();
-                dol_syslog(get_class($this)."::create: Failed -2 - ".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -2;
+	            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+	            $sql.= " SET ref='(PROV".$this->id.")'";
+	            $sql.= " WHERE rowid=".$this->id;
+	            dol_syslog(get_class($this)."::create sql=".$sql);
+	            if ($this->db->query($sql))
+	            {
+	                // On logue creation pour historique
+	                $this->log($user, 0, time());
+
+	                if (! $notrigger)
+	                {
+	                    // Appel des triggers
+	                    include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+	                    $interface=new Interfaces($this->db);
+	                    $result=$interface->run_triggers('ORDER_SUPPLIER_CREATE',$this,$user,$langs,$conf);
+	                    if ($result < 0) { $error++; $this->errors=$interface->errors; }
+	                    // Fin appel triggers
+	                }
+
+	                $this->db->commit();
+	                return $this->id;
+	            }
+	            else
+	            {
+	                $this->error=$this->db->error();
+	                dol_syslog(get_class($this)."::create: Failed -2 - ".$this->error, LOG_ERR);
+	                $this->db->rollback();
+	                return -2;
+	            }
             }
         }
         else
@@ -993,6 +1026,69 @@ class CommandeFournisseur extends CommonOrder
         }
     }
 
+    /**
+     *	Load an object from its id and create a new one in database
+     *
+     *	@param		HookManager	$hookmanager	Hook manager instance
+     *	@return		int							New id of clone
+     */
+    function createFromClone($hookmanager=false)
+    {
+        global $conf,$user,$langs;
+
+        $error=0;
+
+        $this->db->begin();
+
+        // Load source object
+        $objFrom = dol_clone($this);
+
+        $this->id=0;
+        $this->statut=0;
+
+        // Clear fields
+        $this->user_author_id     = $user->id;
+        $this->user_valid         = '';
+        $this->date_creation      = '';
+        $this->date_validation    = '';
+        $this->ref_supplier         = '';
+
+        // Create clone
+        $result=$this->create($user);
+        if ($result < 0) $error++;
+
+        if (! $error)
+        {
+            // Hook of thirdparty module
+            if (is_object($hookmanager))
+            {
+                $parameters=array('objFrom'=>$objFrom);
+                $action='';
+                $reshook=$hookmanager->executeHooks('createFrom',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+                if ($reshook < 0) $error++;
+            }
+
+            // Appel des triggers
+            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+            $interface=new Interfaces($this->db);
+            $result=$interface->run_triggers('ORDER_SUPPLIER_CLONE',$this,$user,$langs,$conf);
+            if ($result < 0) { $error++; $this->errors=$interface->errors; }
+            // Fin appel triggers
+        }
+
+        // End
+        if (! $error)
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+        else
+        {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
     /**
      *	Add order line
      *
@@ -1044,7 +1140,6 @@ class CommandeFournisseur extends CommonOrder
         }
         $desc=trim($desc);
 
-
         // Check parameters
         if ($qty < 1 && ! $fk_product)
         {
@@ -1053,7 +1148,6 @@ class CommandeFournisseur extends CommonOrder
         }
         if ($type < 0) return -1;
 
-
         if ($this->statut == 0)
         {
             $this->db->begin();
@@ -1076,7 +1170,7 @@ class CommandeFournisseur extends CommonOrder
                         $this->error="No price found for this quantity. Quantity may be too low ?";
                         $this->db->rollback();
                         dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
-                        return -1;
+                        return -1; // FIXME this return create an error in jenkins
                     }
                     if ($result < -1)
                     {
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index e9e11a5d557..e7e4c1d6161 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -73,18 +73,31 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('ordersuppliercard'));
 
-$mesg='';
-$errors=array();
-
 $object = new CommandeFournisseur($db);
 
+// Load object
+if ($id > 0 || ! empty($ref))
+{
+	$ret = $object->fetch($id, $ref);
+	if ($ret < 0) dol_print_error($db,$object->error);
+	$ret = $object->fetch_thirdparty();
+	if ($ret < 0) dol_print_error($db,$object->error);
+}
+else if (! empty($socid))
+{
+	$fourn = new Fournisseur($db);
+	$ret=$fourn->fetch($socid);
+	if ($ret < 0) dol_print_error($db,$object->error);
+	$object->socid = $fourn->id;
+	$ret = $object->fetch_thirdparty();
+	if ($ret < 0) dol_print_error($db,$object->error);
+}
 
 /*
  * Actions
  */
 if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
     $result=$object->setValueFrom('ref_supplier',GETPOST('ref_supplier','alpha'));
     if ($result < 0) dol_print_error($db, $object->error);
 }
@@ -92,14 +105,12 @@ if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
 // conditions de reglement
 if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
     $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
 }
 
 // mode de reglement
 else if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
     $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
 }
 
@@ -108,44 +119,38 @@ if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->cree
 {
 	$datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'),GETPOST('liv_year','int'));
 
-	$object->fetch($id);
 	$result=$object->set_date_livraison($user,$datelivraison);
 	if ($result < 0)
 	{
-		$mesg='<div class="error">'.$object->error.'</div>';
+		setEventMessage($object->error, 'errors');
 	}
 }
 
 // Set project
 else if ($action ==	'classin' && $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
     $object->setProject($projectid);
 }
 
 else if ($action ==	'setremisepercent' && $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
     $result = $object->set_remise($user, $_POST['remise_percent']);
 }
 
 else if ($action == 'setnote_public' && $user->rights->fournisseur->commande->creer)
 {
-	$object->fetch($id);
 	$result=$object->update_note_public(dol_html_entity_decode(GETPOST('note_public'), ENT_QUOTES));
 	if ($result < 0) dol_print_error($db,$object->error);
 }
 
 else if ($action == 'setnote' && $user->rights->fournisseur->commande->creer)
 {
-	$object->fetch($id);
 	$result=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES));
 	if ($result < 0) dol_print_error($db,$object->error);
 }
 
 else if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver)
 {
-    $result = $object->fetch($id);
     if (in_array($object->statut, array(1, 5, 6, 7, 9)))
     {
         if ($object->statut == 1) $newstatus=0;	// Validated->Draft
@@ -173,46 +178,43 @@ else if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver)
 else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
 {
     $langs->load('errors');
-    $error = false;
+    $error = 0;
 
-    if ($_POST['pu'] < 0 && $_POST['qty'] < 0)
+    if (GETPOST('pu') < 0 && GETPOST('qty') < 0)
     {
         setEventMessage($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), 'errors');
-        $error = true;
+        $error++;
     }
-    if (empty($_POST['idprodfournprice']) && $_POST['type'] < 0)
+    if (! GETPOST('idprodfournprice') && GETPOST('type') < 0)
     {
         setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), 'errors');
-        $error = true;
+        $error++;
     }
-    if (empty($_POST['idprodfournprice']) && (! isset($_POST['pu']) || $_POST['pu']=='')) // Unit price can be 0 but not ''
+    if (! GETPOST('idprodfournprice') && (! GETPOST('pu') || GETPOST('pu')=='')) // Unit price can be 0 but not ''
     {
         setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors');
-        $error = true;
+        $error++;
     }
-    if (empty($_POST['idprodfournprice']) && empty($_POST['np_desc']) && empty($_POST['dp_desc']))
+    if (! GETPOST('idprodfournprice') && ! GETPOST('np_desc') && ! GETPOST('dp_desc'))
     {
         setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), 'errors');
-        $error = true;
+        $error++;
     }
-    if (empty($_POST['idprodfournprice']) && (! isset($_POST['qty']) || $_POST['qty'] == '')
-    || ! empty($_POST['idprodfournprice']) && (! isset($_POST['pqty']) || $_POST['pqty'] == ''))
+    if (! GETPOST('idprodfournprice') && (! GETPOST('qty') || GETPOST('qty') == '')
+    || GETPOST('idprodfournprice') && (! GETPOST('pqty') || GETPOST('pqty') == ''))
     {
         setEventMessage($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), 'errors');
-        $error = true;
+        $error++;
     }
 
-    if (! $error && (($_POST['qty'] || $_POST['pqty']) && (($_POST['pu'] && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprodfournprice'])))
+    if (! $error && ((GETPOST('qty') || GETPOST('pqty')) && ((GETPOST('pu') && (GETPOST('np_desc') || GETPOST('dp_desc'))) || GETPOST('idprodfournprice'))))
     {
-        if ($object->fetch($id) < 0) dol_print_error($db,$object->error);
-        if ($object->fetch_thirdparty() < 0) dol_print_error($db,$object->error);
-
         // Ecrase $pu par celui	du produit
         // Ecrase $desc	par	celui du produit
         // Ecrase $txtva  par celui du produit
-        if ($_POST["idprodfournprice"])	// >0 or -1
+        if (GETPOST('idprodfournprice'))	// >0 or -1
         {
-            $qty = $_POST['qty'] ? $_POST['qty'] : $_POST['pqty'];
+            $qty = GETPOST('qty') ? GETPOST('qty') : GETPOST('pqty');
 
             $productsupplier = new ProductFournisseur($db);
             $idprod=$productsupplier->get_buyprice($_POST['idprodfournprice'], $qty);    // Just to see if a price exists for the quantity. Not used to found vat
@@ -229,9 +231,9 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
                 $desc.= $productsupplier->description && $_POST['np_desc'] ? "\n" : "";
                 $desc.= $_POST['np_desc'];
 
-                $remise_percent = $_POST["remise_percent"] ? $_POST["remise_percent"] : $_POST["p_remise_percent"];
+                $remise_percent = GETPOST('remise_percent') ? GETPOST('remise_percent') : GETPOST('p_remise_percent');
 
-                $tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, $_POST['idprodfournprice']);
+                $tva_tx	= get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice'));
                 $type = $productsupplier->type;
 
                 // Local Taxes
@@ -240,13 +242,13 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
 
                 $result=$object->addline(
                     $desc,
-                    $pu,
+                    $pu, // FIXME $pu is not defined
                     $qty,
                     $tva_tx,
                     $localtax1_tx,
                     $localtax2_tx,
                     $productsupplier->id,
-                    $_POST['idprodfournprice'],
+                    GETPOST('idprodfournprice'),
                     $productsupplier->fourn_ref,
                     $remise_percent,
                     'HT',
@@ -256,7 +258,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             if ($idprod == -1)
             {
                 // Quantity too low
-                $mesg='<div class="error">'.$langs->trans("ErrorQtyTooLowForThisSupplier").'</div>';
+                setEventMessage($langs->trans("ErrorQtyTooLowForThisSupplier"), 'errors');
             }
         }
         else
@@ -271,7 +273,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
 
             if (! $_POST['dp_desc'])
             {
-                $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")).'</div>';
+            	setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), 'errors');
             }
             else
             {
@@ -306,7 +308,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             		$outputlangs->setDefaultLang($newlang);
             	}
 
-                $ret=$object->fetch($id);    // Reload to get new records
+                $ret=$object->fetch($object->id);    // Reload to get new records
                 supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
             }
             unset($_POST['qty']);
@@ -338,9 +340,6 @@ else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer
         if ($product->fetch($_POST["elrowid"]) < 0) dol_print_error($db);
     }
 
-    if ($object->fetch($id) < 0) dol_print_error($db,$object->error);
-    if ($object->fetch_thirdparty() < 0) dol_print_error($db,$object->error);
-
     $localtax1_tx=get_localtax($_POST['tva_tx'],1,$object->thirdparty);
     $localtax2_tx=get_localtax($_POST['tva_tx'],2,$object->thirdparty);
 
@@ -361,14 +360,14 @@ else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer
     if ($result	>= 0)
     {
         $outputlangs = $langs;
-        if (! empty($_REQUEST['lang_id']))
+        if (GETPOST('lang_id'))
         {
             $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+            $outputlangs->setDefaultLang(GETPOST('lang_id'));
         }
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
-            $ret=$object->fetch($id);    // Reload to get new records
+            $ret=$object->fetch($object->id);    // Reload to get new records
             supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
         }
     }
@@ -381,60 +380,56 @@ else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer
 
 else if ($action == 'confirm_deleteproductline' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
 
     $result = $object->deleteline(GETPOST('lineid'));
     if ($result	>= 0)
     {
         $outputlangs = $langs;
-        if (! empty($_REQUEST['lang_id']))
+        if (GETPOST('lang_id'))
         {
             $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+            $outputlangs->setDefaultLang(GETPOST('lang_id'));
         }
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
-            $ret=$object->fetch($id);    // Reload to get new records
+            $ret=$object->fetch($object->id);    // Reload to get new records
             supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
         }
     }
     else
     {
         $error++;
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 
     if (! $error)
     {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         exit;
     }
 }
 
 else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fournisseur->commande->valider)
 {
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-
     $object->date_commande=dol_now();
     $result = $object->valid($user);
     if ($result	>= 0)
     {
         $outputlangs = $langs;
-        if (! empty($_REQUEST['lang_id']))
+        if (GETPOST('lang_id'))
         {
             $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+            $outputlangs->setDefaultLang(GETPOST('lang_id'));
         }
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
-            $ret=$object->fetch($id);    // Reload to get new records
+            $ret=$object->fetch($object->id);    // Reload to get new records
             supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
         }
     }
     else
     {
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 
     // If we have permission, and if we don't need to provide th idwarehouse, we go directly on approved step
@@ -448,16 +443,13 @@ else if ($action == 'confirm_approve' && $confirm == 'yes' && $user->rights->fou
 {
     $idwarehouse=GETPOST('idwarehouse', 'int');
 
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-
     // Check parameters
     if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
     {
         if (! $idwarehouse || $idwarehouse == -1)
         {
             $error++;
-            $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
+            setEventMessage($langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")), 'errors');
             $action='';
         }
     }
@@ -467,51 +459,47 @@ else if ($action == 'confirm_approve' && $confirm == 'yes' && $user->rights->fou
         $result	= $object->approve($user, $idwarehouse);
         if ($result > 0)
         {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
             exit;
         }
         else
         {
-            $mesg=$object->error;
+            setEventMessage($object->error, 'errors');
         }
     }
 }
 
 else if ($action == 'confirm_refuse' &&	$confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
 {
-    $object->fetch($id);
     $result = $object->refuse($user);
     if ($result > 0)
     {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         exit;
     }
     else
     {
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 }
 
 else if ($action == 'confirm_commande' && $confirm	== 'yes' &&	$user->rights->fournisseur->commande->commander)
 {
-    $object->fetch($id);
     $result	= $object->commande($user, $_REQUEST["datecommande"],	$_REQUEST["methode"], $_REQUEST['comment']);
     if ($result > 0)
     {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         exit;
     }
     else
     {
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 }
 
 
 else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->commande->supprimer)
 {
-    $object->fetch($id);
-    $object->fetch_thirdparty();
     $result=$object->delete($user);
     if ($result > 0)
     {
@@ -520,14 +508,39 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->four
     }
     else
     {
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 }
 
+// Action clone object
+else if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
+{
+	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	{
+		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+	}
+	else
+	{
+		if ($object->id > 0)
+		{
+			$result=$object->createFromClone($hookmanager);
+			if ($result > 0)
+			{
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+				exit;
+			}
+			else
+			{
+				setEventMessage($object->error, 'errors');
+				$action='';
+			}
+		}
+	}
+}
+
 // Receive
 else if ($action == 'livraison' && $user->rights->fournisseur->commande->receptionner)
 {
-    $object->fetch($id);
 
     if ($_POST["type"])
     {
@@ -536,12 +549,12 @@ else if ($action == 'livraison' && $user->rights->fournisseur->commande->recepti
         $result	= $object->Livraison($user, $date_liv, $_POST["type"], $_POST["comment"]);
         if ($result > 0)
         {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
             exit;
         }
         else if($result == -3)
         {
-            $mesg='<div class="error">'.$langs->trans("NotAuthorized").'</div>';
+        	setEventMessage($langs->trans("NotAuthorized"), 'errors');
         }
         else
         {
@@ -557,23 +570,21 @@ else if ($action == 'livraison' && $user->rights->fournisseur->commande->recepti
 
 else if ($action == 'confirm_cancel' && $confirm == 'yes' &&	$user->rights->fournisseur->commande->commander)
 {
-    $object->fetch($id);
     $result	= $object->cancel($user);
     if ($result > 0)
     {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         exit;
     }
     else
     {
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 }
 
 // Line ordering
 else if ($action == 'up'	&& $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
     $object->line_up($_GET['rowid']);
 
     $outputlangs = $langs;
@@ -583,12 +594,11 @@ else if ($action == 'up'	&& $user->rights->fournisseur->commande->creer)
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
     if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
-    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
+    header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
     exit;
 }
 else if ($action == 'down' && $user->rights->fournisseur->commande->creer)
 {
-    $object->fetch($id);
     $object->line_down($_GET['rowid']);
 
     $outputlangs = $langs;
@@ -607,19 +617,17 @@ else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer)	/
     // Build document
 
     // Sauvegarde le dernier module	choisi pour	generer	un document
-    $object->fetch($id);
-    $object->fetch_thirdparty();
 
-    if ($_REQUEST['model'])
+    if (GETPOST('model'))
     {
-        $object->setDocModel($user, $_REQUEST['model']);
+        $object->setDocModel($user, GETPOST('model'));
     }
 
     $outputlangs = $langs;
-    if (! empty($_REQUEST['lang_id']))
+    if (GETPOST('lang_id'))
     {
         $outputlangs = new Translate("",$conf);
-        $outputlangs->setDefaultLang($_REQUEST['lang_id']);
+        $outputlangs->setDefaultLang(GETPOST('lang_id'));
     }
     $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
     if ($result	<= 0)
@@ -635,52 +643,41 @@ else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer)	/
 }
 
 // Delete file in doc form
-else if ($action == 'remove_file' && $user->rights->fournisseur->commande->creer)
+else if ($action == 'remove_file' && $object->id > 0 && $user->rights->fournisseur->commande->creer)
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    if ($object->fetch($id))
-    {
-    	$object->fetch_thirdparty();
-
-        $langs->load("other");
-        $upload_dir =	$conf->fournisseur->commande->dir_output;
-        $file =	$upload_dir	. '/' .	GETPOST('file');
-        $ret=dol_delete_file($file,0,0,0,$object);
-        if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
-        else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
-    }
+    $langs->load("other");
+    $upload_dir =	$conf->fournisseur->commande->dir_output;
+    $file =	$upload_dir	. '/' .	GETPOST('file');
+    $ret=dol_delete_file($file,0,0,0,$object);
+    if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+    else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
 }
 
 /*
  * Create an order
  */
-else if ($action == 'create' && $user->rights->fournisseur->commande->creer)
+else if ($action == 'create' && ! empty($object->socid) && $user->rights->fournisseur->commande->creer)
 {
     $error=0;
 
-    $fourn = new Fournisseur($db);
-    $result=$fourn->fetch($socid);
-
-    $object->socid = $fourn->id;
-
     $db->begin();
 
-    $orderid=$object->create($user);
-    if (! $orderid > 0)
+    $id=$object->create($user);
+    if (! $id > 0)
     {
         $error++;
-        $mesg=$object->error;
+        setEventMessage($object->error, 'errors');
     }
 
     if (! $error)
     {
         if ($comclientid !=	'')
         {
-    		$object->updateFromCommandeClient($user, $orderid, $comclientid);
+    		$object->updateFromCommandeClient($user, $id, $comclientid);
         }
 
-        $id=$orderid;
+		$ret=$object->fetch($id);    // Reload to get new records
 
         $db->commit();
     }
@@ -728,10 +725,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 {
     $langs->load('mails');
 
-    $result=$object->fetch($_POST['orderid']);
-    $result=$object->fetch_thirdparty();
-
-    if ($result > 0)
+    if ($object->id > 0)
     {
 //        $ref = dol_sanitizeFileName($object->ref);
 //        $file = $conf->fournisseur->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
@@ -798,14 +792,15 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
                 $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt);
                 if ($mailfile->error)
                 {
-                    $mesg='<div class="error">'.$mailfile->error.'</div>';
+                	setEventMessage($mailfile->error, 'errors');
                 }
                 else
                 {
                     $result=$mailfile->sendfile();
                     if ($result)
                     {
-                        $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));		// Must not contain "
+                    	$mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2));		// Must not contain "
+                    	setEventMessage($mesg);
 
                         $error=0;
 
@@ -839,17 +834,17 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
                     else
                     {
                         $langs->load("other");
-                        $mesg='<div class="error">';
                         if ($mailfile->error)
                         {
-                            $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
-                            $mesg.='<br>'.$mailfile->error;
+                            $mesg = $langs->trans('ErrorFailedToSendMail',$from,$sendto);
+                            $mesg.= '<br>'.$mailfile->error;
                         }
                         else
                         {
-                            $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+                            $mesg = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
                         }
-                        $mesg.='</div>';
+
+                        setEventMessage($mesg, 'errors');
                     }
                 }
 /*            }
@@ -864,14 +859,14 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
         else
         {
             $langs->load("errors");
-            $mesg='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div>';
+            setEventMessage($langs->trans('ErrorCantReadFile',$file), 'errors');
             dol_syslog('Failed to read file: '.$file);
         }
     }
     else
     {
         $langs->load("other");
-        $mesg='<div class="error">'.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'</div>';
+        setEventMessage($langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")), 'errors');
         dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
     }
 }
@@ -880,12 +875,10 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fourniss
 {
 	if ($action == 'addcontact')
 	{
-		$result = $object->fetch($id);
-
-		if ($result > 0 && $id > 0)
+		if ($object->id > 0)
 		{
 			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-			$result = $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+			$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
 		}
 
 		if ($result >= 0)
@@ -898,32 +891,24 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fourniss
 			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$langs->load("errors");
-				$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+				setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
 			}
 			else
 			{
-				$mesg = '<div class="error">'.$object->error.'</div>';
+				setEventMessage($object->error, 'errors');
 			}
 		}
 	}
 
 	// bascule du statut d'un contact
-	else if ($action == 'swapstatut')
+	else if ($action == 'swapstatut' && $object->id > 0)
 	{
-		if ($object->fetch($id))
-		{
-			$result=$object->swapContactStatus(GETPOST('ligne'));
-		}
-		else
-		{
-			dol_print_error($db);
-		}
+		$result=$object->swapContactStatus(GETPOST('ligne'));
 	}
 
 	// Efface un contact
-	else if ($action == 'deletecontact')
+	else if ($action == 'deletecontact' && $object->id > 0)
 	{
-		$object->fetch($id);
 		$result = $object->delete_contact($_GET["lineid"]);
 
 		if ($result >= 0)
@@ -958,901 +943,899 @@ $productstatic = new Product($db);
 
 $now=dol_now();
 
-if ($id > 0 || ! empty($ref))
+if (! empty($object->id))
 {
-    //if ($mesg) print $mesg.'<br>';
+	$author	= new User($db);
+	$author->fetch($object->user_author_id);
 
-    $result=$object->fetch($id,$ref);
-    if ($result >= 0)
-    {
-        $soc = new Societe($db);
-        $soc->fetch($object->socid);
+	$head = ordersupplier_prepare_head($object);
 
-        $author	= new User($db);
-        $author->fetch($object->user_author_id);
+	$title=$langs->trans("SupplierOrder");
+	dol_fiche_head($head, 'card', $title, 0, 'order');
 
-        $head = ordersupplier_prepare_head($object);
+	/*
+	 * Confirmation de la suppression de la commande
+	 */
+	if ($action	== 'delete')
+	{
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
+		if ($ret == 'html') print '<br>';
+	}
 
-        $title=$langs->trans("SupplierOrder");
-        dol_fiche_head($head, 'card', $title, 0, 'order');
+	// Clone confirmation
+	if ($action == 'clone')
+	{
+		// Create an array for form
+		$formquestion=array(
+				//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1)
+		);
+		// Paiement incomplet. On demande si motif = escompte ou autre
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1);
+		if ($ret == 'html') print '<br>';
+	}
 
-        /*
-         * Confirmation de la suppression de	la commande
-         */
-        if ($action	== 'delete')
-        {
-            $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
-            if ($ret == 'html') print '<br>';
-        }
+	/*
+	 * Confirmation de la validation
+	 */
+	if ($action	== 'valid')
+	{
+		$object->date_commande=dol_now();
 
-        /*
-         * Confirmation de la validation
-         */
-        if ($action	== 'valid')
-        {
-            $object->date_commande=dol_now();
+		// We check if number is temporary number
+		if (preg_match('/^[\(]?PROV/i',$object->ref)) $newref = $object->getNextNumRef($object->thirdparty);
+		else $newref = $object->ref;
 
-            // We check if number is temporary number
-            if (preg_match('/^[\(]?PROV/i',$object->ref)) $newref = $object->getNextNumRef($soc);
-            else $newref = $object->ref;
+		$text=$langs->trans('ConfirmValidateOrder',$newref);
+		if (! empty($conf->notification->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+			$notify=new	Notify($db);
+			$text.='<br>';
+			$text.=$notify->confirmMessage(3,$object->socid);
+		}
 
-            $text=$langs->trans('ConfirmValidateOrder',$newref);
-            if (! empty($conf->notification->enabled))
-            {
-                require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-                $notify=new	Notify($db);
-                $text.='<br>';
-                $text.=$notify->confirmMessage(3,$object->socid);
-            }
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
+		if ($ret == 'html') print '<br>';
+	}
 
-            $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1);
-            if ($ret == 'html') print '<br>';
-        }
-        /*
-         * Confirmation de l'approbation
-         */
-        if ($action	== 'approve')
-        {
-            $formquestion=array();
-            if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct=new FormProduct($db);
-                $formquestion=array(
-                //'text' => $langs->trans("ConfirmClone"),
-                //array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
-                //array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
-                array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)));
-            }
+	/*
+	 * Confirmation de l'approbation
+	 */
+	if ($action	== 'approve')
+	{
+		$formquestion=array();
+		if (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
+		{
+			$langs->load("stocks");
+			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+			$formproduct=new FormProduct($db);
+			$formquestion=array(
+					//'text' => $langs->trans("ConfirmClone"),
+					//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
+					//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
+					array('type' => 'other', 'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"),   'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))
+			);
+		}
 
-            $ret=$form->form_confirm("fiche.php?id=".$object->id,$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", $formquestion, 1, 1, 240);
-            if ($ret == 'html') print '<br>';
-        }
-        /*
-         * Confirmation de la desapprobation
-         */
-        if ($action	== 'refuse')
-        {
-            $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
-            if ($ret == 'html') print '<br>';
-        }
-        /*
-         * Confirmation de l'annulation
-         */
-        if ($action	== 'cancel')
-        {
-            $ret=$form->form_confirm("fiche.php?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
-            if ($ret == 'html') print '<br>';
-        }
+		$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", $formquestion, 1, 1, 240);
+		if ($ret == 'html') print '<br>';
+	}
 
-        /*
-         * Confirmation de l'envoi de la commande
-         */
-        if ($action	== 'commande')
-        {
-            $date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
-            $ret=$form->form_confirm("fiche.php?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
-            if ($ret == 'html') print '<br>';
-        }
+	/*
+	 * Confirmation de la desapprobation
+	 */
+	if ($action	== 'refuse')
+	{
+		$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("DenyingThisOrder"),$langs->trans("ConfirmDenyingThisOrder",$object->ref),"confirm_refuse", '', 0, 1);
+		if ($ret == 'html') print '<br>';
+	}
 
-        /*
-         * Confirmation de la suppression d'une ligne produit
-         */
-        if ($action == 'delete_product_line')
-        {
-            $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
-            if ($ret == 'html') print '<br>';
-        }
+	/*
+	 * Confirmation de l'annulation
+	 */
+	if ($action	== 'cancel')
+	{
+		$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=$object->id",$langs->trans("Cancel"),$langs->trans("ConfirmCancelThisOrder",$object->ref),"confirm_cancel", '', 0, 1);
+		if ($ret == 'html') print '<br>';
+	}
 
-        /*
-         *	Commande
-         */
-        $nbrow=8;
-        if (! empty($conf->projet->enabled))	$nbrow++;
+	/*
+	 * Confirmation de l'envoi de la commande
+	 */
+	if ($action	== 'commande')
+	{
+		$date_com = dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
+		$ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"),$langs->trans("ConfirmMakeOrder",dol_print_date($date_com,'day')),"confirm_commande",'',0,2);
+		if ($ret == 'html') print '<br>';
+	}
 
-        //Local taxes
-        if ($mysoc->country_code=='ES')
-        {
-            if($mysoc->localtax1_assuj=="1") $nbrow++;
-            if($mysoc->localtax2_assuj=="1") $nbrow++;
-        }
+	/*
+	 * Confirmation de la suppression d'une ligne produit
+	 */
+	if ($action == 'delete_product_line')
+	{
+		$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteproductline','',0,2);
+		if ($ret == 'html') print '<br>';
+	}
 
-        print '<table class="border" width="100%">';
+	/*
+	 *	Commande
+	*/
+	$nbrow=8;
+	if (! empty($conf->projet->enabled))	$nbrow++;
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	//Local taxes
+	if ($mysoc->country_code=='ES')
+	{
+		if($mysoc->localtax1_assuj=="1") $nbrow++;
+		if($mysoc->localtax2_assuj=="1") $nbrow++;
+	}
 
-        // Ref
-        print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-        print '<td colspan="2">';
-        print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
-        print '</td>';
-        print '</tr>';
+	print '<table class="border" width="100%">';
 
-        // Ref supplier
-        print '<tr><td>';
-        print $form->editfieldkey("RefSupplier",'ref_supplier',$langs->trans($object->ref_supplier),$object,$user->rights->fournisseur->commande->creer);
-        print '</td><td colspan="2">';
-        print $form->editfieldval("RefSupplier",'ref_supplier',$langs->trans($object->ref_supplier),$object,$user->rights->fournisseur->commande->creer);
-        print '</td></tr>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/commande/liste.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
-        // Fournisseur
-        print '<tr><td>'.$langs->trans("Supplier")."</td>";
-        print '<td colspan="2">'.$soc->getNomUrl(1,'supplier').'</td>';
-        print '</tr>';
+	// Ref
+	print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
+	print '<td colspan="2">';
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+	print '</td>';
+	print '</tr>';
 
-        // Statut
-        print '<tr>';
-        print '<td>'.$langs->trans("Status").'</td>';
-        print '<td colspan="2">';
-        print $object->getLibStatut(4);
-        print "</td></tr>";
+	// Ref supplier
+	print '<tr><td>';
+	print $form->editfieldkey("RefSupplier",'ref_supplier',$langs->trans($object->ref_supplier),$object,$user->rights->fournisseur->commande->creer);
+	print '</td><td colspan="2">';
+	print $form->editfieldval("RefSupplier",'ref_supplier',$langs->trans($object->ref_supplier),$object,$user->rights->fournisseur->commande->creer);
+	print '</td></tr>';
 
-        // Date
-        if ($object->methode_commande_id > 0)
-        {
-            print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">';
-            if ($object->date_commande)
-            {
-                print dol_print_date($object->date_commande,"dayhourtext")."\n";
-            }
-            print "</td></tr>";
+	// Fournisseur
+	print '<tr><td>'.$langs->trans("Supplier")."</td>";
+	print '<td colspan="2">'.$object->thirdparty->getNomUrl(1,'supplier').'</td>';
+	print '</tr>';
 
-            if ($object->methode_commande)
-            {
-                print '<tr><td>'.$langs->trans("Method").'</td><td colspan="2">'.$object->getInputMethod().'</td></tr>';
-            }
-        }
+	// Statut
+	print '<tr>';
+	print '<td>'.$langs->trans("Status").'</td>';
+	print '<td colspan="2">';
+	print $object->getLibStatut(4);
+	print "</td></tr>";
 
-        // Author
-        print '<tr><td>'.$langs->trans("AuthorRequest").'</td>';
-        print '<td colspan="2">'.$author->getNomUrl(1).'</td>';
-        print '</tr>';
+	// Date
+	if ($object->methode_commande_id > 0)
+	{
+		print '<tr><td>'.$langs->trans("Date").'</td><td colspan="2">';
+		if ($object->date_commande)
+		{
+			print dol_print_date($object->date_commande,"dayhourtext")."\n";
+		}
+		print "</td></tr>";
 
-        // Conditions de reglement par defaut
-        $langs->load('bills');
-        $form = new Form($db);
-        print '<tr><td nowrap>';
-        print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-        print $langs->trans('PaymentConditions');
-        print '<td>';
-        if ($action != 'editconditions') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td colspan="2">';
-        if ($action == 'editconditions')
-        {
-            $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,  $object->cond_reglement_id,'cond_reglement_id');
-        }
-        else
-        {
-            $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,  $object->cond_reglement_id,'none');
-        }
-        print "</td>";
-        print '</tr>';
+		if ($object->methode_commande)
+		{
+			print '<tr><td>'.$langs->trans("Method").'</td><td colspan="2">'.$object->getInputMethod().'</td></tr>';
+		}
+	}
 
-        // Mode of payment
-        $langs->load('bills');
-        $form = new Form($db);
-        print '<tr><td nowrap>';
-        print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-        print $langs->trans('PaymentMode');
-        print '</td>';
-        if ($action != 'editmode') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td colspan="2">';
-        if ($action == 'editmode')
-        {
-            $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
-        }
-        else
-        {
-            $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
-        }
-        print '</td></tr>';
+	// Author
+	print '<tr><td>'.$langs->trans("AuthorRequest").'</td>';
+	print '<td colspan="2">'.$author->getNomUrl(1).'</td>';
+	print '</tr>';
 
-		// Delivery date planed
-            print '<tr><td height="10">';
-            print '<table class="nobordernopadding" width="100%"><tr><td>';
-            print $langs->trans('DateDeliveryPlanned');
-            print '</td>';
+	// Conditions de reglement par defaut
+	$langs->load('bills');
+	$form = new Form($db);
+	print '<tr><td nowrap>';
+	print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
+	print $langs->trans('PaymentConditions');
+	print '<td>';
+	if ($action != 'editconditions') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editconditions')
+	{
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,  $object->cond_reglement_id,'cond_reglement_id');
+	}
+	else
+	{
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,  $object->cond_reglement_id,'none');
+	}
+	print "</td>";
+	print '</tr>';
 
-            if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
-            print '</tr></table>';
-            print '</td><td colspan="2">';
-            if ($action == 'editdate_livraison')
-            {
-                print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="action" value="setdate_livraison">';
-                $form->select_date($object->date_livraison?$object->date_livraison:-1,'liv_','','','',"setdate_livraison");
-                print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-                print '</form>';
-            }
-            else
-            {
-                print $object->date_livraison ? dol_print_date($object->date_livraison,'daytext') : '&nbsp;';
-            }
-            print '</td>';
+	// Mode of payment
+	$langs->load('bills');
+	$form = new Form($db);
+	print '<tr><td nowrap>';
+	print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
+	print $langs->trans('PaymentMode');
+	print '</td>';
+	if ($action != 'editmode') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editmode')
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+	}
+	else
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+	}
+	print '</td></tr>';
 
-        // Project
-        if (! empty($conf->projet->enabled))
-        {
-            $langs->load('projects');
-            print '<tr><td height="10">';
-            print '<table class="nobordernopadding" width="100%"><tr><td>';
-            print $langs->trans('Project');
-            print '</td>';
-            if ($action != 'classify') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
-            print '</tr></table>';
-            print '</td><td colspan="2">';
-            //print "$object->id, $object->socid, $object->fk_project";
-            if ($action == 'classify')
-            {
-                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
-            }
-            else
-            {
-                $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
-            }
-            print '</td>';
-            print '</tr>';
-        }
+	// Delivery date planed
+	print '<tr><td height="10">';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('DateDeliveryPlanned');
+	print '</td>';
 
-		// Other attributes
-		$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editdate_livraison')
+	{
+		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="setdate_livraison">';
+		$form->select_date($object->date_livraison?$object->date_livraison:-1,'liv_','','','',"setdate_livraison");
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+		print $object->date_livraison ? dol_print_date($object->date_livraison,'daytext') : '&nbsp;';
+	}
+	print '</td>';
 
-        // Ligne de	3 colonnes
-        print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-        print '<td align="right"><b>'.price($object->total_ht).'</b></td>';
-        print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load('projects');
+		print '<tr><td height="10">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Project');
+		print '</td>';
+		if ($action != 'classify') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="2">';
+		//print "$object->id, $object->socid, $object->fk_project";
+		if ($action == 'classify')
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:'-1', $object->fk_project, 'projectid');
+		}
+		else
+		{
+			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+		}
+		print '</td>';
+		print '</tr>';
+	}
 
-        print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($object->total_tva).'</td>';
-        print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	// Other attributes
+	$parameters=array('socid'=>$socid, 'colspan' => ' colspan="3"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
-        // Amount Local Taxes
-        if ($mysoc->country_code=='ES')
-        {
-            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->trans("AmountTTC").'</td><td align="right">'.price($object->total_ttc).'</td>';
-        print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	// Ligne de	3 colonnes
+	print '<tr><td>'.$langs->trans("AmountHT").'</td>';
+	print '<td align="right"><b>'.price($object->total_ht).'</b></td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-        print "</table><br>";
+	print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($object->total_tva).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-        if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-        {
-        	$blocname = 'contacts';
-        	$title = $langs->trans('ContactsAddresses');
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-        }
+	// Amount Local Taxes
+	if ($mysoc->country_code=='ES')
+	{
+		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->trans("AmountTTC").'</td><td align="right">'.price($object->total_ttc).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-        if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-        {
-        	$blocname = 'notes';
-        	$title = $langs->trans('Notes');
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-        }
+	print "</table><br>";
 
-        dol_htmloutput_mesg($mesg);
-        dol_htmloutput_errors('',$errors);
+	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+		$blocname = 'contacts';
+		$title = $langs->trans('ContactsAddresses');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
 
-        /*
-         * Lines
-         */
-        print '<table class="noborder" width="100%">';
+	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$blocname = 'notes';
+		$title = $langs->trans('Notes');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
 
-        $num = count($object->lines);
-        $i = 0;	$total = 0;
+	/*
+	 * Lines
+	*/
+	print '<table class="noborder" width="100%">';
 
-        if ($num)
-        {
-            print '<tr class="liste_titre">';
-            print '<td>'.$langs->trans('Label').'</td>';
-            print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
-            print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
-            print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
-            print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
-            print '<td align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
-            print '<td width="48" colspan="3">&nbsp;</td>';
-            print "</tr>\n";
-        }
-        $var=true;
-        while ($i <	$num)
-        {
-            $line =	$object->lines[$i];
-            $var=!$var;
+	$num = count($object->lines);
+	$i = 0;	$total = 0;
 
-            // Show product and description
-            $type=(! empty($line->product_type)?$line->product_type:(! empty($line->fk_product_type)?$line->fk_product_type:0));
-            // Try to enhance type detection using date_start and date_end for free lines where type
-            // was not saved.
-            $date_start='';
-            $date_end='';
-            if (! empty($line->date_start))
-            {
-            	$date_start=$line->date_start;
-            	$type=1;
-            }
-            if (! empty($line->date_end))
-            {
-            	$date_end=$line->date_end;
-            	$type=1;
-            }
+	if ($num)
+	{
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans('Label').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('VAT').'</td>';
+		print '<td align="right" width="80">'.$langs->trans('PriceUHT').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('Qty').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('ReductionShort').'</td>';
+		print '<td align="right" width="50">'.$langs->trans('TotalHTShort').'</td>';
+		print '<td width="48" colspan="3">&nbsp;</td>';
+		print "</tr>\n";
+	}
+	$var=true;
+	while ($i <	$num)
+	{
+		$line =	$object->lines[$i];
+		$var=!$var;
 
-            // Ligne en mode visu
-            if ($action != 'editline' || $_GET['rowid'] != $line->id)
-            {
-                print '<tr '.$bc[$var].'>';
+		// Show product and description
+		$type=(! empty($line->product_type)?$line->product_type:(! empty($line->fk_product_type)?$line->fk_product_type:0));
+		// Try to enhance type detection using date_start and date_end for free lines where type
+		// was not saved.
+		$date_start='';
+		$date_end='';
+		if (! empty($line->date_start))
+		{
+			$date_start=$line->date_start;
+			$type=1;
+		}
+		if (! empty($line->date_end))
+		{
+			$date_end=$line->date_end;
+			$type=1;
+		}
 
-                // Show product and description
-                print '<td>';
-                if ($line->fk_product > 0)
-                {
-                    print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+		// Ligne en mode visu
+		if ($action != 'editline' || $_GET['rowid'] != $line->id)
+		{
+			print '<tr '.$bc[$var].'>';
 
-                    $product_static=new ProductFournisseur($db);
-                    $product_static->fetch($line->fk_product);
-                    $text=$product_static->getNomUrl(1,'supplier');
-                    $text.= ' - '.$product_static->libelle;
-                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
-                    print $form->textwithtooltip($text,$description,3,'','',$i);
+			// Show product and description
+			print '<td>';
+			if ($line->fk_product > 0)
+			{
+				print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
 
-                    // Show range
-                    print_date_range($date_start,$date_end);
+				$product_static=new ProductFournisseur($db);
+				$product_static->fetch($line->fk_product);
+				$text=$product_static->getNomUrl(1,'supplier');
+				$text.= ' - '.$product_static->libelle;
+				$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
+				print $form->textwithtooltip($text,$description,3,'','',$i);
 
-                    // Add description in form
-                    if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) print ($line->description && $line->description!=$product_static->libelle)?'<br>'.dol_htmlentitiesbr($line->description):'';
-                }
+				// Show range
+				print_date_range($date_start,$date_end);
 
-                // Description - Editor wysiwyg
-                if (! $line->fk_product)
-                {
-                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
-                    else $text = img_object($langs->trans('Product'),'product');
-                    print $text.' '.nl2br($line->description);
+				// Add description in form
+				if (! empty($conf->global->PRODUIT_DESC_IN_FORM)) print ($line->description && $line->description!=$product_static->libelle)?'<br>'.dol_htmlentitiesbr($line->description):'';
+			}
 
-                    // Show range
-                    print_date_range($date_start,$date_end);
-                }
+			// Description - Editor wysiwyg
+			if (! $line->fk_product)
+			{
+				if ($type==1) $text = img_object($langs->trans('Service'),'service');
+				else $text = img_object($langs->trans('Product'),'product');
+				print $text.' '.nl2br($line->description);
 
-                print '</td>';
+				// Show range
+				print_date_range($date_start,$date_end);
+			}
 
-                print '<td align="right" nowrap="nowrap">'.vatrate($line->tva_tx).'%</td>';
+			print '</td>';
 
-                print '<td align="right" nowrap="nowrap">'.price($line->subprice)."</td>\n";
+			print '<td align="right" nowrap="nowrap">'.vatrate($line->tva_tx).'%</td>';
 
-                print '<td align="right" nowrap="nowrap">'.$line->qty.'</td>';
+			print '<td align="right" nowrap="nowrap">'.price($line->subprice)."</td>\n";
 
-                if ($line->remise_percent >	0)
-                {
-                    print '<td align="right" nowrap="nowrap">'.dol_print_reduction($line->remise_percent,$langs)."</td>\n";
-                }
-                else
-                {
-                    print '<td>&nbsp;</td>';
-                }
+			print '<td align="right" nowrap="nowrap">'.$line->qty.'</td>';
 
-                print '<td align="right" nowrap="nowrap">'.price($line->total_ht).'</td>';
-                if ($object->statut == 0	&& $user->rights->fournisseur->commande->creer)
-                {
-                    print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$line->id.'#'.$line->id.'">';
-                    print img_edit();
-                    print '</a></td>';
+			if ($line->remise_percent >	0)
+			{
+				print '<td align="right" nowrap="nowrap">'.dol_print_reduction($line->remise_percent,$langs)."</td>\n";
+			}
+			else
+			{
+				print '<td>&nbsp;</td>';
+			}
 
-                    $actiondelete='delete_product_line';
-                    print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$actiondelete.'&amp;lineid='.$line->id.'">';
-                    print img_delete();
-                    print '</a></td>';
-                }
-                else
-                {
-                    print '<td>&nbsp;</td><td>&nbsp;</td>';
-                }
-                print "</tr>";
-            }
+			print '<td align="right" nowrap="nowrap">'.price($line->total_ht).'</td>';
+			if ($object->statut == 0	&& $user->rights->fournisseur->commande->creer)
+			{
+				print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$line->id.'#'.$line->id.'">';
+				print img_edit();
+				print '</a></td>';
 
-            // Ligne en mode update
-            if ($action	== 'editline' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
-            {
-                print "\n";
-                print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;etat=1&amp;ligne_id='.$line->id.'" method="post">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden" name="action" value="updateligne">';
-                print '<input type="hidden" name="id" value="'.$object->id.'">';
-                print '<input type="hidden" name="elrowid" value="'.$_GET['rowid'].'">';
-                print '<tr '.$bc[$var].'>';
-                print '<td>';
-                print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
-                if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $line->fk_product > 0)
-                {
-                    $product_static=new ProductFournisseur($db);
-                    $product_static->fetch($line->fk_product);
-                    $text=$product_static->getNomUrl(1,'supplier');
-                    $text.= ' - '.$product_static->libelle;
-                    $description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
-                    print $form->textwithtooltip($text,$description,3,'','',$i);
+				$actiondelete='delete_product_line';
+				print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action='.$actiondelete.'&amp;lineid='.$line->id.'">';
+				print img_delete();
+				print '</a></td>';
+			}
+			else
+			{
+				print '<td>&nbsp;</td><td>&nbsp;</td>';
+			}
+			print "</tr>";
+		}
 
-                    // Show range
-                    print_date_range($date_start,$date_end);
-                    print '<br>';
-                }
-                else
-                {
-                    print $form->select_type_of_lines($line->product_type,'type',1);
-                    if (! empty($conf->product->enabled) && ! empty($conf->service->enabled)) print '<br>';
-                }
+		// Ligne en mode update
+		if ($action	== 'editline' && $user->rights->fournisseur->commande->creer && ($_GET["rowid"] == $line->id))
+		{
+			print "\n";
+			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;etat=1&amp;ligne_id='.$line->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="action" value="updateligne">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="elrowid" value="'.$_GET['rowid'].'">';
+			print '<tr '.$bc[$var].'>';
+			print '<td>';
+			print '<a name="'.$line->id.'"></a>'; // ancre pour retourner sur la ligne
+			if ((! empty($conf->product->enabled) || ! empty($conf->service->enabled)) && $line->fk_product > 0)
+			{
+				$product_static=new ProductFournisseur($db);
+				$product_static->fetch($line->fk_product);
+				$text=$product_static->getNomUrl(1,'supplier');
+				$text.= ' - '.$product_static->libelle;
+				$description=($conf->global->PRODUIT_DESC_IN_FORM?'':dol_htmlentitiesbr($line->description));
+				print $form->textwithtooltip($text,$description,3,'','',$i);
 
-                if (is_object($hookmanager))
-                {
-                    $parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i);
-                    $reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
-                }
+				// Show range
+				print_date_range($date_start,$date_end);
+				print '<br>';
+			}
+			else
+			{
+				print $form->select_type_of_lines($line->product_type,'type',1);
+				if (! empty($conf->product->enabled) && ! empty($conf->service->enabled)) print '<br>';
+			}
 
-                // Description - Editor wysiwyg
-                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                $nbrows=ROWS_2;
-                if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-                $doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
-                $doleditor->Create();
+			if (is_object($hookmanager))
+			{
+				$parameters=array('fk_parent_line'=>$line->fk_parent_line, 'line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i);
+				$reshook=$hookmanager->executeHooks('formEditProductOptions',$parameters,$object,$action);
+			}
 
-                print '</td>';
-                print '<td>';
-                print $form->load_tva('tva_tx',$line->tva_tx,$soc,$mysoc);
-                print '</td>';
-                print '<td align="right"><input	size="5" type="text" name="pu"	value="'.price($line->subprice).'"></td>';
-                print '<td align="right"><input size="2" type="text" name="qty" value="'.$line->qty.'"></td>';
-                print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="remise_percent" value="'.$line->remise_percent.'">%</td>';
-                print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
-                print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
-                print '</tr>' .	"\n";
-                print "</form>\n";
-            }
-            $i++;
-        }
+			// Description - Editor wysiwyg
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			$nbrows=ROWS_2;
+			if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+			$doleditor=new DolEditor('eldesc',$line->description,'',200,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,$nbrows,70);
+			$doleditor->Create();
 
-        /*
-         * Form to add new line
-         */
-        if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline')
-        {
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			print '</td>';
+			print '<td>';
+			print $form->load_tva('tva_tx',$line->tva_tx,$object->thirdparty,$mysoc);
+			print '</td>';
+			print '<td align="right"><input	size="5" type="text" name="pu"	value="'.price($line->subprice).'"></td>';
+			print '<td align="right"><input size="2" type="text" name="qty" value="'.$line->qty.'"></td>';
+			print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="remise_percent" value="'.$line->remise_percent.'">%</td>';
+			print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+			print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
+			print '</tr>' .	"\n";
+			print "</form>\n";
+		}
+		$i++;
+	}
 
-            print '<tr class="liste_titre">';
-            print '<td>';
-            print '<a name="add"></a>'; // ancre
-            print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").'</td>';
-            print '<td align="right">'.$langs->trans('VAT').'</td>';
-            print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
-            print '<td align="right">'.$langs->trans('Qty').'</td>';
-            print '<td align="right">'.$langs->trans('ReductionShort').'</td>';
-            print '<td colspan="4">&nbsp;</td>';
-            print '</tr>';
+	/*
+	 * Form to add new line
+	 */
+	if ($object->statut == 0 && $user->rights->fournisseur->commande->creer && $action <> 'editline')
+	{
+		//WYSIWYG Editor
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-            // 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 '<tr class="liste_titre">';
+		print '<td>';
+		print '<a name="add"></a>'; // ancre
+		print $langs->trans('AddNewLine').' - '.$langs->trans("FreeZone").'</td>';
+		print '<td align="right">'.$langs->trans('VAT').'</td>';
+		print '<td align="right">'.$langs->trans('PriceUHT').'</td>';
+		print '<td align="right">'.$langs->trans('Qty').'</td>';
+		print '<td align="right">'.$langs->trans('ReductionShort').'</td>';
+		print '<td colspan="4">&nbsp;</td>';
+		print '</tr>';
 
-            print '<script type="text/javascript">
-            	jQuery(document).ready(function() {
-            		jQuery(\'#idprodfournprice\').change(function() {
-            			if (jQuery(\'#idprodfournprice\').val() > 0) jQuery(\'#np_desc\').focus();
-            		});
-            	});
+		// 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>';
 
-            $forceall=1;
-            print $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
-            if ($forceall || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
-            || (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
+		$var=true;
+		print '<tr '.$bc[$var].'>';
+		print '<td>';
 
-            if (is_object($hookmanager))
-            {
-                $parameters=array();
-                $reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
-            }
+		$forceall=1;
+		print $form->select_type_of_lines(isset($_POST["type"])?$_POST["type"]:-1,'type',1,0,$forceall);
+		if ($forceall || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+				|| (empty($conf->product->enabled) && empty($conf->service->enabled))) print '<br>';
 
-            $nbrows=ROWS_2;
-            if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-            $doleditor = new DolEditor('dp_desc', GETPOST('dp_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
-            $doleditor->Create();
+		if (is_object($hookmanager))
+		{
+			$parameters=array();
+			$reshook=$hookmanager->executeHooks('formCreateProductOptions',$parameters,$object,$action);
+		}
 
-            print '</td>';
-            print '<td align="center">';
-            print $form->load_tva('tva_tx',(GETPOST('tva_tx')?GETPOST('tva_tx'):-1),$soc,$mysoc);
-            print '</td>';
-            print '<td align="right"><input type="text" name="pu" size="5" value="'.GETPOST('pu').'"></td>';
-            print '<td align="right"><input type="text" name="qty" value="'.(GETPOST('qty')?GETPOST('qty'):'1').'" size="2"></td>';
-            print '<td align="right" nowrap="nowrap"><input type="text" name="remise_percent" size="1" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):$soc->remise_client).'">%</td>';
-            print '<td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'"></td>';
-            print '</tr>';
+		$nbrows=ROWS_2;
+		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+		$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
+		$doleditor->Create();
 
-            print '</form>';
+		print '</td>';
+		print '<td align="center">';
+		print $form->load_tva('tva_tx',(GETPOST('tva_tx')?GETPOST('tva_tx'):-1),$object->thirdparty,$mysoc);
+		print '</td>';
+		print '<td align="right"><input type="text" name="pu" size="5" value="'.GETPOST('pu').'"></td>';
+		print '<td align="right"><input type="text" name="qty" value="'.(GETPOST('qty')?GETPOST('qty'):'1').'" size="2"></td>';
+		print '<td align="right" nowrap="nowrap"><input type="text" name="remise_percent" size="1" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):$object->thirdparty->remise_client).'">%</td>';
+		print '<td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'"></td>';
+		print '</tr>';
 
-            // Ajout de produits/services predefinis
-            if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
-            {
-                print '<tr class="liste_titre">';
-                print '<td colspan="3">';
-                print $langs->trans("AddNewLine").' - ';
-                if (! empty($conf->service->enabled))
-                {
-                    print $langs->trans('RecordedProductsAndServices');
-                }
-                else
-                {
-                    print $langs->trans('RecordedProducts');
-                }
-                print '</td>';
-                print '<td align="right">'.$langs->trans('Qty').'</td>';
-                print '<td align="right">'.$langs->trans('ReductionShort').'</td>';
-                print '<td colspan="4">&nbsp;</td>';
-                print '</tr>';
+		print '</form>';
 
-                print '<form id="addpredefinedproduct" 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.'">';
+		// Ajout de produits/services predefinis
+		if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+		{
+			print '<tr class="liste_titre">';
+			print '<td colspan="3">';
+			print $langs->trans("AddNewLine").' - ';
+			if (! empty($conf->service->enabled))
+			{
+				print $langs->trans('RecordedProductsAndServices');
+			}
+			else
+			{
+				print $langs->trans('RecordedProducts');
+			}
+			print '</td>';
+			print '<td align="right">'.$langs->trans('Qty').'</td>';
+			print '<td align="right">'.$langs->trans('ReductionShort').'</td>';
+			print '<td colspan="4">&nbsp;</td>';
+			print '</tr>';
 
-                $var=!$var;
-                print '<tr '.$bc[$var].'>';
-                print '<td colspan="3">';
+			print '<form id="addpredefinedproduct" 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.'">';
 
-                $ajaxoptions=array(
-                		'update' => array('pqty' => 'qty', 'p_remise_percent' => 'discount'),
-                		'option_disabled' => 'addPredefinedProductButton',
-                		'error' => $langs->trans("NoPriceDefinedForThisSupplier")
-                );
-                $form->select_produits_fournisseurs($object->fourn_id, '', 'idprodfournprice', '', '', $ajaxoptions);
+			$var=!$var;
+			print '<tr '.$bc[$var].'>';
+			print '<td colspan="3">';
 
-                if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) print '<br>';
+			$ajaxoptions=array(
+					'update' => array('pqty' => 'qty', 'p_remise_percent' => 'discount'),
+					'option_disabled' => 'addPredefinedProductButton',
+					'error' => $langs->trans("NoPriceDefinedForThisSupplier")
+			);
+			$form->select_produits_fournisseurs($object->fourn_id, '', 'idprodfournprice', '', '', $ajaxoptions);
 
-				if (is_object($hookmanager))
+			if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) print '<br>';
+
+			if (is_object($hookmanager))
+			{
+				$parameters=array('htmlname'=>'idprodfournprice');
+				$reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
+			}
+
+			$nbrows=ROWS_2;
+			if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
+			$doleditor = new DolEditor('np_desc', GETPOST('np_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
+			$doleditor->Create();
+
+			print '</td>';
+			print '<td align="right"><input type="text" size="2" id="pqty" name="pqty" value="'.(GETPOST('pqty')?GETPOST('pqty'):'1').'"></td>';
+			print '<td align="right" nowrap="nowrap"><input type="text" size="1" id="p_remise_percent" name="p_remise_percent" value="'.(GETPOST('p_remise_percent')?GETPOST('p_remise_percent'):$object->thirdparty->remise_client).'">%</td>';
+			print '<td align="center" colspan="4"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans('Add').'"></td>';
+			print '</tr>';
+
+			print '</form>';
+		}
+	}
+	print '</table>';
+	print '</div>';
+
+
+	if ($action != 'presend')
+	{
+		/**
+		 * Boutons actions
+		 */
+		if ($user->societe_id == 0 && $action != 'editline' && $action != 'delete')
+		{
+			print '<div	class="tabsAction">';
+
+			// Validate
+			if ($object->statut == 0 && $num > 0)
+			{
+				if ($user->rights->fournisseur->commande->valider)
 				{
-			        $parameters=array('htmlname'=>'idprodfournprice');
-				    $reshook=$hookmanager->executeHooks('formCreateProductSupplierOptions',$parameters,$object,$action);
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+					print '>'.$langs->trans('Validate').'</a>';
+				}
+			}
+
+			// Modify
+			if ($object->statut == 1)
+			{
+				if ($user->rights->fournisseur->commande->commander)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a>';
+				}
+			}
+
+			// Approve
+			if ($object->statut == 1)
+			{
+				if ($user->rights->fournisseur->commande->approuver)
+				{
+					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
+					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
+				}
+				else
+				{
+					print '<a class="butActionRefused" href="#">'.$langs->trans("ApproveOrder").'</a>';
+					print '<a class="butActionRefused" href="#">'.$langs->trans("RefuseOrder").'</a>';
+				}
+			}
+
+			// Send
+			if (in_array($object->statut, array(2, 3, 4, 5)))
+			{
+				if ($user->rights->fournisseur->commande->commander)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+				}
+			}
+
+			// Reopen
+			if (in_array($object->statut, array(5, 6, 7, 9)))
+			{
+				if ($user->rights->fournisseur->commande->commander)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
+				}
+			}
+
+			// Create bill
+			if (! empty($conf->fournisseur->enabled) && $object->statut >= 2)  // 2 means accepted
+			{
+				if ($user->rights->fournisseur->facture->creer)
+				{
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
 
-                $nbrows=ROWS_2;
-                if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-                $doleditor = new DolEditor('np_desc', GETPOST('np_desc'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, $nbrows, 70);
-                $doleditor->Create();
+				//if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
+				//{
+				//	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
+				//}
+			}
 
-                print '</td>';
-                print '<td align="right"><input type="text" size="2" id="pqty" name="pqty" value="'.(GETPOST('pqty')?GETPOST('pqty'):'1').'"></td>';
-                print '<td align="right" nowrap="nowrap"><input type="text" size="1" id="p_remise_percent" name="p_remise_percent" value="'.(GETPOST('p_remise_percent')?GETPOST('p_remise_percent'):$soc->remise_client).'">%</td>';
-                print '<td align="center" colspan="4"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans('Add').'"></td>';
-                print '</tr>';
+			// Cancel
+			if ($object->statut == 2)
+			{
+				if ($user->rights->fournisseur->commande->commander)
+				{
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
+				}
+			}
 
-                print '</form>';
-            }
-        }
-        print '</table>';
-        print '</div>';
+			// Clone
+			if ($user->rights->fournisseur->commande->creer)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
+			}
 
+			// Delete
+			if ($user->rights->fournisseur->commande->supprimer)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+			}
 
-        if ($action != 'presend')
-        {
+			print "</div>";
+		}
 
-            /**
-             * Boutons actions
-             */
-            if ($user->societe_id == 0 && $action != 'editline' && $action != 'delete')
-            {
-                print '<div	class="tabsAction">';
+		print '<table width="100%"><tr><td width="50%" valign="top">';
+		print '<a name="builddoc"></a>'; // ancre
 
-                // Validate
-                if ($object->statut == 0 && $num > 0)
-                {
-                    if ($user->rights->fournisseur->commande->valider)
-                    {
-                        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
-                        print '>'.$langs->trans('Validate').'</a>';
-                    }
-                }
+		/*
+		 * Documents generes
+		 */
+		$comfournref = dol_sanitizeFileName($object->ref);
+		$file =	$conf->fournisseur->dir_output . '/commande/' . $comfournref .	'/'	. $comfournref . '.pdf';
+		$relativepath =	$comfournref.'/'.$comfournref.'.pdf';
+		$filedir = $conf->fournisseur->dir_output	. '/commande/' .	$comfournref;
+		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed=$user->rights->fournisseur->commande->creer;
+		$delallowed=$user->rights->fournisseur->commande->supprimer;
 
-                // Modify
-                if ($object->statut == 1)
-                {
-                    if ($user->rights->fournisseur->commande->commander)
-                    {
-                        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a>';
-                    }
-                }
+		print $formfile->showdocuments('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,0,0,'','','',$object->thirdparty->default_lang);
+		$somethingshown=$formfile->numoffiles;
 
-                // Approve
-                if ($object->statut == 1)
-                {
-                    if ($user->rights->fournisseur->commande->approuver)
-                    {
-                        print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
-                        print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
-                    }
-                    else
-                    {
-                        print '<a class="butActionRefused" href="#">'.$langs->trans("ApproveOrder").'</a>';
-                        print '<a class="butActionRefused" href="#">'.$langs->trans("RefuseOrder").'</a>';
-                    }
-                }
+		$object=$object;
 
-                // Send
-                if (in_array($object->statut, array(2, 3, 4, 5)))
-                {
-                    if ($user->rights->fournisseur->commande->commander)
-                    {
-                        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
-                    }
-                }
+		/*
+		 * Linked object block
+		 */
+		$somethingshown=$object->showLinkedObjectBlock();
 
-                // Reopen
-                if (in_array($object->statut, array(5, 6, 7, 9)))
-                {
-                    if ($user->rights->fournisseur->commande->commander)
-                    {
-                        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-                    }
-                }
+		print '</td><td valign="top" width="50%">';
 
-                // Create bill
-                if (! empty($conf->fournisseur->enabled) && $object->statut >= 2)  // 2 means accepted
-                {
-                    if ($user->rights->fournisseur->facture->creer)
-                    {
-                        print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
-                    }
+		if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
+		{
+			/*
+			 * Commander (action=commande)
+			 */
+			print '<br>';
+			print '<form name="commande" action="fiche.php?id='.$object->id.'&amp;action=commande" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden"	name="action" value="commande">';
+			print '<table class="border" width="100%">';
+			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
+			print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
+			$date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+			print $form->select_date($date_com,'','','','',"commande");
+			print '</td></tr>';
 
-                    //if ($user->rights->fournisseur->commande->creer && $object->statut > 2)
-                    //{
-                    //	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
-                    //}
-                }
+			print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
+			$formorder->select_methodes_commande(GETPOST('methodecommande'), "methodecommande", 1);
+			print '</td></tr>';
 
-                // Cancel
-                if ($object->statut == 2)
-                {
-                    if ($user->rights->fournisseur->commande->commander)
-                    {
-                        print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
-                    }
-                }
+			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
+			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("ToOrder").'"></td></tr>';
+			print '</table>';
+			print '</form>';
+		}
 
-                // Delete
-                if ($user->rights->fournisseur->commande->supprimer)
-                {
-                    print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-                }
+		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
+		{
+			/*
+			 * Receptionner (action=livraison)
+			 */
+			print '<br>';
+			print '<form action="fiche.php?id='.$object->id.'" method="post">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden"	name="action" value="livraison">';
+			print '<table class="border" width="100%">';
+			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
+			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
+			print $form->select_date('','','','','',"commande");
+			print "</td></tr>\n";
 
+			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
+			$liv = array();
+			$liv[''] = '&nbsp;';
+			$liv['tot']	= $langs->trans("TotalWoman");
+			$liv['par']	= $langs->trans("PartialWoman");
+			$liv['nev']	= $langs->trans("NeverReceived");
+			$liv['can']	= $langs->trans("Canceled");
 
-                print "</div>";
-            }
+			print $form->selectarray("type",$liv);
 
+			print '</td></tr>';
+			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
+			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+			print "</table>\n";
+			print "</form>\n";
+		}
 
-            print '<table width="100%"><tr><td width="50%" valign="top">';
-            print '<a name="builddoc"></a>'; // ancre
+		// List of actions on element
+		/* Hidden because" available into "Log" tab
+		print '<br>';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions=new FormActions($db);
+		$somethingshown=$formactions->showactions($object,'order_supplier',$socid);
+		*/
 
-            /*
-             * Documents	generes
-             */
-            $comfournref = dol_sanitizeFileName($object->ref);
-            $file =	$conf->fournisseur->dir_output . '/commande/' . $comfournref .	'/'	. $comfournref . '.pdf';
-            $relativepath =	$comfournref.'/'.$comfournref.'.pdf';
-            $filedir = $conf->fournisseur->dir_output	. '/commande/' .	$comfournref;
-            $urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-            $genallowed=$user->rights->fournisseur->commande->creer;
-            $delallowed=$user->rights->fournisseur->commande->supprimer;
+		print '</td></tr></table>';
+	}
 
-            print $formfile->showdocuments('commande_fournisseur',$comfournref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,0,0,'','','',$soc->default_lang);
-            $somethingshown=$formfile->numoffiles;
+	/*
+	 * Action presend
+	 */
+	if ($action == 'presend')
+	{
+		$ref = dol_sanitizeFileName($object->ref);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref);
+		$file=$fileparams['fullname'];
 
-            $object=$object;
+		// Build document if it not exists
+		if (! $file || ! is_readable($file))
+		{
+			// Define output language
+			$outputlangs = $langs;
+			$newlang='';
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+			if (! empty($newlang))
+			{
+				$outputlangs = new Translate("",$conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
 
-            /*
-             * Linked object block
-             */
-            $somethingshown=$object->showLinkedObjectBlock();
+			$result=supplier_order_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+			if ($result <= 0)
+			{
+				dol_print_error($db,$result);
+				exit;
+			}
+			$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref);
+			$file=$fileparams['fullname'];
+		}
 
+		print '<br>';
 
-            print '</td><td valign="top" width="50%">';
+		print_titre($langs->trans('SendOrderByMail'));
 
-            if ($user->rights->fournisseur->commande->commander && $object->statut == 2)
-            {
-                /**
-                 * Commander (action=commande)
-                 */
-                print '<br>';
-                print '<form name="commande" action="fiche.php?id='.$object->id.'&amp;action=commande" method="post">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden"	name="action" value="commande">';
-                print '<table class="border" width="100%">';
-                print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
-                print '<tr><td>'.$langs->trans("OrderDate").'</td><td>';
-                $date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
-                print $form->select_date($date_com,'','','','',"commande");
-                print '</td></tr>';
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->fromtype = 'user';
+		$formmail->fromid   = $user->id;
+		$formmail->fromname = $user->getFullName($langs);
+		$formmail->frommail = $user->email;
+		$formmail->withfrom=1;
+		$formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
+		$formmail->withtosocid=$object->thirdparty->id;
+		$formmail->withtocc=1;
+		$formmail->withtoccsocid=0;
+		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
+		$formmail->withtocccsocid=0;
+		$formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__');
+		$formmail->withfile=2;
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+		// Tableau des substitutions
+		$formmail->substit['__ORDERREF__']=$object->ref;
+		$formmail->substit['__SIGNATURE__']=$user->signature;
+		$formmail->substit['__PERSONALIZED__']='';
+		// Tableau des parametres complementaires
+		$formmail->param['action']='send';
+		$formmail->param['models']='order_supplier_send';
+		$formmail->param['orderid']=$object->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
 
-                print '<tr><td>'.$langs->trans("OrderMode").'</td><td>';
-                $formorder->select_methodes_commande(GETPOST('methodecommande'), "methodecommande", 1);
-                print '</td></tr>';
+		// Init list of files
+		if (GETPOST("mode")=='init')
+		{
+			$formmail->clear_attached_files();
+			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+		}
 
-                print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
-                print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("ToOrder").'"></td></tr>';
-                print '</table>';
-                print '</form>';
-            }
+		// Show form
+		$formmail->show_form();
 
-            if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
-            {
-                /**
-                 * Receptionner (action=livraison)
-                 */
-                print '<br>';
-                print '<form action="fiche.php?id='.$object->id.'" method="post">';
-                print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                print '<input type="hidden"	name="action" value="livraison">';
-                print '<table class="border" width="100%">';
-                print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
-                print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-                print $form->select_date('','','','','',"commande");
-                print "</td></tr>\n";
+		print '<br>';
+	}
 
-                print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
-                $liv = array();
-                $liv[''] = '&nbsp;';
-                $liv['tot']	= $langs->trans("TotalWoman");
-                $liv['par']	= $langs->trans("PartialWoman");
-                $liv['nev']	= $langs->trans("NeverReceived");
-                $liv['can']	= $langs->trans("Canceled");
-
-                print $form->selectarray("type",$liv);
-
-                print '</td></tr>';
-                print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-                print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
-                print "</table>\n";
-                print "</form>\n";
-            }
-
-            // List of actions on element
-            /* Hidden because" available into "Log" tab
-            print '<br>';
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-            $formactions=new FormActions($db);
-            $somethingshown=$formactions->showactions($object,'order_supplier',$socid);
-            */
-
-            print '</td></tr></table>';
-        }
-
-
-
-        /*
-         * Action presend
-         *
-         */
-        if ($action == 'presend')
-        {
-            $ref = dol_sanitizeFileName($object->ref);
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref);
-            $file=$fileparams['fullname'];
-
-            // Build document if it not exists
-            if (! $file || ! is_readable($file))
-            {
-                // Define output language
-                $outputlangs = $langs;
-                $newlang='';
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-                if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-                if (! empty($newlang))
-                {
-                    $outputlangs = new Translate("",$conf);
-                    $outputlangs->setDefaultLang($newlang);
-                }
-
-                $result=supplier_order_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
-                if ($result <= 0)
-                {
-                    dol_print_error($db,$result);
-                    exit;
-                }
-                $fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref);
-                $file=$fileparams['fullname'];
-            }
-
-            print '<br>';
-            print_titre($langs->trans('SendOrderByMail'));
-
-            // Cree l'objet formulaire mail
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            $formmail = new FormMail($db);
-            $formmail->fromtype = 'user';
-            $formmail->fromid   = $user->id;
-            $formmail->fromname = $user->getFullName($langs);
-            $formmail->frommail = $user->email;
-            $formmail->withfrom=1;
-            $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-            $formmail->withtosocid=$soc->id;
-            $formmail->withtocc=1;
-            $formmail->withtoccsocid=0;
-            $formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-            $formmail->withtocccsocid=0;
-            $formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__');
-            $formmail->withfile=2;
-            $formmail->withbody=1;
-            $formmail->withdeliveryreceipt=1;
-            $formmail->withcancel=1;
-            // Tableau des substitutions
-            $formmail->substit['__ORDERREF__']=$object->ref;
-            $formmail->substit['__SIGNATURE__']=$user->signature;
-            $formmail->substit['__PERSONALIZED__']='';
-            // Tableau des parametres complementaires
-            $formmail->param['action']='send';
-            $formmail->param['models']='order_supplier_send';
-            $formmail->param['orderid']=$object->id;
-            $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-            // Init list of files
-            if (GETPOST("mode")=='init')
-            {
-                $formmail->clear_attached_files();
-                $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-            }
-
-            // Show form
-            $formmail->show_form();
-
-            print '<br>';
-        }
-
-        print '</td></tr></table>';
-
-    }
-    else
-    {
-        // Commande	non	trouvee
-        dol_print_error($db);
-    }
+	print '</td></tr></table>';
 }
 
 // End of page
diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php
index 5bfbf4cff62..f5cd59ba8d5 100644
--- a/htdocs/fourn/commande/liste.php
+++ b/htdocs/fourn/commande/liste.php
@@ -122,7 +122,7 @@ if ($resql)
 
 	print_barre_liste($title, $page, "liste.php", "", $sortfield, $sortorder, '', $num);
 	print '<form action="liste.php" method="GET">';
-	print '<table class="liste">';
+	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref","","",'',$sortfield,$sortorder);
 	print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","",'',$sortfield,$sortorder);
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 648df36f946..6986b743dfd 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -82,7 +82,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes')
         $result=$object->createFromClone($id);
         if ($result > 0)
         {
-            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+            header("Location: ".$_SERVER['PHP_SELF'].'?action=editfacnumber&id='.$result);
             exit;
         }
         else
@@ -469,7 +469,7 @@ elseif ($action == 'addline')
     if (GETPOST('search_idprodfournprice') || GETPOST('idprodfournprice'))	// With combolist idprodfournprice is > 0 or -1, with autocomplete, idprodfournprice is > 0 or ''
     {
     	$idprod=0;
-    	$product=new Product($db);
+    	$product=new Product($db);
 
     	if (GETPOST('idprodfournprice') == '')
 		{
@@ -1820,12 +1820,12 @@ else
                 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();
+                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;
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 1fe9810414f..be90f452158 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -90,11 +90,11 @@ class Holiday extends CommonObject
         $error=0;
 
         $now=dol_now();
-        
+
         // Check parameters
         if (empty($this->fk_user) || ! is_numeric($this->fk_user) || $this->fk_user < 0) { $this->error="ErrorBadParameter"; return -1; }
         if (empty($this->fk_validator) || ! is_numeric($this->fk_validator) || $this->fk_validator < 0)  { $this->error="ErrorBadParameter"; return -1; }
-        
+
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday(";
 
@@ -191,7 +191,8 @@ class Holiday extends CommonObject
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->rowid    = $obj->rowid;
+                $this->id    = $obj->rowid;
+                $this->rowid    = $obj->rowid;	// deprecated
                 $this->fk_user = $obj->fk_user;
                 $this->date_create = $this->db->jdate($obj->date_create);
                 $this->description = $obj->description;
@@ -206,8 +207,6 @@ class Holiday extends CommonObject
                 $this->date_cancel = $this->db->jdate($obj->date_cancel);
                 $this->fk_user_cancel = $obj->fk_user_cancel;
                 $this->detail_refuse = $obj->detail_refuse;
-
-
             }
             $this->db->free($resql);
 
@@ -1601,17 +1600,17 @@ class Holiday extends CommonObject
     function initAsSpecimen()
     {
     	global $user,$langs;
-    
+
     	// Initialise parameters
     	$this->id=0;
     	$this->specimen=1;
-    	
+
     	$this->fk_user=1;
     	$this->description='SPECIMEN description';
     	$this->date_debut=dol_now();
     	$this->date_fin=dol_now()+(24*3600);
     	$this->fk_validator=1;
     }
-    
+
 }
 ?>
diff --git a/htdocs/holiday/fiche.php b/htdocs/holiday/fiche.php
index 859069957a6..b09f08720e3 100644
--- a/htdocs/holiday/fiche.php
+++ b/htdocs/holiday/fiche.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 
 // Get parameters
@@ -752,9 +753,9 @@ else
             //print_fiche_titre($langs->trans('TitreRequestCP'));
 
             // Si il y a une erreur
-            if (GETPOST('error')) 
+            if (GETPOST('error'))
             {
-                switch(GETPOST('error')) 
+                switch(GETPOST('error'))
                 {
                     case 'datefin' :
                         $errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
@@ -829,16 +830,8 @@ else
                     if ($ret == 'html') print '<br />';
                 }
 
+                $head=holiday_prepare_head($cp);
 
-                $h=0;
-                $head = array();
-                $head[$h][0] = DOL_URL_ROOT . '/holiday/fiche.php?id='.$id;
-                $head[$h][1] = $langs->trans("Card");
-                $head[$h][2] = 'card';
-                $h++;
-                
-                complete_head_from_modules($conf,$langs,$cp,$head,$h,'holiday');
-                
                 dol_fiche_head($head,'card',$langs->trans("CPTitreMenu"),0,'holiday');
 
 
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index dd706ed9be2..8e063237b83 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -57,7 +57,7 @@ $search_employe  = GETPOST('search_employe');
 $search_valideur = GETPOST('search_valideur');
 $search_statut   = GETPOST('select_statut');
 
-$holiday = new Holiday($db);
+$holiday = new Holiday($db);
 
 /*
  * Actions
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index c566735c3e3..b482987af0b 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -55,8 +55,8 @@ $db_prefix=GETPOST('db_prefix','alpha');
 session_start();	// To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
 
 // Save a flag to tell to restore input value if we do back
-$_SESSION['dol_save_pass']=$db_pass;
-//$_SESSION['dol_save_passroot']=$passroot;
+$_SESSION['dol_save_pass']=$db_pass;
+//$_SESSION['dol_save_passroot']=$passroot;
 
 // Now we load forced value from install.forced.php file.
 $useforcedwizard=false;
@@ -874,15 +874,6 @@ 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");
@@ -892,6 +883,9 @@ 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");
@@ -901,6 +895,9 @@ 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/fileconf.php b/htdocs/install/fileconf.php
index 4cb44467761..349de13771a 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -69,7 +69,7 @@ if (@file_exists($forcedfile)) {
  *	View
  */
 
-session_start();	// To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
+session_start();	// To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters)
 
 pHeader($langs->trans("ConfigurationFile"),"etape1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'));
 
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 618e7ff6224..3cceb0dc077 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -30,15 +30,16 @@
 -- Types action comm
 --
 
-delete from llx_c_actioncomm where id in (1,2,3,4,5,8,9,10,30,31,50);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 1,  'AC_TEL',     'system', 'Phone call'							,NULL, 2);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 2,  'AC_FAX',     'system', 'Send Fax'							,NULL, 3);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 3,  'AC_PROP',    'systemauto', 'Send commercial proposal by email'	,'propal',  10);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 4,  'AC_EMAIL',   'system', 'Send Email'							,NULL, 4);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 5,  'AC_RDV',     'system', 'Rendez-vous'							,NULL, 1);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 8,  'AC_COM',     'systemauto', 'Send customer order by email'		,'order',   8);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 9,  'AC_FAC',     'systemauto', 'Send customer invoice by email'		,'invoice', 6);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 10, 'AC_SHIP',    'systemauto', 'Send shipping by email'				,'shipping', 11);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 30, 'AC_SUP_ORD', 'systemauto', 'Send supplier order by email'		,'order_supplier',    9);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values  (31, 'AC_SUP_INV', 'systemauto', 'Send supplier invoice by email'		,'invoice_supplier', 7);
-insert into llx_c_actioncomm (id, code, type, libelle, module, position) values ( 50, 'AC_OTH',     'system', 'Other'								,NULL, 5);
+delete from llx_c_actioncomm where id in (1,2,3,4,5,8,9,10,30,31,40,50);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 1,'AC_TEL','system','Phone call',NULL, 1, 2);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 2,'AC_FAX','system','Send Fax',NULL, 1, 3);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 4,'AC_EMAIL','system','Send Email',NULL, 1, 4);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 5,'AC_RDV','system','Rendez-vous',NULL, 1, 1);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 8,'AC_COM','systemauto','Send customer order by email','order', 0,8);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 9,'AC_FAC','systemauto', 'Send customer invoice by email','invoice',0,6);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 10,'AC_SHIP','systemauto', 'Send shipping by email','shipping',0,11);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 30,'AC_SUP_ORD','systemauto','Send supplier order by email','order_supplier',0,9);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 31,'AC_SUP_INV','systemauto','Send supplier invoice by email','invoice_supplier',0,7);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 40,'AC_OTH_AUTO','systemauto','Other (automatically inserted events)',NULL, 1, 20);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 50,'AC_OTH','system','Other (manually inserted events)',NULL, 1, 5);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index db277680875..3f48667c690 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -255,9 +255,13 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (15
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1543,154,     '10','0','VAT Frontero',1);
 
 -- BARBADOS (id country=46)
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (461,46,     '0','0','No VAT',1);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (462,46,     '15','0','VAT 15%',1);
-INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (463,46,     '7.5','0','VAT 7.5%',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 461, 46,     '0','0','No VAT',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 462, 46,     '15','0','VAT 15%',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 463, 46,     '7.5','0','VAT 7.5%',1);
+
+-- SOUTH AFRICA (id country=205)
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2051,205,     '0','0','No VAT',1);
+INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2052,205,     '14','0','VAT 14%',1);
 
 -- VENEZUELA (id country=232)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2321,232,     '0','0','No VAT',1);
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 fdbc1f223e6..61735acebe6 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
@@ -805,6 +805,12 @@ ALTER TABLE llx_c_effectif DROP INDEX code, ADD UNIQUE uk_c_effectif (code);
 ALTER TABLE llx_c_paiement DROP INDEX code, ADD UNIQUE uk_c_paiement (code);
 
 
+delete from llx_c_actioncomm where id = 40;
+INSERT INTO llx_c_actioncomm (id, code, type, libelle, module, position) values ( 40, 'AC_OTH_AUTO','systemauto', 'Other (automatically inserted events)' ,NULL, 20);
+UPDATE llx_c_actioncomm SET libelle = 'Other (manually inserted events)' WHERE code = 'AC_OTH';
+UPDATE llx_c_actioncomm SET active = 0 WHERE code in ('AC_PROP', 'AC_COM', 'AC_FAC', 'AC_SHIP', 'AC_SUP_ORD', 'AC_SUP_INV');
+
+
 -- Update dictionnary of table llx_c_paper_format
 DELETE FROM llx_c_paper_format;
 
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index c5dce9389a6..9c10b0fb1f7 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -718,6 +718,20 @@ VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'
 VATIsUsedExampleFR=A França, es tracta de les societats o organismes que trien un règim fiscal general (General simplificat o General normal), règim en el qual es declara l'IVA.
 VATIsNotUsedExampleFR=A França, es tracta d'associacions exemptes d'IVA o societats, organismes o professions liberals que han eligedo el règim fiscal de mòduls (IVA en franquícia), pagant un IVA en franquícia sense fer declaració d'IVA. Aquesta elecció fa aparèixer l'anotació "IVA no aplicable - art-293B del CGI" en les factures.
 ##### Local Taxes #####
+LocalTax1IsUsed=Subjecte
+LocalTax1IsNotUsed=No subjecte
+LocalTax1IsUsedDesc=Ús d'un 2on. tipus d'impost (Diferent de l'IVA)
+LocalTax1IsNotUsedDesc=No utilitzar un 2on. tipus d'impost (Diferent de l'IVA)
+LocalTax1Management=Gestió 2on. tipus d'impost
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsUsed=Subjecte
+LocalTax2IsNotUsed=No subjecte
+LocalTax2IsUsedDesc=Ús d'un 3er. tipus d'impost (Diferent de l'IVA)
+LocalTax2IsNotUsedDesc=No utilitzar un 3er. tipus d'impost (Diferent de l'IVA)
+LocalTax2Management=Gestió 2on. tipus d'impost
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample= 
 LocalTax1ManagementES=Gestió Recàrrec d'Equivalència
 LocalTax1IsUsedDescES=El tipus de RE proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla:<br>Si el comprador no està subjecte a RE, RE per defecte= 0. Final de regla.<br>Si el comprador està subjecte a RE aleshores s'aplica valor de RE per defecte. Final de regla.<br>
 LocalTax1IsNotUsedDescES=El tipus de RE proposat per defecte es 0. Final de regla.
@@ -949,7 +963,6 @@ 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/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index d6159645479..62f5e6a3b7b 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -20,7 +20,6 @@ AddThisArticle=Afegeix aquest article
 RestartSelling=Reprendre la venda
 SellFinished=Venda acabada
 PrintTicket=Imprimir tiquet
-NoResults=Cap resultat
 NoProductFound=Cap article trobat
 ProductFound=Producte trobat
 ProductsFound=Productes trobats
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 1efa62b8804..502ed15864f 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -81,6 +81,8 @@ ActionAC_SHIP=Enviament expedició per correu
 ActionAC_SUP_ORD=Enviament comanda a proveïdor per correu
 ActionAC_SUP_INV=Enviament factura de proveïdor per correu
 ActionAC_OTH=Altra
+ActionAC_MANUAL=Esdeveniments creats manualment
+ActionAC_AUTO=Esdeveniments creats automàticament
 Stats=Estadístiques de venda
 CAOrder=Volum de vendes (Comandes validades)
 FromTo=de %s a %s
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 63ae033cd98..caa0cfe0174 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -108,49 +108,42 @@ ProfId2AR=Ingressos bruts
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
-ProfId6AR=-
 ProfId1AU=ABN
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
-ProfId6AU=-
 ProfId1BE=N° col·legiat
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
 ProfId5BE=-
-ProfId6BE=-
-ProfId1BR=-
+ProfId1BR=CNPJ
 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
@@ -168,61 +161,51 @@ ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
-ProfId6GB=-
 ProfId1HN=RTN
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
-ProfId6HN=-
 ProfId1IN=Id prof. 1 (TIN)
-ProfId2IN=Id prof. 2 (PAN)
-ProfId3IN=Id prof. 3 (SRVC TAX)
+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=-
-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 ec04e3ff9ce..fd43de81c10 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -21,7 +21,6 @@ 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/languages.lang b/htdocs/langs/ca_ES/languages.lang
index d9716305d73..97b44e22cbe 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -12,6 +12,7 @@ Language_en_AU=Anglès (Australia)
 Language_en_GB=Anglès (Regne Unit)
 Language_en_IN=Anglès (Índia)
 Language_en_NZ=Anglais (Nova Zelanda)
+Language_en_SA=Inglés (Aràbia Saudita)
 Language_en_US=Anglès (Estats Units)
 Language_es_ES=Espanyol
 Language_es_AR=Espanyol (Argentina)
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 3e924788ed0..f5721bd7557 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -77,6 +77,8 @@ YourMailUnsubcribeOK=El correu electrònic <b>%s</b>  és correcta desuscribe.
 MailtoEMail=mailto email (hyperlink)
 ActivateCheckRead=Activar confirmació de lectura i opció de Desubscripció
 ActivateCheckReadKey=Clau usada per xifrar la URL de la confirmació de lectura i la funció de desubscripció
+EMailSentToNRecipients=E-Mail enviat a %s destinataris.
+
 # Libelle des modules de liste de destinataires mailing==
 MailingModuleDescContactCompanies=Contactes de tercers (clients potencials, clients, proveïdors ...)
 MailingModuleDescDolibarrUsers=Usuaris de Dolibarr
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 97683be8657..e5dd83e69e4 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -627,7 +627,8 @@ ByDay=Per dia
 BySalesRepresentative=Per comercial
 LinkedToSpecificUsers=Enllaçat a un contacte d'usuari particular
 DeleteAFile=Eliminació d'arxiu
-ConfirmDeleteAFile=Confirma l'eliminació de l'arxiu
+ConfirmDeleteAFile=Confirme l'eliminació de l'arxiu
+NoResults=Cap resultat
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index 62bb253a587..f502a3274bf 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -46,8 +46,4 @@ 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
-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
+UnitCharges=Càrrega unitària
\ No newline at end of file
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 16dc5eb7805..3ab4439d0b9 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -199,3 +199,6 @@ Collectivités=Col.lectivitats
 Particuliers=Particulars
 Entreprises=Empreses
 DOLIBARRFOUNDATION_PAYMENT_FORM=Per realitzar el pagament de la seva cotització per transferència bancària, visiteu la pàgina <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Per pagar amb targeta de crèdit o PayPal, feu clic al botó a la part inferior d'aquesta pàgina.<br><br>
+ByProperties=Per característiques
+MembersStatisticsByProperties=Estadístiques dels membres per característiques
+MembersByNature=Membres per naturalesa
\ No newline at end of file
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 71d8d426d2c..f1c0fbb0616 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -146,8 +146,6 @@ 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/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 19defa1363c..0f6ce75309d 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -93,6 +93,8 @@ CloneFiles=Clonar els arxius adjunts
 ConfirmCloneProject=Esteu segur que voleu clonar aquest projecte?
 ProjectReportDate=Canviar les dates de les tasques en funció de la data d'inici del projecte
 ErrorShiftTaskDate=S'ha produït un error en el canvi de les dates de les tasques
+ProjectsAndTasksLines=Projectes i tasques
+
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Cap de projecte
 TypeContact_project_external_PROJECTLEADER=Cap de projecte
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index df64623f238..38462265059 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -58,6 +58,7 @@ ActionsOnShipping=Events sobre l'expedició
 LinkToTrackYourPackage=Enllaç per al seguiment del seu paquet
 ShipmentCreationIsDoneFromOrder=De moment, la creació d'una nova expedició es realitza des de la fitxa de comanda.
 RelatedShippings=Expedició(ns) associades
+ShipmentLine=Línia d'expedició
 
 # Sending methods
 SendingMethodCATCH=Recollit pel client
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 22b63fbda11..d088feb8598 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -34,7 +34,7 @@ MakeWithdrawRequest=Fer una petició de domiciliació
 ThirdPartyBankCode=Codi banc del tercer
 ThirdPartyDeskCode=Codi oficina del tercer
 NoInvoiceCouldBeWithdrawed=No s'ha domiciliat cap factura. Assegureu-vos que les factures són d'empreses amb les dades de comptes bancaris correctes.
-ClassCredited=Abonar
+ClassCredited=Classificar com "Abonada"
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
 TransData=Data enviament
 TransMetod=Mètode enviament
@@ -81,6 +81,9 @@ WithdrawalFileNotCapable=No es possible generar fitxer bancari de domiciliacio p
 ShowWithdraw=Veure domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té pendent algun pagament per domiciliació, no serà tancada per a permetre la gestió de la domiciliació.
 DoStandingOrdersBeforePayments=Aquesta pestanya us permet realitzar una petició de domiciliació. Un cop, podeu ingressar el pagament a la factura per procedir al seu tancament.
+WithdrawalFile=Arxiu de la domiciliació
+SetToStatusSent=Classificar com "Arxiu enviat"
+ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades
 
 ### Notifications 
 InfoCreditSubject=Abonament de domiciliació %s pel banc
diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang
index 5ae5fd3a44e..146ae3fd85e 100644
--- a/htdocs/langs/en_SA/main.lang
+++ b/htdocs/langs/en_SA/main.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - en_WW - main
+# Dolibarr language file - en_SA - main
 CHARSET=UTF-8
 DIRECTION=ltr
 FONTFORPDF=DejaVuSans
@@ -10,8 +10,8 @@ FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
-FormatDateText=%B %d, %Y
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %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
+FormatDateHourTextShort=%d %b %Y, %I:%M %p
+FormatDateHourText=%d %B %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 b07c69d7259..6eb9b59b168 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -707,6 +707,20 @@ VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases li
 VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
+LocalTax1IsUsed=Use second tax
+LocalTax1IsNotUsed=Do not use second tax
+LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
+LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
+LocalTax1Management=Second type of tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsUsed=Use third tax
+LocalTax2IsNotUsed=Do not use third tax
+LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
+LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
+LocalTax2Management=Third type of tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE Management
 LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
 LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
@@ -939,7 +953,6 @@ 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
@@ -1310,6 +1323,7 @@ AccountancyCodeBuy=Purchase account. code
 AgendaSetup=Events and agenda module setup
 PasswordTogetVCalExport=Key to authorize export link
 PastDelayVCalExport=Do not export event older than
+AGENDA_USE_EVENT_TYPE=Use events types (manage into Configuration->Dictionnary->llx_c_actioncomm)
 ##### ClickToDial #####
 ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
 ##### Point Of Sales (CashDesk) #####
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 89238168e3a..6bd04970611 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -7,7 +7,7 @@ Agendas= Agendas
 Calendar= Calendar
 Calendars= Calendars
 LocalAgenda=Local calendar
-AffectedTo= Affected to
+AffectedTo= Assigned to
 DoneBy= Done by
 Events= Events
 MyEvents=My events
@@ -22,7 +22,7 @@ MenuToDoMyActions= My incomplete events
 MenuDoneMyActions= My terminated events
 ListOfEvents= List of Dolibarr events
 ActionsAskedBy=Events reported by
-ActionsToDoBy=Events affected to
+ActionsToDoBy=Events assigned to
 ActionsDoneBy=Events done by
 AllMyActions= All my events/tasks
 AllActions= All events/tasks
@@ -59,9 +59,9 @@ DateActionDoneEnd= Real end date
 DateActionStart= Start date
 DateActionEnd= End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, affected to or done by user <b>%s</b>.
+AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, assigned to or done by user <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions affected to user <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b>.
 AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>.
 AgendaShowBirthdayEvents=Show birthday's contacts
 AgendaHideBirthdayEvents=Hide birthday's contacts
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 8eebe14d634..baac58e4642 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -31,7 +31,7 @@ SalesRepresentativeFollowUp=Sales representative (follow-up)
 SalesRepresentativeSignature=Sales representative (signature)
 CommercialInterlocutor=Commercial interlocutor
 ErrorWrongCode=Wrong code
-NoSalesRepresentativeAffected=No particular sales representative affected
+NoSalesRepresentativeAffected=No particular sales representative assigned
 ShowCustomer=Show customer
 ShowProspect=Show prospect
 ListOfProspects=List of prospects
@@ -52,7 +52,7 @@ StatusActionToDo=To do
 StatusActionDone=Complete
 MyActionsAsked=Events I have recorded
 MyActionsToDo=Events I have to do
-MyActionsDone=Events affected to me
+MyActionsDone=Events assigned to me
 StatusActionInProcess=In process
 TasksHistoryForThisContact=Events for this contact
 LastProspectDoNotContact=Do not contact
@@ -63,7 +63,7 @@ LastProspectContactDone=Contact done
 DateActionPlanned=Date event planned for
 DateActionDone=Date event done
 ActionAskedBy=Event reported by
-ActionAffectedTo=Event affected to
+ActionAffectedTo=Event assigned to
 ActionDoneBy=Event done by
 ActionUserAsk=Reported by
 ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
@@ -81,6 +81,8 @@ ActionAC_SHIP=Send shipping by mail
 ActionAC_SUP_ORD=Send supplier order by mail
 ActionAC_SUP_INV=Send supplier invoice by mail
 ActionAC_OTH=Other
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
 Stats=Sales statistics
 CAOrder=Sales volume (validated orders)
 FromTo=from %s to %s
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index f2f537453e7..19a36f64c22 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -25,7 +25,6 @@ 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/margins.lang b/htdocs/langs/en_US/margins.lang
index 10a8112f87e..41203847ba5 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -47,7 +47,6 @@ 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/propal.lang b/htdocs/langs/en_US/propal.lang
index 78119f38ebb..3f76ca5ecda 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -61,7 +61,7 @@ FileUploaded=The file was successfully uploaded
 AssociatedDocuments=Documents associated with the proposal:
 ErrorCantOpenDir=Can't open directory
 DatePropal=Date of proposal
-DateEndPropal=Date end validity
+DateEndPropal=Validity ending date
 DateEndPropalShort=Date end
 ValidityDuration=Validity duration
 CloseAs=Close with status
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index b836554c2ea..c6f9ba97874 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -61,7 +61,7 @@ LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
 ShowGroup=Show group
 ShowUser=Show user
-NonAffectedUsers=Non affected users
+NonAffectedUsers=Non assigned users
 UserModified=User modified successfully
 GroupModified=Group modified successfully
 PhotoFile=Photo file
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 5488f674620..fe9fa0a9b99 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -81,6 +81,9 @@ WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your cou
 ShowWithdraw=Show Withdraw
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as payed to allow to manage withdrawal before.
 DoStandingOrdersBeforePayments=This tabs allows you to request for a standing order. Once it will be finished, you can type the payment to close the invoice.
+WithdrawalFile=Withdrawal file
+SetToStatusSent=Set to status "File Sent"
+ThisWillAlsoAddPaymentOnInvoice=This will also create payments onto invoices and will classify them to paid
 
 ### Notifications 
 InfoCreditSubject=Payment of standing order %s by the bank
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 3a43d9c67b3..63d3180e8a9 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -720,6 +720,20 @@ VATIsNotUsedDesc=El tipo de IVA propuesto por defecto es 0. Este es el caso de a
 VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el IVA.
 VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de IVA o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (IVA en franquicia), pagando un IVA en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
 ##### Local Taxes #####
+LocalTax1IsUsed=Sujeto
+LocalTax1IsNotUsed=No sujeto
+LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del IVA)
+LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del IVA)
+LocalTax1Management=Gestión 2º tipo de impuesto
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsUsed=Sujeto
+LocalTax2IsNotUsed=No sujeto
+LocalTax2IsUsedDesc=Uso de un 3er. tipo de impuesto (Distinto del IVA)
+LocalTax2IsNotUsedDesc=No usar un 3er. tipo de impuesto (Distinto del IVA)
+LocalTax2Management=Gestión 3er. tipo de impuesto
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample= 
 LocalTax1ManagementES=Gestión RE
 LocalTax1IsUsedDescES=El tipo de RE propuesto por defecto en las creaciones de presupuestos, facturas, pedidos, etc. Responde a la siguiente regla:<br>Si el comprador no está sujeto a RE, RE por defecto=0. Final de regla.<br>Si el comprador está sujeto a RE entonces se aplica valor de RE por defecto. Final de regla.<br>
 LocalTax1IsNotUsedDescES=El tipo de RE propuesto por defecto es 0. Final de regla.
@@ -952,7 +966,6 @@ 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/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 2520879a012..9cba2e3c687 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -20,7 +20,6 @@ AddThisArticle=Añadir este artículo
 RestartSelling=Retomar la venta
 SellFinished=Venta terminada
 PrintTicket=Imprimir ticket
-NoResults=Ningún resultado
 NoProductFound=Ningún artículo encontrado
 ProductFound=Producto encontrado
 ProductsFound=Productos encontrados
diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index c05a6b26395..3b5d007aac9 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -81,6 +81,8 @@ ActionAC_SHIP=Envío expedición por correo
 ActionAC_SUP_ORD=Envío pedido a proveedor por correo
 ActionAC_SUP_INV=Envío factura de proveedor por correo
 ActionAC_OTH=Otra
+ActionAC_MANUAL=Eventos creados manualmente
+ActionAC_AUTO=Eventos creados automáticamente
 Stats=Estadísticas de venta
 CAOrder=Volumen de ventas (Pedidos validados)
 FromTo=de %s a %s
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 511921a014b..9313df97434 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -109,20 +109,17 @@ ProfId2AR=Ingresos brutos
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
-ProfId6AR=-
 ProfId1AU=ABN
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
-ProfId6AU=-
 ProfId1BE=N° colegiado
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
 ProfId5BE=-
-ProfId6BE=-
-ProfId1BR=-
+ProfId1BR=CNPJ
 ProfId2BR=IE (Inscricao Estadual)
 ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
@@ -133,25 +130,21 @@ 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
@@ -169,61 +162,51 @@ 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=-
-ProfId6MA=-
+ProfId5MA=Id prof. 5
 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 d723910a5bd..580627e6cab 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -21,7 +21,6 @@ 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/languages.lang b/htdocs/langs/es_ES/languages.lang
index bd9b00231ce..0e537271c37 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -14,6 +14,7 @@ Language_en_AU=Inglés (Australia)
 Language_en_GB=Inglés (Reino Unido)
 Language_en_IN=Inglés (India)
 Language_en_NZ=Inglés (Nueva Zelanda)
+Language_en_SA=Inglés (Arabia Saudita)
 Language_en_US=Inglés (Estados Unidos)
 Language_es_ES=Español
 Language_es_AR=Español (Argentina)
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index de9216ef367..1885d285946 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -78,6 +78,7 @@ YourMailUnsubcribeOK=El correo electrónico <b>%s</b> es correcta desuscribe.
 MailtoEMail=mailto email (hyperlink)
 ActivateCheckRead=Activar confirmación de lectura y opción de desuscripción
 ActivateCheckReadKey=Clave usada para encriptar la URL de la confirmación de lectura y la función de desuscripción
+EMailSentToNRecipients=E-Mail enviado a %s destinatarios.
 
 # Libelle des modules de liste de destinataires mailing=
 MailingModuleDescContactCompanies=Contactos de terceros (clientes potenciales, clientes, proveedores...)
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 102624c20dc..17be1964762 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -627,8 +627,8 @@ ByDay=Por día
 BySalesRepresentative=Por comercial
 LinkedToSpecificUsers=Enlazado a un contacto de usuario particular
 DeleteAFile=Eliminación de archivo
-ConfirmDeleteAFile=Confirma la eliminación del archivo
-
+ConfirmDeleteAFile=Confirme la eliminación del archivo
+NoResults=Ningún resultado
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 0dc08481c46..5ff7b74b7d4 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -46,8 +46,4 @@ 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
-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
+UnitCharges=Carga unitaria
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index ecd037cbaa8..2050ca73d60 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -199,3 +199,6 @@ Collectivités=Colectividades
 Particuliers=Particulares
 Entreprises=Empresas
 DOLIBARRFOUNDATION_PAYMENT_FORM=Para realizar el pago de su cotización por transferencia bancaria, visite la página <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribirse#Para_una_adhesi.C3.B3n_por_transferencia">http://wiki.dolibarr.org/index.php/Subscribirse</a>.<br>Para pagar con tarjeta de crédito o PayPal, haga clic en el botón en la parte inferior de esta página.<br><br>
+ByProperties=Por características
+MembersStatisticsByProperties=Estadísticas de los miembros por características
+MembersByNature=Miembros por naturaleza
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index a3c2bf41eb7..97d4586bae6 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -146,8 +146,6 @@ 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/projects.lang b/htdocs/langs/es_ES/projects.lang
index 979f70f813f..0ee3925cdda 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -93,6 +93,7 @@ CloneFiles=Clonar los archivos adjuntos
 ConfirmCloneProject=¿Está seguro de querer clonar este proyecto?
 ProjectReportDate=Cambiar las fechas de las tareas en función de la fecha de inicio del proyecto
 ErrorShiftTaskDate=Se ha producido un error en el cambio de las fechas de las tareas
+ProjectsAndTasksLines=Proyectos y tareas
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Jefe de proyecto
 TypeContact_project_external_PROJECTLEADER=Jefe de proyecto
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 113af44ba93..7efaabc81cd 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -58,6 +58,7 @@ ActionsOnShipping=Eventos sobre la expedición
 LinkToTrackYourPackage=Enlace para el seguimento de su paquete
 ShipmentCreationIsDoneFromOrder=De momento, la creación de una nueva expedición se realiza desde la ficha de pedido.
 RelatedShippings=Expedición(es) asociada(s)
+ShipmentLine=Línea de expedición
 
 # Sending methods
 SendingMethodCATCH=Recogido por el cliente
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 6876b3f643a..bbbee4a6198 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -34,7 +34,7 @@ MakeWithdrawRequest=Realizar una petición de domiciliación
 ThirdPartyBankCode=Código banco del tercero
 ThirdPartyDeskCode=Código oficina del tercero
 NoInvoiceCouldBeWithdrawed=No se ha domiciliado ninguna factura. Asegúrese de que las facturas son de empresas con los datos de cuentas bancarias correctos.
-ClassCredited=Abonar
+ClassCredited=Clasificar como "Abonada"
 ClassCreditedConfirm=¿Está seguro de querer clasificar esta domiciliación como abonada en su cuenta bancaria?
 TransData=Fecha envío
 TransMetod=Método envío
@@ -81,6 +81,9 @@ WithdrawalFileNotCapable=No es posible generar fichero bancario de domiciliacion
 ShowWithdraw=Ver domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación, no será cerrada para permitir la gestión de la domiciliación.
 DoStandingOrdersBeforePayments=Esta pestaña le permite realizar una petición de domiciliación. Una vez terminada, puede ingresar el pago en la factura para proceder a su cierre.
+WithdrawalFile=Archivo de la domiciliación
+SetToStatusSent=Clasificar como "Archivo enviado"
+ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas
 
 ### Notifications 
 InfoCreditSubject=Abono de domiciliación %s por el banco
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 000a58860f9..089ae7f5cda 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -715,6 +715,20 @@ VATIsNotUsedDesc= Le taux de TVA proposé par défaut est 0. C'est le cas d'asso
 VATIsUsedExampleFR= En France, il s'agit des sociétés ou organismes ayant choisi un régime fiscale réel (Réel simplifié ou Réel normal), régime dans lequel la TVA est déclarée.
 VATIsNotUsedExampleFR= En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaitre la mention "TVA non applicable - art-293B du CGI" sur les factures.
 ##### Local Taxes #####
+LocalTax1IsUsed=Assujeti
+LocalTax1IsNotUsed=Non assujeti
+LocalTax1IsUsedDesc=Utilisation d'une 2eme type taxe (autre que TVA)
+LocalTax1IsNotUsedDesc=Pas d'utilisation de 2eme type taxe (autre que TVA)
+LocalTax1Management=Gestion 2eme type de tax
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsUsed=Assujeti
+LocalTax2IsNotUsed=Non assujeti
+LocalTax2IsUsedDesc=Utilisation d'une 3eme type taxe (autre que TVA)
+LocalTax2IsNotUsedDesc=Pas d'utilisation de 3eme type taxe (autre que TVA)
+LocalTax2Management=Gestion 3eme type de tax
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample= 
 LocalTax1ManagementES= Gestion RE
 LocalTax1IsUsedDescES= Le taux de RE proposé par défaut lors de la création de propale, facture, commande, etc... répond à la règle standard suivante:<br>Si acheteur non assujetti à RE, RE par défaut=0. Fin de règle.<br>Si acheteur assujetti à RE alors RE par défaut. Fin de règle.<br>
 LocalTax1IsNotUsedDescES= Le taux de RE proposé par défaut est 0. Fin de règle.
@@ -946,7 +960,6 @@ 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
@@ -1317,6 +1330,7 @@ AccountancyCodeBuy=Code compta achat
 AgendaSetup= Configuration du module actions et agenda
 PasswordTogetVCalExport= Clé pour autoriser lien export
 PastDelayVCalExport=Ne pas exporter les événements de plus de
+AGENDA_USE_EVENT_TYPE=Utilisez les type des évenements (administrable dans Configuration->Dictionnary->llx_c_actioncomm)
 ##### ClickToDial #####
 ClickToDialDesc= Ce module permet d'ajouter un petit picto à côté des numéros de téléphones. Un clic sur ce picto provoque l'appel de l'URL définie dans ce paramétrage. Ceci permet de provoquer des appels à un serveur de téléphonie depuis Dolibarr qui peut alors composer le numéro sur un système SIP par exemple.
 ##### Point Of Sales (CashDesk) #####
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index bb76700ba53..79937cb84fb 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -81,6 +81,8 @@ ActionAC_SHIP=Envoi bon d'expédition par mail
 ActionAC_SUP_ORD=Envoi commande fournisseur par mail
 ActionAC_SUP_INV=Envoi facture fournisseur par mail
 ActionAC_OTH=Autre
+ActionAC_MANUAL=Evênements insérés manuellement
+ActionAC_AUTO=Evênements insérés automatiquement
 Stats=Statistiques de vente
 CAOrder=Chiffre d'affaires (Commandes validées)
 FromTo=du %s au %s
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index b6fcbb6611b..87715bea1fe 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -26,7 +26,6 @@ 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/margins.lang b/htdocs/langs/fr_FR/margins.lang
index 3c81a9a1e4d..02dfedbbe9a 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -47,7 +47,6 @@ 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/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 39f62c0f5c1..27c00e307cf 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -81,6 +81,9 @@ WithdrawalFileNotCapable=Impossible de générer un fichier de bons de prélève
 ShowWithdraw=Voir prélèvement
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement par prélèvement non traité, elle ne le sera pas afin de permettre la gestion du prélèvement d'abord.
 DoStandingOrdersBeforePayments=Cet onglet permet de faire une demande de prélèvement bancaire. Une fois réalisé, vous pourrez saisir le paiement sur la facture pour la clore.
+WithdrawalFile=Fichier de prélèvement
+SetToStatusSent=Mettre status "Fichier envoyé"
+ThisWillAlsoAddPaymentOnInvoice=Ceci créera également les paiements sur les factures et les classera payées
 
 ### Notifications 
 InfoCreditSubject=Crédit prélèvement %s à la banque
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index 99e46b1161c..34cecb83e05 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -40,10 +40,12 @@ function marges_admin_prepare_head()
 
 	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    // $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,'',$head,$h,'margesadmin');
 
+	complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin','remove');
+
 	return $head;
 }
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 151920e614f..02ee4895bc1 100755
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -182,8 +182,10 @@ function paypaladmin_prepare_head()
     // 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf,$langs,$object,$head,$h,'paypaladmin');
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'paypaladmin');
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'paypaladmin','remove');
 
     return $head;
 }
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 443b0bc4be4..ce68665cb69 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 ($object->id && ($action == '' || $action == 'view') && $object->status)
+if ($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 380fb625b21..eda89ef1c5d 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-2012 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 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,8 +34,6 @@ 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');
@@ -351,11 +349,8 @@ if ($id || $ref)
 				//print $form->load_tva('tva_tx',$product->tva_tx,$supplier,$mysoc);    // Do not use list here as it may be any vat rates for any country
 				if (! empty($socid))	// When update
 				{
-					$supplierselected=new Societe($db);
-					$supplierselected->fetch($socid);
 					$default_vat=get_default_tva($supplier, $mysoc, $product->id);
 				}
-				if ($action == 'add_price' && $socid) $default_vat=$product->tva_tx;	// If editing product-fourn
 				print '<input type="text" class="flat" size="5" name="tva_tx" value="'.(GETPOST("tva_tx")?vatrate(GETPOST("tva_tx")):($default_vat!=''?vatrate($default_vat):'')).'">';
 				print '</td></tr>';
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 32ad23eafbe..bfff310636f 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -195,23 +195,6 @@ 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
@@ -539,7 +522,6 @@ 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");
@@ -550,10 +532,6 @@ $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;
@@ -561,47 +539,42 @@ $i=0;
 $nbofloop=count($profid);
 while ($i < $nbofloop)
 {
-	if ($profid[$i][1]!='-')
+	$var = !$var;
+
+	print '<tr '.$bc[$var].'>';
+	print '<td>'.$profid[$i][0]."</td><td>\n";
+	print $profid[$i][1];
+	print '</td>';
+
+	switch($i)
 	{
-		$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";
+        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;
 	}
+
+	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/notify/fiche.php b/htdocs/societe/notify/fiche.php
index 73a78eca503..26df6553559 100644
--- a/htdocs/societe/notify/fiche.php
+++ b/htdocs/societe/notify/fiche.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2010      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
@@ -232,7 +232,7 @@ if ($result > 0)
 
         foreach($listofnotifiedevents as $notifiedevent)
         {
-            $label=$langs->trans("Notify_".$notifiedevent['code'])!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
+ 			$label=($langs->trans("Notify_".$notifiedevent['code'])!="Notify_".$notifiedevent['code']?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']);
             $actions[$notifiedevent['rowid']]=$label;
         }
         print '<tr '.$bc[$var].'><td>';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 26c453607ec..528672e3592 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-2012 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2011 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,18 +202,9 @@ 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 or mandatory prof id
-        	for ($i = 1; $i < 5; $i++)
+            // Check for duplicate prof id
+        	for ($i = 1; $i < 3; $i++)
         	{
         	    $slabel="idprof".$i;
     			$_POST[$slabel]=trim($_POST[$slabel]);
@@ -227,18 +218,8 @@ 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')
@@ -312,7 +293,7 @@ if (empty($reshook))
                     // Gestion du logo de la société
                 }
                 else
-				{
+                {
                     $error=$object->error; $errors=$object->errors;
                 }
 
@@ -853,13 +834,7 @@ else
             if ($idprof!='-')
             {
                 if (($j % 2) == 0) print '<tr>';
-                
-                $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>';
-                
+                print '<td>'.$idprof.'</td><td>';
                 $key='idprof'.$i;
                 print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
                 print '</td>';
@@ -934,22 +909,22 @@ else
         // Local Taxes
         if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsed").'</td><td>';
             print $form->selectyesno('localtax1assuj_value',0,1);
-            print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+            print '</td><td>'.$langs->trans("LocalTax2IsUsed").'</td><td>';
             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 '<tr><td>'.$langs->trans("LocalTax1IsUsed").'</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 '<tr><td>'.$langs->trans("LocalTax2IsUsed").'</td><td colspan="3">';
             print $form->selectyesno('localtax2assuj_value',0,1);
             print '</td><tr>';
         }
@@ -1296,13 +1271,7 @@ else
                 if ($idprof!='-')
                 {
                     if (($j % 2) == 0) print '<tr>';
-                    
-					$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>';
-                    
+                    print '<td>'.$idprof.'</td><td>';
                     $key='idprof'.$i;
                     print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
                     print '</td>';
@@ -1351,23 +1320,23 @@ else
             // Local Taxes
             if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
             {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
                 print $form->selectyesno('localtax1assuj_value',$object->localtax1_assuj,1);
-                print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+                print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 print '</td></tr>';
 
             }
             elseif($mysoc->localtax1_assuj=="1")
             {
-                print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+                print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</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("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+                print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 print '</td></tr>';
             }
@@ -1667,22 +1636,22 @@ else
         // Local Taxes
         if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
         {
-            print '<tr><td>'.$langs->trans("LocalTax1IsUsed",$mysoc->country_code).'</td><td>';
+            print '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
             print yn($object->localtax1_assuj);
-            print '</td><td>'.$langs->trans("LocalTax2IsUsed",$mysoc->country_code).'</td><td>';
+            print '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
             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 '<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("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
+            print '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
             print yn($object->localtax2_assuj);
             print '</td><tr>';
         }