alxarafe / alixar

dolibarr/htdocs/don/info.php

Spacing +14 added lines, -14 removed lines

@@ -23,13 +23,13 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/donation.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (!empty($conf->projet->enabled)) {
-    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.'/projet/class/project.class.php';
 }
 
 $langs->load("donations");
@@ -56,7 +56,7 @@ 
 /*
  * View
  */
-$title = $langs->trans('Donation') . " - " . $langs->trans('Info');
+$title = $langs->trans('Donation')." - ".$langs->trans('Info');
 $helpurl = "";
 llxHeader('', $title, $helpurl);
 
@@ -71,31 +71,31 @@ 
 
 dol_fiche_head($head, 'info', $langs->trans("Donation"), -1, 'generic');
 
-$linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!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') . ' ';
+    $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 .= '<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 .= '<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 .= '<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);
+                $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 .= '<a href="'.BASE_URI.'controller=projet&method=card&id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
             $morehtmlref .= $proj->ref;
             $morehtmlref .= '</a>';
         } else {

Braces +6 added lines, -3 removed lines

@@ -40,7 +40,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid = $user->societe_id;
+if ($user->societe_id) {
+    $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -79,10 +81,11 @@ 
     $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.='<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);

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();

Spacing +42 added lines, -42 removed lines

@@ -32,56 +32,56 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array("companies","other","donations"));
+$langs->loadLangs(array("companies", "other", "donations"));
 
-$id = GETPOST('id','int');
+$id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action','alpha');
-$confirm = GETPOST('confirm','alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'don', $id, '');
 
 
 // Get parameters
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
 
 
 $object = new Don($db);
 $object->fetch($id, $ref);
 
-$upload_dir = $conf->don->dir_output . '/' . get_exdir($filename,0,0,0,$object,'donation'). '/'. dol_sanitizeFileName($object->ref);
-$modulepart='don';
+$upload_dir = $conf->don->dir_output.'/'.get_exdir($filename, 0, 0, 0, $object, 'donation').'/'.dol_sanitizeFileName($object->ref);
+$modulepart = 'don';
 
 
 /*
  * Actions
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 if ($action == 'classin' && $user->rights->don->creer)
 {
@@ -94,9 +94,9 @@ 
  */
 
 $form = new Form($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
-$title = $langs->trans('Donation') . " - " . $langs->trans('Documents');
+$title = $langs->trans('Donation')." - ".$langs->trans('Documents');
 $helpurl = "";
 llxHeader('', $title, $helpurl);
 
@@ -105,55 +105,55 @@ 
 {
 	$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)
+	$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'];
+		$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>';
+    $linkback = '<a href="'.BASE_URI.'?controller=don&method=list'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
+	    $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>';
+                    $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);
+                    $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)) {
+	        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 .= '<a href="'.BASE_URI.'?controller=projet&method=card&id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
                 $morehtmlref .= $proj->ref;
-	            $morehtmlref.='</a>';
+	            $morehtmlref .= '</a>';
 	        } else {
-	            $morehtmlref.='';
+	            $morehtmlref .= '';
 	        }
 	    }
 	}
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
@@ -174,7 +174,7 @@ 
 	//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>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
     print '</table>';
 
     print '</div>';
@@ -186,8 +186,8 @@ 
     $modulepart = 'don';
     $permission = $user->rights->don->lire;
     $permtoedit = $user->rights->don->creer;
-    $param = '&id=' . $object->id;
-    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    $param = '&id='.$object->id;
+    include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {

Braces +13 added lines, -7 removed lines

@@ -54,7 +54,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 
@@ -66,8 +68,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 
 $object = new Don($db);
@@ -129,10 +135,11 @@ 
 	    $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.='<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);
@@ -188,8 +195,7 @@ 
     $permtoedit = $user->rights->don->creer;
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	print $langs->trans("ErrorUnknown");
 }

dolibarr/htdocs/dav/dav.lib.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     $h = 0;
     $head = arolimar123ray();
 
-    $head[$h][0] = BASE_URI . '?controller=admin&method=dav&id=' . $object->id;
+    $head[$h][0] = BASE_URI.'?controller=admin&method=dav&id='.$object->id;
     $head[$h][1] = $langs->trans("WebDAV");
     $head[$h][2] = 'webdav';
     $h++;

Braces +12 added lines, -10 removed lines

@@ -23,19 +23,21 @@
 
 // define CDAV_CONTACT_TAG if not
 if (!defined('CDAV_CONTACT_TAG')) {
-    if (isset($conf->global->CDAV_CONTACT_TAG))
-        define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-    else
-        define('CDAV_CONTACT_TAG', '');
-}
+    if (isset($conf->global->CDAV_CONTACT_TAG)) {
+            define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
+    } else {
+            define('CDAV_CONTACT_TAG', '');
+    }
+    }
 
 // define CDAV_URI_KEY if not
 if (!defined('CDAV_URI_KEY')) {
-    if (isset($conf->global->CDAV_URI_KEY))
-        define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-    else
-        define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
-}
+    if (isset($conf->global->CDAV_URI_KEY)) {
+            define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
+    } else {
+            define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
+    }
+    }
 
 
 /**

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

Spacing +231 added lines, -231 removed lines

@@ -32,66 +32,66 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 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';
+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 . '/core/class/html.formprojet.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'compta', 'admin', 'other'));
 
-$action     = GETPOST('action','alpha');
-$massaction = GETPOST('massaction','alpha');
-$show_files = GETPOST('show_files','int');
-$confirm    = GETPOST('confirm','alpha');
+$action     = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'invoicetemplatelist';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
 
 // Security check
-$id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
-$lineid=GETPOST('lineid','int');
-$ref=GETPOST('ref','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
+$id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$lineid = GETPOST('lineid', 'int');
+$ref = GETPOST('ref', 'alpha');
+if ($user->societe_id) $socid = $user->societe_id;
 $objecttype = 'facture_rec';
 if ($action == "create" || $action == "add") $objecttype = '';
 $result = restrictedArea($user, 'facture', $id, $objecttype);
-$projectid = GETPOST('projectid','int');
-
-$search_ref=GETPOST('search_ref');
-$search_societe=GETPOST('search_societe');
-$search_montant_ht=GETPOST('search_montant_ht');
-$search_montant_vat=GETPOST('search_montant_vat');
-$search_montant_ttc=GETPOST('search_montant_ttc');
-$search_payment_mode=GETPOST('search_payment_mode');
-$search_payment_term=GETPOST('search_payment_term');
-$search_day=GETPOST('search_day','int');
-$search_year=GETPOST('search_year','int');
-$search_month=GETPOST('search_month','int');
-$search_day_date_when=GETPOST('search_day_date_when','int');
-$search_year_date_when=GETPOST('search_year_date_when','int');
-$search_month_date_when=GETPOST('search_month_date_when','int');
-$search_recurring=GETPOST('search_recurring','int');
-$search_frequency=GETPOST('search_frequency','alpha');
-$search_unit_frequency=GETPOST('search_unit_frequency','alpha');
-$search_status=GETPOST('search_status','int');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$projectid = GETPOST('projectid', 'int');
+
+$search_ref = GETPOST('search_ref');
+$search_societe = GETPOST('search_societe');
+$search_montant_ht = GETPOST('search_montant_ht');
+$search_montant_vat = GETPOST('search_montant_vat');
+$search_montant_ttc = GETPOST('search_montant_ttc');
+$search_payment_mode = GETPOST('search_payment_mode');
+$search_payment_term = GETPOST('search_payment_term');
+$search_day = GETPOST('search_day', 'int');
+$search_year = GETPOST('search_year', 'int');
+$search_month = GETPOST('search_month', 'int');
+$search_day_date_when = GETPOST('search_day_date_when', 'int');
+$search_year_date_when = GETPOST('search_year_date_when', 'int');
+$search_month_date_when = GETPOST('search_month_date_when', 'int');
+$search_recurring = GETPOST('search_recurring', 'int');
+$search_frequency = GETPOST('search_frequency', 'alpha');
+$search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
+$search_status = GETPOST('search_status', 'int');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='f.titre';
+if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) $sortfield = 'f.titre';
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -106,18 +106,18 @@ 
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('invoicereccard','globalcard'));
+$hookmanager->initHooks(array('invoicereccard', 'globalcard'));
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('facture_rec');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
+$permissiondellink = $user->rights->facture->creer; // Used by the include of actions_dellink.inc.php
 $permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
 
-$arrayfields=array(
+$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),
@@ -138,9 +138,9 @@ 
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
+	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]));
+		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]));
 	}
 }
 
@@ -149,8 +149,8 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
@@ -158,32 +158,32 @@ 
 
 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';
 
 	// 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
+	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();
+		$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
@@ -200,33 +200,33 @@ 
  *	View
  */
 
