alxarafe / alixar

dolibarr/htdocs/margin/lib/margins.lib.php

Indentation +4 added lines, -4 removed lines

@@ -73,10 +73,10 @@
 
     if ($user->rights->societe->lire) {
         $head[$h][0] = BASE_URI . '?controller=margin&method=customerMargins';
-		$head[$h][1] = $langs->trans("CustomerMargins");
-		$head[$h][2] = 'customerMargins';
-		$h++;
-	}
+        $head[$h][1] = $langs->trans("CustomerMargins");
+        $head[$h][2] = 'customerMargins';
+        $h++;
+    }
 
     if ($user->rights->margins->read->all) {
         $title = 'UserMargins';

dolibarr/htdocs/master.inc.php

Indentation +66 added lines, -66 removed lines

@@ -68,33 +68,33 @@ 
 $conf->file->dol_url_root				= array('main' => (string) DOL_URL_ROOT);									// Define array of url root path ('' or '/dolibarr')
 if (! empty($dolibarr_main_document_root_alt))
 {
-	// dolibarr_main_document_root_alt can contains several directories
-	$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
-	$i=0;
+    // dolibarr_main_document_root_alt can contains several directories
+    $values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
+    $i=0;
     foreach ($values as $value)
         $conf->file->dol_document_root['alt' . ($i++)] = (string)$value;
-	$values=preg_split('/[;,]/',$dolibarr_main_url_root_alt);
-	$i=0;
-	foreach($values as $value)
-	{
-		if (preg_match('/^http(s)?:/',$value))
-		{
-			// Show error message
-			$correct_value = str_replace($dolibarr_main_url_root, '', $value);
-			print '<b>Error:</b><br>'."\n";
-			print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n";
-			print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.<br>'."\n";
-			print 'Value found: '.$value.'<br>'."\n";
-			print 'Should be replaced by: '.$correct_value.'<br>'."\n";
-			print "Or something like following examples:<br>\n";
-			print "\"/extensions\"<br>\n";
-			print "\"/extensions1,/extensions2,...\"<br>\n";
-			print "\"/../extensions\"<br>\n";
-			print "\"/custom\"<br>\n";
-			exit;
-		}
-		$conf->file->dol_url_root['alt'.($i++)]=(string) $value;
-	}
+    $values=preg_split('/[;,]/',$dolibarr_main_url_root_alt);
+    $i=0;
+    foreach($values as $value)
+    {
+        if (preg_match('/^http(s)?:/',$value))
+        {
+            // Show error message
+            $correct_value = str_replace($dolibarr_main_url_root, '', $value);
+            print '<b>Error:</b><br>'."\n";
+            print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n";
+            print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.<br>'."\n";
+            print 'Value found: '.$value.'<br>'."\n";
+            print 'Should be replaced by: '.$correct_value.'<br>'."\n";
+            print "Or something like following examples:<br>\n";
+            print "\"/extensions\"<br>\n";
+            print "\"/extensions1,/extensions2,...\"<br>\n";
+            print "\"/../extensions\"<br>\n";
+            print "\"/custom\"<br>\n";
+            exit;
+        }
+        $conf->file->dol_url_root['alt'.($i++)]=(string) $value;
+    }
 }
 
 // Chargement des includes principaux de librairies communes
@@ -108,7 +108,7 @@ 
  */
 if (! defined('NOREQUIRETRAN'))
 {
-	$langs = new Translate('',$conf);	// Must be after reading conf
+    $langs = new Translate('',$conf);	// Must be after reading conf
 }
 
 /*
@@ -118,11 +118,11 @@ 
 {
     $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
 
-	if ($db->error)
-	{
-		dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
-		exit;
-	}
+    if ($db->error)
+    {
+        dol_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
+        exit;
+    }
 }
 
 // Now database connexion is known, so we can forget password
@@ -134,7 +134,7 @@ 
  */
 if (! defined('NOREQUIREUSER'))
 {
-	$user = new User($db);
+    $user = new User($db);
 }
 
 /*
@@ -145,19 +145,19 @@ 
 // By default conf->entity is 1, but we change this if we ask another value.
 if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
 {
-	$conf->entity = $_SESSION["dol_entity"];
+    $conf->entity = $_SESSION["dol_entity"];
 }
 else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
 {
-	$conf->entity = $_ENV["dol_entity"];
+    $conf->entity = $_ENV["dol_entity"];
 }
 else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page
 {
-	$conf->entity = GETPOST("entity",'int');
+    $conf->entity = GETPOST("entity",'int');
 }
 else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
 {
-	$conf->entity = DOLENTITY;
+    $conf->entity = DOLENTITY;
 }
 
 // Sanitize entity
@@ -165,16 +165,16 @@ 
 
 if (! defined('NOREQUIREDB'))
 {
-	//print "Will work with data into entity instance number '".$conf->entity."'";
+    //print "Will work with data into entity instance number '".$conf->entity."'";
 
-	// Here we read database (llx_const table) and define $conf->global->XXX var.
-	$conf->setValues($db);
+    // Here we read database (llx_const table) and define $conf->global->XXX var.
+    $conf->setValues($db);
 }
 
 // Overwrite database value
 if (! empty($conf->file->mailing_limit_sendbyweb))
 {
-	$conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
+    $conf->global->MAILING_LIMIT_SENDBYWEB = $conf->file->mailing_limit_sendbyweb;
 }
 if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
 {
@@ -192,41 +192,41 @@ 
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
-	$ok=0;
-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin
-	if (! $ok)
-	{
-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
-		{
-			print 'Sorry, your application is offline.'."\n";
-			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+    $ok=0;
+    if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+    elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)
+    elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
+    elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
+    elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin
+    if (! $ok)
+    {
+        if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
+        {
+            print 'Sorry, your application is offline.'."\n";
+            print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '?controller=user&method=logout';
-			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
-		{
-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+            print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
+        }
+        else
+        {
+            print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '/';
-			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
-		}
-		exit;
-	}
+            print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
+        }
+        exit;
+    }
 }
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
 if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 {
-	require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+    require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
 
-	$mysoc=new Societe($db);
-	$mysoc->setMysoc($conf);
+    $mysoc=new Societe($db);
+    $mysoc->setMysoc($conf);
 
-	// For some countries, we need to invert our address with customer address
-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
+    // For some countries, we need to invert our address with customer address
+    if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
 }
 
 

dolibarr/htdocs/core/lib/product.lib.php

Indentation +292 added lines, -292 removed lines

@@ -34,88 +34,88 @@ 
  */
 function product_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$langs->load("products");
+    global $db, $langs, $conf, $user;
+    $langs->load("products");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
     $head[$h][0] = BASE_URI . "?controller=product&method=card&id=" . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
 
-	if (! empty($object->status))
-	{
+    if (! empty($object->status))
+    {
         $head[$h][0] = BASE_URI . "?controller=product&method=price&id=" . $object->id;
-    	$head[$h][1] = $langs->trans("SellingPrices");
-    	$head[$h][2] = 'price';
-    	$h++;
-	}
-
-	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
-	{
-    	if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
-    	|| (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
-    	)
-    	{
+        $head[$h][1] = $langs->trans("SellingPrices");
+        $head[$h][2] = 'price';
+        $h++;
+    }
+
+    if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
+    {
+        if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
+        || (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
+        )
+        {
             $head[$h][0] = BASE_URI . "?controller=product&method=fournisseurs&id=" . $object->id;
-    		$head[$h][1] = $langs->trans("BuyingPrices");
-    		$head[$h][2] = 'suppliers';
-    		$h++;
-    	}
-	}
-
-	// Multilangs
-	if (! empty($conf->global->MAIN_MULTILANGS))
-	{
+            $head[$h][1] = $langs->trans("BuyingPrices");
+            $head[$h][2] = 'suppliers';
+            $h++;
+        }
+    }
+
+    // Multilangs
+    if (! empty($conf->global->MAIN_MULTILANGS))
+    {
         $head[$h][0] = BASE_URI . "?controller=product&method=traduction&id=" . $object->id;
-		$head[$h][1] = $langs->trans("Translation");
-		$head[$h][2] = 'translation';
-		$h++;
-	}
-
-	// Sub products
-	if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
-	{
+        $head[$h][1] = $langs->trans("Translation");
+        $head[$h][2] = 'translation';
+        $h++;
+    }
+
+    // Sub products
+    if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+    {
         $head[$h][0] = BASE_URI . "?controller=product/composition&method=card&id=" . $object->id;
-		$head[$h][1] = $langs->trans('AssociatedProducts');
+        $head[$h][1] = $langs->trans('AssociatedProducts');
 
-		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
-		$head[$h][2] = 'subproduct';
-		$h++;
-	}
+        $nbFatherAndChild = $object->hasFatherOrChild();
+        if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+        $head[$h][2] = 'subproduct';
+        $h++;
+    }
 
     $head[$h][0] = BASE_URI . "?controller=product/stats&method=card&id=" . $object->id;
-	$head[$h][1] = $langs->trans('Statistics');
-	$head[$h][2] = 'stats';
-	$h++;
+    $head[$h][1] = $langs->trans('Statistics');
+    $head[$h][2] = 'stats';
+    $h++;
 
     $head[$h][0] = BASE_URI . "?controller=product/stats&method=facture&showmessage=1&id=" . $object->id;
-	$head[$h][1] = $langs->trans('Referers');
-	$head[$h][2] = 'referers';
-	$h++;
+    $head[$h][1] = $langs->trans('Referers');
+    $head[$h][2] = 'referers';
+    $h++;
 
-	if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
+    if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 
-		global $db;
+        global $db;
 
-		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
-		$prodcomb = new ProductCombination($db);
+        $prodcomb = new ProductCombination($db);
 
-		if ($prodcomb->fetchByFkProductChild($object->id) == -1)
-		{
+        if ($prodcomb->fetchByFkProductChild($object->id) == -1)
+        {
             $head[$h][0] = BASE_URI . "?controller=variants&method=combinations&id=" . $object->id;
-			$head[$h][1] = $langs->trans('ProductCombinations');
-			$head[$h][2] = 'combinations';
-			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
+            $head[$h][1] = $langs->trans('ProductCombinations');
+            $head[$h][2] = 'combinations';
+            $nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
             if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
-		}
+        }
 
-		$h++;
-	}
+        $h++;
+    }
 
     if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
     {
@@ -148,7 +148,7 @@ 
     }
 
     // Attachments
-	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';
     if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
     if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
@@ -160,10 +160,10 @@ 
     }
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = BASE_URI . '?controller=product&method=document&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][1] = $langs->trans('Documents');
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'product', 'remove');
 
@@ -172,13 +172,13 @@ 
     $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][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
     }
     $head[$h][2] = 'agenda';
     $h++;
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -200,19 +200,19 @@ 
     $head[$h][0] = BASE_URI . "?controller=product/stock&method=productlot_card&id=" . $object->id;
     $head[$h][1] = $langs->trans("Card");
     $head[$h][2] = 'card';
-	$h++;
+    $h++;
 
-	// Attachments
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    // Attachments
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.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] = BASE_URI . "?controller=product/stock&method=productlot_document&id=" . $object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
     $head[$h][2] = 'documents';
-	$h++;
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -242,40 +242,40 @@ 
 */
 function product_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
     $head[$h][0] = BASE_URI . "?controller=product/admin&method=product";
-	$head[$h][1] = $langs->trans('Parameters');
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][1] = $langs->trans('Parameters');
+    $head[$h][2] = 'general';
+    $h++;
 
-	if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
-	{
-		$head[$h] = array(
+    if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
+    {
+        $head[$h] = array(
             0 => BASE_URI . "?controller=product/admin&method=price_rules",
-			1 => $langs->trans('MultipriceRules'),
-			2 => 'generator'
-		);
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
+            1 => $langs->trans('MultipriceRules'),
+            2 => 'generator'
+        );
+        $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,'product_admin');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin');
 
     $head[$h][0] = BASE_URI . '?controller=product/admin&method=product_extrafields';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'product_admin','remove');
 
-	return $head;
+    return $head;
 }
 
 
