alxarafe / alixar

dolibarr/htdocs/core/lib/expedition.lib.php

Indentation +86 added lines, -86 removed lines

@@ -34,29 +34,29 @@ 
  */
 function expedition_prepare_head(Expedition $object)
 {
-	global $langs, $conf, $user;
-	if (! empty($conf->expedition->enabled)) $langs->load("sendings");
-	$langs->load("orders");
+    global $langs, $conf, $user;
+    if (! empty($conf->expedition->enabled)) $langs->load("sendings");
+    $langs->load("orders");
 
-	$h = 0;
-	$head = array();
-	$h = 0;
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
-	$head[$h][1] = $langs->trans("Setup");
-	$h++;
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-	$head[$h][1] = $langs->trans("Shipment");
-	$hselected=$h;
-	$h++;
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
-		$head[$h][1] = $langs->trans("Receivings");
-		$h++;
-	}
+    $h = 0;
+    $head = array();
+    $h = 0;
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
+    $head[$h][1] = $langs->trans("Setup");
+    $h++;
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+    $head[$h][1] = $langs->trans("Shipment");
+    $hselected=$h;
+    $h++;
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+        $head[$h][1] = $langs->trans("Receivings");
+        $h++;
+    }
 	
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'order','remove');
@@ -71,72 +71,72 @@ 
  */
 function expedition_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-	$langs->load("sendings");
+    global $langs, $conf, $user;
+    $langs->load("sendings");
 
-	$h = 0;
-	$head = array();
-	
-	$head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
-	$head[$h][1] = $langs->trans("Setup");
-	$head[$h][2] = 'general';
-	$h++;
-	
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
-		$head[$h][1] = $langs->trans("Shipment");
-		$head[$h][2] = 'shipment';
-		$h++;
-	}
-	
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes_shipment';
-	$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
-	$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-	$head[$h][2] = 'attributeslines_shipment';
-	$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
-		$head[$h][1] = $langs->trans("Receivings");
-		$head[$h][2] = 'receivings';
-		$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
-		$head[$h][1] = $langs->trans("ExtraFields");
-		$head[$h][2] = 'attributes_receivings';
-		$h++;
-	}
-	
-	if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
-		$head[$h][1] = $langs->trans("ExtraFieldsLines");
-		$head[$h][2] = 'attributeslines_receivings';
-		$h++;
-	}
-	
-	
-	
-	complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
+    $h = 0;
+    $head = array();
+	
+    $head[$h][0] = DOL_URL_ROOT."/admin/confexped.php";
+    $head[$h][1] = $langs->trans("Setup");
+    $head[$h][2] = 'general';
+    $h++;
+	
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
+        $head[$h][1] = $langs->trans("Shipment");
+        $head[$h][2] = 'shipment';
+        $h++;
+    }
+	
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes_shipment';
+    $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
+    {
+    $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][2] = 'attributeslines_shipment';
+    $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/livraison.php";
+        $head[$h][1] = $langs->trans("Receivings");
+        $head[$h][2] = 'receivings';
+        $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/admin/livraison_extrafields.php';
+        $head[$h][1] = $langs->trans("ExtraFields");
+        $head[$h][2] = 'attributes_receivings';
+        $h++;
+    }
+	
+    if (! empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/admin/livraisondet_extrafields.php';
+        $head[$h][1] = $langs->trans("ExtraFieldsLines");
+        $head[$h][2] = 'attributeslines_receivings';
+        $h++;
+    }
+	
+	
+	
+    complete_head_from_modules($conf,$langs,null,$head,$h,'expedition_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

dolibarr/htdocs/core/lib/fourn.lib.php

Indentation +129 added lines, -129 removed lines

@@ -33,25 +33,25 @@ 
  */
 function facturefourn_prepare_head($object)
 {
-	global $db, $langs, $conf;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
+    global $db, $langs, $conf;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Card');
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -61,31 +61,31 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$object->ref;
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$object->ref;
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/info.php?facid='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/facture/info.php?facid='.$object->id;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_invoice','remove');
 
@@ -101,36 +101,36 @@ 
  */
 function ordersupplier_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("OrderCard");
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
-	if (! empty($conf->stock->enabled) && (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
-	{
-		$langs->load("stocks");
-		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("OrderDispatch");
-		$head[$h][2] = 'dispatch';
-		$h++;
-	}
-
-	// Show more tabs from modules
+    global $db, $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("OrderCard");
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
+
+    if (! empty($conf->stock->enabled) && (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
+    {
+        $langs->load("stocks");
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("OrderDispatch");
+        $head[$h][2] = 'dispatch';
+        $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
@@ -138,38 +138,38 @@ 
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Notes");
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
-	$head[$h][1].= $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
-	{
-	    $head[$h][1].= '/';
-	    $head[$h][1].= $langs->trans("Agenda");
-	}
-	$head[$h][2] = 'info';
-	$h++;
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_order', 'remove');
-	return $head;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
+    $head[$h][1].= $langs->trans("Events");
+    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    {
+        $head[$h][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
+    }
+    $head[$h][2] = 'info';
+    $h++;
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'supplier_order', 'remove');
+    return $head;
 }
 
 /**
@@ -179,53 +179,53 @@ 
  */
 function supplierorder_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_order.php";
-	$head[$h][1] = $langs->trans("SupplierOrder");
-	$head[$h][2] = 'order';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/supplier_order.php";
+    $head[$h][1] = $langs->trans("SupplierOrder");
+    $head[$h][2] = 'order';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_invoice.php";
-	$head[$h][1] = $langs->trans("SuppliersInvoice");
-	$head[$h][2] = 'invoice';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/supplier_invoice.php";
+    $head[$h][1] = $langs->trans("SuppliersInvoice");
+    $head[$h][2] = 'invoice';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/supplier_payment.php";
-	$head[$h][1] = $langs->trans("SuppliersPayment");
-	$head[$h][2] = 'supplierpayment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/supplier_payment.php";
+    $head[$h][1] = $langs->trans("SuppliersPayment");
+    $head[$h][2] = 'supplierpayment';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierorder_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierOrders");
-	$head[$h][2] = 'supplierorder';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierorder_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierOrders");
+    $head[$h][2] = 'supplierorder';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierorderdet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierOrdersLines");
-	$head[$h][2] = 'supplierorderdet';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierorderdet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierOrdersLines");
+    $head[$h][2] = 'supplierorderdet';
+    $h++;
 
 
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoice_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoices");
-	$head[$h][2] = 'supplierinvoice';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoice_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoices");
+    $head[$h][2] = 'supplierinvoice';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoicedet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoicesLines");
-	$head[$h][2] = 'supplierinvoicedet';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/supplierinvoicedet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsSupplierInvoicesLines");
+    $head[$h][2] = 'supplierinvoicedet';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'supplierorder_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 

dolibarr/htdocs/core/lib/pdf.lib.php

Indentation +1604 added lines, -1604 removed lines

@@ -41,34 +41,34 @@ 
  */
 function pdf_getFormat(Translate $outputlangs = null)
 {
-	global $conf,$db;
-
-	// Default value if setup was not done and/or entry into c_paper_format not defined
-	$width=210; $height=297; $unit='mm';
-
-	if (empty($conf->global->MAIN_PDF_FORMAT))
-	{
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$pdfformat=dol_getDefaultFormat($outputlangs);
-	}
-	else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
-
-	$sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
-	$sql.=" WHERE code = '".$pdfformat."'";
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$obj=$db->fetch_object($resql);
-		if ($obj)
-		{
-			$width=(int) $obj->width;
-			$height=(int) $obj->height;
-			$unit=$obj->unit;
-		}
-	}
-
-	//print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
-	return array('width'=>$width,'height'=>$height,'unit'=>$unit);
+    global $conf,$db;
+
+    // Default value if setup was not done and/or entry into c_paper_format not defined
+    $width=210; $height=297; $unit='mm';
+
+    if (empty($conf->global->MAIN_PDF_FORMAT))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $pdfformat=dol_getDefaultFormat($outputlangs);
+    }
+    else $pdfformat=$conf->global->MAIN_PDF_FORMAT;
+
+    $sql="SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
+    $sql.=" WHERE code = '".$pdfformat."'";
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $obj=$db->fetch_object($resql);
+        if ($obj)
+        {
+            $width=(int) $obj->width;
+            $height=(int) $obj->height;
+            $unit=$obj->unit;
+        }
+    }
+
+    //print "pdfformat=".$pdfformat." width=".$width." height=".$height." unit=".$unit;
+    return array('width'=>$width,'height'=>$height,'unit'=>$unit);
 }
 
 /**
@@ -81,64 +81,64 @@ 
  */
 function pdf_getInstance($format='',$metric='mm',$pagetype='P')
 {
-	global $conf;
-
-	// Define constant for TCPDF
-	if (! defined('K_TCPDF_EXTERNAL_CONFIG'))
-	{
-		define('K_TCPDF_EXTERNAL_CONFIG',1);	// this avoid using tcpdf_config file
-		define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
-		define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
-		dol_mkdir(K_PATH_CACHE);
-		define('K_BLANK_IMAGE', '_blank.png');
-		define('PDF_PAGE_FORMAT', 'A4');
-		define('PDF_PAGE_ORIENTATION', 'P');
-		define('PDF_CREATOR', 'TCPDF');
-		define('PDF_AUTHOR', 'TCPDF');
-		define('PDF_HEADER_TITLE', 'TCPDF Example');
-		define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
-		define('PDF_UNIT', 'mm');
-		define('PDF_MARGIN_HEADER', 5);
-		define('PDF_MARGIN_FOOTER', 10);
-		define('PDF_MARGIN_TOP', 27);
-		define('PDF_MARGIN_BOTTOM', 25);
-		define('PDF_MARGIN_LEFT', 15);
-		define('PDF_MARGIN_RIGHT', 15);
-		define('PDF_FONT_NAME_MAIN', 'helvetica');
-		define('PDF_FONT_SIZE_MAIN', 10);
-		define('PDF_FONT_NAME_DATA', 'helvetica');
-		define('PDF_FONT_SIZE_DATA', 8);
-		define('PDF_FONT_MONOSPACED', 'courier');
-		define('PDF_IMAGE_SCALE_RATIO', 1.25);
-		define('HEAD_MAGNIFICATION', 1.1);
-		define('K_CELL_HEIGHT_RATIO', 1.25);
-		define('K_TITLE_MAGNIFICATION', 1.3);
-		define('K_SMALL_RATIO', 2/3);
-		define('K_THAI_TOPCHARS', true);
-		define('K_TCPDF_CALLS_IN_HTML', true);
-		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
-	}
-
-	// Load TCPDF
-	require_once TCPDF_PATH.'tcpdf.php';
-
-	// We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
-
-	//$arrayformat=pdf_getFormat();
-	//$format=array($arrayformat['width'],$arrayformat['height']);
-	//$metric=$arrayformat['unit'];
-
-	$pdfa=false;											// PDF-1.3
-	if (! empty($conf->global->PDF_USE_1A)) $pdfa=true;		// PDF1/A
-
-	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
-	else $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
-
-	// Protection and encryption of pdf
-	if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
-	{
-		/* Permission supported by TCPDF
+    global $conf;
+
+    // Define constant for TCPDF
+    if (! defined('K_TCPDF_EXTERNAL_CONFIG'))
+    {
+        define('K_TCPDF_EXTERNAL_CONFIG',1);	// this avoid using tcpdf_config file
+        define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+        define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
+        dol_mkdir(K_PATH_CACHE);
+        define('K_BLANK_IMAGE', '_blank.png');
+        define('PDF_PAGE_FORMAT', 'A4');
+        define('PDF_PAGE_ORIENTATION', 'P');
+        define('PDF_CREATOR', 'TCPDF');
+        define('PDF_AUTHOR', 'TCPDF');
+        define('PDF_HEADER_TITLE', 'TCPDF Example');
+        define('PDF_HEADER_STRING', "by Dolibarr ERP CRM");
+        define('PDF_UNIT', 'mm');
+        define('PDF_MARGIN_HEADER', 5);
+        define('PDF_MARGIN_FOOTER', 10);
+        define('PDF_MARGIN_TOP', 27);
+        define('PDF_MARGIN_BOTTOM', 25);
+        define('PDF_MARGIN_LEFT', 15);
+        define('PDF_MARGIN_RIGHT', 15);
+        define('PDF_FONT_NAME_MAIN', 'helvetica');
+        define('PDF_FONT_SIZE_MAIN', 10);
+        define('PDF_FONT_NAME_DATA', 'helvetica');
+        define('PDF_FONT_SIZE_DATA', 8);
+        define('PDF_FONT_MONOSPACED', 'courier');
+        define('PDF_IMAGE_SCALE_RATIO', 1.25);
+        define('HEAD_MAGNIFICATION', 1.1);
+        define('K_CELL_HEIGHT_RATIO', 1.25);
+        define('K_TITLE_MAGNIFICATION', 1.3);
+        define('K_SMALL_RATIO', 2/3);
+        define('K_THAI_TOPCHARS', true);
+        define('K_TCPDF_CALLS_IN_HTML', true);
+        define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
+    }
+
+    // Load TCPDF
+    require_once TCPDF_PATH.'tcpdf.php';
+
+    // We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
+    if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
+
+    //$arrayformat=pdf_getFormat();
+    //$format=array($arrayformat['width'],$arrayformat['height']);
+    //$metric=$arrayformat['unit'];
+
+    $pdfa=false;											// PDF-1.3
+    if (! empty($conf->global->PDF_USE_1A)) $pdfa=true;		// PDF1/A
+
+    if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+    else $pdf = new TCPDF($pagetype,$metric,$format,true,'UTF-8',false,$pdfa);
+
+    // Protection and encryption of pdf
+    if (! empty($conf->global->PDF_SECURITY_ENCRYPTION))
+    {
+        /* Permission supported by TCPDF
 		- print : Print the document;
 		- modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';
 		- copy : Copy or otherwise extract text and graphics from the document;
@@ -150,26 +150,26 @@ 
 		- owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.
 		*/
 
-		// For TCPDF, we specify permission we want to block
-		$pdfrights = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true):array('modify','copy')); // Json format in llx_const
+        // For TCPDF, we specify permission we want to block
+        $pdfrights = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true):array('modify','copy')); // Json format in llx_const
 
-		// Password for the end user
-		$pdfuserpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_USERPASS:'');
+        // Password for the end user
+        $pdfuserpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_USERPASS:'');
 
-		// Password of the owner, created randomly if not defined
-		$pdfownerpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS:null);
+        // Password of the owner, created randomly if not defined
+        $pdfownerpass = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS)?$conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS:null);
 
-		// For encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit
-		$encstrength = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH)?$conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH:0);
+        // For encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit
+        $encstrength = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH)?$conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH:0);
 
-		// Array of recipients containing public-key certificates ('c') and permissions ('p').
-		// For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
-		$pubkeys = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true):null); // Json format in llx_const
+        // Array of recipients containing public-key certificates ('c') and permissions ('p').
+        // For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
+        $pubkeys = (! empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS)?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true):null); // Json format in llx_const
 
-		$pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass,$encstrength,$pubkeys);
-	}
+        $pdf->SetProtection($pdfrights,$pdfuserpass,$pdfownerpass,$encstrength,$pubkeys);
+    }
 