-llxHeader('',$langs->trans("RepeatableInvoices"),'ch-facture.html#s-fac-facture-rec');
+llxHeader('', $langs->trans("RepeatableInvoices"), 'ch-facture.html#s-fac-facture-rec');
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 $companystatic = new Societe($db);
 $invoicerectmp = new FactureRec($db);
 
 $now = dol_now();
-$tmparray=dol_getdate($now);
-$today = dol_mktime(23,59,59,$tmparray['mon'],$tmparray['mday'],$tmparray['year']);   // Today is last second of current day
+$tmparray = dol_getdate($now);
+$today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
 
 
 /*
  *  List mode
  */
 $sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre, f.total, f.tva as total_vat, f.total_ttc, f.frequency, f.unit_frequency,";
-$sql.= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when, f.suspended,";
-$sql.= " f.datec, f.tms,";
-$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 .= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when, f.suspended,";
+$sql .= " f.datec, f.tms,";
+$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.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('invoice').')';
-if (! $user->rights->societe->client->voir && ! $socid) {
+$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;
 }
 if ($search_ref)                  $sql .= natural_search('f.titre', $search_ref);
@@ -234,46 +234,46 @@ 
 if ($search_montant_ht != '')     $sql .= natural_search('f.total', $search_montant_ht, 1);
 if ($search_montant_vat != '')    $sql .= natural_search('f.tva', $search_montant_vat, 1);
 if ($search_montant_ttc != '')    $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if (! empty($search_payment_mode) && $search_payment_mode != '-1')   $sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
-if (! empty($search_payment_term) && $search_payment_term != '-1')   $sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
+if (!empty($search_payment_mode) && $search_payment_mode != '-1')   $sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
+if (!empty($search_payment_term) && $search_payment_term != '-1')   $sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
 if ($search_recurring == '1')     $sql .= ' AND f.frequency > 0';
 if ($search_recurring == '0')     $sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
 if ($search_frequency != '')      $sql .= natural_search('f.frequency', $search_frequency, 1);
 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))."'";
+		$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)."'";
+		$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))."'";
+		$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)."'";
+		$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);
+$sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -287,43 +287,43 @@ 
 	}
 }
 
-$sql.= $db->plimit($limit+1,$offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $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);
+	$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")));
+	$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
+	$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"].'">';
@@ -337,133 +337,133 @@ 
 	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_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";
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Filters lines
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (! empty($arrayfields['f.titre']['checked']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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']))
+	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.'">';
+		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');
+		$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']))
+	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.'">';
+		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');
+		$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
+	$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']))
+	if (!empty($arrayfields['f.datec']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (! empty($arrayfields['f.tms']['checked']))
+	if (!empty($arrayfields['f.tms']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (! empty($arrayfields['status']['checked']))
+	if (!empty($arrayfields['status']['checked']))
 	{
 		print '<td class="liste_titre" align="center">';
-		$liststatus=array(
+		$liststatus = array(
 			0=>$langs->trans("Draft"),
 			1=>$langs->trans("Active"),
 			-1=>$langs->trans("Disabled"),
@@ -473,143 +473,143 @@ 
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+	$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";
+	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))
+		$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;
+			$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;
+			$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']))
+			if (!empty($arrayfields['f.titre']['checked']))
 			{
 			   print '<td>';
 			   print $invoicerectmp->getNomUrl(1);
 			   print "</a>";
 			   print "</td>\n";
-			   if (! $i) $totalarray['nbfield']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['s.nom']['checked']))
+			if (!empty($arrayfields['s.nom']['checked']))
 			{
-			   print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+			   if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['f.total']['checked']))
+			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';
+			   if (!$i) $totalarray['nbfield']++;
+			   if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
 			   $totalarray['val']['f.total'] += $objp->total;
 			}
-			if (! empty($arrayfields['f.tva']['checked']))
+			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';
+			   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']))
+			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';
+			   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']))
+			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']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
 			// Payment mode
-			if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
+			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 (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['recurring']['checked']))
+			if (!empty($arrayfields['recurring']['checked']))
 			{
-			   print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   print '<td align="center">'.yn($objp->frequency ? 1 : 0).'</td>';
+			   if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['f.frequency']['checked']))
+			if (!empty($arrayfields['f.frequency']['checked']))
 			{
 			   print '<td align="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['f.unit_frequency']['checked']))
+			if (!empty($arrayfields['f.unit_frequency']['checked']))
 			{
 			   print '<td align="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['f.nb_gen_done']['checked']))
+			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 ($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']++;
+				if (!$i) $totalarray['nbfield']++;
 			}
 			// Date last generation
-			if (! empty($arrayfields['f.date_last_gen']['checked']))
+			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 ($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']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
 			// Date next generation
-			if (! empty($arrayfields['f.date_when']['checked']))
+			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())
+				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"));
+					if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
 				}
 				else
 				{
@@ -617,28 +617,28 @@ 
 				}
 				print '</div>';
 				print '</td>';
-				if (! $i) $totalarray['nbfield']++;
+				if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['f.datec']['checked']))
+			if (!empty($arrayfields['f.datec']['checked']))
 			{
 			   print '<td align="center">';
-			   print dol_print_date($db->jdate($objp->datec),'dayhour');
+			   print dol_print_date($db->jdate($objp->datec), 'dayhour');
 			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['f.tms']['checked']))
+			if (!empty($arrayfields['f.tms']['checked']))
 			{
 			   print '<td align="center">';
-			   print dol_print_date($db->jdate($objp->tms),'dayhour');
+			   print dol_print_date($db->jdate($objp->tms), 'dayhour');
 			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
-			if (! empty($arrayfields['status']['checked']))
+			if (!empty($arrayfields['status']['checked']))
 			{
 			   print '<td align="center">';
-			   print $invoicerectmp->getLibStatut(3,0);
+			   print $invoicerectmp->getLibStatut(3, 0);
 			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   if (!$i) $totalarray['nbfield']++;
 			}
 			// Action column
 			print '<td align="center">';
@@ -650,7 +650,7 @@ 
 				}
 				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 '<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