@@ -319,146 +319,146 @@ 
  */
 function show_stats_for_company($product,$socid)
 {
-	global $conf,$langs,$user,$db;
-
-	$nblines = 0;
-
-	print '<tr class="liste_titre">';
-	print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
-	print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
-	print '</tr>';
-
-	// Customer proposals
-	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_propale($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("propal");
-		print '<tr><td>';
-		print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_propale['customers'];
-		print '</td><td align="right">';
-		print $product->stats_propale['nb'];
-		print '</td><td align="right">';
-		print $product->stats_propale['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier proposals
-	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_proposal_supplier($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("propal");
-		print '<tr><td>';
-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['nb'];
-		print '</td><td align="right">';
-		print $product->stats_proposal_supplier['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Customer orders
-	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_commande($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_commande['customers'];
-		print '</td><td align="right">';
-		print $product->stats_commande['nb'];
-		print '</td><td align="right">';
-		print $product->stats_commande['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier orders
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_commande_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['nb'];
-		print '</td><td align="right">';
-		print $product->stats_commande_fournisseur['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Customer invoices
-	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_facture($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("bills");
-		print '<tr><td>';
-		print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_facture['customers'];
-		print '</td><td align="right">';
-		print $product->stats_facture['nb'];
-		print '</td><td align="right">';
-		print $product->stats_facture['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Supplier invoices
-	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_facture_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("bills");
-		print '<tr><td>';
-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['suppliers'];
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['nb'];
-		print '</td><td align="right">';
-		print $product->stats_facture_fournisseur['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-
-	// Contracts
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("contracts");
-		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_contrat['customers'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['nb'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-
-	return $nblines++;
+    global $conf,$langs,$user,$db;
+
+    $nblines = 0;
+
+    print '<tr class="liste_titre">';
+    print '<td align="left" width="25%">'.$langs->trans("Referers").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("NbOfThirdParties").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("NbOfObjectReferers").'</td>';
+    print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
+    print '</tr>';
+
+    // Customer proposals
+    if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_propale($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("propal");
+        print '<tr><td>';
+        print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_propale['customers'];
+        print '</td><td align="right">';
+        print $product->stats_propale['nb'];
+        print '</td><td align="right">';
+        print $product->stats_propale['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier proposals
+    if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_proposal_supplier($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("propal");
+        print '<tr><td>';
+        print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['nb'];
+        print '</td><td align="right">';
+        print $product->stats_proposal_supplier['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Customer orders
+    if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_commande($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("orders");
+        print '<tr><td>';
+        print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_commande['customers'];
+        print '</td><td align="right">';
+        print $product->stats_commande['nb'];
+        print '</td><td align="right">';
+        print $product->stats_commande['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier orders
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_commande_fournisseur($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("orders");
+        print '<tr><td>';
+        print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['nb'];
+        print '</td><td align="right">';
+        print $product->stats_commande_fournisseur['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Customer invoices
+    if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_facture($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("bills");
+        print '<tr><td>';
+        print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_facture['customers'];
+        print '</td><td align="right">';
+        print $product->stats_facture['nb'];
+        print '</td><td align="right">';
+        print $product->stats_facture['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+    // Supplier invoices
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_facture_fournisseur($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("bills");
+        print '<tr><td>';
+        print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['suppliers'];
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['nb'];
+        print '</td><td align="right">';
+        print $product->stats_facture_fournisseur['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+
+    // Contracts
+    if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+    {
+        $nblines++;
+        $ret=$product->load_stats_contrat($socid);
+        if ($ret < 0) dol_print_error($db);
+        $langs->load("contracts");
+        print '<tr><td>';
+        print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
+        print '</td><td align="right">';
+        print $product->stats_contrat['customers'];
+        print '</td><td align="right">';
+        print $product->stats_contrat['nb'];
+        print '</td><td align="right">';
+        print $product->stats_contrat['qty'];
+        print '</td>';
+        print '</tr>';
+    }
+
+    return $nblines++;
 }
 
 
@@ -472,50 +472,50 @@ 
  */
 function measuring_units_string($unit,$measuring_style='')
 {
-	global $langs;
-
-	$measuring_units=array();
-	if ($measuring_style == 'weight')
-	{
-		$measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
-		$measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
-	}
-	else if ($measuring_style == 'size')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
-		$measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
-		$measuring_units[-2] = $langs->transnoentitiesnoconv("SizeUnitcm");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
+    global $langs;
+
+    $measuring_units=array();
+    if ($measuring_style == 'weight')
+    {
+        $measuring_units[3] = $langs->transnoentitiesnoconv("WeightUnitton");
+        $measuring_units[0] = $langs->transnoentitiesnoconv("WeightUnitkg");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("WeightUnitg");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
+    }
+    else if ($measuring_style == 'size')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
+        $measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
+        $measuring_units[-2] = $langs->transnoentitiesnoconv("SizeUnitcm");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SizeUnitfoot");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
-	}
-	else if ($measuring_style == 'surface')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
-		$measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
-		$measuring_units[-4] = $langs->transnoentitiesnoconv("SurfaceUnitcm2");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
+    }
+    else if ($measuring_style == 'surface')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
+        $measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
+        $measuring_units[-4] = $langs->transnoentitiesnoconv("SurfaceUnitcm2");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SurfaceUnitfoot2");
-		$measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
-	}
-	else if ($measuring_style == 'volume')
-	{
-		$measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
-		$measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");
-		$measuring_units[-6] = $langs->transnoentitiesnoconv("VolumeUnitcm3");
-		$measuring_units[-9] = $langs->transnoentitiesnoconv("VolumeUnitmm3");
+        $measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
+    }
+    else if ($measuring_style == 'volume')
+    {
+        $measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
+        $measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");
+        $measuring_units[-6] = $langs->transnoentitiesnoconv("VolumeUnitcm3");
+        $measuring_units[-9] = $langs->transnoentitiesnoconv("VolumeUnitmm3");
         $measuring_units[88] = $langs->transnoentitiesnoconv("VolumeUnitfoot3");
         $measuring_units[89] = $langs->transnoentitiesnoconv("VolumeUnitinch3");
-		$measuring_units[97] = $langs->transnoentitiesnoconv("VolumeUnitounce");
-		$measuring_units[98] = $langs->transnoentitiesnoconv("VolumeUnitlitre");
+        $measuring_units[97] = $langs->transnoentitiesnoconv("VolumeUnitounce");
+        $measuring_units[98] = $langs->transnoentitiesnoconv("VolumeUnitlitre");
         $measuring_units[99] = $langs->transnoentitiesnoconv("VolumeUnitgallon");
-	}
+    }
 
-	return $measuring_units[$unit];
+    return $measuring_units[$unit];
 }
 
 /**
@@ -527,14 +527,14 @@ 
  */
 function measuring_units_squared($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m3
-	$measuring_units[-1] = -2; // dm-> dm2
-	$measuring_units[-2] = -4; // cm -> cm2
-	$measuring_units[-3] = -6; // mm -> mm2
-	$measuring_units[98] = 98; // foot -> foot2
-	$measuring_units[99] = 99; // inch -> inch2
-	return $measuring_units[$unit];
+    $measuring_units=array();
+    $measuring_units[0] = 0;   // m -> m3
+    $measuring_units[-1] = -2; // dm-> dm2
+    $measuring_units[-2] = -4; // cm -> cm2
+    $measuring_units[-3] = -6; // mm -> mm2
+    $measuring_units[98] = 98; // foot -> foot2
+    $measuring_units[99] = 99; // inch -> inch2
+    return $measuring_units[$unit];
 }
 
 
@@ -547,12 +547,12 @@ 
  */
 function measuring_units_cubed($unit)
 {
-	$measuring_units=array();
-	$measuring_units[0] = 0;   // m -> m2
-	$measuring_units[-1] = -3; // dm-> dm3
-	$measuring_units[-2] = -6; // cm -> cm3
-	$measuring_units[-3] = -9; // mm -> mm3
-	$measuring_units[98] = 88; // foot -> foot3
-	$measuring_units[99] = 89; // inch -> inch3
-	return $measuring_units[$unit];
+    $measuring_units=array();
+    $measuring_units[0] = 0;   // m -> m2
+    $measuring_units[-1] = -3; // dm-> dm3
+    $measuring_units[-2] = -6; // cm -> cm3
+    $measuring_units[-3] = -9; // mm -> mm3
+    $measuring_units[98] = 88; // foot -> foot3
+    $measuring_units[99] = 89; // inch -> inch3
+    return $measuring_units[$unit];
 }

dolibarr/htdocs/core/modules/modMargin.class.php

Indentation +106 added lines, -106 removed lines

@@ -30,119 +30,119 @@
  */
 class modMargin extends DolibarrModules
 {
-	/**
-	 * 	Constructor
-	 *
-	 * 	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-
-		// Id for module (must be unique).
-		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-		$this->numero = 59000;
-		// Key text used to identify module (for permissions, menus, etc...)
-		$this->rights_class = 'margins';
-
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
-		$this->family = "financial";
-		$this->module_position = '55';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
-		$this->description = "Margin management";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of png file (without png) used for this module.
-		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
-		$this->picto='margin';
-
-		// Data directories to create when module is enabled.
-		$this->dirs = array('/margin/temp');
-
-		// Config pages. Put here list of php page names stored in admmin directory used to setup module.
-		$this->config_page_url = array("margin.php@margin");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modPropale", "modProduct");		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,2);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("margins");
-
-		// Constants
-		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
-		// );
-		$this->const = array(0=>array('MARGIN_TYPE','chaine','costprice','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
-
-		// New pages on tabs
-		$this->tabs = array(
+    /**
+     * 	Constructor
+     *
+     * 	@param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+
+        // Id for module (must be unique).
+        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+        $this->numero = 59000;
+        // Key text used to identify module (for permissions, menus, etc...)
+        $this->rights_class = 'margins';
+
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
+        $this->family = "financial";
+        $this->module_position = '55';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Margin management";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of png file (without png) used for this module.
+        // Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
+        $this->picto='margin';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array('/margin/temp');
+
+        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        $this->config_page_url = array("margin.php@margin");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modPropale", "modProduct");		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,2);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("margins");
+
+        // Constants
+        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+        // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+        //                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+        // );
+        $this->const = array(0=>array('MARGIN_TYPE','chaine','costprice','Rule for margin calculation by default',0,'current',0));			// List of particular constants to add when module is enabled
+
+        // New pages on tabs
+        $this->tabs = array(
             'product:+margin:Margins:margins:$user->rights->margins->liretous:?controller=margin/tabs&method=productMargins&id=__ID__',
             'thirdparty:+margin:Margins:margins:empty($user->societe_id) && $user->rights->margins->liretous && ($object->client > 0):?controller=margin/tabs&method=thirdpartyMargins&socid=__ID__'
-		);
+        );
 
 
-		// Boxes
-		$this->boxes = array();			// List of boxes
-		$r=0;
+        // Boxes
+        $this->boxes = array();			// List of boxes
+        $r=0;
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
 
-		// Main menu entries
-		$this->menu = array();			// List of menus to add
-		$r = 0;
+        // Main menu entries
+        $this->menu = array();			// List of menus to add
+        $r = 0;
 
-		// left menu entry
-		$this->menu[$r]=array(
-				'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
-    			'type'=>'left',			// This is a Top menu entry
-    			'titre'=>'Margins',
-    			'mainmenu'=>'billing',
-    			'leftmenu'=>'margins',
+        // left menu entry
+        $this->menu[$r]=array(
+                'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
+                'type'=>'left',			// This is a Top menu entry
+                'titre'=>'Margins',
+                'mainmenu'=>'billing',
+                'leftmenu'=>'margins',
             'url' => '?controller=margin&method=index',
-    			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-    			'position'=>100,
-    			'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-    			'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
-    			'target'=>'',
-    			'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
-		$r++;
-
-		// Permissions
-		$this->rights = array();
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 59001; // id de la permission
-		$this->rights[$r][1] = 'Visualiser les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'liretous';
-
-		$r++;
-		$this->rights[$r][0] = 59002; // id de la permission
-		$this->rights[$r][1] = 'Définir les marges'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 59003; // id de la permission
-		$this->rights[$r][1] = 'Read every user margin'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'read';
-		$this->rights[$r][5] = 'all';
-	}
+                'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+                'position'=>100,
+                'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+                'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+                'target'=>'',
+                'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+        $r++;
+
+        // Permissions
+        $this->rights = array();
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 59001; // id de la permission
+        $this->rights[$r][1] = 'Visualiser les marges'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'liretous';
+
+        $r++;
+        $this->rights[$r][0] = 59002; // id de la permission
+        $this->rights[$r][1] = 'Définir les marges'; // libelle de la permission
+        $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 59003; // id de la permission
+        $this->rights[$r][1] = 'Read every user margin'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'read';
+        $this->rights[$r][5] = 'all';
+    }
 }
 

dolibarr/htdocs/don/card.php

Indentation +455 added lines, -455 removed lines

@@ -78,117 +78,117 @@ 
 
 if ($action == 'update')
 {
-	if (! empty($cancel))
-	{
+    if (! empty($cancel))
+    {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
-		exit;
-	}
+        exit;
+    }
 
-	$error=0;
+    $error=0;
 
     if (empty($donation_date))
     {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
         $action = "create";
         $error++;
     }
 
-	if (empty($amount))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
+    if (empty($amount))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+        $action = "create";
+        $error++;
+    }
 
-	if (! $error)
-	{
-		$object->fetch($id);
-
-		$object->firstname   = GETPOST("firstname",'alpha');
-		$object->lastname    = GETPOST("lastname",'alpha');
-		$object->societe     = GETPOST("societe",'alpha');
-		$object->address     = GETPOST("address",'alpha');
-		$object->amount      = price2num(GETPOST("amount",'alpha'));
-		$object->town        = GETPOST("town",'alpha');
-		$object->zip         = GETPOST("zipcode",'alpha');
+    if (! $error)
+    {
+        $object->fetch($id);
+
+        $object->firstname   = GETPOST("firstname",'alpha');
+        $object->lastname    = GETPOST("lastname",'alpha');
+        $object->societe     = GETPOST("societe",'alpha');
+        $object->address     = GETPOST("address",'alpha');
+        $object->amount      = price2num(GETPOST("amount",'alpha'));
+        $object->town        = GETPOST("town",'alpha');
+        $object->zip         = GETPOST("zipcode",'alpha');
         $object->country_id  = GETPOST('country_id', 'int');
         $object->email       = GETPOST("email",'alpha');
-		$object->date        = $donation_date;
-		$object->public      = GETPOST("public",'alpha');
-		$object->fk_project  = GETPOST("fk_project",'alpha');
-		$object->note_private= GETPOST("note_private",'none');
-		$object->note_public = GETPOST("note_public",'none');
-		$object->modepaymentid = GETPOST('modepayment','int');
-
-		// Fill array 'array_options' with data from add form
+        $object->date        = $donation_date;
+        $object->public      = GETPOST("public",'alpha');
+        $object->fk_project  = GETPOST("fk_project",'alpha');
+        $object->note_private= GETPOST("note_private",'none');
+        $object->note_public = GETPOST("note_public",'none');
+        $object->modepaymentid = GETPOST('modepayment','int');
+
+        // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+        if ($ret < 0) $error++;
 
-		if ($object->update($user) > 0)
-		{
+        if ($object->update($user) > 0)
+        {
             header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $object->id);
-			exit;
-		}
-	}
+            exit;
+        }
+    }
 }
 
 if ($action == 'add')
 {
-	if (! empty($cancel))
-	{
-		header("Location: index.php");
-		exit;
-	}
+    if (! empty($cancel))
+    {
+        header("Location: index.php");
+        exit;
+    }
 
-	$error=0;
+    $error=0;
 
     if (empty($donation_date))
     {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
         $action = "create";
         $error++;
     }
 
-	if (empty($amount))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
+    if (empty($amount))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+        $action = "create";
+        $error++;
+    }
 
-	if (! $error)
-	{
-		$object->firstname   = GETPOST("firstname",'alpha');
-		$object->lastname    = GETPOST("lastname",'alpha');
-		$object->societe     = GETPOST("societe",'alpha');
-		$object->address     = GETPOST("address",'alpha');
-		$object->amount      = price2num(GETPOST("amount",'alpha'));
-		$object->zip         = GETPOST("zipcode",'alpha');
-		$object->town        = GETPOST("town",'alpha');
+    if (! $error)
+    {
+        $object->firstname   = GETPOST("firstname",'alpha');
+        $object->lastname    = GETPOST("lastname",'alpha');
+        $object->societe     = GETPOST("societe",'alpha');
+        $object->address     = GETPOST("address",'alpha');
+        $object->amount      = price2num(GETPOST("amount",'alpha'));
+        $object->zip         = GETPOST("zipcode",'alpha');
+        $object->town        = GETPOST("town",'alpha');
         $object->country_id  = GETPOST('country_id', 'int');
         $object->email       = GETPOST("email",'alpha');
-		$object->date        = $donation_date;
-		$object->note_private= GETPOST("note_private",'none');
-		$object->note_public = GETPOST("note_public",'none');
-		$object->public      = GETPOST("public",'alpha');
-		$object->fk_project  = GETPOST("fk_project",'alpha');
-		$object->modepaymentid = GETPOST('modepayment','int');
-
-		// Fill array 'array_options' with data from add form
+        $object->date        = $donation_date;
+        $object->note_private= GETPOST("note_private",'none');
+        $object->note_public = GETPOST("note_public",'none');
+        $object->public      = GETPOST("public",'alpha');
+        $object->fk_project  = GETPOST("fk_project",'alpha');
+        $object->modepaymentid = GETPOST('modepayment','int');
+
+        // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+        if ($ret < 0) $error++;
 
-		$res = $object->create($user);
-		if ($res > 0)
-		{
+        $res = $object->create($user);
+        if ($res > 0)
+        {
             header("Location: " . $_SERVER['PHP_SELF'] . '&id=' . $res);
-			exit;
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 }
 if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
 {
@@ -207,46 +207,46 @@ 
 }
 if ($action == 'valid_promesse')
 {
-	$object->fetch($id);
-	if ($object->valid_promesse($id, $user->id) >= 0)
-	{
-		setEventMessages($langs->trans("DonationValidated", $object->ref), null);
+    $object->fetch($id);
+    if ($object->valid_promesse($id, $user->id) >= 0)
+    {
+        setEventMessages($langs->trans("DonationValidated", $object->ref), null);
 
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
-		exit;
-	}
+        exit;
+    }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_cancel')
 {
-	$object->fetch($id);
-	if ($object->set_cancel($id) >= 0)
+    $object->fetch($id);
+    if ($object->set_cancel($id) >= 0)
     {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
         exit;
     }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_paid')
 {
-	$object->fetch($id);
-	if ($object->set_paid($id, $modepayment) >= 0)
-	{
+    $object->fetch($id);
+    if ($object->set_paid($id, $modepayment) >= 0)
+    {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
-		exit;
-	}
+        exit;
+    }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 else if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 // Actions to build doc
@@ -321,50 +321,50 @@ 
 
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans("AddDonation"));
+    print load_fiche_titre($langs->trans("AddDonation"));
 
-	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
+    print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+    dol_fiche_head('');
 
-	print '<table class="border" width="100%">';
-	print '<tbody>';
+    print '<table class="border" width="100%">';
+    print '<tbody>';
 
-	// Ref
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
+    // Ref
+    print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
 
-	// Company
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
-		// Thirdparty
-		print '<td>' . $langs->trans('Customer') . '</td>';
-		if ($soc->id > 0 && ! GETPOST('fac_rec','alpha'))
-		{
-			print '<td colspan="2">';
-			print $soc->getNomUrl(1);
-			print '<input type="hidden" name="socid" value="' . $soc->id . '">';
-			// Outstanding Bill
-			$outstandingBills = $soc->get_OutstandingBill();
-			print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
-			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
-			if ($soc->outstanding_limit != '')
-			{
-				if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
-				print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
-			}
-			print ')';
-			print '</td>';
-		}
-		else
-		{
-			print '<td colspan="2">';
-			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
-			// Option to reload page to retrieve customer informations. Note, this clear other input
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
-			{
-				print '<script type="text/javascript">
+    // Company
+    if (! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES))
+    {
+        // Thirdparty
+        print '<td>' . $langs->trans('Customer') . '</td>';
+        if ($soc->id > 0 && ! GETPOST('fac_rec','alpha'))
+        {
+            print '<td colspan="2">';
+            print $soc->getNomUrl(1);
+            print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+            // Outstanding Bill
+            $outstandingBills = $soc->get_OutstandingBill();
+            print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
+            print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
+            if ($soc->outstanding_limit != '')
+            {
+                if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+                print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
+            }
+            print ')';
+            print '</td>';
+        }
+        else
+        {
+            print '<td colspan="2">';
+            print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+            // Option to reload page to retrieve customer informations. Note, this clear other input
+            if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+            {
+                print '<script type="text/javascript">
 				$(document).ready(function() {
 					$("#socid").change(function() {
 						var socid = $(this).val();
@@ -374,82 +374,82 @@ 
 					});
 				});
 				</script>';
-			}
+            }
             //print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
             print ' <a href="' . BASE_URI . '?controller=societe&method=card&action=create&client=3&fournisseur=0&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create') . '">' . $langs->trans("AddThirdParty") . '</a>';
-			print '</td>';
-		}
-		print '</tr>' . "\n";
-	}
+            print '</td>';
+        }
+        print '</tr>' . "\n";
+    }
 
-	// Date
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($donation_date?$donation_date:-1, '', '', '', '', "add", 1, 1);
-	print '</td>';
+    // Date
+    print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Date").'</td><td>';
+    print $form->selectDate($donation_date?$donation_date:-1, '', '', '', '', "add", 1, 1);
+    print '</td>';
 
-	// Amount
-	print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.dol_escape_htmltag(GETPOST("amount")).'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+    // Amount
+    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.dol_escape_htmltag(GETPOST("amount")).'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-	// Public donation
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
-	print "</td></tr>\n";
+    // Public donation
+    print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+    print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
+    print "</td></tr>\n";
 
-	if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
-		print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address")).'</textarea></td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</tr>';
-
-		// Country
-		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
-		print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
-	}
+    if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
+    {
+        print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
+        print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address")).'</textarea></td></tr>';
+
+        // Zip / Town
+        print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+        print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+        print ' ';
+        print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+        print '</tr>';
+
+        // Country
+        print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
+        print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        print '</td></tr>';
+
+        print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
+    }
 
-	// Payment mode
-	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-	$selected = GETPOST('modepayment','int');
-	$form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
-	print "</td></tr>\n";
+    // Payment mode
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
+    $selected = GETPOST('modepayment','int');
+    $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
+    print "</td></tr>\n";
 
-	// Public note
-	print '<tr>';
-	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
-	print '<td>';
+    // Public note
+    print '<tr>';
+    print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+    print '<td>';
 
     $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-	print $doleditor->Create(1);
-	print '</td></tr>';
-
-	// Private note
-	if (empty($user->societe_id)) {
-		print '<tr>';
-		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td>';
-
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-		print $doleditor->Create(1);
-		print '</td></tr>';
-	}
+    print $doleditor->Create(1);
+    print '</td></tr>';
+
+    // Private note
+    if (empty($user->societe_id)) {
+        print '<tr>';
+        print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+        print '<td>';
+
+        $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+        print $doleditor->Create(1);
+        print '</td></tr>';
+    }
 
-	if (! empty($conf->projet->enabled))
+    if (! empty($conf->projet->enabled))
     {
         print "<tr><td>".$langs->trans("Project")."</td><td>";
         $formproject->select_projects(-1, $projectid,'fk_project', 0, 0, 1, 1);
-		print "</td></tr>\n";
+        print "</td></tr>\n";
     }
 
     // Other attributes
@@ -458,21 +458,21 @@ 
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-		print $object->showOptionals($extrafields,'edit',$parameters);
+        print $object->showOptionals($extrafields,'edit',$parameters);
     }
 
     print '</tbody>';
-	print "</table>\n";
+    print "</table>\n";
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+    print '<div class="center">';
+    print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
+    print '</div>';
 
-	print "</form>\n";
+    print "</form>\n";
 }
 
 
@@ -484,80 +484,80 @@ 
 
 if (! empty($id) && $action == 'edit')
 {
-	$result=$object->fetch($id);
-	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
-	}
-	$result=$object->fetch_optionals();
-	if ($result < 0) {
-		dol_print_error($db); exit;
-	}
+    $result=$object->fetch($id);
+    if ($result < 0) {
+        dol_print_error($db,$object->error); exit;
+    }
+    $result=$object->fetch_optionals();
+    if ($result < 0) {
+        dol_print_error($db); exit;
+    }
 
-	$hselected='card';
-	$head = donation_prepare_head($object);
+    $hselected='card';
+    $head = donation_prepare_head($object);
 
-	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-	print '<input type="hidden" name="amount" value="'.$object->amount.'">';
+    print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
+    print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+    print '<input type="hidden" name="amount" value="'.$object->amount.'">';
 
 
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
+    dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	// Ref
-	print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">';
-	print $object->getNomUrl();
-	print '</td>';
-	print '</tr>';
+    // Ref
+    print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">';
+    print $object->getNomUrl();
+    print '</td>';
+    print '</tr>';
 
-	// Date
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($object->date,'','','','',"update");
-	print '</td>';
+    // Date
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
+    print $form->selectDate($object->date,'','','','',"update");
+    print '</td>';
 
-	// Amount
-	if ($object->statut == 0)
-	{
-		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
-	{
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
-		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
-		print '</td></tr>';
-	}
+    // Amount
+    if ($object->statut == 0)
+    {
+        print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+    }
+    else
+    {
+        print '<tr><td>'.$langs->trans("Amount").'</td><td>';
+        print price($object->amount,0,$langs,0,0,-1,$conf->currency);
+        print '</td></tr>';
+    }
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",1,1);
-	print "</td>";
-	print "</tr>\n";
+    print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+    print $form->selectyesno("public",1,1);
+    print "</td>";
+    print "</tr>\n";
 
-	$langs->load("companies");
-	print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address).'</textarea></td></tr>';
+    $langs->load("companies");
+    print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Address").'</td><td>';
+    print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address).'</textarea></td></tr>';
 
     // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-	print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+    print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
     print ' ';
-	print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-	print '</tr>';
+    print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+    print '</tr>';
 
-	// Country
-	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
-	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	print '</td></tr>';
+    // Country
+    print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
+    print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
+    if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    print '</td></tr>';
 
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
+    print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
 
-	// Payment mode
+    // Payment mode
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
     if ($object->modepaymentid) $selected = $object->modepaymentid;
     else $selected = '';
@@ -565,16 +565,16 @@ 
     print "</td></tr>\n";
 
     // Status
-	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+    print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
     // Project
     if (! empty($conf->projet->enabled))
     {
-    	$formproject=new FormProjets($db);
+        $formproject=new FormProjets($db);
 
         $langs->load('projects');
         print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 0, 1, 1);
+        $formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 0, 1, 1);
         print '</td></tr>';
     }
 
@@ -584,16 +584,16 @@ 
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-      	print $object->showOptionals($extrafields,'edit');
+            print $object->showOptionals($extrafields,'edit');
     }
 
-	print "</table>\n";
+    print "</table>\n";
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
-	print "</form>\n";
+    print "</form>\n";
 }
 
 
@@ -605,66 +605,66 @@ 
 /* ************************************************************ */
 if (! empty($id) && $action != 'edit')
 {
-	// Confirmation delete
+    // Confirmation delete
     if ($action == 'delete')
     {
         $text=$langs->trans("ConfirmDeleteADonation");
         print $form->formconfirm($_SERVER["PHP_SELF"] . "&id=" . $object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
     }
 
-	$result=$object->fetch($id);
-	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
-	}
-	$result=$object->fetch_optionals();
-	if ($result < 0) {
-		dol_print_error($db); exit;
-	}
+    $result=$object->fetch($id);
+    if ($result < 0) {
+        dol_print_error($db,$object->error); exit;
+    }
+    $result=$object->fetch_optionals();
+    if ($result < 0) {
+        dol_print_error($db); exit;
+    }
 
-	$hselected='card';
+    $hselected='card';
 
-	$head = donation_prepare_head($object);
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'generic');
+    $head = donation_prepare_head($object);
+    dol_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'generic');
 
-	// Print form confirm
-	print $formconfirm;
+    // Print form confirm
+    print $formconfirm;
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
                     $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&methos=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
 
     dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
@@ -676,195 +676,195 @@ 
 
     print '<table class="border" width="100%">';
 
-	// Date
-	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
-	print dol_print_date($object->date,"day");
-	print "</td>";
+    // Date
+    print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
+    print dol_print_date($object->date,"day");
+    print "</td>";
 
     print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
-	print price($object->amount,0,$langs,0,0,-1,$conf->currency);
-	print '</td></tr>';
+    print price($object->amount,0,$langs,0,0,-1,$conf->currency);
+    print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("PublicDonation").'</td><td colspan="2">';
-	print yn($object->public);
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("PublicDonation").'</td><td colspan="2">';
+    print yn($object->public);
+    print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
-	print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
-	print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
 
-	// Payment mode
-	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-	$form->form_modes_reglement(null, $object->modepaymentid,'none');
-	print "</td></tr>\n";
+    // Payment mode
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
+    $form->form_modes_reglement(null, $object->modepaymentid,'none');
+    print "</td></tr>\n";
 
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+    // Other attributes
+    $cols = 2;
+    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-	print '</table>';
+    print '</table>';
 
-	print '</div>';
-	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
+    print '</div>';
+    print '<div class="fichehalfright">';
+    print '<div class="ficheaddleft">';
 
-	/*
+    /*
 	 * Payments
 	 */
-	$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
-	$sql.= "c.code as type_code,c.libelle as paiement_type";
-	$sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
-	$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
-	$sql.= ", ".MAIN_DB_PREFIX."don as d";
-	$sql.= " WHERE d.rowid = '".$id."'";
-	$sql.= " AND p.fk_donation = d.rowid";
-	$sql.= " AND d.entity IN (".getEntity('donation').")";
-	$sql.= " AND p.fk_typepayment = c.id";
-	$sql.= " ORDER BY dp";
-
-	//print $sql;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0; $total = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("RefPayment").'</td>';
-		print '<td>'.$langs->trans("Date").'</td>';
-		print '<td>'.$langs->trans("Type").'</td>';
-   		print '<td align="right">'.$langs->trans("Amount").'</td>';
-   		print '</tr>';
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			print '<tr class="oddeven"><td>';
+    $sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
+    $sql.= "c.code as type_code,c.libelle as paiement_type";
+    $sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
+    $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
+    $sql.= ", ".MAIN_DB_PREFIX."don as d";
+    $sql.= " WHERE d.rowid = '".$id."'";
+    $sql.= " AND p.fk_donation = d.rowid";
+    $sql.= " AND d.entity IN (".getEntity('donation').")";
+    $sql.= " AND p.fk_typepayment = c.id";
+    $sql.= " ORDER BY dp";
+
+    //print $sql;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0; $total = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td>'.$langs->trans("RefPayment").'</td>';
+        print '<td>'.$langs->trans("Date").'</td>';
+        print '<td>'.$langs->trans("Type").'</td>';
+            print '<td align="right">'.$langs->trans("Amount").'</td>';
+            print '</tr>';
+
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($resql);
+
+            print '<tr class="oddeven"><td>';
             print '<a href="' . BASE_URI . '?controller=don/payment&method=card&id=' . $objp->rowid . '">' . img_object($langs->trans("Payment"), "payment") . ' ' . $objp->rowid . '</a></td>';
-			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-		    $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+            print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+            $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
             print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-			print '<td align="right">'.price($objp->amount)."</td>\n";
-			print "</tr>";
-			$totalpaid += $objp->amount;
-			$i++;
-		}
-
-		if ($object->paid == 0)
-		{
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
-
-			$remaintopay = $object->amount - $totalpaid;
-
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-			print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':'').'><b>'.price($remaintopay)."</b></td></tr>\n";
-		}
-		print "</table>";
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+            print '<td align="right">'.price($objp->amount)."</td>\n";
+            print "</tr>";
+            $totalpaid += $objp->amount;
+            $i++;
+        }
+
+        if ($object->paid == 0)
+        {
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
+
+            $remaintopay = $object->amount - $totalpaid;
+
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
+            print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':'').'><b>'.price($remaintopay)."</b></td></tr>\n";
+        }
+        print "</table>";
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 
-	print '</div>';
-	print '</div>';
-	print '</div>';
+    print '</div>';
+    print '</div>';
+    print '</div>';
 
-	print '<div class="clearboth"></div>';
+    print '<div class="clearboth"></div>';
 
     dol_fiche_end();
 
-	$remaintopay = $object->amount - $totalpaid;
+    $remaintopay = $object->amount - $totalpaid;
 
-	// Actions buttons
+    // Actions buttons
 
-	print '<div class="tabsAction">';
+    print '<div class="tabsAction">';
 
     print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '&action=edit&rowid=' . $object->id . '">' . $langs->trans('Modify') . '</a></div>';
 
-	if ($object->statut == 0)
-	{
+    if ($object->statut == 0)
+    {
         print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '&rowid=' . $object->id . '&action=valid_promesse">' . $langs->trans("ValidPromess") . '</a></div>';
-	}
+    }
 
     if (($object->statut == 0 || $object->statut == 1) && $totalpaid == 0 && $object->paid == 0)
     {
         print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '&rowid=' . $object->id . '&action=set_cancel">' . $langs->trans("ClassifyCanceled") . "</a></div>";
     }
 
-	// Create payment
-	if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
-	{
-		if ($remaintopay == 0)
-		{
-			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
-		}
-		else
-		{
+    // Create payment
+    if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
+    {
+        if ($remaintopay == 0)
+        {
+            print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
+        }
+        else
+        {
             print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=don/payment&method=payment&rowid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
-		}
-	}
+        }
+    }
 
-	// Classify 'paid'
-	if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
-	}
+    // Classify 'paid'
+    if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
+    {
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
+    }
 
-	// Delete
-	if ($user->rights->don->supprimer)
-	{
-		if ($object->statut == -1 || $object->statut == 0)
-		{
+    // Delete
+    if ($user->rights->don->supprimer)
+    {
+        if ($object->statut == -1 || $object->statut == 0)
+        {
             // TODO: Original href="card.php?rowid='.$object->id.'&action=delete"
             print '<div class="inline-block divButAction"><a class="butActionDelete" href="?controller=don&method=card&rowid=' . $object->id . '&action=delete">' . $langs->trans("Delete") . "</a></div>";
-		}
-		else
-		{
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
-		}
-	}
-	else
-	{
-		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
-	}
+        }
+        else
+        {
+            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
+        }
+    }
+    else
+    {
+        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
+    }
 
-	print "</div>";
+    print "</div>";
 
 
     print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	/*
+    /*
 	 * Documents generes
 	 */
-	$filename	=	dol_sanitizeFileName($object->id);
-	$filedir	=	$conf->don->dir_output . "/" . dol_sanitizeFileName($object->id);
+    $filename	=	dol_sanitizeFileName($object->id);
+    $filedir	=	$conf->don->dir_output . "/" . dol_sanitizeFileName($object->id);
     $urlsource = $_SERVER['PHP_SELF'] . '&rowid=' . $object->id;
-	$genallowed	=	(($object->paid == 0 || $user->admin) && $user->rights->don->lire);
-	$delallowed	=	$user->rights->don->creer;
+    $genallowed	=	(($object->paid == 0 || $user->admin) && $user->rights->don->lire);
+    $delallowed	=	$user->rights->don->creer;
 
-	print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
+    print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
-	// Show links to link elements
-	$linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
-	$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+    // Show links to link elements
+    $linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
+    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-		// Show online payment link
-		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
+        // Show online payment link
+        $useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
 
-		if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
-		{
-			print '<br><!-- Link to pay -->'."\n";
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-			print showOnlinePaymentUrl('donation', $object->ref).'<br>';
-		}
+        if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
+        {
+            print '<br><!-- Link to pay -->'."\n";
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+            print showOnlinePaymentUrl('donation', $object->ref).'<br>';
+        }
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	print '</div></div></div>';
+    print '</div></div></div>';
 }
 
 llxFooter();

dolibarr/htdocs/don/note.php

Indentation +42 added lines, -42 removed lines

@@ -63,8 +63,8 @@ 
 
 if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 /*
@@ -80,59 +80,59 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$object = new Don($db);
-	$object->fetch($id,$ref);
+    $object = new Don($db);
+    $object->fetch($id,$ref);
 
-	$head = donation_prepare_head($object);
+    $head = donation_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'generic');
+    dol_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'generic');
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
                     $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
-	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+    dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
-	$cssclass="titlefield";
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+    $cssclass="titlefield";
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 llxFooter();

dolibarr/htdocs/don/document.php

Indentation +49 added lines, -49 removed lines

@@ -85,8 +85,8 @@ 
 
 if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 /*
@@ -103,75 +103,75 @@ 
 
 if ($object->id)
 {
-	$object->fetch_thirdparty();
+    $object->fetch_thirdparty();
 
-	$head=donation_prepare_head($object);
+    $head=donation_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("Donation"), -1, 'generic');
+    dol_fiche_head($head, 'documents',  $langs->trans("Donation"), -1, 'generic');
 
 
-	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
-	{
-		$totalsize+=$file['size'];
-	}
+    // Build file list
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
                     $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
                 $morehtmlref .= $proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
 
-	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+    dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
     print '<table class="border" width="100%">';
 
-	// Ref
-	/*
+    // Ref
+    /*
 	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
 	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
 	print '</td></tr>';
     */
 
-	// Societe
-	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+    // Societe
+    //print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
     print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
@@ -191,7 +191,7 @@ 
 }
 else
 {
-	print $langs->trans("ErrorUnknown");
+    print $langs->trans("ErrorUnknown");
 }
 
 llxFooter();

dolibarr/htdocs/compta/facture/invoicetemplate_list.php

Indentation +496 added lines, -496 removed lines

@@ -37,8 +37,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	//require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    //require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
@@ -98,11 +98,11 @@ 
 $object = new FactureRec($db);
 if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
 {
-	$ret = $object->fetch($id, $ref);
-	if (!$ret)
-	{
-		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
-	}
+    $ret = $object->fetch($id, $ref);
+    if (!$ret)
+    {
+        setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
+    }
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -118,30 +118,30 @@ 
 $permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
 
 $arrayfields=array(
-	'f.titre'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	'f.total'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-	'f.tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
-	'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
-	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>0),
-	'f.fk_cond_reglement'=>array('label'=>$langs->trans("PaymentTerm"), 'checked'=>0),
-	'recurring'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
-	'f.frequency'=>array('label'=>$langs->trans("Frequency"), 'checked'=>1),
-	'f.unit_frequency'=>array('label'=>$langs->trans("FrequencyUnit"), 'checked'=>1),
-	'f.nb_gen_done'=>array('label'=>$langs->trans("NbOfGenerationDoneShort"), 'checked'=>1),
-	'f.date_last_gen'=>array('label'=>$langs->trans("DateLastGenerationShort"), 'checked'=>1),
-	'f.date_when'=>array('label'=>$langs->trans("NextDateToExecutionShort"), 'checked'=>1),
-	'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>100),
-	'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'f.titre'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+    'f.total'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
+    'f.tva'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>1),
+    'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>1),
+    'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>0),
+    'f.fk_cond_reglement'=>array('label'=>$langs->trans("PaymentTerm"), 'checked'=>0),
+    'recurring'=>array('label'=>$langs->trans("RecurringInvoiceTemplate"), 'checked'=>1),
+    'f.frequency'=>array('label'=>$langs->trans("Frequency"), 'checked'=>1),
+    'f.unit_frequency'=>array('label'=>$langs->trans("FrequencyUnit"), 'checked'=>1),
+    'f.nb_gen_done'=>array('label'=>$langs->trans("NbOfGenerationDoneShort"), 'checked'=>1),
+    'f.date_last_gen'=>array('label'=>$langs->trans("DateLastGenerationShort"), 'checked'=>1),
+    'f.date_when'=>array('label'=>$langs->trans("NextDateToExecutionShort"), 'checked'=>1),
+    'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>100),
+    'f.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 );
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
-	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-	}
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
 }
 
 
@@ -158,36 +158,36 @@ 
 
 if (empty($reshook))
 {
-	if (GETPOST('cancel','alpha')) $action='';
-
-	// Selection of new fields
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-	// Do we click on purge search criteria ?
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
-	{
-		$search_ref='';
-		$search_societe='';
-		$search_montant_ht='';
-		$search_montant_vat='';
-		$search_montant_ttc='';
-		$search_payment_mode='';
-		$search_payment_term='';
-		$search_day='';
-		$search_year='';
-		$search_month='';
-		$search_day_date_when='';
-		$search_year_date_when='';
-		$search_month_date_when='';
-		$search_recurring='';
-		$search_frequency='';
-		$search_unit_frequency='';
-		$search_status='';
-		$search_array_options=array();
-	}
-
-	// Mass actions
-	/*$objectclass='MyObject';
+    if (GETPOST('cancel','alpha')) $action='';
+
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Do we click on purge search criteria ?
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All test are required to be compatible with all browsers
+    {
+        $search_ref='';
+        $search_societe='';
+        $search_montant_ht='';
+        $search_montant_vat='';
+        $search_montant_ttc='';
+        $search_payment_mode='';
+        $search_payment_term='';
+        $search_day='';
+        $search_year='';
+        $search_month='';
+        $search_day_date_when='';
+        $search_year_date_when='';
+        $search_month_date_when='';
+        $search_recurring='';
+        $search_frequency='';
+        $search_unit_frequency='';
+        $search_status='';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    /*$objectclass='MyObject';
     $objectlabel='MyObject';
     $permtoread = $user->rights->mymodule->read;
     $permtodelete = $user->rights->mymodule->delete;
@@ -222,12 +222,12 @@ 
 $sql.= " f.fk_cond_reglement, f.fk_mode_reglement";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
 if (! $user->rights->societe->client->voir && ! $socid) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql.= " WHERE f.fk_soc = s.rowid";
 $sql.= ' AND f.entity IN ('.getEntity('invoice').')';
 if (! $user->rights->societe->client->voir && ! $socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 if ($search_ref)                  $sql .= natural_search('f.titre', $search_ref);
 if ($search_societe)              $sql .= natural_search('s.nom', $search_societe);
@@ -242,35 +242,35 @@ 
 if ($search_unit_frequency != '') $sql .= ' AND f.frequency > 0'.natural_search('f.unit_frequency', $search_unit_frequency);
 if ($search_status != '' && $search_status >= -1)
 {
-	if ($search_status == 0) $sql.= ' AND frequency = 0 AND suspended = 0';
-	if ($search_status == 1) $sql.= ' AND frequency != 0 AND suspended = 0';
-	if ($search_status == -1) $sql.= ' AND suspended = 1';
+    if ($search_status == 0) $sql.= ' AND frequency = 0 AND suspended = 0';
+    if ($search_status == 1) $sql.= ' AND frequency != 0 AND suspended = 0';
+    if ($search_status == -1) $sql.= ' AND suspended = 1';
 }
 if ($search_month > 0)
 {
-	if ($search_year > 0 && empty($search_day))
-		$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
-	else if ($search_year > 0 && ! empty($search_day))
-		$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
-	else
-		$sql.= " AND date_format(f.date_last_gen, '%m') = '".$db->escape($search_month)."'";
+    if ($search_year > 0 && empty($search_day))
+        $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'";
+    else if ($search_year > 0 && ! empty($search_day))
+        $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'";
+    else
+        $sql.= " AND date_format(f.date_last_gen, '%m') = '".$db->escape($search_month)."'";
 }
 else if ($search_year > 0)
 {
-	$sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
+    $sql.= " AND f.date_last_gen BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'";
 }
 if ($search_month_date_when > 0)
 {
-	if ($search_year_date_when > 0 && empty($search_day_date_when))
-		$sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($search_year_date_when,$search_month_date_when,false))."' AND '".$db->idate(dol_get_last_day($search_year_date_when,$search_month_date_when,false))."'";
-	else if ($search_year_date_when > 0 && ! empty($search_day_date_when))
-		$sql.= " AND f.date_date_when_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month_date_when, $search_day_date_when, $search_year_date_when))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month_date_when, $search_day_date_when, $search_year_date_when))."'";
-	else
-		$sql.= " AND date_format(f.date_when, '%m') = '".$db->escape($search_month_date_when)."'";
+    if ($search_year_date_when > 0 && empty($search_day_date_when))
+        $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($search_year_date_when,$search_month_date_when,false))."' AND '".$db->idate(dol_get_last_day($search_year_date_when,$search_month_date_when,false))."'";
+    else if ($search_year_date_when > 0 && ! empty($search_day_date_when))
+        $sql.= " AND f.date_date_when_reglement BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month_date_when, $search_day_date_when, $search_year_date_when))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month_date_when, $search_day_date_when, $search_year_date_when))."'";
+    else
+        $sql.= " AND date_format(f.date_when, '%m') = '".$db->escape($search_month_date_when)."'";
 }
 else if ($search_year_date_when > 0)
 {
-	$sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($search_year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($search_year_date_when,12,false))."'";
+    $sql.= " AND f.date_when BETWEEN '".$db->idate(dol_get_first_day($search_year_date_when,1,false))."' AND '".$db->idate(dol_get_last_day($search_year_date_when,12,false))."'";
 }
 
 $sql.= $db->order($sortfield, $sortorder);
@@ -278,13 +278,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1,$offset);
@@ -292,423 +292,423 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($socid)                     $param.='&socid='.urlencode($socid);
-	if ($search_day)                $param.='&search_day='.urlencode($search_day);
-	if ($search_month)              $param.='&search_month='.urlencode($search_month);
-	if ($search_year)               $param.='&search_year=' .urlencode($search_year);
-	if ($search_day_date_when)      $param.='&search_day_date_when='.urlencode($search_day_date_when);
-	if ($search_month_date_when)    $param.='&search_month_date_when='.urlencode($search_month_date_when);
-	if ($search_year_date_when)     $param.='&search_year_date_when=' .urlencode($search_year_date_when);
-	if ($search_ref)                $param.='&search_ref=' .urlencode($search_ref);
-	if ($search_societe)            $param.='&search_societe=' .urlencode($search_societe);
-	if ($search_montant_ht != '')   $param.='&search_montant_ht=' .urlencode($search_montant_ht);
-	if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
-	if ($search_montant_ttc != '')  $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
-	if ($search_payment_mode != '') $param.='&search_payment_mode='.urlencode($search_payment_mode);
-	if ($search_payment_type != '') $param.='&search_payment_type='.urlencode($search_payment_type);
-	if ($search_recurring != '' && $search_recurrning != '-1')    $param.='&search_recurring='  .urlencode($search_recurring);
-	if ($search_frequency > 0)        $param.='&search_frequency='  .urlencode($search_frequency);
-	if ($search_unit_frequency != '') $param.='&search_unit_frequency='.urlencode($search_unit_frequency);
-	if ($search_status != '')		$param.='&search_status='.urlencode($search_status);
-	if ($option)                    $param.="&option=".urlencode($option);
-	if ($optioncss != '')           $param.='&optioncss='.urlencode($optioncss);
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-
-	$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	//$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
-	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
-
-	print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','', $limit);
-
-	print $langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'<br><br>';
-
-	$i = 0;
-
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-	// Filters lines
-	print '<tr class="liste_titre_filter">';
-	// Ref
-	if (! empty($arrayfields['f.titre']['checked']))
-	{
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
-	}
-	// Thirpdarty
-	if (! empty($arrayfields['s.nom']['checked']))
-	{
-		print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
-	}
-	if (! empty($arrayfields['f.total']['checked']))
-	{
-		// Amount net
-		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
-		print '</td>';
-	}
-	if (! empty($arrayfields['f.tva']['checked']))
-	{
-		// Amount Vat
-		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
-		print '</td>';
-	}
-	if (! empty($arrayfields['f.total_ttc']['checked']))
-	{
-		// Amount
-		print '<td class="liste_titre" align="right">';
-		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
-		print '</td>';
-	}
-	if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
-	{
-		// Payment term
-		print '<td class="liste_titre" align="right">';
-		print $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
-		print "</td>";
-	}
-	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
-	{
-		// Payment mode
-		print '<td class="liste_titre" align="right">';
-		print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
-		print '</td>';
-	}
-	if (! empty($arrayfields['recurring']['checked']))
-	{
-		// Recurring or not
-		print '<td class="liste_titre" align="center">';
-		print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
-		print '</td>';
-	}
-	if (! empty($arrayfields['f.frequency']['checked']))
-	{
-		// Recurring or not
-		print '<td class="liste_titre" align="center">';
-		print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
-		print '</td>';
-	}
-	if (! empty($arrayfields['f.unit_frequency']['checked']))
-	{
-		// Frequency unit
-		print '<td class="liste_titre" align="center">';
-		print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
-		print '</td>';
-	}
-	if (! empty($arrayfields['f.nb_gen_done']['checked']))
-	{
-		// Nb generation
-		print '<td class="liste_titre" align="center">';
-		print '</td>';
-	}
-	// Date invoice
-	if (! empty($arrayfields['f.date_last_gen']['checked']))
-	{
-		print '<td class="liste_titre nowraponall" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-		$formother->select_year($search_year?$search_year:-1,'search_year',1, 20, 5, 0, 0, '', 'witdhauto valignmiddle');
-		print '</td>';
-	}
-	// Date next generation
-	if (! empty($arrayfields['f.date_when']['checked']))
-	{
-		print '<td class="liste_titre nowraponall" align="center">';
-		if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">';
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">';
-		$formother->select_year($search_year_date_when?$search_year_date_when:-1,'search_year_date_when',1, 20, 5, 0, 0, '', 'witdhauto valignmiddle');
-		print '</td>';
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
-
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields);
-	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (! empty($arrayfields['f.datec']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Date modification
-	if (! empty($arrayfields['f.tms']['checked']))
-	{
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Status
-	if (! empty($arrayfields['status']['checked']))
-	{
-		print '<td class="liste_titre" align="center">';
-		$liststatus=array(
-			0=>$langs->trans("Draft"),
-			1=>$langs->trans("Active"),
-			-1=>$langs->trans("Disabled"),
-		);
-		print $form->selectarray('search_status', $liststatus, $search_status, -2);
-		print '</td>';
-	}
-	// Action column
-	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
-	print $searchpicto;
-	print '</td>';
-	print "</tr>\n";
-
-
-	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['f.titre']['checked']))         print_liste_field_titre($arrayfields['f.titre']['label'],$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
-	if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'],$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'],$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_cond_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'],$_SERVER['PHP_SELF'],"f.fk_cond_reglement","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER['PHP_SELF'],"f.fk_mode_reglement","",$param,'',$sortfield,$sortorder);
-	if (! empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'],$_SERVER['PHP_SELF'],"recurring","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.frequency']['checked']))     print_liste_field_titre($arrayfields['f.frequency']['label'],$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'],$_SERVER['PHP_SELF'],"f.unit_frequency","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.nb_gen_done']['checked']))   print_liste_field_titre($arrayfields['f.nb_gen_done']['label'],$_SERVER['PHP_SELF'],"f.nb_gen_done","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.date_last_gen']['checked'])) print_liste_field_titre($arrayfields['f.date_last_gen']['label'],$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.date_when']['checked']))     print_liste_field_titre($arrayfields['f.date_when']['label'],$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.datec']['checked']))         print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER['PHP_SELF'],"f.datec","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['f.tms']['checked']))           print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER['PHP_SELF'],"f.tms","",$param,'align="center"',$sortfield,$sortorder);
-	if (! empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'],$_SERVER['PHP_SELF'],"f.suspended,f.frequency","",$param,'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'nomaxwidthsearch ')."\n";
-	print "</tr>\n";
-
-	if ($num > 0)
-	{
-		$i=0;
-		$totalarray=array();
-		while ($i < min($num,$limit))
-		{
-			$objp = $db->fetch_object($resql);
-			if (empty($objp)) break;
-
-			$companystatic->id=$objp->socid;
-			$companystatic->name=$objp->name;
-
-			$invoicerectmp->id=$objp->id?$objp->id:$objp->facid;
-			$invoicerectmp->frequency=$objp->frequency;
-			$invoicerectmp->suspended=$objp->suspended;
-			$invoicerectmp->unit_frequency=$objp->unit_frequency;
-			$invoicerectmp->nb_gen_max=$objp->nb_gen_max;
-			$invoicerectmp->nb_gen_done=$objp->nb_gen_done;
-			$invoicerectmp->ref=$objp->titre;
-
-			print '<tr class="oddeven">';
-
-			if (! empty($arrayfields['f.titre']['checked']))
-			{
-			   print '<td>';
-			   print $invoicerectmp->getNomUrl(1);
-			   print "</a>";
-			   print "</td>\n";
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['s.nom']['checked']))
-			{
-			   print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['f.total']['checked']))
-			{
-			   print '<td align="right">'.price($objp->total).'</td>'."\n";
-			   if (! $i) $totalarray['nbfield']++;
-			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total';
-			   $totalarray['val']['f.total'] += $objp->total;
-			}
-			if (! empty($arrayfields['f.tva']['checked']))
-			{
-			   print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
-			   if (! $i) $totalarray['nbfield']++;
-			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva';
-			   $totalarray['val']['f.tva'] += $objp->total_vat;
-			}
-			if (! empty($arrayfields['f.total_ttc']['checked']))
-			{
-			   print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
-			   if (! $i) $totalarray['nbfield']++;
-			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc';
-			   $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
-			}
-			// Payment term
-			if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
-			{
-			   print '<td align="right">';
-			   print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
-			   print '</td>'."\n";
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			// Payment mode
-			if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
-			{
-			   print '<td align="right">';
-			   print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
-			   print '</td>'."\n";
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['recurring']['checked']))
-			{
-			   print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['f.frequency']['checked']))
-			{
-			   print '<td align="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['f.unit_frequency']['checked']))
-			{
-			   print '<td align="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['f.nb_gen_done']['checked']))
-			{
-				print '<td align="center">';
-				print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
-			}
-			// Date last generation
-			if (! empty($arrayfields['f.date_last_gen']['checked']))
-			{
-			   print '<td align="center">';
-			   print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			// Date next generation
-			if (! empty($arrayfields['f.date_when']['checked']))
-			{
-				print '<td align="center">';
-				print '<div class="nowraponall">';
-				print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-				if (! $invoicerectmp->isMaxNbGenReached())
-				{
-					if (! $objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
-				}
-				else
-				{
-					print img_info($langs->trans("MaxNumberOfGenerationReached"));
-				}
-				print '</div>';
-				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['f.datec']['checked']))
-			{
-			   print '<td align="center">';
-			   print dol_print_date($db->jdate($objp->datec),'dayhour');
-			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['f.tms']['checked']))
-			{
-			   print '<td align="center">';
-			   print dol_print_date($db->jdate($objp->tms),'dayhour');
-			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			if (! empty($arrayfields['status']['checked']))
-			{
-			   print '<td align="center">';
-			   print $invoicerectmp->getLibStatut(3,0);
-			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
-			}
-			// Action column
-			print '<td align="center">';
-			if ($user->rights->facture->creer && empty($invoicerectmp->suspended))
-			{
-				if ($invoicerectmp->isMaxNbGenReached())
-				{
-					print $langs->trans("MaxNumberOfGenerationReached");
-				}
-				elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
-				{
+    $num = $db->num_rows($resql);
+
+    $param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+    if ($socid)                     $param.='&socid='.urlencode($socid);
+    if ($search_day)                $param.='&search_day='.urlencode($search_day);
+    if ($search_month)              $param.='&search_month='.urlencode($search_month);
+    if ($search_year)               $param.='&search_year=' .urlencode($search_year);
+    if ($search_day_date_when)      $param.='&search_day_date_when='.urlencode($search_day_date_when);
+    if ($search_month_date_when)    $param.='&search_month_date_when='.urlencode($search_month_date_when);
+    if ($search_year_date_when)     $param.='&search_year_date_when=' .urlencode($search_year_date_when);
+    if ($search_ref)                $param.='&search_ref=' .urlencode($search_ref);
+    if ($search_societe)            $param.='&search_societe=' .urlencode($search_societe);
+    if ($search_montant_ht != '')   $param.='&search_montant_ht=' .urlencode($search_montant_ht);
+    if ($search_montant_vat != '')  $param.='&search_montant_vat='.urlencode($search_montant_vat);
+    if ($search_montant_ttc != '')  $param.='&search_montant_ttc='.urlencode($search_montant_ttc);
+    if ($search_payment_mode != '') $param.='&search_payment_mode='.urlencode($search_payment_mode);
+    if ($search_payment_type != '') $param.='&search_payment_type='.urlencode($search_payment_type);
+    if ($search_recurring != '' && $search_recurrning != '-1')    $param.='&search_recurring='  .urlencode($search_recurring);
+    if ($search_frequency > 0)        $param.='&search_frequency='  .urlencode($search_frequency);
+    if ($search_unit_frequency != '') $param.='&search_unit_frequency='.urlencode($search_unit_frequency);
+    if ($search_status != '')		$param.='&search_status='.urlencode($search_status);
+    if ($option)                    $param.="&option=".urlencode($option);
+    if ($optioncss != '')           $param.='&optioncss='.urlencode($optioncss);
+    // Add $param from extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+    $massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    //$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+
+    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+
+    print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','', $limit);
+
+    print $langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'<br><br>';
+
+    $i = 0;
+
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+    // Filters lines
+    print '<tr class="liste_titre_filter">';
+    // Ref
+    if (! empty($arrayfields['f.titre']['checked']))
+    {
+        print '<td class="liste_titre" align="left">';
+        print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+        print '</td>';
+    }
+    // Thirpdarty
+    if (! empty($arrayfields['s.nom']['checked']))
+    {
+        print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
+    }
+    if (! empty($arrayfields['f.total']['checked']))
+    {
+        // Amount net
+        print '<td class="liste_titre" align="right">';
+        print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['f.tva']['checked']))
+    {
+        // Amount Vat
+        print '<td class="liste_titre" align="right">';
+        print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['f.total_ttc']['checked']))
+    {
+        // Amount
+        print '<td class="liste_titre" align="right">';
+        print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
+    {
+        // Payment term
+        print '<td class="liste_titre" align="right">';
+        print $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
+        print "</td>";
+    }
+    if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+    {
+        // Payment mode
+        print '<td class="liste_titre" align="right">';
+        print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
+        print '</td>';
+    }
+    if (! empty($arrayfields['recurring']['checked']))
+    {
+        // Recurring or not
+        print '<td class="liste_titre" align="center">';
+        print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
+        print '</td>';
+    }
+    if (! empty($arrayfields['f.frequency']['checked']))
+    {
+        // Recurring or not
+        print '<td class="liste_titre" align="center">';
+        print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['f.unit_frequency']['checked']))
+    {
+        // Frequency unit
+        print '<td class="liste_titre" align="center">';
+        print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['f.nb_gen_done']['checked']))
+    {
+        // Nb generation
+        print '<td class="liste_titre" align="center">';
+        print '</td>';
+    }
+    // Date invoice
+    if (! empty($arrayfields['f.date_last_gen']['checked']))
+    {
+        print '<td class="liste_titre nowraponall" align="center">';
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+        print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
+        $formother->select_year($search_year?$search_year:-1,'search_year',1, 20, 5, 0, 0, '', 'witdhauto valignmiddle');
+        print '</td>';
+    }
+    // Date next generation
+    if (! empty($arrayfields['f.date_when']['checked']))
+    {
+        print '<td class="liste_titre nowraponall" align="center">';
+        if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">';
+        print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">';
+        $formother->select_year($search_year_date_when?$search_year_date_when:-1,'search_year_date_when',1, 20, 5, 0, 0, '', 'witdhauto valignmiddle');
+        print '</td>';
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Date creation
+    if (! empty($arrayfields['f.datec']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    // Date modification
+    if (! empty($arrayfields['f.tms']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    // Status
+    if (! empty($arrayfields['status']['checked']))
+    {
+        print '<td class="liste_titre" align="center">';
+        $liststatus=array(
+            0=>$langs->trans("Draft"),
+            1=>$langs->trans("Active"),
+            -1=>$langs->trans("Disabled"),
+        );
+        print $form->selectarray('search_status', $liststatus, $search_status, -2);
+        print '</td>';
+    }
+    // Action column
+    print '<td class="liste_titre" align="middle">';
+    $searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+    print $searchpicto;
+    print '</td>';
+    print "</tr>\n";
+
+
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['f.titre']['checked']))         print_liste_field_titre($arrayfields['f.titre']['label'],$_SERVER['PHP_SELF'],"f.titre","",$param,"",$sortfield,$sortorder);
+    if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER['PHP_SELF'],"s.nom","",$param,"",$sortfield,$sortorder);
+    if (! empty($arrayfields['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'],$_SERVER['PHP_SELF'],"f.total","",$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'],$_SERVER['PHP_SELF'],"f.tva","",$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'],$_SERVER['PHP_SELF'],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.fk_cond_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'],$_SERVER['PHP_SELF'],"f.fk_cond_reglement","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.fk_mode_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'],$_SERVER['PHP_SELF'],"f.fk_mode_reglement","",$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'],$_SERVER['PHP_SELF'],"recurring","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.frequency']['checked']))     print_liste_field_titre($arrayfields['f.frequency']['label'],$_SERVER['PHP_SELF'],"f.frequency","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'],$_SERVER['PHP_SELF'],"f.unit_frequency","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.nb_gen_done']['checked']))   print_liste_field_titre($arrayfields['f.nb_gen_done']['label'],$_SERVER['PHP_SELF'],"f.nb_gen_done","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.date_last_gen']['checked'])) print_liste_field_titre($arrayfields['f.date_last_gen']['label'],$_SERVER['PHP_SELF'],"f.date_last_gen","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.date_when']['checked']))     print_liste_field_titre($arrayfields['f.date_when']['label'],$_SERVER['PHP_SELF'],"f.date_when","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.datec']['checked']))         print_liste_field_titre($arrayfields['f.datec']['label'],$_SERVER['PHP_SELF'],"f.datec","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['f.tms']['checked']))           print_liste_field_titre($arrayfields['f.tms']['label'],$_SERVER['PHP_SELF'],"f.tms","",$param,'align="center"',$sortfield,$sortorder);
+    if (! empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'],$_SERVER['PHP_SELF'],"f.suspended,f.frequency","",$param,'align="center"',$sortfield,$sortorder);
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'nomaxwidthsearch ')."\n";
+    print "</tr>\n";
+
+    if ($num > 0)
+    {
+        $i=0;
+        $totalarray=array();
+        while ($i < min($num,$limit))
+        {
+            $objp = $db->fetch_object($resql);
+            if (empty($objp)) break;
+
+            $companystatic->id=$objp->socid;
+            $companystatic->name=$objp->name;
+
+            $invoicerectmp->id=$objp->id?$objp->id:$objp->facid;
+            $invoicerectmp->frequency=$objp->frequency;
+            $invoicerectmp->suspended=$objp->suspended;
+            $invoicerectmp->unit_frequency=$objp->unit_frequency;
+            $invoicerectmp->nb_gen_max=$objp->nb_gen_max;
+            $invoicerectmp->nb_gen_done=$objp->nb_gen_done;
+            $invoicerectmp->ref=$objp->titre;
+
+            print '<tr class="oddeven">';
+
+            if (! empty($arrayfields['f.titre']['checked']))
+            {
+                print '<td>';
+                print $invoicerectmp->getNomUrl(1);
+                print "</a>";
+                print "</td>\n";
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['s.nom']['checked']))
+            {
+                print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['f.total']['checked']))
+            {
+                print '<td align="right">'.price($objp->total).'</td>'."\n";
+                if (! $i) $totalarray['nbfield']++;
+                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total';
+                $totalarray['val']['f.total'] += $objp->total;
+            }
+            if (! empty($arrayfields['f.tva']['checked']))
+            {
+                print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
+                if (! $i) $totalarray['nbfield']++;
+                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva';
+                $totalarray['val']['f.tva'] += $objp->total_vat;
+            }
+            if (! empty($arrayfields['f.total_ttc']['checked']))
+            {
+                print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
+                if (! $i) $totalarray['nbfield']++;
+                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc';
+                $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
+            }
+            // Payment term
+            if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
+            {
+                print '<td align="right">';
+                print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
+                print '</td>'."\n";
+                if (! $i) $totalarray['nbfield']++;
+            }
+            // Payment mode
+            if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+            {
+                print '<td align="right">';
+                print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
+                print '</td>'."\n";
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['recurring']['checked']))
+            {
+                print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['f.frequency']['checked']))
+            {
+                print '<td align="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['f.unit_frequency']['checked']))
+            {
+                print '<td align="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['f.nb_gen_done']['checked']))
+            {
+                print '<td align="center">';
+                print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+                print '</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            // Date last generation
+            if (! empty($arrayfields['f.date_last_gen']['checked']))
+            {
+                print '<td align="center">';
+                print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen),'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+                print '</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            // Date next generation
+            if (! empty($arrayfields['f.date_when']['checked']))
+            {
+                print '<td align="center">';
+                print '<div class="nowraponall">';
+                print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached()?'<strike>':'').dol_print_date($db->jdate($objp->date_when),'day').($invoicerectmp->isMaxNbGenReached()?'</strike>':'') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+                if (! $invoicerectmp->isMaxNbGenReached())
+                {
+                    if (! $objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
+                }
+                else
+                {
+                    print img_info($langs->trans("MaxNumberOfGenerationReached"));
+                }
+                print '</div>';
+                print '</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['f.datec']['checked']))
+            {
+                print '<td align="center">';
+                print dol_print_date($db->jdate($objp->datec),'dayhour');
+                print '</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['f.tms']['checked']))
+            {
+                print '<td align="center">';
+                print dol_print_date($db->jdate($objp->tms),'dayhour');
+                print '</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            if (! empty($arrayfields['status']['checked']))
+            {
+                print '<td align="center">';
+                print $invoicerectmp->getLibStatut(3,0);
+                print '</td>';
+                if (! $i) $totalarray['nbfield']++;
+            }
+            // Action column
+            print '<td align="center">';
+            if ($user->rights->facture->creer && empty($invoicerectmp->suspended))
+            {
+                if ($invoicerectmp->isMaxNbGenReached())
+                {
+                    print $langs->trans("MaxNumberOfGenerationReached");
+                }
+                elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+                {
                     print '<a href="' . BASE_URI . '?controller=compta/facture&method=card&action=create&amp;socid=' . $objp->socid . '&amp;fac_rec=' . $objp->facid . '">';
-					print $langs->trans("CreateBill").'</a>';
-				}
-				else
-				{
-					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
-				}
-			}
-			else
-			{
-				print "&nbsp;";
-			}
-			if (! $i) $totalarray['nbfield']++;
-			print "</td>";
-
-			print "</tr>\n";
-
-			$i++;
-		}
-	}
-	else
-	{
-		$colspan=1;
-		foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
-		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
-	}
-
-	//var_dump($totalarray);
-	// Show total line
-	if (isset($totalarray['pos']))
-	{
-		print '<tr class="liste_total">';
-		$i=0;
-		while ($i < $totalarray['nbfield'])
-		{
-			$i++;
-			if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-			else
-			{
-				if ($i == 1)
-				{
-					if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-					else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-				}
-				else print '<td></td>';
-			}
-		}
-		print '</tr>';
-	}
-
-	print "</table>";
-	print "</div>";
-	print "</form>";
-
-	$db->free($resql);
+                    print $langs->trans("CreateBill").'</a>';
+                }
+                else
+                {
+                    print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
+                }
+            }
+            else
+            {
+                print "&nbsp;";
+            }
+            if (! $i) $totalarray['nbfield']++;
+            print "</td>";
+
+            print "</tr>\n";
+
+            $i++;
+        }
+    }
+    else
+    {
+        $colspan=1;
+        foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+        print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+    }
+
+    //var_dump($totalarray);
+    // Show total line
+    if (isset($totalarray['pos']))
+    {
+        print '<tr class="liste_total">';
+        $i=0;
+        while ($i < $totalarray['nbfield'])
+        {
+            $i++;
+            if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+            else
+            {
+                if ($i == 1)
+                {
+                    if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+                    else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+                }
+                else print '<td></td>';
+            }
+        }
+        print '</tr>';
+    }
+
+    print "</table>";
+    print "</div>";
+    print "</form>";
+
+    $db->free($resql);
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 // End of page

dolibarr/htdocs/compta/facture/fiche-rec.php

Indentation +1424 added lines, -1424 removed lines

@@ -38,8 +38,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (! empty($conf->projet->enabled)) {
-	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
-	//include_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    //include_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
@@ -84,11 +84,11 @@ 
 $object = new FactureRec($db);
 if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
 {
-	$ret = $object->fetch($id, $ref);
-	if (!$ret)
-	{
-		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
-	}
+    $ret = $object->fetch($id, $ref);
+    if (!$ret)
+    {
+        setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
+    }
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -119,564 +119,564 @@ 
 
 if (empty($reshook))
 {
-	if (GETPOST('cancel','alpha')) $action='';
+    if (GETPOST('cancel','alpha')) $action='';
 
-	// Selection of new fields
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	// Set note
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	    // Must be include, not include_once
+    // Set note
+    include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	    // Must be include, not include_once
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+    include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-	// Mass actions
-	/*$objectclass='MyObject';
+    // Mass actions
+    /*$objectclass='MyObject';
     $objectlabel='MyObject';
     $permtoread = $user->rights->mymodule->read;
     $permtodelete = $user->rights->mymodule->delete;
     $uploaddir = $conf->mymodule->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
 
-	// Create predefined invoice
-	if ($action == 'add')
-	{
-		if (! GETPOST('titre'))
-		{
-			setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), null, 'errors');
-			$action = "create";
-			$error++;
-		}
-
-		$frequency=GETPOST('frequency', 'int');
-		$reyear=GETPOST('reyear');
-		$remonth=GETPOST('remonth');
-		$reday=GETPOST('reday');
-		$rehour=GETPOST('rehour');
-		$remin=GETPOST('remin');
-		$nb_gen_max=GETPOST('nb_gen_max', 'int');
-		//if (empty($nb_gen_max)) $nb_gen_max =0;
-
-		if (GETPOST('frequency'))
-		{
-			if (empty($reyear) || empty($remonth) || empty($reday))
-			{
-				setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Date")), null, 'errors');
-				$action = "create";
-				$error++;
-			}
-			if ($nb_gen_max === '')
-			{
-				setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("MaxPeriodNumber")), null, 'errors');
-				$action = "create";
-				$error++;
-			}
-		}
-
-		if (! $error)
-		{
-			$object->titre = GETPOST('titre', 'alpha');
-			$object->note_private = GETPOST('note_private','none');
+    // Create predefined invoice
+    if ($action == 'add')
+    {
+        if (! GETPOST('titre'))
+        {
+            setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), null, 'errors');
+            $action = "create";
+            $error++;
+        }
+
+        $frequency=GETPOST('frequency', 'int');
+        $reyear=GETPOST('reyear');
+        $remonth=GETPOST('remonth');
+        $reday=GETPOST('reday');
+        $rehour=GETPOST('rehour');
+        $remin=GETPOST('remin');
+        $nb_gen_max=GETPOST('nb_gen_max', 'int');
+        //if (empty($nb_gen_max)) $nb_gen_max =0;
+
+        if (GETPOST('frequency'))
+        {
+            if (empty($reyear) || empty($remonth) || empty($reday))
+            {
+                setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Date")), null, 'errors');
+                $action = "create";
+                $error++;
+            }
+            if ($nb_gen_max === '')
+            {
+                setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("MaxPeriodNumber")), null, 'errors');
+                $action = "create";
+                $error++;
+            }
+        }
+
+        if (! $error)
+        {
+            $object->titre = GETPOST('titre', 'alpha');
+            $object->note_private = GETPOST('note_private','none');
             $object->note_public  = GETPOST('note_public','none');
             $object->modelpdf = GETPOST('modelpdf', 'alpha');
-			$object->usenewprice = GETPOST('usenewprice');
+            $object->usenewprice = GETPOST('usenewprice');
 
-			$object->frequency = $frequency;
-			$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
-			$object->nb_gen_max = $nb_gen_max;
-			$object->auto_validate = GETPOST('auto_validate', 'int');
+            $object->frequency = $frequency;
+            $object->unit_frequency = GETPOST('unit_frequency', 'alpha');
+            $object->nb_gen_max = $nb_gen_max;
+            $object->auto_validate = GETPOST('auto_validate', 'int');
             $object->generate_pdf = GETPOST('generate_pdf', 'int');
-			$object->fk_project = $projectid;
-
-			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
-			$object->date_when = $date_next_execution;
-
-			// Get first contract linked to invoice used to generate template (facid is id of source invoice)
-			if (GETPOST('facid','int') > 0)
-			{
-				$srcObject = new Facture($db);
-				$srcObject->fetch(GETPOST('facid','int'));
-
-				$srcObject->fetchObjectLinked();
-
-				if (! empty($srcObject->linkedObjectsIds['contrat']))
-				{
-					$contractidid = reset($srcObject->linkedObjectsIds['contrat']);
-
-					$object->origin = 'contrat';
-					$object->origin_id = $contractidid;
-					$object->linked_objects[$object->origin] = $object->origin_id;
-				}
-			}
-
-			$db->begin();
-
-			$oldinvoice = new Facture($db);
-			$oldinvoice->fetch(GETPOST('facid','int'));
-
-			$result = $object->create($user, $oldinvoice->id);
-			if ($result > 0)
-			{
-				$result=$oldinvoice->delete($user, 1);
-				if ($result < 0)
-				{
-					$error++;
-					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
-					$action = "create";
-				}
-			}
-			else
-			{
-				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = "create";
-			}
-
-			if (! $error)
-			{
-				$db->commit();
-
-				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
-	   			exit;
-			}
-			else
-			{
-				$db->rollback();
-
-				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = "create";
-			}
-		}
-	}
-
-	// Delete
-	if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && $user->rights->facture->supprimer)
-	{
-		$object->delete($user);
+            $object->fk_project = $projectid;
+
+            $date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
+            $object->date_when = $date_next_execution;
+
+            // Get first contract linked to invoice used to generate template (facid is id of source invoice)
+            if (GETPOST('facid','int') > 0)
+            {
+                $srcObject = new Facture($db);
+                $srcObject->fetch(GETPOST('facid','int'));
+
+                $srcObject->fetchObjectLinked();
+
+                if (! empty($srcObject->linkedObjectsIds['contrat']))
+                {
+                    $contractidid = reset($srcObject->linkedObjectsIds['contrat']);
+
+                    $object->origin = 'contrat';
+                    $object->origin_id = $contractidid;
+                    $object->linked_objects[$object->origin] = $object->origin_id;
+                }
+            }
+
+            $db->begin();
+
+            $oldinvoice = new Facture($db);
+            $oldinvoice->fetch(GETPOST('facid','int'));
+
+            $result = $object->create($user, $oldinvoice->id);
+            if ($result > 0)
+            {
+                $result=$oldinvoice->delete($user, 1);
+                if ($result < 0)
+                {
+                    $error++;
+                    setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
+                    $action = "create";
+                }
+            }
+            else
+            {
+                $error++;
+                setEventMessages($object->error, $object->errors, 'errors');
+                $action = "create";
+            }
+
+            if (! $error)
+            {
+                $db->commit();
+
+                header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
+                    exit;
+            }
+            else
+            {
+                $db->rollback();
+
+                $error++;
+                setEventMessages($object->error, $object->errors, 'errors');
+                $action = "create";
+            }
+        }
+    }
+
+    // Delete
+    if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && $user->rights->facture->supprimer)
+    {
+        $object->delete($user);
 
         header("Location: " . BASE_URI . 'controller=compta/facture&method=invoicetemplate_list');
-		exit;
-	}
-
-
-	// Update field
-	// Set condition
-	if ($action == 'setconditions' && $user->rights->facture->creer)
-	{
-		$result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-	// Set mode
-	elseif ($action == 'setmode' && $user->rights->facture->creer)
-	{
-		$result=$object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-	// Set project
-	elseif ($action == 'classin' && $user->rights->facture->creer)
-	{
-		$object->setProject(GETPOST('projectid', 'int'));
-	}
-	// Set bank account
-	elseif ($action == 'setref' && $user->rights->facture->creer)
-	{
-		//var_dump(GETPOST('ref', 'alpha'));exit;
-		$result=$object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
-		if ($result > 0)
-		{
-			$object->titre = GETPOST('ref', 'alpha');
-			$object->ref = $object->titre;
-		}
-		else dol_print_error($db, $object->error, $object->errors);
-	}
-	// Set bank account
-	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
-	{
-		$result=$object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-	// Set frequency and unit frequency
-	elseif ($action == 'setfrequency' && $user->rights->facture->creer)
-	{
-		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
-	}
-	// Set next date of execution
-	elseif ($action == 'setdate_when' && $user->rights->facture->creer)
-	{
-		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
-		if (!empty($date)) $object->setNextDate($date);
-	}
-	// Set max period
-	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
-	{
-		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
-	}
-	// Set auto validate
-	elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
-	{
-		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
+        exit;
+    }
+
+
+    // Update field
+    // Set condition
+    if ($action == 'setconditions' && $user->rights->facture->creer)
+    {
+        $result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+    }
+    // Set mode
+    elseif ($action == 'setmode' && $user->rights->facture->creer)
+    {
+        $result=$object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+    }
+    // Set project
+    elseif ($action == 'classin' && $user->rights->facture->creer)
+    {
+        $object->setProject(GETPOST('projectid', 'int'));
+    }
+    // Set bank account
+    elseif ($action == 'setref' && $user->rights->facture->creer)
+    {
+        //var_dump(GETPOST('ref', 'alpha'));exit;
+        $result=$object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
+        if ($result > 0)
+        {
+            $object->titre = GETPOST('ref', 'alpha');
+            $object->ref = $object->titre;
+        }
+        else dol_print_error($db, $object->error, $object->errors);
+    }
+    // Set bank account
+    elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
+    {
+        $result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+    }
+    // Set frequency and unit frequency
+    elseif ($action == 'setfrequency' && $user->rights->facture->creer)
+    {
+        $object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+    }
+    // Set next date of execution
+    elseif ($action == 'setdate_when' && $user->rights->facture->creer)
+    {
+        $date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
+        if (!empty($date)) $object->setNextDate($date);
+    }
+    // Set max period
+    elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
+    {
+        $object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
+    }
+    // Set auto validate
+    elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
+    {
+        $object->setAutoValidate(GETPOST('auto_validate', 'int'));
     }
     // Set generate pdf
-	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
-	{
-		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
-	}
+    elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
+    {
+        $object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
+    }
     // Set model pdf
-	elseif ($action == 'setmodelpdf' && $user->rights->facture->creer)
-	{
-		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
-	}
-
-	// Set status disabled
-	elseif ($action == 'disable' && $user->rights->facture->creer)
-	{
-		$db->begin();
-
-		$object->fetch($id);
-
-		$res = $object->setValueFrom('suspended', 1);
-		if ($res <= 0)
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-		}
-		else
-		{
-			$db->rollback();
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-
-	// Set status enabled
-	elseif ($action == 'enable' && $user->rights->facture->creer)
-	{
-		$db->begin();
-
-		$object->fetch($id);
-
-		$res = $object->setValueFrom('suspended', 0);
-		if ($res <= 0)
-		{
-			$error++;
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-		}
-		else
-		{
-			$db->rollback();
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-
-	// Delete line
-	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer)
-	{
-		$object->fetch($id);
-		$object->fetch_thirdparty();
-
-		$db->begin();
-
-		$line=new FactureLigneRec($db);
-
-		// For triggers
-		$line->id = $lineid;
-
-		if ($line->delete($user) > 0)
-		{
-			$result=$object->update_price(1);
-
-			if ($result > 0)
-			{
-				$db->commit();
-				$object->fetch($object->id);    // Reload lines
-			}
-			else
-			{
-				$db->rollback();
-				setEventMessages($db->lasterror(), null, 'errors');
-			}
-		}
-		else
-		{
-			$db->rollback();
-			setEventMessages($line->error, $line->errors, 'errors');
-		}
-	}
-	else if ($action == 'update_extras')
-	{
-		$object->oldcopy = dol_clone($object);
-
-		// Fill array 'array_options' with data from update form
-		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
-		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-		if ($ret < 0) $error++;
-
-		if (! $error)
-		{
-			$result = $object->insertExtraFields('BILLREC_MODIFY');
-			if ($result < 0)
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$error++;
-			}
-		}
-	}
-
-	// Add a new line
-	if ($action == 'addline' && $user->rights->facture->creer)
-	{
-		$langs->load('errors');
-		$error = 0;
-
-		// Set if we used free entry or predefined product
-		$predef='';
-		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
-		$price_ht = GETPOST('price_ht');
-		if (GETPOST('prod_entry_mode') == 'free')
-		{
-			$idprod=0;
-			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
-			$idprod=GETPOST('idprod', 'int');
-			$tva_tx = '';
-		}
-
-		$qty = GETPOST('qty' . $predef);
-		$remise_percent = GETPOST('remise_percent' . $predef);
-
-		// Extrafields
-		$extrafieldsline = new ExtraFields($db);
-		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
-		// Unset extrafield
-		if (is_array($extralabelsline))
-		{
-			// Get extra fields
-			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key . $predef]);
-			}
-		}
-
-		if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
-			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
-			$error ++;
-		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
-			$error ++;
-		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
-			$error ++;
-		}
-		if ($qty == '') {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
-			$error ++;
-		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
-			$error ++;
-		}
-		if ($qty < 0) {
-			$langs->load("errors");
-			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
-			$error ++;
-		}
-
-		if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod)))
-		{
-		$ret = $object->fetch($id);
-		if ($ret < 0) {
-			dol_print_error($db, $object->error);
-			exit();
-		}
-		$ret = $object->fetch_thirdparty();
-
-		// Clean parameters
-		$date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
-		$date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
-		$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
-
-		// Define special_code for special lines
-		$special_code = 0;
-		// if (empty($_POST['qty'])) $special_code=3; // Options should not exists on invoices
-
-		// Ecrase $pu par celui du produit
-		// Ecrase $desc par celui du produit
-		// Ecrase $tva_tx par celui du produit
-		// Ecrase $base_price_type par celui du produit
-		// Replaces $fk_unit with the product's
-		if (! empty($idprod))
-			{
-			$prod = new Product($db);
-			$prod->fetch($idprod);
-
-			$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
-
-			// Update if prices fields are defined
-			$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
-			$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-			if (empty($tva_tx)) $tva_npr=0;
-
-			$pu_ht = $prod->price;
-			$pu_ttc = $prod->price_ttc;
-			$price_min = $prod->price_min;
-			$price_base_type = $prod->price_base_type;
-
-			// We define price for product
-			if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
-			{
-				$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
-				$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
-				$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
-				$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-				if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
-				{
-					if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
-					if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
-					if (empty($tva_tx)) $tva_npr=0;
-				}
-			}
-			elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
-
-				$prodcustprice = new Productcustomerprice($db);
-
-				$filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
-
-				$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-				if ($result)
-				{
-					if (count($prodcustprice->lines) > 0)
-					{
-						$pu_ht = price($prodcustprice->lines[0]->price);
-						$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-						$price_base_type = $prodcustprice->lines[0]->price_base_type;
-						$tva_tx = $prodcustprice->lines[0]->tva_tx;
-						if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
-						$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-						if (empty($tva_tx)) $tva_npr=0;
-					}
-				}
-			}
-
-			$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
-			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
-
-			// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
-			if (! empty($price_ht))
-			{
-				$pu_ht = price2num($price_ht, 'MU');
-				$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-			}
-			// On reevalue prix selon taux tva car taux tva transaction peut etre different
-			// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-			elseif ($tmpvat != $tmpprodvat)
-			{
-				if ($price_base_type != 'HT')
-				{
-					$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-				}
-				else
-				{
-					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-			}
-
-			$desc = '';
-
-			// Define output language
-			if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-			{
-				$outputlangs = $langs;
-				$newlang = '';
-				if (empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
-				if (empty($newlang))
-					$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang))
-				{
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-
-				$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
-			}
-			else
-			{
-				$desc = $prod->description;
-			}
-
-					$desc = dol_concatdesc($desc, $product_desc);
-
-			// Add custom code and origin country into description
-			if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
-			{
-				$tmptxt = '(';
-				if (! empty($prod->customcode))
-					$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
-				if (! empty($prod->customcode) && ! empty($prod->country_code))
-					$tmptxt .= ' - ';
-				if (! empty($prod->country_code))
-					$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
-				$tmptxt .= ')';
-				$desc = dol_concatdesc($desc, $tmptxt);
-			}
-
-			$type = $prod->type;
-			$fk_unit = $prod->fk_unit;
-		}
-		else
-		{
-			$pu_ht = price2num($price_ht, 'MU');
-			$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
-			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
-			$tva_tx = str_replace('*', '', $tva_tx);
-			if (empty($tva_tx)) $tva_npr=0;
-			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
-			$desc = $product_desc;
-			$type = GETPOST('type');
-			$fk_unit= GETPOST('units', 'alpha');
-		}
-
-		$date_start_fill = GETPOST('date_start_fill','int');
-		$date_end_fill = GETPOST('date_end_fill','int');
-
-		// Margin
-		$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-		$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we must keep this value
-
-		// Local Taxes
-		$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
-		$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
-
-		$info_bits = 0;
-		if ($tva_npr)
-			$info_bits |= 0x01;
-
-		if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))))
-		{
-			$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-			setEventMessages($mesg, null, 'errors');
-		}
-		else
-		{
-			// Insert line
-			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx,$localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill);
-
-			if ($result > 0)
-			{
-				/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+    elseif ($action == 'setmodelpdf' && $user->rights->facture->creer)
+    {
+        $object->setModelpdf(GETPOST('modelpdf', 'alpha'));
+    }
+
+    // Set status disabled
+    elseif ($action == 'disable' && $user->rights->facture->creer)
+    {
+        $db->begin();
+
+        $object->fetch($id);
+
+        $res = $object->setValueFrom('suspended', 1);
+        if ($res <= 0)
+        {
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+        }
+        else
+        {
+            $db->rollback();
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    // Set status enabled
+    elseif ($action == 'enable' && $user->rights->facture->creer)
+    {
+        $db->begin();
+
+        $object->fetch($id);
+
+        $res = $object->setValueFrom('suspended', 0);
+        if ($res <= 0)
+        {
+            $error++;
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+        }
+        else
+        {
+            $db->rollback();
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
+
+    // Delete line
+    if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer)
+    {
+        $object->fetch($id);
+        $object->fetch_thirdparty();
+
+        $db->begin();
+
+        $line=new FactureLigneRec($db);
+
+        // For triggers
+        $line->id = $lineid;
+
+        if ($line->delete($user) > 0)
+        {
+            $result=$object->update_price(1);
+
+            if ($result > 0)
+            {
+                $db->commit();
+                $object->fetch($object->id);    // Reload lines
+            }
+            else
+            {
+                $db->rollback();
+                setEventMessages($db->lasterror(), null, 'errors');
+            }
+        }
+        else
+        {
+            $db->rollback();
+            setEventMessages($line->error, $line->errors, 'errors');
+        }
+    }
+    else if ($action == 'update_extras')
+    {
+        $object->oldcopy = dol_clone($object);
+
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
+        if ($ret < 0) $error++;
+
+        if (! $error)
+        {
+            $result = $object->insertExtraFields('BILLREC_MODIFY');
+            if ($result < 0)
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
+            }
+        }
+    }
+
+    // Add a new line
+    if ($action == 'addline' && $user->rights->facture->creer)
+    {
+        $langs->load('errors');
+        $error = 0;
+
+        // Set if we used free entry or predefined product
+        $predef='';
+        $product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+        $price_ht = GETPOST('price_ht');
+        if (GETPOST('prod_entry_mode') == 'free')
+        {
+            $idprod=0;
+            $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+        }
+        else
+        {
+            $idprod=GETPOST('idprod', 'int');
+            $tva_tx = '';
+        }
+
+        $qty = GETPOST('qty' . $predef);
+        $remise_percent = GETPOST('remise_percent' . $predef);
+
+        // Extrafields
+        $extrafieldsline = new ExtraFields($db);
+        $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+        $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline, $predef);
+        // Unset extrafield
+        if (is_array($extralabelsline))
+        {
+            // Get extra fields
+            foreach ($extralabelsline as $key => $value) {
+                unset($_POST["options_" . $key . $predef]);
+            }
+        }
+
+        if (empty($idprod) && ($price_ht < 0) && ($qty < 0)) {
+            setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+            $error ++;
+        }
+        if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
+            $error ++;
+        }
+        if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
+        {
+            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
+            $error ++;
+        }
+        if ($qty == '') {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+            $error ++;
+        }
+        if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
+            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
+            $error ++;
+        }
+        if ($qty < 0) {
+            $langs->load("errors");
+            setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
+            $error ++;
+        }
+
+        if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod)))
+        {
+        $ret = $object->fetch($id);
+        if ($ret < 0) {
+            dol_print_error($db, $object->error);
+            exit();
+        }
+        $ret = $object->fetch_thirdparty();
+
+        // Clean parameters
+        $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
+        $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+        $price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
+
+        // Define special_code for special lines
+        $special_code = 0;
+        // if (empty($_POST['qty'])) $special_code=3; // Options should not exists on invoices
+
+        // Ecrase $pu par celui du produit
+        // Ecrase $desc par celui du produit
+        // Ecrase $tva_tx par celui du produit
+        // Ecrase $base_price_type par celui du produit
+        // Replaces $fk_unit with the product's
+        if (! empty($idprod))
+            {
+            $prod = new Product($db);
+            $prod->fetch($idprod);
+
+            $label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
+
+            // Update if prices fields are defined
+            $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+            $tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
+            if (empty($tva_tx)) $tva_npr=0;
+
+            $pu_ht = $prod->price;
+            $pu_ttc = $prod->price_ttc;
+            $price_min = $prod->price_min;
+            $price_base_type = $prod->price_base_type;
+
+            // We define price for product
+            if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+            {
+                $pu_ht = $prod->multiprices[$object->thirdparty->price_level];
+                $pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
+                $price_min = $prod->multiprices_min[$object->thirdparty->price_level];
+                $price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
+                if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+                {
+                    if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+                    if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+                    if (empty($tva_tx)) $tva_npr=0;
+                }
+            }
+            elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+
+                $prodcustprice = new Productcustomerprice($db);
+
+                $filter = array('t.fk_product' => $prod->id,'t.fk_soc' => $object->thirdparty->id);
+
+                $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+                if ($result)
+                {
+                    if (count($prodcustprice->lines) > 0)
+                    {
+                        $pu_ht = price($prodcustprice->lines[0]->price);
+                        $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+                        $price_base_type = $prodcustprice->lines[0]->price_base_type;
+                        $tva_tx = $prodcustprice->lines[0]->tva_tx;
+                        if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+                        $tva_npr = $prodcustprice->lines[0]->recuperableonly;
+                        if (empty($tva_tx)) $tva_npr=0;
+                    }
+                }
+            }
+
+            $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
+            $tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
+
+            // if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
+            if (! empty($price_ht))
+            {
+                $pu_ht = price2num($price_ht, 'MU');
+                $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+            }
+            // On reevalue prix selon taux tva car taux tva transaction peut etre different
+            // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+            elseif ($tmpvat != $tmpprodvat)
+            {
+                if ($price_base_type != 'HT')
+                {
+                    $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+                }
+                else
+                {
+                    $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+                }
+            }
+
+            $desc = '';
+
+            // Define output language
+            if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+            {
+                $outputlangs = $langs;
+                $newlang = '';
+                if (empty($newlang) && GETPOST('lang_id','aZ09'))
+                    $newlang = GETPOST('lang_id','aZ09');
+                if (empty($newlang))
+                    $newlang = $object->thirdparty->default_lang;
+                if (! empty($newlang))
+                {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+
+                $desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+            }
+            else
+            {
+                $desc = $prod->description;
+            }
+
+                    $desc = dol_concatdesc($desc, $product_desc);
+
+            // Add custom code and origin country into description
+            if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
+            {
+                $tmptxt = '(';
+                if (! empty($prod->customcode))
+                    $tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+                if (! empty($prod->customcode) && ! empty($prod->country_code))
+                    $tmptxt .= ' - ';
+                if (! empty($prod->country_code))
+                    $tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+                $tmptxt .= ')';
+                $desc = dol_concatdesc($desc, $tmptxt);
+            }
+
+            $type = $prod->type;
+            $fk_unit = $prod->fk_unit;
+        }
+        else
+        {
+            $pu_ht = price2num($price_ht, 'MU');
+            $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+            $tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
+            $tva_tx = str_replace('*', '', $tva_tx);
+            if (empty($tva_tx)) $tva_npr=0;
+            $label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+            $desc = $product_desc;
+            $type = GETPOST('type');
+            $fk_unit= GETPOST('units', 'alpha');
+        }
+
+        $date_start_fill = GETPOST('date_start_fill','int');
+        $date_end_fill = GETPOST('date_end_fill','int');
+
+        // Margin
+        $fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
+        $buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we must keep this value
+
+        // Local Taxes
+        $localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+        $localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
+
+        $info_bits = 0;
+        if ($tva_npr)
+            $info_bits |= 0x01;
+
+        if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))))
+        {
+            $mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
+            setEventMessages($mesg, null, 'errors');
+        }
+        else
+        {
+            // Insert line
+            $result = $object->addline($desc, $pu_ht, $qty, $tva_tx,$localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill);
+
+            if ($result > 0)
+            {
+                /*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
     			{
     			    // Define output language
     			    $outputlangs = $langs;
@@ -693,117 +693,117 @@ 
     			    $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			    if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
     			}*/
-				$object->fetch($object->id);    // Reload lines
-
-				unset($_POST['prod_entry_mode']);
-
-				unset($_POST['qty']);
-				unset($_POST['type']);
-				unset($_POST['remise_percent']);
-				unset($_POST['price_ht']);
-				unset($_POST['multicurrency_price_ht']);
-				unset($_POST['price_ttc']);
-				unset($_POST['tva_tx']);
-				unset($_POST['product_ref']);
-				unset($_POST['product_label']);
-				unset($_POST['product_desc']);
-				unset($_POST['fournprice']);
-				unset($_POST['buying_price']);
-				unset($_POST['np_marginRate']);
-				unset($_POST['np_markRate']);
-				unset($_POST['dp_desc']);
-				unset($_POST['idprod']);
-				unset($_POST['units']);
-
-				unset($_POST['date_starthour']);
-				unset($_POST['date_startmin']);
-				unset($_POST['date_startsec']);
-				unset($_POST['date_startday']);
-				unset($_POST['date_startmonth']);
-				unset($_POST['date_startyear']);
-				unset($_POST['date_endhour']);
-				unset($_POST['date_endmin']);
-				unset($_POST['date_endsec']);
-				unset($_POST['date_endday']);
-				unset($_POST['date_endmonth']);
-				unset($_POST['date_endyear']);
-
-				unset($_POST['date_start_fill']);
-				unset($_POST['date_end_fill']);
-
-				unset($_POST['situations']);
-				unset($_POST['progress']);
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-
-			$action = '';
-		}
-		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
-	{
-		if (! $object->fetch($id) > 0)	dol_print_error($db);
-		$object->fetch_thirdparty();
-
-		// Clean parameters
-		$date_start = '';
-		$date_end = '';
-		//$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
-		//$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-		$description = dol_htmlcleanlastbr(GETPOST('product_desc','none') ? GETPOST('product_desc','none') : GETPOST('desc','none'));
-		$pu_ht = GETPOST('price_ht');
-		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		$qty = GETPOST('qty');
-		$pu_ht_devise = GETPOST('multicurrency_subprice');
-
-		// Define info_bits
-		$info_bits = 0;
-		if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
-
-		// Define vat_rate
-		$vat_rate = str_replace('*', '', $vat_rate);
-		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
-		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
-
-		// Add buying price
-		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');       // If buying_price is '0', we muste keep this value
-
-		// Extrafields
-		$extrafieldsline = new ExtraFields($db);
-		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
-
-		$objectline = new FactureLigneRec($db);
-		if ($objectline->fetch(GETPOST('lineid')))
-		{
-			$objectline->array_options=$array_options;
-			$result=$objectline->insertExtraFields();
-			if ($result < 0)
-			{
-				setEventMessages($langs->trans('Error').$result, null, 'errors');
-			}
-		}
-
-		// Unset extrafield
-		if (is_array($extralabelsline))
-		{
-			// Get extra fields
-			foreach ($extralabelsline as $key => $value)
-			{
-				 unset($_POST["options_" . $key]);
-			}
-		}
-
-		// Define special_code for special lines
-		$special_code=GETPOST('special_code');
-		if (! GETPOST('qty')) $special_code=3;
-
-		/*$line = new FactureLigne($db);
+                $object->fetch($object->id);    // Reload lines
+
+                unset($_POST['prod_entry_mode']);
+
+                unset($_POST['qty']);
+                unset($_POST['type']);
+                unset($_POST['remise_percent']);
+                unset($_POST['price_ht']);
+                unset($_POST['multicurrency_price_ht']);
+                unset($_POST['price_ttc']);
+                unset($_POST['tva_tx']);
+                unset($_POST['product_ref']);
+                unset($_POST['product_label']);
+                unset($_POST['product_desc']);
+                unset($_POST['fournprice']);
+                unset($_POST['buying_price']);
+                unset($_POST['np_marginRate']);
+                unset($_POST['np_markRate']);
+                unset($_POST['dp_desc']);
+                unset($_POST['idprod']);
+                unset($_POST['units']);
+
+                unset($_POST['date_starthour']);
+                unset($_POST['date_startmin']);
+                unset($_POST['date_startsec']);
+                unset($_POST['date_startday']);
+                unset($_POST['date_startmonth']);
+                unset($_POST['date_startyear']);
+                unset($_POST['date_endhour']);
+                unset($_POST['date_endmin']);
+                unset($_POST['date_endsec']);
+                unset($_POST['date_endday']);
+                unset($_POST['date_endmonth']);
+                unset($_POST['date_endyear']);
+
+                unset($_POST['date_start_fill']);
+                unset($_POST['date_end_fill']);
+
+                unset($_POST['situations']);
+                unset($_POST['progress']);
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+
+            $action = '';
+        }
+        }
+    }
+
+    elseif ($action == 'updateline' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
+    {
+        if (! $object->fetch($id) > 0)	dol_print_error($db);
+        $object->fetch_thirdparty();
+
+        // Clean parameters
+        $date_start = '';
+        $date_end = '';
+        //$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
+        //$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+        $description = dol_htmlcleanlastbr(GETPOST('product_desc','none') ? GETPOST('product_desc','none') : GETPOST('desc','none'));
+        $pu_ht = GETPOST('price_ht');
+        $vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+        $qty = GETPOST('qty');
+        $pu_ht_devise = GETPOST('multicurrency_subprice');
+
+        // Define info_bits
+        $info_bits = 0;
+        if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
+
+        // Define vat_rate
+        $vat_rate = str_replace('*', '', $vat_rate);
+        $localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
+        $localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
+
+        // Add buying price
+        $fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
+        $buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');       // If buying_price is '0', we muste keep this value
+
+        // Extrafields
+        $extrafieldsline = new ExtraFields($db);
+        $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+        $array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+
+        $objectline = new FactureLigneRec($db);
+        if ($objectline->fetch(GETPOST('lineid')))
+        {
+            $objectline->array_options=$array_options;
+            $result=$objectline->insertExtraFields();
+            if ($result < 0)
+            {
+                setEventMessages($langs->trans('Error').$result, null, 'errors');
+            }
+        }
+
+        // Unset extrafield
+        if (is_array($extralabelsline))
+        {
+            // Get extra fields
+            foreach ($extralabelsline as $key => $value)
+            {
+                    unset($_POST["options_" . $key]);
+            }
+        }
+
+        // Define special_code for special lines
+        $special_code=GETPOST('special_code');
+        if (! GETPOST('qty')) $special_code=3;
+
+        /*$line = new FactureLigne($db);
         $line->fetch(GETPOST('lineid'));
         $percent = $line->get_prev_progress($object->id);
 
@@ -815,77 +815,77 @@ 
                 $result = -1;
         }*/
 
-		// Check minimum price
-		$productid = GETPOST('productid', 'int');
-		if (! empty($productid))
-		{
-			$product = new Product($db);
-			$product->fetch($productid);
-
-			$type = $product->type;
-
-			$price_min = $product->price_min;
-			if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
-				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
-
-			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
-
-			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))))
-			{
-				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
-				$error ++;
-			}
-		} else {
-			$type = GETPOST('type');
-			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
-
-				// Check parameters
-				if (GETPOST('type') < 0) {
-					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-					$error ++;
-				}
-			}
-		if ($qty < 0) {
-			$langs->load("errors");
-			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
-			$error ++;
-		}
-
-		$date_start_fill = GETPOST('date_start_fill','int');
-		$date_end_fill = GETPOST('date_end_fill','int');
-
-		// Update line
-		if (! $error)
-		{
-			$result = $object->updateline(
-				GETPOST('lineid'),
-				$description,
-				$pu_ht,
-				$qty,
-				$vat_rate,
-				$localtax1_rate,
-				$localtax1_rate,
-				GETPOST('productid'),
-				GETPOST('remise_percent'),
-				'HT',
-				$info_bits,
-				0,
-				0,
-				$type,
-				0,
-				$special_code,
-				$label,
-				GETPOST('units'),
-				$pu_ht_devise,
-				0,
-				$date_start_fill,
-				$date_end_fill
-			);
-
-			if ($result >= 0)
-			{
-					/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+        // Check minimum price
+        $productid = GETPOST('productid', 'int');
+        if (! empty($productid))
+        {
+            $product = new Product($db);
+            $product->fetch($productid);
+
+            $type = $product->type;
+
+            $price_min = $product->price_min;
+            if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+                $price_min = $product->multiprices_min[$object->thirdparty->price_level];
+
+            $label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
+
+            // Check price is not lower than minimum (check is done only for standard or replacement invoices)
+            if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))))
+            {
+                setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
+                $error ++;
+            }
+        } else {
+            $type = GETPOST('type');
+            $label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+
+                // Check parameters
+                if (GETPOST('type') < 0) {
+                    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+                    $error ++;
+                }
+            }
+        if ($qty < 0) {
+            $langs->load("errors");
+            setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
+            $error ++;
+        }
+
+        $date_start_fill = GETPOST('date_start_fill','int');
+        $date_end_fill = GETPOST('date_end_fill','int');
+
+        // Update line
+        if (! $error)
+        {
+            $result = $object->updateline(
+                GETPOST('lineid'),
+                $description,
+                $pu_ht,
+                $qty,
+                $vat_rate,
+                $localtax1_rate,
+                $localtax1_rate,
+                GETPOST('productid'),
+                GETPOST('remise_percent'),
+                'HT',
+                $info_bits,
+                0,
+                0,
+                $type,
+                0,
+                $special_code,
+                $label,
+                GETPOST('units'),
+                $pu_ht_devise,
+                0,
+                $date_start_fill,
+                $date_end_fill
+            );
+
+            if ($result >= 0)
+            {
+                    /*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
                         // Define output language
                         $outputlangs = $langs;
                         $newlang = '';
@@ -902,50 +902,50 @@ 
                                 $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                     }*/
 
-				$object->fetch($object->id);    // Reload lines
-
-				unset($_POST['qty']);
-				unset($_POST['type']);
-				unset($_POST['productid']);
-				unset($_POST['remise_percent']);
-				unset($_POST['price_ht']);
-				unset($_POST['multicurrency_price_ht']);
-				unset($_POST['price_ttc']);
-				unset($_POST['tva_tx']);
-				unset($_POST['product_ref']);
-				unset($_POST['product_label']);
-				unset($_POST['product_desc']);
-				unset($_POST['fournprice']);
-				unset($_POST['buying_price']);
-				unset($_POST['np_marginRate']);
-				unset($_POST['np_markRate']);
-
-				unset($_POST['dp_desc']);
-				unset($_POST['idprod']);
-				unset($_POST['units']);
-
-				unset($_POST['date_starthour']);
-				unset($_POST['date_startmin']);
-				unset($_POST['date_startsec']);
-				unset($_POST['date_startday']);
-				unset($_POST['date_startmonth']);
-				unset($_POST['date_startyear']);
-				unset($_POST['date_endhour']);
-				unset($_POST['date_endmin']);
-				unset($_POST['date_endsec']);
-				unset($_POST['date_endday']);
-				unset($_POST['date_endmonth']);
-				unset($_POST['date_endyear']);
-
-				unset($_POST['situations']);
-				unset($_POST['progress']);
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-			}
-		}
-	}
+                $object->fetch($object->id);    // Reload lines
+
+                unset($_POST['qty']);
+                unset($_POST['type']);
+                unset($_POST['productid']);
+                unset($_POST['remise_percent']);
+                unset($_POST['price_ht']);
+                unset($_POST['multicurrency_price_ht']);
+                unset($_POST['price_ttc']);
+                unset($_POST['tva_tx']);
+                unset($_POST['product_ref']);
+                unset($_POST['product_label']);
+                unset($_POST['product_desc']);
+                unset($_POST['fournprice']);
+                unset($_POST['buying_price']);
+                unset($_POST['np_marginRate']);
+                unset($_POST['np_markRate']);
+
+                unset($_POST['dp_desc']);
+                unset($_POST['idprod']);
+                unset($_POST['units']);
+
+                unset($_POST['date_starthour']);
+                unset($_POST['date_startmin']);
+                unset($_POST['date_startsec']);
+                unset($_POST['date_startday']);
+                unset($_POST['date_startmonth']);
+                unset($_POST['date_startyear']);
+                unset($_POST['date_endhour']);
+                unset($_POST['date_endmin']);
+                unset($_POST['date_endsec']);
+                unset($_POST['date_endday']);
+                unset($_POST['date_endmonth']);
+                unset($_POST['date_endyear']);
+
+                unset($_POST['situations']);
+                unset($_POST['progress']);
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+            }
+        }
+    }
 }
 
 
@@ -971,119 +971,119 @@ 
  */
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png');
-
-	$object = new Facture($db);   // Source invoice
-	$product_static = new Product($db);
-
-	if ($object->fetch($id, $ref) > 0)
-	{
-		$result = $object->getLinesArray();
-
-		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="add">';
-		print '<input type="hidden" name="facid" value="'.$object->id.'">';
-
-		dol_fiche_head(null, '', '', 0);
-
-		$rowspan=4;
-		if (! empty($conf->projet->enabled)) $rowspan++;
-		if ($object->fk_account > 0) $rowspan++;
-
-		print '<table class="border" width="100%">';
-
-		$object->fetch_thirdparty();
-
-		// Title
-		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.$_POST["titre"].'">';
-		print '</td></tr>';
-
-		// Third party
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Customer").'</td><td>'.$object->thirdparty->getNomUrl(1,'customer').'</td>';
-		print '</tr>';
-
-		$note_public=GETPOST('note_public','none')?GETPOST('note_public','none'):$object->note_public;
-		$note_private=GETPOST('note_private','none')?GETPOST('note_private','none'):$object->note_private;
-
-		// Help of substitution key
-		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
-
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'),'%m').')';
-		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%m').')';
-		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'),'%m').')';
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'),'%B').')';
-		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%B').')';
-		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%B').')';
-		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'y'),'%Y').')';
-		$substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%Y').')';
-		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'),'%Y').')';
-		// Only on template invoices
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date($object->date_when, 'dayhour').')';
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date_when, $object->frequency, $object->unit_frequency),'dayhour').')';
-
-		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-		foreach($substitutionarray as $key => $val)
-		{
-			$htmltext.=$key.' = '.$langs->trans($val).'<br>';
-		}
-		$htmltext.='</i>';
-
-		// Public note
-		print '<tr>';
-		print '<td class="tdtop">';
-		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
-		print '</td>';
-		print '<td>';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-		print $doleditor->Create(1);
-
-		// Private note
-		if (empty($user->societe_id))
-		{
-			print '<tr>';
-			print '<td class="tdtop">';
-			print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
-			print '</td>';
-			print '<td>';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-			print $doleditor->Create(1);
-			// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
-			print '</td></tr>';
-		}
-
-		// Author
-		print "<tr><td>".$langs->trans("Author")."</td><td>".$user->getFullName($langs)."</td></tr>";
-
-		// Payment term
-		print "<tr><td>".$langs->trans("PaymentConditions")."</td><td>";
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
-		print "</td></tr>";
-
-		// Payment mode
-		print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', '', 1);
-		print "</td></tr>";
-
-		// Project
-		if (! empty($conf->projet->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0)
-		{
-			$projectid = GETPOST('projectid')?GETPOST('projectid'):$object->fk_project;
-			$langs->load('projects');
-			print '<tr><td>' . $langs->trans('Project') . '</td><td>';
-			$numprojet = $formproject->select_projects($object->thirdparty->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, '');
+    print load_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png');
+
+    $object = new Facture($db);   // Source invoice
+    $product_static = new Product($db);
+
+    if ($object->fetch($id, $ref) > 0)
+    {
+        $result = $object->getLinesArray();
+
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="add">';
+        print '<input type="hidden" name="facid" value="'.$object->id.'">';
+
+        dol_fiche_head(null, '', '', 0);
+
+        $rowspan=4;
+        if (! empty($conf->projet->enabled)) $rowspan++;
+        if ($object->fk_account > 0) $rowspan++;
+
+        print '<table class="border" width="100%">';
+
+        $object->fetch_thirdparty();
+
+        // Title
+        print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
+        print '<input class="flat quatrevingtpercent" type="text" name="titre" value="'.$_POST["titre"].'">';
+        print '</td></tr>';
+
+        // Third party
+        print '<tr><td class="titlefieldcreate">'.$langs->trans("Customer").'</td><td>'.$object->thirdparty->getNomUrl(1,'customer').'</td>';
+        print '</tr>';
+
+        $note_public=GETPOST('note_public','none')?GETPOST('note_public','none'):$object->note_public;
+        $note_private=GETPOST('note_private','none')?GETPOST('note_private','none'):$object->note_private;
+
+        // Help of substitution key
+        $substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
+
+        $substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'),'%m').')';
+        $substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%m').')';
+        $substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'),'%m').')';
+        $substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'),'%B').')';
+        $substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%B').')';
+        $substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%B').')';
+        $substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'y'),'%Y').')';
+        $substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date,'%Y').')';
+        $substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'),'%Y').')';
+        // Only on template invoices
+        $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date($object->date_when, 'dayhour').')';
+        $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date_when, $object->frequency, $object->unit_frequency),'dayhour').')';
+
+        $htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
+        foreach($substitutionarray as $key => $val)
+        {
+            $htmltext.=$key.' = '.$langs->trans($val).'<br>';
+        }
+        $htmltext.='</i>';
+
+        // Public note
+        print '<tr>';
+        print '<td class="tdtop">';
+        print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
+        print '</td>';
+        print '<td>';
+        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+        print $doleditor->Create(1);
+
+        // Private note
+        if (empty($user->societe_id))
+        {
+            print '<tr>';
+            print '<td class="tdtop">';
+            print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
+            print '</td>';
+            print '<td>';
+            $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+            print $doleditor->Create(1);
+            // print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
+            print '</td></tr>';
+        }
+
+        // Author
+        print "<tr><td>".$langs->trans("Author")."</td><td>".$user->getFullName($langs)."</td></tr>";
+
+        // Payment term
+        print "<tr><td>".$langs->trans("PaymentConditions")."</td><td>";
+        $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
+        print "</td></tr>";
+
+        // Payment mode
+        print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
+        $form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', '', 1);
+        print "</td></tr>";
+
+        // Project
+        if (! empty($conf->projet->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0)
+        {
+            $projectid = GETPOST('projectid')?GETPOST('projectid'):$object->fk_project;
+            $langs->load('projects');
+            print '<tr><td>' . $langs->trans('Project') . '</td><td>';
+            $numprojet = $formproject->select_projects($object->thirdparty->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, '');
             print ' &nbsp; <a href="' . BASE_URI . '?controller=projet&method=card&socid=' . $object->thirdparty->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $object->thirdparty->id . (!empty($id) ? '&id=' . $id : '')) . '">' . $langs->trans("AddProject") . '</a>';
-			print '</td></tr>';
-		}
+            print '</td></tr>';
+        }
 