-	return $pdf;
+    return $pdf;
 }
 
 /**
@@ -181,15 +181,15 @@ 
  */
 function pdf_getEncryption(&$pdf, $pathoffile)
 {
-	$isencrypted = false;
+    $isencrypted = false;
 
-	$pdfparser = $pdf->_getPdfParser($pathoffile);
-	$data = $pdfparser->getParsedData();
-	if (isset($data[0]['trailer'][1]['/Encrypt'])) {
-		$isencrypted = true;
-	}
+    $pdfparser = $pdf->_getPdfParser($pathoffile);
+    $data = $pdfparser->getParsedData();
+    if (isset($data[0]['trailer'][1]['/Encrypt'])) {
+        $isencrypted = true;
+    }
 
-	return $isencrypted;
+    return $isencrypted;
 }
 
 /**
@@ -200,19 +200,19 @@ 
  */
 function pdf_getPDFFont($outputlangs)
 {
-	global $conf;
-
-	if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
-
-	$font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
-	{
-		if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
-		{
-			$font=$outputlangs->trans('FONTFORPDF');
-		}
-	}
-	return $font;
+    global $conf;
+
+    if (! empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
+
+    $font='Helvetica'; // By default, for FPDI, or ISO language on TCPDF
+    if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+    {
+        if ($outputlangs->trans('FONTFORPDF')!='FONTFORPDF')
+        {
+            $font=$outputlangs->trans('FONTFORPDF');
+        }
+    }
+    return $font;
 }
 
 /**
@@ -223,15 +223,15 @@ 
  */
 function pdf_getPDFFontSize($outputlangs)
 {
-	$size=10;                   // By default, for FPDI or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
-	{
-		if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
-		{
-			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
-		}
-	}
-	return $size;
+    $size=10;                   // By default, for FPDI or ISO language on TCPDF
+    if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+    {
+        if ($outputlangs->trans('FONTSIZEFORPDF')!='FONTSIZEFORPDF')
+        {
+            $size = (int) $outputlangs->trans('FONTSIZEFORPDF');
+        }
+    }
+    return $size;
 }
 
 
@@ -244,18 +244,18 @@ 
  */
 function pdf_getHeightForLogo($logo, $url = false)
 {
-	global $conf;
-	$height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
-	$maxwidth=130;
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($logo, $url);
-	if ($tmp['height'])
-	{
-		$width=round($height*$tmp['width']/$tmp['height']);
-		if ($width > $maxwidth) $height=$height*$maxwidth/$width;
-	}
-	//print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
-	return $height;
+    global $conf;
+    $height=(empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT)?22:$conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
+    $maxwidth=130;
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+    $tmp=dol_getImageSize($logo, $url);
+    if ($tmp['height'])
+    {
+        $width=round($height*$tmp['width']/$tmp['height']);
+        if ($width > $maxwidth) $height=$height*$maxwidth/$width;
+    }
+    //print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
+    return $height;
 }
 
 /**
@@ -287,22 +287,22 @@ 
     else
     {
         for ($page=$start_page; $page <= $end_page; ++$page) {
-        	$pdf->setPage($page);
-        	$tmpm=$pdf->getMargins();
-        	$tMargin = $tmpm['top'];
-        	if ($page == $start_page) {
-        		// first page
-        		$height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
-        	} elseif ($page == $end_page) {
-        		// last page
-        		$height = $end_y - $tMargin;
-        	} else {
-        		$height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
-        	}
+            $pdf->setPage($page);
+            $tmpm=$pdf->getMargins();
+            $tMargin = $tmpm['top'];
+            if ($page == $start_page) {
+                // first page
+                $height = $pdf->getPageHeight() - $start_y - $pdf->getBreakMargin();
+            } elseif ($page == $end_page) {
+                // last page
+                $height = $end_y - $tMargin;
+            } else {
+                $height = $pdf->getPageHeight() - $tMargin - $pdf->getBreakMargin();
+            }
         }
-	}
-	// restore previous object
-	$pdf = $pdf->rollbackTransaction();
+    }
+    // restore previous object
+    $pdf = $pdf->rollbackTransaction();
 
     return $height;
 }
@@ -320,21 +320,21 @@ 
 {
     global $conf;
 
-	// Recipient name
-	$socname = '';
-
-	if ($thirdparty instanceof Societe) {
-		$socname .= $thirdparty->name;
-		if (($includealias || ! empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
-		    $socname .= "\n".$thirdparty->name_alias;
-		}
-	} elseif ($thirdparty instanceof Contact) {
-		$socname = $thirdparty->socname;
-	} else {
-		throw new InvalidArgumentException('Parameter 1 $thirdparty is not a Societe nor Contact');
-	}
-
-	return $outputlangs->convToOutputCharset($socname);
+    // Recipient name
+    $socname = '';
+
+    if ($thirdparty instanceof Societe) {
+        $socname .= $thirdparty->name;
+        if (($includealias || ! empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
+            $socname .= "\n".$thirdparty->name_alias;
+        }
+    } elseif ($thirdparty instanceof Contact) {
+        $socname = $thirdparty->socname;
+    } else {
+        throw new InvalidArgumentException('Parameter 1 $thirdparty is not a Societe nor Contact');
+    }
+
+    return $outputlangs->convToOutputCharset($socname);
 }
 
 
@@ -352,240 +352,240 @@ 
  */
 function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$targetcontact='',$usecontact=0,$mode='source',$object=null)
 {
-	global $conf, $hookmanager;
-
-	if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
-	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
-
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
-	if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
-	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
-	if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
-	if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id=getState($targetcompany->state_id,'2');
-
-	$reshook=0;
-	$stringaddress = '';
-	if (is_object($hookmanager))
-	{
-		$parameters = array('sourcecompany'=>&$sourcecompany,'targetcompany'=>&$targetcompany,'targetcontact'=>$targetcontact,'outputlangs'=>$outputlangs,'mode'=>$mode,'usecontact'=>$usecontact);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_build_address',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$stringaddress.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-    	if ($mode == 'source')
-    	{
-    		$withCountry = 0;
-    		if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
-
-    		$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
-
-    		if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
-    		{
-    			// Phone
-    			if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
-    			// Fax
-    			if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
-    			// EMail
-    			if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
-    			// Web
-    			if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
-    		}
-    		// Intra VAT
-    		if (! empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
-    		{
-    			if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
-    		}
-    		// Professionnal Ids
-    		if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId1",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof2))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId2",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof3))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId3",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof4))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId4",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof5))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId5",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof6))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId6",$sourcecompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
-    		}
-    	}
-
-    	if ($mode == 'target' || preg_match('/targetwithdetails/',$mode))
-    	{
-    		if ($usecontact)
-    		{
-    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
-
-    			if (!empty($targetcontact->address)) {
-    				$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
-    			} else {
-    				$companytouseforaddress = $targetcompany;
-
-					// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
-					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
-					{
-						$targetcontact->fetch_thirdparty();
-						$companytouseforaddress = $targetcontact->thirdparty;
-					}
-
-					$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
-				}
-    			// Country
-    			if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-    				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-    			}
-    			else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-    				$stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-    			}
-
-    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
-    			{
-    				// Phone
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
-    			    {
-        				if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-        				if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-        				if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-        				if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
-    			    }
-    				// Fax
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
-    			    {
+    global $conf, $hookmanager;
+
+    if ($mode == 'source' && ! is_object($sourcecompany)) return -1;
+    if ($mode == 'target' && ! is_object($targetcompany)) return -1;
+
+    if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO deprecated
+    if (! empty($sourcecompany->state_id) && empty($sourcecompany->state))       $sourcecompany->state=getState($sourcecompany->state_id);
+    if (! empty($sourcecompany->state_id) && !isset($sourcecompany->departement_id))   $sourcecompany->departement_id=getState($sourcecompany->state_id,'2');
+    if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id); //TODO deprecated
+    if (! empty($targetcompany->state_id) && empty($targetcompany->state))       $targetcompany->state=getState($targetcompany->state_id);
+    if (! empty($targetcompany->state_id) && !isset($targetcompany->departement_id))   $targetcompany->departement_id=getState($targetcompany->state_id,'2');
+
+    $reshook=0;
+    $stringaddress = '';
+    if (is_object($hookmanager))
+    {
+        $parameters = array('sourcecompany'=>&$sourcecompany,'targetcompany'=>&$targetcompany,'targetcontact'=>$targetcontact,'outputlangs'=>$outputlangs,'mode'=>$mode,'usecontact'=>$usecontact);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_build_address',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $stringaddress.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if ($mode == 'source')
+        {
+            $withCountry = 0;
+            if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+
+            $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
+
+            if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
+            {
+                // Phone
+                if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+                // Fax
+                if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+                // EMail
+                if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+                // Web
+                if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+            }
+            // Intra VAT
+            if (! empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
+            {
+                if ($sourcecompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+            }
+            // Professionnal Ids
+            if (! empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof1))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId1",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
+            }
+            if (! empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof2))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId2",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
+            }
+            if (! empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof3))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId3",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
+            }
+            if (! empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof4))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId4",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
+            }
+            if (! empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof5))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId5",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
+            }
+            if (! empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && ! empty($sourcecompany->idprof6))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId6",$sourcecompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
+            }
+        }
+
+        if ($mode == 'target' || preg_match('/targetwithdetails/',$mode))
+        {
+            if ($usecontact)
+            {
+                $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs,1));
+
+                if (!empty($targetcontact->address)) {
+                    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
+                } else {
+                    $companytouseforaddress = $targetcompany;
+
+                    // Contact on a thirdparty that is a different thirdparty than the thirdparty of object
+                    if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
+                    {
+                        $targetcontact->fetch_thirdparty();
+                        $companytouseforaddress = $targetcontact->thirdparty;
+                    }
+
+                    $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
+                }
+                // Country
+                if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
+                    $stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
+                }
+                else if (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+                    $stringaddress.= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+                }
+
+                if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
+                {
+                    // Phone
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
+                    {
+                        if (! empty($targetcontact->phone_pro) || ! empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+                        if (! empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+                        if (! empty($targetcontact->phone_pro) && ! empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
+                        if (! empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+                    }
+                    // Fax
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
+                    {
                         if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
-    			    }
-    				// EMail
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
-    			    {
+                    }
+                    // EMail
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
+                    {
                         if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
-    			    }
-    				// Web
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
-    			    {
+                    }
+                    // Web
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
+                    {
                         if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
-    			    }
-    			}
-    		}
-    		else
-    		{
-    			$stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
-    			// Country
-    			if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-
-    			if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
-    			{
-    				// Phone
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
-    			    {
-    			    	if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
-	    				if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-    					if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-    					if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
-    			    }
-    				// Fax
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
-    			    {
-    			    	if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
-    			    }
-    				// EMail
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
-    			    {
-    			    	if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
-    			    }
-    				// Web
-    			    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
-    			    {
-    			    	if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
-    			    }
-    			}
-    		}
-
-    		// Intra VAT
-    		if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
-    		{
-    			if ($targetcompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
-    		}
-
-    		// Professionnal Ids
-    		if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
-    		{
-    			$tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
-    			if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    			$stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && ! empty($targetcompany->idprof5))
-    		{
-    		    $tmp=$outputlangs->transcountrynoentities("ProfId5",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
-    		}
-    		if (! empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && ! empty($targetcompany->idprof6))
-    		{
-    		    $tmp=$outputlangs->transcountrynoentities("ProfId6",$targetcompany->country_code);
-    		    if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
-    		    $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
-    		}
-
-    		// Public note
-    		if (! empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
-    		{
-    		    if ($mode == 'source' && ! empty($sourcecompany->note_public))
-        		{
-        		    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($sourcecompany->note_public);
-        		}
-        		if (($mode == 'target' || preg_match('/targetwithdetails/',$mode)) && ! empty($targetcompany->note_public))
-        		{
-        		    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($targetcompany->note_public);
-        		}
-    		}
-    	}
-	}
-
-	return $stringaddress;
+                    }
+                }
+            }
+            else
+            {
+                $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
+                // Country
+                if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+
+                if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/',$mode))
+                {
+                    // Phone
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/',$mode))
+                    {
+                        if (! empty($targetcompany->phone) || ! empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ";
+                        if (! empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+                        if (! empty($targetcompany->phone) && ! empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
+                        if (! empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+                    }
+                    // Fax
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/',$mode))
+                    {
+                        if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+                    }
+                    // EMail
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/',$mode))
+                    {
+                        if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+                    }
+                    // Web
+                    if (! empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/',$mode))
+                    {
+                        if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+                    }
+                }
+            }
+
+            // Intra VAT
+            if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
+            {
+                if ($targetcompany->tva_intra) $stringaddress.=($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+            }
+
+            // Professionnal Ids
+            if (! empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && ! empty($targetcompany->idprof1))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId1",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
+            }
+            if (! empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && ! empty($targetcompany->idprof2))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId2",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
+            }
+            if (! empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && ! empty($targetcompany->idprof3))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId3",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
+            }
+            if (! empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && ! empty($targetcompany->idprof4))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId4",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
+            }
+            if (! empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && ! empty($targetcompany->idprof5))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId5",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
+            }
+            if (! empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && ! empty($targetcompany->idprof6))
+            {
+                $tmp=$outputlangs->transcountrynoentities("ProfId6",$targetcompany->country_code);
+                if (preg_match('/\((.+)\)/',$tmp,$reg)) $tmp=$reg[1];
+                $stringaddress.=($stringaddress ? "\n" : '' ).$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
+            }
+
+            // Public note
+            if (! empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
+            {
+                if ($mode == 'source' && ! empty($sourcecompany->note_public))
+                {
+                    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($sourcecompany->note_public);
+                }
+                if (($mode == 'target' || preg_match('/targetwithdetails/',$mode)) && ! empty($targetcompany->note_public))
+                {
+                    $stringaddress.=($stringaddress ? "\n" : '' ).dol_string_nohtmltag($targetcompany->note_public);
+                }
+            }
+        }
+    }
+
+    return $stringaddress;
 }
 
 
@@ -599,15 +599,15 @@ 
  */
 function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 {
-	global $conf;
-
-	// Add a background image on document
-	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
-	{
-		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
-		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
-		$pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
-	}
+    global $conf;
+
+    // Add a background image on document
+    if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+    {
+        $pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
+        $pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
+        $pdf->SetAutoPageBreak(1,0);	// Restore pagebreak
+    }
 }
 
 
@@ -642,38 +642,38 @@ 
  */
 function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 {
-	global $langs, $mysoc, $user;
-
-	// Print Draft Watermark
-	if ($unit=='pt') $k=1;
-	elseif ($unit=='mm') $k=72/25.4;
-	elseif ($unit=='cm') $k=72/2.54;
-	elseif ($unit=='in') $k=72;
-
-	// Make substitution
-	$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
-	complete_substitutions_array($substitutionarray, $outputlangs, null);
-	$text=make_substitutions($text, $substitutionarray, $outputlangs);
-	$text=$outputlangs->convToOutputCharset($text);
-
-	$savx=$pdf->getX(); $savy=$pdf->getY();
-
-	$watermark_angle=atan($h/$w)/2;
-	$watermark_x_pos=0;
-	$watermark_y_pos=$h/3;
-	$watermark_x=$w/2;
-	$watermark_y=$h/3;
-	$pdf->SetFont('','B',40);
-	$pdf->SetTextColor(255,192,203);
-	//rotate
-	$pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm',cos($watermark_angle),sin($watermark_angle),-sin($watermark_angle),cos($watermark_angle),$watermark_x*$k,($h-$watermark_y)*$k,-$watermark_x*$k,-($h-$watermark_y)*$k));
-	//print watermark
-	$pdf->SetXY($watermark_x_pos,$watermark_y_pos);
-	$pdf->Cell($w-20,25,$outputlangs->convToOutputCharset($text),"",2,"C",0);
-	//antirotate
-	$pdf->_out('Q');
-
-	$pdf->SetXY($savx,$savy);
+    global $langs, $mysoc, $user;
+
+    // Print Draft Watermark
+    if ($unit=='pt') $k=1;
+    elseif ($unit=='mm') $k=72/25.4;
+    elseif ($unit=='cm') $k=72/2.54;
+    elseif ($unit=='in') $k=72;
+
+    // Make substitution
+    $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, null);
+    complete_substitutions_array($substitutionarray, $outputlangs, null);
+    $text=make_substitutions($text, $substitutionarray, $outputlangs);
+    $text=$outputlangs->convToOutputCharset($text);
+
+    $savx=$pdf->getX(); $savy=$pdf->getY();
+
+    $watermark_angle=atan($h/$w)/2;
+    $watermark_x_pos=0;
+    $watermark_y_pos=$h/3;
+    $watermark_x=$w/2;
+    $watermark_y=$h/3;
+    $pdf->SetFont('','B',40);
+    $pdf->SetTextColor(255,192,203);
+    //rotate
+    $pdf->_out(sprintf('q %.5F %.5F %.5F %.5F %.2F %.2F cm 1 0 0 1 %.2F %.2F cm',cos($watermark_angle),sin($watermark_angle),-sin($watermark_angle),cos($watermark_angle),$watermark_x*$k,($h-$watermark_y)*$k,-$watermark_x*$k,-($h-$watermark_y)*$k));
+    //print watermark
+    $pdf->SetXY($watermark_x_pos,$watermark_y_pos);
+    $pdf->Cell($w-20,25,$outputlangs->convToOutputCharset($text),"",2,"C",0);
+    //antirotate
+    $pdf->_out('Q');
+
+    $pdf->SetXY($savx,$savy);
 }
 
 
