alxarafe / alixar

dolibarr/htdocs/core/lib/payments.lib.php

Indentation +174 added lines, -174 removed lines

@@ -28,15 +28,15 @@ 
 function payment_prepare_head(Paiement $object)
 {
 
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'payment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'payment';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -44,14 +44,14 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'payment');
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/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,'payment', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -63,15 +63,15 @@ 
  */
 function payment_supplier_prepare_head(Paiement $object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'payment';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'payment';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -79,14 +79,14 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier');
 
-	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/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,'payment_supplier', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'payment_supplier', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -97,23 +97,23 @@ 
  */
 function getValidOnlinePaymentMethods($paymentmethod='')
 {
-	global $conf;
-
-	$validpaymentmethod=array();
-
-	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled))
-	{
-		$validpaymentmethod['paypal']='valid';
-	}
-	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled))
-	{
-		$validpaymentmethod['paybox']='valid';
-	}
-	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
-	{
-		$validpaymentmethod['stripe']='valid';
-	}
-	return $validpaymentmethod;
+    global $conf;
+
+    $validpaymentmethod=array();
+
+    if ((empty($paymentmethod) || $paymentmethod == 'paypal') && ! empty($conf->paypal->enabled))
+    {
+        $validpaymentmethod['paypal']='valid';
+    }
+    if ((empty($paymentmethod) || $paymentmethod == 'paybox') && ! empty($conf->paybox->enabled))
+    {
+        $validpaymentmethod['paybox']='valid';
+    }
+    if ((empty($paymentmethod) || $paymentmethod == 'stripe') && ! empty($conf->stripe->enabled))
+    {
+        $validpaymentmethod['stripe']='valid';
+    }
+    return $validpaymentmethod;
 }
 
 /**
@@ -125,18 +125,18 @@ 
  */
 function showOnlinePaymentUrl($type,$ref)
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array('payment', 'paybox'));
 
-	$servicename='Online';
+    $servicename='Online';
 
-	$out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
-	$url = getOnlinePaymentUrl(0,$type,$ref);
-	$out.= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
-	$out.= ajax_autoselect("onlinepaymenturl", 0);
-	return $out;
+    $out = img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
+    $url = getOnlinePaymentUrl(0,$type,$ref);
+    $out.= '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$url.'">';
+    $out.= ajax_autoselect("onlinepaymenturl", 0);
+    return $out;
 }
 
 /**
@@ -151,115 +151,115 @@ 
  */
 function getOnlinePaymentUrl($mode, $type, $ref='', $amount='9.99', $freetag='your_free_tag')
 {
-	global $conf;
-
-	$ref=str_replace(' ','',$ref);
-	$out='';
-
-	if ($type == 'free')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-		}
-	}
-	elseif ($type == 'order')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='order_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	elseif ($type == 'invoice')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='invoice_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	elseif ($type == 'contractline')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='contractline_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	elseif ($type == 'member' || $type == 'membersubscription')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='member_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-	if ($type == 'donation')
-	{
-		$out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=donation&ref='.($mode?'<font color="#666666">':'');
-		if ($mode == 1) $out.='donation_ref';
-		if ($mode == 0) $out.=urlencode($ref);
-		$out.=($mode?'</font>':'');
-		if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
-				$out.='&securekey='.($mode?'<font color="#666666">':'');
-				if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
-				if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
-				$out.=($mode?'</font>':'');
-			}
-		}
-	}
-
-	// For multicompany
-	if (! empty($out) && ! empty($conf->multicompany->enabled)) $out.="&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
-
-	return $out;
+    global $conf;
+
+    $ref=str_replace(' ','',$ref);
+    $out='';
+
+    if ($type == 'free')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else $out.='&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+        }
+    }
+    elseif ($type == 'order')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='order_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    elseif ($type == 'invoice')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='invoice_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    elseif ($type == 'contractline')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='contractline_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    elseif ($type == 'member' || $type == 'membersubscription')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='member_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+    if ($type == 'donation')
+    {
+        $out=DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?source=donation&ref='.($mode?'<font color="#666666">':'');
+        if ($mode == 1) $out.='donation_ref';
+        if ($mode == 0) $out.=urlencode($ref);
+        $out.=($mode?'</font>':'');
+        if (! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+        {
+            if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+            else
+            {
+                $out.='&securekey='.($mode?'<font color="#666666">':'');
+                if ($mode == 1) $out.="hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
+                if ($mode == 0) $out.= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $type . $ref, 2);
+                $out.=($mode?'</font>':'');
+            }
+        }
+    }
+
+    // For multicompany
+    if (! empty($out) && ! empty($conf->multicompany->enabled)) $out.="&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+
+    return $out;
 }
 
 
@@ -331,20 +331,20 @@ 
     print '<div class="center">'."\n";
     if ($addformmessage)
     {
-    	print '<!-- object = '.$object->element.' -->';
-    	print '<br>';
-
-    	$parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
-
-    	// Add other message if VAT exists
-    	if ($object->total_vat != 0 || $object->total_tva != 0)
-    	{
-    		$parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
-    	}
+        print '<!-- object = '.$object->element.' -->';
+        print '<br>';
+
+        $parammessageform='ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+        if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+        elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+
+        // Add other message if VAT exists
+        if ($object->total_vat != 0 || $object->total_tva != 0)
+        {
+            $parammessageform='ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+            if (! empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+            elseif (! empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+        }
     }
 
     print '<font style="font-size: 10px;"><br><hr>'."\n";

dolibarr/htdocs/core/lib/asset.lib.php

Indentation +91 added lines, -91 removed lines

@@ -28,41 +28,41 @@ 
  */
 function asset_admin_prepare_head()
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$langs->load("assets");
+    $langs->load("assets");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
-	$head[$h][1] = $langs->trans("Settings");
-	$head[$h][2] = 'settings';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/asset/admin/setup.php';
+    $head[$h][1] = $langs->trans("Settings");
+    $head[$h][2] = 'settings';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
-	//); // to add new tab
-	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
-	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
-	$head[$h][2] = 'attributes_type';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_type_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
+    $head[$h][2] = 'attributes_type';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -72,56 +72,56 @@ 
  */
 function asset_prepare_head()
 {
-	global $langs, $conf;
-
-	$langs->load("assets");
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/assets/mypage.php?id=__ID__'
-	//); // to add new tab
-	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/assets/mypage.php?id=__ID__'
-	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets');
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename,2,0,1,$object,'assets'). '/'. 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.'/asset/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++;
-
-	$nbNote = 0;
-	if(!empty($object->note_private)) $nbNote++;
-	if(!empty($object->note_public)) $nbNote++;
-	$head[$h][0] = DOL_URL_ROOT.'/asset/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++;
-
-	$head[$h][0] = DOL_URL_ROOT . '/asset/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, 'asset', 'remove');
-
-	return $head;
+    global $langs, $conf;
+
+    $langs->load("assets");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT . '/asset/card.php';
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets');
+
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename,2,0,1,$object,'assets'). '/'. 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.'/asset/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++;
+
+    $nbNote = 0;
+    if(!empty($object->note_private)) $nbNote++;
+    if(!empty($object->note_public)) $nbNote++;
+    $head[$h][0] = DOL_URL_ROOT.'/asset/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++;
+
+    $head[$h][0] = DOL_URL_ROOT . '/asset/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, 'asset', 'remove');
+
+    return $head;
 }
 
 /**
@@ -132,23 +132,23 @@ 
  */
 function asset_type_prepare_head(AssetType $object)
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h=0;
-	$head = array();
+    $h=0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'assettype','remove');
 
-	return $head;
+    return $head;
 }

dolibarr/htdocs/core/lib/vat.lib.php

Indentation +12 added lines, -12 removed lines

@@ -36,10 +36,10 @@ 
     $tab = 0;
     $head = array();
 
-	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans('Card');
-	$head[$tab][2] = 'card';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans('Card');
+    $head[$tab][2] = 'card';
+    $tab++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -47,16 +47,16 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf, $langs, $object, $head, $tab,'vat');
 	
-	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->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->tax->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[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
-	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$tab][2] = 'documents';
-	$tab++;
+    $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
+    $head[$tab][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$tab][2] = 'documents';
+    $tab++;
 
     $head[$tab][0] = DOL_URL_ROOT.'/compta/tva/info.php?id='.$object->id;
     $head[$tab][1] = $langs->trans("Info");

dolibarr/htdocs/core/lib/donation.lib.php

Indentation +51 added lines, -51 removed lines

@@ -28,30 +28,30 @@ 
  */
 function donation_admin_prepare_head()
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/don/admin/donation.php';
-	$head[$h][1] = $langs->trans("Miscellaneous");
-	$head[$h][2] = 'general';
-	$h ++;
+    $head[$h][0] = DOL_URL_ROOT . '/don/admin/donation.php';
+    $head[$h][1] = $langs->trans("Miscellaneous");
+    $head[$h][2] = 'general';
+    $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, null, $head, $h, 'donation_admin');
+    // 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, null, $head, $h, 'donation_admin');
 	
-	$head[$h][0] = DOL_URL_ROOT . '/don/admin/donation_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][0] = DOL_URL_ROOT . '/don/admin/donation_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
-	$h++;
+    $h++;
 
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'donation_admin', 'remove');
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'donation_admin', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -62,48 +62,48 @@ 
  */
 function donation_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 . '/don/card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h ++;
+    $head[$h][0] = DOL_URL_ROOT . '/don/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
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-	// $this->tabs = array('entity:-tabname); to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+    // $this->tabs = array('entity:-tabname); to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation');
 
-	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->don->dir_output . '/' . get_exdir($filename,2,0,1,$object,'donation'). '/'. dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->don->dir_output . '/' . get_exdir($filename,2,0,1,$object,'donation'). '/'. 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.'/don/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.'/don/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++;
 
-	$nbNote = 0;
-	if(!empty($object->note_private)) $nbNote++;
-	if(!empty($object->note_public)) $nbNote++;
-	$head[$h][0] = DOL_URL_ROOT.'/don/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++;
+    $nbNote = 0;
+    if(!empty($object->note_private)) $nbNote++;
+    if(!empty($object->note_public)) $nbNote++;
+    $head[$h][0] = DOL_URL_ROOT.'/don/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++;
 	
-	$head[$h][0] = DOL_URL_ROOT . '/don/info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/don/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, 'donation', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation', 'remove');
 
-	return $head;
+    return $head;
 }

dolibarr/htdocs/core/lib/trip.lib.php

Indentation +20 added lines, -20 removed lines

@@ -29,33 +29,33 @@
  */
 function trip_prepare_head(Deplacement $object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/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
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'trip');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'trip');
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Documents");
+    $head[$h][2] = 'documents';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Info");
+    $head[$h][2] = 'info';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
 
-	return $head;
+    return $head;
 }

dolibarr/htdocs/core/lib/categories.lib.php

Indentation +39 added lines, -39 removed lines

@@ -31,31 +31,31 @@ 
  */
 function categories_prepare_head($object,$type)
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	// Load translation files required by the page
+    // Load translation files required by the page
     $langs->loadLangs(array('categories', 'products'));
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/categories/photos.php?id='.$object->id.'&type='.$type;
-	$head[$h][1] = $langs->trans("Photos");
-	$head[$h][2] = 'photos';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/categories/photos.php?id='.$object->id.'&type='.$type;
+    $head[$h][1] = $langs->trans("Photos");
+    $head[$h][2] = 'photos';
+    $h++;
 
-	if (! empty($conf->global->MAIN_MULTILANGS))
-	{
-    	$head[$h][0] = DOL_URL_ROOT.'/categories/traduction.php?id='.$object->id.'&type='.$type;
-    	$head[$h][1] = $langs->trans("Translation");
-    	$head[$h][2] = 'translation';
-    	$h++;
-	}
+    if (! empty($conf->global->MAIN_MULTILANGS))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/categories/traduction.php?id='.$object->id.'&type='.$type;
+        $head[$h][1] = $langs->trans("Translation");
+        $head[$h][2] = 'translation';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -65,7 +65,7 @@ 
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'categories_'.$type,'remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -76,32 +76,32 @@ 
  */
 function categoriesadmin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$langs->load("categories");
+    $langs->load("categories");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/categories/admin/categorie.php';
-	$head[$h][1] = $langs->trans("Setup");
-	$head[$h][2] = 'setup';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/categories/admin/categorie.php';
+    $head[$h][1] = $langs->trans("Setup");
+    $head[$h][2] = 'setup';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/categories/admin/categorie_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsCategories");
-	$head[$h][2] = 'attributes_categories';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/categories/admin/categorie_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsCategories");
+    $head[$h][2] = 'attributes_categories';
+    $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,null,$head,$h,'categoriesadmin');
+    // 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,null,$head,$h,'categoriesadmin');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'categoriesadmin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'categoriesadmin','remove');
 
-	return $head;
+    return $head;
 }
 
 

dolibarr/htdocs/core/lib/project.lib.php

Indentation +1471 added lines, -1471 removed lines

@@ -35,122 +35,122 @@ 
  */
 function project_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Project");