@@ -662,7 +662,7 @@ 
 			{
 				print "&nbsp;";
 			}
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 			print "</td>";
 
 			print "</tr>\n";
@@ -672,8 +672,8 @@ 
 	}
 	else
 	{
-		$colspan=1;
-		foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 	}
 
@@ -682,11 +682,11 @@ 
 	if (isset($totalarray['pos']))
 	{
 		print '<tr class="liste_total">';
-		$i=0;
+		$i = 0;
 		while ($i < $totalarray['nbfield'])
 		{
 			$i++;
-			if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+			if (!empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 			else
 			{
 				if ($i == 1)

Braces +295 added lines, -121 removed lines

@@ -60,9 +60,13 @@ 
 $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
 $lineid=GETPOST('lineid','int');
 $ref=GETPOST('ref','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $objecttype = 'facture_rec';
-if ($action == "create" || $action == "add") $objecttype = '';
+if ($action == "create" || $action == "add") {
+    $objecttype = '';
+}
 $result = restrictedArea($user, 'facture', $id, $objecttype);
 $projectid = GETPOST('projectid','int');
 
@@ -90,8 +94,12 @@ 
 $page = GETPOST("page",'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='f.titre';
+if (! $sortorder) {
+    $sortorder='DESC';
+}
+if (! $sortfield) {
+    $sortfield='f.titre';
+}
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -140,7 +148,9 @@ 
 {
 	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]));
+		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]));
+		}
 	}
 }
 
@@ -154,19 +164,25 @@ 
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 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';
 
 	// 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
+	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='';
@@ -229,46 +245,74 @@ 
 if (! $user->rights->societe->client->voir && ! $socid) {
 	$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);
-if ($search_montant_ht != '')     $sql .= natural_search('f.total', $search_montant_ht, 1);
-if ($search_montant_vat != '')    $sql .= natural_search('f.tva', $search_montant_vat, 1);
-if ($search_montant_ttc != '')    $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if (! empty($search_payment_mode) && $search_payment_mode != '-1')   $sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
-if (! empty($search_payment_term) && $search_payment_term != '-1')   $sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
-if ($search_recurring == '1')     $sql .= ' AND f.frequency > 0';
-if ($search_recurring == '0')     $sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
-if ($search_frequency != '')      $sql .= natural_search('f.frequency', $search_frequency, 1);
-if ($search_unit_frequency != '') $sql .= ' AND f.frequency > 0'.natural_search('f.unit_frequency', $search_unit_frequency);
+if ($search_ref) {
+    $sql .= natural_search('f.titre', $search_ref);
+}
+if ($search_societe) {
+    $sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_montant_ht != '') {
+    $sql .= natural_search('f.total', $search_montant_ht, 1);
+}
+if ($search_montant_vat != '') {
+    $sql .= natural_search('f.tva', $search_montant_vat, 1);
+}
+if ($search_montant_ttc != '') {
+    $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
+}
+if (! empty($search_payment_mode) && $search_payment_mode != '-1') {
+    $sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
+}
+if (! empty($search_payment_term) && $search_payment_term != '-1') {
+    $sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
+}
+if ($search_recurring == '1') {
+    $sql .= ' AND f.frequency > 0';
+}
+if ($search_recurring == '0') {
+    $sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
+}
+if ($search_frequency != '') {
+    $sql .= natural_search('f.frequency', $search_frequency, 1);
+}
+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)."'";
-}
-else if ($search_year > 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)."'";
+	}
+	} 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))."'";
 }
 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)."'";
-}
-else if ($search_year_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)."'";
+	}
+	} 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))."'";
 }
@@ -280,9 +324,11 @@ 
 {
 	$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
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -295,28 +341,72 @@ 
 	$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);
+	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';
 
@@ -327,7 +417,9 @@ 
 	//$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.'">';
+	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">';
@@ -426,7 +518,9 @@ 
 	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.'">';
+		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>';
@@ -435,7 +529,9 @@ 
 	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.'">';
+		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>';
@@ -480,22 +576,54 @@ 
 
 
 	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);
+	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";
 
@@ -506,7 +634,9 @@ 
 		while ($i < min($num,$limit))
 		{
 			$objp = $db->fetch_object($resql);
-			if (empty($objp)) break;
+			if (empty($objp)) {
+			    break;
+			}
 
 			$companystatic->id=$objp->socid;
 			$companystatic->name=$objp->name;
@@ -527,32 +657,48 @@ 
 			   print $invoicerectmp->getNomUrl(1);
 			   print "</a>";
 			   print "</td>\n";
-			   if (! $i) $totalarray['nbfield']++;
+			   if (! $i) {
+			       $totalarray['nbfield']++;
+			   }
 			}
 			if (! empty($arrayfields['s.nom']['checked']))
 			{
 			   print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1,'customer').'</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   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';
+			   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';
+			   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';
+			   if (! $i) {
+			       $totalarray['nbfield']++;
+			   }
+			   if (! $i) {
+			       $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc';
+			   }
 			   $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
 			}
 			// Payment term
@@ -561,7 +707,9 @@ 
 			   print '<td align="right">';
 			   print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
 			   print '</td>'."\n";
-			   if (! $i) $totalarray['nbfield']++;
+			   if (! $i) {
+			       $totalarray['nbfield']++;
+			   }
 			}
 			// Payment mode
 			if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
@@ -569,29 +717,39 @@ 
 			   print '<td align="right">';
 			   print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
 			   print '</td>'."\n";
-			   if (! $i) $totalarray['nbfield']++;
+			   if (! $i) {
+			       $totalarray['nbfield']++;
+			   }
 			}
 			if (! empty($arrayfields['recurring']['checked']))
 			{
 			   print '<td align="center">'.yn($objp->frequency?1:0).'</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   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 (! $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 (! $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']++;
+				if (! $i) {
+				    $totalarray['nbfield']++;
+				}
 			}
 			// Date last generation
 			if (! empty($arrayfields['f.date_last_gen']['checked']))
@@ -599,7 +757,9 @@ 
 			   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']++;
+			   if (! $i) {
+			       $totalarray['nbfield']++;
+			   }
 			}
 			// Date next generation
 			if (! empty($arrayfields['f.date_when']['checked']))
@@ -609,36 +769,45 @@ 
 				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
+					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 (! $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 (! $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 (! $i) {
+			       $totalarray['nbfield']++;
+			   }
 			}
 			if (! empty($arrayfields['status']['checked']))
 			{
 			   print '<td align="center">';
 			   print $invoicerectmp->getLibStatut(3,0);
 			   print '</td>';
-			   if (! $i) $totalarray['nbfield']++;
+			   if (! $i) {
+			       $totalarray['nbfield']++;
+			   }
 			}
 			// Action column
 			print '<td align="center">';
@@ -647,33 +816,34 @@ 
 				if ($invoicerectmp->isMaxNbGenReached())
 				{
 					print $langs->trans("MaxNumberOfGenerationReached");
-				}
-				elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+				} 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
+				} else
 				{
 					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
 				}
-			}
-			else
+			} else
 			{
 				print "&nbsp;";
 			}
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 			print "</td>";
 
 			print "</tr>\n";
 
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		$colspan=1;
-		foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+		foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) {
+		    $colspan++;
+		}
+		}
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 	}
 