@@ -691,167 +691,167 @@ 
  */
 function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default_font_size=10)
 {
-	global $mysoc, $conf;
-
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
-
-	$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-	$diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT);
-	$pdf->SetXY($curx, $cury);
-
-	if (empty($onlynumber))
-	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizetitle);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
-		$cury+=4;
-	}
-
-	$outputlangs->load("banks");
-
-	// Use correct name of bank id according to country
-	$bickey="BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
-
-	// Get format of bank account according to its country
-	$usedetailedbban=$account->useDetailedBBAN();
-
-	//$onlynumber=0; $usedetailedbban=1; // For tests
-	if ($usedetailedbban)
-	{
-		$savcurx=$curx;
-
-		if (empty($onlynumber))
-		{
-			$pdf->SetFont('','',$default_font_size - $diffsizecontent);
-			$pdf->SetXY($curx, $cury);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-			$cury+=3;
-		}
-
-		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
-		{
-		    // Note:
-		    // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
-		    // desk = code guichet (FR), used only when $usedetailedbban = 1
-		    // number = account number
-		    // key = check control key used only when $usedetailedbban = 1
-    		if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
-
-
-			foreach ($account->getFieldsToShow() as $val)
-			{
-				$pdf->SetXY($curx, $cury+4);
-				$pdf->SetFont('','',$default_font_size - 3);
-
-				if ($val == 'BankCode') {
-					// Bank code
-					$tmplength = 18;
-					$content = $account->code_banque;
-				} elseif ($val == 'DeskCode') {
-					// Desk
-					$tmplength = 18;
-					$content = $account->code_guichet;
-				} elseif ($val == 'BankAccountNumber') {
-					// Number
-					$tmplength = 24;
-					$content = $account->number;
-				} elseif ($val == 'BankAccountNumberKey') {
-					// Key
-					$tmplength = 15;
-					$content = $account->cle_rib;
-				}elseif ($val == 'IBAN' || $val == 'BIC') {
-					// Key
-					$tmplength = 0;
-					$content = '';
-				} else {
-					dol_print_error($account->db, 'Unexpected value for getFieldsToShow: '.$val);
-					break;
-				}
-
-				$pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($content), 0, 'C', 0);
-				$pdf->SetXY($curx, $cury + 1);
-				$curx += $tmplength;
-				$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
-				$pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities($val), 0, 'C', 0);
-				if (empty($onlynumber)) {
-					$pdf->line($curx, $cury + 1, $curx, $cury + 7);
-				}
-    		}
-
-    		$curx=$savcurx;
-    		$cury+=8;
-		}
-	}
-	else
-	{
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
-		$cury+=3;
-
-		$pdf->SetFont('','B',$default_font_size - $diffsizecontent);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
-		$cury+=3;
-
-		if ($diffsizecontent <= 2) $cury+=1;
-	}
-
-	$pdf->SetFont('','',$default_font_size - $diffsizecontent);
-
-	if (empty($onlynumber) && ! empty($account->domiciliation))
-	{
-		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation);
-		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
-		//$nboflines=dol_nboflines_bis($val,120);
-		//$cury+=($nboflines*3)+2;
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
-	}
-
-	if (! empty($account->proprio))
-	{
-		$pdf->SetXY($curx, $cury);
-		$val=$outputlangs->transnoentities("BankAccountOwner").': ' . $outputlangs->convToOutputCharset($account->proprio);
-		$pdf->MultiCell(100, 3, $val, 0, 'L', 0);
-		$tmpy=$pdf->getStringHeight(100, $val);
-		$cury+=$tmpy;
-		$cur+=1;
-	}
-
-	else if (! $usedetailedbban) $cury+=1;
-
-	// Use correct name of bank id according to country
-	$ibankey = FormBank::getIBANLabel($account);
-
-	if (! empty($account->iban))
-	{
-		//Remove whitespaces to ensure we are dealing with the format we expect
-		$ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
-		$ibanDisplay = "";
-
-		$nbIbanDisplay_temp = dol_strlen($ibanDisplay_temp);
-		for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
-		{
-			$ibanDisplay .= $ibanDisplay_temp[$i];
-			if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
-		}
-
-		$pdf->SetFont('','B',$default_font_size - 3);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
-		$cury+=3;
-	}
-
-	if (! empty($account->bic))
-	{
-		$pdf->SetFont('','B',$default_font_size - 3);
-		$pdf->SetXY($curx, $cury);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
-	}
-
-	return $pdf->getY();
+    global $mysoc, $conf;
+
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
+
+    $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
+    $diffsizecontent=(empty($conf->global->PDF_DIFFSIZE_CONTENT)?4:$conf->global->PDF_DIFFSIZE_CONTENT);
+    $pdf->SetXY($curx, $cury);
+
+    if (empty($onlynumber))
+    {
+        $pdf->SetFont('','B',$default_font_size - $diffsizetitle);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
+        $cury+=4;
+    }
+
+    $outputlangs->load("banks");
+
+    // Use correct name of bank id according to country
+    $bickey="BICNumber";
+    if ($account->getCountryCode() == 'IN') $bickey="SWIFT";
+
+    // Get format of bank account according to its country
+    $usedetailedbban=$account->useDetailedBBAN();
+
+    //$onlynumber=0; $usedetailedbban=1; // For tests
+    if ($usedetailedbban)
+    {
+        $savcurx=$curx;
+
+        if (empty($onlynumber))
+        {
+            $pdf->SetFont('','',$default_font_size - $diffsizecontent);
+            $pdf->SetXY($curx, $cury);
+            $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+            $cury+=3;
+        }
+
+        if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
+        {
+            // Note:
+            // bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
+            // desk = code guichet (FR), used only when $usedetailedbban = 1
+            // number = account number
+            // key = check control key used only when $usedetailedbban = 1
+            if (empty($onlynumber)) $pdf->line($curx+1, $cury+1, $curx+1, $cury+6);
+
+
+            foreach ($account->getFieldsToShow() as $val)
+            {
+                $pdf->SetXY($curx, $cury+4);
+                $pdf->SetFont('','',$default_font_size - 3);
+
+                if ($val == 'BankCode') {
+                    // Bank code
+                    $tmplength = 18;
+                    $content = $account->code_banque;
+                } elseif ($val == 'DeskCode') {
+                    // Desk
+                    $tmplength = 18;
+                    $content = $account->code_guichet;
+                } elseif ($val == 'BankAccountNumber') {
+                    // Number
+                    $tmplength = 24;
+                    $content = $account->number;
+                } elseif ($val == 'BankAccountNumberKey') {
+                    // Key
+                    $tmplength = 15;
+                    $content = $account->cle_rib;
+                }elseif ($val == 'IBAN' || $val == 'BIC') {
+                    // Key
+                    $tmplength = 0;
+                    $content = '';
+                } else {
+                    dol_print_error($account->db, 'Unexpected value for getFieldsToShow: '.$val);
+                    break;
+                }
+
+                $pdf->MultiCell($tmplength, 3, $outputlangs->convToOutputCharset($content), 0, 'C', 0);
+                $pdf->SetXY($curx, $cury + 1);
+                $curx += $tmplength;
+                $pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
+                $pdf->MultiCell($tmplength, 3, $outputlangs->transnoentities($val), 0, 'C', 0);
+                if (empty($onlynumber)) {
+                    $pdf->line($curx, $cury + 1, $curx, $cury + 7);
+                }
+            }
+
+            $curx=$savcurx;
+            $cury+=8;
+        }
+    }
+    else
+    {
+        $pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': ' . $outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
+        $cury+=3;
+
+        $pdf->SetFont('','B',$default_font_size - $diffsizecontent);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': ' . $outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
+        $cury+=3;
+
+        if ($diffsizecontent <= 2) $cury+=1;
+    }
+
+    $pdf->SetFont('','',$default_font_size - $diffsizecontent);
+
+    if (empty($onlynumber) && ! empty($account->domiciliation))
+    {
+        $pdf->SetXY($curx, $cury);
+        $val=$outputlangs->transnoentities("Residence").': ' . $outputlangs->convToOutputCharset($account->domiciliation);
+        $pdf->MultiCell(100, 3, $val, 0, 'L', 0);
+        //$nboflines=dol_nboflines_bis($val,120);
+        //$cury+=($nboflines*3)+2;
+        $tmpy=$pdf->getStringHeight(100, $val);
+        $cury+=$tmpy;
+    }
+
+    if (! empty($account->proprio))
+    {
+        $pdf->SetXY($curx, $cury);
+        $val=$outputlangs->transnoentities("BankAccountOwner").': ' . $outputlangs->convToOutputCharset($account->proprio);
+        $pdf->MultiCell(100, 3, $val, 0, 'L', 0);
+        $tmpy=$pdf->getStringHeight(100, $val);
+        $cury+=$tmpy;
+        $cur+=1;
+    }
+
+    else if (! $usedetailedbban) $cury+=1;
+
+    // Use correct name of bank id according to country
+    $ibankey = FormBank::getIBANLabel($account);
+
+    if (! empty($account->iban))
+    {
+        //Remove whitespaces to ensure we are dealing with the format we expect
+        $ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
+        $ibanDisplay = "";
+
+        $nbIbanDisplay_temp = dol_strlen($ibanDisplay_temp);
+        for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
+        {
+            $ibanDisplay .= $ibanDisplay_temp[$i];
+            if($i%4 == 3 && $i > 0)	$ibanDisplay .= " ";
+        }
+
+        $pdf->SetFont('','B',$default_font_size - 3);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities($ibankey).': ' . $ibanDisplay, 0, 'L', 0);
+        $cury+=3;
+    }
+
+    if (! empty($account->bic))
+    {
+        $pdf->SetFont('','B',$default_font_size - 3);
+        $pdf->SetXY($curx, $cury);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': ' . $outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
+    }
+
+    return $pdf->getY();
 }
 
 /**
@@ -871,235 +871,235 @@ 
  */
 function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_basse,$marge_gauche,$page_hauteur,$object,$showdetails=0,$hidefreetext=0)
 {
-	global $conf,$user,$mysoc;
-
-	$outputlangs->load("dict");
-	$line='';
-
-	$dims=$pdf->getPageDimensions();
-
-	// Line of free text
-	if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
-	{
-		$substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
-		// More substitution keys
-		$substitutionarray['__FROM_NAME__']=$fromcompany->name;
-		$substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
-		complete_substitutions_array($substitutionarray, $outputlangs, $object);
-		$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
-
-		// Make a change into HTML code to allow to include images from medias directory.
-		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-		// become
-		// <img alt="" src="'.DOL_DATA_ROOT.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-		$newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
-
-		$line.=$outputlangs->convToOutputCharset($newfreetext);
-	}
-
-	// First line of company infos
-	$line1=""; $line2=""; $line3=""; $line4="";
-
-		if ($showdetails == 1 || $showdetails == 3)
-	{
-		// Company name
-		if ($fromcompany->name)
-		{
-			$line1.=($line1?" - ":"").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
-		}
-		// Address
-		if ($fromcompany->address)
-		{
-			$line1.=($line1?" - ":"").str_replace("\n", ", ", $fromcompany->address);
-		}
-		// Zip code
-		if ($fromcompany->zip)
-		{
-			$line1.=($line1?" - ":"").$fromcompany->zip;
-		}
-		// Town
-		if ($fromcompany->town)
-		{
-			$line1.=($line1?" ":"").$fromcompany->town;
-		}
-		// Phone
-		if ($fromcompany->phone)
-		{
-			$line2.=($line2?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
-		}
-		// Fax
-		if ($fromcompany->fax)
-		{
-			$line2.=($line2?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
-		}
-
-		// URL
-		if ($fromcompany->url)
-		{
-			$line2.=($line2?" - ":"").$fromcompany->url;
-		}
-		// Email
-		if ($fromcompany->email)
-		{
-			$line2.=($line2?" - ":"").$fromcompany->email;
-		}
-	}
-	if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE'))
-	{
-		// Managers
-		if ($fromcompany->managers)
-		{
-			$line2.=($line2?" - ":"").$fromcompany->managers;
-		}
-	}
-
-	// Line 3 of company infos
-	// Juridical status
-	if ($fromcompany->forme_juridique_code)
-	{
-		$line3.=($line3?" - ":"").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
-	}
-	// Capital
-	if ($fromcompany->capital)
-	{
-		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
-	}
-	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
-	}
-	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
-	}
-
-	// Line 4 of company infos
-	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
-	}
-	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
-	}
-	// Prof Id 5
-	if ($fromcompany->idprof5)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId5",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
-	}
-	// Prof Id 6
-	if ($fromcompany->idprof6)
-	{
-		$field=$outputlangs->transcountrynoentities("ProfId6",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
-	}
-	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
-		$line4.=($line4?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
-	}
-
-	$pdf->SetFont('','',7);
-	$pdf->SetDrawColor(224,224,224);
-
-	// The start of the bottom of this page footer is positioned according to # of lines
-	$freetextheight=0;
-	if ($line)	// Free text
-	{
-		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
-	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-		{
-			$width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
-    		if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
-    			$width=200; $align='C';
-    		}
-		    $freetextheight=$pdf->getStringHeight($width,$line);
-		}
-		else
-		{
+    global $conf,$user,$mysoc;
+
+    $outputlangs->load("dict");
+    $line='';
+
+    $dims=$pdf->getPageDimensions();
+
+    // Line of free text
+    if (empty($hidefreetext) && ! empty($conf->global->$paramfreetext))
+    {
+        $substitutionarray=pdf_getSubstitutionArray($outputlangs, null, $object);
+        // More substitution keys
+        $substitutionarray['__FROM_NAME__']=$fromcompany->name;
+        $substitutionarray['__FROM_EMAIL__']=$fromcompany->email;
+        complete_substitutions_array($substitutionarray, $outputlangs, $object);
+        $newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
+
+        // Make a change into HTML code to allow to include images from medias directory.
+        // <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+        // become
+        // <img alt="" src="'.DOL_DATA_ROOT.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
+        $newfreetext=preg_replace('/(<img.*src=")[^\"]*viewimage\.php[^\"]*modulepart=medias[^\"]*file=([^\"]*)("[^\/]*\/>)/', '\1'.DOL_DATA_ROOT.'/medias/\2\3', $newfreetext);
+
+        $line.=$outputlangs->convToOutputCharset($newfreetext);
+    }
+
+    // First line of company infos
+    $line1=""; $line2=""; $line3=""; $line4="";
+
+        if ($showdetails == 1 || $showdetails == 3)
+    {
+        // Company name
+        if ($fromcompany->name)
+        {
+            $line1.=($line1?" - ":"").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
+        }
+        // Address
+        if ($fromcompany->address)
+        {
+            $line1.=($line1?" - ":"").str_replace("\n", ", ", $fromcompany->address);
+        }
+        // Zip code
+        if ($fromcompany->zip)
+        {
+            $line1.=($line1?" - ":"").$fromcompany->zip;
+        }
+        // Town
+        if ($fromcompany->town)
+        {
+            $line1.=($line1?" ":"").$fromcompany->town;
+        }
+        // Phone
+        if ($fromcompany->phone)
+        {
+            $line2.=($line2?" - ":"").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
+        }
+        // Fax
+        if ($fromcompany->fax)
+        {
+            $line2.=($line2?" - ":"").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
+        }
+
+        // URL
+        if ($fromcompany->url)
+        {
+            $line2.=($line2?" - ":"").$fromcompany->url;
+        }
+        // Email
+        if ($fromcompany->email)
+        {
+            $line2.=($line2?" - ":"").$fromcompany->email;
+        }
+    }
+    if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE'))
+    {
+        // Managers
+        if ($fromcompany->managers)
+        {
+            $line2.=($line2?" - ":"").$fromcompany->managers;
+        }
+    }
+
+    // Line 3 of company infos
+    // Juridical status
+    if ($fromcompany->forme_juridique_code)
+    {
+        $line3.=($line3?" - ":"").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
+    }
+    // Capital
+    if ($fromcompany->capital)
+    {
+        $tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
+        if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
+        else $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$tmpamounttoshow,$outputlangs);
+    }
+    // Prof Id 1
+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
+    }
+    // Prof Id 2
+    if ($fromcompany->idprof2)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line3.=($line3?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
+    }
+
+    // Line 4 of company infos
+    // Prof Id 3
+    if ($fromcompany->idprof3)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
+    }
+    // Prof Id 4
+    if ($fromcompany->idprof4)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
+    }
+    // Prof Id 5
+    if ($fromcompany->idprof5)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId5",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
+    }
+    // Prof Id 6
+    if ($fromcompany->idprof6)
+    {
+        $field=$outputlangs->transcountrynoentities("ProfId6",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line4.=($line4?" - ":"").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
+    }
+    // IntraCommunautary VAT
+    if ($fromcompany->tva_intra != '')
+    {
+        $line4.=($line4?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
+    }
+
+    $pdf->SetFont('','',7);
+    $pdf->SetDrawColor(224,224,224);
+
+    // The start of the bottom of this page footer is positioned according to # of lines
+    $freetextheight=0;
+    if ($line)	// Free text
+    {
+        //$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
+        if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
+        {
+            $width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
+            if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+                $width=200; $align='C';
+            }
+            $freetextheight=$pdf->getStringHeight($width,$line);
+        }
+        else
+        {
             $freetextheight=pdfGetHeightForHtmlContent($pdf,dol_htmlentitiesbr($line, 1, 'UTF-8', 0));      // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
-		}
-	}
+        }
+    }
 
-	$marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
-	$posy=$marginwithfooter+0;
+    $marginwithfooter=$marge_basse + $freetextheight + (! empty($line1)?3:0) + (! empty($line2)?3:0) + (! empty($line3)?3:0) + (! empty($line4)?3:0);
+    $posy=$marginwithfooter+0;
 
-	if ($line)	// Free text
-	{
-		$pdf->SetXY($dims['lm'],-$posy);
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
-		{
+    if ($line)	// Free text
+    {
+        $pdf->SetXY($dims['lm'],-$posy);
+        if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
+        {
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
-		}
-		else
-		{
+        }
+        else
+        {
             $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk']-$marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
-		}
-		$posy-=$freetextheight;
-	}
-
-	$pdf->SetY(-$posy);
-	$pdf->line($dims['lm'], $dims['hk']-$posy, $dims['wk']-$dims['rm'], $dims['hk']-$posy);
-	$posy--;
-
-	if (! empty($line1))
-	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line1, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
-	}
-
-	if (! empty($line2))
-	{
-		$pdf->SetFont('','B',7);
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line2, 0, 'C', 0);
-		$posy-=3;
-		$pdf->SetFont('','',7);
-	}
-
-	if (! empty($line3))
-	{
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line3, 0, 'C', 0);
-	}
-
-	if (! empty($line4))
-	{
-		$posy-=3;
-		$pdf->SetXY($dims['lm'],-$posy);
-		$pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line4, 0, 'C', 0);
-	}
-
-	// Show page nb only on iso languages (so default Helvetica font)
-	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
-	{
-		$pdf->SetXY($dims['wk']-$dims['rm']-15, -$posy);
-		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
-		$pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-	}
-
-	return $marginwithfooter;
+        }
+        $posy-=$freetextheight;
+    }
+
+    $pdf->SetY(-$posy);
+    $pdf->line($dims['lm'], $dims['hk']-$posy, $dims['wk']-$dims['rm'], $dims['hk']-$posy);
+    $posy--;
+
+    if (! empty($line1))
+    {
+        $pdf->SetFont('','B',7);
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line1, 0, 'C', 0);
+        $posy-=3;
+        $pdf->SetFont('','',7);
+    }
+
+    if (! empty($line2))
+    {
+        $pdf->SetFont('','B',7);
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line2, 0, 'C', 0);
+        $posy-=3;
+        $pdf->SetFont('','',7);
+    }
+
+    if (! empty($line3))
+    {
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line3, 0, 'C', 0);
+    }
+
+    if (! empty($line4))
+    {
+        $posy-=3;
+        $pdf->SetXY($dims['lm'],-$posy);
+        $pdf->MultiCell($dims['wk']-$dims['rm']-$dims['lm'], 2, $line4, 0, 'C', 0);
+    }
+
+    // Show page nb only on iso languages (so default Helvetica font)
+    if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
+    {
+        $pdf->SetXY($dims['wk']-$dims['rm']-15, -$posy);
+        //print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
+        $pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+    }
+
+    return $marginwithfooter;
 }
 
 /**
@@ -1118,25 +1118,25 @@ 
  */
 function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$align,$default_font_size)
 {
-	$linkedobjects = pdf_getLinkedObjects($object,$outputlangs);
-	if (! empty($linkedobjects))
-	{
-		foreach($linkedobjects as $linkedobject)
-		{
-		    $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
-		    if (! empty($linkedobject["date_value"]))
-		    {
-		        $reftoshow .= ' / '.$linkedobject["date_value"];
-		    }
-
-			$posy+=3;
-			$pdf->SetXY($posx,$posy);
-			$pdf->SetFont('','', $default_font_size - 2);
-			$pdf->MultiCell($w, $h, $reftoshow, '', $align);
-		}
-	}
-
-	return $pdf->getY();
+    $linkedobjects = pdf_getLinkedObjects($object,$outputlangs);
+    if (! empty($linkedobjects))
+    {
+        foreach($linkedobjects as $linkedobject)
+        {
+            $reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
+            if (! empty($linkedobject["date_value"]))
+            {
+                $reftoshow .= ' / '.$linkedobject["date_value"];
+            }
+
+            $posy+=3;
+            $pdf->SetXY($posx,$posy);
+            $pdf->SetFont('','', $default_font_size - 2);
+            $pdf->MultiCell($w, $h, $reftoshow, '', $align);
+        }
+    }
+
+    return $pdf->getY();
 }
 
 /**
@@ -1157,29 +1157,29 @@ 
  */
 function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
-	global $db, $conf, $langs, $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
-		$action='';
-		$reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$labelproductservice=pdf_getlinedesc($object,$i,$outputlangs,$hideref,$hidedesc,$issupplierline);
-		// Description
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
-		$result.=$labelproductservice;
-	}
-	return $result;
+    global $db, $conf, $langs, $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('pdf'=>$pdf,'i'=>$i,'outputlangs'=>$outputlangs,'w'=>$w,'h'=>$h,'posx'=>$posx,'posy'=>$posy,'hideref'=>$hideref,'hidedesc'=>$hidedesc,'issupplierline'=>$issupplierline,'special_code'=>$special_code);
+        $action='';
+        $reshook=$hookmanager->executeHooks('pdf_writelinedesc',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $labelproductservice=pdf_getlinedesc($object,$i,$outputlangs,$hideref,$hidedesc,$issupplierline);
+        // Description
+        $pdf->writeHTMLCell($w, $h, $posx, $posy, $outputlangs->convToOutputCharset($labelproductservice), 0, 1, false, true, 'J',true);
+        $result.=$labelproductservice;
+    }
+    return $result;
 }
 
 /**
@@ -1195,222 +1195,222 @@ 
  */
 function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