-	$head[$h][2] = 'project';
-	$h++;
-
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("ProjectContact");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-	$head[$h][2] = 'contact';
-	$h++;
-
-	if (empty($conf->global->PROJECT_HIDE_TASKS))
-	{
-		// Then tab for sub level of projet, i mean tasks
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Tasks");
-
-		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-		$taskstatic=new Task($db);
-		$nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
-		if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
-		$head[$h][2] = 'tasks';
-		$h++;
-
-		$nbTimeSpent=0;
-		$sql = "SELECT t.rowid";
-		//$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
-		//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
-		$sql .= " WHERE t.fk_task = pt.rowid";
-		$sql .= " AND pt.fk_projet =".$object->id;
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $nbTimeSpent=1;
-		}
-		else dol_print_error($db);
-
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
-		$head[$h][1] = $langs->trans("TimeSpent");
-		if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
-		$head[$h][2] = 'timespent';
-		$h++;
-	}
-
-	if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
-		|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
-		|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("ProjectOverview");
-		$head[$h][2] = 'element';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project');
-
-
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/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] = 'notes';
-		$h++;
-	}
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->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.'/projet/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] = 'document';
-	$h++;
-
-	// Manage discussion
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
-	{
-		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
-		$head[$h][2] = 'project_comment';
-		$h++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/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] = 'agenda';
-	$h++;
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
-
-	return $head;
+    global $db, $langs, $conf, $user;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Project");
+    $head[$h][2] = 'project';
+    $h++;
+
+    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+    $head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("ProjectContact");
+    if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    $head[$h][2] = 'contact';
+    $h++;
+
+    if (empty($conf->global->PROJECT_HIDE_TASKS))
+    {
+        // Then tab for sub level of projet, i mean tasks
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("Tasks");
+
+        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+        $taskstatic=new Task($db);
+        $nbTasks=count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+        if ($nbTasks > 0) $head[$h][1].= ' <span class="badge">'.($nbTasks).'</span>';
+        $head[$h][2] = 'tasks';
+        $h++;
+
+        $nbTimeSpent=0;
+        $sql = "SELECT t.rowid";
+        //$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
+        //$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
+        $sql .= " WHERE t.fk_task = pt.rowid";
+        $sql .= " AND pt.fk_projet =".$object->id;
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $nbTimeSpent=1;
+        }
+        else dol_print_error($db);
+
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
+        $head[$h][1] = $langs->trans("TimeSpent");
+        if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+        $head[$h][2] = 'timespent';
+        $h++;
+    }
+
+    if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
+        || ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
+        || ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
+    {
+        $head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("ProjectOverview");
+        $head[$h][2] = 'element';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'project');
+
+
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = 0;
+        if(!empty($object->note_private)) $nbNote++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/projet/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] = 'notes';
+        $h++;
+    }
+
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $upload_dir = $conf->projet->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.'/projet/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] = 'document';
+    $h++;
+
+    // Manage discussion
+    if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
+    {
+        $nbComments = $object->getNbComments();
+        $head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
+        $head[$h][1] = $langs->trans("CommentLink");
+        if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+        $head[$h][2] = 'project_comment';
+        $h++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/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] = 'agenda';
+    $h++;
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'project','remove');
+
+    return $head;
 }
 
 
@@ -162,86 +162,86 @@ 
  */
 function task_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'task_task';
-	$h++;
-
-	$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-	$head[$h][2] = 'task_contact';
-	$h++;
-
-	// Is there timespent ?
-	$nbTimeSpent=0;
-	$sql = "SELECT t.rowid";
-	//$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
-	//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
-	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
-	$sql .= " WHERE t.fk_task =".$object->id;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent=1;
-	}
-	else dol_print_error($db);
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
-	$head[$h][2] = 'task_time';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
-
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$h][2] = 'task_notes';
-		$h++;
-	}
-
-	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-	$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'task_document';
-	$h++;
-
-	// Manage discussion
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
-	{
-		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
-		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
-		$head[$h][2] = 'task_comment';
-		$h++;
-	}
-
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
-
-	return $head;
+    global $db, $langs, $conf, $user;
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/task.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'task_task';
+    $h++;
+
+    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $head[$h][1] = $langs->trans("TaskRessourceLinks");
+    if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+    $head[$h][2] = 'task_contact';
+    $h++;
+
+    // Is there timespent ?
+    $nbTimeSpent=0;
+    $sql = "SELECT t.rowid";
+    //$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
+    //$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
+    $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
+    $sql .= " WHERE t.fk_task =".$object->id;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $obj = $db->fetch_object($resql);
+        if ($obj) $nbTimeSpent=1;
+    }
+    else dol_print_error($db);
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $head[$h][1] = $langs->trans("TimeSpent");
+    if ($nbTimeSpent > 0) $head[$h][1].= ' <span class="badge">...</span>';
+    $head[$h][2] = 'task_time';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'task');
+
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = 0;
+        if(!empty($object->note_private)) $nbNote++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'task_notes';
+        $h++;
+    }
+
+    $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+    $filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . '/' .dol_sanitizeFileName($object->ref);
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+    $nbFiles = count(dol_dir_list($filesdir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $nbLinks=Link::count($db, $object->element, $object->id);
+    $head[$h][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'task_document';
+    $h++;
+
+    // Manage discussion
+    if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
+    {
+        $nbComments = $object->getNbComments();
+        $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject')?'&withproject=1':'');
+        $head[$h][1] = $langs->trans("CommentLink");
+        if ($nbComments > 0) $head[$h][1].= ' <span class="badge">'.$nbComments.'</span>';
+        $head[$h][2] = 'task_comment';
+        $h++;
+    }
+
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'task','remove');
+
+    return $head;
 }
 
 /**
@@ -253,33 +253,33 @@ 
  */
 function project_timesheet_prepare_head($mode, $fuser=null)
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
-
-	$h = 0;
-
-	$param='';
-	$param.=($mode?'&mode='.$mode:'');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
-
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
-		$head[$h][1] = $langs->trans("InputPerWeek");
-		$head[$h][2] = 'inputperweek';
-		$h++;
-	}
-
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
-		$head[$h][1] = $langs->trans("InputPerDay");
-		$head[$h][2] = 'inputperday';
-		$h++;
-	}
-
-	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
+
+    $h = 0;
+
+    $param='';
+    $param.=($mode?'&mode='.$mode:'');
+    if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param.='&search_usertoprocessid='.$fuser->id;
+
+    if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param?'?'.$param:'');
+        $head[$h][1] = $langs->trans("InputPerWeek");
+        $head[$h][2] = 'inputperweek';
+        $h++;
+    }
+
+    if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
+    {
+        $head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param?'?'.$param:'');
+        $head[$h][1] = $langs->trans("InputPerDay");
+        $head[$h][2] = 'inputperday';
+        $h++;
+    }
+
+    /*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perline.php".($param?'?'.$param:'');
 		$head[$h][1] = $langs->trans("InputDetail");
@@ -287,11 +287,11 @@ 
 		$h++;
 	}*/
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet');
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -302,32 +302,32 @@ 
  */
 function project_admin_prepare_head()
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
 
-	$h = 0;
+    $h = 0;
 
-	$head[$h][0] = DOL_URL_ROOT."/projet/admin/project.php";
-	$head[$h][1] = $langs->trans("Projects");
-	$head[$h][2] = 'project';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/projet/admin/project.php";
+    $head[$h][1] = $langs->trans("Projects");
+    $head[$h][2] = 'project';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin');
 