@@ -686,15 +856,20 @@ 
 		while ($i < $totalarray['nbfield'])
 		{
 			$i++;
-			if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-			else
+			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>';
+					if ($num < $limit) {
+					    print '<td align="left">'.$langs->trans("Total").'</td>';
+					} else {
+					    print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+					}
+				} else {
+				    print '<td></td>';
 				}
-				else print '<td></td>';
 			}
 		}
 		print '</tr>';
@@ -705,8 +880,7 @@ 
 	print "</form>";
 
 	$db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }

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

Spacing +258 added lines, -258 removed lines

@@ -33,51 +33,51 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 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';
+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';
 }
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'compta', 'admin', 'other', 'products'));
 
-$action     = GETPOST('action','alpha');
-$massaction = GETPOST('massaction','alpha');
-$show_files = GETPOST('show_files','int');
-$confirm    = GETPOST('confirm','alpha');
+$action     = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'invoicetemplatelist';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
 
 // Security check
-$id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
-$lineid=GETPOST('lineid','int');
-$ref=GETPOST('ref','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
+$id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$lineid = GETPOST('lineid', 'int');
+$ref = GETPOST('ref', 'alpha');
+if ($user->societe_id) $socid = $user->societe_id;
 $objecttype = 'facture_rec';
 if ($action == "create" || $action == "add") $objecttype = '';
 $result = restrictedArea($user, 'facture', $id, $objecttype);
-$projectid = GETPOST('projectid','int');
+$projectid = GETPOST('projectid', 'int');
 
-$year_date_when=GETPOST('year_date_when');
-$month_date_when=GETPOST('month_date_when');
+$year_date_when = GETPOST('year_date_when');
+$month_date_when = GETPOST('month_date_when');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='f.titre';
+if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) $sortfield = 'f.titre';
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -92,15 +92,15 @@ 
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('invoicereccard','globalcard'));
+$hookmanager->initHooks(array('invoicereccard', 'globalcard'));
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('facture_rec');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
+$permissiondellink = $user->rights->facture->creer; // Used by the include of actions_dellink.inc.php
 $permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
 
 $now = dol_now();
@@ -110,8 +110,8 @@ 
  * Actions
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
@@ -119,17 +119,17 @@ 
 
 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';
 
 	// Set note
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	    // Must be include, not include_once
+	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';
@@ -142,43 +142,43 @@ 
 	// Create predefined invoice
 	if ($action == 'add')
 	{
-		if (! GETPOST('titre'))
+		if (!GETPOST('titre'))
 		{
-			setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("Title")), null, 'errors');
+			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');
+		$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');
+				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');
+				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("MaxPeriodNumber")), null, 'errors');
 				$action = "create";
 				$error++;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$object->titre = GETPOST('titre', 'alpha');
-			$object->note_private = GETPOST('note_private','none');
-            $object->note_public  = GETPOST('note_public','none');
+			$object->note_private = GETPOST('note_private', 'none');
+            $object->note_public = GETPOST('note_public', 'none');
             $object->modelpdf = GETPOST('modelpdf', 'alpha');
 			$object->usenewprice = GETPOST('usenewprice');
 
@@ -193,14 +193,14 @@ 
 			$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)
+			if (GETPOST('facid', 'int') > 0)
 			{
 				$srcObject = new Facture($db);
-				$srcObject->fetch(GETPOST('facid','int'));
+				$srcObject->fetch(GETPOST('facid', 'int'));
 
 				$srcObject->fetchObjectLinked();
 
-				if (! empty($srcObject->linkedObjectsIds['contrat']))
+				if (!empty($srcObject->linkedObjectsIds['contrat']))
 				{
 					$contractidid = reset($srcObject->linkedObjectsIds['contrat']);
 
@@ -213,12 +213,12 @@ 
 			$db->begin();
 
 			$oldinvoice = new Facture($db);
-			$oldinvoice->fetch(GETPOST('facid','int'));
+			$oldinvoice->fetch(GETPOST('facid', 'int'));
 
 			$result = $object->create($user, $oldinvoice->id);
 			if ($result > 0)
 			{
-				$result=$oldinvoice->delete($user, 1);
+				$result = $oldinvoice->delete($user, 1);
 				if ($result < 0)
 				{
 					$error++;
@@ -233,11 +233,11 @@ 
 				$action = "create";
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$db->commit();
 
-				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
+				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id);
 	   			exit;
 			}
 			else
@@ -256,7 +256,7 @@ 
 	{
 		$object->delete($user);
 
-        header("Location: " . BASE_URI . 'controller=compta/facture&method=invoicetemplate_list');
+        header("Location: ".BASE_URI.'controller=compta/facture&method=invoicetemplate_list');
 		exit;
 	}
 
@@ -265,12 +265,12 @@ 
 	// Set condition
 	if ($action == 'setconditions' && $user->rights->facture->creer)
 	{
-		$result=$object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$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'));
+		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	}
 	// Set project
 	elseif ($action == 'classin' && $user->rights->facture->creer)
@@ -281,7 +281,7 @@ 
 	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');
+		$result = $object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY');
 		if ($result > 0)
 		{
 			$object->titre = GETPOST('ref', 'alpha');
@@ -292,7 +292,7 @@ 
 	// Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
 	{
-		$result=$object->setBankAccount(GETPOST('fk_account', 'int'));
+		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 	// Set frequency and unit frequency
 	elseif ($action == 'setfrequency' && $user->rights->facture->creer)
@@ -339,7 +339,7 @@ 
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$db->commit();
 		}
@@ -363,7 +363,7 @@ 
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$db->commit();
 		}
@@ -382,19 +382,19 @@ 
 
 		$db->begin();
 
-		$line=new FactureLigneRec($db);
+		$line = new FactureLigneRec($db);
 
 		// For triggers
 		$line->id = $lineid;
 
 		if ($line->delete($user) > 0)
 		{
-			$result=$object->update_price(1);
+			$result = $object->update_price(1);
 
 			if ($result > 0)
 			{
 				$db->commit();
-				$object->fetch($object->id);    // Reload lines
+				$object->fetch($object->id); // Reload lines
 			}
 			else
 			{
@@ -414,10 +414,10 @@ 
 
 		// 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'));
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute', 'none'));
 		if ($ret < 0) $error++;
 
-		if (! $error)
+		if (!$error)
 		{
 			$result = $object->insertExtraFields('BILLREC_MODIFY');
 			if ($result < 0)
@@ -435,22 +435,22 @@ 
 		$error = 0;
 
 		// Set if we used free entry or predefined product
-		$predef='';
-		$product_desc=(GETPOST('dp_desc')?GETPOST('dp_desc'):'');
+		$predef = '';
+		$product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
 		$price_ht = GETPOST('price_ht');
 		if (GETPOST('prod_entry_mode') == 'free')
 		{
-			$idprod=0;
+			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		}
 		else
 		{
-			$idprod=GETPOST('idprod', 'int');
+			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
 
-		$qty = GETPOST('qty' . $predef);
-		$remise_percent = GETPOST('remise_percent' . $predef);
+		$qty = GETPOST('qty'.$predef);
+		$remise_percent = GETPOST('remise_percent'.$predef);
 
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
@@ -461,38 +461,38 @@ 
 		{
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key . $predef]);
+				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 ++;
+			$error++;
 		}
 		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
-			$error ++;
+			$error++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
+		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 ++;
+			$error++;
 		}
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
-			$error ++;
+			$error++;
 		}
 		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && empty($product_desc)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
-			$error ++;
+			$error++;
 		}
 		if ($qty < 0) {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
-			$error ++;
+			$error++;
 		}
 
-		if (! $error && ($qty >= 0) && (! empty($product_desc) || ! empty($idprod)))
+		if (!$error && ($qty >= 0) && (!empty($product_desc) || !empty($idprod)))
 		{
 		$ret = $object->fetch($id);
 		if ($ret < 0) {
@@ -502,8 +502,8 @@ 
 		$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'));
+		$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
@@ -515,7 +515,7 @@ 
 		// 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))
+		if (!empty($idprod))
 			{
 			$prod = new Product($db);
 			$prod->fetch($idprod);
@@ -525,7 +525,7 @@ 
 			// 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;
+			if (empty($tva_tx)) $tva_npr = 0;
 
 			$pu_ht = $prod->price;
 			$pu_ttc = $prod->price_ttc;
@@ -533,26 +533,26 @@ 
 			$price_base_type = $prod->price_base_type;
 
 			// We define price for product
-			if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+			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 (!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;
+					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))
+			elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+				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);
+				$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
 
 				$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 				if ($result)
@@ -563,9 +563,9 @@ 
 						$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.')';
+						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;
+						if (empty($tva_tx)) $tva_npr = 0;
 					}
 				}
 			}