-		// Bank account
-		if ($object->fk_account > 0)
-		{
-			print "<tr><td>".$langs->trans('BankAccount')."</td><td>";
-			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
-			print "</td></tr>";
-		}
+        // Bank account
+        if ($object->fk_account > 0)
+        {
+            print "<tr><td>".$langs->trans('BankAccount')."</td><td>";
+            $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+            print "</td></tr>";
+        }
 
         // Model pdf
         print "<tr><td>".$langs->trans('Model')."</td><td>";
@@ -1092,323 +1092,323 @@ 
         print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
         print "</td></tr>";
 
-		print "</table>";
+        print "</table>";
 
-		dol_fiche_end();
+        dol_fiche_end();
 
 
-		// Autogeneration
-		$title = $langs->trans("Recurrence");
-		print load_fiche_titre('<span class="fa fa-calendar"></span> '.$title, '', '');
+        // Autogeneration
+        $title = $langs->trans("Recurrence");
+        print load_fiche_titre('<span class="fa fa-calendar"></span> '.$title, '', '');
 
-		dol_fiche_head(null, '', '', 0);
+        dol_fiche_head(null, '', '', 0);
 
-		print '<table class="border" width="100%">';
+        print '<table class="border" width="100%">';
 
-		// Frequency + unit
-		print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
-		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m'));
-		print "</td></tr>";
+        // Frequency + unit
+        print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
+        print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency')?GETPOST('unit_frequency'):'m'));
+        print "</td></tr>";
 