-	$head[$h][0] = DOL_URL_ROOT."/projet/admin/project_extrafields.php";
-	$head[$h][1] = $langs->trans("ExtraFieldsProject");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/projet/admin/project_extrafields.php";
+    $head[$h][1] = $langs->trans("ExtraFieldsProject");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/admin/project_task_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsProjectTask");
-	$head[$h][2] = 'attributes_task';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/projet/admin/project_task_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsProjectTask");
+    $head[$h][2] = 'attributes_task';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'project_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -349,284 +349,284 @@ 
  */
 function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0, $filterprogresscalc='')
 {
-	global $user, $bc, $langs, $conf, $db;
-	global $projectstatic, $taskstatic;
-
-	$lastprojectid=0;
-
-	$projectsArrayId=explode(',',$projectsListId);
-	if ($filterprogresscalc!=='') {
-		foreach ($lines as $key=>$line) {
-			if (!empty($line->planned_workload) && !empty($line->duration)) {
-				$filterprogresscalc = str_replace(' = ', ' == ', $filterprogresscalc);
-				if (!eval($filterprogresscalc)) {
-					unset($lines[$key]);
-				}
-			}
-		}
-		$lines=array_values($lines);
-	}
-
-	$numlines=count($lines);
-
-	// We declare counter as global because we want to edit them into recursive call
-	global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
-	if ($level == 0)
-	{
-		$total_projectlinesa_spent=0;
-		$total_projectlinesa_planned=0;
-		$total_projectlinesa_spent_if_planned=0;
-	}
-
-	for ($i = 0 ; $i < $numlines ; $i++)
-	{
-		if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
-
-		// Process line
-		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
-
-		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
-		{
-			// Show task line.
-			$showline=1;
-			$showlineingray=0;
-
-			// If there is filters to use
-			if (is_array($taskrole))
-			{
-				// If task not legitimate to show, search if a legitimate task exists later in tree
-				if (! isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
-				{
-					// So search if task has a subtask legitimate to show
-					$foundtaskforuserdeeper=0;
-					searchTaskInChild($foundtaskforuserdeeper,$lines[$i]->id,$lines,$taskrole);
-					//print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
-					if ($foundtaskforuserdeeper > 0)
-					{
-						$showlineingray=1;		// We will show line but in gray
-					}
-					else
-					{
-						$showline=0;			// No reason to show line
-					}
-				}
-			}
-			else
-			{
-				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
-				// or into all other projects if user has permission to).
-				if (empty($user->rights->projet->all->lire))
-				{
-					// User is not allowed on this project and project is not public, so we hide line
-					if (! in_array($lines[$i]->fk_project, $projectsArrayId))
-					{
-						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
-						// because assignement on task can be done only on contact of project.
-						// If assignement was done and after, was removed from contact of project, then we can hide the line.
-						$showline=0;
-					}
-				}
-			}
-
-			if ($showline)
-			{
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$var = !$var;
-					$lastprojectid=$lines[$i]->fk_project;
-				}
-
-				print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
-
-				if ($showproject)
-				{
-					// Project ref
-					print "<td>";
-					//if ($showlineingray) print '<i>';
-					$projectstatic->id=$lines[$i]->fk_project;
-					$projectstatic->ref=$lines[$i]->projectref;
-					$projectstatic->public=$lines[$i]->public;
-					$projectstatic->title=$lines[$i]->projectlabel;
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1,'nolink');
-					//if ($showlineingray) print '</i>';
-					print "</td>";
-
-					// Project status
-					print '<td>';
-					$projectstatic->statut=$lines[$i]->projectstatus;
-					print $projectstatic->getLibStatut(2);
-					print "</td>";
-				}
-
-				// Ref of task
-				print '<td>';
-				if ($showlineingray)
-				{
-					print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
-				}
-				else
-				{
-					$taskstatic->id=$lines[$i]->id;
-					$taskstatic->ref=$lines[$i]->ref;
-					$taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:'');
-					print $taskstatic->getNomUrl(1,'withproject');
-				}
-				print '</td>';
-
-				// Title of task
-				print "<td>";
-				if ($showlineingray) print '<i>';
-				//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
-				for ($k = 0 ; $k < $level ; $k++)
-				{
-					print "&nbsp; &nbsp; &nbsp;";
-				}
-				print $lines[$i]->label;
-				if ($showlineingray) print '</i>';
-				//else print '</a>';
-				print "</td>\n";
-
-				// Date start
-				print '<td align="center">';
-				print dol_print_date($lines[$i]->date_start,'dayhour');
-				print '</td>';
-
-				// Date end
-				print '<td align="center">';
-				$taskstatic->projectstatus = $lines[$i]->projectstatus;
-				$taskstatic->progress = $lines[$i]->progress;
-				$taskstatic->fk_statut = $lines[$i]->status;
-				$taskstatic->datee = $lines[$i]->date_end;
-				print dol_print_date($lines[$i]->date_end,'dayhour');
-				if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
-				print '</td>';
-
-				$plannedworkloadoutputformat='allhourmin';
-				$timespentoutputformat='allhourmin';
-				if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
-
-				// Planned Workload (in working hours)
-				print '<td align="right">';
-				$fullhour=convertSecondToTime($lines[$i]->planned_workload,$plannedworkloadoutputformat);
-				$workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
-				if ($lines[$i]->planned_workload != '')
-				{
-					print $fullhour;
-					// TODO Add delay taking account of working hours per day and working day per week
-					//if ($workingdelay != $fullhour) print '<br>('.$workingdelay.')';
-				}
-				//else print '--:--';
-				print '</td>';
-
-				// Time spent
-				print '<td align="right">';
-				if ($showlineingray) print '<i>';
-				else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
-				if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
-				else print '--:--';
-				if ($showlineingray) print '</i>';
-				else print '</a>';
-				print '</td>';
-
-				// Progress calculated (Note: ->duration is time spent)
-				print '<td align="right">';
-				if ($lines[$i]->planned_workload || $lines[$i]->duration)
-				{
-					if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
-					else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
-				}
-				print '</td>';
-
-				// Progress declared
-				print '<td align="right">';
-				if ($lines[$i]->progress != '')
-				{
-					print $lines[$i]->progress.' %';
-				}
-				print '</td>';
-
-				// Contacts of task
-				if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
-				{
-					print '<td>';
-					foreach(array('internal','external') as $source)
-					{
-						$tab = $lines[$i]->liste_contact(-1,$source);
-						$num=count($tab);
-						if (!empty($num)){
-							foreach ($tab as $contacttask){
-								//var_dump($contacttask);
-								if ($source == 'internal') $c = new User($db);
-								else $c = new Contact($db);
-								$c->fetch($contacttask['id']);
-								print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>';
-							}
-						}
-					}
-					print '</td>';
-				}
-
-				// Tick to drag and drop
-				if ($addordertick)
-				{
-					print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
-				}
-
-				print "</tr>\n";
-
-				if (! $showlineingray) $inc++;
-
-				if ($level >= 0)    // Call sublevels
-				{
-					$level++;
-					if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
-					$level--;
-				}
-
-				$total_projectlinesa_spent += $lines[$i]->duration;
-				$total_projectlinesa_planned += $lines[$i]->planned_workload;
-				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
-			}
-		}
-		else
-		{
-			//$level--;
-		}
-	}
-
-	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0) && $level <= 0)
-	{
-		print '<tr class="liste_total nodrag nodrop">';
-		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-		if ($showproject) print '<td></td><td></td>';
-		print '<td></td>';
-		print '<td></td>';
-		print '<td></td>';
-		print '<td align="right" class="nowrap liste_total">';
-		print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
-		print '</td>';
-		print '<td align="right" class="nowrap liste_total">';
-		if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
-		print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
-		if ($projectidfortotallink > 0) print '</a>';
-		print '</td>';
-		print '<td align="right" class="nowrap liste_total">';
-		if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
-		print '</td>';
-		print '<td></td>';
-		// Contacts of task
-		if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
-		{
-			print '<td></td>';
-		}
-		if ($addordertick) print '<td class="hideonsmartphone"></td>';
-		print '</tr>';
-	}
-
-	return $inc;
+    global $user, $bc, $langs, $conf, $db;
+    global $projectstatic, $taskstatic;
+
+    $lastprojectid=0;
+
+    $projectsArrayId=explode(',',$projectsListId);
+    if ($filterprogresscalc!=='') {
+        foreach ($lines as $key=>$line) {
+            if (!empty($line->planned_workload) && !empty($line->duration)) {
+                $filterprogresscalc = str_replace(' = ', ' == ', $filterprogresscalc);
+                if (!eval($filterprogresscalc)) {
+                    unset($lines[$key]);
+                }
+            }
+        }
+        $lines=array_values($lines);
+    }
+
+    $numlines=count($lines);
+
+    // We declare counter as global because we want to edit them into recursive call
+    global $total_projectlinesa_spent,$total_projectlinesa_planned,$total_projectlinesa_spent_if_planned;
+    if ($level == 0)
+    {
+        $total_projectlinesa_spent=0;
+        $total_projectlinesa_planned=0;
+        $total_projectlinesa_spent_if_planned=0;
+    }
+
+    for ($i = 0 ; $i < $numlines ; $i++)
+    {
+        if ($parent == 0 && $level >= 0) $level = 0;              // if $level = -1, we dont' use sublevel recursion, we show all lines
+
+        // Process line
+        // print "i:".$i."-".$lines[$i]->fk_project.'<br>';
+
+        if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
+        {
+            // Show task line.
+            $showline=1;
+            $showlineingray=0;
+
+            // If there is filters to use
+            if (is_array($taskrole))
+            {
+                // If task not legitimate to show, search if a legitimate task exists later in tree
+                if (! isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
+                {
+                    // So search if task has a subtask legitimate to show
+                    $foundtaskforuserdeeper=0;
+                    searchTaskInChild($foundtaskforuserdeeper,$lines[$i]->id,$lines,$taskrole);
+                    //print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
+                    if ($foundtaskforuserdeeper > 0)
+                    {
+                        $showlineingray=1;		// We will show line but in gray
+                    }
+                    else
+                    {
+                        $showline=0;			// No reason to show line
+                    }
+                }
+            }
+            else
+            {
+                // Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
+                // or into all other projects if user has permission to).
+                if (empty($user->rights->projet->all->lire))
+                {
+                    // User is not allowed on this project and project is not public, so we hide line
+                    if (! in_array($lines[$i]->fk_project, $projectsArrayId))
+                    {
+                        // Note that having a user assigned to a task into a project user has no permission on, should not be possible
+                        // because assignement on task can be done only on contact of project.
+                        // If assignement was done and after, was removed from contact of project, then we can hide the line.
+                        $showline=0;
+                    }
+                }
+            }
+
+            if ($showline)
+            {
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $var = !$var;
+                    $lastprojectid=$lines[$i]->fk_project;
+                }
+
+                print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
+
+                if ($showproject)
+                {
+                    // Project ref
+                    print "<td>";
+                    //if ($showlineingray) print '<i>';
+                    $projectstatic->id=$lines[$i]->fk_project;
+                    $projectstatic->ref=$lines[$i]->projectref;
+                    $projectstatic->public=$lines[$i]->public;
+                    $projectstatic->title=$lines[$i]->projectlabel;
+                    if ($lines[$i]->public || in_array($lines[$i]->fk_project,$projectsArrayId) || ! empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
+                    else print $projectstatic->getNomUrl(1,'nolink');
+                    //if ($showlineingray) print '</i>';
+                    print "</td>";
+
+                    // Project status
+                    print '<td>';
+                    $projectstatic->statut=$lines[$i]->projectstatus;
+                    print $projectstatic->getLibStatut(2);
+                    print "</td>";
+                }
+
+                // Ref of task
+                print '<td>';
+                if ($showlineingray)
+                {
+                    print '<i>'.img_object('','projecttask').' '.$lines[$i]->ref.'</i>';
+                }
+                else
+                {
+                    $taskstatic->id=$lines[$i]->id;
+                    $taskstatic->ref=$lines[$i]->ref;
+                    $taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:'');
+                    print $taskstatic->getNomUrl(1,'withproject');
+                }
+                print '</td>';
+
+                // Title of task
+                print "<td>";
+                if ($showlineingray) print '<i>';
+                //else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
+                for ($k = 0 ; $k < $level ; $k++)
+                {
+                    print "&nbsp; &nbsp; &nbsp;";
+                }
+                print $lines[$i]->label;
+                if ($showlineingray) print '</i>';
+                //else print '</a>';
+                print "</td>\n";
+
+                // Date start
+                print '<td align="center">';
+                print dol_print_date($lines[$i]->date_start,'dayhour');
+                print '</td>';
+
+                // Date end
+                print '<td align="center">';
+                $taskstatic->projectstatus = $lines[$i]->projectstatus;
+                $taskstatic->progress = $lines[$i]->progress;
+                $taskstatic->fk_statut = $lines[$i]->status;
+                $taskstatic->datee = $lines[$i]->date_end;
+                print dol_print_date($lines[$i]->date_end,'dayhour');
+                if ($taskstatic->hasDelay()) print img_warning($langs->trans("Late"));
+                print '</td>';
+
+                $plannedworkloadoutputformat='allhourmin';
+                $timespentoutputformat='allhourmin';
+                if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+                if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+
+                // Planned Workload (in working hours)
+                print '<td align="right">';
+                $fullhour=convertSecondToTime($lines[$i]->planned_workload,$plannedworkloadoutputformat);
+                $workingdelay=convertSecondToTime($lines[$i]->planned_workload,'all',86400,7);	// TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
+                if ($lines[$i]->planned_workload != '')
+                {
+                    print $fullhour;
+                    // TODO Add delay taking account of working hours per day and working day per week
+                    //if ($workingdelay != $fullhour) print '<br>('.$workingdelay.')';
+                }
+                //else print '--:--';
+                print '</td>';
+
+                // Time spent
+                print '<td align="right">';
+                if ($showlineingray) print '<i>';
+                else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject?'':'&withproject=1').'">';
+                if ($lines[$i]->duration) print convertSecondToTime($lines[$i]->duration,$timespentoutputformat);
+                else print '--:--';
+                if ($showlineingray) print '</i>';
+                else print '</a>';
+                print '</td>';
+
+                // Progress calculated (Note: ->duration is time spent)
+                print '<td align="right">';
+                if ($lines[$i]->planned_workload || $lines[$i]->duration)
+                {
+                    if ($lines[$i]->planned_workload) print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload,2).' %';
+                    else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+                }
+                print '</td>';
+
+                // Progress declared
+                print '<td align="right">';
+                if ($lines[$i]->progress != '')
+                {
+                    print $lines[$i]->progress.' %';
+                }
+                print '</td>';
+
+                // Contacts of task
+                if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
+                {
+                    print '<td>';
+                    foreach(array('internal','external') as $source)
+                    {
+                        $tab = $lines[$i]->liste_contact(-1,$source);
+                        $num=count($tab);
+                        if (!empty($num)){
+                            foreach ($tab as $contacttask){
+                                //var_dump($contacttask);
+                                if ($source == 'internal') $c = new User($db);
+                                else $c = new Contact($db);
+                                $c->fetch($contacttask['id']);
+                                print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . '<br>';
+                            }
+                        }
+                    }
+                    print '</td>';
+                }
+
+                // Tick to drag and drop
+                if ($addordertick)
+                {
+                    print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
+                }
+
+                print "</tr>\n";
+
+                if (! $showlineingray) $inc++;
+
+                if ($level >= 0)    // Call sublevels
+                {
+                    $level++;
+                    if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick);
+                    $level--;
+                }
+
+                $total_projectlinesa_spent += $lines[$i]->duration;
+                $total_projectlinesa_planned += $lines[$i]->planned_workload;
+                if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+            }
+        }
+        else
+        {
+            //$level--;
+        }
+    }
+
+    if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0) && $level <= 0)
+    {
+        print '<tr class="liste_total nodrag nodrop">';
+        print '<td class="liste_total">'.$langs->trans("Total").'</td>';
+        if ($showproject) print '<td></td><td></td>';
+        print '<td></td>';
+        print '<td></td>';
+        print '<td></td>';
+        print '<td align="right" class="nowrap liste_total">';
+        print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
+        print '</td>';
+        print '<td align="right" class="nowrap liste_total">';
+        if ($projectidfortotallink > 0) print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject?'':'&withproject=1').'">';
+        print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
+        if ($projectidfortotallink > 0) print '</a>';
+        print '</td>';
+        print '<td align="right" class="nowrap liste_total">';
+        if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
+        print '</td>';
+        print '<td></td>';
+        // Contacts of task
+        if (! empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
+        {
+            print '<td></td>';
+        }
+        if ($addordertick) print '<td class="hideonsmartphone"></td>';
+        print '</tr>';
+    }
+
+    return $inc;
 }
 
 
@@ -649,191 +649,191 @@ 
  */
 function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
 {
-	global $conf, $db, $user, $bc, $langs;
-	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
-
-	$lastprojectid=0;
-	$totalforeachline=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
-
-	$numlines=count($lines);
-
-	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0 ; $i < $numlines ; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-		}
-	}
-
-	if (empty($oldprojectforbreak))
-	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
-	}
-
-	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0 ; $i < $numlines ; $i++)
-	{
-		if ($parent == 0) $level = 0;
-
-		//if ($lines[$i]->fk_task_parent == $parent)
-		//{
-			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
-			{
-				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$lastprojectid=$lines[$i]->fk_project;
-					if ($preselectedday)
-					{
-						$projectstatic->id = $lines[$i]->fk_project;
-					}
-				}
-
-				if (empty($workloadforid[$projectstatic->id]))
-				{
-					if ($preselectedday)
-					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-						$workloadforid[$projectstatic->id]=1;
-					}
-				}
-
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->project_ref;
-				$projectstatic->title=$lines[$i]->project_label;
-				$projectstatic->public=$lines[$i]->public;
-
-				$taskstatic->id=$lines[$i]->task_id;
-				$taskstatic->ref=($lines[$i]->task_ref?$lines[$i]->task_ref:$lines[$i]->task_id);
-				$taskstatic->label=$lines[$i]->task_label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
-
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
-
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
-					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="11">';
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-					if ($projectstatic->title)
-					{
-						print ' - ';
-						print $projectstatic->title;
-					}
-					print '</td>';
-					print '</tr>';
-				}
-
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
-
-				print '<tr class="oddeven">'."\n";
-
-				// User
-				/*
+    global $conf, $db, $user, $bc, $langs;
+    global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+    $lastprojectid=0;
+    $totalforeachline=array();
+    $workloadforid=array();
+    $lineswithoutlevel0=array();
+
+    $numlines=count($lines);
+
+    // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+    if ($parent == 0) // Always and only if at first level
+    {
+        for ($i = 0 ; $i < $numlines ; $i++)
+        {
+            if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+        }
+    }
+
+    if (empty($oldprojectforbreak))
+    {
+        $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+    }
+
+    //dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+    for ($i = 0 ; $i < $numlines ; $i++)
+    {
+        if ($parent == 0) $level = 0;
+
+        //if ($lines[$i]->fk_task_parent == $parent)
+        //{
+            // If we want all or we have a role on task, we show it
+            if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+            {
+                //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $lastprojectid=$lines[$i]->fk_project;
+                    if ($preselectedday)
+                    {
+                        $projectstatic->id = $lines[$i]->fk_project;
+                    }
+                }
+
+                if (empty($workloadforid[$projectstatic->id]))
+                {
+                    if ($preselectedday)
+                    {
+                        $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+                        $workloadforid[$projectstatic->id]=1;
+                    }
+                }
+
+                $projectstatic->id=$lines[$i]->fk_project;
+                $projectstatic->ref=$lines[$i]->project_ref;
+                $projectstatic->title=$lines[$i]->project_label;
+                $projectstatic->public=$lines[$i]->public;
+
+                $taskstatic->id=$lines[$i]->task_id;
+                $taskstatic->ref=($lines[$i]->task_ref?$lines[$i]->task_ref:$lines[$i]->task_id);
+                $taskstatic->label=$lines[$i]->task_label;
+                $taskstatic->date_start=$lines[$i]->date_start;
+                $taskstatic->date_end=$lines[$i]->date_end;
+
+                $thirdpartystatic->id=$lines[$i]->socid;
+                $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+                $thirdpartystatic->email=$lines[$i]->thirdparty_email;
+
+                if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
+                {
+                    print '<tr class="oddeven trforbreak">'."\n";
+                    print '<td colspan="11">';
+                    print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+                    if ($projectstatic->title)
+                    {
+                        print ' - ';
+                        print $projectstatic->title;
+                    }
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+
+                print '<tr class="oddeven">'."\n";
+
+                // User
+                /*
 				 print '<td class="nowrap">';
 				 print $fuser->getNomUrl(1, 'withproject', 'time');
 				 print '</td>';
 				 */
 