@@ -574,7 +574,7 @@ 
 			$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))
+			if (!empty($price_ht))
 			{
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
@@ -596,21 +596,21 @@ 
 			$desc = '';
 
 			// Define output language
-			if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_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) && GETPOST('lang_id', 'aZ09'))
+					$newlang = GETPOST('lang_id', 'aZ09');
 				if (empty($newlang))
 					$newlang = $object->thirdparty->default_lang;
-				if (! empty($newlang))
+				if (!empty($newlang))
 				{
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
 
-				$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+				$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
 			}
 			else
 			{
@@ -620,15 +620,15 @@ 
 					$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)))
+			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))
+				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);
+				if (!empty($prod->country_code))
+					$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
 				$tmptxt .= ')';
 				$desc = dol_concatdesc($desc, $tmptxt);
 			}
@@ -642,19 +642,19 @@ 
 			$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;
+			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');
+			$fk_unit = GETPOST('units', 'alpha');
 		}
 
-		$date_start_fill = GETPOST('date_start_fill','int');
-		$date_end_fill = GETPOST('date_end_fill','int');
+		$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
+		$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);
@@ -664,7 +664,7 @@ 
 		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))))
+		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');
@@ -672,7 +672,7 @@ 
 		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);
+			$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)
 			{
@@ -693,7 +693,7 @@ 
     			    $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			    if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
     			}*/
-				$object->fetch($object->id);    // Reload lines
+				$object->fetch($object->id); // Reload lines
 
 				unset($_POST['prod_entry_mode']);
 
@@ -744,9 +744,9 @@ 
 		}
 	}
 
-	elseif ($action == 'updateline' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
+	elseif ($action == 'updateline' && $user->rights->facture->creer && !GETPOST('cancel', 'alpha'))
 	{
-		if (! $object->fetch($id) > 0)	dol_print_error($db);
+		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
 
 		// Clean parameters
@@ -754,7 +754,7 @@ 
 		$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'));
+		$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');
@@ -771,7 +771,7 @@ 
 
 		// 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
+		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
 
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
@@ -781,8 +781,8 @@ 
 		$objectline = new FactureLigneRec($db);
 		if ($objectline->fetch(GETPOST('lineid')))
 		{
-			$objectline->array_options=$array_options;
-			$result=$objectline->insertExtraFields();
+			$objectline->array_options = $array_options;
+			$result = $objectline->insertExtraFields();
 			if ($result < 0)
 			{
 				setEventMessages($langs->trans('Error').$result, null, 'errors');
@@ -795,13 +795,13 @@ 
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value)
 			{
-				 unset($_POST["options_" . $key]);
+				 unset($_POST["options_".$key]);
 			}
 		}
 
 		// Define special_code for special lines
-		$special_code=GETPOST('special_code');
-		if (! GETPOST('qty')) $special_code=3;
+		$special_code = GETPOST('special_code');
+		if (!GETPOST('qty')) $special_code = 3;
 
 		/*$line = new FactureLigne($db);
         $line->fetch(GETPOST('lineid'));
@@ -817,7 +817,7 @@ 
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
-		if (! empty($productid))
+		if (!empty($productid))
 		{
 			$product = new Product($db);
 			$product->fetch($productid);
@@ -825,16 +825,16 @@ 
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
+			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))))
+			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 ++;
+				$error++;
 			}
 		} else {
 			$type = GETPOST('type');
@@ -843,20 +843,20 @@ 
 				// Check parameters
 				if (GETPOST('type') < 0) {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-					$error ++;
+					$error++;
 				}
 			}
 		if ($qty < 0) {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
-			$error ++;
+			$error++;
 		}
 
-		$date_start_fill = GETPOST('date_start_fill','int');
-		$date_end_fill = GETPOST('date_end_fill','int');
+		$date_start_fill = GETPOST('date_start_fill', 'int');
+		$date_end_fill = GETPOST('date_end_fill', 'int');
 
 		// Update line
-		if (! $error)
+		if (!$error)
 		{
 			$result = $object->updateline(
 				GETPOST('lineid'),
@@ -902,7 +902,7 @@ 
                                 $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                     }*/
 
-				$object->fetch($object->id);    // Reload lines
+				$object->fetch($object->id); // Reload lines
 
 				unset($_POST['qty']);
 				unset($_POST['type']);
@@ -953,17 +953,17 @@ 
  *	View
  */
 
-llxHeader('',$langs->trans("RepeatableInvoices"),'ch-facture.html#s-fac-facture-rec');
+llxHeader('', $langs->trans("RepeatableInvoices"), 'ch-facture.html#s-fac-facture-rec');
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 $companystatic = new Societe($db);
 $invoicerectmp = new FactureRec($db);
 
 $now = dol_now();
-$tmparray=dol_getdate($now);
-$today = dol_mktime(23,59,59,$tmparray['mon'],$tmparray['mday'],$tmparray['year']);   // Today is last second of current day
+$tmparray = dol_getdate($now);
+$today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
 
 
 /*
@@ -971,9 +971,9 @@ 
  */
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans("CreateRepeatableInvoice"),'','title_accountancy.png');
+	print load_fiche_titre($langs->trans("CreateRepeatableInvoice"), '', 'title_accountancy.png');
 
-	$object = new Facture($db);   // Source invoice
+	$object = new Facture($db); // Source invoice
 	$product_static = new Product($db);
 
 	if ($object->fetch($id, $ref) > 0)
@@ -987,8 +987,8 @@ 
 
 		dol_fiche_head(null, '', '', 0);
 
-		$rowspan=4;
-		if (! empty($conf->projet->enabled)) $rowspan++;
+		$rowspan = 4;
+		if (!empty($conf->projet->enabled)) $rowspan++;
 		if ($object->fk_account > 0) $rowspan++;
 
 		print '<table class="border" width="100%">';
@@ -1001,34 +1001,34 @@ 
 		print '</td></tr>';
 
 		// Third party
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Customer").'</td><td>'.$object->thirdparty->getNomUrl(1,'customer').'</td>';
+		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;
+		$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_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').')';
+		$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').')';
+		$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)
+		foreach ($substitutionarray as $key => $val)
 		{
-			$htmltext.=$key.' = '.$langs->trans($val).'<br>';
+			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 		}
-		$htmltext.='</i>';
+		$htmltext .= '</i>';
 
 		// Public note
 		print '<tr>';