-	global $db, $conf, $langs;
-
-	$idprod=(! empty($object->lines[$i]->fk_product)?$object->lines[$i]->fk_product:false);
-	$label=(! empty($object->lines[$i]->label)?$object->lines[$i]->label:(! empty($object->lines[$i]->product_label)?$object->lines[$i]->product_label:''));
-	$desc=(! empty($object->lines[$i]->desc)?$object->lines[$i]->desc:(! empty($object->lines[$i]->description)?$object->lines[$i]->description:''));
-	$ref_supplier=(! empty($object->lines[$i]->ref_supplier)?$object->lines[$i]->ref_supplier:(! empty($object->lines[$i]->ref_fourn)?$object->lines[$i]->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=(! empty($object->lines[$i]->note)?$object->lines[$i]->note:'');
-	$dbatch=(! empty($object->lines[$i]->detail_batch)?$object->lines[$i]->detail_batch:false);
-
-	if ($issupplierline)
-	{
-		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-		$prodser = new ProductFournisseur($db);
-	}
-	else
-	{
-		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		$prodser = new Product($db);
-	}
-
-	if ($idprod)
-	{
-		$prodser->fetch($idprod);
-		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
-		{
-			$translatealsoifmodified=(! empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED));	// By default if value was modified manually, we keep it (no translation because we don't have it)
-
-			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
-			// ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
-
-			// Set label
-			// If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
-			//var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
-			$textwasmodified=($label == $prodser->label);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
-
-			// Set desc
-			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
-			$textwasmodified=false;
-			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
-			} else {
-				$textwasmodified=($desc == $prodser->description);
-			}
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
-
-			// Set note
-			$textwasmodified=($note == $prodser->note);
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
-		}
-	}
-
-	// Description short of product line
-	$libelleproduitservice=$label;
-
-	// Description long of product line
-	if (! empty($desc) && ($desc != $label))
-	{
-		if ($libelleproduitservice && empty($hidedesc))
-		{
-			$libelleproduitservice.='__N__';
-		}
-
-		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
-			// Add date of deposit
-			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
-		}
-		if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
-		}
-		else
-		{
-			if ($idprod)
-			{
-				if (empty($hidedesc))
-				{
-					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
-					{
-						$libelleproduitservice=$desc."\n".$libelleproduitservice;
-					}
-					else
-					{
-						$libelleproduitservice.=$desc;
-					}
-				}
-			}
-			else
-			{
-				$libelleproduitservice.=$desc;
-			}
-		}
-	}
-
-	// We add ref of product (and supplier ref if defined)
-	$prefix_prodserv = "";
-	$ref_prodserv = "";
-	if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
-	{
-		if ($prodser->isService())
-		{
-			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-		}
-		else
-		{
-			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
-		}
-	}
-
-	if (empty($hideref))
-	{
-		if ($issupplierline)
-		{
-			if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
-				$ref_prodserv = $ref_supplier;
-			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
-				$ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else	// Common case
-			{
-				$ref_prodserv = $prodser->ref; // Show local ref
-				if ($ref_supplier) $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
-			}
-		}
-		else
-		{
-			$ref_prodserv = $prodser->ref; // Show local ref only
-		}
-
-		if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) $ref_prodserv .= " - ";
-	}
-
-	if(!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){ $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
-	$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
-
-	// Add an additional description for the category products
-	if (! empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && ! empty($conf->categorie->enabled))
-	{
-		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$categstatic=new Categorie($db);
-		// recovering the list of all the categories linked to product
-		$tblcateg=$categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
-		foreach ($tblcateg as $cate)
-		{
-			// Adding the descriptions if they are filled
-			$desccateg=$cate->add_description;
-			if ($desccateg)
-				$libelleproduitservice.='__N__'.$desccateg;
-		}
-	}
-
-	if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
-	{
-		$format='day';
-		// Show duration if exists
-		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs),dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
-		}
-		if ($object->lines[$i]->date_start && ! $object->lines[$i]->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
-		}
-		if (! $object->lines[$i]->date_start && $object->lines[$i]->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
-		}
-		//print '>'.$outputlangs->charset_output.','.$period;
-		if(!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){
-		    $libelleproduitservice.= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
-		}else{
-		$libelleproduitservice.="__N__".$period;
-		}
-		//print $libelleproduitservice;
-	}
-
-	if ($dbatch)
-	{
-		$format='day';
-		foreach ($dbatch as $detail)
-		{
-			$dte=array();
-			if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
-			if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
-			if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
-			$dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->qty);
-			$libelleproduitservice.= "__N__  ".implode(" - ", $dte);
-		}
-	}
-
-	// Now we convert \n into br
-	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
-	else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
-	$libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
-
-	return $libelleproduitservice;
+    global $db, $conf, $langs;
+
+    $idprod=(! empty($object->lines[$i]->fk_product)?$object->lines[$i]->fk_product:false);
+    $label=(! empty($object->lines[$i]->label)?$object->lines[$i]->label:(! empty($object->lines[$i]->product_label)?$object->lines[$i]->product_label:''));
+    $desc=(! empty($object->lines[$i]->desc)?$object->lines[$i]->desc:(! empty($object->lines[$i]->description)?$object->lines[$i]->description:''));
+    $ref_supplier=(! empty($object->lines[$i]->ref_supplier)?$object->lines[$i]->ref_supplier:(! empty($object->lines[$i]->ref_fourn)?$object->lines[$i]->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
+    $note=(! empty($object->lines[$i]->note)?$object->lines[$i]->note:'');
+    $dbatch=(! empty($object->lines[$i]->detail_batch)?$object->lines[$i]->detail_batch:false);
+
+    if ($issupplierline)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+        $prodser = new ProductFournisseur($db);
+    }
+    else
+    {
+        include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+        $prodser = new Product($db);
+    }
+
+    if ($idprod)
+    {
+        $prodser->fetch($idprod);
+        // If a predefined product and multilang and on other lang, we renamed label with label translated
+        if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
+        {
+            $translatealsoifmodified=(! empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED));	// By default if value was modified manually, we keep it (no translation because we don't have it)
+
+            // TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
+            // ($textwasmodified is replaced with $textwasmodifiedorcompleted and we add completion).
+
+            // Set label
+            // If we want another language, and if label is same than default language (we did force it to a specific value), we can use translation.
+            //var_dump($outputlangs->defaultlang.' - '.$langs->defaultlang.' - '.$label.' - '.$prodser->label);exit;
+            $textwasmodified=($label == $prodser->label);
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && ($textwasmodified || $translatealsoifmodified))     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+
+            // Set desc
+            // Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
+            $textwasmodified=false;
+            if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
+                $textwasmodified=(strpos(dol_html_entity_decode($desc,ENT_QUOTES | ENT_HTML401),dol_html_entity_decode($prodser->description,ENT_QUOTES | ENT_HTML401))!==false);
+            } else {
+                $textwasmodified=($desc == $prodser->description);
+            }
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+
+            // Set note
+            $textwasmodified=($note == $prodser->note);
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+        }
+    }
+
+    // Description short of product line
+    $libelleproduitservice=$label;
+
+    // Description long of product line
+    if (! empty($desc) && ($desc != $label))
+    {
+        if ($libelleproduitservice && empty($hidedesc))
+        {
+            $libelleproduitservice.='__N__';
+        }
+
+        if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromCreditNote",$sourceref);
+        }
+        elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit",$sourceref);
+            // Add date of deposit
+            if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+        }
+        if ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
+        }
+        elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($object->lines[$i]->fk_remise_except);
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+        }
+        else
+        {
+            if ($idprod)
+            {
+                if (empty($hidedesc))
+                {
+                    if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
+                    {
+                        $libelleproduitservice=$desc."\n".$libelleproduitservice;
+                    }
+                    else
+                    {
+                        $libelleproduitservice.=$desc;
+                    }
+                }
+            }
+            else
+            {
+                $libelleproduitservice.=$desc;
+            }
+        }
+    }
+
+    // We add ref of product (and supplier ref if defined)
+    $prefix_prodserv = "";
+    $ref_prodserv = "";
+    if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
+    {
+        if ($prodser->isService())
+        {
+            $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
+        }
+        else
+        {
+            $prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
+        }
+    }
+
+    if (empty($hideref))
+    {
+        if ($issupplierline)
+        {
+            if ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1)
+                $ref_prodserv = $ref_supplier;
+            elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
+                $ref_prodserv = $ref_supplier. ' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
+            else	// Common case
+            {
+                $ref_prodserv = $prodser->ref; // Show local ref
+                if ($ref_supplier) $ref_prodserv.= ($prodser->ref?' (':'').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref?')':'');
+            }
+        }
+        else
+        {
+            $ref_prodserv = $prodser->ref; // Show local ref only
+        }
+
+        if (! empty($libelleproduitservice) && ! empty($ref_prodserv)) $ref_prodserv .= " - ";
+    }
+
+    if(!empty($ref_prodserv) && !empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){ $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
+    $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+
+    // Add an additional description for the category products
+    if (! empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && ! empty($conf->categorie->enabled))
+    {
+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+        $categstatic=new Categorie($db);
+        // recovering the list of all the categories linked to product
+        $tblcateg=$categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
+        foreach ($tblcateg as $cate)
+        {
+            // Adding the descriptions if they are filled
+            $desccateg=$cate->add_description;
+            if ($desccateg)
+                $libelleproduitservice.='__N__'.$desccateg;
+        }
+    }
+
+    if (! empty($object->lines[$i]->date_start) || ! empty($object->lines[$i]->date_end))
+    {
+        $format='day';
+        // Show duration if exists
+        if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs),dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+        }
+        if ($object->lines[$i]->date_start && ! $object->lines[$i]->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
+        }
+        if (! $object->lines[$i]->date_start && $object->lines[$i]->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
+        }
+        //print '>'.$outputlangs->charset_output.','.$period;
+        if(!empty($conf->global->ADD_HTML_FORMATING_INTO_DESC_DOC)){
+            $libelleproduitservice.= '<b style="color:#333666;" ><em>'."__N__</b> ".$period.'</em>';
+        }else{
+        $libelleproduitservice.="__N__".$period;
+        }
+        //print $libelleproduitservice;
+    }
+
+    if ($dbatch)
+    {
+        $format='day';
+        foreach ($dbatch as $detail)
+        {
+            $dte=array();
+            if ($detail->eatby) $dte[]=$outputlangs->transnoentitiesnoconv('printEatby',dol_print_date($detail->eatby, $format, false, $outputlangs));
+            if ($detail->sellby) $dte[]=$outputlangs->transnoentitiesnoconv('printSellby',dol_print_date($detail->sellby, $format, false, $outputlangs));
+            if ($detail->batch) $dte[]=$outputlangs->transnoentitiesnoconv('printBatch',$detail->batch);
+            $dte[]=$outputlangs->transnoentitiesnoconv('printQty',$detail->qty);
+            $libelleproduitservice.= "__N__  ".implode(" - ", $dte);
+        }
+    }
+
+    // Now we convert \n into br
+    if (dol_textishtml($libelleproduitservice)) $libelleproduitservice=preg_replace('/__N__/','<br>',$libelleproduitservice);
+    else $libelleproduitservice=preg_replace('/__N__/',"\n",$libelleproduitservice);
+    $libelleproduitservice=dol_htmlentitiesbr($libelleproduitservice,1);
+
+    return $libelleproduitservice;
 }
 
 /**
@@ -1424,25 +1424,25 @@ 
  */
 function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->num);
-	}
-	return $result;
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $result.=dol_htmlentitiesbr($object->lines[$i]->num);
+    }
+    return $result;
 }
 
 
@@ -1457,25 +1457,25 @@ 
  */
 function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->product_ref);
-	}
-	return $result;
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $result.=dol_htmlentitiesbr($object->lines[$i]->product_ref);
+    }
+    return $result;
 }
 
 /**
@@ -1489,25 +1489,25 @@ 
  */
 function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		$result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		$result.=dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
-	}
-	return $result;
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        $result.=dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
+    }
+    return $result;
 }
 
 /**
@@ -1521,52 +1521,52 @@ 
  */
 function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails=0)
 {
-	global $conf, $hookmanager, $mysoc;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
-			$tmpresult='';
-
-			$tmpresult.=vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))
-			{
-				if ($object->lines[$i]->total_localtax1 != 0)
-				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
-				}
-			}
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))
-			{
-				if ($object->lines[$i]->total_localtax2 != 0)
-				{
-					if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
-					else $tmpresult='';
-					$tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
-				}
-			}
-			$tmpresult.= '%';
-
-			$result.=$tmpresult;
-		}
-	}
-	return $result;
+    global $conf, $hookmanager, $mysoc;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if (empty($hidedetails) || $hidedetails > 1)
+        {
+            $tmpresult='';
+
+            $tmpresult.=vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
+            if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))
+            {
+                if ($object->lines[$i]->total_localtax1 != 0)
+                {
+                    if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
+                    else $tmpresult='';
+                    $tmpresult.=vatrate(abs($object->lines[$i]->localtax1_tx), 0);
+                }
+            }
+            if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))
+            {
+                if ($object->lines[$i]->total_localtax2 != 0)
+                {
+                    if (preg_replace('/[\s0%]/','',$tmpresult)) $tmpresult.='/';
+                    else $tmpresult='';
+                    $tmpresult.=vatrate(abs($object->lines[$i]->localtax2_tx), 0);
+                }
+            }
+            $tmpresult.= '%';
+
+            $result.=$tmpresult;
+        }
+    }
+    return $result;
 }
 
 /**
@@ -1580,33 +1580,33 @@ 
  */
 function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $conf, $hookmanager;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
-			$subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
-			$result.=price($sign * $subprice, 0, $outputlangs);
-		}
-	}
-	return $result;
+    global $conf, $hookmanager;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if (empty($hidedetails) || $hidedetails > 1)
+        {
+            $subprice = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
+            $result.=price($sign * $subprice, 0, $outputlangs);
+        }
+    }
+    return $result;
 }
 
 /**
@@ -1620,29 +1620,29 @@ 
  */
 function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager,$conf;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
-	}
-	return $result;
+    global $hookmanager,$conf;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100), 0, $outputlangs);
+    }
+    return $result;
 }
 
 /**
@@ -1656,27 +1656,27 @@ 
  */
 function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$result='';
-	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
-	}
+    global $hookmanager;
+
+    $result='';
+    $reshook=0;
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
+    }
     if (empty($reshook))
-	{
-	   if ($object->lines[$i]->special_code == 3) return '';
-	   if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
-	}
-	return $result;
+    {
+        if ($object->lines[$i]->special_code == 3) return '';
+        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
+    }
+    return $result;
 }
 
 /**
@@ -1690,27 +1690,27 @@ 
  */
 function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
         if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_asked;
-	}
-	return $result;
+    }
+    return $result;
 }
 
 /**
@@ -1724,27 +1724,27 @@ 
  */
 function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    global $hookmanager;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
+    }
+    return $result;
 }
 
 /**
@@ -1758,27 +1758,27 @@ 
  */
 function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
+    global $hookmanager;
 
-	$reshook=0;
+    $reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+    }
+    return $result;
 }
 
 /**
@@ -1793,34 +1793,34 @@ 
  */
 function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = false)
 {
-	global $langs;
+    global $langs;
 
-	$reshook=0;
+    $reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
-			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		}
-		$parameters = array(
-			'i' => $i,
-			'outputlangs' => $outputlangs,
-			'hidedetails' => $hidedetails,
-			'special_code' => $special_code
-		);
-		$action = '';
-		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (!empty($object->lines[$i]->fk_parent_line)) {
+            $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        }
+        $parameters = array(
+            'i' => $i,
+            'outputlangs' => $outputlangs,
+            'hidedetails' => $hidedetails,
+            'special_code' => $special_code
+        );
+        $action = '';
+        $reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+    }
+    return $result;
 }
 
 
@@ -1835,29 +1835,29 @@ 
  */
 function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager;
-
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
+    global $hookmanager;
+
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
-	}
-	return $result;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+    }
+    return $result;
 }
 
 /**
@@ -1872,41 +1872,41 @@ 
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
-	if (empty($hookmanager)) global $hookmanager;
-	global $conf;
+    if (empty($hookmanager)) global $hookmanager;
+    global $conf;
 
-	$reshook=0;
+    $reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
-		$action = '';
-		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-        	if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
-			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
-			{
-				$prev_progress = 0;
-				if (method_exists($object, 'get_prev_progress'))
-				{
-			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-				}
-			 	$result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
-			}
-			else
-				$result = $object->lines[$i]->situation_percent . '%';
-	  	}
-	}
-	return $result;
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
+        $action = '';
+        $reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+            if ($object->lines[$i]->special_code == 3) return '';
+        if (empty($hidedetails) || $hidedetails > 1)
+        {
+            if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
+            {
+                $prev_progress = 0;
+                if (method_exists($object, 'get_prev_progress'))
+                {
+                        $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+                }
+                    $result = ($object->lines[$i]->situation_percent - $prev_progress) . '%';
+            }
+            else
+                $result = $object->lines[$i]->situation_percent . '%';
+            }
+    }
+    return $result;
 }
 
 /**
@@ -1920,49 +1920,49 @@ 
  */
 function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $conf, $hookmanager;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
+    global $conf, $hookmanager;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code, 'sign'=>$sign);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
     if (empty($reshook))
     {
-	    if ($object->lines[$i]->special_code == 3)
-    	{
-    		return $outputlangs->transnoentities("Option");
-    	}
+        if ($object->lines[$i]->special_code == 3)
+        {
+            return $outputlangs->transnoentities("Option");
+        }
         if (empty($hidedetails) || $hidedetails > 1)
         {
-        	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
-        	if ($object->lines[$i]->situation_percent > 0)
-        	{
-        		$prev_progress = 0;
-        		$progress = 1;
-        		if (method_exists($object->lines[$i], 'get_prev_progress'))
-        		{
-					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
-        		}
-				$result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
-        	}
-        	else
-			$result.=price($sign * $total_ht, 0, $outputlangs);
-	}
-    }
-	return $result;
+            $total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+            if ($object->lines[$i]->situation_percent > 0)
+            {
+                $prev_progress = 0;
+                $progress = 1;
+                if (method_exists($object->lines[$i], 'get_prev_progress'))
+                {
+                    $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+                    $progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
+                }
+                $result.=price($sign * ($total_ht/($object->lines[$i]->situation_percent/100)) * $progress, 0, $outputlangs);
+            }
+            else
+            $result.=price($sign * $total_ht, 0, $outputlangs);
+    }
+    }
+    return $result;
 }
 
 /**
@@ -1976,33 +1976,33 @@ 
  */
 function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
-	global $hookmanager,$conf;
-
-	$sign=1;
-	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
-
-	$reshook=0;
-	$result='';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
-		$special_code = $object->lines[$i]->special_code;
-		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-		$action='';
-		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-
-		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3)
-    	{
-    		$result.=$outputlangs->transnoentities("Option");
-    	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
-	}
-	return $result;
+    global $hookmanager,$conf;
+
+    $sign=1;
+    if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+
+    $reshook=0;
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
+    {
+        $special_code = $object->lines[$i]->special_code;
+        if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+        $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+        $action='';
+        $reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+
+        if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
+    }
+    if (empty($reshook))
+    {
+        if ($object->lines[$i]->special_code == 3)
+        {
+            $result.=$outputlangs->transnoentities("Option");
+        }
+        elseif (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+    }
+    return $result;
 }
 
 /**
@@ -2016,41 +2016,41 @@ 
  */
 function pdf_getTotalQty($object,$type,$outputlangs)
 {
-	global $hookmanager;
-
-	$total=0;
-	$nblignes=count($object->lines);
-
-	// Loop on each lines
-	for ($i = 0 ; $i < $nblignes ; $i++)
-	{
-		if ($object->lines[$i]->special_code != 3)
-		{
-			if ($type=='all')
-			{
-				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
-			{
-				$special_code = $object->lines[$i]->special_code;
-				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-				$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-				$action='';
-				$reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-				return $hookmanager->resPrint;
-			}
-			else if ($type==0 && $object->lines[$i]->product_type == 0)
-			{
-				$total += $object->lines[$i]->qty;
-			}
-			else if ($type==1 && $object->lines[$i]->product_type == 1)
-			{
-				$total += $object->lines[$i]->qty;
-			}
-		}
-	}
-
-	return $total;
+    global $hookmanager;
+
+    $total=0;
+    $nblignes=count($object->lines);
+
+    // Loop on each lines
+    for ($i = 0 ; $i < $nblignes ; $i++)
+    {
+        if ($object->lines[$i]->special_code != 3)
+        {
+            if ($type=='all')
+            {
+                $total += $object->lines[$i]->qty;
+            }
+            else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+            {
+                $special_code = $object->lines[$i]->special_code;
+                if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+                $parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+                $action='';
+                $reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+                return $hookmanager->resPrint;
+            }
+            else if ($type==0 && $object->lines[$i]->product_type == 0)
+            {
+                $total += $object->lines[$i]->qty;
+            }
+            else if ($type==1 && $object->lines[$i]->product_type == 1)
+            {
+                $total += $object->lines[$i]->qty;
+            }
+        }
+    }
+
+    return $total;
 }
 
 /**
@@ -2063,97 +2063,97 @@ 
  */
 function pdf_getLinkedObjects($object,$outputlangs)
 {
-	global $hookmanager;
-
-	$linkedobjects=array();
-
-	$object->fetchObjectLinked();
-
-	foreach($object->linkedObjects as $objecttype => $objects)
-	{
-	    if ($objecttype == 'facture')
-	    {
-	       // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-	    }
-	    elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
-		{
-			$outputlangs->load('propal');
-
-			foreach($objects as $elementobject)
-			{
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
-			}
-		}
-		else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
-		{
-			$outputlangs->load('orders');
-			foreach($objects as $elementobject)
-			{
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '') . ($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
-			}
-		}
-		else if ($objecttype == 'contrat')
-		{
-			$outputlangs->load('contracts');
-			foreach($objects as $elementobject)
-			{
-				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
-				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
-				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
-			}
-		}
-		else if ($objecttype == 'shipping')
-		{
-			$outputlangs->loadLangs(array("orders", "sendings"));
-
-			foreach($objects as $x => $elementobject)
-			{
-			    $order=null;
-			    // We concat this record info into fields xxx_value. title is overwrote.
-			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
-			    {
-			        $elementobject->fetchObjectLinked();
-			        if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
-			    }
-			    if (! is_object($order))
-			    {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-			        if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
-			        $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
-			        //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
-			        //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
-			    }
-			    else
-			    {
-			        $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
-			        if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
-			        $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
-			        //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
-			        //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
-			        //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
-			    }
-			}
-		}
-	}
-
-	// For add external linked objects
-	if (is_object($hookmanager))
-	{
-		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
-		$action='';
-		$hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
-	}
-
-	return $linkedobjects;
+    global $hookmanager;
+
+    $linkedobjects=array();
+
+    $object->fetchObjectLinked();
+
+    foreach($object->linkedObjects as $objecttype => $objects)
+    {
+        if ($objecttype == 'facture')
+        {
+            // For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
+        }
+        elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
+        {
+            $outputlangs->load('propal');
+
+            foreach($objects as $elementobject)
+            {
+                $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
+                $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
+                $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
+                $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+            }
+        }
+        else if ($objecttype == 'commande' || $objecttype == 'supplier_order')
+        {
+            $outputlangs->load('orders');
+            foreach($objects as $elementobject)
+            {
+                $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
+                $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref) . ($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '') . ($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
+                $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
+                $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date,'day','',$outputlangs);
+            }
+        }
+        else if ($objecttype == 'contrat')
+        {
+            $outputlangs->load('contracts');
+            foreach($objects as $elementobject)
+            {
+                $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
+                $linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
+                $linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
+                $linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat,'day','',$outputlangs);
+            }
+        }
+        else if ($objecttype == 'shipping')
+        {
+            $outputlangs->loadLangs(array("orders", "sendings"));
+
+            foreach($objects as $x => $elementobject)
+            {
+                $order=null;
+                // We concat this record info into fields xxx_value. title is overwrote.
+                if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
+                {
+                    $elementobject->fetchObjectLinked();
+                    if (! empty($elementobject->linkedObjects['commande'])) $order = reset($elementobject->linkedObjects['commande']);
+                }
+                if (! is_object($order))
+                {
+                    $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
+                    if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'].=' / ';
+                    $linkedobjects[$objecttype]['ref_value'].= $outputlangs->transnoentities($elementobject->ref);
+                    //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
+                    //if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
+                    //$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
+                }
+                else
+                {
+                    $linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
+                    if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
+                    $linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($elementobject->ref);
+                    //$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
+                    //if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
+                    //$linkedobjects[$objecttype]['date_value'].= ($elementobject->date_delivery ? ' / ' . dol_print_date($elementobject->date_delivery,'day','',$outputlangs) : '');
+                }
+            }
+        }
+    }
+
+    // For add external linked objects
+    if (is_object($hookmanager))
+    {
+        $parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
+        $action='';
+        $hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        if (! empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
+    }
+
+    return $linkedobjects;
 }
 
 /**
@@ -2165,24 +2165,24 @@ 
  */
 function pdf_getSizeForImage($realpath)
 {
-	global $conf;
-
-	$maxwidth=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
-	$maxheight=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT)?32:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-	$tmp=dol_getImageSize($realpath);
-	if ($tmp['height'])
-	{
-		$width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
-		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
-		{
-			$width=$maxwidth;
-			$height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
-		}
-		else	// No pb with maxheight
-		{
-			$height=$maxheight;
-		}
-	}
-	return array('width'=>$width,'height'=>$height);
+    global $conf;
+
+    $maxwidth=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
+    $maxheight=(empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT)?32:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+    $tmp=dol_getImageSize($realpath);
+    if ($tmp['height'])
+    {
+        $width=(int) round($maxheight*$tmp['width']/$tmp['height']);	// I try to use maxheight
+        if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
+        {
+            $width=$maxwidth;
+            $height=(int) round($maxwidth*$tmp['height']/$tmp['width']);
+        }
+        else	// No pb with maxheight
+        {
+            $height=$maxheight;
+        }
+    }
+    return array('width'=>$width,'height'=>$height);
 }