-				// Project
-				print "<td>";
-				if ($oldprojectforbreak == -1)
-				{
-					print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-					print '<br>'.$projectstatic->title;
-				}
-				print "</td>";
-
-				// Thirdparty
-				print '<td class="tdoverflowmax100">';
-				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
-				print '</td>';
-
-				// Ref
-				print '<td>';
-				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				print $taskstatic->getNomUrl(1, 'withproject', 'time');
-				// Label task
-				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				print $taskstatic->label;
-				//print "<br>";
-				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
-				print "</td>\n";
-
-				// Date
-				print '<td align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'day');
-				print '</td>';
-
-				$disabledproject=1;$disabledtask=1;
-				//print "x".$lines[$i]->fk_project;
-				//var_dump($lines[$i]);
-				//var_dump($projectsrole[$lines[$i]->fk_project]);
-				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
-					$disabledproject=0;
-					$disabledtask=0;
-				}
-				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
-					$disabledtask=1;
-				}
-
-				// Hour
-				print '<td class="nowrap" align="center">';
-				print dol_print_date($lines[$i]->timespent_datehour,'hour');
-				print '</td>';
-
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
-
-				// Duration
-				print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
-
-				$dayWorkLoad = $lines[$i]->timespent_duration;
-				$totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
-
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
-
-				print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
-
-				$modeinput='hours';
-
-				print '<script type="text/javascript">';
-				print "jQuery(document).ready(function () {\n";
-				print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
-				print "})\n";
-				print '</script>';
-
-				print '</td>';
-
-				// Note
-				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
-				print $lines[$i]->timespent_note;
-				print '</textarea>';
-				print '</td>';
-
-				// Warning
-				print '<td align="right">';
-				/*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+                // Project
+                print "<td>";
+                if ($oldprojectforbreak == -1)
+                {
+                    print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+                    print '<br>'.$projectstatic->title;
+                }
+                print "</td>";
+
+                // Thirdparty
+                print '<td class="tdoverflowmax100">';
+                if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+                print '</td>';
+
+                // Ref
+                print '<td>';
+                print '<!-- Task id = '.$lines[$i]->id.' -->';
+                for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                print $taskstatic->getNomUrl(1, 'withproject', 'time');
+                // Label task
+                print '<br>';
+                for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                print $taskstatic->label;
+                //print "<br>";
+                //for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+                print "</td>\n";
+
+                // Date
+                print '<td align="center">';
+                print dol_print_date($lines[$i]->timespent_datehour,'day');
+                print '</td>';
+
+                $disabledproject=1;$disabledtask=1;
+                //print "x".$lines[$i]->fk_project;
+                //var_dump($lines[$i]);
+                //var_dump($projectsrole[$lines[$i]->fk_project]);
+                // If at least one role for project
+                if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+                {
+                    $disabledproject=0;
+                    $disabledtask=0;
+                }
+                // If $restricteditformytask is on and I have no role on task, i disable edit
+                if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
+                {
+                    $disabledtask=1;
+                }
+
+                // Hour
+                print '<td class="nowrap" align="center">';
+                print dol_print_date($lines[$i]->timespent_datehour,'hour');
+                print '</td>';
+
+                $cssonholiday='';
+                if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
+                elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
+                elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+
+                // Duration
+                print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
+
+                $dayWorkLoad = $lines[$i]->timespent_duration;
+                $totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
+
+                $alreadyspent='';
+                if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+
+                print convertSecondToTime($lines[$i]->timespent_duration,'allhourmin');
+
+                $modeinput='hours';
+
+                print '<script type="text/javascript">';
+                print "jQuery(document).ready(function () {\n";
+                print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
+                print "})\n";
+                print '</script>';
+
+                print '</td>';
+
+                // Note
+                print '<td align="center">';
+                print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+                print $lines[$i]->timespent_note;
+                print '</textarea>';
+                print '</td>';
+
+                // Warning
+                print '<td align="right">';
+                /*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
 				else if ($disabledtask)
 				{
 					$titleassigntask = $langs->trans("AssignTaskToMe");
@@ -841,18 +841,18 @@ 
 
 					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
 				}*/
-				print '</td>';
-
-				print "</tr>\n";
-			}
-		//}
-		//else
-		//{
-			//$level--;
-		//}
-	}
-
-	return $totalforeachline;
+                print '</td>';
+
+                print "</tr>\n";
+            }
+        //}
+        //else
+        //{
+            //$level--;
+        //}
+    }
+
+    return $totalforeachline;
 }
 
 
@@ -875,273 +875,273 @@ 
  */
 function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
 {
-	global $conf, $db, $user, $bc, $langs;
-	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
-
-	$lastprojectid=0;
-	$totalforeachday=array();
-	$workloadforid=array();
-	$lineswithoutlevel0=array();
-
-	$numlines=count($lines);
-
-	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0 ; $i < $numlines ; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-		}
-	}
-
-	if (empty($oldprojectforbreak))
-	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
-	}
-
-	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0 ; $i < $numlines ; $i++)
-	{
-		if ($parent == 0) $level = 0;
-
-		if ($lines[$i]->fk_task_parent == $parent)
-		{
-			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
-			{
-				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
-				{
-					continue;
-				}
-
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$lastprojectid=$lines[$i]->fk_project;
-					if ($preselectedday)
-					{
-						$projectstatic->id = $lines[$i]->fk_project;
-					}
-				}
-
-				if (empty($workloadforid[$projectstatic->id]))
-				{
-					if ($preselectedday)
-					{
-						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		   				$workloadforid[$projectstatic->id]=1;
-					}
-				}
-
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
-
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
-
-				$thirdpartystatic->id=$lines[$i]->socid;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
-
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
-					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="9">';
-					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
-					if ($projectstatic->title)
-					{
-						print ' - ';
-						print $projectstatic->title;
-					}
-					print '</td>';
-					print '</tr>';
-				}
-
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
-
-				print '<tr class="oddeven">'."\n";
-
-				// User
-				/*
+    global $conf, $db, $user, $bc, $langs;
+    global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+    $lastprojectid=0;
+    $totalforeachday=array();
+    $workloadforid=array();
+    $lineswithoutlevel0=array();
+
+    $numlines=count($lines);
+
+    // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+    if ($parent == 0) // Always and only if at first level
+    {
+        for ($i = 0 ; $i < $numlines ; $i++)
+        {
+            if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+        }
+    }
+
+    if (empty($oldprojectforbreak))
+    {
+        $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+    }
+
+    //dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+    for ($i = 0 ; $i < $numlines ; $i++)
+    {
+        if ($parent == 0) $level = 0;
+
+        if ($lines[$i]->fk_task_parent == $parent)
+        {
+            // If we want all or we have a role on task, we show it
+            if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+            {
+                //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+
+                if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
+                {
+                    continue;
+                }
+
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $lastprojectid=$lines[$i]->fk_project;
+                    if ($preselectedday)
+                    {
+                        $projectstatic->id = $lines[$i]->fk_project;
+                    }
+                }
+
+                if (empty($workloadforid[$projectstatic->id]))
+                {
+                    if ($preselectedday)
+                    {
+                        $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+                            $workloadforid[$projectstatic->id]=1;
+                    }
+                }
+
+                $projectstatic->id=$lines[$i]->fk_project;
+                $projectstatic->ref=$lines[$i]->projectref;
+                $projectstatic->title=$lines[$i]->projectlabel;
+                $projectstatic->public=$lines[$i]->public;
+
+                $taskstatic->id=$lines[$i]->id;
+                $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
+                $taskstatic->label=$lines[$i]->label;
+                $taskstatic->date_start=$lines[$i]->date_start;
+                $taskstatic->date_end=$lines[$i]->date_end;
+
+                $thirdpartystatic->id=$lines[$i]->socid;
+                $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+                $thirdpartystatic->email=$lines[$i]->thirdparty_email;
+
+                if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
+                {
+                    print '<tr class="oddeven trforbreak">'."\n";
+                    print '<td colspan="9">';
+                    print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+                    if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+                    if ($projectstatic->title)
+                    {
+                        print ' - ';
+                        print $projectstatic->title;
+                    }
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+
+                print '<tr class="oddeven">'."\n";
+
+                // User
+                /*
 				print '<td class="nowrap">';
 				print $fuser->getNomUrl(1, 'withproject', 'time');
 				print '</td>';
 				*/
 
-				// Project
-				/*print "<td>";
+                // Project
+                /*print "<td>";
 				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";*/
 
-				// Thirdparty
-				/*print '<td class="tdoverflowmax100">';
+                // Thirdparty
+                /*print '<td class="tdoverflowmax100">';
 				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
 				print '</td>';*/
 
-				// Ref
-				print '<td>';
-				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				print $taskstatic->getNomUrl(1, 'withproject', 'time');
-				// Label task
-				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				print $taskstatic->label;
-				//print "<br>";
-				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
-				print "</td>\n";
-
-				// Planned Workload
-				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
-				print '</td>';
-
-				// Progress declared %
-				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
-				print '</td>';
-
-				// Time spent by everybody
-				print '<td align="right">';
-				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
-				if ($lines[$i]->duration)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
-					print '</a>';
-				}
-				else print '--:--';
-				print "</td>\n";
-
-				// Time spent by user
-				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
-				print "</td>\n";
-
-				$disabledproject=1;$disabledtask=1;
-				//print "x".$lines[$i]->fk_project;
-				//var_dump($lines[$i]);
-				//var_dump($projectsrole[$lines[$i]->fk_project]);
-				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
-					$disabledproject=0;
-					$disabledtask=0;
-				}
-				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
-					$disabledtask=1;
-				}
-
-				// Form to add new time
-				print '<td class="nowrap leftborder" align="center">';
-				$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
-				print $tableCell;
-				print '</td>';
-
-				$cssonholiday='';
-				if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
-				elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
-				elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
-
-				global $daytoparse;
-				$tmparray = dol_getdate($daytoparse,true);	// detail of current day
-				$idw = $tmparray['wday'];
-
-				global $numstartworkingday, $numendworkingday;
-				$cssweekend='';
-				if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
-				{
-					$cssweekend='weekend';
-				}
-
-				// Duration
-				print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
-				$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
-				$totalforeachday[$preselectedday]+=$dayWorkLoad;
-
-				$alreadyspent='';
-				if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
-
-				$idw = 0;
-
-				$tableCell='';
-				$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-				$tableCell.='<span class="hideonsmartphone"> + </span>';
-				//$tableCell.='&nbsp;&nbsp;&nbsp;';
-				$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
-				//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
-				print $tableCell;
-
-				$modeinput='hours';
-
-				print '<script type="text/javascript">';
-				print "jQuery(document).ready(function () {\n";
-				print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
-				print "})\n";
-				print '</script>';
-
-				print '</td>';
-
-				// Note
-				print '<td align="center">';
-				print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
-				print '</textarea>';
-				print '</td>';
-
-				// Warning
-				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
-   				{
-   					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
-
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
-   				}
-				print '</td>';
-
-				print "</tr>\n";
-			}
-
-			$inc++;
-			$level++;
-			if ($lines[$i]->id > 0)
-			{
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
-				//var_dump($totalforeachday);
-				$ret = projectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
-				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
-				//var_dump($ret);
-				foreach($ret as $key => $val)
-				{
-					$totalforeachday[$key]+=$val;
-				}
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
-				//var_dump($totalforeachday);
-			}
-			$level--;
-		}
-		else
-		{
-			//$level--;
-		}
-	}
-
-	return $totalforeachday;
+                // Ref
+                print '<td>';
+                print '<!-- Task id = '.$lines[$i]->id.' -->';
+                for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                print $taskstatic->getNomUrl(1, 'withproject', 'time');
+                // Label task
+                print '<br>';
+                for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                print $taskstatic->label;
+                //print "<br>";
+                //for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+                print "</td>\n";
+
+                // Planned Workload
+                print '<td align="right" class="leftborder plannedworkload">';
+                if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+                else print '--:--';
+                print '</td>';
+
+                // Progress declared %
+                print '<td align="right">';
+                print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+                print '</td>';
+
+                // Time spent by everybody
+                print '<td align="right">';
+                // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
+                if ($lines[$i]->duration)
+                {
+                    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
+                    print convertSecondToTime($lines[$i]->duration,'allhourmin');
+                    print '</a>';
+                }
+                else print '--:--';
+                print "</td>\n";
+
+                // Time spent by user
+                print '<td align="right">';
+                $tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
+                if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+                else print '--:--';
+                print "</td>\n";
+
+                $disabledproject=1;$disabledtask=1;
+                //print "x".$lines[$i]->fk_project;
+                //var_dump($lines[$i]);
+                //var_dump($projectsrole[$lines[$i]->fk_project]);
+                // If at least one role for project
+                if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+                {
+                    $disabledproject=0;
+                    $disabledtask=0;
+                }
+                // If $restricteditformytask is on and I have no role on task, i disable edit
+                if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
+                {
+                    $disabledtask=1;
+                }
+
+                // Form to add new time
+                print '<td class="nowrap leftborder" align="center">';
+                $tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
+                print $tableCell;
+                print '</td>';
+
+                $cssonholiday='';
+                if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon'])   $cssonholiday.='onholidayallday ';
+                elseif (! $isavailable[$preselectedday]['morning'])   $cssonholiday.='onholidaymorning ';
+                elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+
+                global $daytoparse;
+                $tmparray = dol_getdate($daytoparse,true);	// detail of current day
+                $idw = $tmparray['wday'];
+
+                global $numstartworkingday, $numendworkingday;
+                $cssweekend='';
+                if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+                {
+                    $cssweekend='weekend';
+                }
+
+                // Duration
+                print '<td class="center duration'.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
+                $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
+                $totalforeachday[$preselectedday]+=$dayWorkLoad;
+
+                $alreadyspent='';
+                if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+
+                $idw = 0;
+
+                $tableCell='';
+                $tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+                $tableCell.='<span class="hideonsmartphone"> + </span>';
+                //$tableCell.='&nbsp;&nbsp;&nbsp;';
+                $tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
+                //$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';
+                print $tableCell;
+
+                $modeinput='hours';
+
+                print '<script type="text/javascript">';
+                print "jQuery(document).ready(function () {\n";
+                print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
+                print "})\n";
+                print '</script>';
+
+                print '</td>';
+
+                // Note
+                print '<td align="center">';
+                print '<textarea name="'.$lines[$i]->id.'note" rows="'.ROWS_2.'" id="'.$lines[$i]->id.'note"'.($disabledtask?' disabled="disabled"':'').'>';
+                print '</textarea>';
+                print '</td>';
+
+                // Warning
+                print '<td align="right">';
+                    if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+                    else if ($disabledtask)
+                    {
+                        $titleassigntask = $langs->trans("AssignTaskToMe");
+                        if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+
+                        print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+                    }
+                print '</td>';
+
+                print "</tr>\n";
+            }
+
+            $inc++;
+            $level++;
+            if ($lines[$i]->id > 0)
+            {
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
+                //var_dump($totalforeachday);
+                $ret = projectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
+                //var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
+                //var_dump($ret);
+                foreach($ret as $key => $val)
+                {
+                    $totalforeachday[$key]+=$val;
+                }
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
+                //var_dump($totalforeachday);
+            }
+            $level--;
+        }
+        else
+        {
+            //$level--;
+        }
+    }
+
+    return $totalforeachday;
 }
 
 