@@ -1067,13 +1067,13 @@ 
 		print "</td></tr>";
 
 		// Project
-		if (! empty($conf->projet->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0)
+		if (!empty($conf->projet->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0)
 		{
-			$projectid = GETPOST('projectid')?GETPOST('projectid'):$object->fk_project;
+			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
-			print '<tr><td>' . $langs->trans('Project') . '</td><td>';
+			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 ' &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>';
 		}
 
@@ -1087,7 +1087,7 @@ 
 
         // Model pdf
         print "<tr><td>".$langs->trans('Model')."</td><td>";
-        include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
         $list = ModelePDFFactures::liste_modeles($db);
         print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
         print "</td></tr>";
@@ -1107,7 +1107,7 @@ 
 
 		// 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 "<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
@@ -1123,15 +1123,15 @@ 
 
 		// Auto validate the invoice
 		print "<tr><td>".$langs->trans("StatusOfGeneratedInvoices")."</td><td>";
-		$select = array('0'=>$langs->trans('BillStatusDraft'),'1'=>$langs->trans('BillStatusValidated'));
+		$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))
+		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'));
+			$select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
 		}
@@ -1159,12 +1159,12 @@ 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		// Show object lines
-		if (! empty($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
+			$disableedit = 1;
+			$disablemove = 1;
+			$disableremove = 1;
+			$object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
 		}
 
 		print "</table>\n";
@@ -1185,13 +1185,13 @@ 
 
 		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 '<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);
+		dol_print_error('', "Error, no invoice ".$object->id);
 	}
 }
 else
@@ -1205,12 +1205,12 @@ 
 
 		// 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);
+			$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);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
 		}
 
 		print $formconfirm;
@@ -1218,57 +1218,57 @@ 
 		$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
 
-        $linkback = '<a href="' . BASE_URI . '?controller=compta/facture&method=invoicetemplate_list&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+        $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 = '';
+		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">';
+		$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);
+		$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (! empty($conf->projet->enabled))
+		if (!empty($conf->projet->enabled))
 		{
 			$langs->load("projects");
-			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			$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> : ';
+					$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>';
+						$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);
+						$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)) {
+				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>';
+                    $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 .= '';
 				}
 			}
 		}
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'titre', 'none', $morehtmlref, '', 0, '', $morehtmlright);
 
@@ -1281,25 +1281,25 @@ 
 		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 '<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><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>';
+			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->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><td>'.$langs->trans("AmountTTC").'</td><td colspan="3">'.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 
 
@@ -1308,19 +1308,19 @@ 
 		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>';
+		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');
+				$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');
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
 			}
 		} else {
 			print '&nbsp;';
@@ -1332,8 +1332,8 @@ 
 		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>';
+		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')
@@ -1347,30 +1347,30 @@ 
 		print '</td></tr>';
 
 		// Help of substitution key
-		$dateexample=dol_now();
-		if (! empty($object->frequency) && ! empty($object->date_when)) $dateexample=$object->date_when;
+		$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_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').')';
+		$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').')';
+		$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)
+		foreach ($substitutionarray as $key => $val)
 		{
-			$htmltext.=$key.' = '.$langs->trans($val).'<br>';
+			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 		}
-		$htmltext.='</i>';
+		$htmltext .= '</i>';
 
 		// Note public
 		print '<tr><td>';
@@ -1395,8 +1395,8 @@ 
 		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>';
+		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')
@@ -1417,17 +1417,17 @@ 
         print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
         print $langs->trans('Model');
         print '<td>';
-        if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
-            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'),1).'</a></td>';
+        if (($action != 'editmodelpdf') && $user->rights->facture->creer && !empty($object->brouillon))
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editmodelpdf')
         {
-            include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
             $list = array();
             $models = ModelePDFFactures::liste_modeles($db);
             foreach ($models as $model) {
-                $list[] = $model . ':' . $model;
+                $list[] = $model.':'.$model;
             }
             $select = 'select;'.implode(',', $list);
             print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
@@ -1441,7 +1441,7 @@ 
 
 		// Other attributes
 		$cols = 2;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 
@@ -1466,18 +1466,18 @@ 
 		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>';
+		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 '<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 "<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>';
@@ -1511,9 +1511,9 @@ 
 			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->isMaxNbGenReached())
 		{
-			if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
+			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
 		}
 		else
 		{
@@ -1535,7 +1535,7 @@ 
 		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);
+			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
 		}
 		else
 		{
@@ -1558,7 +1558,7 @@ 
 		}
 		print '</td>';
 		// Auto generate documents
-		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
+		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
 		{
 			print '<tr>';
 			print '<td>';
@@ -1599,7 +1599,7 @@ 
 			// 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 $object->nb_gen_done ? $object->nb_gen_done : '0';
 			print '</td>';
 			print '</tr>';
 
@@ -1624,25 +1624,25 @@ 
 
 
 		// 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') . '">
+		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 . '">
+        	<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))
+		if (!empty($object->lines))
 		{
 			//$disableedit=1;
 			//$disablemove=1;
-			$ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
+			$ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
 		}
 
 		// Form to add new line
@@ -1651,7 +1651,7 @@ 
 			if ($action != 'editline')
 			{
 				// Add free products/services
-				$object->formAddObjectLine(0, $mysoc, $object->thirdparty);                          // No date selector for template invoice
+				$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
@@ -1675,7 +1675,7 @@ 
 		{
 			if ($user->rights->facture->creer)
 			{
-				if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
+				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>';
 				}
@@ -1683,7 +1683,7 @@ 
 				{
 					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>';
+                        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
 					{
@@ -1701,11 +1701,11 @@ 
 		{
 			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>';
+                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
 			{
-                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>';
+                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>';
 			}
 		}
 

Braces +170 added lines, -135 removed lines

@@ -61,9 +61,13 @@ 
 $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
 $lineid=GETPOST('lineid','int');
 $ref=GETPOST('ref','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $objecttype = 'facture_rec';
-if ($action == "create" || $action == "add") $objecttype = '';
+if ($action == "create" || $action == "add") {
+    $objecttype = '';
+}
 $result = restrictedArea($user, 'facture', $id, $objecttype);
 $projectid = GETPOST('projectid','int');
 
@@ -76,8 +80,12 @@ 
 $page = GETPOST("page",'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='f.titre';
+if (! $sortorder) {
+    $sortorder='DESC';
+}
+if (! $sortfield) {
+    $sortfield='f.titre';
+}
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -115,11 +123,15 @@ 
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 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';
@@ -225,8 +237,7 @@ 
 					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
 					$action = "create";
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -239,8 +250,7 @@ 
 
 				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
 	   			exit;
-			}
-			else
+			} else
 			{
 				$db->rollback();
 
@@ -286,8 +296,9 @@ 
 		{
 			$object->titre = GETPOST('ref', 'alpha');
 			$object->ref = $object->titre;
+		} else {
+		    dol_print_error($db, $object->error, $object->errors);
 		}
-		else dol_print_error($db, $object->error, $object->errors);
 	}
 	// Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
@@ -303,7 +314,9 @@ 
 	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);
+		if (!empty($date)) {
+		    $object->setNextDate($date);
+		}
 	}
 	// Set max period
 	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
@@ -342,8 +355,7 @@ 
 		if (! $error)
 		{
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -366,8 +378,7 @@ 
 		if (! $error)
 		{
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -395,27 +406,26 @@ 
 			{
 				$db->commit();
 				$object->fetch($object->id);    // Reload lines
-			}
-			else
+			} else
 			{
 				$db->rollback();
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	}
-	else if ($action == 'update_extras')
+	} 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 ($ret < 0) {
+		    $error++;
+		}
 
 		if (! $error)
 		{
@@ -442,8 +452,7 @@ 
 		{
 			$idprod=0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
+		} else
 		{
 			$idprod=GETPOST('idprod', 'int');
 			$tva_tx = '';
@@ -473,9 +482,11 @@ 
 			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 ''
+		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 == '') {
@@ -525,7 +536,9 @@ 
 			// 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;
+			if (empty($tva_tx)) {
+			    $tva_npr=0;
+			}
 
 			$pu_ht = $prod->price;
 			$pu_ttc = $prod->price_ttc;
@@ -539,14 +552,19 @@ 
 				$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 (! 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))
+					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';
 
@@ -563,9 +581,13 @@ 
 						$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.')';
+						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;
+						if (empty($tva_tx)) {
+						    $tva_npr=0;
+						}
 					}
 				}
 			}