-		// Date next run
-		print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
-		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
-		print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
-		print "</td></tr>";
+        // Date next run
+        print "<tr><td>".$langs->trans('NextDateToExecution')."</td><td>";
+        $date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
+        print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
+        print "</td></tr>";
 
-		// Number max of generation
-		print "<tr><td>".$langs->trans("MaxPeriodNumber")."</td><td>";
-		print '<input type="text" name="nb_gen_max" value="'.GETPOST('nb_gen_max').'" size="5" />';
-		print "</td></tr>";
+        // Number max of generation
+        print "<tr><td>".$langs->trans("MaxPeriodNumber")."</td><td>";
+        print '<input type="text" name="nb_gen_max" value="'.GETPOST('nb_gen_max').'" size="5" />';
+        print "</td></tr>";
 
-		// Auto validate the invoice
-		print "<tr><td>".$langs->trans("StatusOfGeneratedInvoices")."</td><td>";
-		$select = array('0'=>$langs->trans('BillStatusDraft'),'1'=>$langs->trans('BillStatusValidated'));
-		print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
-		print "</td></tr>";
+        // Auto validate the invoice
+        print "<tr><td>".$langs->trans("StatusOfGeneratedInvoices")."</td><td>";
+        $select = array('0'=>$langs->trans('BillStatusDraft'),'1'=>$langs->trans('BillStatusValidated'));
+        print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
+        print "</td></tr>";
 