@@ -1164,263 +1164,263 @@ 
  */
 function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak=0)
 {
-	global $conf, $db, $user, $bc, $langs;
-	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
-
-	$numlines=count($lines);
-
-	$lastprojectid=0;
-	$workloadforid=array();
-	$totalforeachday=array();
-	$lineswithoutlevel0=array();
-
-	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0 ; $i < $numlines ; $i++)
-		{
-		   if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
-		}
-	}
-
-	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-
-	if (empty($oldprojectforbreak))
-	{
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
-	}
-
-	for ($i = 0 ; $i < $numlines ; $i++)
-	{
-		if ($parent == 0) $level = 0;
-
-		if ($lines[$i]->fk_task_parent == $parent)
-		{
-			// If we want all or we have a role on task, we show it
-			if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
-			{
-				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
-
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
-				{
-					continue;
-				}
-
-				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
-					$lastprojectid=$lines[$i]->fk_project;
-					$projectstatic->id = $lines[$i]->fk_project;
-				}
-
-				//var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
-				//var_dump($projectstatic->weekWorkLoadPerTask);
-				if (empty($workloadforid[$projectstatic->id]))
-				{
-					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-					$workloadforid[$projectstatic->id]=1;
-				}
-				//var_dump($projectstatic->weekWorkLoadPerTask);
-				//var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
-
-				$projectstatic->id=$lines[$i]->fk_project;
-				$projectstatic->ref=$lines[$i]->projectref;
-				$projectstatic->title=$lines[$i]->projectlabel;
-				$projectstatic->public=$lines[$i]->public;
-				$projectstatic->thirdparty_name=$lines[$i]->thirdparty_name;
-
-				$taskstatic->id=$lines[$i]->id;
-				$taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
-				$taskstatic->label=$lines[$i]->label;
-				$taskstatic->date_start=$lines[$i]->date_start;
-				$taskstatic->date_end=$lines[$i]->date_end;
-
-				$thirdpartystatic->id=$lines[$i]->thirdparty_id;
-				$thirdpartystatic->name=$lines[$i]->thirdparty_name;
-				$thirdpartystatic->email=$lines[$i]->thirdparty_email;
-
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
-					print '<tr class="oddeven trforbreak">'."\n";
-					print '<td colspan="13">';
-					print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
-					if ($projectstatic->title)
-					{
-						print ' - ';
-						print $projectstatic->title;
-					}
-					print '</td>';
-					print '</tr>';
-				}
-
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
-
-				print '<tr class="oddeven">'."\n";
-
-				// User
-				/*
+    global $conf, $db, $user, $bc, $langs;
+    global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
+
+    $numlines=count($lines);
+
+    $lastprojectid=0;
+    $workloadforid=array();
+    $totalforeachday=array();
+    $lineswithoutlevel0=array();
+
+    // Create a smaller array with sublevels only to be used later. This increase dramatically performances.
+    if ($parent == 0) // Always and only if at first level
+    {
+        for ($i = 0 ; $i < $numlines ; $i++)
+        {
+            if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[]=$lines[$i];
+        }
+    }
+
+    //dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
+
+    if (empty($oldprojectforbreak))
+    {
+        $oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
+    }
+
+    for ($i = 0 ; $i < $numlines ; $i++)
+    {
+        if ($parent == 0) $level = 0;
+
+        if ($lines[$i]->fk_task_parent == $parent)
+        {
+            // If we want all or we have a role on task, we show it
+            if (empty($mine) || ! empty($tasksrole[$lines[$i]->id]))
+            {
+                //dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
+
+                if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
+                {
+                    continue;
+                }
+
+                // Break on a new project
+                if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
+                {
+                    $lastprojectid=$lines[$i]->fk_project;
+                    $projectstatic->id = $lines[$i]->fk_project;
+                }
+
+                //var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+                //var_dump($projectstatic->weekWorkLoadPerTask);
+                if (empty($workloadforid[$projectstatic->id]))
+                {
+                    $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id);	// Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+                    $workloadforid[$projectstatic->id]=1;
+                }
+                //var_dump($projectstatic->weekWorkLoadPerTask);
+                //var_dump('--- '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
+
+                $projectstatic->id=$lines[$i]->fk_project;
+                $projectstatic->ref=$lines[$i]->projectref;
+                $projectstatic->title=$lines[$i]->projectlabel;
+                $projectstatic->public=$lines[$i]->public;
+                $projectstatic->thirdparty_name=$lines[$i]->thirdparty_name;
+
+                $taskstatic->id=$lines[$i]->id;
+                $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id);
+                $taskstatic->label=$lines[$i]->label;
+                $taskstatic->date_start=$lines[$i]->date_start;
+                $taskstatic->date_end=$lines[$i]->date_end;
+
+                $thirdpartystatic->id=$lines[$i]->thirdparty_id;
+                $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+                $thirdpartystatic->email=$lines[$i]->thirdparty_email;
+
+                if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
+                {
+                    print '<tr class="oddeven trforbreak">'."\n";
+                    print '<td colspan="13">';
+                    print $projectstatic->getNomUrl(1,'',0,'<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
+                    if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
+                    if ($projectstatic->title)
+                    {
+                        print ' - ';
+                        print $projectstatic->title;
+                    }
+                    print '</td>';
+                    print '</tr>';
+                }
+
+                if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+
+                print '<tr class="oddeven">'."\n";
+
+                // User
+                /*
 				print '<td class="nowrap">';
 				print $fuser->getNomUrl(1, 'withproject', 'time');
 				print '</td>';
 				*/
 
-				// Project
-				/*print '<td class="nowrap">';
+                // Project
+                /*print '<td class="nowrap">';
 				if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print "</td>";*/
 
-				// Thirdparty
-				/*print '<td class="tdoverflowmax100">';
+                // Thirdparty
+                /*print '<td class="tdoverflowmax100">';
 				if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
 				print '</td>';*/
 
-				// Ref
-				print '<td class="nowrap">';
-				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				print $taskstatic->getNomUrl(1, 'withproject', 'time');
-				// Label task
-				print '<br>';
-				for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
-				print $taskstatic->label;
-				//print "<br>";
-				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
-				print "</td>\n";
-
-				// Planned Workload
-				print '<td align="right" class="leftborder plannedworkload">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
-				else print '--:--';
-				print '</td>';
-
-				// Progress declared %
-				print '<td align="right">';
-				print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
-				print '</td>';
-
-				// Time spent by everybody
-				print '<td align="right">';
-				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
-				if ($lines[$i]->duration)
-				{
-					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
-					print convertSecondToTime($lines[$i]->duration,'allhourmin');
-					print '</a>';
-				}
-				else print '--:--';
-				print "</td>\n";
-
-				// Time spent by user
-				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
-				else print '--:--';
-				print "</td>\n";
-
-				$disabledproject=1;$disabledtask=1;
-				//print "x".$lines[$i]->fk_project;
-				//var_dump($lines[$i]);
-				//var_dump($projectsrole[$lines[$i]->fk_project]);
-				// If at least one role for project
-				if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
-					$disabledproject=0;
-					$disabledtask=0;
-				}
-				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
-					$disabledtask=1;
-				}
-
-				//var_dump($projectstatic->weekWorkLoadPerTask);
-
-				// Fields to show current time
-				$tableCell=''; $modeinput='hours';
-				for ($idw = 0; $idw < 7; $idw++)
-				{
-					$tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
-
-					$cssonholiday='';
-					if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
-					elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
-					elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
-
-					$tmparray=dol_getdate($tmpday);
-					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
-					$totalforeachday[$tmpday]+=$dayWorkLoad;
-
-					$alreadyspent='';
-					if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
-					$alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
-
-					global $numstartworkingday, $numendworkingday;
-					$cssweekend='';
-					if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
-					{
-						$cssweekend='weekend';
-					}
-
-					$tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
-					$placeholder='';
-					if ($alreadyspent)
-					{
-						$tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
-						//$placeholder=' placeholder="00:00"';
-					 	//$tableCell.='+';
-					}
-				  	$tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
-					$tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
-				   	$tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
-				   	$tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
-				   	$tableCell.='</td>';
-					print $tableCell;
-				}
-
-				// Warning
-				print '<td align="right">';
-   				if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
-   				else if ($disabledtask)
-   				{
-   					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
-
-   					print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
-   				}
-				print '</td>';
-
-				print "</tr>\n";
-			}
-
-			// Call to show task with a lower level (task under the current task)
-			$inc++;
-			$level++;
-			if ($lines[$i]->id > 0)
-			{
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
-				//var_dump($totalforeachday);
-				$ret = projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
-				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
-				//var_dump($ret);
-				foreach($ret as $key => $val)
-				{
-					$totalforeachday[$key]+=$val;
-				}
-				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
-				//var_dump($totalforeachday);
-			}
-			$level--;
-		}
-		else
-		{
-			//$level--;
-		}
-	}
-
-	return $totalforeachday;
+                // Ref
+                print '<td class="nowrap">';
+                print '<!-- Task id = '.$lines[$i]->id.' -->';
+                for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                print $taskstatic->getNomUrl(1, 'withproject', 'time');
+                // Label task
+                print '<br>';
+                for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                //print $taskstatic->getNomUrl(0, 'withproject', 'time');
+                print $taskstatic->label;
+                //print "<br>";
+                //for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
+                //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+                print "</td>\n";
+
+                // Planned Workload
+                print '<td align="right" class="leftborder plannedworkload">';
+                if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload,'allhourmin');
+                else print '--:--';
+                print '</td>';
+
+                // Progress declared %
+                print '<td align="right">';
+                print $formother->select_percent($lines[$i]->progress, $lines[$i]->id . 'progress');
+                print '</td>';
+
+                // Time spent by everybody
+                print '<td align="right">';
+                // $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
+                if ($lines[$i]->duration)
+                {
+                    print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
+                    print convertSecondToTime($lines[$i]->duration,'allhourmin');
+                    print '</a>';
+                }
+                else print '--:--';
+                print "</td>\n";
+
+                // Time spent by user
+                print '<td align="right">';
+                $tmptimespent=$taskstatic->getSummaryOfTimeSpent($fuser->id);
+                if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
+                else print '--:--';
+                print "</td>\n";
+
+                $disabledproject=1;$disabledtask=1;
+                //print "x".$lines[$i]->fk_project;
+                //var_dump($lines[$i]);
+                //var_dump($projectsrole[$lines[$i]->fk_project]);
+                // If at least one role for project
+                if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+                {
+                    $disabledproject=0;
+                    $disabledtask=0;
+                }
+                // If $restricteditformytask is on and I have no role on task, i disable edit
+                if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
+                {
+                    $disabledtask=1;
+                }
+
+                //var_dump($projectstatic->weekWorkLoadPerTask);
+
+                // Fields to show current time
+                $tableCell=''; $modeinput='hours';
+                for ($idw = 0; $idw < 7; $idw++)
+                {
+                    $tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd');
+
+                    $cssonholiday='';
+                    if (! $isavailable[$tmpday]['morning'] && ! $isavailable[$tmpday]['afternoon'])   $cssonholiday.='onholidayallday ';
+                    elseif (! $isavailable[$tmpday]['morning'])   $cssonholiday.='onholidaymorning ';
+                    elseif (! $isavailable[$tmpday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+
+                    $tmparray=dol_getdate($tmpday);
+                    $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
+                    $totalforeachday[$tmpday]+=$dayWorkLoad;
+
+                    $alreadyspent='';
+                    if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin');
+                    $alttitle=$langs->trans("AddHereTimeSpentForDay",$tmparray['day'],$tmparray['mon']);
+
+                    global $numstartworkingday, $numendworkingday;
+                    $cssweekend='';
+                    if (($idw + 1) < $numstartworkingday || ($idw + 1) > $numendworkingday)	// This is a day is not inside the setup of working days, so we use a week-end css.
+                    {
+                        $cssweekend='weekend';
+                    }
+
+                    $tableCell ='<td align="center" class="hide'.$idw.($cssonholiday?' '.$cssonholiday:'').($cssweekend?' '.$cssweekend:'').'">';
+                    $placeholder='';
+                    if ($alreadyspent)
+                    {
+                        $tableCell.='<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+                        //$placeholder=' placeholder="00:00"';
+                            //$tableCell.='+';
+                    }
+                        $tableCell.='<input type="text" alt="'.($disabledtask?'':$alttitle).'" title="'.($disabledtask?'':$alttitle).'" '.($disabledtask?'disabled':$placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+                    $tableCell.=' onkeypress="return regexEvent(this,event,\'timeChar\')"';
+                        $tableCell.=' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
+                        $tableCell.=' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
+                        $tableCell.='</td>';
+                    print $tableCell;
+                }
+
+                // Warning
+                print '<td align="right">';
+                    if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+                    else if ($disabledtask)
+                    {
+                        $titleassigntask = $langs->trans("AssignTaskToMe");
+                        if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+
+                        print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+                    }
+                print '</td>';
+
+                print "</tr>\n";
+            }
+
+            // Call to show task with a lower level (task under the current task)
+            $inc++;
+            $level++;
+            if ($lines[$i]->id > 0)
+            {
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
+                //var_dump($totalforeachday);
+                $ret = projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
+                //var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
+                //var_dump($ret);
+                foreach($ret as $key => $val)
+                {
+                    $totalforeachday[$key]+=$val;
+                }
+                //var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
+                //var_dump($totalforeachday);
+            }
+            $level--;
+        }
+        else
+        {
+            //$level--;
+        }
+    }
+
+    return $totalforeachday;
 }
 
 