@@ -586,8 +608,7 @@ 
 				if ($price_base_type != 'HT')
 				{
 					$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-				}
-				else
+				} else
 				{
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 				}
@@ -600,10 +621,12 @@ 
 			{
 				$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) && GETPOST('lang_id','aZ09')) {
+									$newlang = GETPOST('lang_id','aZ09');
+				}
+				if (empty($newlang)) {
+									$newlang = $object->thirdparty->default_lang;
+				}
 				if (! empty($newlang))
 				{
 					$outputlangs = new Translate("", $conf);
@@ -611,8 +634,7 @@ 
 				}
 
 				$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
-			}
-			else
+			} else
 			{
 				$desc = $prod->description;
 			}
@@ -623,26 +645,30 @@ 
 			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);
+				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
+		} 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;
+			if (empty($tva_tx)) {
+			    $tva_npr=0;
+			}
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 			$desc = $product_desc;
 			$type = GETPOST('type');
@@ -661,15 +687,15 @@ 
 		$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 
 		$info_bits = 0;
-		if ($tva_npr)
-			$info_bits |= 0x01;
+		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
+		} 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);
@@ -733,8 +759,7 @@ 
 
 				unset($_POST['situations']);
 				unset($_POST['progress']);
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -742,11 +767,11 @@ 
 			$action = '';
 		}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
+	} elseif ($action == 'updateline' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
 	{
-		if (! $object->fetch($id) > 0)	dol_print_error($db);
+		if (! $object->fetch($id) > 0) {
+		    dol_print_error($db);
+		}
 		$object->fetch_thirdparty();
 
 		// Clean parameters
@@ -762,7 +787,9 @@ 
 
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
+		if (preg_match('/\*/', $vat_rate)) {
+		    $info_bits |= 0x01;
+		}
 
 		// Define vat_rate
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -801,7 +828,9 @@ 
 
 		// Define special_code for special lines
 		$special_code=GETPOST('special_code');
-		if (! GETPOST('qty')) $special_code=3;
+		if (! GETPOST('qty')) {
+		    $special_code=3;
+		}
 
 		/*$line = new FactureLigne($db);
         $line->fetch(GETPOST('lineid'));
@@ -825,8 +854,9 @@ 
 			$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];
+			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') : '');
 
@@ -939,8 +969,7 @@ 
 
 				unset($_POST['situations']);
 				unset($_POST['progress']);
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -988,8 +1017,12 @@ 
 		dol_fiche_head(null, '', '', 0);
 
 		$rowspan=4;
-		if (! empty($conf->projet->enabled)) $rowspan++;
-		if ($object->fk_account > 0) $rowspan++;
+		if (! empty($conf->projet->enabled)) {
+		    $rowspan++;
+		}
+		if ($object->fk_account > 0) {
+		    $rowspan++;
+		}
 
 		print '<table class="border" width="100%">';
 
@@ -1134,8 +1167,7 @@ 
 			$select = array('0'=>$langs->trans('DoNotGenerateDoc'),'1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
-		}
-		else
+		} else
 		{
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
@@ -1146,10 +1178,11 @@ 
 
 
 		$title = $langs->trans("ProductsAndServices");
-		if (empty($conf->service->enabled))
-			$title = $langs->trans("Products");
-		else if (empty($conf->product->enabled))
-			$title = $langs->trans("Services");
+		if (empty($conf->service->enabled)) {
+					$title = $langs->trans("Products");
+		} else if (empty($conf->product->enabled)) {
+					$title = $langs->trans("Services");
+		}
 
 		print load_fiche_titre($title, '', '');
 
@@ -1188,13 +1221,11 @@ 
 		print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',"Error, no invoice ".$object->id);
 	}
-}
-else
+} else
 {
 	/*
 	 * View mode
@@ -1227,8 +1258,11 @@ 
         $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');
+		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
@@ -1243,8 +1277,9 @@ 
 			$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.='<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.'">';
@@ -1288,14 +1323,18 @@ 
 		print '</tr>';
 
 		// Amount Local Taxes
-		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
+		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
+		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>';
 		}
 
@@ -1308,8 +1347,9 @@ 
 		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>';
+		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)
@@ -1317,8 +1357,7 @@ 
 			if ($action == 'editconditions')
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
-			}
-			else
+			} else
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
 			}
@@ -1332,15 +1371,15 @@ 
 		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>';
+		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
+		} else
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
 		}
@@ -1348,7 +1387,9 @@ 
 
 		// Help of substitution key
 		$dateexample=dol_now();
-		if (! empty($object->frequency) && ! empty($object->date_when)) $dateexample=$object->date_when;
+		if (! empty($object->frequency) && ! empty($object->date_when)) {
+		    $dateexample=$object->date_when;
+		}
 
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
@@ -1395,15 +1436,15 @@ 
 		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>';
+		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
+		} else
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 		}
@@ -1417,8 +1458,9 @@ 
         print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
         print $langs->trans('Model');
         print '<td>';
-        if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
-            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'),1).'</a></td>';
+        if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon)) {
+                    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'),1).'</a></td>';
+        }
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editmodelpdf')
@@ -1431,8 +1473,7 @@ 
             }
             $select = 'select;'.implode(',', $list);
             print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
-        }
-        else
+        } else
         {
             print $object->modelpdf;
         }
@@ -1466,8 +1507,9 @@ 
 		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>';
+		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')
@@ -1481,14 +1523,12 @@ 
 			print '</td>';
 			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
+		} else
 		{
 				if ($object->frequency > 0)
 				{
 					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				}
-				else
+				} else
 				{
 					print $langs->trans("NotARecurringInvoiceTemplate");
 			}
@@ -1500,8 +1540,7 @@ 
 		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
+		} else
 		{
 			print $langs->trans("NextDateToExecution");
 		}
@@ -1513,9 +1552,10 @@ 
 		//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
+			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"));
 		}
@@ -1527,8 +1567,7 @@ 
 		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
+		} else
 		{
 			print $langs->trans("MaxPeriodNumber");
 		}
@@ -1536,8 +1575,7 @@ 
 		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
+		} else
 		{
 			print '';
 		}
@@ -1546,10 +1584,11 @@ 
 
 		// 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");
+		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)
@@ -1562,10 +1601,11 @@ 
 		{
 			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");
+			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');
@@ -1575,8 +1615,7 @@ 
 			}
 			print '</td>';
 			print '</tr>';
-		}
-		else
+		} else
 		{
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
@@ -1678,20 +1717,17 @@ 
 				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
+				} 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
+					} 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
+			} else
 			{
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
 			}
@@ -1702,8 +1738,7 @@ 
 			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>';
 			}

dolibarr/htdocs/compta/facture/note.php

Indentation +36 added lines, -36 removed lines

@@ -35,7 +35,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 
 if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -75,10 +75,10 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$object = new Facture($db);
-	$object->fetch($id,$ref);
+    $object = new Facture($db);
+    $object->fetch($id,$ref);
 
-	$object->fetch_thirdparty();
+    $object->fetch_thirdparty();
 
     $head = facture_prepare_head($object);
 
@@ -99,35 +99,35 @@ 
     // 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> : ';
-    			$morehtmlref.=' : ';
-    		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);
+        $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> : ';
+                $morehtmlref.=' : ';
+            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.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
     }
     $morehtmlref.='</div>';
 
@@ -135,14 +135,14 @@ 
 
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
 
-	$cssclass="titlefield";
+    $cssclass="titlefield";
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 // End of page

Spacing +38 added lines, -38 removed lines

@@ -29,54 +29,54 @@ 
 
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
 
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 
-if (! empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills'));
 
-$id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int'));  // For backward compatibility
-$ref=GETPOST('ref','alpha');
-$socid=GETPOST('socid','int');
-$action=GETPOST('action','alpha');
+$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-$socid=0;
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'facture',$id,'');
+$socid = 0;
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'facture', $id, '');
 
 $object = new Facture($db);
 $object->fetch($id);
 
-$permissionnote=$user->rights->facture->creer;	// Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
 
 
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 /*
  * View
  */
 
-$title = $langs->trans('InvoiceCustomer') . " - " . $langs->trans('Notes');
+$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Notes');
 $helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$object = new Facture($db);
-	$object->fetch($id,$ref);
+	$object->fetch($id, $ref);
 
 	$object->fetch_thirdparty();
 
@@ -88,50 +88,50 @@ 
 
     // Invoice content
 
-    $linkback = '<a href="' . BASE_URI . '?controller=compta/facture&method=list&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    $linkback = '<a href="'.BASE_URI.'?controller=compta/facture&method=list&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref='<div class="refidno">';
+    $morehtmlref = '<div class="refidno">';
     // Ref customer
-    $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-    $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+    $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+    $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
     // Thirdparty
-    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
+    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
     // Project
-    if (! empty($conf->projet->enabled))
+    if (!empty($conf->projet->enabled))
     {
     	$langs->load("projects");
-    	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+    	$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> : ';
-    			$morehtmlref.=' : ';
+    			$morehtmlref .= ' : ';
     		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>';
+    			$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);
+    			$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)) {
+    		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>';
+                $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 .= '';
     		}
     	}
     }