dolibarr/htdocs/core/lib/price.lib.php

Indentation +248 added lines, -248 removed lines

@@ -84,330 +84,330 @@
  */
 function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100, $multicurrency_tx=1, $pu_devise=0)
 {
-	global $conf,$mysoc,$db;
-
-	$result=array();
-
-	// Clean parameters
-	if (empty($info_bits)) $info_bits=0;
-	if (empty($txtva)) $txtva=0;
-	if (empty($seller) || ! is_object($seller))
-	{
-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
-		{
-			$mysoc=new Societe($db);
-			$mysoc->setMysoc($conf);
-		}
-		$seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
-		//var_dump($seller->country_id);exit;
-	}
-	if (empty($localtaxes_array) || ! is_array($localtaxes_array))
-	{
-		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
-	}
-	// Too verbose. Enable for debug only
-	//dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
-
-	$countryid=$seller->country_id;
-
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
-
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
-
-	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
-	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
+    global $conf,$mysoc,$db;
+
+    $result=array();
+
+    // Clean parameters
+    if (empty($info_bits)) $info_bits=0;
+    if (empty($txtva)) $txtva=0;
+    if (empty($seller) || ! is_object($seller))
+    {
+        dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
+        if (! is_object($mysoc))	// mysoc may be not defined (during migration process)
+        {
+            $mysoc=new Societe($db);
+            $mysoc->setMysoc($conf);
+        }
+        $seller=$mysoc;	// If sell is done to a customer, $seller is not provided, we use $mysoc
+        //var_dump($seller->country_id);exit;
+    }
+    if (empty($localtaxes_array) || ! is_array($localtaxes_array))
+    {
+        dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING);
+    }
+    // Too verbose. Enable for debug only
+    //dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress);
+
+    $countryid=$seller->country_id;
+
+    if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate=(float) $uselocaltax1_rate;
+    if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate=(float) $uselocaltax2_rate;
+
+    if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj;
+    if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj;
+
+    //var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
+    dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
 
     // Now we search localtaxes information ourself (rates and types).
-	$localtax1_type=0;
-	$localtax2_type=0;
-
-	if (is_array($localtaxes_array))
-	{
-		$localtax1_type = $localtaxes_array[0];
-		$localtax1_rate = $localtaxes_array[1];
-		$localtax2_type = $localtaxes_array[2];
-		$localtax2_rate = $localtaxes_array[3];
-	}
-	else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
-	{
-		$sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
-		$sql.= " WHERE cv.taux = ".$txtva;
-		$sql.= " AND cv.fk_pays = ".$countryid;
-		dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				$localtax1_rate=$obj->localtax1;
-				$localtax2_rate=$obj->localtax2;
-				$localtax1_type=$obj->localtax1_type;
-				$localtax2_type=$obj->localtax2_type;
-				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
-			}
-		}
-		else dol_print_error($db);
-	}
-
-	// pu calculation from pu_devise if pu empty
-	if (empty($pu) && !empty($pu_devise)) {
-		if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
-		{
-			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
-			return array();
-		}
-	}
-	if ($pu === '') $pu=0;
-	// pu_devise calculation from pu
-	if (empty($pu_devise) && !empty($multicurrency_tx)) {
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
-		{
-			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
-			return array();
-		}
-	}
-
-	// initialize total (may be HT or TTC depending on price_base_type)
-	$tot_sans_remise = $pu * $qty * $progress / 100;
-	$tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
-	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
-
-	// initialize result array
-	for ($i=0; $i <= 15; $i++) $result[$i] = 0;
-
-	// if there's some localtax including vat, we calculate localtaxes (we will add later)
+    $localtax1_type=0;
+    $localtax2_type=0;
+
+    if (is_array($localtaxes_array))
+    {
+        $localtax1_type = $localtaxes_array[0];
+        $localtax1_rate = $localtaxes_array[1];
+        $localtax2_type = $localtaxes_array[2];
+        $localtax2_rate = $localtaxes_array[3];
+    }
+    else	// deprecated method. values and type for localtaxes must be provided by caller and loaded with getLocalTaxesFromRate
+    {
+        $sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv";
+        $sql.= " WHERE cv.taux = ".$txtva;
+        $sql.= " AND cv.fk_pays = ".$countryid;
+        dol_syslog("Price.lib::calcul_price_total search vat information using old deprecated method", LOG_WARNING);
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj)
+            {
+                $localtax1_rate=$obj->localtax1;
+                $localtax2_rate=$obj->localtax2;
+                $localtax1_type=$obj->localtax1_type;
+                $localtax2_type=$obj->localtax2_type;
+                //var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
+            }
+        }
+        else dol_print_error($db);
+    }
+
+    // pu calculation from pu_devise if pu empty
+    if (empty($pu) && !empty($pu_devise)) {
+        if (! empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
+        else
+        {
+            dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
+            return array();
+        }
+    }
+    if ($pu === '') $pu=0;
+    // pu_devise calculation from pu
+    if (empty($pu_devise) && !empty($multicurrency_tx)) {
+        if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
+        else
+        {
+            dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
+            return array();
+        }
+    }
+
+    // initialize total (may be HT or TTC depending on price_base_type)
+    $tot_sans_remise = $pu * $qty * $progress / 100;
+    $tot_avec_remise_ligne = $tot_sans_remise       * (1 - ($remise_percent_ligne / 100));
+    $tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
+
+    // initialize result array
+    for ($i=0; $i <= 15; $i++) $result[$i] = 0;
+
+    // if there's some localtax including vat, we calculate localtaxes (we will add later)
 
     //If input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
     if ($price_base_type != 'TTC')
     {
-    	$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
-    	$pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
+        $tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)),'MU');
+        $tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)),'MU');
+        $pu_wt = price2num($pu * (1 + ($txtva / 100)),'MU');
     }
     else
     {
-    	$tot_sans_remise_wt = $tot_sans_remise;
-    	$tot_avec_remise_wt = $tot_avec_remise;
-    	$pu_wt = $pu;
+        $tot_sans_remise_wt = $tot_sans_remise;
+        $tot_avec_remise_wt = $tot_avec_remise;
+        $pu_wt = $pu;
     }
 
-	//print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
+    //print 'rr'.$price_base_type.'-'.$txtva.'-'.$tot_sans_remise_wt."-".$pu_wt."-".$uselocaltax1_rate."-".$localtax1_rate."-".$localtax1_type."\n";
 
     $localtaxes = array(0,0,0);
     $apply_tax = false;