@@ -1435,29 +1435,29 @@ 
  */
 function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 {
-	//print 'Search in line with parent id = '.$parent.'<br>';
-	$numlines=count($lines);
-	for ($i = 0 ; $i < $numlines ; $i++)
-	{
-		// Process line $lines[$i]
-		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
-		{
-			// If task is legitimate to show, no more need to search deeper
-			if (isset($taskrole[$lines[$i]->id]))
-			{
-				//print 'Found a legitimate task id='.$lines[$i]->id.'<br>';
-				$inc++;
-				return $inc;
-			}
-
-			searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
-			//print 'Found inc='.$inc.'<br>';
-
-			if ($inc > 0) return $inc;
-		}
-	}
-
-	return $inc;
+    //print 'Search in line with parent id = '.$parent.'<br>';
+    $numlines=count($lines);
+    for ($i = 0 ; $i < $numlines ; $i++)
+    {
+        // Process line $lines[$i]
+        if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
+        {
+            // If task is legitimate to show, no more need to search deeper
+            if (isset($taskrole[$lines[$i]->id]))
+            {
+                //print 'Found a legitimate task id='.$lines[$i]->id.'<br>';
+                $inc++;
+                return $inc;
+            }
+
+            searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
+            //print 'Found inc='.$inc.'<br>';
+
+            if ($inc > 0) return $inc;
+        }
+    }
+
+    return $inc;
 }
 
 /**
@@ -1475,235 +1475,235 @@ 
  */
 function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=0, $statut=-1, $listofoppstatus=array(),$hiddenfields=array())
 {
-	global $langs,$conf,$user,$bc;
-
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-	$projectstatic=new Project($db);
-	$thirdpartystatic=new Societe($db);
-
-	$sortfield='';
-	$sortorder='';
-	$project_year_filter=0;
-
-	$title=$langs->trans("Projects");
-	if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
-
-	$arrayidtypeofcontact=array();
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder" width="100%">';
-
-	$sql= " FROM ".MAIN_DB_PREFIX."projet as p";
-	if ($mytasks)
-	{
-		$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
-		$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	else
-	{
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
-	}
-	$sql.= " WHERE p.entity IN (".getEntity('project').")";
-	$sql.= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-	if ($mytasks)
-	{
-		$sql.= " AND p.rowid = t.fk_projet";
-		$sql.= " AND ec.element_id = t.rowid";
-		$sql.= " AND ec.fk_socpeople = ".$user->id;
-		$sql.= " AND ec.fk_c_type_contact = ctc.rowid";   // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
-		$sql.= " AND ctc.element = 'project_task'";
-	}
-	if ($statut >= 0)
-	{
-		$sql.= " AND p.fk_statut = ".$statut;
-	}
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
-	{
-		$project_year_filter = GETPOST("project_year_filter");
-		//Check if empty or invalid year. Wildcard ignores the sql check
-		if ($project_year_filter != "*")
-		{
-			if (empty($project_year_filter) || !ctype_digit($project_year_filter))
-			{
-				$project_year_filter = date("Y");
-			}
-			$sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
-			$sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
-		}
-	}
-
-	// Get id of project we must show tasks
-	$arrayidofprojects=array();
-	$sql1 = "SELECT p.rowid as projectid";
-	$sql1.= $sql;
-	$resql = $db->query($sql1);
-	if ($resql)
-	{
-		$i=0;
-		$num = $db->num_rows($resql);
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-			$arrayidofprojects[$objp->projectid]=$objp->projectid;
-			$i++;
-		}
-	}
-	else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
-
-	// Get list of project with calculation on tasks
-	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
-	$sql2.= " p.dateo, p.datee,";
-	$sql2.= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
-	$sql2.= " FROM ".MAIN_DB_PREFIX."projet as p";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
-	$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
-	$sql2.= " WHERE p.rowid IN (".join(',',$arrayidofprojects).")";
-	$sql2.= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
-	$sql2.= " ORDER BY p.title, p.ref";
-
-	$resql = $db->query($sql2);
-	if ($resql)
-	{
-	   $total_task = 0;
-		$total_opp_amount = 0;
-		$ponderated_opp_amount = 0;
-
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
-			print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
-			print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
-		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
-			print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
-			if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
-		}
-		print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
-		print "</tr>\n";
-
-		$total_plannedworkload=0;
-		$total_declaredprogressworkload=0;
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			$projectstatic->id = $objp->projectid;
-			$projectstatic->user_author_id = $objp->fk_user_creat;
-			$projectstatic->public = $objp->public;
-
-			// Check is user has read permission on project
-			$userAccess = $projectstatic->restrictedProjectArea($user);
-			if ($userAccess >= 0)
-			{
-				$projectstatic->ref=$objp->ref;
-				$projectstatic->statut = $objp->status;
-				$projectstatic->title = $objp->title;
-				$projectstatic->datee = $db->jdate($objp->datee);
-				$projectstatic->dateo = $db->jdate($objp->dateo);
-
-
-				print '<tr class="oddeven">';
-				print '<td>';
-				print $projectstatic->getNomUrl(1);
-				if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
-				print '</td>';
-				print '<td>';
-				if ($objp->fk_soc > 0)
-				{
-					$thirdpartystatic->id=$objp->fk_soc;
-					$thirdpartystatic->ref=$objp->socname;
-					$thirdpartystatic->name=$objp->socname;
-					print $thirdpartystatic->getNomUrl(1);
-				}
-				print '</td>';
-				if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-				{
-					print '<td align="right">';
-					if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
-					print '</td>';
-					print '<td align="right">';
-					$code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
-					if ($code) print $langs->trans("OppStatus".$code);
-					print '</td>';
-				}
-				if (empty($conf->global->PROJECT_HIDE_TASKS))
-				{
-					print '<td align="right">'.$objp->nb.'</td>';
-
-					$plannedworkload=$objp->planned_workload;
-					$total_plannedworkload+=$plannedworkload;
-					if (! in_array('plannedworkload', $hiddenfields))
-					{
-						print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
-					}
-					if (! in_array('declaredprogress', $hiddenfields))
-					{
-						$declaredprogressworkload=$objp->declared_progess_workload;
-						$total_declaredprogressworkload+=$declaredprogressworkload;
-						print '<td align="right">';
-						//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
-						print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
-						print '</td>';
-					}
-				}
-
-				print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
-				print "</tr>\n";
-
-				$total_task = $total_task + $objp->nb;
-				$total_opp_amount = $total_opp_amount + $objp->opp_amount;
-				$ponderated_opp_amount = $ponderated_opp_amount + price2num($listofoppstatus[$objp->opp_status] * $objp->opp_amount / 100);
-			}
-
-			$i++;
-		}
-
-		print '<tr class="liste_total">';
-		print '<td colspan="2">'.$langs->trans("Total")."</td>";
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
-			print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
-			print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
-		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
-			print '<td class="liste_total" align="right">'.$total_task.'</td>';
-			if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
-			if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
-		}
-		print '<td class="liste_total"></td>';
-		print '</tr>';
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-
-	print "</table>";
-	print '</div>';
-
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
-	{
-		//Add the year filter input
-		print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<table width="100%">';
-		print '<tr>';
-		print '<td>'.$langs->trans("Year").'</td>';
-		print '<td style="text-align:right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
-		print "</tr>\n";
-		print '</table></form>';
-	}
+    global $langs,$conf,$user,$bc;
+
+    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+    $projectstatic=new Project($db);
+    $thirdpartystatic=new Societe($db);
+
+    $sortfield='';
+    $sortorder='';
+    $project_year_filter=0;
+
+    $title=$langs->trans("Projects");
+    if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]);
+
+    $arrayidtypeofcontact=array();
+
+    print '<div class="div-table-responsive-no-min">';
+    print '<table class="noborder" width="100%">';
+
+    $sql= " FROM ".MAIN_DB_PREFIX."projet as p";
+    if ($mytasks)
+    {
+        $sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+        $sql.= ", ".MAIN_DB_PREFIX."element_contact as ec";
+        $sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
+    }
+    else
+    {
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+    }
+    $sql.= " WHERE p.entity IN (".getEntity('project').")";
+    $sql.= " AND p.rowid IN (".$projectsListId.")";
+    if ($socid) $sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+    if ($mytasks)
+    {
+        $sql.= " AND p.rowid = t.fk_projet";
+        $sql.= " AND ec.element_id = t.rowid";
+        $sql.= " AND ec.fk_socpeople = ".$user->id;
+        $sql.= " AND ec.fk_c_type_contact = ctc.rowid";   // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
+        $sql.= " AND ctc.element = 'project_task'";
+    }
+    if ($statut >= 0)
+    {
+        $sql.= " AND p.fk_statut = ".$statut;
+    }
+    if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
+    {
+        $project_year_filter = GETPOST("project_year_filter");
+        //Check if empty or invalid year. Wildcard ignores the sql check
+        if ($project_year_filter != "*")
+        {
+            if (empty($project_year_filter) || !ctype_digit($project_year_filter))
+            {
+                $project_year_filter = date("Y");
+            }
+            $sql.= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter,12,false)).")";
+            $sql.= " AND (p.datee IS NULL OR p.datee >= ".$db->idate(dol_get_first_day($project_year_filter,1,false)).")";
+        }
+    }
+
+    // Get id of project we must show tasks
+    $arrayidofprojects=array();
+    $sql1 = "SELECT p.rowid as projectid";
+    $sql1.= $sql;
+    $resql = $db->query($sql1);
+    if ($resql)
+    {
+        $i=0;
+        $num = $db->num_rows($resql);
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($resql);
+            $arrayidofprojects[$objp->projectid]=$objp->projectid;
+            $i++;
+        }
+    }
+    else dol_print_error($db);
+    if (empty($arrayidofprojects)) $arrayidofprojects[0]=-1;
+
+    // Get list of project with calculation on tasks
+    $sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount,";
+    $sql2.= " p.dateo, p.datee,";
+    $sql2.= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
+    $sql2.= " FROM ".MAIN_DB_PREFIX."projet as p";
+    $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+    $sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
+    $sql2.= " WHERE p.rowid IN (".join(',',$arrayidofprojects).")";
+    $sql2.= " GROUP BY p.rowid, p.ref, p.title, p.fk_soc, s.nom, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_amount, p.dateo, p.datee";
+    $sql2.= " ORDER BY p.title, p.ref";
+
+    $resql = $db->query($sql2);
+    if ($resql)
+    {
+        $total_task = 0;
+        $total_opp_amount = 0;
+        $ponderated_opp_amount = 0;
+
+        $num = $db->num_rows($resql);
+        $i = 0;
+
+        print '<tr class="liste_titre">';
+        print_liste_field_titre($title.' <span class="badge">'.$num.'</span>',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+        print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+        if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+        {
+            print_liste_field_titre("OpportunityAmount","","","","",'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre("OpportunityStatus","","","","",'align="right"',$sortfield,$sortorder);
+        }
+        if (empty($conf->global->PROJECT_HIDE_TASKS))
+        {
+            print_liste_field_titre("Tasks","","","","",'align="right"',$sortfield,$sortorder);
+            if (! in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload","","","","",'align="right"',$sortfield,$sortorder);
+            if (! in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared","","","","",'align="right"',$sortfield,$sortorder);
+        }
+        print_liste_field_titre("Status","","","","",'align="right"',$sortfield,$sortorder);
+        print "</tr>\n";
+
+        $total_plannedworkload=0;
+        $total_declaredprogressworkload=0;
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($resql);
+
+            $projectstatic->id = $objp->projectid;
+            $projectstatic->user_author_id = $objp->fk_user_creat;
+            $projectstatic->public = $objp->public;
+
+            // Check is user has read permission on project
+            $userAccess = $projectstatic->restrictedProjectArea($user);
+            if ($userAccess >= 0)
+            {
+                $projectstatic->ref=$objp->ref;
+                $projectstatic->statut = $objp->status;
+                $projectstatic->title = $objp->title;
+                $projectstatic->datee = $db->jdate($objp->datee);
+                $projectstatic->dateo = $db->jdate($objp->dateo);
+
+
+                print '<tr class="oddeven">';
+                print '<td>';
+                print $projectstatic->getNomUrl(1);
+                if (! in_array('projectlabel', $hiddenfields)) print '<br>'.dol_trunc($objp->title,24);
+                print '</td>';
+                print '<td>';
+                if ($objp->fk_soc > 0)
+                {
+                    $thirdpartystatic->id=$objp->fk_soc;
+                    $thirdpartystatic->ref=$objp->socname;
+                    $thirdpartystatic->name=$objp->socname;
+                    print $thirdpartystatic->getNomUrl(1);
+                }
+                print '</td>';
+                if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+                {
+                    print '<td align="right">';
+                    if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
+                    print '</td>';
+                    print '<td align="right">';
+                    $code = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
+                    if ($code) print $langs->trans("OppStatus".$code);
+                    print '</td>';
+                }
+                if (empty($conf->global->PROJECT_HIDE_TASKS))
+                {
+                    print '<td align="right">'.$objp->nb.'</td>';
+
+                    $plannedworkload=$objp->planned_workload;
+                    $total_plannedworkload+=$plannedworkload;
+                    if (! in_array('plannedworkload', $hiddenfields))
+                    {
+                        print '<td align="right">'.($plannedworkload?convertSecondToTime($plannedworkload):'').'</td>';
+                    }
+                    if (! in_array('declaredprogress', $hiddenfields))
+                    {
+                        $declaredprogressworkload=$objp->declared_progess_workload;
+                        $total_declaredprogressworkload+=$declaredprogressworkload;
+                        print '<td align="right">';
+                        //print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
+                        print ($plannedworkload?round(100*$declaredprogressworkload/$plannedworkload,0).'%':'');
+                        print '</td>';
+                    }
+                }
+
+                print '<td align="right">'.$projectstatic->getLibStatut(3).'</td>';
+                print "</tr>\n";
+
+                $total_task = $total_task + $objp->nb;
+                $total_opp_amount = $total_opp_amount + $objp->opp_amount;
+                $ponderated_opp_amount = $ponderated_opp_amount + price2num($listofoppstatus[$objp->opp_status] * $objp->opp_amount / 100);
+            }
+
+            $i++;
+        }
+
+        print '<tr class="liste_total">';
+        print '<td colspan="2">'.$langs->trans("Total")."</td>";
+        if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+        {
+            print '<td class="liste_total" align="right">'.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).'</td>';
+            print '<td class="liste_total" align="right">'.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).'</td>';
+        }
+        if (empty($conf->global->PROJECT_HIDE_TASKS))
+        {
+            print '<td class="liste_total" align="right">'.$total_task.'</td>';
+            if (! in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total" align="right">'.($total_plannedworkload?convertSecondToTime($total_plannedworkload):'').'</td>';
+            if (! in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total" align="right">'.($total_plannedworkload?round(100*$total_declaredprogressworkload/$total_plannedworkload,0).'%':'').'</td>';
+        }
+        print '<td class="liste_total"></td>';
+        print '</tr>';
+
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
+
+    print "</table>";
+    print '</div>';
+
+    if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
+    {
+        //Add the year filter input
+        print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
+        print '<table width="100%">';
+        print '<tr>';
+        print '<td>'.$langs->trans("Year").'</td>';
+        print '<td style="text-align:right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
+        print "</tr>\n";
+        print '</table></form>';
+    }
 }

dolibarr/htdocs/core/lib/json.lib.php

Indentation +263 added lines, -263 removed lines

@@ -25,16 +25,16 @@ 
 
 if (! function_exists('json_encode'))
 {
-	/**
-	 * Implement json_encode for PHP that does not have module enabled.
-	 *
-	 * @param	mixed	$elements		PHP Object to json encode
-	 * @return 	string					Json encoded string
-	 */
-	function json_encode($elements)
-	{
-		return dol_json_encode($elements);
-	}
+    /**
+     * Implement json_encode for PHP that does not have module enabled.
+     *
+     * @param	mixed	$elements		PHP Object to json encode
+     * @return 	string					Json encoded string
+     */
+    function json_encode($elements)
+    {
+        return dol_json_encode($elements);
+    }
 }
 
 /**
@@ -47,56 +47,56 @@ 
  */
 function dol_json_encode($elements)
 {
-	dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
-
-	$num=0;
-	if (is_object($elements))	// Count number of properties for an object
-	{
-		foreach($elements as $key => $value) $num++;
-	}
-	else
-	{
-	    $num=count($elements);
-	}
-	//var_dump($num);
-
-	// determine type
-	if (is_numeric(key($elements)) && key($elements) == 0)
-	{
-		// indexed (list)
-		$keysofelements=array_keys($elements);	// Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
-		$output = '[';
-		for ($i = 0, $last = ($num - 1); $i < $num; $i++)
-		{
-			if (! isset($elements[$keysofelements[$i]])) continue;
-			if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output.= json_encode($elements[$keysofelements[$i]]);
-			else $output .= _val($elements[$keysofelements[$i]]);
-			if ($i !== $last) $output.= ',';
-		}
-		$output.= ']';
-	}
-	else
-	{
-		// associative (object)
-		$output = '{';
-		$last = $num - 1;
-		$i = 0;
-		$tmpelements=array();
-		if (is_array($elements)) $tmpelements=$elements;
-		if (is_object($elements)) $tmpelements=get_object_vars($elements);
-		foreach($tmpelements as $key => $value)
-		{
-			$output .= '"'.$key.'":';
-			if (is_array($value)) $output.= json_encode($value);
-			else $output .= _val($value);
-			if ($i !== $last) $output.= ',';
-			++$i;
-		}
-		$output.= '}';
-	}
-
-	// return
-	return $output;
+    dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
+
+    $num=0;
+    if (is_object($elements))	// Count number of properties for an object
+    {
+        foreach($elements as $key => $value) $num++;
+    }
+    else
+    {
+        $num=count($elements);
+    }
+    //var_dump($num);
+
+    // determine type
+    if (is_numeric(key($elements)) && key($elements) == 0)
+    {
+        // indexed (list)
+        $keysofelements=array_keys($elements);	// Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
+        $output = '[';
+        for ($i = 0, $last = ($num - 1); $i < $num; $i++)
+        {
+            if (! isset($elements[$keysofelements[$i]])) continue;
+            if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output.= json_encode($elements[$keysofelements[$i]]);
+            else $output .= _val($elements[$keysofelements[$i]]);
+            if ($i !== $last) $output.= ',';
+        }
+        $output.= ']';
+    }
+    else
+    {
+        // associative (object)
+        $output = '{';
+        $last = $num - 1;
+        $i = 0;
+        $tmpelements=array();
+        if (is_array($elements)) $tmpelements=$elements;
+        if (is_object($elements)) $tmpelements=get_object_vars($elements);
+        foreach($tmpelements as $key => $value)
+        {
+            $output .= '"'.$key.'":';
+            if (is_array($value)) $output.= json_encode($value);
+            else $output .= _val($value);
+            if ($i !== $last) $output.= ',';
+            ++$i;
+        }
+        $output.= '}';
+    }
+
+    // return
+    return $output;
 }
 
 /**
@@ -107,8 +107,8 @@ 
  */
 function _val($val)
 {
-	if (is_string($val))
-	{
+    if (is_string($val))
+    {
         // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
         $ascii = '';
         $strlen_var = strlen($val);
@@ -117,107 +117,107 @@ 
 	     * Iterate over every character in the string,
 	     * escaping with a slash or encoding to UTF-8 where necessary
 	     */
-	    for ($c = 0; $c < $strlen_var; ++$c) {
-
-	        $ord_var_c = ord($val{$c});
-
-	        switch (true) {
-	            case $ord_var_c == 0x08:
-	                $ascii .= '\b';
-	                break;
-	            case $ord_var_c == 0x09:
-	                $ascii .= '\t';
-	                break;
-	            case $ord_var_c == 0x0A:
-	                $ascii .= '\n';
-	                break;
-	            case $ord_var_c == 0x0C:
-	                $ascii .= '\f';
-	                break;
-	            case $ord_var_c == 0x0D:
-	                $ascii .= '\r';
-	                break;
-
-	            case $ord_var_c == 0x22:
-	            case $ord_var_c == 0x2F:
-	            case $ord_var_c == 0x5C:
-	                // double quote, slash, slosh
-	                $ascii .= '\\'.$val{$c};
-	                break;
-
-	            case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-	                // characters U-00000000 - U-0000007F (same as ASCII)
-	                $ascii .= $val{$c};
-	                break;
-
-	            case (($ord_var_c & 0xE0) == 0xC0):
-	                // characters U-00000080 - U-000007FF, mask 110XXXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}));
-	                $c += 1;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xF0) == 0xE0):
-	                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}));
-	                $c += 2;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xF8) == 0xF0):
-	                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}));
-	                $c += 3;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xFC) == 0xF8):
-	                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}));
-	                $c += 4;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-
-	            case (($ord_var_c & 0xFE) == 0xFC):
-	                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-	                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-	                $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}), ord($val{$c + 5}));
-	                $c += 5;
-	                $utf16 = utf82utf16($char);
-	                $ascii .= sprintf('\u%04s', bin2hex($utf16));
-	                break;
-	        }
-	    }
-
-	    return '"'.$ascii.'"';
-	}
-	elseif (is_int($val)) return sprintf('%d', $val);
-	elseif (is_float($val)) return sprintf('%F', $val);
-	elseif (is_bool($val)) return ($val ? 'true' : 'false');
-	else  return 'null';
+        for ($c = 0; $c < $strlen_var; ++$c) {
+
+            $ord_var_c = ord($val{$c});
+
+            switch (true) {
+                case $ord_var_c == 0x08:
+                    $ascii .= '\b';
+                    break;
+                case $ord_var_c == 0x09:
+                    $ascii .= '\t';
+                    break;
+                case $ord_var_c == 0x0A:
+                    $ascii .= '\n';
+                    break;
+                case $ord_var_c == 0x0C:
+                    $ascii .= '\f';
+                    break;
+                case $ord_var_c == 0x0D:
+                    $ascii .= '\r';
+                    break;
+
+                case $ord_var_c == 0x22:
+                case $ord_var_c == 0x2F:
+                case $ord_var_c == 0x5C:
+                    // double quote, slash, slosh
+                    $ascii .= '\\'.$val{$c};
+                    break;
+
+                case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                    // characters U-00000000 - U-0000007F (same as ASCII)
+                    $ascii .= $val{$c};
+                    break;
+
+                case (($ord_var_c & 0xE0) == 0xC0):
+                    // characters U-00000080 - U-000007FF, mask 110XXXXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}));
+                    $c += 1;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xF0) == 0xE0):
+                    // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}));
+                    $c += 2;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xF8) == 0xF0):
+                    // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}));
+                    $c += 3;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xFC) == 0xF8):
+                    // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}));
+                    $c += 4;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+
+                case (($ord_var_c & 0xFE) == 0xFC):
+                    // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                    $char = pack('C*', $ord_var_c, ord($val{$c + 1}), ord($val{$c + 2}), ord($val{$c + 3}), ord($val{$c + 4}), ord($val{$c + 5}));
+                    $c += 5;
+                    $utf16 = utf82utf16($char);
+                    $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                    break;
+            }
+        }
+
+        return '"'.$ascii.'"';
+    }
+    elseif (is_int($val)) return sprintf('%d', $val);
+    elseif (is_float($val)) return sprintf('%F', $val);
+    elseif (is_bool($val)) return ($val ? 'true' : 'false');
+    else  return 'null';
 }
 
 if (! function_exists('json_decode'))
 {
-	/**
-	 * Implement json_decode for PHP that does not support it
-	 *
-	 * @param	string	$json		Json encoded to PHP Object or Array
-	 * @param	bool	$assoc		False return an object, true return an array
-	 * @return 	mixed				Object or Array
-	 */
-	function json_decode($json, $assoc=false)
-	{
-		return dol_json_decode($json, $assoc);
-	}
+    /**
+     * Implement json_decode for PHP that does not support it
+     *
+     * @param	string	$json		Json encoded to PHP Object or Array
+     * @param	bool	$assoc		False return an object, true return an array
+     * @return 	mixed				Object or Array
+     */
+    function json_decode($json, $assoc=false)
+    {
+        return dol_json_decode($json, $assoc);
+    }
 }
 
 /**
@@ -231,52 +231,52 @@ 
  */
 function dol_json_decode($json, $assoc=false)
 {
-	dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
+    dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
 
-	$comment = false;
+    $comment = false;
 
     $out='';
-	$strLength = strlen($json);    // Must stay strlen and not dol_strlen because we want technical length, not visible length
-	for ($i=0; $i<$strLength; $i++)
-	{
-		if (! $comment)
-		{
-			if (($json[$i] == '{') || ($json[$i] == '[')) $out.= 'array(';
-			else if (($json[$i] == '}') || ($json[$i] == ']')) $out.= ')';
-			else if ($json[$i] == ':') $out.= ' => ';
-			else $out.=$json[$i];
-		}
-		else $out.= $json[$i];
-		if ($json[$i] == '"' && $json[($i-1)]!="\\") $comment = !$comment;
-	}
-
-	$out=_unval($out);
-
-	// Return an array
-	if ($out != '') eval('$array = '.$out.';');
-	else $array=array();
-
-	// Return an object
-	if (! $assoc)
-	{
-		if (! empty($array))
-		{
-			$object = false;
-			if (count($array)>0) {
-				$object = (object) array();
-			}
-			foreach ($array as $key => $value)
-			{
-				if ($key) $object->{$key} = $value;
-			}
-
-			return $object;
-		}
-
-		return false;
-	}
-
-	return $array;
+    $strLength = strlen($json);    // Must stay strlen and not dol_strlen because we want technical length, not visible length
+    for ($i=0; $i<$strLength; $i++)
+    {
+        if (! $comment)
+        {
+            if (($json[$i] == '{') || ($json[$i] == '[')) $out.= 'array(';
+            else if (($json[$i] == '}') || ($json[$i] == ']')) $out.= ')';
+            else if ($json[$i] == ':') $out.= ' => ';
+            else $out.=$json[$i];
+        }
+        else $out.= $json[$i];
+        if ($json[$i] == '"' && $json[($i-1)]!="\\") $comment = !$comment;
+    }
+
+    $out=_unval($out);
+
+    // Return an array
+    if ($out != '') eval('$array = '.$out.';');
+    else $array=array();
+
+    // Return an object
+    if (! $assoc)
+    {
+        if (! empty($array))
+        {
+            $object = false;
+            if (count($array)>0) {
+                $object = (object) array();
+            }
+            foreach ($array as $key => $value)
+            {
+                if ($key) $object->{$key} = $value;
+            }
+
+            return $object;
+        }
+
+        return false;
+    }
+
+    return $array;
 }
 
 /**
@@ -287,14 +287,14 @@ 
  */
 function _unval($val)
 {
-	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
-	{
-	    // single, escaped unicode character
-	    $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
-	    $utf8  = utf162utf8($utf16);
-	    $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i',$utf8,$val);
-	}
-	return $val;
+    while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
+    {
+        // single, escaped unicode character
+        $utf16 = chr(hexdec($reg[1])) . chr(hexdec($reg[2]));
+        $utf8  = utf162utf8($utf16);
+        $val=preg_replace('/\\\u'.$reg[1].$reg[2].'/i',$utf8,$val);
+    }
+    return $val;
 }
 
 /**
@@ -309,35 +309,35 @@ 
  */
 function utf162utf8($utf16)
 {
-	// oh please oh please oh please oh please oh please
-	if(function_exists('mb_convert_encoding')) {
-	    return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-	}
-
-	$bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-	switch(true) {
-    	case ((0x7F & $bytes) == $bytes):
-    	// this case should never be reached, because we are in ASCII range
-    	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr($bytes);
-
-    	case (0x07FF & $bytes) == $bytes:
-    	// return a 2-byte UTF-8 character
-    	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xC0 | (($bytes >> 6) & 0x1F))
-    	. chr(0x80 | ($bytes & 0x3F));
-
-    	case (0xFFFF & $bytes) == $bytes:
-    	// return a 3-byte UTF-8 character
-    	// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-    	return chr(0xE0 | (($bytes >> 12) & 0x0F))
-    	. chr(0x80 | (($bytes >> 6) & 0x3F))
-    	. chr(0x80 | ($bytes & 0x3F));
-	}
-
-	// ignoring UTF-32 for now, sorry
-	return '';
+    // oh please oh please oh please oh please oh please
+    if(function_exists('mb_convert_encoding')) {
+        return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+    }
+
+    $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+
+    switch(true) {
+        case ((0x7F & $bytes) == $bytes):
+        // this case should never be reached, because we are in ASCII range
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr($bytes);
+
+        case (0x07FF & $bytes) == $bytes:
+        // return a 2-byte UTF-8 character
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr(0xC0 | (($bytes >> 6) & 0x1F))
+        . chr(0x80 | ($bytes & 0x3F));
+
+        case (0xFFFF & $bytes) == $bytes:
+        // return a 3-byte UTF-8 character
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr(0xE0 | (($bytes >> 12) & 0x0F))
+        . chr(0x80 | (($bytes >> 6) & 0x3F))
+        . chr(0x80 | ($bytes & 0x3F));
+    }
+
+    // ignoring UTF-32 for now, sorry
+    return '';
 }
 
 /**
@@ -352,28 +352,28 @@ 
  */
 function utf82utf16($utf8)
 {
-	// oh please oh please oh please oh please oh please
-	if(function_exists('mb_convert_encoding')) {
-	return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-	}
-
-	switch(strlen($utf8)) {
-		case 1:
-	        	// this case should never be reached, because we are in ASCII range
-		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return $utf8;
-
-		case 2:
-		// return a UTF-16 character from a 2-byte UTF-8 char
-		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
-
-		case 3:
-		// return a UTF-16 character from a 3-byte UTF-8 char
-		// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
-	}
-
-	// ignoring UTF-32 for now, sorry
-	return '';
+    // oh please oh please oh please oh please oh please
+    if(function_exists('mb_convert_encoding')) {
+    return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+    }
+
+    switch(strlen($utf8)) {
+        case 1:
+                // this case should never be reached, because we are in ASCII range
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return $utf8;
+
+        case 2:
+        // return a UTF-16 character from a 2-byte UTF-8 char
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
+
+        case 3:
+        // return a UTF-16 character from a 3-byte UTF-8 char
+        // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+        return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
+    }
+
+    // ignoring UTF-32 for now, sorry
+    return '';
 }