-    $morehtmlref.='</div>';
+    $morehtmlref .= '</div>';
 
-    $object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
+    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
     dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
@@ -139,7 +139,7 @@ 
 	print '<div class="underbanner clearboth"></div>';
 
 
-	$cssclass="titlefield";
+	$cssclass = "titlefield";
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	dol_fiche_end();

dolibarr/htdocs/compta/facture/info.php

Indentation +29 added lines, -29 removed lines

@@ -33,7 +33,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 if (! empty($conf->projet->enabled)) {
-	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+    include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -77,35 +77,35 @@ 
 // 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> : ';
-			$morehtmlref.=' : ';
-		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);
+    $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> : ';
+            $morehtmlref.=' : ';
+        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.=$proj->ref;
+            $morehtmlref.='</a>';
+        } else {
+            $morehtmlref.='';
+        }
+    }
 }
 $morehtmlref.='</div>';
 

Spacing +28 added lines, -28 removed lines

@@ -27,20 +27,20 @@ 
 
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
 
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-if (! empty($conf->projet->enabled)) {
-	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills'));
 
-$id = GETPOST("facid","int");
-$ref=GETPOST("ref",'alpha');
+$id = GETPOST("facid", "int");
+$ref = GETPOST("ref", 'alpha');
 
 
 /*
@@ -49,7 +49,7 @@ 
 
 $form = new Form($db);
 
-$title = $langs->trans('InvoiceCustomer') . " - " . $langs->trans('Info');
+$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Info');
 $helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 llxHeader('', $title, $helpurl);
 
@@ -66,50 +66,50 @@ 
 
 // Invoice content
 
-$linkback = '<a href="' . BASE_URL . '?controller=compta/facture&method=list&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+$linkback = '<a href="'.BASE_URL.'?controller=compta/facture&method=list&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-$morehtmlref='<div class="refidno">';
+$morehtmlref = '<div class="refidno">';
 // Ref customer
-$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 // Thirdparty
-$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
+$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 // Project
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
 {
 	$langs->load("projects");
-	$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	$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> : ';
-			$morehtmlref.=' : ';
+			$morehtmlref .= ' : ';
 		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>';
+			$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);
+			$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)) {
+		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>';
+            $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 .= '';
 		}
 	}
 }
-$morehtmlref.='</div>';
+$morehtmlref .= '</div>';
 
-$object->totalpaye = $totalpaye;   // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 

dolibarr/htdocs/compta/facture/admin/facture_cust_extrafields.php

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
@@ -39,13 +39,13 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='facture'; //Must be the $table_element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'facture'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -62,13 +62,13 @@ 
 * View
 */
 
-$textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
+$textobject = strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
 
-llxHeader('',$langs->trans("BillsSetup"));
+llxHeader('', $langs->trans("BillsSetup"));
 
-$linkback = '<a href="' . BASE_URI . '?controller=admin&method=modules&restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.BASE_URI.'?controller=admin&method=modules&restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
 
@@ -107,7 +107,7 @@ 
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
 	$langs->load("members");
 

dolibarr/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php

Spacing +12 added lines, -12 removed lines

@@ -29,7 +29,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
@@ -40,13 +40,13 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='facture_rec'; //Must be the $table_element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'facture_rec'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -63,13 +63,13 @@ 
 * View
 */
 
-$textobject=strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
+$textobject = strtolower($langs->transnoentitiesnoconv("BillsCustomers"));
 
-llxHeader('',$langs->trans("BillsSetup"));
+llxHeader('', $langs->trans("BillsSetup"));
 
-$linkback = '<a href="' . BASE_URI . '?controller=admin&method=modules&restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.BASE_URI.'?controller=admin&method=modules&restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup');
+print load_fiche_titre($langs->trans("BillsSetup"), $linkback, 'title_setup');
 
 $head = invoice_admin_prepare_head();
 
@@ -108,7 +108,7 @@ 
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
 	$langs->load("members");