-		// Auto generate document
-		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
-		{
-			print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
-			$select = array('0'=>$langs->trans('DoNotGenerateDoc'),'1'=>$langs->trans('AutoGenerateDoc'));
-			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
-			print "</td></tr>";
-		}
-		else
-		{
-			print '<input type="hidden" name="generate_pdf" value="1">';
-		}
+        // Auto generate document
+        if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
+        {
+            print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
+            $select = array('0'=>$langs->trans('DoNotGenerateDoc'),'1'=>$langs->trans('AutoGenerateDoc'));
+            print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
+            print "</td></tr>";
+        }
+        else
+        {
+            print '<input type="hidden" name="generate_pdf" value="1">';
+        }
 
-		print "</table>";
+        print "</table>";
 
-		dol_fiche_end();
+        dol_fiche_end();
 
 
-		$title = $langs->trans("ProductsAndServices");
-		if (empty($conf->service->enabled))
-			$title = $langs->trans("Products");
-		else if (empty($conf->product->enabled))
-			$title = $langs->trans("Services");
+        $title = $langs->trans("ProductsAndServices");
+        if (empty($conf->service->enabled))
+            $title = $langs->trans("Products");
+        else if (empty($conf->product->enabled))
+            $title = $langs->trans("Services");
 
-		print load_fiche_titre($title, '', '');
+        print load_fiche_titre($title, '', '');
 