dolibarr/htdocs/core/lib/doc.lib.php

Indentation +113 added lines, -113 removed lines

@@ -40,129 +40,129 @@
  */
 function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
-	global $db, $conf, $langs;
+    global $db, $conf, $langs;
 
-	$idprod=$line->fk_product;
-	$label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:''));
-	$desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:''));
-	$ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
-	$note=(! empty($line->note)?$line->note:'');
+    $idprod=$line->fk_product;
+    $label=(! empty($line->label)?$line->label:(! empty($line->libelle)?$line->libelle:''));
+    $desc=(! empty($line->desc)?$line->desc:(! empty($line->description)?$line->description:''));
+    $ref_supplier=(! empty($line->ref_supplier)?$line->ref_supplier:(! empty($line->ref_fourn)?$line->ref_fourn:''));    // TODO Not yet saved for supplier invoices, only supplier orders
+    $note=(! empty($line->note)?$line->note:'');
 
-	if ($issupplierline) $prodser = new ProductFournisseur($db);
-	else $prodser = new Product($db);
+    if ($issupplierline) $prodser = new ProductFournisseur($db);
+    else $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))
-		{
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
-			if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
-		}
-	}
+    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))
+        {
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label=$prodser->multilangs[$outputlangs->defaultlang]["label"];
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc=$prodser->multilangs[$outputlangs->defaultlang]["description"];
+            if (! empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note=$prodser->multilangs[$outputlangs->defaultlang]["note"];
+        }
+    }
 