-  	switch($localtax1_type) {
-      case '2':     // localtax on product or service
+        switch($localtax1_type) {
+        case '2':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '4':     // localtax on product
+        case '4':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '6':     // localtax on service
+        case '6':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
 
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[14];
+            $result[14] = price2num(($tot_sans_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
+            $localtaxes[0] += $result[14];
 
-  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[9];
+            $result[9] = price2num(($tot_avec_remise_wt * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
+            $localtaxes[1] += $result[9];
 
-  		$result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[11];
+            $result[11] = price2num(($pu_wt * (1 + ( $localtax1_rate / 100))) - $pu_wt, 'MU');
+            $localtaxes[2] += $result[11];
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
-      case '2':     // localtax on product or service
+        switch($localtax2_type) {
+        case '2':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '4':     // localtax on product
+        case '4':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '6':     // localtax on service
+        case '6':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[15];
+            $result[15] = price2num(($tot_sans_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
+            $localtaxes[0] += $result[15];
+
+            $result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
+            $localtaxes[1] += $result[10];
 
-  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[10];
+            $result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
+            $localtaxes[2] += $result[12];
+    }
 
-  		$result[12] = price2num(($pu_wt * (1 + ( $localtax2_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[12];
+    //dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
+    if ($price_base_type == 'HT')
+    {
+        // We work to define prices using the price without tax
+        $result[6] = price2num($tot_sans_remise, 'MT');
+        $result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
+        $result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
+        $result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
+
+        $result[0] = price2num($tot_avec_remise, 'MT');
+        $result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
+        $result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
+        $result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+
+        $result[3] = price2num($pu, 'MU');
+        $result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
+        $result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
+        $result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
+    }
+    else
+    {
+        // We work to define prices using the price with tax
+        $result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
+        $result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
+        $result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+        $result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
+
+        $result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
+        $result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
+        $result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
+        $result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
+
+        $result[5] = price2num($pu + $localtaxes[2], 'MU');
+        $result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
+        $result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
+        $result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
     }
 
-	//dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
-	if ($price_base_type == 'HT')
-	{
-		// We work to define prices using the price without tax
-		$result[6] = price2num($tot_sans_remise, 'MT');
-		$result[8] = price2num($tot_sans_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[0], 'MT');	// Selon TVA NPR ou non
-		$result8bis= price2num($tot_sans_remise * (1 + ( $txtva / 100)) + $localtaxes[0], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[7] = price2num($result8bis - ($result[6] + $localtaxes[0]), 'MT');
-
-		$result[0] = price2num($tot_avec_remise, 'MT');
-		$result[2] = price2num($tot_avec_remise * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[1], 'MT');	// Selon TVA NPR ou non
-		$result2bis= price2num($tot_avec_remise * (1 + ( $txtva / 100)) + $localtaxes[1], 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result2bis - ($result[0] + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
-
-		$result[3] = price2num($pu, 'MU');
-		$result[5] = price2num($pu * (1 + ( (($info_bits & 1)?0:$txtva) / 100)) + $localtaxes[2], 'MU');	// Selon TVA NPR ou non
-		$result5bis= price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU');	// Si TVA consideree normale (non NPR)
-		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
-	{
-		// We work to define prices using the price with tax
-		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
-		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result6bis= price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[7] = price2num($result[8] - ($result6bis + $localtaxes[0]), 'MT');
-
-		$result[2] = price2num($tot_avec_remise + $localtaxes[1], 'MT');
-		$result[0] = price2num($tot_avec_remise / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MT');	// Selon TVA NPR ou non
-		$result0bis= price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MT');	// Si TVA consideree normale (non NPR)
-		$result[1] = price2num($result[2] - ($result0bis + $localtaxes[1]), 'MT');	// Total VAT = TTC - (HT + localtax)
-
-		$result[5] = price2num($pu + $localtaxes[2], 'MU');
-		$result[3] = price2num($pu / (1 + ((($info_bits & 1)?0:$txtva) / 100)), 'MU');	// Selon TVA NPR ou non
-		$result3bis= price2num($pu / (1 + ($txtva / 100)), 'MU');	// Si TVA consideree normale (non NPR)
-		$result[4] = price2num($result[5] - ($result3bis + $localtaxes[2]), 'MU');
-	}
-
-	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
+    // if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
     //If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
     if ($price_base_type == 'TTC')
     {
-    	$tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
-    	$tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
-    	$pu = price2num($pu / (1 + ($txtva / 100)),'MU');
+        $tot_sans_remise= price2num($tot_sans_remise / (1 + ($txtva / 100)),'MU');
+        $tot_avec_remise= price2num($tot_avec_remise / (1 + ($txtva / 100)),'MU');
+        $pu = price2num($pu / (1 + ($txtva / 100)),'MU');
     }
 
-	$apply_tax = false;
+    $apply_tax = false;
     switch($localtax1_type) {
-      case '1':     // localtax on product or service
+        case '1':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '3':     // localtax on product
+        case '3':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '5':     // localtax on service
+        case '5':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
-  		$result[8] += $result[14];																				// total_ttc_without_discount + tax1
+            $result[14] = price2num(($tot_sans_remise * (1 + ( $localtax1_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax1 for total_ht_without_discount
+            $result[8] += $result[14];																				// total_ttc_without_discount + tax1
 
-  		$result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
-  		$result[2] += $result[9];																				// total_ttc + tax1
+            $result[9] = price2num(($tot_avec_remise * (1 + ( $localtax1_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax1 for total_ht
+            $result[2] += $result[9];																				// total_ttc + tax1
 
-  		$result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
-  		$result[5] += $result[11];																				// pu_ht + tax1
+            $result[11] = price2num(($pu * (1 + ( $localtax1_rate / 100))) - $pu, 'MU');							// amount tax1 for pu_ht
+            $result[5] += $result[11];																				// pu_ht + tax1
     }
 
     $apply_tax = false;
-  	switch($localtax2_type) {
-      case '1':     // localtax on product or service
+        switch($localtax2_type) {
+        case '1':     // localtax on product or service
         $apply_tax = true;
         break;
-      case '3':     // localtax on product
+        case '3':     // localtax on product
         if ($type == 0) $apply_tax = true;
         break;
-      case '5':     // localtax on service
+        case '5':     // localtax on service
         if ($type == 1) $apply_tax = true;
         break;
     }
     if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
-  		$result[8] += $result[15];																				// total_ttc_without_discount + tax2
+            $result[15] = price2num(($tot_sans_remise * (1 + ( $localtax2_rate / 100))) - $tot_sans_remise, 'MT');	// amount tax2 for total_ht_without_discount
+            $result[8] += $result[15];																				// total_ttc_without_discount + tax2
 
-  		$result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
-  		$result[2] += $result[10];																				// total_ttc + tax2
+            $result[10] = price2num(($tot_avec_remise * (1 + ( $localtax2_rate / 100))) - $tot_avec_remise, 'MT');	// amount tax2 for total_ht
+            $result[2] += $result[10];																				// total_ttc + tax2
 
-  		$result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
-  		$result[5] += $result[12];																				// pu_ht + tax2
+            $result[12] = price2num(($pu * (1 + ( $localtax2_rate / 100))) - $pu, 'MU');							// amount tax2 for pu_ht
+            $result[5] += $result[12];																				// pu_ht + tax2
     }
 
-	// If rounding is not using base 10 (rare)
-	if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
-	{
-		if ($price_base_type == 'HT')
-		{
-			$result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=price2num($result[0]+$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-		else
-		{
-			$result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[0]=price2num($result[2]-$result[1], 'MT');
-			$result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
-		}
-	}
-
-	// Multicurrency
-	if ($multicurrency_tx != 1)
-	{
-		// Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
-		$newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0);
-
-		$result[16] = $newresult[0];
-		$result[17] = $newresult[1];
-		$result[18] = $newresult[2];
-		$result[19] = $newresult[3];
-		$result[20] = $newresult[4];
-		$result[21] = $newresult[5];
-		$result[22] = $newresult[6];
-		$result[23] = $newresult[7];
-		$result[24] = $newresult[8];
-		$result[25] = $newresult[9];
-		$result[26] = $newresult[10];
-		/*
+    // If rounding is not using base 10 (rare)
+    if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT))
+    {
+        if ($price_base_type == 'HT')
+        {
+            $result[0]=round($result[0]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[2]=price2num($result[0]+$result[1], 'MT');
+            $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+        }
+        else
+        {
+            $result[1]=round($result[1]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[2]=round($result[2]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[0]=price2num($result[2]-$result[1], 'MT');
+            $result[9]=round($result[9]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+            $result[10]=round($result[10]/$conf->global->MAIN_ROUNDING_RULE_TOT, 0)*$conf->global->MAIN_ROUNDING_RULE_TOT;
+        }
+    }
+
+    // Multicurrency
+    if ($multicurrency_tx != 1)
+    {
+        // Recal function using the multicurrency price as reference price. We must set param $multicurrency_tx to 1 to avoid infinite loop.
+        $newresult = calcul_price_total($qty, $pu_devise, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller, $localtaxes_array, $progress, 1, 0);
+
+        $result[16] = $newresult[0];
+        $result[17] = $newresult[1];
+        $result[18] = $newresult[2];
+        $result[19] = $newresult[3];
+        $result[20] = $newresult[4];
+        $result[21] = $newresult[5];
+        $result[22] = $newresult[6];
+        $result[23] = $newresult[7];
+        $result[24] = $newresult[8];
+        $result[25] = $newresult[9];
+        $result[26] = $newresult[10];
+        /*
 		$result[16] = price2num($result[0] * $multicurrency_tx, 'MT');
 		$result[17] = price2num($result[1] * $multicurrency_tx, 'MT');
 		$result[18] = price2num($result[2] * $multicurrency_tx, 'MT');
 		$result[19] = price2num($pu_devise, 'MU');
 		*/
-	}
-	else
-	{
-		$result[16] = $result[0];
-		$result[17] = $result[1];
-		$result[18] = $result[2];
-		$result[19] = $result[3];
-		$result[20] = $result[4];
-		$result[21] = $result[5];
-		$result[22] = $result[6];
-		$result[23] = $result[7];
-		$result[24] = $result[8];
-		$result[25] = $result[9];
-		$result[26] = $result[10];
-	}
-
-	//var_dump($result);
-	// initialize result array
-	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
-
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
-
-	return $result;
+    }
+    else
+    {
+        $result[16] = $result[0];
+        $result[17] = $result[1];
+        $result[18] = $result[2];
+        $result[19] = $result[3];
+        $result[20] = $result[4];
+        $result[21] = $result[5];
+        $result[22] = $result[6];
+        $result[23] = $result[7];
+        $result[24] = $result[8];
+        $result[25] = $result[9];
+        $result[26] = $result[10];
+    }
+
+    //var_dump($result);
+    // initialize result array
+    //for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
+
+    dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.$conf->global->MAIN_ROUNDING_RULE_TOT.' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+
+    return $result;
 }
 

dolibarr/htdocs/core/lib/ldap.lib.php

Indentation +122 added lines, -122 removed lines

@@ -30,66 +30,66 @@ 
  */
 function ldap_prepare_head()
 {
-	global $langs, $conf, $user;
-
-	$langs->load("ldap");
-
-	// Onglets
-	$head=array();
-	$h = 0;
-
-	$head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
-	$head[$h][1] = $langs->trans("LDAPGlobalParameters");
-	$head[$h][2] = 'ldap';
-	$h++;
-
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
-		$head[$h][1] = $langs->trans("LDAPUsersSynchro");
-		$head[$h][2] = 'users';
-		$h++;
-	}
-
-	if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
-		$head[$h][1] = $langs->trans("LDAPGroupsSynchro");
-		$head[$h][2] = 'groups';
-		$h++;
-	}
-
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
-		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
-		$head[$h][2] = 'contacts';
-		$h++;
-	}
-
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
-		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
-		$head[$h][2] = 'members';
-		$h++;
-	}
-
-	if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
-		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
-		$head[$h][2] = 'memberstypes';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
-
-	return $head;
+    global $langs, $conf, $user;
+
+    $langs->load("ldap");
+
+    // Onglets
+    $head=array();
+    $h = 0;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/ldap.php";
+    $head[$h][1] = $langs->trans("LDAPGlobalParameters");
+    $head[$h][2] = 'ldap';
+    $h++;
+
+    if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
+        $head[$h][1] = $langs->trans("LDAPUsersSynchro");
+        $head[$h][2] = 'users';
+        $h++;
+    }
+
+    if (! empty($conf->global->LDAP_SYNCHRO_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
+        $head[$h][1] = $langs->trans("LDAPGroupsSynchro");
+        $head[$h][2] = 'groups';
+        $h++;
+    }
+
+    if (! empty($conf->societe->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
+        $head[$h][1] = $langs->trans("LDAPContactsSynchro");
+        $head[$h][2] = 'contacts';
+        $h++;
+    }
+
+    if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
+        $head[$h][1] = $langs->trans("LDAPMembersSynchro");
+        $head[$h][2] = 'members';
+        $h++;
+    }
+
+    if (! empty($conf->adherent->enabled) && ! empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
+        $head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
+        $head[$h][2] = 'memberstypes';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,'',$head,$h,'ldap');
+
+    return $head;
 }
 
 
@@ -105,28 +105,28 @@ 
  */
 function show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass)
 {
-	global $langs, $conf, $user;
-	//print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
-
-	print '<br>';
-	if (! function_exists("ldap_connect"))
-	{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	else if (empty($conf->global->LDAP_SERVER_HOST))
-	{
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else if (empty($key) || empty($dn) || empty($objectclass))
-	{
-		$langs->load("errors");
-		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
-	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
-	}
-	print '<br><br>';
+    global $langs, $conf, $user;
+    //print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
+
+    print '<br>';
+    if (! function_exists("ldap_connect"))
+    {
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
+    }
+    else if (empty($conf->global->LDAP_SERVER_HOST))
+    {
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
+    }
+    else if (empty($key) || empty($dn) || empty($objectclass))
+    {
+        $langs->load("errors");
+        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
+    }
+    else
+    {
+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
+    }
+    print '<br><br>';
 }
 
 
@@ -143,45 +143,45 @@ 
  */
 function show_ldap_content($result,$level,$count,$var,$hide=0,$subcount=0)
 {
-	global $bc, $conf;
-
-	$count--;
-	if ($count == 0) return -1;	// To stop loop
-	if (! is_array($result)) return -1;
-
-	foreach($result as $key => $val)
-	{
-		if ("$key" == "objectclass") continue;
-		if ("$key" == "count") continue;
-		if ("$key" == "dn") continue;
-		if ("$val" == "objectclass") continue;
-
-		$lastkey[$level]=$key;
-
-		if (is_array($val))
-		{
-			$hide=0;
-			if (! is_numeric($key))
-			{
-
-				print '<tr '.$bc[$var].' valign="top">';
-				print '<td>';
-				print $key;
-				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide=1;
-			}
-			show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
-		}
-		else if ($subcount)
-		{
-			$subcount--;
-			$newstring=dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i','*',$newstring);
-			else print $newstring;
-			print '<br>';
-		}
-		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
-	}
-	return 1;
+    global $bc, $conf;
+
+    $count--;
+    if ($count == 0) return -1;	// To stop loop
+    if (! is_array($result)) return -1;
+
+    foreach($result as $key => $val)
+    {
+        if ("$key" == "objectclass") continue;
+        if ("$key" == "count") continue;
+        if ("$key" == "dn") continue;
+        if ("$val" == "objectclass") continue;
+
+        $lastkey[$level]=$key;
+
+        if (is_array($val))
+        {
+            $hide=0;
+            if (! is_numeric($key))
+            {
+
+                print '<tr '.$bc[$var].' valign="top">';
+                print '<td>';
+                print $key;
+                print '</td><td>';
+                if (strtolower($key) == 'userpassword') $hide=1;
+            }
+            show_ldap_content($val,$level+1,$count,$var,$hide,$val["count"]);
+        }
+        else if ($subcount)
+        {
+            $subcount--;
+            $newstring=dol_htmlentitiesbr($val);
+            if ($hide) print preg_replace('/./i','*',$newstring);
+            else print $newstring;
+            print '<br>';
+        }
+        if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
+    }
+    return 1;
 }
 

dolibarr/htdocs/core/lib/security.lib.php

Indentation +550 added lines, -550 removed lines

@@ -36,29 +36,29 @@ 
  */
 function dol_encode($chain, $key='1')
 {
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
-		}
-		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
-	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
-		}
-		$chain=$result;
-	}
-
-	return base64_encode($chain);
+    if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+    {
+        $output_tab=array();
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $output_tab[$i] = chr(ord(substr($chain,$i,1))+17);
+        }
+        $chain = implode("",$output_tab);
+    }
+    elseif ($key)
+    {
+        $result='';
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $keychar = substr($key, ($i % strlen($key))-1, 1);
+            $result.= chr(ord(substr($chain,$i,1))+(ord($keychar)-65));
+        }
+        $chain=$result;
+    }
+
+    return base64_encode($chain);
 }
 
 /**
@@ -72,32 +72,32 @@ 
  */
 function dol_decode($chain, $key='1')
 {
-	$chain = base64_decode($chain);
-
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
-		$output_tab=array();
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength;$i++)
-		{
-			$output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
-		}
-
-		$chain = implode("",$output_tab);
-	}
-	elseif ($key)
-	{
-		$result='';
-		$strlength=dol_strlen($chain);
-		for ($i=0; $i < $strlength; $i++)
-		{
-			$keychar = substr($key, ($i % strlen($key))-1, 1);
-			$result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
-		}
-		$chain=$result;
-	}
-
-	return $chain;
+    $chain = base64_decode($chain);
+
+    if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
+    {
+        $output_tab=array();
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength;$i++)
+        {
+            $output_tab[$i] = chr(ord(substr($chain,$i,1))-17);
+        }
+
+        $chain = implode("",$output_tab);
+    }
+    elseif ($key)
+    {
+        $result='';
+        $strlength=dol_strlen($chain);
+        for ($i=0; $i < $strlength; $i++)
+        {
+            $keychar = substr($key, ($i % strlen($key))-1, 1);
+            $result.= chr(ord(substr($chain, $i, 1))-(ord($keychar)-65));
+        }
+        $chain=$result;
+    }
+
+    return $chain;
 }
 
 
@@ -113,27 +113,27 @@ 
  */
 function dol_hash($chain, $type='0')
 {
-	global $conf;
-
-	// No need to add salt for password_hash
-	if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
-	{
-		return password_hash($chain, PASSWORD_DEFAULT);
-	}
-
-	// Salt value
-	if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
-
-	if ($type == '1' || $type == 'sha1') return sha1($chain);
-	else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
-	else if ($type == '3' || $type == 'md5') return md5($chain);
-	else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	else if ($type == '5') return hash('sha256',$chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
-
-	// No particular encoding defined, use default
-	return md5($chain);
+    global $conf;
+
+    // No need to add salt for password_hash
+    if (($type == '0' || $type == 'auto') && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
+    {
+        return password_hash($chain, PASSWORD_DEFAULT);
+    }
+
+    // Salt value
+    if (! empty($conf->global->MAIN_SECURITY_SALT)) $chain=$conf->global->MAIN_SECURITY_SALT.$chain;
+
+    if ($type == '1' || $type == 'sha1') return sha1($chain);
+    else if ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
+    else if ($type == '3' || $type == 'md5') return md5($chain);
+    else if ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5,$chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+    else if ($type == '5') return hash('sha256',$chain);
+    else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
+    else if (! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+
+    // No particular encoding defined, use default
+    return md5($chain);
 }
 
 /**
@@ -149,17 +149,17 @@ 
  */
 function dol_verifyHash($chain, $hash, $type='0')
 {
-	global $conf;
+    global $conf;
 
-	if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if ($hash[0] == '$') return password_verify($chain, $hash);
-		else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+    if ($type == '0' && ! empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
+        if ($hash[0] == '$') return password_verify($chain, $hash);
+        else if(strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
+        else if(strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
 
-		return false;
-	}
+        return false;
+    }
 
-	return dol_hash($chain, $type) == $hash;
+    return dol_hash($chain, $type) == $hash;
 }
 
 
@@ -180,242 +180,242 @@ 
  */
 function restrictedArea($user, $features, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='fk_soc', $dbt_select='rowid', $isdraft=0)
 {
-	global $db, $conf;
-	global $hookmanager;
-
-	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");
-	//print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
-	//print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
-	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
-
-	// Get more permissions checks from hooks
-	$parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
-	$reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
-	if (! empty($hookmanager->resArray['result'])) return true;
-	if ($reshook > 0) return false;
-
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
-
-	// Features/modules to check
-	$featuresarray = array($features);
-	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-	else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
-
-	// More subfeatures to check
-	if (! empty($feature2)) $feature2 = explode("|", $feature2);
-
-	// More parameters
-	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
-
-	$listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
-
-	// Check read permission from module
-	$readok=1; $nbko=0;
-	foreach ($featuresarray as $feature)	// first we check nb of test ko
-	{
-		$featureforlistofmodule=$feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
-		if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
-		{
-			$readok=0; $nbko++;
-			continue;
-		}
-
-		if ($feature == 'societe')
-		{
-			if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'contact')
-		{
-			if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'produit|service')
-		{
-			if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'prelevement')
-		{
-			if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'cheque')
-		{
-			if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
-		}
-		else if ($feature == 'projet')
-		{
-			if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
-		}
-		else if (! empty($feature2))	// This should be used for future changes
-		{
-			$tmpreadok=1;
-			foreach($feature2 as $subfeature)
-			{
-				if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
-				else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
-				else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
-			}
-			if (! $tmpreadok)	// We found a test on feature that is ko
-			{
-				$readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
-				$nbko++;
-			}
-		}
-		else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
-		{
-			if (empty($user->rights->$feature->lire)
-				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
-		}
-	}
-
-	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
-
-	if (! $readok) accessforbidden();
-	//print "Read access is ok";
-
-	// Check write permission from module (we need to know write permission to create but also to delete drafts record)
-	$createok=1; $nbko=0;
-	if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
-	{
-		foreach ($featuresarray as $feature)
-		{
-			if ($feature == 'contact')
-			{
-				if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'produit|service')
-			{
-				if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'prelevement')
-			{
-				if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'commande_fournisseur')
-			{
-				if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'banque')
-			{
-				if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
-			}
-			else if ($feature == 'cheque')
-			{
-				if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
-			}
-			else if (! empty($feature2))	// This should be used
-			{
-				foreach($feature2 as $subfeature)
-				{
-					if (empty($user->rights->$feature->$subfeature->creer)
-						&& empty($user->rights->$feature->$subfeature->write)
-						&& empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
-						else { $createok=1; break; } // Break to bypass second test if the first is ok
-				}
-			}
-			else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
-			{
-				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
-				if (empty($user->rights->$feature->creer)
-					&& empty($user->rights->$feature->write)
-					&& empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
-			}
-		}
-
-		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
-
-		if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
-		//print "Write access is ok";
-	}
-
-	// Check create user permission
-	$createuserok=1;
-	if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
-	{
-		if (! $user->rights->user->user->creer) $createuserok=0;
-
-		if (! $createuserok) accessforbidden();
-		//print "Create user access is ok";
-	}
-
-	// Check delete permission from module
-	$deleteok=1; $nbko=0;
-	if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
-	{
-		foreach ($featuresarray as $feature)
-		{
-			if ($feature == 'contact')
-			{
-				if (! $user->rights->societe->contact->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'produit|service')
-			{
-				if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'commande_fournisseur')
-			{
-				if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
-			}
-			else if ($feature == 'banque')
-			{
-				if (! $user->rights->banque->modifier) $deleteok=0;
-			}
-			else if ($feature == 'cheque')
-			{
-				if (! $user->rights->banque->cheque) $deleteok=0;
-			}
-			else if ($feature == 'ecm')
-			{
-				if (! $user->rights->ecm->upload) $deleteok=0;
-			}
-			else if ($feature == 'ftp')
-			{
-				if (! $user->rights->ftp->write) $deleteok=0;
-			}else if ($feature == 'salaries')
-			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if ($feature == 'salaries')
-			{
-				if (! $user->rights->salaries->delete) $deleteok=0;
-			}
-			else if (! empty($feature2))	// This should be used for permissions on 2 levels
-			{
-				foreach($feature2 as $subfeature)
-				{
-					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
-					else { $deleteok=1; break; } // For bypass the second test if the first is ok
-				}
-			}
-			else if (! empty($feature))		// This is used for permissions on 1 level
-			{
-				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
-				if (empty($user->rights->$feature->supprimer)
-					&& empty($user->rights->$feature->delete)
-					&& empty($user->rights->$feature->run)) $deleteok=0;
-			}
-		}
-
-		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
-
-		if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
-		//print "Delete access is ok";
-	}
-
-	// If we have a particular object to check permissions on, we check this object
-	// is linked to a company allowed to $user.
-	if (! empty($objectid) && $objectid > 0)
-	{
-		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
-		return $ok ? 1 : accessforbidden();
-	}
-
-	return 1;
+    global $db, $conf;
+    global $hookmanager;
+
+    //dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename,$feature2,$dbt_socfield,$dbt_select");
+    //print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
+    //print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
+    //print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
+
+    // Get more permissions checks from hooks
+    $parameters=array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
+    $reshook=$hookmanager->executeHooks('restrictedArea',$parameters);
+    if (! empty($hookmanager->resArray['result'])) return true;
+    if ($reshook > 0) return false;
+
+    if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+
+    // Features/modules to check
+    $featuresarray = array($features);
+    if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
+    else if (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+
+    // More subfeatures to check
+    if (! empty($feature2)) $feature2 = explode("|", $feature2);
+
+    // More parameters
+    $params = explode('&', $tableandshare);
+    $dbtablename=(! empty($params[0]) ? $params[0] : '');
+    $sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+
+    $listofmodules=explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL);
+
+    // Check read permission from module
+    $readok=1; $nbko=0;
+    foreach ($featuresarray as $feature)	// first we check nb of test ko
+    {
+        $featureforlistofmodule=$feature;
+        if ($featureforlistofmodule == 'produit') $featureforlistofmodule='product';
+        if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($featureforlistofmodule,$listofmodules))	// If limits on modules for external users, module must be into list of modules for external users
+        {
+            $readok=0; $nbko++;
+            continue;
+        }
+
+        if ($feature == 'societe')
+        {
+            if (! $user->rights->societe->lire && ! $user->rights->fournisseur->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'contact')
+        {
+            if (! $user->rights->societe->contact->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'produit|service')
+        {
+            if (! $user->rights->produit->lire && ! $user->rights->service->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'prelevement')
+        {
+            if (! $user->rights->prelevement->bons->lire) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'cheque')
+        {
+            if (! $user->rights->banque->cheque) { $readok=0; $nbko++; }
+        }
+        else if ($feature == 'projet')
+        {
+            if (! $user->rights->projet->lire && ! $user->rights->projet->all->lire) { $readok=0; $nbko++; }
+        }
+        else if (! empty($feature2))	// This should be used for future changes
+        {
+            $tmpreadok=1;
+            foreach($feature2 as $subfeature)
+            {
+                if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
+                else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
+                else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+            }
+            if (! $tmpreadok)	// We found a test on feature that is ko
+            {
+                $readok=0;	// All tests are ko (we manage here the and, the or will be managed later using $nbko).
+                $nbko++;
+            }
+        }
+        else if (! empty($feature) && ($feature!='user' && $feature!='usergroup'))		// This is for old permissions
+        {
+            if (empty($user->rights->$feature->lire)
+                && empty($user->rights->$feature->read)
+                && empty($user->rights->$feature->run)) { $readok=0; $nbko++; }
+        }
+    }
+
+    // If a or and at least one ok
+    if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok=1;
+
+    if (! $readok) accessforbidden();
+    //print "Read access is ok";
+
+    // Check write permission from module (we need to know write permission to create but also to delete drafts record)
+    $createok=1; $nbko=0;
+    if (GETPOST('action','aZ09')  == 'create' || ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete'))
+    {
+        foreach ($featuresarray as $feature)
+        {
+            if ($feature == 'contact')
+            {
+                if (! $user->rights->societe->contact->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'produit|service')
+            {
+                if (! $user->rights->produit->creer && ! $user->rights->service->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'prelevement')
+            {
+                if (! $user->rights->prelevement->bons->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'commande_fournisseur')
+            {
+                if (! $user->rights->fournisseur->commande->creer) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'banque')
+            {
+                if (! $user->rights->banque->modifier) { $createok=0; $nbko++; }
+            }
+            else if ($feature == 'cheque')
+            {
+                if (! $user->rights->banque->cheque) { $createok=0; $nbko++; }
+            }
+            else if (! empty($feature2))	// This should be used
+            {
+                foreach($feature2 as $subfeature)
+                {
+                    if (empty($user->rights->$feature->$subfeature->creer)
+                        && empty($user->rights->$feature->$subfeature->write)
+                        && empty($user->rights->$feature->$subfeature->create)) { $createok=0; $nbko++; }
+                        else { $createok=1; break; } // Break to bypass second test if the first is ok
+                }
+            }
+            else if (! empty($feature))		// This is for old permissions ('creer' or 'write')
+            {
+                //print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write;
+                if (empty($user->rights->$feature->creer)
+                    && empty($user->rights->$feature->write)
+                    && empty($user->rights->$feature->create)) { $createok=0; $nbko++; }
+            }
+        }
+
+        // If a or and at least one ok
+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok=1;
+
+        if (GETPOST('action','aZ09') == 'create' && ! $createok) accessforbidden();
+        //print "Write access is ok";
+    }
+
+    // Check create user permission
+    $createuserok=1;
+    if (GETPOST('action','aZ09') == 'confirm_create_user' && GETPOST("confirm",'aZ09') == 'yes')
+    {
+        if (! $user->rights->user->user->creer) $createuserok=0;
+
+        if (! $createuserok) accessforbidden();
+        //print "Create user access is ok";
+    }
+
+    // Check delete permission from module
+    $deleteok=1; $nbko=0;
+    if ((GETPOST("action","aZ09")  == 'confirm_delete' && GETPOST("confirm","aZ09") == 'yes') || GETPOST("action","aZ09")  == 'delete')
+    {
+        foreach ($featuresarray as $feature)
+        {
+            if ($feature == 'contact')
+            {
+                if (! $user->rights->societe->contact->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'produit|service')
+            {
+                if (! $user->rights->produit->supprimer && ! $user->rights->service->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'commande_fournisseur')
+            {
+                if (! $user->rights->fournisseur->commande->supprimer) $deleteok=0;
+            }
+            else if ($feature == 'banque')
+            {
+                if (! $user->rights->banque->modifier) $deleteok=0;
+            }
+            else if ($feature == 'cheque')
+            {
+                if (! $user->rights->banque->cheque) $deleteok=0;
+            }
+            else if ($feature == 'ecm')
+            {
+                if (! $user->rights->ecm->upload) $deleteok=0;
+            }
+            else if ($feature == 'ftp')
+            {
+                if (! $user->rights->ftp->write) $deleteok=0;
+            }else if ($feature == 'salaries')
+            {
+                if (! $user->rights->salaries->delete) $deleteok=0;
+            }
+            else if ($feature == 'salaries')
+            {
+                if (! $user->rights->salaries->delete) $deleteok=0;
+            }
+            else if (! empty($feature2))	// This should be used for permissions on 2 levels
+            {
+                foreach($feature2 as $subfeature)
+                {
+                    if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok=0;
+                    else { $deleteok=1; break; } // For bypass the second test if the first is ok
+                }
+            }
+            else if (! empty($feature))		// This is used for permissions on 1 level
+            {
+                //print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
+                if (empty($user->rights->$feature->supprimer)
+                    && empty($user->rights->$feature->delete)
+                    && empty($user->rights->$feature->run)) $deleteok=0;
+            }
+        }
+
+        // If a or and at least one ok
+        if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok=1;
+
+        if (! $deleteok && ! ($isdraft && $createok)) accessforbidden();
+        //print "Delete access is ok";
+    }
+
+    // If we have a particular object to check permissions on, we check this object
+    // is linked to a company allowed to $user.
+    if (! empty($objectid) && $objectid > 0)
+    {
+        $ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
+        return $ok ? 1 : accessforbidden();
+    }
+
+    return 1;
 }
 
 /**
@@ -434,216 +434,216 @@ 
  */
 function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandshare='', $feature2='', $dbt_keyfield='', $dbt_select='rowid')
 {
-	global $db, $conf;
-
-	// More parameters
-	$params = explode('&', $tableandshare);
-	$dbtablename=(! empty($params[0]) ? $params[0] : '');
-	$sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
-
-	foreach ($featuresarray as $feature)
-	{
-		$sql='';
-
-		// For backward compatibility
-		if ($feature == 'member')  $feature='adherent';
-		if ($feature == 'project') $feature='projet';
-		if ($feature == 'task')    $feature='projet_task';
-
-		$check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
-		$checksoc = array('societe');	 // Test for societe object
-		$checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
-		$checkproject = array('projet','project'); // Test for project object
-		$checktask = array('projet_task');
-		$nocheck = array('barcode','stock');	// No test
-		$checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
-
-		// If dbtablename not defined, we use same name for table than module name
-		if (empty($dbtablename))
-		{
-			$dbtablename = $feature;
-			$sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
-		}
-
-		// Check permission for object with entity
-		if (in_array($feature,$check))
-		{
-			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-			$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-			if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
-			{
-				if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-				{
-					if ($conf->entity == 1 && $user->admin && ! $user->entity)
-					{
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND dbt.entity IS NOT NULL";
-					}
-					else
-					{
-						$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
-						$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-						$sql.= " AND (ug.fk_user = dbt.rowid";
-						$sql.= " AND ug.entity IN (".getEntity('user')."))";
-						$sql.= " OR dbt.entity = 0"; // Show always superadmin
-					}
-				}
-				else {
-					$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-					$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				}
-			}
-			else
-			{
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checksoc))	// We check feature = checksoc
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				if ($user->socid <> $objectid) return false;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s)";
-				$sql.= " WHERE sc.fk_soc IN (".$objectid.")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-				$sql.= " AND sc.fk_soc = s.rowid";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(s.rowid) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-				$sql.= " WHERE s.rowid IN (".$objectid.")";
-				$sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.fk_soc = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checkproject))
-		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($objectid,$tmparray)) return false;
-			}
-			else
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (in_array($feature,$checktask))
-		{
-			if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
-				$task = new Task($db);
-				$task->fetch($objectid);
-
-				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-				$projectstatic=new Project($db);
-				$tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
-				$tmparray=explode(',',$tmps);
-				if (! in_array($task->fk_project,$tmparray)) return false;
-			}
-			else
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
-		{
-			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
-				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.rowid IN (".$objectid.")";
-				$sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
-			else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
-			{
-				if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
-				$sql = "SELECT COUNT(sc.fk_soc) as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-				$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
-				$sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-				$sql.= " AND sc.fk_user = ".$user->id;
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
-			else if (! empty($conf->multicompany->enabled))
-			{
-				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
-				$sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-
-		if ($sql)
-		{
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$obj = $db->fetch_object($resql);
-				if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else
-			{
-				return false;
-			}
-		}
-	}
-	return true;
+    global $db, $conf;
+
+    // More parameters
+    $params = explode('&', $tableandshare);
+    $dbtablename=(! empty($params[0]) ? $params[0] : '');
+    $sharedelement=(! empty($params[1]) ? $params[1] : $dbtablename);
+
+    foreach ($featuresarray as $feature)
+    {
+        $sql='';
+
+        // For backward compatibility
+        if ($feature == 'member')  $feature='adherent';
+        if ($feature == 'project') $feature='projet';
+        if ($feature == 'task')    $feature='projet_task';
+
+        $check = array('adherent','banque','don','user','usergroup','product','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company)
+        $checksoc = array('societe');	 // Test for societe object
+        $checkother = array('contact','agenda');	 // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
+        $checkproject = array('projet','project'); // Test for project object
+        $checktask = array('projet_task');
+        $nocheck = array('barcode','stock');	// No test
+        $checkdefault = 'all other not already defined'; // Test on entity and link to third party. Not allowed if link is empty (Ex: invoice, orders...).
+
+        // If dbtablename not defined, we use same name for table than module name
+        if (empty($dbtablename))
+        {
+            $dbtablename = $feature;
+            $sharedelement = (! empty($params[1]) ? $params[1] : $dbtablename);		// We change dbtablename, so we set sharedelement too.
+        }
+
+        // Check permission for object with entity
+        if (in_array($feature,$check))
+        {
+            $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+            $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+            if (($feature == 'user' || $feature == 'usergroup') && ! empty($conf->multicompany->enabled))
+            {
+                if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+                {
+                    if ($conf->entity == 1 && $user->admin && ! $user->entity)
+                    {
+                        $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                        $sql.= " AND dbt.entity IS NOT NULL";
+                    }
+                    else
+                    {
+                        $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+                        $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                        $sql.= " AND (ug.fk_user = dbt.rowid";
+                        $sql.= " AND ug.entity IN (".getEntity('user')."))";
+                        $sql.= " OR dbt.entity = 0"; // Show always superadmin
+                    }
+                }
+                else {
+                    $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                    $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+                }
+            }
+            else
+            {
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checksoc))	// We check feature = checksoc
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                if ($user->socid <> $objectid) return false;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                $sql = "SELECT COUNT(sc.fk_soc) as nb";
+                $sql.= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= ", ".MAIN_DB_PREFIX."societe as s)";
+                $sql.= " WHERE sc.fk_soc IN (".$objectid.")";
+                $sql.= " AND sc.fk_user = ".$user->id;
+                $sql.= " AND sc.fk_soc = s.rowid";
+                $sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(s.rowid) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+                $sql.= " WHERE s.rowid IN (".$objectid.")";
+                $sql.= " AND s.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.fk_soc = ".$user->socid;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)";	// Contact not linked to a company or to a company of user
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checkproject))
+        {
+            if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+            {
+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $projectstatic=new Project($db);
+                $tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
+                $tmparray=explode(',',$tmps);
+                if (! in_array($objectid,$tmparray)) return false;
+            }
+            else
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (in_array($feature,$checktask))
+        {
+            if (! empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
+            {
+                $task = new Task($db);
+                $task->fetch($objectid);
+
+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+                $projectstatic=new Project($db);
+                $tmps=$projectstatic->getProjectsAuthorizedForUser($user,0,1,0);
+                $tmparray=explode(',',$tmps);
+                if (! in_array($task->fk_project,$tmparray)) return false;
+            }
+            else
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+        else if (! in_array($feature,$nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+        {
+            // If external user: Check permission for external users
+            if ($user->socid > 0)
+            {
+                if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+                $sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.rowid IN (".$objectid.")";
+                $sql.= " AND dbt.".$dbt_keyfield." = ".$user->socid;
+            }
+            // If internal user: Check permission for internal users that are restricted on their objects
+            else if (! empty($conf->societe->enabled) && ($user->rights->societe->lire && ! $user->rights->societe->client->voir))
+            {
+                if (empty($dbt_keyfield)) dol_print_error('','Param dbt_keyfield is required but not defined');
+                $sql = "SELECT COUNT(sc.fk_soc) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= ", ".MAIN_DB_PREFIX."societe as s";
+                $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND sc.fk_soc = dbt.".$dbt_keyfield;
+                $sql.= " AND dbt.".$dbt_keyfield." = s.rowid";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+                $sql.= " AND sc.fk_user = ".$user->id;
+            }
+            // If multicompany and internal users with all permissions, check user is in correct entity
+            else if (! empty($conf->multicompany->enabled))
+            {
+                $sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
+                $sql.= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+                $sql.= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
+            }
+        }
+
+        if ($sql)
+        {
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $obj = $db->fetch_object($resql);
+                if (! $obj || $obj->nb < count(explode(',', $objectid))) return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+    return true;
 }
 
 /**
@@ -666,30 +666,30 @@ 
         $langs->setDefaultLang();
     }
 
-	$langs->load("errors");
-
-	if ($printheader)
-	{
-		if (function_exists("llxHeader")) llxHeader('');
-		else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
-	}
-	print '<div class="error">';
-	if (! $message) print $langs->trans("ErrorForbidden");
-	else print $message;
-	print '</div>';
-	print '<br>';
-	if (empty($showonlymessage))
-	{
-		if ($user->login)
-		{
-			print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
-			print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
-		}
-		else
-		{
-			print $langs->trans("ErrorForbidden3");
-		}
-	}
-	if ($printfooter && function_exists("llxFooter")) llxFooter();
-	exit(0);
+    $langs->load("errors");
+
+    if ($printheader)
+    {
+        if (function_exists("llxHeader")) llxHeader('');
+        else if (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+    }
+    print '<div class="error">';
+    if (! $message) print $langs->trans("ErrorForbidden");
+    else print $message;
+    print '</div>';
+    print '<br>';
+    if (empty($showonlymessage))
+    {
+        if ($user->login)
+        {
+            print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
+            print $langs->trans("ErrorForbidden2",$langs->trans("Home"),$langs->trans("Users"));
+        }
+        else
+        {
+            print $langs->trans("ErrorForbidden3");
+        }
+    }
+    if ($printfooter && function_exists("llxFooter")) llxFooter();
+    exit(0);
 }

dolibarr/htdocs/core/lib/functions2.lib.php

Indentation +400 added lines, -400 removed lines

@@ -126,7 +126,7 @@ 
 
     $selected='EUA4';
     if (!$outputlangs) {
-    	$outputlangs=$langs;
+        $outputlangs=$langs;
     }
 
     if ($outputlangs->defaultlang == 'ca_CA') $selected='CAP4';        // Canada
@@ -230,15 +230,15 @@ 
         else print ': ';
         if (is_object($object->user_creation))
         {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -266,15 +266,15 @@ 
         else print ': ';
         if (is_object($object->user_modification))
         {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
             if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -303,14 +303,14 @@ 
         if (is_object($object->user_validation))
         {
             if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -339,14 +339,14 @@ 
         if (is_object($object->user_approve))
         {
             if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -402,15 +402,15 @@ 
         else print ': ';
         if (is_object($object->user_cloture))
         {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_cloture);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -438,15 +438,15 @@ 
         else print ': ';
         if (is_object($object->user_rappro))
         {
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         else
         {
             $userstatic=new User($db);
             $userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
+            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+            else print $langs->trans("Unknown");
         }
         if ($usetable) print '</td></tr>';
         else print '<br>';
@@ -492,8 +492,8 @@ 
  */
 function dolAddEmailTrackId($email, $trackingid)
 {
-	$tmp=explode('@',$email);
-	return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
+    $tmp=explode('@',$email);
+    return $tmp[0].'+'.$trackingid.'@'.(isset($tmp[1])?$tmp[1]:'');
 }
 
 /**
@@ -619,33 +619,33 @@ 
  */
 function dolObfuscateEmail($mail, $replace="*", $nbreplace=8, $nbdisplaymail=4, $nbdisplaydomain=3, $displaytld=true)
 {
-	if(!isValidEmail($mail))return '';
-	$tab = explode('@', $mail);
-	$tab2 = explode('.',$tab[1]);
-	$string_replace = '';
-	$mail_name = $tab[0];
-	$mail_domaine = $tab2[0];
-	$mail_tld = '';
-
-	$nbofelem = count($tab2);
-	for($i=1; $i < $nbofelem && $displaytld; $i++)
-	{
-		$mail_tld .= '.'.$tab2[$i];
-	}
-
-	for($i=0; $i < $nbreplace; $i++){
-		$string_replace .= $replace;
-	}
-
-	if(strlen($mail_name) > $nbdisplaymail){
-		$mail_name = substr($mail_name, 0, $nbdisplaymail);
-	}
-
-	if(strlen($mail_domaine) > $nbdisplaydomain){
-		$mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
-	}
-
-	return $mail_name . $string_replace . $mail_domaine . $mail_tld;
+    if(!isValidEmail($mail))return '';
+    $tab = explode('@', $mail);
+    $tab2 = explode('.',$tab[1]);
+    $string_replace = '';
+    $mail_name = $tab[0];
+    $mail_domaine = $tab2[0];
+    $mail_tld = '';
+
+    $nbofelem = count($tab2);
+    for($i=1; $i < $nbofelem && $displaytld; $i++)
+    {
+        $mail_tld .= '.'.$tab2[$i];
+    }
+
+    for($i=0; $i < $nbreplace; $i++){
+        $string_replace .= $replace;
+    }
+
+    if(strlen($mail_name) > $nbdisplaymail){
+        $mail_name = substr($mail_name, 0, $nbdisplaymail);
+    }
+
+    if(strlen($mail_domaine) > $nbdisplaydomain){
+        $mail_domaine = substr($mail_domaine, strlen($mail_domaine)-$nbdisplaydomain);
+    }
+
+    return $mail_name . $string_replace . $mail_domaine . $mail_tld;
 }
 
 
@@ -783,24 +783,24 @@ 
     }
     else
     {
-    	$masktype='';
-    	$masktype_value='';
+        $masktype='';
+        $masktype_value='';
     }
 
     // Extract value for user
     if (preg_match('/\{(u+)\}/i',$mask,$regType))
     {
-    	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+        $lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
+        if (is_object($objuser)) $lastname = $objuser->lastname;
 
-    	$maskuser=$regType[1];
-    	$maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
-    	$maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
+        $maskuser=$regType[1];
+        $maskuser_value=substr($lastname,0,dol_strlen($regType[1]));// get n first characters of user firstname (where n is length in mask)
+        $maskuser_value=str_pad($maskuser_value,dol_strlen($regType[1]),"#",STR_PAD_RIGHT);				 // we fill on right with # to have same number of char than into mask
     }
     else
     {
-    	$maskuser='';
-    	$maskuser_value='';
+        $maskuser='';
+        $maskuser_value='';
     }
 
     // Personalized field {XXX-1} à {XXX-9}
@@ -816,12 +816,12 @@ 
 
     if (strstr($mask,'user_extra_'))
     {
-			$start = "{user_extra_";
-			$end = "\}";
-			$extra= get_string_between($mask, "user_extra_", "}");
-			if(!empty($user->array_options['options_'.$extra])){
-				$mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
-			}
+            $start = "{user_extra_";
+            $end = "\}";
+            $extra= get_string_between($mask, "user_extra_", "}");
+            if(!empty($user->array_options['options_'.$extra])){
+                $mask =  preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
+            }
     }
     $maskwithonlyymcode=$mask;
     $maskwithonlyymcode=preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i',$maskcounter,$maskwithonlyymcode);
@@ -882,7 +882,7 @@ 
         else // if reset is for a specific month in year, we need year
         {
             if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=3; $posm=2; }
-        	else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
+            else if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=3; }
             else if (preg_match('/^(.*)\{(y+)\}/i',$maskwithonlyymcode,$reg)) { $posy=2; $posm=0; }
             else return 'ErrorCantUseRazIfNoYearInMask';
         }
@@ -890,11 +890,11 @@ 
         $yearlen = $posy?dol_strlen($reg[$posy]):0;
         $monthlen = $posm?dol_strlen($reg[$posm]):0;
         // Define pos
-       	$yearpos = (dol_strlen($reg[1])+1);
+            $yearpos = (dol_strlen($reg[1])+1);
         $monthpos = ($yearpos+$yearlen);
         if ($posy == 3 && $posm == 2) {		// if month is before year
-          	$monthpos = (dol_strlen($reg[1])+1);
-           	$yearpos = ($monthpos+$monthlen);
+                $monthpos = (dol_strlen($reg[1])+1);
+                $yearpos = ($monthpos+$monthlen);
         }
         //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
 
@@ -904,20 +904,20 @@ 
 
         if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
         {
-        	$currentyear=date("Y", $date);
-        	$fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
-        	$newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
-        	$nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
-        	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
-
-        	// If after or equal of current fiscal date
-        	if ($date >= $fiscaldate)
-        	{
-        		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
-        	}
-        	// If after or equal of current new year date
-        	else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
+            $currentyear=date("Y", $date);
+            $fiscaldate=dol_mktime('0','0','0',$maskraz,'1',$currentyear);
+            $newyeardate=dol_mktime('0','0','0','1','1',$currentyear);
+            $nextnewyeardate=dol_mktime('0','0','0','1','1',$currentyear+1);
+            //echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
+
+            // If after or equal of current fiscal date
+            if ($date >= $fiscaldate)
+            {
+                // If before of next new year date
+                if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset=1;
+            }
+            // If after or equal of current new year date
+            else if ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset=-1;
         }
         // For backward compatibility
         else if (date("m",$date) < $maskraz && empty($resetEveryMonth)) { $yearoffset=-1; }	// If current month lower that month of return to zero, year is previous year
@@ -938,11 +938,11 @@ 
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
             $sqlwhere.=')';
         }
-		else if ($resetEveryMonth)
-		{
-			$sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
+        else if ($resetEveryMonth)
+        {
+            $sqlwhere.="(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
             $sqlwhere.=" AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
+        }
         else   // reset is done on january
         {
             $sqlwhere.='(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
@@ -953,13 +953,13 @@ 
 
     // Define $sqlstring
     if (function_exists('mb_strrpos'))
-    	{
-    	$posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
-	}
-	else
-	{
-    	$posnumstart=strrpos($maskwithnocode,$maskcounter);
-	}	// Pos of counter in final string (from 0 to ...)
+        {
+        $posnumstart=mb_strrpos($maskwithnocode,$maskcounter, 'UTF-8');
+    }
+    else
+    {
+        $posnumstart=strrpos($maskwithnocode,$maskcounter);
+    }	// Pos of counter in final string (from 0 to ...)
     if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
     $sqlstring='SUBSTRING('.$field.', '.($posnumstart+1).', '.dol_strlen($maskcounter).')';
 
@@ -978,7 +978,7 @@ 
     if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'),$maskuser_value,$maskLike);
     foreach($maskperso as $key => $val)
     {
-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
+        $maskLike = str_replace(dol_string_nospecial($maskperso[$key]),$maskpersonew[$key],$maskLike);
     }
 
     // Get counter in database
@@ -986,11 +986,11 @@ 
     $sql = "SELECT MAX(".$sqlstring.") as val";
     $sql.= " FROM ".MAIN_DB_PREFIX.$table;
     $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-	$sql.= " AND ".$field." NOT LIKE '(PROV%)'";
+    $sql.= " AND ".$field." NOT LIKE '(PROV%)'";
     if ($bentityon) // only if entity enable
-    	$sql.= " AND entity IN (".getEntity($sharetable).")";
+        $sql.= " AND entity IN (".getEntity($sharetable).")";
     else if (! empty($forceentity))
-    	$sql.= " AND entity IN (".$forceentity.")";
+        $sql.= " AND entity IN (".$forceentity.")";
     if ($where) $sql.=$where;
     if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
@@ -1008,8 +1008,8 @@ 
     if (empty($counter)) $counter=$maskoffset;
     else if (preg_match('/[^0-9]/i',$counter))
     {
-    	$counter=0;
-    	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
+        $counter=0;
+        dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
     }
     else if ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter=$maskoffset;
 
@@ -1035,11 +1035,11 @@ 
         $sql = "SELECT ".$field." as ref";
         $sql.= " FROM ".MAIN_DB_PREFIX.$table;
         $sql.= " WHERE ".$field." LIKE '".$maskLike."'";
-    	$sql.= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
-        	$sql.= " AND entity IN (".getEntity($sharetable).")";
+        $sql.= " AND ".$field." NOT LIKE '%PROV%'";
+        if ($bentityon) // only if entity enable
+            $sql.= " AND entity IN (".getEntity($sharetable).")";
         else if (! empty($forceentity))
-        	$sql.= " AND entity IN (".$forceentity.")";
+            $sql.= " AND entity IN (".$forceentity.")";
         if ($where) $sql.=$where;
         if ($sqlwhere) $sql.=' AND '.$sqlwhere;
 
@@ -1061,7 +1061,7 @@ 
         // If value for $counter has a length higher than $maskcounter chars
         if ($counter >= pow(10, dol_strlen($maskcounter)))
         {
-        	$counter='ErrorMaxNumberReachForThisMask';
+            $counter='ErrorMaxNumberReachForThisMask';
         }
 
         if (! empty($maskrefclient_maskcounter))
@@ -1093,9 +1093,9 @@ 
             //$sql.= " WHERE ".$field." not like '(%'";
             $maskrefclient_sql.= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
             if ($bentityon) // only if entity enable
-            	$maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
+                $maskrefclient_sql.= " AND entity IN (".getEntity($sharetable).")";
             else if (! empty($forceentity))
-            	$sql.= " AND entity IN (".$forceentity.")";
+                $sql.= " AND entity IN (".$forceentity.")";
             if ($where) $maskrefclient_sql.=$where; //use the same optional where as general mask
             if ($sqlwhere) $maskrefclient_sql.=' AND '.$sqlwhere; //use the same sqlwhere as general mask
             $maskrefclient_sql.=' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode,$maskrefclient)+1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
@@ -1110,25 +1110,25 @@ 
             else dol_print_error($db);
 
             if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i',$maskrefclient_counter)) $maskrefclient_counter=$maskrefclient_maskoffset;
-			$maskrefclient_counter++;
+            $maskrefclient_counter++;
         }
 
         // Build numFinal
         $numFinal = $mask;
 
         // We replace special codes except refclient
-		if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
-		{
-	        $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
-		{
-        	$numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
-		}
+        if (! empty($yearoffsettype) && ! is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
+        {
+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date)+$yearoffset, $numFinal);
+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date)+$yearoffset, $numFinal);
+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1)+$yearoffset, $numFinal);
+        }
+        else	// we want yyyy to be current year
+        {
+            $numFinal = preg_replace('/\{yyyy\}/i',date("Y",$date), $numFinal);
+            $numFinal = preg_replace('/\{yy\}/i',  date("y",$date), $numFinal);
+            $numFinal = preg_replace('/\{y\}/i',   substr(date("y",$date),1,1), $numFinal);
+        }
         $numFinal = preg_replace('/\{mm\}/i',  date("m",$date), $numFinal);
         $numFinal = preg_replace('/\{dd\}/i',  date("d",$date), $numFinal);
 
@@ -1158,9 +1158,9 @@ 
         // Now we replace the user
         if ($maskuser)
         {
-        	$maskuser_maskbefore='{'.$maskuser.'}';
-        	$maskuser_maskafter=$maskuser_value;
-        	$numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
+            $maskuser_maskbefore='{'.$maskuser.'}';
+            $maskuser_maskafter=$maskuser_value;
+            $numFinal = str_replace($maskuser_maskbefore,$maskuser_maskafter,$numFinal);
         }
     }
 
@@ -1179,11 +1179,11 @@ 
 function get_string_between($string, $start, $end)
 {
     $string = " ".$string;
-     $ini = strpos($string,$start);
-     if ($ini == 0) return "";
-     $ini += strlen($start);
-     $len = strpos($string,$end,$ini) - $ini;
-     return substr($string,$ini,$len);
+        $ini = strpos($string,$start);
+        if ($ini == 0) return "";
+        $ini += strlen($start);
+        $len = strpos($string,$end,$ini) - $ini;
+        return substr($string,$ini,$len);
 }
 
 /**
@@ -1531,7 +1531,7 @@ 
     }
     else
     {
-    	$string = vatrate($reduction,true);
+        $string = vatrate($reduction,true);
     }
 
     return $string;
@@ -1624,7 +1624,7 @@ 
                 //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
                 $dirtoscan= preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
 
-		$listoffiles=array();
+        $listoffiles=array();
 
                 // Now we add models found in directories scanned
                 $listofdir=explode(',',$dirtoscan);
@@ -1635,8 +1635,8 @@ 
                     if (! $tmpdir) { unset($listofdir[$key]); continue; }
                     if (is_dir($tmpdir))
                     {
-			// all type of template is allowed
-			$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+            // all type of template is allowed
+            $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
                         if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles);
                     }
                 }
@@ -1692,19 +1692,19 @@ 
  */
 function is_ip($ip)
 {
-	// First we test if it is a valid IPv4
-	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+    // First we test if it is a valid IPv4
+    if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 
-		// Then we test if it is a private range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+        // Then we test if it is a private range
+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
 
-		// Then we test if it is a reserved range
-		if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+        // Then we test if it is a reserved range
+        if (! filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
 
-		return 1;
-	}
+        return 1;
+    }
 
-	return 0;
+    return 0;
 }
 
 /**
@@ -1744,25 +1744,25 @@ 
     if ($proxyuse)
     {
         $params=array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 1,
-                      'proxy_host'     => $proxyhost,
-                      'proxy_port'     => $proxyport,
-                      'proxy_login'    => $proxyuser,
-                      'proxy_password' => $proxypass,
-                      'trace'		   => 1
+                        'response_timeout'=>$response_timeout,
+                        'proxy_use'      => 1,
+                        'proxy_host'     => $proxyhost,
+                        'proxy_port'     => $proxyport,
+                        'proxy_login'    => $proxyuser,
+                        'proxy_password' => $proxypass,
+                        'trace'		   => 1
         );
     }
     else
     {
         $params=array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 0,
-                      'proxy_host'     => false,
-                      'proxy_port'     => false,
-                      'proxy_login'    => false,
-                      'proxy_password' => false,
-                      'trace'		   => 1
+                        'response_timeout'=>$response_timeout,
+                        'proxy_use'      => 0,
+                        'proxy_host'     => false,
+                        'proxy_port'     => false,
+                        'proxy_login'    => false,
+                        'proxy_password' => false,
+                        'trace'		   => 1
         );
     }
     return $params;
@@ -1780,118 +1780,118 @@ 
  */
 function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='')
 {
-	global $db, $conf, $langs;
-
-	$ret='';
-
-	// Parse element/subelement (ex: project_task)
-	$module = $element = $subelement = $objecttype;
-	if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
-	{
-		$module = $element = $regs[1];
-		$subelement = $regs[2];
-	}
-
-	$classpath = $element.'/class';
-
-	// To work with non standard path
-	if ($objecttype == 'facture' || $objecttype == 'invoice') {
-		$classpath = 'compta/facture/class';
-		$module='facture';
-		$subelement='facture';
-	}
-	if ($objecttype == 'commande' || $objecttype == 'order') {
-		$classpath = 'commande/class';
-		$module='commande';
-		$subelement='commande';
-	}
-	if ($objecttype == 'propal')  {
-		$classpath = 'comm/propal/class';
-	}
-	if ($objecttype == 'supplier_proposal')  {
-		$classpath = 'supplier_proposal/class';
-	}
-	if ($objecttype == 'shipping') {
-		$classpath = 'expedition/class';
-		$subelement = 'expedition';
-		$module = 'expedition_bon';
-	}
-	if ($objecttype == 'delivery') {
-		$classpath = 'livraison/class';
-		$subelement = 'livraison';
-		$module = 'livraison_bon';
-	}
-	if ($objecttype == 'contract') {
-		$classpath = 'contrat/class';
-		$module='contrat';
-		$subelement='contrat';
-	}
-	if ($objecttype == 'member') {
-		$classpath = 'adherents/class';
-		$module='adherent';
-		$subelement='adherent';
-	}
-	if ($objecttype == 'cabinetmed_cons') {
-		$classpath = 'cabinetmed/class';
-		$module='cabinetmed';
-		$subelement='cabinetmedcons';
-	}
-	if ($objecttype == 'fichinter') {
-		$classpath = 'fichinter/class';
-		$module='ficheinter';
-		$subelement='fichinter';
-	}
-	if ($objecttype == 'task') {
-		$classpath = 'projet/class';
-		$module='projet';
-		$subelement='task';
-	}
-	if ($objecttype == 'stock') {
-		$classpath = 'product/stock/class';
-		$module='stock';
-		$subelement='stock';
-	}
-
-	//print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
-
-	$classfile = strtolower($subelement); $classname = ucfirst($subelement);
-	if ($objecttype == 'invoice_supplier') {
-		$classfile = 'fournisseur.facture';
-		$classname='FactureFournisseur';
-		$classpath = 'fourn/class';
-		$module='fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier')   {
-		$classfile = 'fournisseur.commande';
-		$classname='CommandeFournisseur';
-		$classpath = 'fourn/class';
-		$module='fournisseur';
-	}
-	elseif ($objecttype == 'stock')   {
-		$classpath = 'product/stock/class';
-		$classfile='entrepot';
-		$classname='Entrepot';
-	}
-	if (! empty($conf->$module->enabled))
-	{
-		$res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
-		if ($res)
-		{
-			if (class_exists($classname))
-			{
-				$object = new $classname($db);
-				$res=$object->fetch($objectid);
-				if ($res > 0) {
-					$ret=$object->getNomUrl($withpicto,$option);
-				} elseif($res==0) {
-					$ret=$langs->trans('Deleted');
-				}
-				unset($object);
-			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
-		}
-	}
-	return $ret;
+    global $db, $conf, $langs;
+
+    $ret='';
+
+    // Parse element/subelement (ex: project_task)
+    $module = $element = $subelement = $objecttype;
+    if (preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs))
+    {
+        $module = $element = $regs[1];
+        $subelement = $regs[2];
+    }
+
+    $classpath = $element.'/class';
+
+    // To work with non standard path
+    if ($objecttype == 'facture' || $objecttype == 'invoice') {
+        $classpath = 'compta/facture/class';
+        $module='facture';
+        $subelement='facture';
+    }
+    if ($objecttype == 'commande' || $objecttype == 'order') {
+        $classpath = 'commande/class';
+        $module='commande';
+        $subelement='commande';
+    }
+    if ($objecttype == 'propal')  {
+        $classpath = 'comm/propal/class';
+    }
+    if ($objecttype == 'supplier_proposal')  {
+        $classpath = 'supplier_proposal/class';
+    }
+    if ($objecttype == 'shipping') {
+        $classpath = 'expedition/class';
+        $subelement = 'expedition';
+        $module = 'expedition_bon';
+    }
+    if ($objecttype == 'delivery') {
+        $classpath = 'livraison/class';
+        $subelement = 'livraison';
+        $module = 'livraison_bon';
+    }
+    if ($objecttype == 'contract') {
+        $classpath = 'contrat/class';
+        $module='contrat';
+        $subelement='contrat';
+    }
+    if ($objecttype == 'member') {
+        $classpath = 'adherents/class';
+        $module='adherent';
+        $subelement='adherent';
+    }
+    if ($objecttype == 'cabinetmed_cons') {
+        $classpath = 'cabinetmed/class';
+        $module='cabinetmed';
+        $subelement='cabinetmedcons';
+    }
+    if ($objecttype == 'fichinter') {
+        $classpath = 'fichinter/class';
+        $module='ficheinter';
+        $subelement='fichinter';
+    }
+    if ($objecttype == 'task') {
+        $classpath = 'projet/class';
+        $module='projet';
+        $subelement='task';
+    }
+    if ($objecttype == 'stock') {
+        $classpath = 'product/stock/class';
+        $module='stock';
+        $subelement='stock';
+    }
+
+    //print "objecttype=".$objecttype." module=".$module." subelement=".$subelement;
+
+    $classfile = strtolower($subelement); $classname = ucfirst($subelement);
+    if ($objecttype == 'invoice_supplier') {
+        $classfile = 'fournisseur.facture';
+        $classname='FactureFournisseur';
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+    }
+    elseif ($objecttype == 'order_supplier')   {
+        $classfile = 'fournisseur.commande';
+        $classname='CommandeFournisseur';
+        $classpath = 'fourn/class';
+        $module='fournisseur';
+    }
+    elseif ($objecttype == 'stock')   {
+        $classpath = 'product/stock/class';
+        $classfile='entrepot';
+        $classname='Entrepot';
+    }
+    if (! empty($conf->$module->enabled))
+    {
+        $res=dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
+        if ($res)
+        {
+            if (class_exists($classname))
+            {
+                $object = new $classname($db);
+                $res=$object->fetch($objectid);
+                if ($res > 0) {
+                    $ret=$object->getNomUrl($withpicto,$option);
+                } elseif($res==0) {
+                    $ret=$langs->trans('Deleted');
+                }
+                unset($object);
+            }
+            else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+        }
+    }
+    return $ret;
 }
 
 
@@ -1905,113 +1905,113 @@ 
  */
 function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 {
-	$totalnb=0;
-	$listofid=array();
-	$listofparentid=array();
-
-	// Get list of all id in array listofid and all parents in array listofparentid
-	$sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-			$listofid[]=$obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
-			$i++;
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	if (count($listofid))
-	{
-		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
-
-		// Check loops on each other
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				print '<br>Some record that were parent of themself were cleaned.';
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		// Check other loops
-		$listofidtoclean=array();
-		foreach($listofparentid as $id => $pid)
-		{
-			// Check depth
-			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
-
-			$cursor=$id; $arrayidparsed=array();	// We start from child $id
-			while ($cursor > 0)
-			{
-				$arrayidparsed[$cursor]=1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
-				{
-					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
-					unset($arrayidparsed);
-					$listofidtoclean[$cursor]=$id;
-					break;
-				}
-				$cursor=$listofparentid[$cursor];
-			}
-
-			if (count($listofidtoclean)) break;
-		}
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				// Removed orphelins records
-				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
-				print join(',',$listofidtoclean);
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		// Check and clean orphelins
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
-		$sql.= " SET ".$fieldfkparent." = 0";
-		$sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$nb=$db->affected_rows($sql);
-			if ($nb > 0)
-			{
-				// Removed orphelins records
-				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
-				print join(',',$listofid);
-			}
-
-			$totalnb+=$nb;
-		}
-		//else dol_print_error($db);
-
-		print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';
-		return $totalnb;
-	}
+    $totalnb=0;
+    $listofid=array();
+    $listofparentid=array();
+
+    // Get list of all id in array listofid and all parents in array listofparentid
+    $sql='SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0;
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
+            $listofid[]=$obj->rowid;
+            if ($obj->parent_id > 0) $listofparentid[$obj->rowid]=$obj->parent_id;
+            $i++;
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    if (count($listofid))
+    {
+        print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
+
+        // Check loops on each other
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid";	// So we update only records linked to themself
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                print '<br>Some record that were parent of themself were cleaned.';
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        // Check other loops
+        $listofidtoclean=array();
+        foreach($listofparentid as $id => $pid)
+        {
+            // Check depth
+            //print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
+
+            $cursor=$id; $arrayidparsed=array();	// We start from child $id
+            while ($cursor > 0)
+            {
+                $arrayidparsed[$cursor]=1;
+                if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
+                {
+                    print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
+                    unset($arrayidparsed);
+                    $listofidtoclean[$cursor]=$id;
+                    break;
+                }
+                $cursor=$listofparentid[$cursor];
+            }
+
+            if (count($listofidtoclean)) break;
+        }
+
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
+        $sql.= " SET ".$fieldfkparent." = 0";
+        $sql.= " WHERE rowid IN (".join(',',$listofidtoclean).")";	// So we update only records detected wrong
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                // Removed orphelins records
+                print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
+                print join(',',$listofidtoclean);
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        // Check and clean orphelins
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
+        $sql.= " SET ".$fieldfkparent." = 0";
+        $sql.= " WHERE ".$fieldfkparent." NOT IN (".join(',',$listofid).")";	// So we update only records linked to a non existing parent
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $nb=$db->affected_rows($sql);
+            if ($nb > 0)
+            {
+                // Removed orphelins records
+                print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
+                print join(',',$listofid);
+            }
+
+            $totalnb+=$nb;
+        }
+        //else dol_print_error($db);
+
+        print '<br>We fixed '.$totalnb.' record(s). Some records may still be corrupted. New check may be required.';
+        return $totalnb;
+    }
 }
 
 /**
@@ -2143,21 +2143,21 @@ 
 function fetchObjectByElement($element_id, $element_type, $element_ref='')
 {
     global $conf;
-	global $db,$conf;
+    global $db,$conf;
 
     $element_prop = getElementProperties($element_type);
     if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
     {
         dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
 
-		$objecttmp = new $element_prop['classname']($db);
-		$ret = $objecttmp->fetch($element_id, $element_ref);
-		if ($ret >= 0)
-		{
-			return $objecttmp;
-		}
-	}
-	return 0;
+        $objecttmp = new $element_prop['classname']($db);
+        $ret = $objecttmp->fetch($element_id, $element_ref);
+        if ($ret >= 0)
+        {
+            return $objecttmp;
+        }
+    }
+    return 0;
 }
 
 
@@ -2172,9 +2172,9 @@ 
  */
 function colorArrayToHex($arraycolor,$colorifnotfound='888888')
 {
-	if (! is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
-	return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
+    if (! is_array($arraycolor)) return $colorifnotfound;
+    if (empty($arraycolor)) return $colorifnotfound;
+    return sprintf("%02s",dechex($arraycolor[0])).sprintf("%02s",dechex($arraycolor[1])).sprintf("%02s",dechex($arraycolor[2]));
 }
 
 /**
@@ -2189,15 +2189,15 @@ 
  */
 function colorStringToArray($stringcolor,$colorifnotfound=array(88,88,88))
 {
-	if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
-	$tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
-	if (! $tmp)
-	{
-		$tmp=explode(',',$stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
-		return $tmp;
-	}
-	return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
+    if (is_array($stringcolor)) return $stringcolor;	// If already into correct output format, we return as is
+    $tmp=preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/',$stringcolor,$reg);
+    if (! $tmp)
+    {
+        $tmp=explode(',',$stringcolor);
+        if (count($tmp) < 3) return $colorifnotfound;
+        return $tmp;
+    }
+    return array(hexdec($reg[1]),hexdec($reg[2]),hexdec($reg[3]));
 }
 
 /**
@@ -2243,7 +2243,7 @@ 
     if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i','',$moduledirforclass);
 
     if ($module == 'contracts') {
-    	$moduledirforclass = 'contrat';
+        $moduledirforclass = 'contrat';
     }
     elseif (in_array($module, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
         $moduledirforclass = 'api';
@@ -2270,7 +2270,7 @@ 
         $moduledirforclass = 'commande';
     }
     elseif ($module == 'shipments') {
-    	$moduledirforclass = 'expedition';
+        $moduledirforclass = 'expedition';
     }
     elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
         $moduledirforclass = 'compta/facture';
@@ -2288,7 +2288,7 @@ 
         $moduledirforclass = 'product/stock';
     }
     elseif ($module == 'supplierproposals' || $module == 'supplierproposal' || $module == 'supplier_proposal') {
-    	$moduledirforclass = 'supplier_proposal';
+        $moduledirforclass = 'supplier_proposal';
     }
     elseif ($module == 'fournisseur' || $module == 'supplierinvoices' || $module == 'supplierorders') {
         $moduledirforclass = 'fourn';
@@ -2300,10 +2300,10 @@ 
         $moduledirforclass = 'user';
     }
     elseif ($module == 'ficheinter' || $module == 'interventions') {
-    	$moduledirforclass = 'fichinter';
+        $moduledirforclass = 'fichinter';
     }
     elseif ($module == 'tickets') {
-    	$moduledirforclass = 'ticket';
+        $moduledirforclass = 'ticket';
     }
 
     return $moduledirforclass;

dolibarr/htdocs/core/lib/stock.lib.php

Indentation +16 added lines, -16 removed lines

@@ -29,29 +29,29 @@ 
  */
 function stock_prepare_head($object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/product/stock/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/product/stock/movement_list.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("StockMovements");
-	$head[$h][2] = 'movements';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/product/stock/movement_list.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("StockMovements");
+    $head[$h][2] = 'movements';
+    $h++;
 
-	/*
+    /*
 	$head[$h][0] = DOL_URL_ROOT.'/product/stock/fiche-valo.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("EnhancedValue");
 	$head[$h][2] = 'value';
 	$h++;
 	*/
 
-	/* Disabled because will never be implemented. Table always empty.
+    /* Disabled because will never be implemented. Table always empty.
 	if (! empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))
 	{
 		// Should not be enabled by defaut because does not work yet correctly because
@@ -70,9 +70,9 @@ 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'stock');
 
     $head[$h][0] = DOL_URL_ROOT.'/product/stock/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'stock','remove');
 

dolibarr/htdocs/core/lib/salaries.lib.php

Indentation +21 added lines, -21 removed lines

@@ -27,15 +27,15 @@ 
 function salaries_prepare_head($object)
 {
 
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.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
@@ -43,23 +43,23 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->salaries->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->salaries->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/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,'salaries', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries', 'remove');
 
-	return $head;
+    return $head;
 }