-		/*
+        /*
 		 * Invoice lines
 		 */
-		print '<div class="div-table-responsive-no-min">';
-		print '<table id="tablelines" class="noborder noshadow" width="100%">';
-		// Show object lines
-		if (! empty($object->lines))
-		{
-			$disableedit=1;
-			$disablemove=1;
-			$disableremove=1;
-			$object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
-		}
-
-		print "</table>\n";
-		print '<div>';
-
-		print '</td></tr>';
-
-		if ($flag_price_may_change)
-		{
-			print '<tr><td colspan="3" align="left">';
-			print '<select name="usenewprice" class="flat">';
-			print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>';
-			print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>';
-			print '</select>';
-			print '</td></tr>';
-		}
-		print "</table>\n";
-
-		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
-		print '</div>';
-		print "</form>\n";
-	}
-	else
-	{
-		dol_print_error('',"Error, no invoice ".$object->id);
-	}
+        print '<div class="div-table-responsive-no-min">';
+        print '<table id="tablelines" class="noborder noshadow" width="100%">';
+        // Show object lines
+        if (! empty($object->lines))
+        {
+            $disableedit=1;
+            $disablemove=1;
+            $disableremove=1;
+            $object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
+        }
+
+        print "</table>\n";
+        print '<div>';
+
+        print '</td></tr>';
+
+        if ($flag_price_may_change)
+        {
+            print '<tr><td colspan="3" align="left">';
+            print '<select name="usenewprice" class="flat">';
+            print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>';
+            print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>';
+            print '</select>';
+            print '</td></tr>';
+        }
+        print "</table>\n";
+
+        print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'">';
+        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+        print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+        print '</div>';
+        print "</form>\n";
+    }
+    else
+    {
+        dol_print_error('',"Error, no invoice ".$object->id);
+    }
 }
 else
 {
-	/*
+    /*
 	 * View mode
 	 */
-	if ($object->id > 0)
-	{
-		$object->fetch_thirdparty();
+    if ($object->id > 0)
+    {
+        $object->fetch_thirdparty();
 
-		// Confirmation de la suppression d'une ligne produit
-		if ($action == 'ask_deleteline') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
-		}
+        // Confirmation de la suppression d'une ligne produit
+        if ($action == 'ask_deleteline') {
+            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
+        }
 
-		// Confirm delete of repeatable invoice
-		if ($action == 'ask_deleteinvoice') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
-		}
+        // Confirm delete of repeatable invoice
+        if ($action == 'ask_deleteinvoice') {
+            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
+        }
 
-		print $formconfirm;
+        print $formconfirm;
 
-		$author = new User($db);
-		$author->fetch($object->user_author);
+        $author = new User($db);
+        $author->fetch($object->user_author);
 
-		$head=invoice_rec_prepare_head($object);
+        $head=invoice_rec_prepare_head($object);
 
-		dol_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"), -1, 'bill');	// Add a div
+        dol_fiche_head($head, 'card', $langs->trans("RepeatableInvoice"), -1, 'bill');	// Add a div
 
-		// Recurring invoice content
+        // Recurring invoice content
 
         $linkback = '<a href="' . BASE_URI . '?controller=compta/facture&method=invoicetemplate_list&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-		$morehtmlref='';
-		if ($action != 'editref') $morehtmlref.=$form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
-		else $morehtmlref.= $form->editfieldval('', 'ref', $object->ref, $object, $user->rights->facture->creer, 'string');
-
-		$morehtmlref.='<div class="refidno">';
-		// Ref customer
-		//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->facture->creer, 'string', '', 0, 1);
-		//$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->facture->creer, 'string', '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref.=$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-			$langs->load("projects");
-			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-			if ($user->rights->facture->creer)
-			{
-				if ($action != 'classify')
-					$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-					if ($action == 'classify') {
-						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-						$morehtmlref.='<input type="hidden" name="action" value="classin">';
-						$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-						$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-						$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-						$morehtmlref.='</form>';
-					} else {
-						$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-					}
-			} else {
-				if (! empty($object->fk_project)) {
-					$proj = new Project($db);
-					$proj->fetch($object->fk_project);
+        $morehtmlref='';
+        if ($action != 'editref') $morehtmlref.=$form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
+        else $morehtmlref.= $form->editfieldval('', 'ref', $object->ref, $object, $user->rights->facture->creer, 'string');
+
+        $morehtmlref.='<div class="refidno">';
+        // Ref customer
+        //$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->facture->creer, 'string', '', 0, 1);
+        //$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->facture->creer, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.=$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+        // Project
+        if (! empty($conf->projet->enabled))
+        {
+            $langs->load("projects");
+            $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+            if ($user->rights->facture->creer)
+            {
+                if ($action != 'classify')
+                    $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                    if ($action == 'classify') {
+                        //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+                        $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+                        $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                        $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                        $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                        $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                        $morehtmlref.='</form>';
+                    } else {
+                        $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                    }
+            } else {
+                if (! empty($object->fk_project)) {
+                    $proj = new Project($db);
+                    $proj->fetch($object->fk_project);
                     $morehtmlref .= '<a href="' . BASE_URI . '&controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-					$morehtmlref.=$proj->ref;
-					$morehtmlref.='</a>';
-				} else {
-					$morehtmlref.='';
-				}
-			}
-		}
-		$morehtmlref.='</div>';
-
-		dol_banner_tab($object, 'ref', $linkback, 1, 'titre', 'none', $morehtmlref, '', 0, '', $morehtmlright);
-
-		print '<div class="fichecenter">';
-		print '<div class="fichehalfleft">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td class="titlefield">'.$langs->trans("Author").'</td><td>'.$author->getFullName($langs)."</td></tr>";
-
-		print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-		print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
-		print '</tr>';
-
-		print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'</td>';
-		print '</tr>';
-
-		// Amount Local Taxes
-		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
-		{
-			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-		}
-		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
-		{
-			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-			print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
-		}
-
-		print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
-		print '</tr>';
-
-
-		// Payment term
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('PaymentConditionsShort');
-		print '</td>';
-		if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td>';
-		if ($object->type != Facture::TYPE_CREDIT_NOTE)
-		{
-			if ($action == 'editconditions')
-			{
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
-			}
-			else
-			{
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
-			}
-		} else {
-			print '&nbsp;';
-		}
-		print '</td></tr>';
-
-		// Payment mode
-		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('PaymentMode');
-		print '</td>';
-		if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td>';
-		if ($action == 'editmode')
-		{
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
-		}
-		else
-		{
-			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
-		}
-		print '</td></tr>';
-
-		// Help of substitution key
-		$dateexample=dol_now();
-		if (! empty($object->frequency) && ! empty($object->date_when)) $dateexample=$object->date_when;
-
-		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
-
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'),'%m').')';
-		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%m').')';
-		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'),'%m').')';
-		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'),'%B').')';
-		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%B').')';
-		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B').')';
-		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'),'%Y').')';
-		$substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%Y').')';
-		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')';
-		// Only on template invoices
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date(($object->date_when?$object->date_when:dol_now()), 'dayhour').')';
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree(($object->date_when?$object->date_when:dol_now()), $object->frequency, $object->unit_frequency),'dayhour').')';
-
-		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-		foreach($substitutionarray as $key => $val)
-		{
-			$htmltext.=$key.' = '.$langs->trans($val).'<br>';
-		}
-		$htmltext.='</i>';
-
-		// Note public
-		print '<tr><td>';
-		print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $user->rights->facture->creer);
-		print '</td><td class="wordbreak">';
-		print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
-		print '</td>';
-		print '</tr>';
-
-		// Note private
-		print '<tr><td>';
-		print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $user->rights->facture->creer);
-		print '</td><td class="wordbreak">';
-		print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
-		print '</td>';
-		print '</tr>';
-
-		// Bank Account
-		$langs->load('banks');
-
-		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-		print $langs->trans('RIB');
-		print '<td>';
-		if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
-			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
-		print '</tr></table>';
-		print '</td><td>';
-		if ($action == 'editbankaccount')
-		{
-			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else
-		{
-			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
-		}
-		print "</td>";
-		print '</tr>';
+                    $morehtmlref.=$proj->ref;
+                    $morehtmlref.='</a>';
+                } else {
+                    $morehtmlref.='';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'titre', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+
+        print '<div class="fichecenter">';
+        print '<div class="fichehalfleft">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border" width="100%">';
+
+        print '<tr><td class="titlefield">'.$langs->trans("Author").'</td><td>'.$author->getFullName($langs)."</td></tr>";
+
+        print '<tr><td>'.$langs->trans("AmountHT").'</td>';
+        print '<td>'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
+        print '</tr>';
+
+        print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'</td>';
+        print '</tr>';
+
+        // Amount Local Taxes
+        if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
+        {
+            print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+            print '<td class="nowrap">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+        }
+        if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
+        {
+            print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+            print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
+        }
+
+        print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
+        print '</tr>';
+
+
+        // Payment term
+        print '<tr><td>';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('PaymentConditionsShort');
+        print '</td>';
+        if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
+            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+        print '</tr></table>';
+        print '</td><td>';
+        if ($object->type != Facture::TYPE_CREDIT_NOTE)
+        {
+            if ($action == 'editconditions')
+            {
+                $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+            }
+            else
+            {
+                $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
+            }
+        } else {
+            print '&nbsp;';
+        }
+        print '</td></tr>';
+
+        // Payment mode
+        print '<tr><td>';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('PaymentMode');
+        print '</td>';
+        if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
+            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+        print '</tr></table>';
+        print '</td><td>';
+        if ($action == 'editmode')
+        {
+            $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
+        }
+        else
+        {
+            $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
+        }
+        print '</td></tr>';
+
+        // Help of substitution key
+        $dateexample=dol_now();
+        if (! empty($object->frequency) && ! empty($object->date_when)) $dateexample=$object->date_when;
+
+        $substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
+
+        $substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'),'%m').')';
+        $substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%m').')';
+        $substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'),'%m').')';
+        $substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'),'%B').')';
+        $substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%B').')';
+        $substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B').')';
+        $substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'),'%Y').')';
+        $substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample,'%Y').')';
+        $substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'),'%Y').')';
+        // Only on template invoices
+        $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date(($object->date_when?$object->date_when:dol_now()), 'dayhour').')';
+        $substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree(($object->date_when?$object->date_when:dol_now()), $object->frequency, $object->unit_frequency),'dayhour').')';
+
+        $htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
+        foreach($substitutionarray as $key => $val)
+        {
+            $htmltext.=$key.' = '.$langs->trans($val).'<br>';
+        }
+        $htmltext.='</i>';
+
+        // Note public
+        print '<tr><td>';
+        print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $user->rights->facture->creer);
+        print '</td><td class="wordbreak">';
+        print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
+        print '</td>';
+        print '</tr>';
+
+        // Note private
+        print '<tr><td>';
+        print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $user->rights->facture->creer);
+        print '</td><td class="wordbreak">';
+        print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1);
+        print '</td>';
+        print '</tr>';
+
+        // Bank Account
+        $langs->load('banks');
+
+        print '<tr><td class="nowrap">';
+        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+        print $langs->trans('RIB');
+        print '<td>';
+        if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td>';
+        if ($action == 'editbankaccount')
+        {
+            $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+        }
+        else
+        {
+            $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+        }
+        print "</td>";
+        print '</tr>';
 
         // Model pdf
         $langs->load('banks');