-	// Description short of product line
-	$libelleproduitservice=$label;
+    // Description short of product line
+    $libelleproduitservice=$label;
 
-	// Description long of product line
-	if ($desc && ($desc != $label))
-	{
-		if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($line->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)' && $line->fk_remise_except)
-		{
-		    $discount=new DiscountAbsolute($db);
-		    $discount->fetch($line->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)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($line->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
-		{
-			$discount=new DiscountAbsolute($db);
-			$discount->fetch($line->fk_remise_except);
-			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
-		}
-		else
-		{
-			if ($idprod)
-			{
-				if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
-			}
-			else
-			{
-				$libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
-			}
-		}
-	}
+    // Description long of product line
+    if ($desc && ($desc != $label))
+    {
+        if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($line->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)' && $line->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($line->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)) $libelleproduitservice.=' ('.dol_print_date($discount->datec,'day','',$outputlangs).')';
+        }
+        elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($line->fk_remise_except);
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived",$discount->ref_facture_source);
+        }
+        elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
+        {
+            $discount=new DiscountAbsolute($db);
+            $discount->fetch($line->fk_remise_except);
+            $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid",$discount->ref_invoice_supplier_source);
+        }
+        else
+        {
+            if ($idprod)
+            {
+                if (empty($hidedesc)) $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+            }
+            else
+            {
+                $libelleproduitservice=dol_concatdesc($libelleproduitservice, $desc);
+            }
+        }
+    }
 
-	// If line linked to a product
-	if ($idprod)
-	{
-		// On ajoute la ref
-		if ($prodser->ref)
-		{
-			$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 line linked to a product
+    if ($idprod)
+    {
+        // On ajoute la ref
+        if ($prodser->ref)
+        {
+            $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) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')';   // Show local ref and supplier ref
-				else $ref_prodserv = $prodser->ref; // Show local ref only
+            if (empty($hideref))
+            {
+                if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')';   // Show local ref and supplier ref
+                else $ref_prodserv = $prodser->ref; // Show local ref only
 
-				$ref_prodserv .= " - ";
-			}
+                $ref_prodserv .= " - ";
+            }
 
-			$libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
-		}
-	}
+            $libelleproduitservice=$prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+        }
+    }
 
-	if (! empty($line->date_start) || ! empty($line->date_end))
-	{
-		$format='day';
-		// Show duration if exists
-		if ($line->date_start && $line->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')';
-		}
-		if ($line->date_start && ! $line->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')';
-		}
-		if (! $line->date_start && $line->date_end)
-		{
-			$period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')';
-		}
-		//print '>'.$outputlangs->charset_output.','.$period;
-		$libelleproduitservice=dol_concatdesc($libelleproduitservice, $period);
-		//print $libelleproduitservice;
-	}
+    if (! empty($line->date_start) || ! empty($line->date_end))
+    {
+        $format='day';
+        // Show duration if exists
+        if ($line->date_start && $line->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFromTo',dol_print_date($line->date_start, $format, false, $outputlangs),dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+        }
+        if ($line->date_start && ! $line->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateFrom',dol_print_date($line->date_start, $format, false, $outputlangs)).')';
+        }
+        if (! $line->date_start && $line->date_end)
+        {
+            $period='('.$outputlangs->transnoentitiesnoconv('DateUntil',dol_print_date($line->date_end, $format, false, $outputlangs)).')';
+        }
+        //print '>'.$outputlangs->charset_output.','.$period;
+        $libelleproduitservice=dol_concatdesc($libelleproduitservice, $period);
+        //print $libelleproduitservice;
+    }
 
-	return $libelleproduitservice;
+    return $libelleproduitservice;
 }