@@ -1439,298 +1439,298 @@ 
         print "</td>";
         print '</tr>';
 
-		// Other attributes
-		$cols = 2;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+        // Other attributes
+        $cols = 2;
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-		print '</table>';
+        print '</table>';
 
-		print '</div>';
-		print '<div class="fichehalfright">';
-		print '<div class="ficheaddleft">';
-		print '<div class="underbanner clearboth"></div>';
+        print '</div>';
+        print '<div class="fichehalfright">';
+        print '<div class="ficheaddleft">';
+        print '<div class="underbanner clearboth"></div>';
 
 
-		/*
+        /*
 		 * Recurrence
 		 */
-		$title = $langs->trans("Recurrence");
-		//print load_fiche_titre($title, '', 'calendar');
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td colspan="2"><span class="fa fa-calendar"></span> '.$title.'</td></tr>';
-
-		// if "frequency" is empty or = 0, the reccurence is disabled
-		print '<tr><td style="width: 50%">';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
-		print $langs->trans('Frequency');
-		print '</td>';
-		if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
-		print '</tr></table>';
-		print '</td><td>';
-		if ($action == 'editfrequency')
-		{
-			print '<form method="post" action="'.$_SERVER["PHP_SELF"] . '?facid=' . $object->id.'">';
-			print '<input type="hidden" name="action" value="setfrequency">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
-			print '<tr><td>';
-			print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m'));
-			print '</td>';
-			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			print '</tr></table></form>';
-		}
-		else
-		{
-				if ($object->frequency > 0)
-				{
-					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				}
-				else
-				{
-					print $langs->trans("NotARecurringInvoiceTemplate");
-			}
-		}
-		print '</td></tr>';
-
-		// Date when (next invoice generation)
-		print '<tr><td>';
-		if ($action == 'date_when' || $object->frequency > 0)
-		{
-			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
-		}
-		else
-		{
-			print $langs->trans("NextDateToExecution");
-		}
-		print '</td><td>';
-		if ($action == 'date_when' || $object->frequency > 0)
-		{
-			print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
-		}
-		//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
-		if (! $object->isMaxNbGenReached())
-		{
-			if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
-		}
-		else
-		{
-			print img_info($langs->trans("MaxNumberOfGenerationReached"));
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Max period / Rest period
-		print '<tr><td>';
-		if ($action == 'nb_gen_max' || $object->frequency > 0)
-		{
-			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-		}
-		else
-		{
-			print $langs->trans("MaxPeriodNumber");
-		}
-		print '</td><td>';
-		if ($action == 'nb_gen_max' || $object->frequency > 0)
-		{
-			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max?$object->nb_gen_max:'', $object, $user->rights->facture->creer);
-		}
-		else
-		{
-			print '';
-		}
-		print '</td>';
-		print '</tr>';
-
-		// Status of generated invoices
-		print '<tr><td>';
-		if ($action == 'auto_validate' || $object->frequency > 0)
-			print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
-		else
-			print $langs->trans("StatusOfGeneratedInvoices");
-		print '</td><td>';
-		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
-		if ($action == 'auto_validate' || $object->frequency > 0)
-		{
-			print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
-		}
-		print '</td>';
-		// Auto generate documents
-		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
-		{
-			print '<tr>';
-			print '<td>';
-			if ($action == 'generate_pdf' || $object->frequency > 0)
-				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
-			else
-				print $langs->trans("StatusOfGeneratedDocuments");
-			print '</td>';
-			print '<td>';
-			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
-			if ($action == 'generate_pdf' || $object->frequency > 0)
-			{
-				print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer, $select);
-			}
-			print '</td>';
-			print '</tr>';
-		}
-		else
-		{
-			print '<input type="hidden" name="generate_pdf" value="1">';
-		}
-
-		print '</table>';
-
-		// Frequencry/Recurring section
-		if ($object->frequency > 0)
-		{
-			print '<br>';
-
-			if (empty($conf->cron->enabled))
-			{
-				print info_admin($langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name")));
-			}
-
-			print '<div class="underbanner clearboth"></div>';
-			print '<table class="border centpercent">';
-
-			// Nb of generation already done
-			print '<tr><td style="width: 50%">'.$langs->trans("NbOfGenerationDone").'</td>';
-			print '<td>';
-			print $object->nb_gen_done?$object->nb_gen_done:'0';
-			print '</td>';
-			print '</tr>';
-
-			// Date last
-			print '<tr><td>';
-			print $langs->trans("DateLastGeneration");
-			print '</td><td>';
-			print dol_print_date($object->date_last_gen, 'dayhour');
-			print '</td>';
-			print '</tr>';
-
-			print '</table>';
-
-			print '<br>';
-		}
-
-		print '</div>';
-		print '</div>';
-		print '</div>';
-
-		print '<div class="clearboth"></div><br>';
-
-
-		// Lines
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
+        $title = $langs->trans("Recurrence");
+        //print load_fiche_titre($title, '', 'calendar');
+
+        print '<table class="border" width="100%">';
+
+        print '<tr><td colspan="2"><span class="fa fa-calendar"></span> '.$title.'</td></tr>';
+
+        // if "frequency" is empty or = 0, the reccurence is disabled
+        print '<tr><td style="width: 50%">';
+        print '<table class="nobordernopadding" width="100%"><tr><td>';
+        print $langs->trans('Frequency');
+        print '</td>';
+        if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
+            print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+        print '</tr></table>';
+        print '</td><td>';
+        if ($action == 'editfrequency')
+        {
+            print '<form method="post" action="'.$_SERVER["PHP_SELF"] . '?facid=' . $object->id.'">';
+            print '<input type="hidden" name="action" value="setfrequency">';
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
+            print '<tr><td>';
+            print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency?$object->unit_frequency:'m'));
+            print '</td>';
+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+            print '</tr></table></form>';
+        }
+        else
+        {
+                if ($object->frequency > 0)
+                {
+                    print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
+                }
+                else
+                {
+                    print $langs->trans("NotARecurringInvoiceTemplate");
+            }
+        }
+        print '</td></tr>';
+
+        // Date when (next invoice generation)
+        print '<tr><td>';
+        if ($action == 'date_when' || $object->frequency > 0)
+        {
+            print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
+        }
+        else
+        {
+            print $langs->trans("NextDateToExecution");
+        }
+        print '</td><td>';
+        if ($action == 'date_when' || $object->frequency > 0)
+        {
+            print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
+        }
+        //var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
+        if (! $object->isMaxNbGenReached())
+        {
+            if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
+        }
+        else
+        {
+            print img_info($langs->trans("MaxNumberOfGenerationReached"));
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Max period / Rest period
+        print '<tr><td>';
+        if ($action == 'nb_gen_max' || $object->frequency > 0)
+        {
+            print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
+        }
+        else
+        {
+            print $langs->trans("MaxPeriodNumber");
+        }
+        print '</td><td>';
+        if ($action == 'nb_gen_max' || $object->frequency > 0)
+        {
+                print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max?$object->nb_gen_max:'', $object, $user->rights->facture->creer);
+        }
+        else
+        {
+            print '';
+        }
+        print '</td>';
+        print '</tr>';
+
+        // Status of generated invoices
+        print '<tr><td>';
+        if ($action == 'auto_validate' || $object->frequency > 0)
+            print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
+        else
+            print $langs->trans("StatusOfGeneratedInvoices");
+        print '</td><td>';
+        $select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
+        if ($action == 'auto_validate' || $object->frequency > 0)
+        {
+            print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
+        }
+        print '</td>';
+        // Auto generate documents
+        if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
+        {
+            print '<tr>';
+            print '<td>';
+            if ($action == 'generate_pdf' || $object->frequency > 0)
+                print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
+            else
+                print $langs->trans("StatusOfGeneratedDocuments");
+            print '</td>';
+            print '<td>';
+            $select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
+            if ($action == 'generate_pdf' || $object->frequency > 0)
+            {
+                print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer, $select);
+            }
+            print '</td>';
+            print '</tr>';
+        }
+        else
+        {
+            print '<input type="hidden" name="generate_pdf" value="1">';
+        }
+
+        print '</table>';
+
+        // Frequencry/Recurring section
+        if ($object->frequency > 0)
+        {
+            print '<br>';
+
+            if (empty($conf->cron->enabled))
+            {
+                print info_admin($langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name")));
+            }
+
+            print '<div class="underbanner clearboth"></div>';
+            print '<table class="border centpercent">';
+
+            // Nb of generation already done
+            print '<tr><td style="width: 50%">'.$langs->trans("NbOfGenerationDone").'</td>';
+            print '<td>';
+            print $object->nb_gen_done?$object->nb_gen_done:'0';
+            print '</td>';
+            print '</tr>';
+
+            // Date last
+            print '<tr><td>';
+            print $langs->trans("DateLastGeneration");
+            print '</td><td>';
+            print dol_print_date($object->date_last_gen, 'dayhour');
+            print '</td>';
+            print '</tr>';
+
+            print '</table>';
+
+            print '<br>';
+        }
+
+        print '</div>';
+        print '</div>';
+        print '</div>';
+
+        print '<div class="clearboth"></div><br>';
+
+
+        // Lines
+        print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid')) . '" method="POST">
         	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
         	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
         	<input type="hidden" name="mode" value="">
         	<input type="hidden" name="id" value="' . $object->id . '">
         	';
 
-		if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-		}
+        if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+            include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+        }
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<table id="tablelines" class="noborder noshadow" width="100%">';
-		// Show object lines
-		if (! empty($object->lines))
-		{
-			//$disableedit=1;
-			//$disablemove=1;
-			$ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
-		}
+        print '<div class="div-table-responsive-no-min">';
+        print '<table id="tablelines" class="noborder noshadow" width="100%">';
+        // Show object lines
+        if (! empty($object->lines))
+        {
+            //$disableedit=1;
+            //$disablemove=1;
+            $ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
+        }
 
-		// Form to add new line
-		if ($object->statut == 0 && $user->rights->facture->creer && $action != 'valid' && $action != 'editline')
-		{
-			if ($action != 'editline')
-			{
-				// Add free products/services
-				$object->formAddObjectLine(0, $mysoc, $object->thirdparty);                          // No date selector for template invoice
+        // Form to add new line
+        if ($object->statut == 0 && $user->rights->facture->creer && $action != 'valid' && $action != 'editline')
+        {
+            if ($action != 'editline')
+            {
+                // Add free products/services
+                $object->formAddObjectLine(0, $mysoc, $object->thirdparty);                          // No date selector for template invoice
 
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			}
-		}
+                $parameters = array();
+                $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+            }
+        }
 
-		print "</table>\n";
-		print '</div>';
+        print "</table>\n";
+        print '</div>';
 
-		print "</form>\n";
+        print "</form>\n";
 
-		dol_fiche_end();
+        dol_fiche_end();
 
 
-		/**
-		 * Barre d'actions
-		 */
-		print '<div class="tabsAction">';
-
-		if (empty($object->suspended))
-		{
-			if ($user->rights->facture->creer)
-			{
-				if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
-				{
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-				else
-				{
-					if (empty($object->frequency) || $object->date_when <= $today)
-					{
+        /**
+         * Barre d'actions
+         */
+        print '<div class="tabsAction">';
+
+        if (empty($object->suspended))
+        {
+            if ($user->rights->facture->creer)
+            {
+                if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
+                {
+                    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
+                }
+                else
+                {
+                    if (empty($object->frequency) || $object->date_when <= $today)
+                    {
                         print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=compta/facture&method=card&action=create&socid=' . $object->thirdparty->id . '&fac_rec=' . $object->id . '">' . $langs->trans("CreateBill") . '</a></div>';
-					}
-					else
-					{
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
-					}
-				}
-			}
-			else
-			{
-				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
-			}
-		}
-
-		if ($user->rights->facture->creer)
-		{
-			if (empty($object->suspended))
-			{
+                    }
+                    else
+                    {
+                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
+                    }
+                }
+            }
+            else
+            {
+                print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
+            }
+        }
+
+        if ($user->rights->facture->creer)
+        {
+            if (empty($object->suspended))
+            {
                 print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . BASE_URI . '?controller=compta/facture&method=fiche-rec&action=disable&id=' . $object->id . '">' . $langs->trans("Disable") . '</a></div>';
-			}
-			else
-			{
+            }
+            else
+            {
                 print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=compta/facture&method=fiche-rec&action=enable&id=' . $object->id . '">' . $langs->trans("Enable") . '</a></div>';
-			}
-		}
+            }
+        }
 
-		//if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
-		if ($user->rights->facture->supprimer)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=ask_deleteinvoice&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-		}
+        //if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
+        if ($user->rights->facture->supprimer)
+        {
+            print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=ask_deleteinvoice&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
+        }
 
-		print '</div>';
+        print '</div>';
 
 
 
-		print '<div class="fichecenter"><div class="fichehalfleft">';
-		print '<a name="builddoc"></a>'; // ancre
+        print '<div class="fichecenter"><div class="fichehalfleft">';
+        print '<a name="builddoc"></a>'; // ancre
 
 
-		// Show links to link elements
-		$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
+        // Show links to link elements
+        $linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
 
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div></div>';
-	}
+        print '</div></div>';
+    }
 }
 
 // End of page