alxarafe / alixar

dolibarr/htdocs/contrat/index.php

Indentation +252 added lines, -252 removed lines

@@ -77,15 +77,15 @@ 
     // Search contract
     if (! empty($conf->contrat->enabled))
     {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
-    	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    	print '<table class="noborder nohover" width="100%">';
-    	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    	print '<tr class="oddeven">';
-    	print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
-    	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    	print "</table></form>\n";
-    	print "<br>";
+        print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<table class="noborder nohover" width="100%">';
+        print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+        print '<tr class="oddeven">';
+        print '<td class="nowrap">'.$langs->trans("Contract").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
+        print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+        print "</table></form>\n";
+        print "<br>";
     }
 }
 
@@ -114,28 +114,28 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num)
-	{
-		$row = $db->fetch_row($resql);
-		if ($row)
-		{
-    		$nb[$row[1]]=$row[0];
+    $num = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num)
+    {
+        $row = $db->fetch_row($resql);
+        if ($row)
+        {
+            $nb[$row[1]]=$row[0];
             if ($row[1]!=5)
             {
                 $vals[$row[1]]=$row[0];
                 $totalinprocess+=$row[0];
             }
             $total+=$row[0];
-		}
-		$i++;
-	}
-	$db->free($resql);
+        }
+        $i++;
+    }
+    $db->free($resql);
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 // Search by status (only expired)
 $sql = "SELECT count(cd.rowid), cd.statut";
@@ -151,7 +151,7 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
 
     // 0 inactive, 4 active, 5 closed
     $i = 0;
@@ -174,7 +174,7 @@ 
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 
@@ -216,11 +216,11 @@ 
 {
     if (empty($conf->use_javascript_ajax))
     {
-    	print '<tr class="oddeven">';
-    	print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
-    	print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
-    	if ($status==4 && ! $bool) $bool=true;
-    	else $bool=false;
+        print '<tr class="oddeven">';
+        print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
+        print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
+        if ($status==4 && ! $bool) $bool=true;
+        else $bool=false;
         print "</tr>\n";
     }
 }
@@ -234,64 +234,64 @@ 
 
 if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
-	$sql  = "SELECT c.rowid, c.ref,";
-	$sql.= " s.nom as name, s.rowid as socid";
-	$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-	$sql.= " AND c.statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-
-	$resql = $db->query($sql);
-
-	if ( $resql )
-	{
-		$num = $db->num_rows($resql);
-
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
-		if ($num)
-		{
-			$companystatic=new Societe($db);
-
-			$i = 0;
-			//$tot_ttc = 0;
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($resql);
-
-				$staticcontrat->ref=$obj->ref;
-				$staticcontrat->id=$obj->rowid;
-
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->name;
-				$companystatic->client=1;
-
-				print '<tr class="oddeven"><td class="nowrap">';
-				print $staticcontrat->getNomUrl(1,'');
-				print '</td>';
-				print '<td>';
-				print $companystatic->getNomUrl(1,'',16);
-				print '</td>';
-				print '</tr>';
-				//$tot_ttc+=$obj->total_ttc;
-				$i++;
-			}
-		}
-		else
-		{
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
-		}
-		print "</table><br>";
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $sql  = "SELECT c.rowid, c.ref,";
+    $sql.= " s.nom as name, s.rowid as socid";
+    $sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+    $sql.= " WHERE s.rowid = c.fk_soc";
+    $sql.= " AND c.entity IN (".getEntity('contract', 0).")";
+    $sql.= " AND c.statut = 0";
+    if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+    if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+
+    $resql = $db->query($sql);
+
+    if ( $resql )
+    {
+        $num = $db->num_rows($resql);
+
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<th colspan="3">'.$langs->trans("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
+        if ($num)
+        {
+            $companystatic=new Societe($db);
+
+            $i = 0;
+            //$tot_ttc = 0;
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($resql);
+
+                $staticcontrat->ref=$obj->ref;
+                $staticcontrat->id=$obj->rowid;
+
+                $companystatic->id=$obj->socid;
+                $companystatic->name=$obj->name;
+                $companystatic->client=1;
+
+                print '<tr class="oddeven"><td class="nowrap">';
+                print $staticcontrat->getNomUrl(1,'');
+                print '</td>';
+                print '<td>';
+                print $companystatic->getNomUrl(1,'',16);
+                print '</td>';
+                print '</tr>';
+                //$tot_ttc+=$obj->total_ttc;
+                $i++;
+            }
+        }
+        else
+        {
+            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
+        }
+        print "</table><br>";
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -325,49 +325,49 @@ 
 $result=$db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
-	$i = 0;
-
-	print '<table class="noborder" width="100%">';
-
-	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts",5).'</th>';
-	print '<th align="center">'.$langs->trans("DateModification").'</th>';
-	//print '<th align="left">'.$langs->trans("Status").'</th>';
-	print '<th align="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
-	print "</tr>\n";
-
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($result);
-
-		print '<tr class="oddeven">';
-		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid);
-		$staticcontrat->id=$obj->cid;
-		print $staticcontrat->getNomUrl(1,16);
-		if ($obj->nb_late) print img_warning($langs->trans("Late"));
-		print '</td>';
-		print '<td>';
-		$staticcompany->id=$obj->socid;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
-		print '</td>';
-		print '<td align="center">'.dol_print_date($db->jdate($obj->tms),'dayhour').'</td>';
-		//print '<td align="left">'.$staticcontrat->LibStatut($obj->statut,2).'</td>';
-		print '<td align="right" width="32">'.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0,3):'').'</td>';
-		print '<td align="right" width="32">'.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4,3,0):'').'</td>';
-		print '<td align="right" width="32">'.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4,3,1):'').'</td>';
-		print '<td align="right" width="32">'.($obj->nb_closed>0  ? $obj->nb_closed.$staticcontratligne->LibStatut(5,3):'').'</td>';
-		print "</tr>\n";
-		$i++;
-	}
-	$db->free($result);
-
-	print "</table>";
+    $num = $db->num_rows($result);
+    $i = 0;
+
+    print '<table class="noborder" width="100%">';
+
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts",5).'</th>';
+    print '<th align="center">'.$langs->trans("DateModification").'</th>';
+    //print '<th align="left">'.$langs->trans("Status").'</th>';
+    print '<th align="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
+    print "</tr>\n";
+
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($result);
+
+        print '<tr class="oddeven">';
+        print '<td width="110" class="nowrap">';
+        $staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid);
+        $staticcontrat->id=$obj->cid;
+        print $staticcontrat->getNomUrl(1,16);
+        if ($obj->nb_late) print img_warning($langs->trans("Late"));
+        print '</td>';
+        print '<td>';
+        $staticcompany->id=$obj->socid;
+        $staticcompany->name=$obj->name;
+        print $staticcompany->getNomUrl(1,'',20);
+        print '</td>';
+        print '<td align="center">'.dol_print_date($db->jdate($obj->tms),'dayhour').'</td>';
+        //print '<td align="left">'.$staticcontrat->LibStatut($obj->statut,2).'</td>';
+        print '<td align="right" width="32">'.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0,3):'').'</td>';
+        print '<td align="right" width="32">'.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4,3,0):'').'</td>';
+        print '<td align="right" width="32">'.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4,3,1):'').'</td>';
+        print '<td align="right" width="32">'.($obj->nb_closed>0  ? $obj->nb_closed.$staticcontratligne->LibStatut(5,3):'').'</td>';
+        print "</tr>\n";
+        $i++;
+    }
+    $db->free($result);
+
+    print "</table>";
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 print '<br>';
@@ -392,60 +392,60 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	print '<table class="noborder" width="100%">';
-
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices",$max).'</th>';
-	print "</tr>\n";
-
-	while ($i < min($num,$max))
-	{
-		$obj = $db->fetch_object($resql);
-
-		print '<tr class="oddeven">';
-		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
-		$staticcontrat->id=$obj->fk_contrat;
-		print $staticcontrat->getNomUrl(1,16);
-		//if (1 == 1) print img_warning($langs->trans("Late"));
-		print '</td>';
-		print '<td>';
-		if ($obj->fk_product > 0)
-		{
-    		$productstatic->id=$obj->fk_product;
+    $num = $db->num_rows($resql);
+    $i = 0;
+
+    print '<table class="noborder" width="100%">';
+
+    print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices",$max).'</th>';
+    print "</tr>\n";
+
+    while ($i < min($num,$max))
+    {
+        $obj = $db->fetch_object($resql);
+
+        print '<tr class="oddeven">';
+        print '<td width="110" class="nowrap">';
+        $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
+        $staticcontrat->id=$obj->fk_contrat;
+        print $staticcontrat->getNomUrl(1,16);
+        //if (1 == 1) print img_warning($langs->trans("Late"));
+        print '</td>';
+        print '<td>';
+        if ($obj->fk_product > 0)
+        {
+            $productstatic->id=$obj->fk_product;
             $productstatic->type=$obj->ptype;
             $productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
+            $productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
-		}
-		else
-		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+        }
+        else
+        {
+            print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
             if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
             else print '</a> '.dol_trunc($obj->note,20);
-		}
-		print '</td>';
-		print '<td>';
-		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
-		print '</td>';
-		print '<td class="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
-		$dateend=$db->jdate($obj->date_fin_validite);
-		print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0);
-		print '</a></td>';
-		print "</tr>\n";
-		$i++;
-	}
-	$db->free();
-
-	print "</table>";
+        }
+        print '</td>';
+        print '<td>';
+        $staticcompany->id=$obj->fk_soc;
+        $staticcompany->name=$obj->name;
+        print $staticcompany->getNomUrl(1,'',20);
+        print '</td>';
+        print '<td class="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
+        $dateend=$db->jdate($obj->date_fin_validite);
+        print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0);
+        print '</a></td>';
+        print "</tr>\n";
+        $i++;
+    }
+    $db->free();
+
+    print "</table>";
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 print '<br>';
@@ -471,59 +471,59 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
+    $num = $db->num_rows($resql);
+    $i = 0;
 
-	print '<table class="noborder" width="100%">';
+    print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
-	print "</tr>\n";
+    print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
+    print "</tr>\n";
 
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($resql);
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($resql);
 
-		print '<tr class="oddeven">';
+        print '<tr class="oddeven">';
 
-		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
-		$staticcontrat->id=$obj->fk_contrat;
-		print $staticcontrat->getNomUrl(1,16);
-		print '</td>';
-		print '<td class="nowrap">';
-		if ($obj->fk_product > 0)
-		{
-    		$productstatic->id=$obj->fk_product;
+        print '<td width="110" class="nowrap">';
+        $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
+        $staticcontrat->id=$obj->fk_contrat;
+        print $staticcontrat->getNomUrl(1,16);
+        print '</td>';
+        print '<td class="nowrap">';
+        if ($obj->fk_product > 0)
+        {
+            $productstatic->id=$obj->fk_product;
             $productstatic->type=$obj->ptype;
             $productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
+            $productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
-		}
-		else
-		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+        }
+        else
+        {
+            print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
             if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
             else print '</a> '.dol_trunc($obj->note,20);
-		}
+        }
+        print '</td>';
+        print '<td>';
+        $staticcompany->id=$obj->fk_soc;
+        $staticcompany->name=$obj->name;
+        print $staticcompany->getNomUrl(1,'',20);
         print '</td>';
-		print '<td>';
-		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
-		print '</td>';
-		print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
-		print $staticcontratligne->LibStatut($obj->statut,3);
-		print '</a></td>';
-		print "</tr>\n";
-		$i++;
-	}
-	$db->free();
-
-	print "</table>";
+        print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
+        print $staticcontratligne->LibStatut($obj->statut,3);
+        print '</a></td>';
+        print "</tr>\n";
+        $i++;
+    }
+    $db->free();
+
+    print "</table>";
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 print '<br>';
@@ -550,59 +550,59 @@ 
 $resql=$db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
+    $num = $db->num_rows($resql);
+    $i = 0;
 
-	print '<table class="noborder" width="100%">';
+    print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
-	print "</tr>\n";
+    print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
+    print "</tr>\n";
 
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($resql);
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($resql);
 
-		print '<tr class="oddeven">';
+        print '<tr class="oddeven">';
 
-		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
-		$staticcontrat->id=$obj->fk_contrat;
-		print $staticcontrat->getNomUrl(1,16);
-		print '</td>';
-		print '<td class="nowrap">';
-		if ($obj->fk_product > 0)
-		{
-    		$productstatic->id=$obj->fk_product;
+        print '<td width="110" class="nowrap">';
+        $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
+        $staticcontrat->id=$obj->fk_contrat;
+        print $staticcontrat->getNomUrl(1,16);
+        print '</td>';
+        print '<td class="nowrap">';
+        if ($obj->fk_product > 0)
+        {
+            $productstatic->id=$obj->fk_product;
             $productstatic->type=$obj->ptype;
             $productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
+            $productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
-		}
-		else
-		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
+        }
+        else
+        {
+            print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
             if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
             else print '</a> '.dol_trunc($obj->note,20);
-		}
-		print '</td>';
-		print '<td>';
-		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
-		print '</td>';
-		print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
-		print $staticcontratligne->LibStatut($obj->statut,3,1);
-		print '</a></td>';
-		print "</tr>\n";
-		$i++;
-	}
-	$db->free();
-
-	print "</table>";
+        }
+        print '</td>';
+        print '<td>';
+        $staticcompany->id=$obj->fk_soc;
+        $staticcompany->name=$obj->name;
+        print $staticcompany->getNomUrl(1,'',20);
+        print '</td>';
+        print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
+        print $staticcontratligne->LibStatut($obj->statut,3,1);
+        print '</a></td>';
+        print "</tr>\n";
+        $i++;
+    }
+    $db->free();
+
+    print "</table>";
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 

Spacing +213 added lines, -213 removed lines

@@ -31,22 +31,22 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'companies', 'contracts'));
 
-$sortfield=GETPOST('sortfield','alpha');
-$sortorder=GETPOST('sortorder','alpha');
-$page=GETPOST('page','int');
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 
-$statut=GETPOST('statut')?GETPOST('statut'):1;
+$statut = GETPOST('statut') ?GETPOST('statut') : 1;
 
 // Security check
-$socid=0;
-$id = GETPOST('id','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+$socid = 0;
+$id = GETPOST('id', 'int');
+if (!empty($user->societe_id)) $socid = $user->societe_id;
 $result = restrictedArea($user, 'contrat', $id);
 
-$staticcompany=new Societe($db);
-$staticcontrat=new Contrat($db);
-$staticcontratligne=new ContratLigne($db);
-$productstatic=new Product($db);
+$staticcompany = new Societe($db);
+$staticcontrat = new Contrat($db);
+$staticcontratligne = new ContratLigne($db);
+$productstatic = new Product($db);
 
 
 /*
@@ -64,7 +64,7 @@ 
 
 llxHeader();
 
-print load_fiche_titre($langs->trans("ContractsArea"),'','title_commercial.png');
+print load_fiche_titre($langs->trans("ContractsArea"), '', 'title_commercial.png');
 
 
 //print '<table border="0" width="100%" class="notopnoleftnoright">';
@@ -72,10 +72,10 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
     // Search contract
-    if (! empty($conf->contrat->enabled))
+    if (!empty($conf->contrat->enabled))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
     	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -94,23 +94,23 @@ 
  * Statistics
  */
 
-$nb=array();
-$total=0;
-$totalinprocess=0;
-$dataseries=array();
-$vals=array();
+$nb = array();
+$total = 0;
+$totalinprocess = 0;
+$dataseries = array();
+$vals = array();
 
 // Search by status (except expired)
 $sql = "SELECT count(cd.rowid), cd.statut";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
-$sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
-$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " GROUP BY cd.statut";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
+$sql .= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
+$sql .= " AND c.entity IN (".getEntity('contract', 0).")";
+if ($user->societe_id) $sql .= ' AND c.fk_soc = '.$user->societe_id;
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " GROUP BY cd.statut";
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -121,13 +121,13 @@ 
 		$row = $db->fetch_row($resql);
 		if ($row)
 		{
-    		$nb[$row[1]]=$row[0];
-            if ($row[1]!=5)
+    		$nb[$row[1]] = $row[0];
+            if ($row[1] != 5)
             {
-                $vals[$row[1]]=$row[0];
-                $totalinprocess+=$row[0];
+                $vals[$row[1]] = $row[0];
+                $totalinprocess += $row[0];
             }
-            $total+=$row[0];
+            $total += $row[0];
 		}
 		$i++;
 	}
@@ -139,15 +139,15 @@ 
 }
 // Search by status (only expired)
 $sql = "SELECT count(cd.rowid), cd.statut";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
-$sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
-$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " GROUP BY cd.statut";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
+$sql .= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
+$sql .= " AND c.entity IN (".getEntity('contract', 0).")";
+if ($user->societe_id) $sql .= ' AND c.fk_soc = '.$user->societe_id;
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+$sql .= " GROUP BY cd.statut";
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -160,13 +160,13 @@ 
         $row = $db->fetch_row($resql);
         if ($row)
         {
-            $nb[$row[1].true]=$row[0];
-            if ($row[1]!=5)
+            $nb[$row[1].true] = $row[0];
+            if ($row[1] != 5)
             {
-                $vals[$row[1]]=$row[0];
-                $totalinprocess+=$row[0];
+                $vals[$row[1]] = $row[0];
+                $totalinprocess += $row[0];
             }
-            $total+=$row[0];
+            $total += $row[0];
         }
         $i++;
     }
@@ -180,22 +180,22 @@ 
 
 print '<table class="noborder nohover" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</th></tr>'."\n";
-$listofstatus=array(0,4,4,5); $bool=false;
-foreach($listofstatus as $status)
+$listofstatus = array(0, 4, 4, 5); $bool = false;
+foreach ($listofstatus as $status)
 {
-    $dataseries[]=array($staticcontratligne->LibStatut($status,1,($bool?1:0)),(isset($nb[$status.$bool])?(int) $nb[$status.$bool]:0));
+    $dataseries[] = array($staticcontratligne->LibStatut($status, 1, ($bool ? 1 : 0)), (isset($nb[$status.$bool]) ? (int) $nb[$status.$bool] : 0));
     if (empty($conf->use_javascript_ajax))
     {
 
         print '<tr class="oddeven">';
-        print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
-        print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
+        print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
+        print '<td align="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
         print "</tr>\n";
     }
-    if ($status==4 && ! $bool) $bool=true;
-    else $bool=false;
+    if ($status == 4 && !$bool) $bool = true;
+    else $bool = false;
 }
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
     print '<tr class="impair"><td align="center" colspan="2">';
 
@@ -207,20 +207,20 @@ 
     $dolgraph->SetType(array('pie'));
     $dolgraph->setWidth('100%');
     $dolgraph->draw('idgraphstatus');
-    print $dolgraph->show($total?0:1);
+    print $dolgraph->show($total ? 0 : 1);
 
     print '</td></tr>';
 }
-$listofstatus=array(0,4,4,5); $bool=false;
-foreach($listofstatus as $status)
+$listofstatus = array(0, 4, 4, 5); $bool = false;
+foreach ($listofstatus as $status)
 {
     if (empty($conf->use_javascript_ajax))
     {
     	print '<tr class="oddeven">';
-    	print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
-    	print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
-    	if ($status==4 && ! $bool) $bool=true;
-    	else $bool=false;
+    	print '<td>'.$staticcontratligne->LibStatut($status, 0, ($bool ? 1 : 0)).'</td>';
+    	print '<td align="right"><a href="services_list.php?mode='.$status.($bool ? '&filter=expired' : '').'">'.($nb[$status.$bool] ? $nb[$status.$bool] : 0).' '.$staticcontratligne->LibStatut($status, 3, ($bool ? 1 : 0)).'</a></td>';
+    	if ($status == 4 && !$bool) $bool = true;
+    	else $bool = false;
         print "</tr>\n";
     }
 }
@@ -232,30 +232,30 @@ 
 
 // Draft contracts
 
-if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
-	$sql  = "SELECT c.rowid, c.ref,";
-	$sql.= " s.nom as name, s.rowid as socid";
-	$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.rowid = c.fk_soc";
-	$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-	$sql.= " AND c.statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+	$sql = "SELECT c.rowid, c.ref,";
+	$sql .= " s.nom as name, s.rowid as socid";
+	$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE s.rowid = c.fk_soc";
+	$sql .= " AND c.entity IN (".getEntity('contract', 0).")";
+	$sql .= " AND c.statut = 0";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 
 	$resql = $db->query($sql);
 
-	if ( $resql )
+	if ($resql)
 	{
 		$num = $db->num_rows($resql);
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("DraftContracts").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
+		print '<th colspan="3">'.$langs->trans("DraftContracts").($num ? ' <span class="badge">'.$num.'</span>' : '').'</th></tr>';
 		if ($num)
 		{
-			$companystatic=new Societe($db);
+			$companystatic = new Societe($db);
 
 			$i = 0;
 			//$tot_ttc = 0;
@@ -263,18 +263,18 @@ 
 			{
 				$obj = $db->fetch_object($resql);
 
-				$staticcontrat->ref=$obj->ref;
-				$staticcontrat->id=$obj->rowid;
+				$staticcontrat->ref = $obj->ref;
+				$staticcontrat->id = $obj->rowid;
 
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->name;
-				$companystatic->client=1;
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = 1;
 
 				print '<tr class="oddeven"><td class="nowrap">';
-				print $staticcontrat->getNomUrl(1,'');
+				print $staticcontrat->getNomUrl(1, '');
 				print '</td>';
 				print '<td>';
-				print $companystatic->getNomUrl(1,'',16);
+				print $companystatic->getNomUrl(1, '', 16);
 				print '</td>';
 				print '</tr>';
 				//$tot_ttc+=$obj->total_ttc;
@@ -300,29 +300,29 @@ 
 
 
 // Last modified contracts
-$max=5;
+$max = 5;
 $sql = 'SELECT ';
-$sql.= ' sum('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,';
-$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')",1,0).') as nb_running,';
-$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')",1,0).') as nb_expired,';
-$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,';
-$sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
-$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
-$sql.= " ".MAIN_DB_PREFIX."contrat as c";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
-$sql.= " WHERE c.fk_soc = s.rowid";
-$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-$sql.= " AND c.statut > 0";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid";
-$sql.= " ORDER BY c.tms DESC";
-$sql.= " LIMIT ".$max;
+$sql .= ' sum('.$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
+$sql .= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
+$sql .= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
+$sql .= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
+$sql .= ' sum('.$db->ifsql("cd.statut=5", 1, 0).') as nb_closed,';
+$sql .= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+$sql .= " ".MAIN_DB_PREFIX."contrat as c";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
+$sql .= " WHERE c.fk_soc = s.rowid";
+$sql .= " AND c.entity IN (".getEntity('contract', 0).")";
+$sql .= " AND c.statut > 0";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) $sql .= " AND s.rowid = ".$socid;
+$sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid";
+$sql .= " ORDER BY c.tms DESC";
+$sql .= " LIMIT ".$max;
 
 dol_syslog("contrat/index.php", LOG_DEBUG);
-$result=$db->query($sql);
+$result = $db->query($sql);
 if ($result)
 {
 	$num = $db->num_rows($result);
@@ -330,7 +330,7 @@ 
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts",5).'</th>';
+	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastContracts", 5).'</th>';
 	print '<th align="center">'.$langs->trans("DateModification").'</th>';
 	//print '<th align="left">'.$langs->trans("Status").'</th>';
 	print '<th align="center" width="80" colspan="4">'.$langs->trans("Services").'</th>';
@@ -342,22 +342,22 @@ 
 
 		print '<tr class="oddeven">';
 		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid);
-		$staticcontrat->id=$obj->cid;
-		print $staticcontrat->getNomUrl(1,16);
+		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->cid);
+		$staticcontrat->id = $obj->cid;
+		print $staticcontrat->getNomUrl(1, 16);
 		if ($obj->nb_late) print img_warning($langs->trans("Late"));
 		print '</td>';
 		print '<td>';
-		$staticcompany->id=$obj->socid;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
+		$staticcompany->id = $obj->socid;
+		$staticcompany->name = $obj->name;
+		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
-		print '<td align="center">'.dol_print_date($db->jdate($obj->tms),'dayhour').'</td>';
+		print '<td align="center">'.dol_print_date($db->jdate($obj->tms), 'dayhour').'</td>';
 		//print '<td align="left">'.$staticcontrat->LibStatut($obj->statut,2).'</td>';
-		print '<td align="right" width="32">'.($obj->nb_initial>0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0,3):'').'</td>';
-		print '<td align="right" width="32">'.($obj->nb_running>0 ? $obj->nb_running.$staticcontratligne->LibStatut(4,3,0):'').'</td>';
-		print '<td align="right" width="32">'.($obj->nb_expired>0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4,3,1):'').'</td>';
-		print '<td align="right" width="32">'.($obj->nb_closed>0  ? $obj->nb_closed.$staticcontratligne->LibStatut(5,3):'').'</td>';
+		print '<td align="right" width="32">'.($obj->nb_initial > 0 ? $obj->nb_initial.$staticcontratligne->LibStatut(0, 3) : '').'</td>';
+		print '<td align="right" width="32">'.($obj->nb_running > 0 ? $obj->nb_running.$staticcontratligne->LibStatut(4, 3, 0) : '').'</td>';
+		print '<td align="right" width="32">'.($obj->nb_expired > 0 ? $obj->nb_expired.$staticcontratligne->LibStatut(4, 3, 1) : '').'</td>';
+		print '<td align="right" width="32">'.($obj->nb_closed > 0 ? $obj->nb_closed.$staticcontratligne->LibStatut(5, 3) : '').'</td>';
 		print "</tr>\n";
 		$i++;
 	}
@@ -374,22 +374,22 @@ 
 
 // Last modified services
 $sql = "SELECT c.ref, c.fk_soc, ";
-$sql.= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
-$sql.= " s.nom as name,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
-$sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
-$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
-$sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
-$sql.= " AND cd.fk_contrat = c.rowid";
-$sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-$sql.= " ORDER BY cd.tms DESC";
-
-$resql=$db->query($sql);
+$sql .= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
+$sql .= " s.nom as name,";
+$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
+$sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
+$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd";
+$sql .= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+$sql .= " WHERE c.entity IN (".getEntity('contract', 0).")";
+$sql .= " AND cd.fk_contrat = c.rowid";
+$sql .= " AND c.fk_soc = s.rowid";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) $sql .= " AND s.rowid = ".$socid;
+$sql .= " ORDER BY cd.tms DESC";
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -397,44 +397,44 @@ 
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices",$max).'</th>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("LastModifiedServices", $max).'</th>';
 	print "</tr>\n";
 
-	while ($i < min($num,$max))
+	while ($i < min($num, $max))
 	{
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
 		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
-		$staticcontrat->id=$obj->fk_contrat;
-		print $staticcontrat->getNomUrl(1,16);
+		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
+		$staticcontrat->id = $obj->fk_contrat;
+		print $staticcontrat->getNomUrl(1, 16);
 		//if (1 == 1) print img_warning($langs->trans("Late"));
 		print '</td>';
 		print '<td>';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id=$obj->fk_product;
-            $productstatic->type=$obj->ptype;
-            $productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
-            print $productstatic->getNomUrl(1,'',20);
+    		$productstatic->id = $obj->fk_product;
+            $productstatic->type = $obj->ptype;
+            $productstatic->ref = $obj->pref;
+			$productstatic->entity = $obj->pentity;
+            print $productstatic->getNomUrl(1, '', 20);
 		}
 		else
 		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
-            if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
-            else print '</a> '.dol_trunc($obj->note,20);
+		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+            else print '</a> '.dol_trunc($obj->note, 20);
 		}
 		print '</td>';
 		print '<td>';
-		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
+		$staticcompany->id = $obj->fk_soc;
+		$staticcompany->name = $obj->name;
+		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
 		print '<td class="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
-		$dateend=$db->jdate($obj->date_fin_validite);
-		print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0);
+		$dateend = $db->jdate($obj->date_fin_validite);
+		print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now) ? 1 : 0);
 		print '</a></td>';
 		print "</tr>\n";
 		$i++;
@@ -452,23 +452,23 @@ 
 
 // Not activated services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql.= " s.nom as name,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
-$sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
-$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
-$sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
-$sql.= " AND c.statut = 1";
-$sql.= " AND cd.statut = 0";
-$sql.= " AND cd.fk_contrat = c.rowid";
-$sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-$sql.= " ORDER BY cd.tms DESC";
-
-$resql=$db->query($sql);
+$sql .= " s.nom as name,";
+$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
+$sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
+$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd";
+$sql .= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+$sql .= " WHERE c.entity IN (".getEntity('contract', 0).")";
+$sql .= " AND c.statut = 1";
+$sql .= " AND cd.statut = 0";
+$sql .= " AND cd.fk_contrat = c.rowid";
+$sql .= " AND c.fk_soc = s.rowid";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) $sql .= " AND s.rowid = ".$socid;
+$sql .= " ORDER BY cd.tms DESC";
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -486,33 +486,33 @@ 
 		print '<tr class="oddeven">';
 
 		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
-		$staticcontrat->id=$obj->fk_contrat;
-		print $staticcontrat->getNomUrl(1,16);
+		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
+		$staticcontrat->id = $obj->fk_contrat;
+		print $staticcontrat->getNomUrl(1, 16);
 		print '</td>';
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id=$obj->fk_product;
-            $productstatic->type=$obj->ptype;
-            $productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
-            print $productstatic->getNomUrl(1,'',20);
+    		$productstatic->id = $obj->fk_product;
+            $productstatic->type = $obj->ptype;
+            $productstatic->ref = $obj->pref;
+			$productstatic->entity = $obj->pentity;
+            print $productstatic->getNomUrl(1, '', 20);
 		}
 		else
 		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
-            if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
-            else print '</a> '.dol_trunc($obj->note,20);
+		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+            else print '</a> '.dol_trunc($obj->note, 20);
 		}
         print '</td>';
 		print '<td>';
-		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
+		$staticcompany->id = $obj->fk_soc;
+		$staticcompany->name = $obj->name;
+		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
 		print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
-		print $staticcontratligne->LibStatut($obj->statut,3);
+		print $staticcontratligne->LibStatut($obj->statut, 3);
 		print '</a></td>';
 		print "</tr>\n";
 		$i++;
@@ -530,24 +530,24 @@ 
 
 // Expired services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql.= " s.nom as name,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
-$sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
-$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
-$sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-$sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
-$sql.= " AND c.statut = 1";
-$sql.= " AND cd.statut = 4";
-$sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
-$sql.= " AND cd.fk_contrat = c.rowid";
-$sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
-$sql.= " ORDER BY cd.tms DESC";
-
-$resql=$db->query($sql);
+$sql .= " s.nom as name,";
+$sql .= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
+$sql .= " FROM (".MAIN_DB_PREFIX."contrat as c";
+$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= ", ".MAIN_DB_PREFIX."contratdet as cd";
+$sql .= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
+$sql .= " WHERE c.entity IN (".getEntity('contract', 0).")";
+$sql .= " AND c.statut = 1";
+$sql .= " AND cd.statut = 4";
+$sql .= " AND cd.date_fin_validite < '".$db->idate($now)."'";
+$sql .= " AND cd.fk_contrat = c.rowid";
+$sql .= " AND c.fk_soc = s.rowid";
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) $sql .= " AND s.rowid = ".$socid;
+$sql .= " ORDER BY cd.tms DESC";
+
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
@@ -565,33 +565,33 @@ 
 		print '<tr class="oddeven">';
 
 		print '<td width="110" class="nowrap">';
-		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat);
-		$staticcontrat->id=$obj->fk_contrat;
-		print $staticcontrat->getNomUrl(1,16);
+		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->fk_contrat);
+		$staticcontrat->id = $obj->fk_contrat;
+		print $staticcontrat->getNomUrl(1, 16);
 		print '</td>';
 		print '<td class="nowrap">';
 		if ($obj->fk_product > 0)
 		{
-    		$productstatic->id=$obj->fk_product;
-            $productstatic->type=$obj->ptype;
-            $productstatic->ref=$obj->pref;
-			$productstatic->entity=$obj->pentity;
-            print $productstatic->getNomUrl(1,'',20);
+    		$productstatic->id = $obj->fk_product;
+            $productstatic->type = $obj->ptype;
+            $productstatic->ref = $obj->pref;
+			$productstatic->entity = $obj->pentity;
+            print $productstatic->getNomUrl(1, '', 20);
 		}
 		else
 		{
-		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
-            if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
-            else print '</a> '.dol_trunc($obj->note,20);
+		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"), "service");
+            if ($obj->label) print ' '.dol_trunc($obj->label, 20).'</a>';
+            else print '</a> '.dol_trunc($obj->note, 20);
 		}
 		print '</td>';
 		print '<td>';
-		$staticcompany->id=$obj->fk_soc;
-		$staticcompany->name=$obj->name;
-		print $staticcompany->getNomUrl(1,'',20);
+		$staticcompany->id = $obj->fk_soc;
+		$staticcompany->name = $obj->name;
+		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
 		print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
-		print $staticcontratligne->LibStatut($obj->statut,3,1);
+		print $staticcontratligne->LibStatut($obj->statut, 3, 1);
 		print '</a></td>';
 		print "</tr>\n";
 		$i++;

Braces +109 added lines, -57 removed lines

@@ -40,7 +40,9 @@ 
 // Security check
 $socid=0;
 $id = GETPOST('id','int');
-if (! empty($user->societe_id)) $socid=$user->societe_id;
+if (! empty($user->societe_id)) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'contrat', $id);
 
 $staticcompany=new Societe($db);
@@ -72,12 +74,14 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
+    // This is useless due to the global search combo
 {
     // Search contract
     if (! empty($conf->contrat->enabled))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/contrat/list.php">';
+}
     	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     	print '<table class="noborder nohover" width="100%">';
     	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
@@ -104,12 +108,18 @@ 
 $sql = "SELECT count(cd.rowid), cd.statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut != 4 OR (cd.statut = 4 AND (cd.date_fin_validite is null or cd.date_fin_validite >= '".$db->idate($now)."')))";
 $sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($user->societe_id) {
+    $sql.=' AND c.fk_soc = '.$user->societe_id;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " GROUP BY cd.statut";
 $resql = $db->query($sql);
 if ($resql)
@@ -132,8 +142,7 @@ 
 		$i++;
 	}
 	$db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -141,12 +150,18 @@ 
 $sql = "SELECT count(cd.rowid), cd.statut";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= " WHERE cd.fk_contrat = c.rowid AND c.fk_soc = s.rowid";
 $sql.= " AND (cd.statut = 4 AND cd.date_fin_validite < '".$db->idate($now)."')";
 $sql.= " AND c.entity IN (".getEntity('contract', 0).")";
-if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($user->societe_id) {
+    $sql.=' AND c.fk_soc = '.$user->societe_id;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 $sql.= " GROUP BY cd.statut";
 $resql = $db->query($sql);
 if ($resql)
@@ -171,8 +186,7 @@ 
         $i++;
     }
     $db->free($resql);
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -192,9 +206,12 @@ 
         print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
         print "</tr>\n";
     }
-    if ($status==4 && ! $bool) $bool=true;
-    else $bool=false;
-}
+    if ($status==4 && ! $bool) {
+        $bool=true;
+    } else {
+        $bool=false;
+    }
+    }
 if (! empty($conf->use_javascript_ajax))
 {
     print '<tr class="impair"><td align="center" colspan="2">';
@@ -219,8 +236,11 @@ 
     	print '<tr class="oddeven">';
     	print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
     	print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
-    	if ($status==4 && ! $bool) $bool=true;
-    	else $bool=false;
+    	if ($status==4 && ! $bool) {
+    	    $bool=true;
+    	} else {
+    	    $bool=false;
+    	}
         print "</tr>\n";
     }
 }
@@ -237,12 +257,18 @@ 
 	$sql  = "SELECT c.rowid, c.ref,";
 	$sql.= " s.nom as name, s.rowid as socid";
 	$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql.= " WHERE s.rowid = c.fk_soc";
 	$sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 	$sql.= " AND c.statut = 0";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if ($socid) $sql.= " AND c.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+	    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	}
+	if ($socid) {
+	    $sql.= " AND c.fk_soc = ".$socid;
+	}
 
 	$resql = $db->query($sql);
 
@@ -280,15 +306,13 @@ 
 				//$tot_ttc+=$obj->total_ttc;
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
 		}
 		print "</table><br>";
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -309,14 +333,20 @@ 
 $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
 $sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+}
 $sql.= " ".MAIN_DB_PREFIX."contrat as c";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 $sql.= " WHERE c.fk_soc = s.rowid";
 $sql.= " AND c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND c.statut > 0";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
 $sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid";
 $sql.= " ORDER BY c.tms DESC";
 $sql.= " LIMIT ".$max;
@@ -345,7 +375,9 @@ 
 		$staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid);
 		$staticcontrat->id=$obj->cid;
 		print $staticcontrat->getNomUrl(1,16);
-		if ($obj->nb_late) print img_warning($langs->trans("Late"));
+		if ($obj->nb_late) {
+		    print img_warning($langs->trans("Late"));
+		}
 		print '</td>';
 		print '<td>';
 		$staticcompany->id=$obj->socid;
@@ -364,8 +396,7 @@ 
 	$db->free($result);
 
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -379,14 +410,20 @@ 
 $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= ") LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 $sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
 $sql.= " ORDER BY cd.tms DESC";
 
 $resql=$db->query($sql);
@@ -419,12 +456,14 @@ 
             $productstatic->ref=$obj->pref;
 			$productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
-		}
-		else
+		} else
 		{
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
-            if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
-            else print '</a> '.dol_trunc($obj->note,20);
+            if ($obj->label) {
+                print ' '.dol_trunc($obj->label,20).'</a>';
+            } else {
+                print '</a> '.dol_trunc($obj->note,20);
+            }
 		}
 		print '</td>';
 		print '<td>';
@@ -442,8 +481,7 @@ 
 	$db->free();
 
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -456,7 +494,9 @@ 
 $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 $sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
@@ -464,8 +504,12 @@ 
 $sql.= " AND cd.statut = 0";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
 $sql.= " ORDER BY cd.tms DESC";
 
 $resql=$db->query($sql);
@@ -498,12 +542,14 @@ 
             $productstatic->ref=$obj->pref;
 			$productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
-		}
-		else
+		} else
 		{
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
-            if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
-            else print '</a> '.dol_trunc($obj->note,20);
+            if ($obj->label) {
+                print ' '.dol_trunc($obj->label,20).'</a>';
+            } else {
+                print '</a> '.dol_trunc($obj->note,20);
+            }
 		}
         print '</td>';
 		print '<td>';
@@ -520,8 +566,7 @@ 
 	$db->free();
 
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }
@@ -534,7 +579,9 @@ 
 $sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 $sql.= " ) LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
 $sql.= " WHERE c.entity IN (".getEntity('contract', 0).")";
@@ -543,8 +590,12 @@ 
 $sql.= " AND cd.date_fin_validite < '".$db->idate($now)."'";
 $sql.= " AND cd.fk_contrat = c.rowid";
 $sql.= " AND c.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
 $sql.= " ORDER BY cd.tms DESC";
 
 $resql=$db->query($sql);
@@ -577,12 +628,14 @@ 
             $productstatic->ref=$obj->pref;
 			$productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
-		}
-		else
+		} else
 		{
 		    print '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'">'.img_object($langs->trans("ShowService"),"service");
-            if ($obj->label) print ' '.dol_trunc($obj->label,20).'</a>';
-            else print '</a> '.dol_trunc($obj->note,20);
+            if ($obj->label) {
+                print ' '.dol_trunc($obj->label,20).'</a>';
+            } else {
+                print '</a> '.dol_trunc($obj->note,20);
+            }
 		}
 		print '</td>';
 		print '<td>';
@@ -599,8 +652,7 @@ 
 	$db->free();
 
 	print "</table>";
-}
-else
+} else
 {
 	dol_print_error($db);
 }

dolibarr/htdocs/contrat/contact.php

Indentation +100 added lines, -100 removed lines

@@ -30,7 +30,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.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
@@ -58,56 +58,56 @@ 
 
 if ($action == 'addcontact' && $user->rights->contrat->creer)
 {
-	$result = $object->fetch($id);
+    $result = $object->fetch($id);
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+        $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+            $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
-		} else {
-			$mesg = $object->error;
-		}
-
-		setEventMessages($mesg, null, 'errors');
-	}
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+            $langs->load("errors");
+            $msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+        } else {
+            $mesg = $object->error;
+        }
+
+        setEventMessages($mesg, null, 'errors');
+    }
 }
 
 // bascule du statut d'un contact
 if ($action == 'swapstatut' && $user->rights->contrat->creer)
 {
-	if ($object->fetch($id))
-	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
-	}
+    if ($object->fetch($id))
+    {
+        $result=$object->swapContactStatus(GETPOST('ligne'));
+    }
+    else
+    {
+        dol_print_error($db,$object->error);
+    }
 }
 
 // Delete contact
 if ($action == 'deletecontact' && $user->rights->contrat->creer)
 {
-	$object->fetch($id);
-	$result = $object->delete_contact($_GET["lineid"]);
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
+    $object->fetch($id);
+    $result = $object->delete_contact($_GET["lineid"]);
+
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
 }
 
 
@@ -130,17 +130,17 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id, $ref) > 0)
-	{
-		$object->fetch_thirdparty();
+    if ($object->fetch($id, $ref) > 0)
+    {
+        $object->fetch_thirdparty();
 
-	    $head = contract_prepare_head($object);
+        $head = contract_prepare_head($object);
 
-		$hselected=1;
+        $hselected=1;
 
-		dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
+        dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
 
-		// Contract card
+        // Contract card
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
@@ -153,16 +153,16 @@ 
             $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
         }*/
 
-		$morehtmlref.='<div class="refidno">';
-		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
-		// Ref supplier
-		$morehtmlref.='<br>';
-		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-		// Thirdparty
-	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+        $morehtmlref.='<div class="refidno">';
+        // Ref customer
+        $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+        // Ref supplier
+        $morehtmlref.='<br>';
+        $morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+        // Thirdparty
+        $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
         // Project
         if (! empty($conf->projet->enabled)) {
             $langs->load("projects");
@@ -173,38 +173,38 @@ 
                     $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->thirdparty->id, $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->thirdparty->id, $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="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	                $morehtmlref.=$proj->ref;
-	                $morehtmlref.='</a>';
-	            } else {
-	                $morehtmlref.='';
-	            }
-	        }
-	    }
-	    $morehtmlref.='</div>';
-
-
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
-
-
-	    print '<div class="fichecenter">';
-	    print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border" width="100%">';
+                    //$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->thirdparty->id, $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->thirdparty->id, $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="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+                    $morehtmlref.=$proj->ref;
+                    $morehtmlref.='</a>';
+                } else {
+                    $morehtmlref.='';
+                }
+            }
+        }
+        $morehtmlref.='</div>';
+
+
+        dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
+
+
+        print '<div class="fichecenter">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border" width="100%">';
 
 
         // Ligne info remises tiers
@@ -223,26 +223,26 @@ 
 
         // Date
         print '<tr>';
-		print '<td class="titlefield">';
-		print $form->editfieldkey("Date",'date_contrat',$object->date_contrat,$object,0);
-		print '</td><td>';
-		print $form->editfieldval("Date",'date_contrat',$object->date_contrat,$object,0,'datehourpicker');
-		print '</td>';
-		print '</tr>';
+        print '<td class="titlefield">';
+        print $form->editfieldkey("Date",'date_contrat',$object->date_contrat,$object,0);
+        print '</td><td>';
+        print $form->editfieldval("Date",'date_contrat',$object->date_contrat,$object,0,'datehourpicker');
+        print '</td>';
+        print '</tr>';
 
-		print "</table>";
+        print "</table>";
 
-		print '</div>';
+        print '</div>';
 
-		dol_fiche_end();
+        dol_fiche_end();
 
-		print '<br>';
+        print '<br>';
 
-		// Contacts lines
-		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	} else {
-		print "ErrorRecordNotFound";
-	}
+        // Contacts lines
+        include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
+    } else {
+        print "ErrorRecordNotFound";
+    }
 }
 
 

Braces +10 added lines, -7 removed lines

@@ -43,7 +43,9 @@ 
 $ref=GETPOST('ref','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'contrat',$id);
 
 $object = new Contrat($db);
@@ -70,8 +72,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
@@ -90,8 +91,7 @@ 
 	if ($object->fetch($id))
 	{
 	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
+	} else
 	{
 		dol_print_error($db,$object->error);
 	}
@@ -216,8 +216,11 @@ 
         }
         $absolute_discount = $object->thirdparty->getAvailableDiscounts();
         print '. ';
-        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
-        else print $langs->trans("CompanyHasNoAbsoluteDiscount");
+        if ($absolute_discount) {
+            print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+        } else {
+            print $langs->trans("CompanyHasNoAbsoluteDiscount");
+        }
         print '.';
         print '</td></tr>';
 

Spacing +49 added lines, -49 removed lines

@@ -27,33 +27,33 @@ 
 
 // 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/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.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';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('contracts', 'companies'));
 
-$action=GETPOST('action','alpha');
-$confirm=GETPOST('confirm','alpha');
-$socid = GETPOST('socid','int');
-$id = GETPOST('id','int');
-$ref=GETPOST('ref','alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$socid = GETPOST('socid', 'int');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result=restrictedArea($user,'contrat',$id);
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'contrat', $id);
 
 $object = new Contrat($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard','globalcard'));
+$hookmanager->initHooks(array('contractcard', 'globalcard'));
 
 
 /*
@@ -93,11 +93,11 @@ 
 {
 	if ($object->fetch($id))
 	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
+	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
 	else
 	{
-		dol_print_error($db,$object->error);
+		dol_print_error($db, $object->error);
 	}
 }
 
@@ -119,12 +119,12 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("Contract"),"");
+llxHeader('', $langs->trans("Contract"), "");
 
 $form = new Form($db);
-$formcompany= new FormCompany($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$formcompany = new FormCompany($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 /* *************************************************************************** */
 /*                                                                             */
@@ -132,7 +132,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	if ($object->fetch($id, $ref) > 0)
 	{
@@ -140,66 +140,66 @@ 
 
 	    $head = contract_prepare_head($object);
 
-		$hselected=1;
+		$hselected = 1;
 
 		dol_fiche_head($head, $hselected, $langs->trans("Contract"), -1, 'contract');
 
 		// Contract card
 
-        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+        $linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-        $morehtmlref='';
+        $morehtmlref = '';
         //if (! empty($modCodeContract->code_auto)) {
-            $morehtmlref.=$object->ref;
+            $morehtmlref .= $object->ref;
         /*} else {
             $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
             $morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
         }*/
 
-		$morehtmlref.='<div class="refidno">';
+		$morehtmlref .= '<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, 0, 'string', '', null, null, '', 1);
 		// Ref supplier
-		$morehtmlref.='<br>';
-		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+		$morehtmlref .= '<br>';
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 		// Thirdparty
-	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+	    $morehtmlref .= '<br>'.$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->contrat->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->thirdparty->id, $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->thirdparty->id, $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->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+	                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $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="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	                $morehtmlref.=$proj->ref;
-	                $morehtmlref.='</a>';
+	                $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?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, 'ref', 'none', $morehtmlref);
@@ -214,13 +214,13 @@ 
         // Ligne info remises tiers
         print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
         if ($object->thirdparty->remise_percent) {
-            print $langs->trans("CompanyHasRelativeDiscount",$object->thirdparty->remise_percent);
+            print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
         } else {
             print $langs->trans("CompanyHasNoRelativeDiscount");
         }
         $absolute_discount = $object->thirdparty->getAvailableDiscounts();
         print '. ';
-        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency));
+        if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
         else print $langs->trans("CompanyHasNoAbsoluteDiscount");
         print '.';
         print '</td></tr>';
@@ -228,9 +228,9 @@ 
         // Date
         print '<tr>';
 		print '<td class="titlefield">';
-		print $form->editfieldkey("Date",'date_contrat',$object->date_contrat,$object,0);
+		print $form->editfieldkey("Date", 'date_contrat', $object->date_contrat, $object, 0);
 		print '</td><td>';
-		print $form->editfieldval("Date",'date_contrat',$object->date_contrat,$object,0,'datehourpicker');
+		print $form->editfieldval("Date", 'date_contrat', $object->date_contrat, $object, 0, 'datehourpicker');
 		print '</td>';
 		print '</tr>';
 

dolibarr/htdocs/contrat/list.php

Indentation +355 added lines, -355 removed lines

@@ -103,38 +103,38 @@ 
 $search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-	'c.ref'=>'Ref',
-	'c.ref_customer'=>'RefCustomer',
-	'c.ref_supplier'=>'RefSupplier',
-	's.nom'=>"ThirdParty",
-	'c.note_public'=>'NotePublic',
+    'c.ref'=>'Ref',
+    'c.ref_customer'=>'RefCustomer',
+    'c.ref_supplier'=>'RefSupplier',
+    's.nom'=>"ThirdParty",
+    'c.note_public'=>'NotePublic',
 );
 if (empty($user->socid)) $fieldstosearchall["c.note_private"]="NotePrivate";
 
 $arrayfields=array(
-	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
-	'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0),
-	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
-	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0),
-	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
-	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
-	'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1),
-	'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1),
-	'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
-	'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'lower_planned_end_date'=>array('label'=>$langs->trans("LowerDateEndPlannedShort"), 'checked'=>1, 'position'=>900, 'help'=>$langs->trans("LowerDateEndPlannedShort")),
-	'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+    'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
+    'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
+    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+    's.email'=>array('label'=>$langs->trans("ThirdPartyEmail"), 'checked'=>0),
+    's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
+    's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0),
+    'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
+    'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
+    'sale_representative'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>1),
+    'c.date_contrat'=>array('label'=>$langs->trans("DateContract"), 'checked'=>1),
+    'c.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+    'c.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+    'lower_planned_end_date'=>array('label'=>$langs->trans("LowerDateEndPlannedShort"), 'checked'=>1, 'position'=>900, 'help'=>$langs->trans("LowerDateEndPlannedShort")),
+    'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
 // 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]));
+    }
 }
 
 
@@ -154,39 +154,39 @@ 
 // 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
 {
-	$day='';
-	$month='';
-	$year='';
-	$search_dfmonth='';
-	$search_dfyear='';
-	$search_op2df='';
-	$search_name="";
-	$search_email="";
-	$search_town='';
-	$search_zip="";
-	$search_state="";
-	$search_type='';
-	$search_country='';
-	$search_contract="";
-	$search_ref_customer="";
-	$search_ref_supplier="";
-	$search_user='';
-	$search_sale='';
-	$search_product_category='';
-	$sall="";
-	$search_status="";
-	$toselect='';
-	$search_array_options=array();
+    $day='';
+    $month='';
+    $year='';
+    $search_dfmonth='';
+    $search_dfyear='';
+    $search_op2df='';
+    $search_name="";
+    $search_email="";
+    $search_town='';
+    $search_zip="";
+    $search_state="";
+    $search_type='';
+    $search_country='';
+    $search_contract="";
+    $search_ref_customer="";
+    $search_ref_supplier="";
+    $search_user='';
+    $search_sale='';
+    $search_product_category='';
+    $sall="";
+    $search_status="";
+    $toselect='';
+    $search_array_options=array();
 }
 
 if (empty($reshook))
 {
-	$objectclass='Contrat';
-	$objectlabel='Contracts';
-	$permtoread = $user->rights->contrat->lire;
-	$permtodelete = $user->rights->contrat->supprimer;
-	$uploaddir = $conf->contrat->dir_output;
-	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    $objectclass='Contrat';
+    $objectlabel='Contracts';
+    $permtoread = $user->rights->contrat->lire;
+    $permtodelete = $user->rights->contrat->supprimer;
+    $uploaddir = $conf->contrat->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -229,8 +229,8 @@ 
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
 if ($search_user > 0)
 {
-	$sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
-	$sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
+    $sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
+    $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql.= " WHERE c.fk_soc = s.rowid ";
 $sql.= ' AND c.entity IN ('.getEntity('contract').')';
@@ -239,16 +239,16 @@ 
 if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 if ($month > 0)
 {
-	if ($year > 0 && empty($day))
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-	else if ($year > 0 && ! empty($day))
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
-	else
-	$sql.= " AND date_format(c.date_contrat, '%m') = '".$month."'";
+    if ($year > 0 && empty($day))
+    $sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+    else if ($year > 0 && ! empty($day))
+    $sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+    else
+    $sql.= " AND date_format(c.date_contrat, '%m') = '".$month."'";
 }
 else if ($year > 0)
 {
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+    $sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
 if ($search_name) $sql .= natural_search('s.nom', $search_name);
 if ($search_email) $sql .= natural_search('s.email', $search_email);
@@ -257,7 +257,7 @@ 
 if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
 if ($search_sale > 0)
 {
-	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
 }
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
@@ -279,9 +279,9 @@ 
 $sql.=$hookmanager->resPrint;
 if ($search_dfyear > 0 && $search_op2df)
 {
-	if ($search_op2df == '<=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."'";
-	elseif ($search_op2df == '>=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
-	else $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
+    if ($search_op2df == '<=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."'";
+    elseif ($search_op2df == '>=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
+    else $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
 }
 $sql.= $db->order($sortfield,$sortorder);
 //print $sql;
@@ -290,19 +290,19 @@ 
 $result=$db->query($sql);
 if ($result)
 {
-	$totalnboflines = $db->num_rows($result);
+    $totalnboflines = $db->num_rows($result);
 }
 
 $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);
@@ -310,8 +310,8 @@ 
 $resql=$db->query($sql);
 if (! $resql)
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $num = $db->num_rows($resql);
@@ -319,10 +319,10 @@ 
 // Direct jump if only one record found
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
 {
-	$obj = $db->fetch_object($resql);
-	$id = $obj->rowid;
-	header("Location: ".DOL_URL_ROOT.'/contrat/card.php?id='.$id);
-	exit;
+    $obj = $db->fetch_object($resql);
+    $id = $obj->rowid;
+    header("Location: ".DOL_URL_ROOT.'/contrat/card.php?id='.$id);
+    exit;
 }
 
 
@@ -337,9 +337,9 @@ 
 
 if ($socid > 0)
 {
-	$soc = new Societe($db);
-	$soc->fetch($socid);
-	if (empty($search_name)) $search_name = $soc->name;
+    $soc = new Societe($db);
+    $soc->fetch($socid);
+    if (empty($search_name)) $search_name = $soc->name;
 }
 
 $param='';
@@ -364,9 +364,9 @@ 
 
 // List of mass actions available
 $arrayofmassactions =  array(
-	'generate_doc'=>$langs->trans("Generate"),
-	'presend'=>$langs->trans("SendByMail"),
-	'builddoc'=>$langs->trans("PDFMerge"),
+    'generate_doc'=>$langs->trans("Generate"),
+    'presend'=>$langs->trans("SendByMail"),
+    'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
@@ -375,9 +375,9 @@ 
 $newcardbutton='';
 if ($user->rights->contrat->creer)
 {
-	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewContractSubscription').'</span>';
-	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-	$newcardbutton.= '</a>';
+    $newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewContractSubscription').'</span>';
+    $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+    $newcardbutton.= '</a>';
 }
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
@@ -400,8 +400,8 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
 $moreforfilter='';
@@ -409,29 +409,29 @@ 
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid)
 {
-	$langs->load("commercial");
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth200');
-	$moreforfilter.='</div>';
+    $langs->load("commercial");
+    $moreforfilter.='<div class="divsearchfield">';
+    $moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
+    $moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth200');
+    $moreforfilter.='</div>';
 }
 // If the user can view other users
 if ($user->rights->user->user->lire)
 {
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	$moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
- 	$moreforfilter.='</div>';
+    $moreforfilter.='<div class="divsearchfield">';
+    $moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
+    $moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+        $moreforfilter.='</div>';
 }
 // If the user can view categories of products
 if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 {
-	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
-	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
-	$moreforfilter.='</div>';
+    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+    $moreforfilter.='<div class="divsearchfield">';
+    $moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+    $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
+    $moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+    $moreforfilter.='</div>';
 }
 
 $parameters=array();
@@ -441,9 +441,9 @@ 
 
 if (! empty($moreforfilter))
 {
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	print '</div>';
+    print '<div class="liste_titre liste_titre_bydiv centpercent">';
+    print $moreforfilter;
+    print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -456,33 +456,33 @@ 
 print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['c.ref']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['c.ref_customer']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['c.ref_supplier']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="6" name="search_ref_supplier" value="'.dol_escape_htmltag($search_ref_supplier).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="6" name="search_ref_supplier" value="'.dol_escape_htmltag($search_ref_supplier).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
+    print '</td>';
 }
 if (! empty($arrayfields['s.email']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="6" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" size="6" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
+    print '</td>';
 }
 // Town
 if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
@@ -491,39 +491,39 @@ 
 // State
 if (! empty($arrayfields['state.nom']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
+    print '</td>';
 }
 // Country
 if (! empty($arrayfields['country.code_iso']['checked']))
 {
-	print '<td class="liste_titre" align="center">';
-	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
-	print '</td>';
+    print '<td class="liste_titre" align="center">';
+    print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+    print '</td>';
 }
 // Company type
 if (! empty($arrayfields['typent.code']['checked']))
 {
-	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
-	print '</td>';
+    print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+    print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+    print '</td>';
 }
 if (! empty($arrayfields['sale_representative']['checked']))
 {
-	print '<td class="liste_titre"></td>';
+    print '<td class="liste_titre"></td>';
 }
 if (! empty($arrayfields['c.date_contrat']['checked']))
 {
-	// Date contract
-	print '<td class="liste_titre center nowraponall">';
-	//print $langs->trans('Month').': ';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
-	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.$month.'">';
-	//print '&nbsp;'.$langs->trans('Year').': ';
-	$syear = $year;
-	print $formother->selectyear($syear,'year',1, 20, 5);
-	print '</td>';
+    // Date contract
+    print '<td class="liste_titre center nowraponall">';
+    //print $langs->trans('Month').': ';
+    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
+    print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.$month.'">';
+    //print '&nbsp;'.$langs->trans('Year').': ';
+    $syear = $year;
+    print $formother->selectyear($syear,'year',1, 20, 5);
+    print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -535,31 +535,31 @@ 
 // Date creation
 if (! empty($arrayfields['c.datec']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 // Date modification
 if (! empty($arrayfields['c.tms']['checked']))
 {
-	print '<td class="liste_titre">';
-	print '</td>';
+    print '<td class="liste_titre">';
+    print '</td>';
 }
 // First end date
 if (! empty($arrayfields['lower_planned_end_date']['checked']))
 {
-		print '<td class="liste_titre nowraponall" align="center">';
-		$arrayofoperators=array('0'=>'','='=>'=','<='=>'<=','>='=>'>=');
-		print $form->selectarray('search_op2df',$arrayofoperators,$search_op2df,0);
-		print '</br>';
-		print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0, 'valignmiddle');
-		print ' ';
-		$formother->select_year($search_dfyear, 'search_dfyear', 1, 20, 5, 0, 0, '', 'valignmiddle');
-		print '</td>';
+        print '<td class="liste_titre nowraponall" align="center">';
+        $arrayofoperators=array('0'=>'','='=>'=','<='=>'<=','>='=>'>=');
+        print $form->selectarray('search_op2df',$arrayofoperators,$search_op2df,0);
+        print '</br>';
+        print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0, 'valignmiddle');
+        print ' ';
+        $formother->select_year($search_dfyear, 'search_dfyear', 1, 20, 5, 0, 0, '', 'valignmiddle');
+        print '</td>';
 }
 // Status
 if (! empty($arrayfields['status']['checked']))
 {
-	print '<td class="liste_titre" colspan="4" align="right"></td>';
+    print '<td class="liste_titre" colspan="4" align="right"></td>';
 }
 print '<td class="liste_titre" align="middle">';
 $searchpicto=$form->showFilterButtons();
@@ -591,211 +591,211 @@ 
 if (! empty($arrayfields['lower_planned_end_date']['checked']))       print_liste_field_titre($arrayfields['lower_planned_end_date']['label'],$_SERVER["PHP_SELF"],"lower_planned_end_date","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 if (! empty($arrayfields['status']['checked']))
 {
-	print_liste_field_titre($staticcontratligne->LibStatut(0,3), '', '', '', '', 'width="16"');
-	print_liste_field_titre($staticcontratligne->LibStatut(4,3,0), '', '', '', '', 'width="16"');
-	print_liste_field_titre($staticcontratligne->LibStatut(4,3,1), '', '', '', '', 'width="16"');
-	print_liste_field_titre($staticcontratligne->LibStatut(5,3), '', '', '', '', 'width="16"');
+    print_liste_field_titre($staticcontratligne->LibStatut(0,3), '', '', '', '', 'width="16"');
+    print_liste_field_titre($staticcontratligne->LibStatut(4,3,0), '', '', '', '', 'width="16"');
+    print_liste_field_titre($staticcontratligne->LibStatut(4,3,1), '', '', '', '', 'width="16"');
+    print_liste_field_titre($staticcontratligne->LibStatut(5,3), '', '', '', '', 'width="16"');
 }
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 while ($i < min($num,$limit))
 {
-	$obj = $db->fetch_object($resql);
-
-	$contracttmp->ref=$obj->ref;
-	$contracttmp->id=$obj->rowid;
-	$contracttmp->ref_customer=$obj->ref_customer;
-	$contracttmp->ref_supplier=$obj->ref_supplier;
-
-	if ($obj->socid > 0)
-	{
-		$result=$socstatic->fetch($obj->socid);
-	}
-
-	print '<tr class="oddeven">';
-	if (! empty($arrayfields['c.ref']['checked']))
-	{
-		print '<td class="nowrap">';
-		print $contracttmp->getNomUrl(1);
-		if ($obj->nb_late) print img_warning($langs->trans("Late"));
-		if (!empty($obj->note_private) || !empty($obj->note_public))
-		{
-			print ' <span class="note">';
-			print '<a href="'.DOL_URL_ROOT.'/contrat/note.php?id='.$obj->rowid.'&save_lastsearch_values=1">'.img_picto($langs->trans("ViewPrivateNote"),'note').'</a>';
-			print '</span>';
-		}
-
-		$filename=dol_sanitizeFileName($obj->ref);
-		$filedir=$conf->contrat->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-		print $formfile->getDocumentsLink($contracttmp->element, $filename, $filedir);
-		print '</td>';
-
-		print '</td>';
-	}
-	if (! empty($arrayfields['c.ref_customer']['checked']))
-	{
-		print '<td>'.$obj->ref_customer.'</td>';
-	}
-	if (! empty($arrayfields['c.ref_supplier']['checked']))
-	{
-		print '<td>'.$obj->ref_supplier.'</td>';
-	}
-	if (! empty($arrayfields['s.nom']['checked']))
-	{
-		print '<td>';
-		//print '<a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a>';
-		if ($obj->socid > 0)
-		{
-			print $socstatic->getNomUrl(1, '');
-		}
-		print '</td>';
-	}
-	if (! empty($arrayfields['s.email']['checked']))
-	{
-		print '<td>'.$obj->email.'</td>';
-	}
-	// Town
-	if (! empty($arrayfields['s.town']['checked']))
-	{
-		print '<td class="nocellnopadd">';
-		print $obj->town;
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Zip
-	if (! empty($arrayfields['s.zip']['checked']))
-	{
-		print '<td class="nocellnopadd">';
-		print $obj->zip;
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// State
-	if (! empty($arrayfields['state.nom']['checked']))
-	{
-		print "<td>".$obj->state_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Country
-	if (! empty($arrayfields['country.code_iso']['checked']))
-	{
-		print '<td align="center">';
-		$tmparray=getCountry($obj->fk_pays,'all');
-		print $tmparray['label'];
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Type ent
-	if (! empty($arrayfields['typent.code']['checked']))
-	{
-		print '<td align="center">';
-		if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-		print $typenArray[$obj->typent_code];
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	if (! empty($arrayfields['sale_representative']['checked']))
-	{
-		// Sales representatives
-		print '<td>';
-		if ($obj->socid > 0)
-		{
-			$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
-			if ($listsalesrepresentatives < 0) dol_print_error($db);
-			$nbofsalesrepresentative=count($listsalesrepresentatives);
-			if ($nbofsalesrepresentative > 3)   // We print only number
-			{
-				print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$socstatic->id.'">';
-				print $nbofsalesrepresentative;
-				print '</a>';
-			}
-			else if ($nbofsalesrepresentative > 0)
-			{
-				$userstatic=new User($db);
-				$j=0;
-				foreach($listsalesrepresentatives as $val)
-				{
-					$userstatic->id=$val['id'];
-					$userstatic->lastname=$val['lastname'];
-					$userstatic->firstname=$val['firstname'];
-					$userstatic->email=$val['email'];
-					$userstatic->statut=$val['statut'];
-					$userstatic->entity=$val['entity'];
-					$userstatic->photo=$val['photo'];
-
-					//print '<div class="float">':
-					print $userstatic->getNomUrl(-2);
-					$j++;
-					if ($j < $nbofsalesrepresentative) print ' ';
-					//print '</div>';
-				}
-			}
-			//else print $langs->trans("NoSalesRepresentativeAffected");
-		}
-		else
-		{
-			print '&nbsp';
-		}
-		print '</td>';
-	}
-	// Date
-	if (! empty($arrayfields['c.date_contrat']['checked']))
-	{
-		print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat), 'day', 'tzuser').'</td>';
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (! empty($arrayfields['c.datec']['checked']))
-	{
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Date modification
-	if (! empty($arrayfields['c.tms']['checked']))
-	{
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Date lower end date
-	if (! empty($arrayfields['lower_planned_end_date']['checked']))
-	{
-		print '<td align="center" class="nowrapforall">';
-		print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
-		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
-	}
-	// Status
-	if (! empty($arrayfields['status']['checked']))
-	{
-		print '<td align="center">'.($obj->nb_initial>0?$obj->nb_initial:'').'</td>';
-		print '<td align="center">'.($obj->nb_running>0?$obj->nb_running:'').'</td>';
-		print '<td align="center">'.($obj->nb_expired>0?$obj->nb_expired:'').'</td>';
-		print '<td align="center">'.($obj->nb_closed>0 ?$obj->nb_closed:'').'</td>';
-	}
-	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-	}
-	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
-
-	print "</tr>\n";
-	$i++;
+    $obj = $db->fetch_object($resql);
+
+    $contracttmp->ref=$obj->ref;
+    $contracttmp->id=$obj->rowid;
+    $contracttmp->ref_customer=$obj->ref_customer;
+    $contracttmp->ref_supplier=$obj->ref_supplier;
+
+    if ($obj->socid > 0)
+    {
+        $result=$socstatic->fetch($obj->socid);
+    }
+
+    print '<tr class="oddeven">';
+    if (! empty($arrayfields['c.ref']['checked']))
+    {
+        print '<td class="nowrap">';
+        print $contracttmp->getNomUrl(1);
+        if ($obj->nb_late) print img_warning($langs->trans("Late"));
+        if (!empty($obj->note_private) || !empty($obj->note_public))
+        {
+            print ' <span class="note">';
+            print '<a href="'.DOL_URL_ROOT.'/contrat/note.php?id='.$obj->rowid.'&save_lastsearch_values=1">'.img_picto($langs->trans("ViewPrivateNote"),'note').'</a>';
+            print '</span>';
+        }
+
+        $filename=dol_sanitizeFileName($obj->ref);
+        $filedir=$conf->contrat->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+        $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+        print $formfile->getDocumentsLink($contracttmp->element, $filename, $filedir);
+        print '</td>';
+
+        print '</td>';
+    }
+    if (! empty($arrayfields['c.ref_customer']['checked']))
+    {
+        print '<td>'.$obj->ref_customer.'</td>';
+    }
+    if (! empty($arrayfields['c.ref_supplier']['checked']))
+    {
+        print '<td>'.$obj->ref_supplier.'</td>';
+    }
+    if (! empty($arrayfields['s.nom']['checked']))
+    {
+        print '<td>';
+        //print '<a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a>';
+        if ($obj->socid > 0)
+        {
+            print $socstatic->getNomUrl(1, '');
+        }
+        print '</td>';
+    }
+    if (! empty($arrayfields['s.email']['checked']))
+    {
+        print '<td>'.$obj->email.'</td>';
+    }
+    // Town
+    if (! empty($arrayfields['s.town']['checked']))
+    {
+        print '<td class="nocellnopadd">';
+        print $obj->town;
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Zip
+    if (! empty($arrayfields['s.zip']['checked']))
+    {
+        print '<td class="nocellnopadd">';
+        print $obj->zip;
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // State
+    if (! empty($arrayfields['state.nom']['checked']))
+    {
+        print "<td>".$obj->state_name."</td>\n";
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Country
+    if (! empty($arrayfields['country.code_iso']['checked']))
+    {
+        print '<td align="center">';
+        $tmparray=getCountry($obj->fk_pays,'all');
+        print $tmparray['label'];
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Type ent
+    if (! empty($arrayfields['typent.code']['checked']))
+    {
+        print '<td align="center">';
+        if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+        print $typenArray[$obj->typent_code];
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    if (! empty($arrayfields['sale_representative']['checked']))
+    {
+        // Sales representatives
+        print '<td>';
+        if ($obj->socid > 0)
+        {
+            $listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
+            if ($listsalesrepresentatives < 0) dol_print_error($db);
+            $nbofsalesrepresentative=count($listsalesrepresentatives);
+            if ($nbofsalesrepresentative > 3)   // We print only number
+            {
+                print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$socstatic->id.'">';
+                print $nbofsalesrepresentative;
+                print '</a>';
+            }
+            else if ($nbofsalesrepresentative > 0)
+            {
+                $userstatic=new User($db);
+                $j=0;
+                foreach($listsalesrepresentatives as $val)
+                {
+                    $userstatic->id=$val['id'];
+                    $userstatic->lastname=$val['lastname'];
+                    $userstatic->firstname=$val['firstname'];
+                    $userstatic->email=$val['email'];
+                    $userstatic->statut=$val['statut'];
+                    $userstatic->entity=$val['entity'];
+                    $userstatic->photo=$val['photo'];
+
+                    //print '<div class="float">':
+                    print $userstatic->getNomUrl(-2);
+                    $j++;
+                    if ($j < $nbofsalesrepresentative) print ' ';
+                    //print '</div>';
+                }
+            }
+            //else print $langs->trans("NoSalesRepresentativeAffected");
+        }
+        else
+        {
+            print '&nbsp';
+        }
+        print '</td>';
+    }
+    // Date
+    if (! empty($arrayfields['c.date_contrat']['checked']))
+    {
+        print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat), 'day', 'tzuser').'</td>';
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Date creation
+    if (! empty($arrayfields['c.datec']['checked']))
+    {
+        print '<td align="center" class="nowrap">';
+        print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Date modification
+    if (! empty($arrayfields['c.tms']['checked']))
+    {
+        print '<td align="center" class="nowrap">';
+        print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Date lower end date
+    if (! empty($arrayfields['lower_planned_end_date']['checked']))
+    {
+        print '<td align="center" class="nowrapforall">';
+        print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
+        print '</td>';
+        if (! $i) $totalarray['nbfield']++;
+    }
+    // Status
+    if (! empty($arrayfields['status']['checked']))
+    {
+        print '<td align="center">'.($obj->nb_initial>0?$obj->nb_initial:'').'</td>';
+        print '<td align="center">'.($obj->nb_running>0?$obj->nb_running:'').'</td>';
+        print '<td align="center">'.($obj->nb_expired>0?$obj->nb_expired:'').'</td>';
+        print '<td align="center">'.($obj->nb_closed>0 ?$obj->nb_closed:'').'</td>';
+    }
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print "</tr>\n";
+    $i++;
 }
 $db->free($resql);
 

Braces +267 added lines, -100 removed lines

@@ -78,12 +78,18 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='c.ref';
-if (! $sortorder) $sortorder='DESC';
+if (! $sortfield) {
+    $sortfield='c.ref';
+}
+if (! $sortorder) {
+    $sortorder='DESC';
+}
 
 // Security check
 $id=GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'contrat', $id);
 
 $diroutputmassaction=$conf->contrat->dir_output . '/temp/massgeneration/'.$user->id;
@@ -91,7 +97,9 @@ 
 $staticcontrat=new Contrat($db);
 $staticcontratligne=new ContratLigne($db);
 
-if ($search_status == '') $search_status=1;
+if ($search_status == '') {
+    $search_status=1;
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Contrat($db);
@@ -109,7 +117,9 @@ 
 	's.nom'=>"ThirdParty",
 	'c.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["c.note_private"]="NotePrivate";
+if (empty($user->socid)) {
+    $fieldstosearchall["c.note_private"]="NotePrivate";
+}
 
 $arrayfields=array(
 	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
@@ -133,7 +143,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]));
+		}
 	}
 }
 
@@ -147,14 +159,18 @@ 
 
 $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');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // 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
 {
 	$day='';
+}
 	$month='';
 	$year='';
 	$search_dfmonth='';
@@ -213,7 +229,9 @@ 
 $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,';
 $sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed';
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
@@ -222,11 +240,17 @@ 
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) {
+    $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= ", ".MAIN_DB_PREFIX."contrat as c";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contrat_extrafields as ef on (c.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contrat_extrafields as ef on (c.rowid = ef.fk_object)";
+}
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
-if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
+if ($search_product_category > 0) {
+    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
+}
 if ($search_user > 0)
 {
 	$sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
@@ -234,33 +258,53 @@ 
 }
 $sql.= " WHERE c.fk_soc = s.rowid ";
 $sql.= ' AND c.entity IN ('.getEntity('contract').')';
-if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
-if ($socid) $sql.= " AND s.rowid = ".$db->escape($socid);
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+if ($search_product_category > 0) {
+    $sql.=" AND cp.fk_categorie = ".$search_product_category;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$db->escape($socid);
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
 if ($month > 0)
 {
-	if ($year > 0 && empty($day))
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-	else if ($year > 0 && ! empty($day))
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
-	else
-	$sql.= " AND date_format(c.date_contrat, '%m') = '".$month."'";
-}
-else if ($year > 0)
+	if ($year > 0 && empty($day)) {
+		$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
+	} else if ($year > 0 && ! empty($day)) {
+		$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+	} else {
+		$sql.= " AND date_format(c.date_contrat, '%m') = '".$month."'";
+	}
+	} else if ($year > 0)
 {
 	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
 }
-if ($search_name) $sql .= natural_search('s.nom', $search_name);
-if ($search_email) $sql .= natural_search('s.email', $search_email);
-if ($search_contract) $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
-if (!empty($search_ref_customer)) $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
-if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
+if ($search_name) {
+    $sql .= natural_search('s.nom', $search_name);
+}
+if ($search_email) {
+    $sql .= natural_search('s.email', $search_email);
+}
+if ($search_contract) {
+    $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
+}
+if (!empty($search_ref_customer)) {
+    $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
+}
+if (!empty($search_ref_supplier)) {
+    $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
+}
 if ($search_sale > 0)
 {
 	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
 }
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
+if ($sall) {
+    $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($search_user > 0) {
+    $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -272,17 +316,23 @@ 
 $sql.= " typent.code,";
 $sql.= " state.code_departement, state.nom";
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+}
 // Add where from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 if ($search_dfyear > 0 && $search_op2df)
 {
-	if ($search_op2df == '<=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."'";
-	elseif ($search_op2df == '>=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
-	else $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
-}
+	if ($search_op2df == '<=') {
+	    $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."'";
+	} elseif ($search_op2df == '>=') {
+	    $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
+	} else {
+	    $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
+	}
+	}
 $sql.= $db->order($sortfield,$sortorder);
 //print $sql;
 
@@ -298,9 +348,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;
 	}
 }
@@ -339,26 +391,60 @@ 
 {
 	$soc = new Societe($db);
 	$soc->fetch($socid);
-	if (empty($search_name)) $search_name = $soc->name;
-}
+	if (empty($search_name)) {
+	    $search_name = $soc->name;
+	}
+	}
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($sall != '')                $param.='&sall='.urlencode($sall);
-if ($search_contract != '')     $param.='&search_contract='.urlencode($search_contract);
-if ($search_name != '')         $param.='&search_name='.urlencode($search_name);
-if ($search_email != '')        $param.='&search_email='.urlencode($search_email);
-if ($search_ref_customer != '') $param.='&search_ref_customer='.urlencode($search_ref_customer);
-if ($search_ref_supplier != '') $param.='&search_ref_supplier='.urlencode($search_ref_supplier);
-if ($search_op2df != '') 		$param.='&search_op2df='.urlencode($search_op2df);
-if ($search_dfyear != '')       $param.='&search_dfyear='.urlencode($search_dfyear);
-if ($search_dfmonth != '')      $param.='&search_dfmonth='.urlencode($search_dfmonth);
-if ($search_sale != '')         $param.='&search_sale=' .urlencode($search_sale);
-if ($search_user != '')			$param.='&search_user=' .urlencode($search_user);
-if ($search_product_category != '')	$param.='&search_product_category=' .urlencode($search_product_category);
-if ($show_files)                $param.='&show_files=' .urlencode($show_files);
-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='.$limit;
+}
+if ($sall != '') {
+    $param.='&sall='.urlencode($sall);
+}
+if ($search_contract != '') {
+    $param.='&search_contract='.urlencode($search_contract);
+}
+if ($search_name != '') {
+    $param.='&search_name='.urlencode($search_name);
+}
+if ($search_email != '') {
+    $param.='&search_email='.urlencode($search_email);
+}
+if ($search_ref_customer != '') {
+    $param.='&search_ref_customer='.urlencode($search_ref_customer);
+}
+if ($search_ref_supplier != '') {
+    $param.='&search_ref_supplier='.urlencode($search_ref_supplier);
+}
+if ($search_op2df != '') {
+    $param.='&search_op2df='.urlencode($search_op2df);
+}
+if ($search_dfyear != '') {
+    $param.='&search_dfyear='.urlencode($search_dfyear);
+}
+if ($search_dfmonth != '') {
+    $param.='&search_dfmonth='.urlencode($search_dfmonth);
+}
+if ($search_sale != '') {
+    $param.='&search_sale=' .urlencode($search_sale);
+}
+if ($search_user != '') {
+    $param.='&search_user=' .urlencode($search_user);
+}
+if ($search_product_category != '') {
+    $param.='&search_product_category=' .urlencode($search_product_category);
+}
+if ($show_files) {
+    $param.='&show_files=' .urlencode($show_files);
+}
+if ($optioncss != '') {
+    $param.='&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -368,8 +454,12 @@ 
 	'presend'=>$langs->trans("SendByMail"),
 	'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+if ($user->rights->contrat->supprimer) {
+    $arrayofmassactions['predelete']=$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend','predelete'))) {
+    $arrayofmassactions=array();
+}
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton='';
@@ -381,7 +471,9 @@ 
 }
 
 print '<form method="POST" 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">';
@@ -400,7 +492,9 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	foreach($fieldstosearchall as $key => $val) {
+	    $fieldstosearchall[$key]=$langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
@@ -436,8 +530,11 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+    $moreforfilter .= $hookmanager->resPrint;
+} else {
+    $moreforfilter = $hookmanager->resPrint;
+}
 
 if (! empty($moreforfilter))
 {
@@ -448,7 +545,9 @@ 
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
 $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+    $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+}
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -485,9 +584,13 @@ 
 	print '</td>';
 }
 // Town
-if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+if (! empty($arrayfields['s.town']['checked'])) {
+    print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+}
 // Zip
-if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+if (! empty($arrayfields['s.zip']['checked'])) {
+    print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+}
 // State
 if (! empty($arrayfields['state.nom']['checked']))
 {
@@ -518,7 +621,9 @@ 
 	// Date contract
 	print '<td class="liste_titre center nowraponall">';
 	//print $langs->trans('Month').': ';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
+	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+	    print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
+	}
 	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.$month.'">';
 	//print '&nbsp;'.$langs->trans('Year').': ';
 	$syear = $year;
@@ -568,27 +673,57 @@ 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['c.ref']['checked']))               print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['c.ref_supplier']['checked']))      print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier","","$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['s.email']['checked']))             print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.town']['checked']))              print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.zip']['checked']))               print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked']))    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['typent.code']['checked']))         print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['c.date_contrat']['checked']))      print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['c.ref']['checked'])) {
+    print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['c.ref_customer']['checked'])) {
+    print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['c.ref_supplier']['checked'])) {
+    print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier","","$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['s.email']['checked'])) {
+    print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email","","$param",'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.town']['checked'])) {
+    print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['s.zip']['checked'])) {
+    print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['state.nom']['checked'])) {
+    print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['country.code_iso']['checked'])) {
+    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['typent.code']['checked'])) {
+    print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['sale_representative']['checked'])) {
+    print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "","","$param",'',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['c.date_contrat']['checked'])) {
+    print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
 $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['lower_planned_end_date']['checked']))       print_liste_field_titre($arrayfields['lower_planned_end_date']['label'],$_SERVER["PHP_SELF"],"lower_planned_end_date","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+if (! empty($arrayfields['c.datec']['checked'])) {
+    print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['c.tms']['checked'])) {
+    print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
+if (! empty($arrayfields['lower_planned_end_date']['checked'])) {
+    print_liste_field_titre($arrayfields['lower_planned_end_date']['label'],$_SERVER["PHP_SELF"],"lower_planned_end_date","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+}
 if (! empty($arrayfields['status']['checked']))
 {
 	print_liste_field_titre($staticcontratligne->LibStatut(0,3), '', '', '', '', 'width="16"');
@@ -618,7 +753,9 @@ 
 	{
 		print '<td class="nowrap">';
 		print $contracttmp->getNomUrl(1);
-		if ($obj->nb_late) print img_warning($langs->trans("Late"));
+		if ($obj->nb_late) {
+		    print img_warning($langs->trans("Late"));
+		}
 		if (!empty($obj->note_private) || !empty($obj->note_public))
 		{
 			print ' <span class="note">';
@@ -662,7 +799,9 @@ 
 		print '<td class="nocellnopadd">';
 		print $obj->town;
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Zip
 	if (! empty($arrayfields['s.zip']['checked']))
@@ -670,13 +809,17 @@ 
 		print '<td class="nocellnopadd">';
 		print $obj->zip;
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// State
 	if (! empty($arrayfields['state.nom']['checked']))
 	{
 		print "<td>".$obj->state_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Country
 	if (! empty($arrayfields['country.code_iso']['checked']))
@@ -685,16 +828,22 @@ 
 		$tmparray=getCountry($obj->fk_pays,'all');
 		print $tmparray['label'];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Type ent
 	if (! empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td align="center">';
-		if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+		if (count($typenArray)==0) {
+		    $typenArray = $formcompany->typent_array(1);
+		}
 		print $typenArray[$obj->typent_code];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	if (! empty($arrayfields['sale_representative']['checked']))
 	{
@@ -703,15 +852,18 @@ 
 		if ($obj->socid > 0)
 		{
 			$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
-			if ($listsalesrepresentatives < 0) dol_print_error($db);
+			if ($listsalesrepresentatives < 0) {
+			    dol_print_error($db);
+			}
 			$nbofsalesrepresentative=count($listsalesrepresentatives);
-			if ($nbofsalesrepresentative > 3)   // We print only number
+			if ($nbofsalesrepresentative > 3) {
+			    // We print only number
 			{
 				print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$socstatic->id.'">';
+			}
 				print $nbofsalesrepresentative;
 				print '</a>';
-			}
-			else if ($nbofsalesrepresentative > 0)
+			} else if ($nbofsalesrepresentative > 0)
 			{
 				$userstatic=new User($db);
 				$j=0;
@@ -728,13 +880,14 @@ 
 					//print '<div class="float">':
 					print $userstatic->getNomUrl(-2);
 					$j++;
-					if ($j < $nbofsalesrepresentative) print ' ';
+					if ($j < $nbofsalesrepresentative) {
+					    print ' ';
+					}
 					//print '</div>';
 				}
 			}
 			//else print $langs->trans("NoSalesRepresentativeAffected");
-		}
-		else
+		} else
 		{
 			print '&nbsp';
 		}
@@ -757,7 +910,9 @@ 
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Date modification
 	if (! empty($arrayfields['c.tms']['checked']))
@@ -765,7 +920,9 @@ 
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Date lower end date
 	if (! empty($arrayfields['lower_planned_end_date']['checked']))
@@ -773,7 +930,9 @@ 
 		print '<td align="center" class="nowrapforall">';
 		print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (! $i) {
+		    $totalarray['nbfield']++;
+		}
 	}
 	// Status
 	if (! empty($arrayfields['status']['checked']))
@@ -785,14 +944,20 @@ 
 	}
 	// Action column
 	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) {
+	    // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+	}
+		if (in_array($obj->rowid, $arrayofselected)) {
+		    $selected=1;
+		}
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (! $i) {
+	    $totalarray['nbfield']++;
+	}
 
 	print "</tr>\n";
 	$i++;
@@ -805,7 +970,9 @@ 
 print '</form>';
 
 $hidegeneratedfilelistifempty=1;
-if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+    $hidegeneratedfilelistifempty=0;
+}
 
 // Show list of available documents
 $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;

Spacing +305 added lines, -305 removed lines

@@ -31,7 +31,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.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -42,60 +42,60 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('contracts', 'products', 'companies', 'compta'));
 
-$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');
 $toselect = GETPOST('toselect', 'array');
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'contractlist';   // To manage different context of search
-
-$search_name=GETPOST('search_name');
-$search_email=GETPOST('search_email');
-$search_town=GETPOST('search_town','alpha');
-$search_zip=GETPOST('search_zip','alpha');
-$search_state=trim(GETPOST("search_state"));
-$search_country=GETPOST("search_country",'int');
-$search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$search_contract=GETPOST('search_contract');
-$search_ref_customer=GETPOST('search_ref_customer','alpha');
-$search_ref_supplier=GETPOST('search_ref_supplier','alpha');
-$sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$search_status=GETPOST('search_status');
-$socid=GETPOST('socid');
-$search_user=GETPOST('search_user','int');
-$search_sale=GETPOST('search_sale','int');
-$search_product_category=GETPOST('search_product_category','int');
-$search_dfmonth=GETPOST('search_dfmonth','int');
-$search_dfyear=GETPOST('search_dfyear','int');
-$search_op2df=GETPOST('search_op2df','alpha');
-$day=GETPOST("day","int");
-$year=GETPOST("year","int");
-$month=GETPOST("month","int");
-
-$optioncss = GETPOST('optioncss','alpha');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'contractlist'; // To manage different context of search
+
+$search_name = GETPOST('search_name');
+$search_email = GETPOST('search_email');
+$search_town = GETPOST('search_town', 'alpha');
+$search_zip = GETPOST('search_zip', 'alpha');
+$search_state = trim(GETPOST("search_state"));
+$search_country = GETPOST("search_country", 'int');
+$search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
+$search_contract = GETPOST('search_contract');
+$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
+$search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_status = GETPOST('search_status');
+$socid = GETPOST('socid');
+$search_user = GETPOST('search_user', 'int');
+$search_sale = GETPOST('search_sale', 'int');
+$search_product_category = GETPOST('search_product_category', 'int');
+$search_dfmonth = GETPOST('search_dfmonth', 'int');
+$search_dfyear = GETPOST('search_dfyear', 'int');
+$search_op2df = GETPOST('search_op2df', 'alpha');
+$day = GETPOST("day", "int");
+$year = GETPOST("year", "int");
+$month = GETPOST("month", "int");
+
+$optioncss = GETPOST('optioncss', 'alpha');
+
+$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;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield='c.ref';
-if (! $sortorder) $sortorder='DESC';
+if (!$sortfield) $sortfield = 'c.ref';
+if (!$sortorder) $sortorder = 'DESC';
 
 // Security check
-$id=GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$id = GETPOST('id', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'contrat', $id);
 
-$diroutputmassaction=$conf->contrat->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id;
 
-$staticcontrat=new Contrat($db);
-$staticcontratligne=new ContratLigne($db);
+$staticcontrat = new Contrat($db);
+$staticcontratligne = new ContratLigne($db);
 
-if ($search_status == '') $search_status=1;
+if ($search_status == '') $search_status = 1;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Contrat($db);
@@ -104,7 +104,7 @@ 
 
 // fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('contrat');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'c.ref'=>'Ref',
@@ -113,9 +113,9 @@ 
 	's.nom'=>"ThirdParty",
 	'c.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["c.note_private"]="NotePrivate";
+if (empty($user->socid)) $fieldstosearchall["c.note_private"] = "NotePrivate";
 
-$arrayfields=array(
+$arrayfields = array(
 	'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
 	'c.ref_customer'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1),
 	'c.ref_supplier'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1),
@@ -135,9 +135,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]));
 	}
 }
 
@@ -146,47 +146,47 @@ 
  * Action
  */
 
-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
+$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');
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // 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
-{
-	$day='';
-	$month='';
-	$year='';
-	$search_dfmonth='';
-	$search_dfyear='';
-	$search_op2df='';
-	$search_name="";
-	$search_email="";
-	$search_town='';
-	$search_zip="";
-	$search_state="";
-	$search_type='';
-	$search_country='';
-	$search_contract="";
-	$search_ref_customer="";
-	$search_ref_supplier="";
-	$search_user='';
-	$search_sale='';
-	$search_product_category='';
-	$sall="";
-	$search_status="";
-	$toselect='';
-	$search_array_options=array();
+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
+{
+	$day = '';
+	$month = '';
+	$year = '';
+	$search_dfmonth = '';
+	$search_dfyear = '';
+	$search_op2df = '';
+	$search_name = "";
+	$search_email = "";
+	$search_town = '';
+	$search_zip = "";
+	$search_state = "";
+	$search_type = '';
+	$search_country = '';
+	$search_contract = "";
+	$search_ref_customer = "";
+	$search_ref_supplier = "";
+	$search_user = '';
+	$search_sale = '';
+	$search_product_category = '';
+	$sall = "";
+	$search_status = "";
+	$toselect = '';
+	$search_array_options = array();
 }
 
 if (empty($reshook))
 {
-	$objectclass='Contrat';
-	$objectlabel='Contracts';
+	$objectclass = 'Contrat';
+	$objectlabel = 'Contracts';
 	$permtoread = $user->rights->contrat->lire;
 	$permtodelete = $user->rights->contrat->supprimer;
 	$uploaddir = $conf->contrat->dir_output;
@@ -198,7 +198,7 @@ 
  * View
  */
 
-$now=dol_now();
+$now = dol_now();
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formother = new FormOther($db);
@@ -206,53 +206,53 @@ 
 $contracttmp = new Contrat($db);
 
 $sql = 'SELECT';
-$sql.= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
-$sql.= " typent.code as typent_code,";
-$sql.= " state.code_departement as state_code, state.nom as state_name,";
-$sql.= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";
-$sql.= ' SUM('.$db->ifsql("cd.statut=0",1,0).') as nb_initial,';
-$sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')",1,0).') as nb_running,';
-$sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')",1,0).') as nb_expired,';
-$sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,';
-$sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed';
+$sql .= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
+$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= " typent.code as typent_code,";
+$sql .= " state.code_departement as state_code, state.nom as state_name,";
+$sql .= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";
+$sql .= ' SUM('.$db->ifsql("cd.statut=0", 1, 0).') as nb_initial,';
+$sql .= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite >= '".$db->idate($now)."')", 1, 0).') as nb_running,';
+$sql .= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')", 1, 0).') as nb_expired,';
+$sql .= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')", 1, 0).') as nb_late,';
+$sql .= ' SUM('.$db->ifsql("cd.statut=5", 1, 0).') as nb_closed';
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contrat_extrafields as ef on (c.rowid = ef.fk_object)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
-if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat_extrafields as ef on (c.rowid = ef.fk_object)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
+if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product';
 if ($search_user > 0)
 {
-	$sql.=", ".MAIN_DB_PREFIX."element_contact as ec";
-	$sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc";
+	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
-$sql.= " WHERE c.fk_soc = s.rowid ";
-$sql.= ' AND c.entity IN ('.getEntity('contract').')';
-if ($search_product_category > 0) $sql.=" AND cp.fk_categorie = ".$search_product_category;
-if ($socid) $sql.= " AND s.rowid = ".$db->escape($socid);
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql .= " WHERE c.fk_soc = s.rowid ";
+$sql .= ' AND c.entity IN ('.getEntity('contract').')';
+if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
+if ($socid) $sql .= " AND s.rowid = ".$db->escape($socid);
+if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 if ($month > 0)
 {
 	if ($year > 0 && empty($day))
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'";
-	else if ($year > 0 && ! empty($day))
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
+	$sql .= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year, $month, false))."' AND '".$db->idate(dol_get_last_day($year, $month, false))."'";
+	else if ($year > 0 && !empty($day))
+	$sql .= " AND c.date_contrat BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
 	else
-	$sql.= " AND date_format(c.date_contrat, '%m') = '".$month."'";
+	$sql .= " AND date_format(c.date_contrat, '%m') = '".$month."'";
 }
 else if ($year > 0)
 {
-	$sql.= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'";
+	$sql .= " AND c.date_contrat BETWEEN '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 }
 if ($search_name) $sql .= natural_search('s.nom', $search_name);
 if ($search_email) $sql .= natural_search('s.email', $search_email);
@@ -261,37 +261,37 @@ 
 if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
 if ($search_sale > 0)
 {
-	$sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
 }
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
+if ($search_user > 0) $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql.= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
-$sql.= " typent.code,";
-$sql.= " state.code_departement, state.nom";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
+$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= " typent.code,";
+$sql .= " state.code_departement, state.nom";
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key : '');
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($search_dfyear > 0 && $search_op2df)
 {
-	if ($search_op2df == '<=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."'";
-	elseif ($search_op2df == '>=') $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
-	else $sql.= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear,$search_dfmonth,false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear,$search_dfmonth,false))."'";
+	if ($search_op2df == '<=') $sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear, $search_dfmonth, false))."'";
+	elseif ($search_op2df == '>=') $sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear, $search_dfmonth, false))."'";
+	else $sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear, $search_dfmonth, false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear, $search_dfmonth, false))."'";
 }
-$sql.= $db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 //print $sql;
 
-$totalnboflines=0;
-$result=$db->query($sql);
+$totalnboflines = 0;
+$result = $db->query($sql);
 if ($result)
 {
 	$totalnboflines = $db->num_rows($result);
@@ -309,10 +309,10 @@ 
 	}
 }
 
-$sql.= $db->plimit($limit + 1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
-$resql=$db->query($sql);
-if (! $resql)
+$resql = $db->query($sql);
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
@@ -321,7 +321,7 @@ 
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
@@ -337,7 +337,7 @@ 
 
 $i = 0;
 
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 if ($socid > 0)
 {
@@ -346,42 +346,42 @@ 
 	if (empty($search_name)) $search_name = $soc->name;
 }
 
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($sall != '')                $param.='&sall='.urlencode($sall);
-if ($search_contract != '')     $param.='&search_contract='.urlencode($search_contract);
-if ($search_name != '')         $param.='&search_name='.urlencode($search_name);
-if ($search_email != '')        $param.='&search_email='.urlencode($search_email);
-if ($search_ref_customer != '') $param.='&search_ref_customer='.urlencode($search_ref_customer);
-if ($search_ref_supplier != '') $param.='&search_ref_supplier='.urlencode($search_ref_supplier);
-if ($search_op2df != '') 		$param.='&search_op2df='.urlencode($search_op2df);
-if ($search_dfyear != '')       $param.='&search_dfyear='.urlencode($search_dfyear);
-if ($search_dfmonth != '')      $param.='&search_dfmonth='.urlencode($search_dfmonth);
-if ($search_sale != '')         $param.='&search_sale=' .urlencode($search_sale);
-if ($search_user != '')			$param.='&search_user=' .urlencode($search_user);
-if ($search_product_category != '')	$param.='&search_product_category=' .urlencode($search_product_category);
-if ($show_files)                $param.='&show_files=' .urlencode($show_files);
-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='.$limit;
+if ($sall != '')                $param .= '&sall='.urlencode($sall);
+if ($search_contract != '')     $param .= '&search_contract='.urlencode($search_contract);
+if ($search_name != '')         $param .= '&search_name='.urlencode($search_name);
+if ($search_email != '')        $param .= '&search_email='.urlencode($search_email);
+if ($search_ref_customer != '') $param .= '&search_ref_customer='.urlencode($search_ref_customer);
+if ($search_ref_supplier != '') $param .= '&search_ref_supplier='.urlencode($search_ref_supplier);
+if ($search_op2df != '') 		$param .= '&search_op2df='.urlencode($search_op2df);
+if ($search_dfyear != '')       $param .= '&search_dfyear='.urlencode($search_dfyear);
+if ($search_dfmonth != '')      $param .= '&search_dfmonth='.urlencode($search_dfmonth);
+if ($search_sale != '')         $param .= '&search_sale='.urlencode($search_sale);
+if ($search_user != '')			$param .= '&search_user='.urlencode($search_user);
+if ($search_product_category != '')	$param .= '&search_product_category='.urlencode($search_product_category);
+if ($show_files)                $param .= '&show_files='.urlencode($show_files);
+if ($optioncss != '')           $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("Generate"),
 	'presend'=>$langs->trans("SendByMail"),
 	'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton='';
+$newcardbutton = '';
 if ($user->rights->contrat->creer)
 {
-	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewContractSubscription').'</span>';
-	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-	$newcardbutton.= '</a>';
+	$newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewContractSubscription').'</span>';
+	$newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
+	$newcardbutton .= '</a>';
 }
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
@@ -396,164 +396,164 @@ 
 
 print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, $newcardbutton, '', $limit);
 
-$topicmail="SendContractRef";
-$modelmail="contract";
-$objecttmp=new Contrat($db);
-$trackid='con'.$object->id;
+$topicmail = "SendContractRef";
+$modelmail = "contract";
+$objecttmp = new Contrat($db);
+$trackid = 'con'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
-$moreforfilter='';
+$moreforfilter = '';
 
 // If the user can view prospects other than his'
 if ($user->rights->societe->client->voir || $socid)
 {
 	$langs->load("commercial");
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('ThirdPartiesOfSaleRepresentative'). ': ';
-	$moreforfilter.=$formother->select_salesrepresentatives($search_sale,'search_sale',$user,0,1,'maxwidth200');
-	$moreforfilter.='</div>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
+	$moreforfilter .= '</div>';
 }
 // If the user can view other users
 if ($user->rights->user->user->lire)
 {
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('LinkedToSpecificUsers'). ': ';
-	$moreforfilter.=$form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
- 	$moreforfilter.='</div>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
+	$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+ 	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
 if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
 {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	$moreforfilter.='<div class="divsearchfield">';
-	$moreforfilter.=$langs->trans('IncludingProductWithTag'). ': ';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
 	$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, null, 'parent', null, null, 1);
-	$moreforfilter.=$form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
-	$moreforfilter.='</div>';
+	$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
+	$moreforfilter .= '</div>';
 }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (! empty($arrayfields['c.ref']['checked']))
+if (!empty($arrayfields['c.ref']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['c.ref_customer']['checked']))
+if (!empty($arrayfields['c.ref_customer']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['c.ref_supplier']['checked']))
+if (!empty($arrayfields['c.ref_supplier']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" size="6" name="search_ref_supplier" value="'.dol_escape_htmltag($search_ref_supplier).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.nom']['checked']))
+if (!empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['s.email']['checked']))
+if (!empty($arrayfields['s.email']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" size="6" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
 	print '</td>';
 }
 // Town
-if (! empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
 // Zip
-if (! empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
 // State
-if (! empty($arrayfields['state.nom']['checked']))
+if (!empty($arrayfields['state.nom']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
 // Country
-if (! empty($arrayfields['country.code_iso']['checked']))
+if (!empty($arrayfields['country.code_iso']['checked']))
 {
 	print '<td class="liste_titre" align="center">';
-	print $form->select_country($search_country,'search_country','',0,'maxwidth100');
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth100');
 	print '</td>';
 }
 // Company type
-if (! empty($arrayfields['typent.code']['checked']))
+if (!empty($arrayfields['typent.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT)?'ASC':$conf->global->SOCIETE_SORT_ON_TYPEENT));
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 	print '</td>';
 }
-if (! empty($arrayfields['sale_representative']['checked']))
+if (!empty($arrayfields['sale_representative']['checked']))
 {
 	print '<td class="liste_titre"></td>';
 }
-if (! empty($arrayfields['c.date_contrat']['checked']))
+if (!empty($arrayfields['c.date_contrat']['checked']))
 {
 	// Date contract
 	print '<td class="liste_titre center nowraponall">';
 	//print $langs->trans('Month').': ';
-	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.$day.'">';
 	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.$month.'">';
 	//print '&nbsp;'.$langs->trans('Year').': ';
 	$syear = $year;
-	print $formother->selectyear($syear,'year',1, 20, 5);
+	print $formother->selectyear($syear, 'year', 1, 20, 5);
 	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['c.datec']['checked']))
+if (!empty($arrayfields['c.datec']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (! empty($arrayfields['c.tms']['checked']))
+if (!empty($arrayfields['c.tms']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // First end date
-if (! empty($arrayfields['lower_planned_end_date']['checked']))
+if (!empty($arrayfields['lower_planned_end_date']['checked']))
 {
 		print '<td class="liste_titre nowraponall" align="center">';
-		$arrayofoperators=array('0'=>'','='=>'=','<='=>'<=','>='=>'>=');
-		print $form->selectarray('search_op2df',$arrayofoperators,$search_op2df,0);
+		$arrayofoperators = array('0'=>'', '='=>'=', '<='=>'<=', '>='=>'>=');
+		print $form->selectarray('search_op2df', $arrayofoperators, $search_op2df, 0);
 		print '</br>';
 		print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0, 'valignmiddle');
 		print ' ';
@@ -561,64 +561,64 @@ 
 		print '</td>';
 }
 // Status
-if (! empty($arrayfields['status']['checked']))
+if (!empty($arrayfields['status']['checked']))
 {
 	print '<td class="liste_titre" colspan="4" align="right"></td>';
 }
 print '<td class="liste_titre" align="middle">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (! empty($arrayfields['c.ref']['checked']))               print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['c.ref_supplier']['checked']))      print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier","","$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['s.email']['checked']))             print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.town']['checked']))              print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['s.zip']['checked']))               print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['country.code_iso']['checked']))    print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['typent.code']['checked']))         print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
-if (! empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "","","$param",'',$sortfield,$sortorder);
-if (! empty($arrayfields['c.date_contrat']['checked']))      print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
+if (!empty($arrayfields['c.ref']['checked']))               print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", "$param", '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.ref_customer']['checked']))      print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER["PHP_SELF"], "c.ref_customer", "", "$param", '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.ref_supplier']['checked']))      print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER["PHP_SELF"], "c.ref_supplier", "", "$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['s.email']['checked']))             print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", "$param", '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.town']['checked']))              print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.zip']['checked']))               print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['country.code_iso']['checked']))    print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['typent.code']['checked']))         print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['sale_representative']['checked'])) print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.date_contrat']['checked']))      print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER["PHP_SELF"], "c.date_contrat", "", "$param", 'align="center"', $sortfield, $sortorder);
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (! empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'],$_SERVER["PHP_SELF"],"c.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'],$_SERVER["PHP_SELF"],"c.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['lower_planned_end_date']['checked']))       print_liste_field_titre($arrayfields['lower_planned_end_date']['label'],$_SERVER["PHP_SELF"],"lower_planned_end_date","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['status']['checked']))
+if (!empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['lower_planned_end_date']['checked']))       print_liste_field_titre($arrayfields['lower_planned_end_date']['label'], $_SERVER["PHP_SELF"], "lower_planned_end_date", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+if (!empty($arrayfields['status']['checked']))
 {
-	print_liste_field_titre($staticcontratligne->LibStatut(0,3), '', '', '', '', 'width="16"');
-	print_liste_field_titre($staticcontratligne->LibStatut(4,3,0), '', '', '', '', 'width="16"');
-	print_liste_field_titre($staticcontratligne->LibStatut(4,3,1), '', '', '', '', 'width="16"');
-	print_liste_field_titre($staticcontratligne->LibStatut(5,3), '', '', '', '', 'width="16"');
+	print_liste_field_titre($staticcontratligne->LibStatut(0, 3), '', '', '', '', 'width="16"');
+	print_liste_field_titre($staticcontratligne->LibStatut(4, 3, 0), '', '', '', '', 'width="16"');
+	print_liste_field_titre($staticcontratligne->LibStatut(4, 3, 1), '', '', '', '', 'width="16"');
+	print_liste_field_titre($staticcontratligne->LibStatut(5, 3), '', '', '', '', 'width="16"');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 print "</tr>\n";
 
-while ($i < min($num,$limit))
+while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
 
-	$contracttmp->ref=$obj->ref;
-	$contracttmp->id=$obj->rowid;
-	$contracttmp->ref_customer=$obj->ref_customer;
-	$contracttmp->ref_supplier=$obj->ref_supplier;
+	$contracttmp->ref = $obj->ref;
+	$contracttmp->id = $obj->rowid;
+	$contracttmp->ref_customer = $obj->ref_customer;
+	$contracttmp->ref_supplier = $obj->ref_supplier;
 
 	if ($obj->socid > 0)
 	{
-		$result=$socstatic->fetch($obj->socid);
+		$result = $socstatic->fetch($obj->socid);
 	}
 
 	print '<tr class="oddeven">';
-	if (! empty($arrayfields['c.ref']['checked']))
+	if (!empty($arrayfields['c.ref']['checked']))
 	{
 		print '<td class="nowrap">';
 		print $contracttmp->getNomUrl(1);
@@ -626,27 +626,27 @@ 
 		if (!empty($obj->note_private) || !empty($obj->note_public))
 		{
 			print ' <span class="note">';
-			print '<a href="'.DOL_URL_ROOT.'/contrat/note.php?id='.$obj->rowid.'&save_lastsearch_values=1">'.img_picto($langs->trans("ViewPrivateNote"),'note').'</a>';
+			print '<a href="'.DOL_URL_ROOT.'/contrat/note.php?id='.$obj->rowid.'&save_lastsearch_values=1">'.img_picto($langs->trans("ViewPrivateNote"), 'note').'</a>';
 			print '</span>';
 		}
 
-		$filename=dol_sanitizeFileName($obj->ref);
-		$filedir=$conf->contrat->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-		$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+		$filename = dol_sanitizeFileName($obj->ref);
+		$filedir = $conf->contrat->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+		$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 		print $formfile->getDocumentsLink($contracttmp->element, $filename, $filedir);
 		print '</td>';
 
 		print '</td>';
 	}
-	if (! empty($arrayfields['c.ref_customer']['checked']))
+	if (!empty($arrayfields['c.ref_customer']['checked']))
 	{
 		print '<td>'.$obj->ref_customer.'</td>';
 	}
-	if (! empty($arrayfields['c.ref_supplier']['checked']))
+	if (!empty($arrayfields['c.ref_supplier']['checked']))
 	{
 		print '<td>'.$obj->ref_supplier.'</td>';
 	}
-	if (! empty($arrayfields['s.nom']['checked']))
+	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td>';
 		//print '<a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a>';
@@ -656,59 +656,59 @@ 
 		}
 		print '</td>';
 	}
-	if (! empty($arrayfields['s.email']['checked']))
+	if (!empty($arrayfields['s.email']['checked']))
 	{
 		print '<td>'.$obj->email.'</td>';
 	}
 	// Town
-	if (! empty($arrayfields['s.town']['checked']))
+	if (!empty($arrayfields['s.town']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 		print $obj->town;
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Zip
-	if (! empty($arrayfields['s.zip']['checked']))
+	if (!empty($arrayfields['s.zip']['checked']))
 	{
 		print '<td class="nocellnopadd">';
 		print $obj->zip;
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// State
-	if (! empty($arrayfields['state.nom']['checked']))
+	if (!empty($arrayfields['state.nom']['checked']))
 	{
 		print "<td>".$obj->state_name."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Country
-	if (! empty($arrayfields['country.code_iso']['checked']))
+	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 		print '<td align="center">';
-		$tmparray=getCountry($obj->fk_pays,'all');
+		$tmparray = getCountry($obj->fk_pays, 'all');
 		print $tmparray['label'];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Type ent
-	if (! empty($arrayfields['typent.code']['checked']))
+	if (!empty($arrayfields['typent.code']['checked']))
 	{
 		print '<td align="center">';
-		if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
+		if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
 		print $typenArray[$obj->typent_code];
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
-	if (! empty($arrayfields['sale_representative']['checked']))
+	if (!empty($arrayfields['sale_representative']['checked']))
 	{
 		// Sales representatives
 		print '<td>';
 		if ($obj->socid > 0)
 		{
-			$listsalesrepresentatives=$socstatic->getSalesRepresentatives($user);
+			$listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
 			if ($listsalesrepresentatives < 0) dol_print_error($db);
-			$nbofsalesrepresentative=count($listsalesrepresentatives);
+			$nbofsalesrepresentative = count($listsalesrepresentatives);
 			if ($nbofsalesrepresentative > 3)   // We print only number
 			{
 				print '<a href="'.DOL_URL_ROOT.'/societe/commerciaux.php?socid='.$socstatic->id.'">';
@@ -717,17 +717,17 @@ 
 			}
 			else if ($nbofsalesrepresentative > 0)
 			{
-				$userstatic=new User($db);
-				$j=0;
-				foreach($listsalesrepresentatives as $val)
+				$userstatic = new User($db);
+				$j = 0;
+				foreach ($listsalesrepresentatives as $val)
 				{
-					$userstatic->id=$val['id'];
-					$userstatic->lastname=$val['lastname'];
-					$userstatic->firstname=$val['firstname'];
-					$userstatic->email=$val['email'];
-					$userstatic->statut=$val['statut'];
-					$userstatic->entity=$val['entity'];
-					$userstatic->photo=$val['photo'];
+					$userstatic->id = $val['id'];
+					$userstatic->lastname = $val['lastname'];
+					$userstatic->firstname = $val['firstname'];
+					$userstatic->email = $val['email'];
+					$userstatic->statut = $val['statut'];
+					$userstatic->entity = $val['entity'];
+					$userstatic->photo = $val['photo'];
 
 					//print '<div class="float">':
 					print $userstatic->getNomUrl(-2);
@@ -745,58 +745,58 @@ 
 		print '</td>';
 	}
 	// Date
-	if (! empty($arrayfields['c.date_contrat']['checked']))
+	if (!empty($arrayfields['c.date_contrat']['checked']))
 	{
 		print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat), 'day', 'tzuser').'</td>';
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (! empty($arrayfields['c.datec']['checked']))
+	if (!empty($arrayfields['c.datec']['checked']))
 	{
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (! empty($arrayfields['c.tms']['checked']))
+	if (!empty($arrayfields['c.tms']['checked']))
 	{
 		print '<td align="center" class="nowrap">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date lower end date
-	if (! empty($arrayfields['lower_planned_end_date']['checked']))
+	if (!empty($arrayfields['lower_planned_end_date']['checked']))
 	{
 		print '<td align="center" class="nowrapforall">';
 		print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
 		print '</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Status
-	if (! empty($arrayfields['status']['checked']))
+	if (!empty($arrayfields['status']['checked']))
 	{
-		print '<td align="center">'.($obj->nb_initial>0?$obj->nb_initial:'').'</td>';
-		print '<td align="center">'.($obj->nb_running>0?$obj->nb_running:'').'</td>';
-		print '<td align="center">'.($obj->nb_expired>0?$obj->nb_expired:'').'</td>';
-		print '<td align="center">'.($obj->nb_closed>0 ?$obj->nb_closed:'').'</td>';
+		print '<td align="center">'.($obj->nb_initial > 0 ? $obj->nb_initial : '').'</td>';
+		print '<td align="center">'.($obj->nb_running > 0 ? $obj->nb_running : '').'</td>';
+		print '<td align="center">'.($obj->nb_expired > 0 ? $obj->nb_expired : '').'</td>';
+		print '<td align="center">'.($obj->nb_closed > 0 ? $obj->nb_closed : '').'</td>';
 	}
 	// Action column
 	print '<td class="nowrap" align="center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (!$i) $totalarray['nbfield']++;
 
 	print "</tr>\n";
 	$i++;
@@ -808,18 +808,18 @@ 
 
 print '</form>';
 
-$hidegeneratedfilelistifempty=1;
-if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+$hidegeneratedfilelistifempty = 1;
+if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
 
 // Show list of available documents
-$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-$urlsource.=str_replace('&amp;','&',$param);
+$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+$urlsource .= str_replace('&amp;', '&', $param);
 
-$filedir=$diroutputmassaction;
-$genallowed=$user->rights->contrat->lire;
-$delallowed=$user->rights->contrat->lire;
+$filedir = $diroutputmassaction;
+$genallowed = $user->rights->contrat->lire;
+$delallowed = $user->rights->contrat->lire;
 
-print $formfile->showdocuments('massfilesarea_contract','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
+print $formfile->showdocuments('massfilesarea_contract', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 
 
 llxFooter();

dolibarr/htdocs/stripe/class/stripe.class.php

Indentation +511 added lines, -511 removed lines

@@ -28,520 +28,520 @@
  */
 class Stripe extends CommonObject
 {
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var int Thirdparty ID
-	 */
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    /**
+     * @var int Thirdparty ID
+     */
     public $fk_soc;
 
     /**
      * @var int ID
      */
-	public $fk_key;
-
-	/**
-	 * @var int ID
-	 */
-	public $id;
-
-	public $mode;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $statut;
-
-	public $type;
-
-	public $code;
-
-	public $message;
-
-	/**
-	 * 	Constructor
-	 *
-	 * 	@param	DoliDB		$db			Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 * Return main company OAuth Connect stripe account
-	 *
-	 * @param 	string	$mode		'StripeTest' or 'StripeLive'
-	 * @return 	string				Stripe account 'acc_....' or '' if no OAuth token found
-	 */
-	public function getStripeAccount($mode='StripeTest')
-	{
-		global $conf;
-
-		$sql = "SELECT tokenstring";
-		$sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND service = '".$mode."'";
-
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-    	if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-    			$tokenstring=$obj->tokenstring;
-
-    			$tmparray = dol_json_decode($tokenstring);
-    			$key = $tmparray->stripe_user_id;
-    		}
-    		else {
-    			$tokenstring='';
-    		}
-    	}
-    	else {
-    		dol_print_error($this->db);
-    	}
-
-    	dol_syslog("No dedicated Stripe Connect account available for entity ".$conf->entity);
-		return $key;
-	}
-
-	/**
-	 * getStripeCustomerAccount
-	 *
-	 * @param	int		$id		Id of third party
-	 * @param	int		$status		Status
-	 * @return	string				Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
-	 */
-	public function getStripeCustomerAccount($id, $status=0)
-	{
-		include_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
-		$societeaccount = new SocieteAccount($this->db);
-		return $societeaccount->getCustomerAccount($id, 'stripe', $status);		// Get thirdparty cus_...
-	}
-
-
-	/**
-	 * Get the Stripe customer of a thirdparty (with option to create it if not linked yet)
-	 *
-	 * @param	Societe	$object							Object thirdparty to check, or create on stripe (create on stripe also update the stripe_account table for current entity)
-	 * @param	string	$key							''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
-	 * @param	int		$status							Status (0=test, 1=live)
-	 * @param	int		$createifnotlinkedtostripe		1=Create the stripe customer and the link if the thirdparty is not yet linked to a stripe customer
-	 * @return 	\Stripe\StripeCustomer|null 			Stripe Customer or null if not found
-	 */
-	public function customerStripe(Societe $object, $key='', $status=0, $createifnotlinkedtostripe=0)
-	{
-		global $conf, $user;
-
-		if (empty($object->id))
-		{
-			dol_syslog("customerStripe is called with param object not loaded");
-			return null;
-		}
-
-		$customer = null;
-
-		$sql = "SELECT sa.key_account as key_account, sa.entity";			// key_account is cus_....
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.fk_soc = " . $object->id;
-		$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
-		$sql.= " AND key_account IS NOT NULL AND key_account <> ''";
-
-		dol_syslog(get_class($this) . "::customerStripe search stripe customer id for thirdparty id=".$object->id, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$tiers = $obj->key_account;
-
-				dol_syslog(get_class($this) . "::customerStripe found stripe customer key_account = ".$tiers);
-
-				// Force to use the correct API key
-				global $stripearrayofkeysbyenv;
-				\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
-
-				try {
-					if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-						$customer = \Stripe\Customer::retrieve("$tiers");
-					} else {
-						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
-					}
-				}
-				catch(Exception $e)
-				{
-					$this->error = $e->getMessage();
-				}
-			}
-			elseif ($createifnotlinkedtostripe)
-			{
-				$dataforcustomer = array(
-					"email" => $object->email,
-					"description" => $object->name,
-					"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']))
-				);
-
-				$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
-
-				$taxinfo = array('type'=>'vat');
-				if ($vatcleaned)
-				{
-					$taxinfo["tax_id"] = $vatcleaned;
-				}
-				// We force data to "null" if not defined as expected by Stripe
-				if (empty($vatcleaned)) $taxinfo=null;
-
-				$dataforcustomer["tax_info"] = $taxinfo;
-
-				//$a = \Stripe\Stripe::getApiKey();
-				//var_dump($a);var_dump($key);exit;
-				try {
-					// Force to use the correct API key
-					global $stripearrayofkeysbyenv;
-					\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
-
-					if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-						$customer = \Stripe\Customer::create($dataforcustomer);
-					} else {
-						$customer = \Stripe\Customer::create($dataforcustomer, array("stripe_account" => $key));
-					}
-
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_account (fk_soc, login, key_account, site, status, entity, date_creation, fk_user_creat)";
-					$sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', " . $status . ", " . $conf->entity . ", '".$this->db->idate(dol_now())."', ".$user->id.")";
-					$resql = $this->db->query($sql);
-					if (! $resql)
-					{
-						$this->error = $this->db->lasterror();
-					}
-				}
-				catch(Exception $e)
-				{
-					$this->error = $e->getMessage();
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $customer;
-	}
-
-	/**
-	 * Get the Stripe card of a company payment mode (with option to create it on Stripe if not linked yet)
-	 *
-	 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer
-	 * @param	CompanyPaymentMode		$object							Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
-	 * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
-	 * @param	int						$status							Status (0=test, 1=live)
-	 * @param	int						$createifnotlinkedtostripe		1=Create the stripe card and the link if the card is not yet linked to a stripe card
-	 * @return 	\Stripe\StripeCard|null 								Stripe Card or null if not found
-	 */
-	public function cardStripe($cu, CompanyPaymentMode $object, $stripeacc='', $status=0, $createifnotlinkedtostripe=0)
-	{
-		global $conf, $user;
-
-		$card = null;
-
-		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.exp_date_month, sa.exp_date_year, sa.number, sa.cvn";			// stripe_card_ref is card_....
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_rib as sa";
-		$sql.= " WHERE sa.rowid = " . $object->id;
-		//$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.type = 'card'";
-
-		dol_syslog(get_class($this) . "::fetch search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$cardref = $obj->stripe_card_ref;
-				dol_syslog("************* cardref=".$cardref);
-				if ($cardref)
-				{
-					try {
-						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							$card = $cu->sources->retrieve($cardref);
-						} else {
-							//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
-							$card = $cu->sources->retrieve($cardref);
-						}
-					}
-					catch(Exception $e)
-					{
-						$this->error = $e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-					}
-				}
-				elseif ($createifnotlinkedtostripe)
-				{
-					$exp_date_month=$obj->exp_date_month;
-					$exp_date_year=$obj->exp_date_year;
-					$number=$obj->number;
-					$cvc=$obj->cvn;								// cvn in database, cvc for stripe
-					$cardholdername=$obj->proprio;
-
-					$dataforcard = array(
-						"source" => array('object'=>'card', 'exp_month'=>$exp_date_month, 'exp_year'=>$exp_date_year, 'number'=>$number, 'cvc'=>$cvc, 'name'=>$cardholdername),
-						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']))
-					);
-
-					//$a = \Stripe\Stripe::getApiKey();
-					//var_dump($a);var_dump($stripeacc);exit;
-					dol_syslog("Try to create card dataforcard = ".dol_json_encode($dataforcard));
-					try {
-						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							$card = $cu->sources->create($dataforcard);
-						} else {
-							$card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
-						}
-
-						if ($card)
-						{
-							$sql = "UPDATE " . MAIN_DB_PREFIX . "societe_rib";
-							$sql.= " SET stripe_card_ref = '".$this->db->escape($card->id)."', card_type = '".$this->db->escape($card->brand)."',";
-							$sql.= " country_code = '".$this->db->escape($card->country)."',";
-							$sql.= " approved = ".($card->cvc_check == 'pass' ? 1 : 0);
-							$sql.= " WHERE rowid = " . $object->id;
-							$sql.= " AND type = 'card'";
-							$resql = $this->db->query($sql);
-							if (! $resql)
-							{
-								$this->error = $this->db->lasterror();
-							}
-						}
-						else
-						{
-							$this->error = 'Call to cu->source->create return empty card';
-						}
-					}
-					catch(Exception $e)
-					{
-						$this->error = $e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-					}
-				}
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-
-		return $card;
-	}
-
-	/**
-	 * Create charge with public/payment/newpayment.php, stripe/card.php, cronjobs or REST API
-	 *
-	 * @param	int 	$amount									Amount to pay
-	 * @param	string 	$currency								EUR, GPB...
-	 * @param	string 	$origin									Object type to pay (order, invoice, contract...)
-	 * @param	int 	$item									Object id to pay
-	 * @param	string 	$source									src_xxxxx or card_xxxxx
-	 * @param	string 	$customer								Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
-	 * @param	string 	$account								Stripe account ref 'acc_xxxxxxxxxxxxx' via  getStripeAccount()
-	 * @param	int		$status									Status (0=test, 1=live)
-	 * @param	int		$usethirdpartyemailforreceiptemail		Use thirdparty email as receipt email
-	 * @param	boolean	$capture								Set capture flag to true (take payment) or false (wait)
-	 * @return Stripe
-	 */
-	public function createPaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account, $status=0, $usethirdpartyemailforreceiptemail=0, $capture=true)
-	{
-		global $conf;
-
-		$error = 0;
-
-		if (empty($status)) $service = 'StripeTest';
-		else $service = 'StripeLive';
-
-		$sql = "SELECT sa.key_account as key_account, sa.fk_soc, sa.entity";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.key_account = '" . $this->db->escape($customer) . "'";
-		//$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
-
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			if ($this->db->num_rows($result)) {
-				$obj = $this->db->fetch_object($result);
-				$key = $obj->fk_soc;
-			} else {
-				$key = null;
-			}
-		} else {
-			$key = null;
-		}
-
-		$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		if (! in_array($currency, $arrayzerounitcurrency)) $stripeamount=$amount * 100;
-		else $stripeamount = $amount;
-
-		$societe = new Societe($this->db);
-		if ($key > 0) $societe->fetch($key);
-
-		$description = "";
-		$ref = "";
-		if ($origin == order) {
-			$order = new Commande($this->db);
-			$order->fetch($item);
-			$ref = $order->ref;
-			$description = "ORD=" . $ref . ".CUS=" . $societe->id.".PM=stripe";
-		} elseif ($origin == invoice) {
-			$invoice = new Facture($this->db);
-			$invoice->fetch($item);
-			$ref = $invoice->ref;
-			$description = "INV=" . $ref . ".CUS=" . $societe->id.".PM=stripe";
-		}
-
-		$metadata = array(
-			"dol_id" => "" . $item . "",
-			"dol_type" => "" . $origin . "",
-			"dol_thirdparty_id" => "" . $societe->id . "",
-			'dol_thirdparty_name' => $societe->name,
-			'dol_version'=>DOL_VERSION,
-			'dol_entity'=>$conf->entity,
-			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])
-		);
-		$return = new Stripe($this->db);
-		try {
-			// Force to use the correct API key
-			global $stripearrayofkeysbyenv;
-			\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
-
-			if (empty($conf->stripeconnect->enabled))
-			{
-				if (preg_match('/acct_/i', $source))
-				{
-					$charge = \Stripe\Charge::create(array(
-						"amount" => "$stripeamount",
-						"currency" => "$currency",
-						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
-						"description" => "Stripe payment: ".$description,
-						"capture"  => $capture,
-						"metadata" => $metadata,
-						"source" => "$source"
-					));
-				} else {
-					$paymentarray = array(
-						"amount" => "$stripeamount",
-						"currency" => "$currency",
-						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
-						"description" => "Stripe payment: ".$description,
-						"capture"  => $capture,
-						"metadata" => $metadata,
-						"source" => "$source",
-						"customer" => "$customer"
-					);
-
-					if ($societe->email && $usethirdpartyemailforreceiptemail)
-					{
-						$paymentarray["receipt_email"] = $societe->email;
-					}
-
-					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$ref"));
-				}
-			} else {
-
-				$fee = round(($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
-				if ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
-					$fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100);
-				}
-
-        		$paymentarray = array(
-						"amount" => "$stripeamount",
-						"currency" => "$currency",
-						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
-						"description" => "Stripe payment: ".$description,
-						"capture"  => $capture,
-						"metadata" => $metadata,
-						"source" => "$source",
-						"customer" => "$customer"
-					);
-					if ($conf->entity!=$conf->global->STRIPECONNECT_PRINCIPAL && $fee>0)
-					{
-						$paymentarray["application_fee"] = $fee;
-					}
-					if ($societe->email && $usethirdpartyemailforreceiptemail)
-					{
-						$paymentarray["receipt_email"] = $societe->email;
-					}
-
-					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$ref","stripe_account" => "$account"));
-			}
-			if (isset($charge->id)) {}
-
-			$return->statut = 'success';
-			$return->id = $charge->id;
-			if ($charge->source->type == 'card') {
-				$return->message = $charge->source->card->brand . " ...." . $charge->source->card->last4;
-			} elseif ($charge->source->type == 'three_d_secure') {
-				$stripe = new Stripe($this->db);
-				$src = \Stripe\Source::retrieve("" . $charge->source->three_d_secure->card . "", array(
-				"stripe_account" => $stripe->getStripeAccount($service)
-				));
-				$return->message = $src->card->brand . " ...." . $src->card->last4;
-			} else {
-				$return->message = $charge->id;
-			}
-		} catch (\Stripe\Error\Card $e) {
-			include DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			// Since it's a decline, \Stripe\Error\Card will be caught
-			$body = $e->getJsonBody();
-			$err = $body['error'];
-
-			$return->statut = 'error';
-			$return->id = $err['charge'];
-			$return->type = $err['type'];
-			$return->code = $err['code'];
-			$return->message = $err['message'];
-			$body = "Error: <br>" . $return->id . " " . $return->message . " ";
-			$subject = '[Alert] Payment error using Stripe';
-			$cmailfile = new CMailFile($subject, $conf->global->ONLINE_PAYMENT_SENDEMAIL, $conf->global->MAIN_INFO_SOCIETE_MAIL, $body);
-			$cmailfile->sendfile();
-
-			$error++;
-			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-		} catch (\Stripe\Error\RateLimit $e) {
-			// Too many requests made to the API too quickly
-			$error++;
-			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-		} catch (\Stripe\Error\InvalidRequest $e) {
-			// Invalid parameters were supplied to Stripe's API
-			$error++;
-			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-		} catch (\Stripe\Error\Authentication $e) {
-			// Authentication with Stripe's API failed
-			// (maybe you changed API keys recently)
-			$error++;
-			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-		} catch (\Stripe\Error\ApiConnection $e) {
-			// Network communication with Stripe failed
-			$error++;
-			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-		} catch (\Stripe\Error\Base $e) {
-			// Display a very generic error to the user, and maybe send
-			// yourself an email
-			$error++;
-			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-		} catch (Exception $e) {
-			// Something else happened, completely unrelated to Stripe
-			$error++;
-			dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
-		}
-		return $return;
-	}
+    public $fk_key;
+
+    /**
+     * @var int ID
+     */
+    public $id;
+
+    public $mode;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $statut;
+
+    public $type;
+
+    public $code;
+
+    public $message;
+
+    /**
+     * 	Constructor
+     *
+     * 	@param	DoliDB		$db			Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     * Return main company OAuth Connect stripe account
+     *
+     * @param 	string	$mode		'StripeTest' or 'StripeLive'
+     * @return 	string				Stripe account 'acc_....' or '' if no OAuth token found
+     */
+    public function getStripeAccount($mode='StripeTest')
+    {
+        global $conf;
+
+        $sql = "SELECT tokenstring";
+        $sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
+        $sql.= " WHERE entity = ".$conf->entity;
+        $sql.= " AND service = '".$mode."'";
+
+        dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $tokenstring=$obj->tokenstring;
+
+                $tmparray = dol_json_decode($tokenstring);
+                $key = $tmparray->stripe_user_id;
+            }
+            else {
+                $tokenstring='';
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
+
+        dol_syslog("No dedicated Stripe Connect account available for entity ".$conf->entity);
+        return $key;
+    }
+
+    /**
+     * getStripeCustomerAccount
+     *
+     * @param	int		$id		Id of third party
+     * @param	int		$status		Status
+     * @return	string				Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
+     */
+    public function getStripeCustomerAccount($id, $status=0)
+    {
+        include_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+        $societeaccount = new SocieteAccount($this->db);
+        return $societeaccount->getCustomerAccount($id, 'stripe', $status);		// Get thirdparty cus_...
+    }
+
+
+    /**
+     * Get the Stripe customer of a thirdparty (with option to create it if not linked yet)
+     *
+     * @param	Societe	$object							Object thirdparty to check, or create on stripe (create on stripe also update the stripe_account table for current entity)
+     * @param	string	$key							''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
+     * @param	int		$status							Status (0=test, 1=live)
+     * @param	int		$createifnotlinkedtostripe		1=Create the stripe customer and the link if the thirdparty is not yet linked to a stripe customer
+     * @return 	\Stripe\StripeCustomer|null 			Stripe Customer or null if not found
+     */
+    public function customerStripe(Societe $object, $key='', $status=0, $createifnotlinkedtostripe=0)
+    {
+        global $conf, $user;
+
+        if (empty($object->id))
+        {
+            dol_syslog("customerStripe is called with param object not loaded");
+            return null;
+        }
+
+        $customer = null;
+
+        $sql = "SELECT sa.key_account as key_account, sa.entity";			// key_account is cus_....
+        $sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
+        $sql.= " WHERE sa.fk_soc = " . $object->id;
+        $sql.= " AND sa.entity IN (".getEntity('societe').")";
+        $sql.= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
+        $sql.= " AND key_account IS NOT NULL AND key_account <> ''";
+
+        dol_syslog(get_class($this) . "::customerStripe search stripe customer id for thirdparty id=".$object->id, LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                $tiers = $obj->key_account;
+
+                dol_syslog(get_class($this) . "::customerStripe found stripe customer key_account = ".$tiers);
+
+                // Force to use the correct API key
+                global $stripearrayofkeysbyenv;
+                \Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
+
+                try {
+                    if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
+                        $customer = \Stripe\Customer::retrieve("$tiers");
+                    } else {
+                        $customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
+                    }
+                }
+                catch(Exception $e)
+                {
+                    $this->error = $e->getMessage();
+                }
+            }
+            elseif ($createifnotlinkedtostripe)
+            {
+                $dataforcustomer = array(
+                    "email" => $object->email,
+                    "description" => $object->name,
+                    "metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']))
+                );
+
+                $vatcleaned = $object->tva_intra ? $object->tva_intra : null;
+
+                $taxinfo = array('type'=>'vat');
+                if ($vatcleaned)
+                {
+                    $taxinfo["tax_id"] = $vatcleaned;
+                }
+                // We force data to "null" if not defined as expected by Stripe
+                if (empty($vatcleaned)) $taxinfo=null;
+
+                $dataforcustomer["tax_info"] = $taxinfo;
+
+                //$a = \Stripe\Stripe::getApiKey();
+                //var_dump($a);var_dump($key);exit;
+                try {
+                    // Force to use the correct API key
+                    global $stripearrayofkeysbyenv;
+                    \Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
+
+                    if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
+                        $customer = \Stripe\Customer::create($dataforcustomer);
+                    } else {
+                        $customer = \Stripe\Customer::create($dataforcustomer, array("stripe_account" => $key));
+                    }
+
+                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_account (fk_soc, login, key_account, site, status, entity, date_creation, fk_user_creat)";
+                    $sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', " . $status . ", " . $conf->entity . ", '".$this->db->idate(dol_now())."', ".$user->id.")";
+                    $resql = $this->db->query($sql);
+                    if (! $resql)
+                    {
+                        $this->error = $this->db->lasterror();
+                    }
+                }
+                catch(Exception $e)
+                {
+                    $this->error = $e->getMessage();
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $customer;
+    }
+
+    /**
+     * Get the Stripe card of a company payment mode (with option to create it on Stripe if not linked yet)
+     *
+     * @param	\Stripe\StripeCustomer	$cu								Object stripe customer
+     * @param	CompanyPaymentMode		$object							Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
+     * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
+     * @param	int						$status							Status (0=test, 1=live)
+     * @param	int						$createifnotlinkedtostripe		1=Create the stripe card and the link if the card is not yet linked to a stripe card
+     * @return 	\Stripe\StripeCard|null 								Stripe Card or null if not found
+     */
+    public function cardStripe($cu, CompanyPaymentMode $object, $stripeacc='', $status=0, $createifnotlinkedtostripe=0)
+    {
+        global $conf, $user;
+
+        $card = null;
+
+        $sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.exp_date_month, sa.exp_date_year, sa.number, sa.cvn";			// stripe_card_ref is card_....
+        $sql.= " FROM " . MAIN_DB_PREFIX . "societe_rib as sa";
+        $sql.= " WHERE sa.rowid = " . $object->id;
+        //$sql.= " AND sa.entity IN (".getEntity('societe').")";
+        $sql.= " AND sa.type = 'card'";
+
+        dol_syslog(get_class($this) . "::fetch search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+            if ($num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                $cardref = $obj->stripe_card_ref;
+                dol_syslog("************* cardref=".$cardref);
+                if ($cardref)
+                {
+                    try {
+                        if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+                            $card = $cu->sources->retrieve($cardref);
+                        } else {
+                            //$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
+                            $card = $cu->sources->retrieve($cardref);
+                        }
+                    }
+                    catch(Exception $e)
+                    {
+                        $this->error = $e->getMessage();
+                        dol_syslog($this->error, LOG_WARNING);
+                    }
+                }
+                elseif ($createifnotlinkedtostripe)
+                {
+                    $exp_date_month=$obj->exp_date_month;
+                    $exp_date_year=$obj->exp_date_year;
+                    $number=$obj->number;
+                    $cvc=$obj->cvn;								// cvn in database, cvc for stripe
+                    $cardholdername=$obj->proprio;
+
+                    $dataforcard = array(
+                        "source" => array('object'=>'card', 'exp_month'=>$exp_date_month, 'exp_year'=>$exp_date_year, 'number'=>$number, 'cvc'=>$cvc, 'name'=>$cardholdername),
+                        "metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']))
+                    );
+
+                    //$a = \Stripe\Stripe::getApiKey();
+                    //var_dump($a);var_dump($stripeacc);exit;
+                    dol_syslog("Try to create card dataforcard = ".dol_json_encode($dataforcard));
+                    try {
+                        if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+                            $card = $cu->sources->create($dataforcard);
+                        } else {
+                            $card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
+                        }
+
+                        if ($card)
+                        {
+                            $sql = "UPDATE " . MAIN_DB_PREFIX . "societe_rib";
+                            $sql.= " SET stripe_card_ref = '".$this->db->escape($card->id)."', card_type = '".$this->db->escape($card->brand)."',";
+                            $sql.= " country_code = '".$this->db->escape($card->country)."',";
+                            $sql.= " approved = ".($card->cvc_check == 'pass' ? 1 : 0);
+                            $sql.= " WHERE rowid = " . $object->id;
+                            $sql.= " AND type = 'card'";
+                            $resql = $this->db->query($sql);
+                            if (! $resql)
+                            {
+                                $this->error = $this->db->lasterror();
+                            }
+                        }
+                        else
+                        {
+                            $this->error = 'Call to cu->source->create return empty card';
+                        }
+                    }
+                    catch(Exception $e)
+                    {
+                        $this->error = $e->getMessage();
+                        dol_syslog($this->error, LOG_WARNING);
+                    }
+                }
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+
+        return $card;
+    }
+
+    /**
+     * Create charge with public/payment/newpayment.php, stripe/card.php, cronjobs or REST API
+     *
+     * @param	int 	$amount									Amount to pay
+     * @param	string 	$currency								EUR, GPB...
+     * @param	string 	$origin									Object type to pay (order, invoice, contract...)
+     * @param	int 	$item									Object id to pay
+     * @param	string 	$source									src_xxxxx or card_xxxxx
+     * @param	string 	$customer								Stripe customer ref 'cus_xxxxxxxxxxxxx' via customerStripe()
+     * @param	string 	$account								Stripe account ref 'acc_xxxxxxxxxxxxx' via  getStripeAccount()
+     * @param	int		$status									Status (0=test, 1=live)
+     * @param	int		$usethirdpartyemailforreceiptemail		Use thirdparty email as receipt email
+     * @param	boolean	$capture								Set capture flag to true (take payment) or false (wait)
+     * @return Stripe
+     */
+    public function createPaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account, $status=0, $usethirdpartyemailforreceiptemail=0, $capture=true)
+    {
+        global $conf;
+
+        $error = 0;
+
+        if (empty($status)) $service = 'StripeTest';
+        else $service = 'StripeLive';
+
+        $sql = "SELECT sa.key_account as key_account, sa.fk_soc, sa.entity";
+        $sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
+        $sql.= " WHERE sa.key_account = '" . $this->db->escape($customer) . "'";
+        //$sql.= " AND sa.entity IN (".getEntity('societe').")";
+        $sql.= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
+
+        dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result) {
+            if ($this->db->num_rows($result)) {
+                $obj = $this->db->fetch_object($result);
+                $key = $obj->fk_soc;
+            } else {
+                $key = null;
+            }
+        } else {
+            $key = null;
+        }
+
+        $arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+        if (! in_array($currency, $arrayzerounitcurrency)) $stripeamount=$amount * 100;
+        else $stripeamount = $amount;
+
+        $societe = new Societe($this->db);
+        if ($key > 0) $societe->fetch($key);
+
+        $description = "";
+        $ref = "";
+        if ($origin == order) {
+            $order = new Commande($this->db);
+            $order->fetch($item);
+            $ref = $order->ref;
+            $description = "ORD=" . $ref . ".CUS=" . $societe->id.".PM=stripe";
+        } elseif ($origin == invoice) {
+            $invoice = new Facture($this->db);
+            $invoice->fetch($item);
+            $ref = $invoice->ref;
+            $description = "INV=" . $ref . ".CUS=" . $societe->id.".PM=stripe";
+        }
+
+        $metadata = array(
+            "dol_id" => "" . $item . "",
+            "dol_type" => "" . $origin . "",
+            "dol_thirdparty_id" => "" . $societe->id . "",
+            'dol_thirdparty_name' => $societe->name,
+            'dol_version'=>DOL_VERSION,
+            'dol_entity'=>$conf->entity,
+            'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])
+        );
+        $return = new Stripe($this->db);
+        try {
+            // Force to use the correct API key
+            global $stripearrayofkeysbyenv;
+            \Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
+
+            if (empty($conf->stripeconnect->enabled))
+            {
+                if (preg_match('/acct_/i', $source))
+                {
+                    $charge = \Stripe\Charge::create(array(
+                        "amount" => "$stripeamount",
+                        "currency" => "$currency",
+                        "statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
+                        "description" => "Stripe payment: ".$description,
+                        "capture"  => $capture,
+                        "metadata" => $metadata,
+                        "source" => "$source"
+                    ));
+                } else {
+                    $paymentarray = array(
+                        "amount" => "$stripeamount",
+                        "currency" => "$currency",
+                        "statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
+                        "description" => "Stripe payment: ".$description,
+                        "capture"  => $capture,
+                        "metadata" => $metadata,
+                        "source" => "$source",
+                        "customer" => "$customer"
+                    );
+
+                    if ($societe->email && $usethirdpartyemailforreceiptemail)
+                    {
+                        $paymentarray["receipt_email"] = $societe->email;
+                    }
+
+                    $charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$ref"));
+                }
+            } else {
+
+                $fee = round(($amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE) * 100);
+                if ($fee < ($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100)) {
+                    $fee = round($conf->global->STRIPE_APPLICATION_FEE_MINIMAL * 100);
+                }
+
+                $paymentarray = array(
+                        "amount" => "$stripeamount",
+                        "currency" => "$currency",
+                        "statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
+                        "description" => "Stripe payment: ".$description,
+                        "capture"  => $capture,
+                        "metadata" => $metadata,
+                        "source" => "$source",
+                        "customer" => "$customer"
+                    );
+                    if ($conf->entity!=$conf->global->STRIPECONNECT_PRINCIPAL && $fee>0)
+                    {
+                        $paymentarray["application_fee"] = $fee;
+                    }
+                    if ($societe->email && $usethirdpartyemailforreceiptemail)
+                    {
+                        $paymentarray["receipt_email"] = $societe->email;
+                    }
+
+                    $charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$ref","stripe_account" => "$account"));
+            }
+            if (isset($charge->id)) {}
+
+            $return->statut = 'success';
+            $return->id = $charge->id;
+            if ($charge->source->type == 'card') {
+                $return->message = $charge->source->card->brand . " ...." . $charge->source->card->last4;
+            } elseif ($charge->source->type == 'three_d_secure') {
+                $stripe = new Stripe($this->db);
+                $src = \Stripe\Source::retrieve("" . $charge->source->three_d_secure->card . "", array(
+                "stripe_account" => $stripe->getStripeAccount($service)
+                ));
+                $return->message = $src->card->brand . " ...." . $src->card->last4;
+            } else {
+                $return->message = $charge->id;
+            }
+        } catch (\Stripe\Error\Card $e) {
+            include DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+            // Since it's a decline, \Stripe\Error\Card will be caught
+            $body = $e->getJsonBody();
+            $err = $body['error'];
+
+            $return->statut = 'error';
+            $return->id = $err['charge'];
+            $return->type = $err['type'];
+            $return->code = $err['code'];
+            $return->message = $err['message'];
+            $body = "Error: <br>" . $return->id . " " . $return->message . " ";
+            $subject = '[Alert] Payment error using Stripe';
+            $cmailfile = new CMailFile($subject, $conf->global->ONLINE_PAYMENT_SENDEMAIL, $conf->global->MAIN_INFO_SOCIETE_MAIL, $body);
+            $cmailfile->sendfile();
+
+            $error++;
+            dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+        } catch (\Stripe\Error\RateLimit $e) {
+            // Too many requests made to the API too quickly
+            $error++;
+            dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+        } catch (\Stripe\Error\InvalidRequest $e) {
+            // Invalid parameters were supplied to Stripe's API
+            $error++;
+            dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+        } catch (\Stripe\Error\Authentication $e) {
+            // Authentication with Stripe's API failed
+            // (maybe you changed API keys recently)
+            $error++;
+            dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+        } catch (\Stripe\Error\ApiConnection $e) {
+            // Network communication with Stripe failed
+            $error++;
+            dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+        } catch (\Stripe\Error\Base $e) {
+            // Display a very generic error to the user, and maybe send
+            // yourself an email
+            $error++;
+            dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+        } catch (Exception $e) {
+            // Something else happened, completely unrelated to Stripe
+            $error++;
+            dol_syslog($e->getMessage(), LOG_WARNING, 0, '_stripe');
+        }
+        return $return;
+    }
 }

Spacing +69 added lines, -69 removed lines

@@ -20,7 +20,7 @@ 
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/stripe/config.php';						// This set stripe global env
+require_once DOL_DOCUMENT_ROOT.'/stripe/config.php'; // This set stripe global env
 
 
 /**
@@ -80,29 +80,29 @@ 
 	 * @param 	string	$mode		'StripeTest' or 'StripeLive'
 	 * @return 	string				Stripe account 'acc_....' or '' if no OAuth token found
 	 */
-	public function getStripeAccount($mode='StripeTest')
+	public function getStripeAccount($mode = 'StripeTest')
 	{
 		global $conf;
 
 		$sql = "SELECT tokenstring";
-		$sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
-		$sql.= " WHERE entity = ".$conf->entity;
-		$sql.= " AND service = '".$mode."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."oauth_token";
+		$sql .= " WHERE entity = ".$conf->entity;
+		$sql .= " AND service = '".$mode."'";
 
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
     	if ($result)
 		{
 			if ($this->db->num_rows($result))
 			{
 				$obj = $this->db->fetch_object($result);
-    			$tokenstring=$obj->tokenstring;
+    			$tokenstring = $obj->tokenstring;
 
     			$tmparray = dol_json_decode($tokenstring);
     			$key = $tmparray->stripe_user_id;
     		}
     		else {
-    			$tokenstring='';
+    			$tokenstring = '';
     		}
     	}
     	else {
@@ -120,11 +120,11 @@ 
 	 * @param	int		$status		Status
 	 * @return	string				Stripe customer ref 'cu_xxxxxxxxxxxxx' or ''
 	 */
-	public function getStripeCustomerAccount($id, $status=0)
+	public function getStripeCustomerAccount($id, $status = 0)
 	{
 		include_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 		$societeaccount = new SocieteAccount($this->db);
-		return $societeaccount->getCustomerAccount($id, 'stripe', $status);		// Get thirdparty cus_...
+		return $societeaccount->getCustomerAccount($id, 'stripe', $status); // Get thirdparty cus_...
 	}
 
 
@@ -137,7 +137,7 @@ 
 	 * @param	int		$createifnotlinkedtostripe		1=Create the stripe customer and the link if the thirdparty is not yet linked to a stripe customer
 	 * @return 	\Stripe\StripeCustomer|null 			Stripe Customer or null if not found
 	 */
-	public function customerStripe(Societe $object, $key='', $status=0, $createifnotlinkedtostripe=0)
+	public function customerStripe(Societe $object, $key = '', $status = 0, $createifnotlinkedtostripe = 0)
 	{
 		global $conf, $user;
 
@@ -149,14 +149,14 @@ 
 
 		$customer = null;
 
-		$sql = "SELECT sa.key_account as key_account, sa.entity";			// key_account is cus_....
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.fk_soc = " . $object->id;
-		$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
-		$sql.= " AND key_account IS NOT NULL AND key_account <> ''";
+		$sql = "SELECT sa.key_account as key_account, sa.entity"; // key_account is cus_....
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
+		$sql .= " WHERE sa.fk_soc = ".$object->id;
+		$sql .= " AND sa.entity IN (".getEntity('societe').")";
+		$sql .= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
+		$sql .= " AND key_account IS NOT NULL AND key_account <> ''";
 
-		dol_syslog(get_class($this) . "::customerStripe search stripe customer id for thirdparty id=".$object->id, LOG_DEBUG);
+		dol_syslog(get_class($this)."::customerStripe search stripe customer id for thirdparty id=".$object->id, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -165,7 +165,7 @@ 
 				$obj = $this->db->fetch_object($resql);
 				$tiers = $obj->key_account;
 
-				dol_syslog(get_class($this) . "::customerStripe found stripe customer key_account = ".$tiers);
+				dol_syslog(get_class($this)."::customerStripe found stripe customer key_account = ".$tiers);
 
 				// Force to use the correct API key
 				global $stripearrayofkeysbyenv;
@@ -178,7 +178,7 @@ 
 						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
 					}
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 				}
@@ -188,7 +188,7 @@ 
 				$dataforcustomer = array(
 					"email" => $object->email,
 					"description" => $object->name,
-					"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']))
+					"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']))
 				);
 
 				$vatcleaned = $object->tva_intra ? $object->tva_intra : null;
@@ -199,7 +199,7 @@ 
 					$taxinfo["tax_id"] = $vatcleaned;
 				}
 				// We force data to "null" if not defined as expected by Stripe
-				if (empty($vatcleaned)) $taxinfo=null;
+				if (empty($vatcleaned)) $taxinfo = null;
 
 				$dataforcustomer["tax_info"] = $taxinfo;
 
@@ -216,15 +216,15 @@ 
 						$customer = \Stripe\Customer::create($dataforcustomer, array("stripe_account" => $key));
 					}
 
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_account (fk_soc, login, key_account, site, status, entity, date_creation, fk_user_creat)";
-					$sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', " . $status . ", " . $conf->entity . ", '".$this->db->idate(dol_now())."', ".$user->id.")";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_account (fk_soc, login, key_account, site, status, entity, date_creation, fk_user_creat)";
+					$sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', ".$status.", ".$conf->entity.", '".$this->db->idate(dol_now())."', ".$user->id.")";
 					$resql = $this->db->query($sql);
-					if (! $resql)
+					if (!$resql)
 					{
 						$this->error = $this->db->lasterror();
 					}
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 				}
@@ -248,19 +248,19 @@ 
 	 * @param	int						$createifnotlinkedtostripe		1=Create the stripe card and the link if the card is not yet linked to a stripe card
 	 * @return 	\Stripe\StripeCard|null 								Stripe Card or null if not found
 	 */
-	public function cardStripe($cu, CompanyPaymentMode $object, $stripeacc='', $status=0, $createifnotlinkedtostripe=0)
+	public function cardStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
 	{
 		global $conf, $user;
 
 		$card = null;
 
-		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.exp_date_month, sa.exp_date_year, sa.number, sa.cvn";			// stripe_card_ref is card_....
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_rib as sa";
-		$sql.= " WHERE sa.rowid = " . $object->id;
+		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.exp_date_month, sa.exp_date_year, sa.number, sa.cvn"; // stripe_card_ref is card_....
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
+		$sql .= " WHERE sa.rowid = ".$object->id;
 		//$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.type = 'card'";
+		$sql .= " AND sa.type = 'card'";
 
-		dol_syslog(get_class($this) . "::fetch search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -279,7 +279,7 @@ 
 							$card = $cu->sources->retrieve($cardref);
 						}
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -287,15 +287,15 @@ 
 				}
 				elseif ($createifnotlinkedtostripe)
 				{
-					$exp_date_month=$obj->exp_date_month;
-					$exp_date_year=$obj->exp_date_year;
-					$number=$obj->number;
-					$cvc=$obj->cvn;								// cvn in database, cvc for stripe
-					$cardholdername=$obj->proprio;
+					$exp_date_month = $obj->exp_date_month;
+					$exp_date_year = $obj->exp_date_year;
+					$number = $obj->number;
+					$cvc = $obj->cvn; // cvn in database, cvc for stripe
+					$cardholdername = $obj->proprio;
 
 					$dataforcard = array(
 						"source" => array('object'=>'card', 'exp_month'=>$exp_date_month, 'exp_year'=>$exp_date_year, 'number'=>$number, 'cvc'=>$cvc, 'name'=>$cardholdername),
-						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']))
+						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']))
 					);
 
 					//$a = \Stripe\Stripe::getApiKey();
@@ -310,14 +310,14 @@ 
 
 						if ($card)
 						{
-							$sql = "UPDATE " . MAIN_DB_PREFIX . "societe_rib";
-							$sql.= " SET stripe_card_ref = '".$this->db->escape($card->id)."', card_type = '".$this->db->escape($card->brand)."',";
-							$sql.= " country_code = '".$this->db->escape($card->country)."',";
-							$sql.= " approved = ".($card->cvc_check == 'pass' ? 1 : 0);
-							$sql.= " WHERE rowid = " . $object->id;
-							$sql.= " AND type = 'card'";
+							$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
+							$sql .= " SET stripe_card_ref = '".$this->db->escape($card->id)."', card_type = '".$this->db->escape($card->brand)."',";
+							$sql .= " country_code = '".$this->db->escape($card->country)."',";
+							$sql .= " approved = ".($card->cvc_check == 'pass' ? 1 : 0);
+							$sql .= " WHERE rowid = ".$object->id;
+							$sql .= " AND type = 'card'";
 							$resql = $this->db->query($sql);
-							if (! $resql)
+							if (!$resql)
 							{
 								$this->error = $this->db->lasterror();
 							}
@@ -327,7 +327,7 @@ 
 							$this->error = 'Call to cu->source->create return empty card';
 						}
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -358,7 +358,7 @@ 
 	 * @param	boolean	$capture								Set capture flag to true (take payment) or false (wait)
 	 * @return Stripe
 	 */
-	public function createPaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account, $status=0, $usethirdpartyemailforreceiptemail=0, $capture=true)
+	public function createPaymentStripe($amount, $currency, $origin, $item, $source, $customer, $account, $status = 0, $usethirdpartyemailforreceiptemail = 0, $capture = true)
 	{
 		global $conf;
 
@@ -368,12 +368,12 @@ 
 		else $service = 'StripeLive';
 
 		$sql = "SELECT sa.key_account as key_account, sa.fk_soc, sa.entity";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.key_account = '" . $this->db->escape($customer) . "'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
+		$sql .= " WHERE sa.key_account = '".$this->db->escape($customer)."'";
 		//$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
+		$sql .= " AND sa.site = 'stripe' AND sa.status = ".((int) $status);
 
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
@@ -386,8 +386,8 @@ 
 			$key = null;
 		}
 
-		$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		if (! in_array($currency, $arrayzerounitcurrency)) $stripeamount=$amount * 100;
+		$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+		if (!in_array($currency, $arrayzerounitcurrency)) $stripeamount = $amount * 100;
 		else $stripeamount = $amount;
 
 		$societe = new Societe($this->db);
@@ -399,22 +399,22 @@ 
 			$order = new Commande($this->db);
 			$order->fetch($item);
 			$ref = $order->ref;
-			$description = "ORD=" . $ref . ".CUS=" . $societe->id.".PM=stripe";
+			$description = "ORD=".$ref.".CUS=".$societe->id.".PM=stripe";
 		} elseif ($origin == invoice) {
 			$invoice = new Facture($this->db);
 			$invoice->fetch($item);
 			$ref = $invoice->ref;
-			$description = "INV=" . $ref . ".CUS=" . $societe->id.".PM=stripe";
+			$description = "INV=".$ref.".CUS=".$societe->id.".PM=stripe";
 		}
 
 		$metadata = array(
-			"dol_id" => "" . $item . "",
-			"dol_type" => "" . $origin . "",
-			"dol_thirdparty_id" => "" . $societe->id . "",
+			"dol_id" => "".$item."",
+			"dol_type" => "".$origin."",
+			"dol_thirdparty_id" => "".$societe->id."",
 			'dol_thirdparty_name' => $societe->name,
 			'dol_version'=>DOL_VERSION,
 			'dol_entity'=>$conf->entity,
-			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])
+			'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])
 		);
 		$return = new Stripe($this->db);
 		try {
@@ -429,7 +429,7 @@ 
 					$charge = \Stripe\Charge::create(array(
 						"amount" => "$stripeamount",
 						"currency" => "$currency",
-						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
+						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt
 						"description" => "Stripe payment: ".$description,
 						"capture"  => $capture,
 						"metadata" => $metadata,
@@ -439,7 +439,7 @@ 
 					$paymentarray = array(
 						"amount" => "$stripeamount",
 						"currency" => "$currency",
-						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
+						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt
 						"description" => "Stripe payment: ".$description,
 						"capture"  => $capture,
 						"metadata" => $metadata,
@@ -464,14 +464,14 @@ 
         		$paymentarray = array(
 						"amount" => "$stripeamount",
 						"currency" => "$currency",
-						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt
+						"statement_descriptor" => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 8, 'right', 'UTF-8', 1).' '.$description, 22, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt
 						"description" => "Stripe payment: ".$description,
 						"capture"  => $capture,
 						"metadata" => $metadata,
 						"source" => "$source",
 						"customer" => "$customer"
 					);
-					if ($conf->entity!=$conf->global->STRIPECONNECT_PRINCIPAL && $fee>0)
+					if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $fee > 0)
 					{
 						$paymentarray["application_fee"] = $fee;
 					}
@@ -480,20 +480,20 @@ 
 						$paymentarray["receipt_email"] = $societe->email;
 					}
 
-					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$ref","stripe_account" => "$account"));
+					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$ref", "stripe_account" => "$account"));
 			}
 			if (isset($charge->id)) {}
 
 			$return->statut = 'success';
 			$return->id = $charge->id;
 			if ($charge->source->type == 'card') {
-				$return->message = $charge->source->card->brand . " ...." . $charge->source->card->last4;
+				$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
 			} elseif ($charge->source->type == 'three_d_secure') {
 				$stripe = new Stripe($this->db);
-				$src = \Stripe\Source::retrieve("" . $charge->source->three_d_secure->card . "", array(
+				$src = \Stripe\Source::retrieve("".$charge->source->three_d_secure->card."", array(
 				"stripe_account" => $stripe->getStripeAccount($service)
 				));
-				$return->message = $src->card->brand . " ...." . $src->card->last4;
+				$return->message = $src->card->brand." ....".$src->card->last4;
 			} else {
 				$return->message = $charge->id;
 			}
@@ -508,7 +508,7 @@ 
 			$return->type = $err['type'];
 			$return->code = $err['code'];
 			$return->message = $err['message'];
-			$body = "Error: <br>" . $return->id . " " . $return->message . " ";
+			$body = "Error: <br>".$return->id." ".$return->message." ";
 			$subject = '[Alert] Payment error using Stripe';
 			$cmailfile = new CMailFile($subject, $conf->global->ONLINE_PAYMENT_SENDEMAIL, $conf->global->MAIN_INFO_SOCIETE_MAIL, $body);
 			$cmailfile->sendfile();

Braces +27 added lines, -28 removed lines

@@ -100,12 +100,10 @@ 
 
     			$tmparray = dol_json_decode($tokenstring);
     			$key = $tmparray->stripe_user_id;
-    		}
-    		else {
+    		} else {
     			$tokenstring='';
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
 
@@ -177,13 +175,11 @@ 
 					} else {
 						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
 					}
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error = $e->getMessage();
 				}
-			}
-			elseif ($createifnotlinkedtostripe)
+			} elseif ($createifnotlinkedtostripe)
 			{
 				$dataforcustomer = array(
 					"email" => $object->email,
@@ -199,7 +195,9 @@ 
 					$taxinfo["tax_id"] = $vatcleaned;
 				}
 				// We force data to "null" if not defined as expected by Stripe
-				if (empty($vatcleaned)) $taxinfo=null;
+				if (empty($vatcleaned)) {
+				    $taxinfo=null;
+				}
 
 				$dataforcustomer["tax_info"] = $taxinfo;
 
@@ -223,14 +221,12 @@ 
 					{
 						$this->error = $this->db->lasterror();
 					}
-				}
-				catch(Exception $e)
+				} catch(Exception $e)
 				{
 					$this->error = $e->getMessage();
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -278,14 +274,12 @@ 
 							//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
 							$card = $cu->sources->retrieve($cardref);
 						}
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
-				}
-				elseif ($createifnotlinkedtostripe)
+				} elseif ($createifnotlinkedtostripe)
 				{
 					$exp_date_month=$obj->exp_date_month;
 					$exp_date_year=$obj->exp_date_year;
@@ -321,21 +315,18 @@ 
 							{
 								$this->error = $this->db->lasterror();
 							}
-						}
-						else
+						} else
 						{
 							$this->error = 'Call to cu->source->create return empty card';
 						}
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -364,8 +355,11 @@ 
 
 		$error = 0;
 
-		if (empty($status)) $service = 'StripeTest';
-		else $service = 'StripeLive';
+		if (empty($status)) {
+		    $service = 'StripeTest';
+		} else {
+		    $service = 'StripeLive';
+		}
 
 		$sql = "SELECT sa.key_account as key_account, sa.fk_soc, sa.entity";
 		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
@@ -387,11 +381,16 @@ 
 		}
 
 		$arrayzerounitcurrency=array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		if (! in_array($currency, $arrayzerounitcurrency)) $stripeamount=$amount * 100;
-		else $stripeamount = $amount;
+		if (! in_array($currency, $arrayzerounitcurrency)) {
+		    $stripeamount=$amount * 100;
+		} else {
+		    $stripeamount = $amount;
+		}
 
 		$societe = new Societe($this->db);
-		if ($key > 0) $societe->fetch($key);
+		if ($key > 0) {
+		    $societe->fetch($key);
+		}
 
 		$description = "";
 		$ref = "";

dolibarr/htdocs/stripe/class/actions_stripe.class.php

Indentation +191 added lines, -191 removed lines

@@ -36,203 +36,203 @@
  */
 class ActionsStripeconnect
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	private $config=array();
+    private $config=array();
 
-	// For Hookmanager return
-	public $resprints;
-	public $results=array();
+    // For Hookmanager return
+    public $resprints;
+    public $results=array();
 
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 * formObjectOptions
-	 *
-	 * @param	array	$parameters		Parameters
-	 * @param	Object	$object			Object
-	 * @param	string	$action			Action
+    /**
+     *	Constructor
+     *
+     *	@param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     * formObjectOptions
+     *
+     * @param	array	$parameters		Parameters
+     * @param	Object	$object			Object
+     * @param	string	$action			Action
      * @return bool
-	 */
-	function formObjectOptions($parameters, &$object, &$action)
-	{
-		global $db,$conf,$user,$langs,$form;
-
-		if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
-		{
-			$service = 'StripeTest';
-			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
-		}
-		else
-		{
-			$service = 'StripeLive';
-		}
-
-		if (is_array($parameters) && ! empty($parameters))
-		{
-			foreach($parameters as $key=>$value)
-			{
-				$key=$value;
-			}
-		}
-
-
-		if (is_object($object) && $object->element == 'societe')
-		{
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('StripeCustomer');
-			$this->resprints.= '<td><td align="right">';
-			//				$this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
-			if ($stripe->getStripeAccount($service)&&$object->client!=0) {
-				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
-			}
-			else {
-				$this->resprints.= $langs->trans("NoStripe");
-			}
-			$this->resprints.= '</td></tr>';
-		}
-		elseif (is_object($object) && $object->element == 'member'){
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('StripeCustomer');
-			$this->resprints.= '<td><td align="right">';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
-			if ($stripe->getStripeAccount($service) && $object->fk_soc > 0) {
-				$object->fetch_thirdparty();
-				$customer=$stripe->customerStripe($object->thirdparty, $stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
-			}
-			else {
-				$this->resprints.= $langs->trans("NoStripe");
-			}
-			$this->resprints.= '</td></tr>';
-
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('SubscriptionStripe');
-			$this->resprints.= '<td><td align="right">';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
-			if (7==4) {
-				$object->fetch_thirdparty();
-				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
-			}
-			else {
-				$this->resprints.= $langs->trans("NoStripe");
-			}
-			$this->resprints.= '</td></tr>';
-		}
-		elseif (is_object($object) && $object->element == 'adherent_type'){
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('PlanStripe');
-			$this->resprints.= '<td><td align="right">';
-			//				$this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
-			if (7==4) {
-				$object->fetch_thirdparty();
-				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
-			}
-			else {
-				$this->resprints.= $langs->trans("NoStripe");
-			}
-			$this->resprints.= '</td></tr>';
-		}
-		return 0;
-	}
-
-	/**
-	 * addMoreActionsButtons
-	 *
-	 * @param arra	 	$parameters	Parameters
-	 * @param Object	$object		Object
-	 * @param string	$action		action
-	 * @return int					0
-	 */
-	function addMoreActionsButtons($parameters, &$object, &$action)
-	{
-		global $db,$conf,$user,$langs,$form;
-		if (is_object($object) && $object->element == 'facture'){
-			// On verifie si la facture a des paiements
-			$sql = 'SELECT pf.amount';
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . 'paiement_facture as pf';
-			$sql .= ' WHERE pf.fk_facture = ' . $object->id;
-
-			$result = $db->query($sql);
-			if ($result) {
-				$i = 0;
-				$num = $db->num_rows($result);
-
-				while ($i < $num) {
-					$objp = $db->fetch_object($result);
-					$totalpaye += $objp->amount;
-					$i ++;
-				}
-			} else {
-				dol_print_error($db, '');
-			}
-
-			$resteapayer = $object->total_ttc - $totalpaye;
-			// Request a direct debit order
-			if ($object->statut > Facture::STATUS_DRAFT && $object->statut < Facture::STATUS_ABANDONED && $object->paye == 0)
-			{
-				$stripe=new Stripe($db);
-				if ($resteapayer > 0)
-				{
-					if ($stripe->getStripeAccount($conf->entity))  // a modifier avec droit stripe
-					{
-						$langs->load("withdrawals");
-						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-					}
-					else
-					{
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
-					}
-				}
-				elseif ($resteapayer == 0)
-				{
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
-				}
-			}
-			else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
-			}
-		}
-		elseif (is_object($object) && $object->element == 'invoice_supplier'){
-			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-		}
-		elseif (is_object($object) && $object->element == 'member'){
-			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
-		}
-		return 0;
-	}
+     */
+    function formObjectOptions($parameters, &$object, &$action)
+    {
+        global $db,$conf,$user,$langs,$form;
+
+        if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
+        {
+            $service = 'StripeTest';
+            dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+        }
+        else
+        {
+            $service = 'StripeLive';
+        }
+
+        if (is_array($parameters) && ! empty($parameters))
+        {
+            foreach($parameters as $key=>$value)
+            {
+                $key=$value;
+            }
+        }
+
+
+        if (is_object($object) && $object->element == 'societe')
+        {
+            $this->resprints.= '<tr><td>';
+            $this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
+            $this->resprints.= $langs->trans('StripeCustomer');
+            $this->resprints.= '<td><td align="right">';
+            //				$this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
+            $this->resprints.= '</td></tr></table>';
+            $this->resprints.= '</td>';
+            $this->resprints.= '<td colspan="3">';
+            $stripe=new Stripe($db);
+            if ($stripe->getStripeAccount($service)&&$object->client!=0) {
+                $customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
+                $this->resprints.= $customer->id;
+            }
+            else {
+                $this->resprints.= $langs->trans("NoStripe");
+            }
+            $this->resprints.= '</td></tr>';
+        }
+        elseif (is_object($object) && $object->element == 'member'){
+            $this->resprints.= '<tr><td>';
+            $this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
+            $this->resprints.= $langs->trans('StripeCustomer');
+            $this->resprints.= '<td><td align="right">';
+            $this->resprints.= '</td></tr></table>';
+            $this->resprints.= '</td>';
+            $this->resprints.= '<td colspan="3">';
+            $stripe=new Stripe($db);
+            if ($stripe->getStripeAccount($service) && $object->fk_soc > 0) {
+                $object->fetch_thirdparty();
+                $customer=$stripe->customerStripe($object->thirdparty, $stripe->getStripeAccount($service));
+                $this->resprints.= $customer->id;
+            }
+            else {
+                $this->resprints.= $langs->trans("NoStripe");
+            }
+            $this->resprints.= '</td></tr>';
+
+            $this->resprints.= '<tr><td>';
+            $this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
+            $this->resprints.= $langs->trans('SubscriptionStripe');
+            $this->resprints.= '<td><td align="right">';
+            $this->resprints.= '</td></tr></table>';
+            $this->resprints.= '</td>';
+            $this->resprints.= '<td colspan="3">';
+            $stripe=new Stripe($db);
+            if (7==4) {
+                $object->fetch_thirdparty();
+                $customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
+                $this->resprints.= $customer->id;
+            }
+            else {
+                $this->resprints.= $langs->trans("NoStripe");
+            }
+            $this->resprints.= '</td></tr>';
+        }
+        elseif (is_object($object) && $object->element == 'adherent_type'){
+            $this->resprints.= '<tr><td>';
+            $this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
+            $this->resprints.= $langs->trans('PlanStripe');
+            $this->resprints.= '<td><td align="right">';
+            //				$this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
+            $this->resprints.= '</td></tr></table>';
+            $this->resprints.= '</td>';
+            $this->resprints.= '<td colspan="3">';
+            $stripe=new Stripe($db);
+            if (7==4) {
+                $object->fetch_thirdparty();
+                $customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
+                $this->resprints.= $customer->id;
+            }
+            else {
+                $this->resprints.= $langs->trans("NoStripe");
+            }
+            $this->resprints.= '</td></tr>';
+        }
+        return 0;
+    }
+
+    /**
+     * addMoreActionsButtons
+     *
+     * @param arra	 	$parameters	Parameters
+     * @param Object	$object		Object
+     * @param string	$action		action
+     * @return int					0
+     */
+    function addMoreActionsButtons($parameters, &$object, &$action)
+    {
+        global $db,$conf,$user,$langs,$form;
+        if (is_object($object) && $object->element == 'facture'){
+            // On verifie si la facture a des paiements
+            $sql = 'SELECT pf.amount';
+            $sql .= ' FROM ' . MAIN_DB_PREFIX . 'paiement_facture as pf';
+            $sql .= ' WHERE pf.fk_facture = ' . $object->id;
+
+            $result = $db->query($sql);
+            if ($result) {
+                $i = 0;
+                $num = $db->num_rows($result);
+
+                while ($i < $num) {
+                    $objp = $db->fetch_object($result);
+                    $totalpaye += $objp->amount;
+                    $i ++;
+                }
+            } else {
+                dol_print_error($db, '');
+            }
+
+            $resteapayer = $object->total_ttc - $totalpaye;
+            // Request a direct debit order
+            if ($object->statut > Facture::STATUS_DRAFT && $object->statut < Facture::STATUS_ABANDONED && $object->paye == 0)
+            {
+                $stripe=new Stripe($db);
+                if ($resteapayer > 0)
+                {
+                    if ($stripe->getStripeAccount($conf->entity))  // a modifier avec droit stripe
+                    {
+                        $langs->load("withdrawals");
+                        print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
+                    }
+                    else
+                    {
+                        print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
+                    }
+                }
+                elseif ($resteapayer == 0)
+                {
+                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
+                }
+            }
+            else {
+                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
+            }
+        }
+        elseif (is_object($object) && $object->element == 'invoice_supplier'){
+            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
+        }
+        elseif (is_object($object) && $object->element == 'member'){
+            print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
+        }
+        return 0;
+    }
 }

Spacing +70 added lines, -70 removed lines

@@ -41,11 +41,11 @@ 
      */
     public $db;
 
-	private $config=array();
+	private $config = array();
 
 	// For Hookmanager return
 	public $resprints;
-	public $results=array();
+	public $results = array();
 
 
 	/**
@@ -69,103 +69,103 @@ 
 	 */
 	function formObjectOptions($parameters, &$object, &$action)
 	{
-		global $db,$conf,$user,$langs,$form;
+		global $db, $conf, $user, $langs, $form;
 
-		if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
+		if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
 		{
 			$service = 'StripeTest';
-			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 		}
 		else
 		{
 			$service = 'StripeLive';
 		}
 
-		if (is_array($parameters) && ! empty($parameters))
+		if (is_array($parameters) && !empty($parameters))
 		{
-			foreach($parameters as $key=>$value)
+			foreach ($parameters as $key=>$value)
 			{
-				$key=$value;
+				$key = $value;
 			}
 		}
 
 
 		if (is_object($object) && $object->element == 'societe')
 		{
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('StripeCustomer');
-			$this->resprints.= '<td><td align="right">';
+			$this->resprints .= '<tr><td>';
+			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
+			$this->resprints .= $langs->trans('StripeCustomer');
+			$this->resprints .= '<td><td align="right">';
 			//				$this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
-			if ($stripe->getStripeAccount($service)&&$object->client!=0) {
-				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
+			$this->resprints .= '</td></tr></table>';
+			$this->resprints .= '</td>';
+			$this->resprints .= '<td colspan="3">';
+			$stripe = new Stripe($db);
+			if ($stripe->getStripeAccount($service) && $object->client != 0) {
+				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
+				$this->resprints .= $customer->id;
 			}
 			else {
-				$this->resprints.= $langs->trans("NoStripe");
+				$this->resprints .= $langs->trans("NoStripe");
 			}
-			$this->resprints.= '</td></tr>';
+			$this->resprints .= '</td></tr>';
 		}
-		elseif (is_object($object) && $object->element == 'member'){
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('StripeCustomer');
-			$this->resprints.= '<td><td align="right">';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
+		elseif (is_object($object) && $object->element == 'member') {
+			$this->resprints .= '<tr><td>';
+			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
+			$this->resprints .= $langs->trans('StripeCustomer');
+			$this->resprints .= '<td><td align="right">';
+			$this->resprints .= '</td></tr></table>';
+			$this->resprints .= '</td>';
+			$this->resprints .= '<td colspan="3">';
+			$stripe = new Stripe($db);
 			if ($stripe->getStripeAccount($service) && $object->fk_soc > 0) {
 				$object->fetch_thirdparty();
-				$customer=$stripe->customerStripe($object->thirdparty, $stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
+				$customer = $stripe->customerStripe($object->thirdparty, $stripe->getStripeAccount($service));
+				$this->resprints .= $customer->id;
 			}
 			else {
-				$this->resprints.= $langs->trans("NoStripe");
+				$this->resprints .= $langs->trans("NoStripe");
 			}
-			$this->resprints.= '</td></tr>';
-
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('SubscriptionStripe');
-			$this->resprints.= '<td><td align="right">';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
-			if (7==4) {
+			$this->resprints .= '</td></tr>';
+
+			$this->resprints .= '<tr><td>';
+			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
+			$this->resprints .= $langs->trans('SubscriptionStripe');
+			$this->resprints .= '<td><td align="right">';
+			$this->resprints .= '</td></tr></table>';
+			$this->resprints .= '</td>';
+			$this->resprints .= '<td colspan="3">';
+			$stripe = new Stripe($db);
+			if (7 == 4) {
 				$object->fetch_thirdparty();
-				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
+				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
+				$this->resprints .= $customer->id;
 			}
 			else {
-				$this->resprints.= $langs->trans("NoStripe");
+				$this->resprints .= $langs->trans("NoStripe");
 			}
-			$this->resprints.= '</td></tr>';
+			$this->resprints .= '</td></tr>';
 		}
-		elseif (is_object($object) && $object->element == 'adherent_type'){
-			$this->resprints.= '<tr><td>';
-			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
-			$this->resprints.= $langs->trans('PlanStripe');
-			$this->resprints.= '<td><td align="right">';
+		elseif (is_object($object) && $object->element == 'adherent_type') {
+			$this->resprints .= '<tr><td>';
+			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
+			$this->resprints .= $langs->trans('PlanStripe');
+			$this->resprints .= '<td><td align="right">';
 			//				$this->resprints.= '<a href="'.$dolibarr_main_url_root.dol_buildpath('/dolipress/card.php?socid='.$object->id, 1).'">'.img_edit().'</a>';
-			$this->resprints.= '</td></tr></table>';
-			$this->resprints.= '</td>';
-			$this->resprints.= '<td colspan="3">';
-			$stripe=new Stripe($db);
-			if (7==4) {
+			$this->resprints .= '</td></tr></table>';
+			$this->resprints .= '</td>';
+			$this->resprints .= '<td colspan="3">';
+			$stripe = new Stripe($db);
+			if (7 == 4) {
 				$object->fetch_thirdparty();
-				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
-				$this->resprints.= $customer->id;
+				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
+				$this->resprints .= $customer->id;
 			}
 			else {
-				$this->resprints.= $langs->trans("NoStripe");
+				$this->resprints .= $langs->trans("NoStripe");
 			}
-			$this->resprints.= '</td></tr>';
+			$this->resprints .= '</td></tr>';
 		}
 		return 0;
 	}
@@ -180,12 +180,12 @@ 
 	 */
 	function addMoreActionsButtons($parameters, &$object, &$action)
 	{
-		global $db,$conf,$user,$langs,$form;
-		if (is_object($object) && $object->element == 'facture'){
+		global $db, $conf, $user, $langs, $form;
+		if (is_object($object) && $object->element == 'facture') {
 			// On verifie si la facture a des paiements
 			$sql = 'SELECT pf.amount';
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . 'paiement_facture as pf';
-			$sql .= ' WHERE pf.fk_facture = ' . $object->id;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
+			$sql .= ' WHERE pf.fk_facture = '.$object->id;
 
 			$result = $db->query($sql);
 			if ($result) {
@@ -195,7 +195,7 @@ 
 				while ($i < $num) {
 					$objp = $db->fetch_object($result);
 					$totalpaye += $objp->amount;
-					$i ++;
+					$i++;
 				}
 			} else {
 				dol_print_error($db, '');
@@ -205,7 +205,7 @@ 
 			// Request a direct debit order
 			if ($object->statut > Facture::STATUS_DRAFT && $object->statut < Facture::STATUS_ABANDONED && $object->paye == 0)
 			{
-				$stripe=new Stripe($db);
+				$stripe = new Stripe($db);
 				if ($resteapayer > 0)
 				{
 					if ($stripe->getStripeAccount($conf->entity))  // a modifier avec droit stripe
@@ -227,10 +227,10 @@ 
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 			}
 		}
-		elseif (is_object($object) && $object->element == 'invoice_supplier'){
+		elseif (is_object($object) && $object->element == 'invoice_supplier') {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
 		}
-		elseif (is_object($object) && $object->element == 'member'){
+		elseif (is_object($object) && $object->element == 'member') {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
 		}
 		return 0;

Braces +15 added lines, -25 removed lines

@@ -75,8 +75,7 @@ 
 		{
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
-		}
-		else
+		} else
 		{
 			$service = 'StripeLive';
 		}
@@ -104,13 +103,11 @@ 
 			if ($stripe->getStripeAccount($service)&&$object->client!=0) {
 				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
 				$this->resprints.= $customer->id;
-			}
-			else {
+			} else {
 				$this->resprints.= $langs->trans("NoStripe");
 			}
 			$this->resprints.= '</td></tr>';
-		}
-		elseif (is_object($object) && $object->element == 'member'){
+		} elseif (is_object($object) && $object->element == 'member'){
 			$this->resprints.= '<tr><td>';
 			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
 			$this->resprints.= $langs->trans('StripeCustomer');
@@ -123,8 +120,7 @@ 
 				$object->fetch_thirdparty();
 				$customer=$stripe->customerStripe($object->thirdparty, $stripe->getStripeAccount($service));
 				$this->resprints.= $customer->id;
-			}
-			else {
+			} else {
 				$this->resprints.= $langs->trans("NoStripe");
 			}
 			$this->resprints.= '</td></tr>';
@@ -141,13 +137,11 @@ 
 				$object->fetch_thirdparty();
 				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
 				$this->resprints.= $customer->id;
-			}
-			else {
+			} else {
 				$this->resprints.= $langs->trans("NoStripe");
 			}
 			$this->resprints.= '</td></tr>';
-		}
-		elseif (is_object($object) && $object->element == 'adherent_type'){
+		} elseif (is_object($object) && $object->element == 'adherent_type'){
 			$this->resprints.= '<tr><td>';
 			$this->resprints.= '<table width="100%" class="nobordernopadding"><tr><td>';
 			$this->resprints.= $langs->trans('PlanStripe');
@@ -161,8 +155,7 @@ 
 				$object->fetch_thirdparty();
 				$customer=$stripe->customerStripe($object,$stripe->getStripeAccount($service));
 				$this->resprints.= $customer->id;
-			}
-			else {
+			} else {
 				$this->resprints.= $langs->trans("NoStripe");
 			}
 			$this->resprints.= '</td></tr>';
@@ -208,29 +201,26 @@ 
 				$stripe=new Stripe($db);
 				if ($resteapayer > 0)
 				{
-					if ($stripe->getStripeAccount($conf->entity))  // a modifier avec droit stripe
+					if ($stripe->getStripeAccount($conf->entity)) {
+					    // a modifier avec droit stripe
 					{
 						$langs->load("withdrawals");
-						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
-					else
+						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
+					} else
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
-				}
-				elseif ($resteapayer == 0)
+				} elseif ($resteapayer == 0)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 				}
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 			}
-		}
-		elseif (is_object($object) && $object->element == 'invoice_supplier'){
+		} elseif (is_object($object) && $object->element == 'invoice_supplier'){
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-		}
-		elseif (is_object($object) && $object->element == 'member'){
+		} elseif (is_object($object) && $object->element == 'member'){
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeAutoSubscription")).'">'.$langs->trans("StripeAutoSubscription").'</a>';
 		}
 		return 0;

dolibarr/htdocs/stripe/lib/stripe.lib.php

Indentation +76 added lines, -76 removed lines

@@ -28,25 +28,25 @@ 
  */
 function stripeadmin_prepare_head()
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
-	$head[$h][1] = $langs->trans("Stripe");
-	$head[$h][2] = 'stripeaccount';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/stripe/admin/stripe.php";
+    $head[$h][1] = $langs->trans("Stripe");
+    $head[$h][2] = 'stripeaccount';
+    $h++;
 
-	$object=new stdClass();
+    $object=new stdClass();
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
 
     return $head;
 }
@@ -62,11 +62,11 @@ 
  */
 function showStripePaymentUrl($type,$ref)
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	$langs->load("paypal");
+    $langs->load("paypal");
     $langs->load("paybox");
-	$langs->load("stripe");
+    $langs->load("stripe");
 
     $servicename='Stripe';
     $out='<br><br>';
@@ -89,41 +89,41 @@ 
  */
 function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
 {
-	global $conf;
+    global $conf;
 
-	$ref=str_replace(' ','',$ref);
+    $ref=str_replace(' ','',$ref);
 	
     if ($type == 'free')
     {
-	    $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
+        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
     }
     if ($type == 'order')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
         if ($mode == 1) $out.='order_ref';
         if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out.=($mode?'</font>':'');
     }
     if ($type == 'invoice')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
         if ($mode == 1) $out.='invoice_ref';
         if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out.=($mode?'</font>':'');
     }
     if ($type == 'contractline')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
         if ($mode == 1) $out.='contractline_ref';
         if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out.=($mode?'</font>':'');
     }
     if ($type == 'membersubscription')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
         if ($mode == 1) $out.='member_ref';
         if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out.=($mode?'</font>':'');
     }
 
     // For multicompany
@@ -142,61 +142,61 @@ 
  */
 function html_print_stripe_footer($fromcompany,$langs)
 {
-	global $conf;
-
-	// Juridical status
-	$line1="";
-	if ($fromcompany->forme_juridique_code)
-	{
-		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-	}
-	// Capital
-	if ($fromcompany->capital)
-	{
-		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-	}
-	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
-	{
-		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
-	}
-	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
-		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
-	}
-
-	// Second line of company infos
-	$line2="";
-	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
-		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
-	}
-	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
-		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
-	}
-	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
-		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-	}
-
-	print '<br><br><hr>'."\n";
-	print '<div class="center"><font style="font-size: 10px;">'."\n";
-	print $fromcompany->name.'<br>';
-	print $line1.'<br>';
-	print $line2;
-	print '</font></div>'."\n";
+    global $conf;
+
+    // Juridical status
+    $line1="";
+    if ($fromcompany->forme_juridique_code)
+    {
+        $line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+    }
+    // Capital
+    if ($fromcompany->capital)
+    {
+        $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+    }
+    // Prof Id 1
+    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+    {
+        $field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+    }
+    // Prof Id 2
+    if ($fromcompany->idprof2)
+    {
+        $field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+    }
+
+    // Second line of company infos
+    $line2="";
+    // Prof Id 3
+    if ($fromcompany->idprof3)
+    {
+        $field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+    }
+    // Prof Id 4
+    if ($fromcompany->idprof4)
+    {
+        $field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
+        if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+        $line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+    }
+    // IntraCommunautary VAT
+    if ($fromcompany->tva_intra != '')
+    {
+        $line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+    }
+
+    print '<br><br><hr>'."\n";
+    print '<div class="center"><font style="font-size: 10px;">'."\n";
+    print $fromcompany->name.'<br>';
+    print $line1.'<br>';
+    print $line2;
+    print '</font></div>'."\n";
 }
 

Spacing +49 added lines, -49 removed lines

@@ -38,15 +38,15 @@ 
 	$head[$h][2] = 'stripeaccount';
 	$h++;
 
-	$object=new stdClass();
+	$object = new stdClass();
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stripeadmin');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'stripeadmin','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stripeadmin', 'remove');
 
     return $head;
 }
@@ -60,7 +60,7 @@ 
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showStripePaymentUrl($type,$ref)
+function showStripePaymentUrl($type, $ref)
 {
 	global $conf, $langs;
 
@@ -68,12 +68,12 @@ 
     $langs->load("paybox");
 	$langs->load("stripe");
 
-    $servicename='Stripe';
-    $out='<br><br>';
-    $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
-    $url=getStripePaymentUrl(0,$type,$ref);
-    $out.='<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
-    $out.=ajax_autoselect("stripeurl", 0);
+    $servicename = 'Stripe';
+    $out = '<br><br>';
+    $out .= img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
+    $url = getStripePaymentUrl(0, $type, $ref);
+    $out .= '<input type="text" id="stripeurl" class="quatrevingtpercent" value="'.$url.'"><br>';
+    $out .= ajax_autoselect("stripeurl", 0);
     return $out;
 }
 
@@ -87,47 +87,47 @@ 
  * @param	string	$freetag	Free tag
  * @return	string				Url string
  */
-function getStripePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
+function getStripePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_free_tag')
 {
 	global $conf;
 
-	$ref=str_replace(' ','',$ref);
+	$ref = str_replace(' ', '', $ref);
 	
     if ($type == 'free')
     {
-	    $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
+	    $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
     }
     if ($type == 'order')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='order_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'order_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
     }
     if ($type == 'invoice')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='invoice_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'invoice_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
     }
     if ($type == 'contractline')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='contractline_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'contractline_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
     }
     if ($type == 'membersubscription')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='member_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
+        $out = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'member_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
     }
 
     // For multicompany
-    $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+    $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
 
     return $out;
 }
@@ -140,56 +140,56 @@ 
  * @param   Translate	$langs			Output language
  * @return	void
  */
-function html_print_stripe_footer($fromcompany,$langs)
+function html_print_stripe_footer($fromcompany, $langs)
 {
 	global $conf;
 
 	// Juridical status
-	$line1="";
+	$line1 = "";
 	if ($fromcompany->forme_juridique_code)
 	{
-		$line1.=($line1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
 	}
 	// Capital
 	if ($fromcompany->capital)
 	{
-		$line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
 	}
 	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
 	{
-		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
+		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2)
 	{
-		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
+		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
 	}
 
 	// Second line of company infos
-	$line2="";
+	$line2 = "";
 	// Prof Id 3
 	if ($fromcompany->idprof3)
 	{
-		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
+		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4)
 	{
-		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
-		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
+		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
 	}
 	// IntraCommunautary VAT
 	if ($fromcompany->tva_intra != '')
 	{
-		$line2.=($line2?" - ":"").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
 	}
 
 	print '<br><br><hr>'."\n";

Braces +36 added lines, -12 removed lines

@@ -100,29 +100,45 @@ 
     if ($type == 'order')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='order_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='order_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
     }
     if ($type == 'invoice')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='invoice_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='invoice_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
     }
     if ($type == 'contractline')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='contractline_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='contractline_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
     }
     if ($type == 'membersubscription')
     {
         $out=DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='member_ref';
-        if ($mode == 0) $out.=urlencode($ref);
+        if ($mode == 1) {
+            $out.='member_ref';
+        }
+        if ($mode == 0) {
+            $out.=urlencode($ref);
+        }
 	    $out.=($mode?'</font>':'');
     }
 
@@ -159,14 +175,18 @@ 
 	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || ! $fromcompany->idprof2))
 	{
 		$field=$langs->transcountrynoentities("ProfId1",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof1;
 	}
 	// Prof Id 2
 	if ($fromcompany->idprof2)
 	{
 		$field=$langs->transcountrynoentities("ProfId2",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line1.=($line1?" - ":"").$field.": ".$fromcompany->idprof2;
 	}
 
@@ -176,14 +196,18 @@ 
 	if ($fromcompany->idprof3)
 	{
 		$field=$langs->transcountrynoentities("ProfId3",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof3;
 	}
 	// Prof Id 4
 	if ($fromcompany->idprof4)
 	{
 		$field=$langs->transcountrynoentities("ProfId4",$fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i',$field,$reg)) $field=$reg[1];
+		if (preg_match('/\((.*)\)/i',$field,$reg)) {
+		    $field=$reg[1];
+		}
 		$line2.=($line2?" - ":"").$field.": ".$fromcompany->idprof4;
 	}
 	// IntraCommunautary VAT

dolibarr/htdocs/stripe/payment.php

Indentation +417 added lines, -417 removed lines

@@ -75,21 +75,21 @@ 
 // Load object
 if ($facid > 0)
 {
-	$ret=$object->fetch($facid);
+    $ret=$object->fetch($facid);
 }
 
 if (! empty($conf->stripe->enabled))
 {
-	$service = 'StripeTest';
-	$servicestatus = 0;
-	if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
-	{
-		$service = 'StripeLive';
-		$servicestatus = 0;
-	}
-
-	$stripe=new Stripe($db);
-	$stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
+    $service = 'StripeTest';
+    $servicestatus = 0;
+    if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
+    {
+        $service = 'StripeLive';
+        $servicestatus = 0;
+    }
+
+    $stripe=new Stripe($db);
+    $stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
 }
 
 // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
@@ -106,100 +106,100 @@ 
 
 if (empty($reshook))
 {
-	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes'))
-	{
-	    $error = 0;
-
-	    $datepaye = dol_now();
-	    $paiement_id = 0;
-	    $totalpayment = 0;
-		$multicurrency_totalpayment = 0;
-	    $atleastonepaymentnotnull = 0;
-
-	    // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
-	    $tmpinvoice=new Facture($db);
-	    foreach ($_POST as $key => $value)
-	    {
-	        if (substr($key,0,7) == 'amount_')
-	        {
-	            $cursorfacid = substr($key,7);
-	            $amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
-	            $totalpayment = $totalpayment + $amounts[$cursorfacid];
-	            if (! empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result=$tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
-	            if ($amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning=1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
-
-	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => $_POST[$key]);
-	        }
-			elseif (substr($key,0,21) == 'multicurrency_amount_')
-			{
-				$cursorfacid = substr($key,21);
-	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
-	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-	            if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result=$tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
-	            $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
-	            if ($multicurrency_amounts[$cursorfacid])
-	            {
-		            // Check amount
-		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
-		            {
-		                $addwarning=1;
-		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
-		            }
-		            // Check date
-		            if ($datepaye && ($datepaye < $tmpinvoice->date))
-		            {
-		            	$langs->load("errors");
-		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
-		            }
-	            }
-
-	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => GETPOST($key, 'int'));
-			}
-	    }
-
-	    // Check parameters
+    if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes'))
+    {
+        $error = 0;
+
+        $datepaye = dol_now();
+        $paiement_id = 0;
+        $totalpayment = 0;
+        $multicurrency_totalpayment = 0;
+        $atleastonepaymentnotnull = 0;
+
+        // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
+        $tmpinvoice=new Facture($db);
+        foreach ($_POST as $key => $value)
+        {
+            if (substr($key,0,7) == 'amount_')
+            {
+                $cursorfacid = substr($key,7);
+                $amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+                $totalpayment = $totalpayment + $amounts[$cursorfacid];
+                if (! empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+                $result=$tmpinvoice->fetch($cursorfacid);
+                if ($result <= 0) dol_print_error($db);
+                $amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
+                if ($amounts[$cursorfacid])
+                {
+                    // Check amount
+                    if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
+                    {
+                        $addwarning=1;
+                        $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
+                    }
+                    // Check date
+                    if ($datepaye && ($datepaye < $tmpinvoice->date))
+                    {
+                        $langs->load("errors");
+                        //$error++;
+                        setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+                    }
+                }
+
+                $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => $_POST[$key]);
+            }
+            elseif (substr($key,0,21) == 'multicurrency_amount_')
+            {
+                $cursorfacid = substr($key,21);
+                $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+                $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
+                if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+                $result=$tmpinvoice->fetch($cursorfacid);
+                if ($result <= 0) dol_print_error($db);
+                $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
+                if ($multicurrency_amounts[$cursorfacid])
+                {
+                    // Check amount
+                    if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
+                    {
+                        $addwarning=1;
+                        $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
+                    }
+                    // Check date
+                    if ($datepaye && ($datepaye < $tmpinvoice->date))
+                    {
+                        $langs->load("errors");
+                        //$error++;
+                        setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+                    }
+                }
+
+                $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => GETPOST($key, 'int'));
+            }
+        }
+
+        // Check parameters
 //	    if (! GETPOST('paiementcode'))
 //	    {
 //	        setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('PaymentMode')), null, 'errors');
 //	        $error++;
 //	    }
 
-	    if (! empty($conf->banque->enabled))
-	    {
-	        // If bank module is on, account is required to enter a payment
-	        if (GETPOST('accountid') <= 0)
-	        {
-	            setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
-	            $error++;
-	        }
-	    }
-
-	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
-	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->trans('PaymentAmount')), null, 'errors');
-	        $error++;
-	    }
+        if (! empty($conf->banque->enabled))
+        {
+            // If bank module is on, account is required to enter a payment
+            if (GETPOST('accountid') <= 0)
+            {
+                setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
+                $error++;
+            }
+        }
+
+        if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
+        {
+            setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->trans('PaymentAmount')), null, 'errors');
+            $error++;
+        }
 
 //	    if (empty($datepaye))
 //	    {
@@ -207,200 +207,200 @@ 
 //	        $error++;
 //	    }
 
-		// Check if payments in both currency
-		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
-		{
-			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
-	        $error++;
-		}
-	}
+        // Check if payments in both currency
+        if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
+        {
+            setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
+            $error++;
+        }
+    }
 
-	/*
+    /*
 	 * Action add_paiement
 	 */
-	if ($action == 'add_paiement') {
-	    if ($error) {
+    if ($action == 'add_paiement') {
+        if ($error) {
             $action = 'create';
             if (!$source) {
-			    setEventMessages($langs->transnoentities('NoSource'), null, 'errors');
-	        }
-	        $error++;
-	    }
-	    // Le reste propre a cette action s'affiche en bas de page.
-	}
-
-	/*
+                setEventMessages($langs->transnoentities('NoSource'), null, 'errors');
+            }
+            $error++;
+        }
+        // Le reste propre a cette action s'affiche en bas de page.
+    }
+
+    /*
 	 * Action confirm_paiement
 	 */
-	if ($action == 'confirm_paiement' && $confirm == 'yes')
-	{
+    if ($action == 'confirm_paiement' && $confirm == 'yes')
+    {
 
-		$error=0;
+        $error=0;
 
-		$datepaye = dol_now();
+        $datepaye = dol_now();
 
-		$db->begin();
+        $db->begin();
 
-		// Clean parameters amount if payment is for a credit note
-		if (GETPOST('type') == 2)
-		{
-			foreach ($amounts as $key => $value)	// How payment is dispatch
-			{
-				$newvalue = price2num($value,'MT');
-				$amounts[$key] = -$newvalue;
-			}
-
-			foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatch
-			{
-				$newvalue = price2num($value,'MT');
-				$multicurrency_amounts[$key] = -$newvalue;
-			}
-		}
-
-		if (! empty($conf->banque->enabled))
-		{
-			// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
-			if (GETPOST('accountid') <= 0)
-			{
-				setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
-				$error++;
-			}
-		}
+        // Clean parameters amount if payment is for a credit note
+        if (GETPOST('type') == 2)
+        {
+            foreach ($amounts as $key => $value)	// How payment is dispatch
+            {
+                $newvalue = price2num($value,'MT');
+                $amounts[$key] = -$newvalue;
+            }
 
-		$facture = new Facture($db);
-		$facture->fetch($facid);
-		$facture->fetch_thirdparty();
+            foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatch
+            {
+                $newvalue = price2num($value,'MT');
+                $multicurrency_amounts[$key] = -$newvalue;
+            }
+        }
 
-		$error = 0;
+        if (! empty($conf->banque->enabled))
+        {
+            // Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
+            if (GETPOST('accountid') <= 0)
+            {
+                setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
+                $error++;
+            }
+        }
 
-		if (is_object($stripe) && $stripeacc)
-		{
-			$customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
+        $facture = new Facture($db);
+        $facture->fetch($facid);
+        $facture->fetch_thirdparty();
 
-			if ($customerstripe->id) {
-				$listofsources=$customerstripe->sources->data;
-			}
-		}
+        $error = 0;
 
-		$stripeamount=0;
-		foreach ($amounts as $key => $value)	// How payment is dispatch
-		{
-			$stripeamount+=price2num($value,'MT');
-		}
+        if (is_object($stripe) && $stripeacc)
+        {
+            $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
 
-		if (preg_match('/acct_/i',$source))
-		{
-			$paiementcode ="VIR";
-		}
-		elseif (preg_match('/card_/i',$source))
-		{
-			$paiementcode ="CB";
-		}
-		elseif (preg_match('/src_/i',$source))
-		{
+            if ($customerstripe->id) {
+                $listofsources=$customerstripe->sources->data;
+            }
+        }
 
-		        $customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
-			$src = $customer2->sources->retrieve("$source");
-			if ($src->type=='card')
-			{
-				$paiementcode ="CB";
-			}
-		}
+        $stripeamount=0;
+        foreach ($amounts as $key => $value)	// How payment is dispatch
+        {
+            $stripeamount+=price2num($value,'MT');
+        }
 
+        if (preg_match('/acct_/i',$source))
+        {
+            $paiementcode ="VIR";
+        }
+        elseif (preg_match('/card_/i',$source))
+        {
+            $paiementcode ="CB";
+        }
+        elseif (preg_match('/src_/i',$source))
+        {
 
+                $customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
+            $src = $customer2->sources->retrieve("$source");
+            if ($src->type=='card')
+            {
+                $paiementcode ="CB";
+            }
+        }
 
-		$societe = new Societe($db);
-		$societe->fetch($facture->socid);
-		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
 
-		$stripecu = $stripe->getStripeCustomerAccount($societe->id, $servicestatus);		// Get thirdparty cu_...
 
-		$charge=$stripe->createPaymentStripe($stripeamount,$facture->multicurrency_code,"invoice",$facid,$source,$stripecu,$stripeacc,$servicestatus);
+        $societe = new Societe($db);
+        $societe->fetch($facture->socid);
+        dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
 
-		if (!$error)
-		{
-			// Creation of payment line
-			$paiement = new Paiement($db);
-			$paiement->datepaye     = $datepaye;
-			$paiement->amounts      = $amounts;   // Array with all payments dispatching
-			$paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
-			$paiement->paiementid   = dol_getIdFromCode($db,$paiementcode,'c_paiement');
-			$paiement->num_paiement = $charge->message;
-			$paiement->note         = GETPOST('comment');
-			$paiement->ext_payment_id = $charge->id;
-			$paiement->ext_payment_site = $service;
-		}
-
-		if (! $error)
-		{
+        $stripecu = $stripe->getStripeCustomerAccount($societe->id, $servicestatus);		// Get thirdparty cu_...
 
-			$paiement_id = $paiement->create($user, 0);
-			if ($paiement_id < 0)
-			{
-				setEventMessages($paiement->error, $paiement->errors, 'errors');
-				$error++;
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($facture->lines))
-			{
-				$outputlangs = $langs;
-				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $facture->thirdparty->default_lang;
-				if (! empty($newlang)) {
-					$outputlangs = new Translate("", $conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-				$model=$facture->modelpdf;
-				$ret = $facture->fetch($facid); // Reload to get new records
-
-				$facture->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-		}
-
-		if (! $error)
-		{
-			$label='(CustomerInvoicePayment)';
-			if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
-			$result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),'','');
-			if ($result < 0)
-			{
-				setEventMessages($paiement->error, $paiement->errors, 'errors');
-				$error++;
-			}
-			elseif (GETPOST('closepaidinvoices')=='on') {
-				$facture->set_paid($user);
-			}
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-
-			// If payment dispatching on more than one invoice, we keep on summary page, otherwise go on invoice card
-			$invoiceid=0;
-			foreach ($paiement->amounts as $key => $amount)
-			{
-				$facid = $key;
-				if (is_numeric($amount) && $amount <> 0)
-				{
-					if ($invoiceid != 0) $invoiceid=-1; // There is more than one invoice payed by this payment
-					else $invoiceid=$facid;
-				}
-			}
-			if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
-			else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
-			header('Location: '.$loc);
-			exit;
-		}
-		else
-		{
-			$loc = DOL_URL_ROOT.'/stripe/payment.php?facid='.$facid.'&action=create&error='.$charge->message;
-			$db->rollback();
+        $charge=$stripe->createPaymentStripe($stripeamount,$facture->multicurrency_code,"invoice",$facid,$source,$stripecu,$stripeacc,$servicestatus);
+
+        if (!$error)
+        {
+            // Creation of payment line
+            $paiement = new Paiement($db);
+            $paiement->datepaye     = $datepaye;
+            $paiement->amounts      = $amounts;   // Array with all payments dispatching
+            $paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
+            $paiement->paiementid   = dol_getIdFromCode($db,$paiementcode,'c_paiement');
+            $paiement->num_paiement = $charge->message;
+            $paiement->note         = GETPOST('comment');
+            $paiement->ext_payment_id = $charge->id;
+            $paiement->ext_payment_site = $service;
+        }
+
+        if (! $error)
+        {
+
+            $paiement_id = $paiement->create($user, 0);
+            if ($paiement_id < 0)
+            {
+                setEventMessages($paiement->error, $paiement->errors, 'errors');
+                $error++;
+            }
+            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($facture->lines))
+            {
+                $outputlangs = $langs;
+                $newlang = '';
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+                if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $facture->thirdparty->default_lang;
+                if (! empty($newlang)) {
+                    $outputlangs = new Translate("", $conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+                $model=$facture->modelpdf;
+                $ret = $facture->fetch($facid); // Reload to get new records
+
+                $facture->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+            }
+        }
+
+        if (! $error)
+        {
+            $label='(CustomerInvoicePayment)';
+            if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
+            $result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),'','');
+            if ($result < 0)
+            {
+                setEventMessages($paiement->error, $paiement->errors, 'errors');
+                $error++;
+            }
+            elseif (GETPOST('closepaidinvoices')=='on') {
+                $facture->set_paid($user);
+            }
+        }
+
+        if (! $error)
+        {
+            $db->commit();
+
+            // If payment dispatching on more than one invoice, we keep on summary page, otherwise go on invoice card
+            $invoiceid=0;
+            foreach ($paiement->amounts as $key => $amount)
+            {
+                $facid = $key;
+                if (is_numeric($amount) && $amount <> 0)
+                {
+                    if ($invoiceid != 0) $invoiceid=-1; // There is more than one invoice payed by this payment
+                    else $invoiceid=$facid;
+                }
+            }
+            if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
+            else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+            header('Location: '.$loc);
+            exit;
+        }
+        else
+        {
+            $loc = DOL_URL_ROOT.'/stripe/payment.php?facid='.$facid.'&action=create&error='.$charge->message;
+            $db->rollback();
 
-			header('Location: '.$loc);
-			exit;
-		}
-	}
+            header('Location: '.$loc);
+            exit;
+        }
+    }
 }
 
 
@@ -413,46 +413,46 @@ 
 llxHeader();
 
 if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha')) {
-	$service = 'StripeLive';
-	$servicestatus = 0;
+    $service = 'StripeLive';
+    $servicestatus = 0;
 } else {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+    dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
 }
 
 if (GETPOST('error')){
-	setEventMessages(GETPOST('error'), null, 'errors');
+    setEventMessages(GETPOST('error'), null, 'errors');
 }
 
 if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
 {
-	$facture = new Facture($db);
-	$result=$facture->fetch($facid);
+    $facture = new Facture($db);
+    $result=$facture->fetch($facid);
 
-	if ($result >= 0)
-	{
-		$facture->fetch_thirdparty();
+    if ($result >= 0)
+    {
+        $facture->fetch_thirdparty();
 
-		$title='';
-		if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
-		if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer");
-		print load_fiche_titre($title);
+        $title='';
+        if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
+        if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer");
+        print load_fiche_titre($title);
 
-		// Initialize data for confirmation (this is used because data can be change during confirmation)
-		if ($action == 'add_paiement')
-		{
-			$i=0;
+        // Initialize data for confirmation (this is used because data can be change during confirmation)
+        if ($action == 'add_paiement')
+        {
+            $i=0;
 
-			$formquestion[$i++]=array('type' => 'hidden','name' => 'facid', 'value' => $facture->id);
-			$formquestion[$i++]=array('type' => 'hidden','name' => 'socid', 'value' => $facture->socid);
-			$formquestion[$i++]=array('type' => 'hidden','name' => 'type',  'value' => $facture->type);
-		}
+            $formquestion[$i++]=array('type' => 'hidden','name' => 'facid', 'value' => $facture->id);
+            $formquestion[$i++]=array('type' => 'hidden','name' => 'socid', 'value' => $facture->socid);
+            $formquestion[$i++]=array('type' => 'hidden','name' => 'type',  'value' => $facture->type);
+        }
 
 
-		// Add realtime total information
-		if ($conf->use_javascript_ajax)
-		{
-			print "\n".'<script type="text/javascript" language="javascript">';
-			print '$(document).ready(function () {
+        // Add realtime total information
+        if ($conf->use_javascript_ajax)
+        {
+            print "\n".'<script type="text/javascript" language="javascript">';
+            print '$(document).ready(function () {
             			setPaiementCode();
 
             			$("#selectpaiementcode").change(function() {
@@ -538,32 +538,32 @@ 
 						});
 			';
 
-			print '	});'."\n";
-			if (!empty($conf->use_javascript_ajax)){
-				//Add js for AutoFill
-				print ' $(document).ready(function () {';
-				print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+            print '	});'."\n";
+            if (!empty($conf->use_javascript_ajax)){
+                //Add js for AutoFill
+                print ' $(document).ready(function () {';
+                print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
 								$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
 							});';
-				print '	});'."\n";
-			}
-			print '	</script>'."\n";
-		}
+                print '	});'."\n";
+            }
+            print '	</script>'."\n";
+        }
 
-		print '<form id="payment_form" name="add_paiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="action" value="add_paiement">';
-		print '<input type="hidden" name="facid" value="'.$facture->id.'">';
-		print '<input type="hidden" name="socid" value="'.$facture->socid.'">';
-		print '<input type="hidden" name="type" id="invoice_type" value="'.$facture->type.'">';
-		print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($facture->thirdparty->name).'">';
+        print '<form id="payment_form" name="add_paiement" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="add_paiement">';
+        print '<input type="hidden" name="facid" value="'.$facture->id.'">';
+        print '<input type="hidden" name="socid" value="'.$facture->socid.'">';
+        print '<input type="hidden" name="type" id="invoice_type" value="'.$facture->type.'">';
+        print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($facture->thirdparty->name).'">';
 
-		dol_fiche_head();
+        dol_fiche_head();
 
-		print '<table class="border" width="100%">';
+        print '<table class="border" width="100%">';
 
-		// Invoice
-		/*if ($facture->id > 0)
+        // Invoice
+        /*if ($facture->id > 0)
 		{
 			print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans('Invoice').'</span></td><td>'.$facture->getNomUrl(4)."</td></tr>\n";
 		}*/
@@ -600,10 +600,10 @@ 
         //print '</td>';
         //print '<td><input name="chqbank" size="30" type="text" value="'.GETPOST('chqbank').'"></td></tr>';
 
-		// Comments
-		print '<tr><td>'.$langs->trans('Comments').'</td>';
-		print '<td class="tdtop">';
-		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment','none').'</textarea></td></tr>';
+        // Comments
+        print '<tr><td>'.$langs->trans('Comments').'</td>';
+        print '<td class="tdtop">';
+        print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment','none').'</textarea></td></tr>';
 
         print '</table>';
 
@@ -766,16 +766,16 @@ 
         $sql.= ' f.datef as df, f.fk_soc as socid';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 
-		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS)) {
-			$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON (f.fk_soc = s.rowid)';
-		}
+        if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS)) {
+            $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON (f.fk_soc = s.rowid)';
+        }
 
-		$sql.= ' WHERE f.entity = '.$conf->entity;
+        $sql.= ' WHERE f.entity = '.$conf->entity;
         $sql.= ' AND (f.fk_soc = '.$facture->socid;
 
-		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
-			$sql.= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
-		}
+        if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
+            $sql.= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
+        }
 
         $sql.= ') AND f.paye = 0';
         $sql.= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
@@ -797,17 +797,17 @@ 
             $num = $db->num_rows($resql);
             if ($num > 0)
             {
-            	$sign=1;
-            	if ($facture->type == 2) $sign=-1;
-
-				$arraytitle=$langs->trans('Invoice');
-				if ($facture->type == 2) $arraytitle=$langs->trans("CreditNotes");
-				$alreadypayedlabel=$langs->trans('Received');
-				$multicurrencyalreadypayedlabel=$langs->trans('MulticurrencyReceived');
-				if ($facture->type == 2) { $alreadypayedlabel=$langs->trans("PaidBack"); $multicurrencyalreadypayedlabel=$langs->trans("MulticurrencyPaidBack"); }
-				$remaindertopay=$langs->trans('RemainderToTake');
-				$multicurrencyremaindertopay=$langs->trans('MulticurrencyRemainderToTake');
-				if ($facture->type == 2) { $remaindertopay=$langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay=$langs->trans("MulticurrencyRemainderToPayBack"); }
+                $sign=1;
+                if ($facture->type == 2) $sign=-1;
+
+                $arraytitle=$langs->trans('Invoice');
+                if ($facture->type == 2) $arraytitle=$langs->trans("CreditNotes");
+                $alreadypayedlabel=$langs->trans('Received');
+                $multicurrencyalreadypayedlabel=$langs->trans('MulticurrencyReceived');
+                if ($facture->type == 2) { $alreadypayedlabel=$langs->trans("PaidBack"); $multicurrencyalreadypayedlabel=$langs->trans("MulticurrencyPaidBack"); }
+                $remaindertopay=$langs->trans('RemainderToTake');
+                $multicurrencyremaindertopay=$langs->trans('MulticurrencyRemainderToTake');
+                if ($facture->type == 2) { $remaindertopay=$langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay=$langs->trans("MulticurrencyRemainderToPayBack"); }
 
                 $i = 0;
                 //print '<tr><td colspan="3">';
@@ -842,8 +842,8 @@ 
                 {
                     $objp = $db->fetch_object($resql);
 
-					$soc = new Societe($db);
-					$soc->fetch($objp->socid);
+                    $soc = new Societe($db);
+                    $soc->fetch($objp->socid);
 
                     $invoice=new Facture($db);
                     $invoice->fetch($objp->facid);
@@ -853,15 +853,15 @@ 
                     $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
                     $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
 
-					// Multicurrency Price
-					if (!empty($conf->multicurrency->enabled))
-					{
-						$multicurrency_payment = $invoice->getSommePaiement(1);
-						$multicurrency_creditnotes=$invoice->getSumCreditNotesUsed(1);
-						$multicurrency_deposits=$invoice->getSumDepositsUsed(1);
-						$multicurrency_alreadypayed=price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits,'MT');
-	                    $multicurrency_remaintopay=price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits,'MT');
-					}
+                    // Multicurrency Price
+                    if (!empty($conf->multicurrency->enabled))
+                    {
+                        $multicurrency_payment = $invoice->getSommePaiement(1);
+                        $multicurrency_creditnotes=$invoice->getSumCreditNotesUsed(1);
+                        $multicurrency_deposits=$invoice->getSumDepositsUsed(1);
+                        $multicurrency_alreadypayed=price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits,'MT');
+                        $multicurrency_remaintopay=price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits,'MT');
+                    }
 
                     print '<tr class="oddeven">';
 
@@ -876,30 +876,30 @@ 
                     // Currency
                     if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$objp->multicurrency_code."</td>\n";
 
-					// Multicurrency Price
-					if (!empty($conf->multicurrency->enabled))
-					{
-					    print '<td align="right">';
-					    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
-					    print '</td>';
-
-                    	// Multicurrency Price
-						print '<td align="right">';
-						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-						{
-						    print price($sign * $multicurrency_payment);
-    		                if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
-    		                if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
-						}
-		                print '</td>';
-
-    					// Multicurrency Price
-    				    print '<td align="right">';
-    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
-    				    print '</td>';
-					}
+                    // Multicurrency Price
+                    if (!empty($conf->multicurrency->enabled))
+                    {
+                        print '<td align="right">';
+                        if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+                        print '</td>';
+
+                        // Multicurrency Price
+                        print '<td align="right">';
+                        if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+                        {
+                            print price($sign * $multicurrency_payment);
+                            if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
+                            if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
+                        }
+                        print '</td>';
+
+                        // Multicurrency Price
+                        print '<td align="right">';
+                        if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+                        print '</td>';
+                    }
 
-					// Price
+                    // Price
                     print '<td align="right">'.price($sign * $objp->total_ttc).'</td>';
 
                     // Received or paid back
@@ -922,7 +922,7 @@ 
                     if ($action != 'add_paiement')
                     {
                         if (!empty($conf->use_javascript_ajax))
-							print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+                            print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
                         print '<input type=hidden class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
                         print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                     }
@@ -933,45 +933,45 @@ 
                     }
                     print "</td>";
 
-					// Multicurrency Price
-					if (! empty($conf->multicurrency->enabled))
-					{
-						print '<td align="right">';
-
-						// Add remind multicurrency amount
-	                    $namef = 'multicurrency_amount_'.$objp->facid;
-	                    $nameRemain = 'multicurrency_remain_'.$objp->facid;
-
-	                    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-	                    {
-    	                    if ($action != 'add_paiement')
-    	                    {
-    	                        if (!empty($conf->use_javascript_ajax))
-    								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
-    	                        print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-    	                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-    	                    }
-    	                    else
-    	                    {
-    	                        print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
-    	                        print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
-    	                    }
-	                    }
-	                    print "</td>";
-					}
+                    // Multicurrency Price
+                    if (! empty($conf->multicurrency->enabled))
+                    {
+                        print '<td align="right">';
+
+                        // Add remind multicurrency amount
+                        $namef = 'multicurrency_amount_'.$objp->facid;
+                        $nameRemain = 'multicurrency_remain_'.$objp->facid;
+
+                        if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+                        {
+                            if ($action != 'add_paiement')
+                            {
+                                if (!empty($conf->use_javascript_ajax))
+                                    print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+                                print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
+                                print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
+                            }
+                            else
+                            {
+                                print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
+                                print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+                            }
+                        }
+                        print "</td>";
+                    }
 
                     // Warning
                     print '<td align="center" width="16">';
                     //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
                     if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
-                    	|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
+                        || $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
                     {
                         print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
                     }
                     print '</td>';
 
-					$parameters=array();
-					$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$objp,$action); // Note that $action and $object may have been modified by hook
+                    $parameters=array();
+                    $reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$objp,$action); // Note that $action and $object may have been modified by hook
 
                     print "</tr>\n";
 
@@ -988,19 +988,19 @@ 
                     // Print total
                     print '<tr class="liste_total">';
                     print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+                    if (!empty($conf->multicurrency->enabled)) {
+                        print '<td></td>';
+                        print '<td></td>';
                         print '<td></td>';
-					    print '<td></td>';
-					    print '<td></td>';
                     }
-					print '<td align="right"><b>'.price($sign * $total_ttc).'</b></td>';
+                    print '<td align="right"><b>'.price($sign * $total_ttc).'</b></td>';
                     print '<td align="right"><b>'.price($sign * $totalrecu);
                     if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
                     if ($totalrecudeposits) print '+'.price($totalrecudeposits);
                     print '</b></td>';
                     print '<td align="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits,'MT')).'</b></td>';
                     print '<td align="right" id="result" style="font-weight: bold;"></td>';
-					if (!empty($conf->multicurrency->enabled)) {
+                    if (!empty($conf->multicurrency->enabled)) {
                         print '<td align="right" id="multicurrency_result" style="font-weight: bold;"></td>';
                     }
                     print "</tr>\n";
@@ -1011,7 +1011,7 @@ 
             $db->free($resql);
         }
         else
-		{
+        {
             dol_print_error($db);
         }
 
@@ -1019,13 +1019,13 @@ 
         // Bouton Enregistrer
         if ($action != 'add_paiement')
         {
-        	$checkboxlabel=$langs->trans("ClosePaidInvoicesAutomatically");
-        	if ($facture->type == 2) $checkboxlabel=$langs->trans("ClosePaidCreditNotesAutomatically");
-        	$buttontitle=$langs->trans('ToMakePayment');
-        	if ($facture->type == 2) $buttontitle=$langs->trans('ToMakePaymentBack');
+            $checkboxlabel=$langs->trans("ClosePaidInvoicesAutomatically");
+            if ($facture->type == 2) $checkboxlabel=$langs->trans("ClosePaidCreditNotesAutomatically");
+            $buttontitle=$langs->trans('ToMakePayment');
+            if ($facture->type == 2) $buttontitle=$langs->trans('ToMakePaymentBack');
 
-        	print '<br><div class="center">';
-        	print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
+            print '<br><div class="center">';
+            print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
             /*if (! empty($conf->prelevement->enabled))
             {
                 $langs->load("withdrawals");
@@ -1044,9 +1044,9 @@ 
             if (!empty($totalpayment)) {
                 $text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
             }
-			if (!empty($multicurrency_totalpayment)) {
-				$text.='<br>'.$langs->trans('ConfirmCustomerPayment', $multicurrency_totalpayment, $langs->trans("paymentInInvoiceCurrency"));
-			}
+            if (!empty($multicurrency_totalpayment)) {
+                $text.='<br>'.$langs->trans('ConfirmCustomerPayment', $multicurrency_totalpayment, $langs->trans("paymentInInvoiceCurrency"));
+            }
             if (GETPOST('closepaidinvoices'))
             {
                 $text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
@@ -1099,7 +1099,7 @@ 
         print_liste_field_titre('Date',$_SERVER["PHP_SELF"],'dp','','','',$sortfield,$sortorder);
         print_liste_field_titre('Type',$_SERVER["PHP_SELF"],'libelle','','','',$sortfield,$sortorder);
         print_liste_field_titre('Amount',$_SERVER["PHP_SELF"],'fa_amount','','','align="right"',$sortfield,$sortorder);
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+        print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
         print "</tr>\n";
 
         while ($i < min($num,$limit))
@@ -1111,8 +1111,8 @@ 
             print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
             print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
 
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$objp,$action); // Note that $action and $object may have been modified by hook
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$objp,$action); // Note that $action and $object may have been modified by hook
 
             print '</tr>';
             $i++;

Braces +118 added lines, -58 removed lines

@@ -102,7 +102,9 @@ 
 
 $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))
 {
@@ -125,9 +127,13 @@ 
 	            $cursorfacid = substr($key,7);
 	            $amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
 	            $totalpayment = $totalpayment + $amounts[$cursorfacid];
-	            if (! empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+	            if (! empty($amounts[$cursorfacid])) {
+	                $atleastonepaymentnotnull++;
+	            }
 	            $result=$tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
+	            if ($result <= 0) {
+	                dol_print_error($db);
+	            }
 	            $amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
 	            if ($amounts[$cursorfacid])
 	            {
@@ -147,15 +153,18 @@ 
 	            }
 
 	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => $_POST[$key]);
-	        }
-			elseif (substr($key,0,21) == 'multicurrency_amount_')
+	        } elseif (substr($key,0,21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key,21);
 	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
 	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-	            if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+	            if (! empty($multicurrency_amounts[$cursorfacid])) {
+	                $atleastonepaymentnotnull++;
+	            }
 	            $result=$tmpinvoice->fetch($cursorfacid);
-	            if ($result <= 0) dol_print_error($db);
+	            if ($result <= 0) {
+	                dol_print_error($db);
+	            }
 	            $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
 	            if ($multicurrency_amounts[$cursorfacid])
 	            {
@@ -244,15 +253,19 @@ 
 		// Clean parameters amount if payment is for a credit note
 		if (GETPOST('type') == 2)
 		{
-			foreach ($amounts as $key => $value)	// How payment is dispatch
+			foreach ($amounts as $key => $value) {
+			    // How payment is dispatch
 			{
 				$newvalue = price2num($value,'MT');
+			}
 				$amounts[$key] = -$newvalue;
 			}
 
-			foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatch
+			foreach ($multicurrency_amounts as $key => $value) {
+			    // How payment is dispatch
 			{
 				$newvalue = price2num($value,'MT');
+			}
 				$multicurrency_amounts[$key] = -$newvalue;
 			}
 		}
@@ -283,20 +296,20 @@ 
 		}
 
 		$stripeamount=0;
-		foreach ($amounts as $key => $value)	// How payment is dispatch
+		foreach ($amounts as $key => $value) {
+		    // How payment is dispatch
 		{
 			$stripeamount+=price2num($value,'MT');
 		}
+		}
 
 		if (preg_match('/acct_/i',$source))
 		{
 			$paiementcode ="VIR";
-		}
-		elseif (preg_match('/card_/i',$source))
+		} elseif (preg_match('/card_/i',$source))
 		{
 			$paiementcode ="CB";
-		}
-		elseif (preg_match('/src_/i',$source))
+		} elseif (preg_match('/src_/i',$source))
 		{
 
 		        $customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
@@ -344,8 +357,12 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $facture->thirdparty->default_lang;
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+				    $newlang = GETPOST('lang_id','aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				    $newlang = $facture->thirdparty->default_lang;
+				}
 				if (! empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -360,14 +377,15 @@ 
 		if (! $error)
 		{
 			$label='(CustomerInvoicePayment)';
-			if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
+			if (GETPOST('type') == 2) {
+			    $label='(CustomerInvoicePaymentBack)';
+			}
 			$result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),'','');
 			if ($result < 0)
 			{
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
-			}
-			elseif (GETPOST('closepaidinvoices')=='on') {
+			} elseif (GETPOST('closepaidinvoices')=='on') {
 				$facture->set_paid($user);
 			}
 		}
@@ -383,16 +401,23 @@ 
 				$facid = $key;
 				if (is_numeric($amount) && $amount <> 0)
 				{
-					if ($invoiceid != 0) $invoiceid=-1; // There is more than one invoice payed by this payment
-					else $invoiceid=$facid;
+					if ($invoiceid != 0) {
+					    $invoiceid=-1;
+					}
+					// There is more than one invoice payed by this payment
+					else {
+					    $invoiceid=$facid;
+					}
 				}
 			}
-			if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
-			else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+			if ($invoiceid > 0) {
+			    $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
+			} else {
+			    $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+			}
 			header('Location: '.$loc);
 			exit;
-		}
-		else
+		} else
 		{
 			$loc = DOL_URL_ROOT.'/stripe/payment.php?facid='.$facid.'&action=create&error='.$charge->message;
 			$db->rollback();
@@ -433,8 +458,12 @@ 
 		$facture->fetch_thirdparty();
 
 		$title='';
-		if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
-		if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer");
+		if ($facture->type != 2) {
+		    $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
+		}
+		if ($facture->type == 2) {
+		    $title.=$langs->trans("EnterPaymentDueToCustomer");
+		}
 		print load_fiche_titre($title);
 
 		// Initialize data for confirmation (this is used because data can be change during confirmation)
@@ -576,8 +605,7 @@ 
         {
             //$form->select_comptes($accountid,'accountid',0,'',2);
             print '<input name="accountid" type="hidden" value="'.$conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS.'">';
-        }
-        else
+        } else
         {
             print '<input name="accountid" type="hidden" value="'.$conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS.'">';
         }
@@ -782,8 +810,7 @@ 
         if ($facture->type != 2)
         {
             $sql .= ' AND type IN (0,1,3,5)';	// Standard invoice, replacement, deposit, situation
-        }
-        else
+        } else
         {
             $sql .= ' AND type = 2';		// If paying back a credit note, we show all credit notes
         }
@@ -798,10 +825,14 @@ 
             if ($num > 0)
             {
             	$sign=1;
-            	if ($facture->type == 2) $sign=-1;
+            	if ($facture->type == 2) {
+            	    $sign=-1;
+            	}
 
 				$arraytitle=$langs->trans('Invoice');
-				if ($facture->type == 2) $arraytitle=$langs->trans("CreditNotes");
+				if ($facture->type == 2) {
+				    $arraytitle=$langs->trans("CreditNotes");
+				}
 				$alreadypayedlabel=$langs->trans('Received');
 				$multicurrencyalreadypayedlabel=$langs->trans('MulticurrencyReceived');
 				if ($facture->type == 2) { $alreadypayedlabel=$langs->trans("PaidBack"); $multicurrencyalreadypayedlabel=$langs->trans("MulticurrencyPaidBack"); }
@@ -867,20 +898,26 @@ 
 
                     print '<td>';
                     print $invoice->getNomUrl(1,'');
-                    if($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
+                    if($objp->socid != $facture->thirdparty->id) {
+                        print ' - '.$soc->getNomUrl(1).' ';
+                    }
                     print "</td>\n";
 
                     // Date
                     print '<td align="center">'.dol_print_date($db->jdate($objp->df),'day')."</td>\n";
 
                     // Currency
-                    if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$objp->multicurrency_code."</td>\n";
+                    if (!empty($conf->multicurrency->enabled)) {
+                        print '<td align="center">'.$objp->multicurrency_code."</td>\n";
+                    }
 
 					// Multicurrency Price
 					if (!empty($conf->multicurrency->enabled))
 					{
 					    print '<td align="right">';
-					    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+					    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
+					        print price($sign * $objp->multicurrency_total_ttc);
+					    }
 					    print '</td>';
 
                     	// Multicurrency Price
@@ -888,14 +925,20 @@ 
 						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
 						{
 						    print price($sign * $multicurrency_payment);
-    		                if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
-    		                if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
+    		                if ($multicurrency_creditnotes) {
+    		                    print '+'.price($multicurrency_creditnotes);
+    		                }
+    		                if ($multicurrency_deposits) {
+    		                    print '+'.price($multicurrency_deposits);
+    		                }
 						}
 		                print '</td>';
 
     					// Multicurrency Price
     				    print '<td align="right">';
-    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
+    				        print price($sign * $multicurrency_remaintopay);
+    				    }
     				    print '</td>';
 					}
 
@@ -904,8 +947,12 @@ 
 
                     // Received or paid back
                     print '<td align="right">'.price($sign * $paiement);
-                    if ($creditnotes) print '+'.price($creditnotes);
-                    if ($deposits) print '+'.price($deposits);
+                    if ($creditnotes) {
+                        print '+'.price($creditnotes);
+                    }
+                    if ($deposits) {
+                        print '+'.price($deposits);
+                    }
                     print '</td>';
 
                     // Remain to take or to pay back
@@ -921,12 +968,12 @@ 
 
                     if ($action != 'add_paiement')
                     {
-                        if (!empty($conf->use_javascript_ajax))
-							print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+                        if (!empty($conf->use_javascript_ajax)) {
+                        							print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+                        }
                         print '<input type=hidden class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
                         print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
-                    }
-                    else
+                    } else
                     {
                         print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
                         print '<input type="hidden" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
@@ -946,12 +993,12 @@ 
 	                    {
     	                    if ($action != 'add_paiement')
     	                    {
-    	                        if (!empty($conf->use_javascript_ajax))
-    								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+    	                        if (!empty($conf->use_javascript_ajax)) {
+    	                            								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+    	                        }
     	                        print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
     	                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-    	                    }
-    	                    else
+    	                    } else
     	                    {
     	                        print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
     	                        print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
@@ -995,8 +1042,12 @@ 
                     }
 					print '<td align="right"><b>'.price($sign * $total_ttc).'</b></td>';
                     print '<td align="right"><b>'.price($sign * $totalrecu);
-                    if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
-                    if ($totalrecudeposits) print '+'.price($totalrecudeposits);
+                    if ($totalrecucreditnote) {
+                        print '+'.price($totalrecucreditnote);
+                    }
+                    if ($totalrecudeposits) {
+                        print '+'.price($totalrecudeposits);
+                    }
                     print '</b></td>';
                     print '<td align="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits,'MT')).'</b></td>';
                     print '<td align="right" id="result" style="font-weight: bold;"></td>';
@@ -1009,8 +1060,7 @@ 
                 //print "</td></tr>\n";
             }
             $db->free($resql);
-        }
-        else
+        } else
 		{
             dol_print_error($db);
         }
@@ -1020,9 +1070,13 @@ 
         if ($action != 'add_paiement')
         {
         	$checkboxlabel=$langs->trans("ClosePaidInvoicesAutomatically");
-        	if ($facture->type == 2) $checkboxlabel=$langs->trans("ClosePaidCreditNotesAutomatically");
+        	if ($facture->type == 2) {
+        	    $checkboxlabel=$langs->trans("ClosePaidCreditNotesAutomatically");
+        	}
         	$buttontitle=$langs->trans('ToMakePayment');
-        	if ($facture->type == 2) $buttontitle=$langs->trans('ToMakePaymentBack');
+        	if ($facture->type == 2) {
+        	    $buttontitle=$langs->trans('ToMakePaymentBack');
+        	}
 
         	print '<br><div class="center">';
         	print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
@@ -1066,12 +1120,18 @@ 
 
 if (! GETPOST('action'))
 {
-    if ($page == -1) $page = 0 ;
+    if ($page == -1) {
+        $page = 0 ;
+    }
     $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
     $offset = $limit * $page ;
 
-    if (! $sortorder) $sortorder='DESC';
-    if (! $sortfield) $sortfield='p.datep';
+    if (! $sortorder) {
+        $sortorder='DESC';
+    }
+    if (! $sortfield) {
+        $sortfield='p.datep';
+    }
 
     $sql = 'SELECT p.datep as dp, p.amount, f.amount as fa_amount, f.ref';
     $sql.=', f.rowid as facid, c.libelle as paiement_type, p.num_paiement';

Spacing +205 added lines, -205 removed lines

@@ -35,7 +35,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/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
@@ -47,70 +47,70 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'banks', 'multicurrency', 'stripe'));
 
-$action		= GETPOST('action','alpha');
+$action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm');
 
-$facid		= GETPOST('facid','int');
+$facid		= GETPOST('facid', 'int');
 $socname	= GETPOST('socname');
 $source = GETPOST('source_id');
 $accountid	= GETPOST('accountid');
 $paymentnum = GETPOST('num_paiement');
 
-$sortfield	= GETPOST('sortfield','alpha');
-$sortorder	= GETPOST('sortorder','alpha');
-$page		= GETPOST('page','int');
+$sortfield	= GETPOST('sortfield', 'alpha');
+$sortorder	= GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 
-$amounts=array();
-$amountsresttopay=array();
-$addwarning=0;
+$amounts = array();
+$amountsresttopay = array();
+$addwarning = 0;
 
-$multicurrency_amounts=array();
-$multicurrency_amountsresttopay=array();
+$multicurrency_amounts = array();
+$multicurrency_amountsresttopay = array();
 
 // Security check
-$socid=0;
+$socid = 0;
 if ($user->societe_id > 0)
 {
     $socid = $user->societe_id;
 }
 
-$object=new Facture($db);
+$object = new Facture($db);
 
 // Load object
 if ($facid > 0)
 {
-	$ret=$object->fetch($facid);
+	$ret = $object->fetch($facid);
 }
 
-if (! empty($conf->stripe->enabled))
+if (!empty($conf->stripe->enabled))
 {
 	$service = 'StripeTest';
 	$servicestatus = 0;
-	if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
+	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
 	{
 		$service = 'StripeLive';
 		$servicestatus = 0;
 	}
 
-	$stripe=new Stripe($db);
-	$stripeacc = $stripe->getStripeAccount($service);								// Stripe OAuth connect account of dolibarr user (no network access here)
+	$stripe = new Stripe($db);
+	$stripeacc = $stripe->getStripeAccount($service); // Stripe OAuth connect account of dolibarr user (no network access here)
 }
 
 // Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('paiementcard','globalcard'));
+$hookmanager->initHooks(array('paiementcard', 'globalcard'));
 
 
 /*
  * Actions
  */
 
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$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 (empty($reshook))
 {
-	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm=='yes'))
+	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
 	{
 	    $error = 0;
 
@@ -121,24 +121,24 @@ 
 	    $atleastonepaymentnotnull = 0;
 
 	    // Generate payment array and check if there is payment higher than invoice and payment date before invoice date
-	    $tmpinvoice=new Facture($db);
+	    $tmpinvoice = new Facture($db);
 	    foreach ($_POST as $key => $value)
 	    {
-	        if (substr($key,0,7) == 'amount_')
+	        if (substr($key, 0, 7) == 'amount_')
 	        {
-	            $cursorfacid = substr($key,7);
+	            $cursorfacid = substr($key, 7);
 	            $amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
 	            $totalpayment = $totalpayment + $amounts[$cursorfacid];
-	            if (! empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result=$tmpinvoice->fetch($cursorfacid);
+	            if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+	            $result = $tmpinvoice->fetch($cursorfacid);
 	            if ($result <= 0) dol_print_error($db);
-	            $amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
+	            $amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
 	            if ($amounts[$cursorfacid])
 	            {
 		            // Check amount
 		            if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
 		            {
-		                $addwarning=1;
+		                $addwarning = 1;
 		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
 		            }
 		            // Check date
@@ -146,27 +146,27 @@ 
 		            {
 		            	$langs->load("errors");
 		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
 		            }
 	            }
 
-	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => $_POST[$key]);
+	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
 	        }
-			elseif (substr($key,0,21) == 'multicurrency_amount_')
+			elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
-				$cursorfacid = substr($key,21);
+				$cursorfacid = substr($key, 21);
 	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
 	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-	            if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
-	            $result=$tmpinvoice->fetch($cursorfacid);
+	            if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+	            $result = $tmpinvoice->fetch($cursorfacid);
 	            if ($result <= 0) dol_print_error($db);
-	            $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
+	            $multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
 	            if ($multicurrency_amounts[$cursorfacid])
 	            {
 		            // Check amount
 		            if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
 		            {
-		                $addwarning=1;
+		                $addwarning = 1;
 		                $formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
 		            }
 		            // Check date
@@ -174,11 +174,11 @@ 
 		            {
 		            	$langs->load("errors");
 		                //$error++;
-		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye,'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
+		                setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
 		            }
 	            }
 
-	            $formquestion[$i++]=array('type' => 'hidden','name' => $key,  'value' => GETPOST($key, 'int'));
+	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
 			}
 	    }
 
@@ -189,19 +189,19 @@ 
 //	        $error++;
 //	    }
 
-	    if (! empty($conf->banque->enabled))
+	    if (!empty($conf->banque->enabled))
 	    {
 	        // If bank module is on, account is required to enter a payment
 	        if (GETPOST('accountid') <= 0)
 	        {
-	            setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
+	            setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
 	            $error++;
 	        }
 	    }
 
 	    if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
 	    {
-	        setEventMessages($langs->transnoentities('ErrorFieldRequired',$langs->trans('PaymentAmount')), null, 'errors');
+	        setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
 	        $error++;
 	    }
 
@@ -239,7 +239,7 @@ 
 	if ($action == 'confirm_paiement' && $confirm == 'yes')
 	{
 
-		$error=0;
+		$error = 0;
 
 		$datepaye = dol_now();
 
@@ -250,23 +250,23 @@ 
 		{
 			foreach ($amounts as $key => $value)	// How payment is dispatch
 			{
-				$newvalue = price2num($value,'MT');
+				$newvalue = price2num($value, 'MT');
 				$amounts[$key] = -$newvalue;
 			}
 
 			foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatch
 			{
-				$newvalue = price2num($value,'MT');
+				$newvalue = price2num($value, 'MT');
 				$multicurrency_amounts[$key] = -$newvalue;
 			}
 		}
 
-		if (! empty($conf->banque->enabled))
+		if (!empty($conf->banque->enabled))
 		{
 			// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
 			if (GETPOST('accountid') <= 0)
 			{
-				setEventMessages($langs->trans('ErrorFieldRequired',$langs->transnoentities('AccountToCredit')), null, 'errors');
+				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
 				$error++;
 			}
 		}
@@ -279,35 +279,35 @@ 
 
 		if (is_object($stripe) && $stripeacc)
 		{
-			$customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
+			$customerstripe = $stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
 
 			if ($customerstripe->id) {
-				$listofsources=$customerstripe->sources->data;
+				$listofsources = $customerstripe->sources->data;
 			}
 		}
 
-		$stripeamount=0;
+		$stripeamount = 0;
 		foreach ($amounts as $key => $value)	// How payment is dispatch
 		{
-			$stripeamount+=price2num($value,'MT');
+			$stripeamount += price2num($value, 'MT');
 		}
 
-		if (preg_match('/acct_/i',$source))
+		if (preg_match('/acct_/i', $source))
 		{
-			$paiementcode ="VIR";
+			$paiementcode = "VIR";
 		}
-		elseif (preg_match('/card_/i',$source))
+		elseif (preg_match('/card_/i', $source))
 		{
-			$paiementcode ="CB";
+			$paiementcode = "CB";
 		}
-		elseif (preg_match('/src_/i',$source))
+		elseif (preg_match('/src_/i', $source))
 		{
 
-		        $customer2 = $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
+		        $customer2 = $customerstripe = $stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
 			$src = $customer2->sources->retrieve("$source");
-			if ($src->type=='card')
+			if ($src->type == 'card')
 			{
-				$paiementcode ="CB";
+				$paiementcode = "CB";
 			}
 		}
 
@@ -317,25 +317,25 @@ 
 		$societe->fetch($facture->socid);
 		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
 
-		$stripecu = $stripe->getStripeCustomerAccount($societe->id, $servicestatus);		// Get thirdparty cu_...
+		$stripecu = $stripe->getStripeCustomerAccount($societe->id, $servicestatus); // Get thirdparty cu_...
 
-		$charge=$stripe->createPaymentStripe($stripeamount,$facture->multicurrency_code,"invoice",$facid,$source,$stripecu,$stripeacc,$servicestatus);
+		$charge = $stripe->createPaymentStripe($stripeamount, $facture->multicurrency_code, "invoice", $facid, $source, $stripecu, $stripeacc, $servicestatus);
 
 		if (!$error)
 		{
 			// Creation of payment line
 			$paiement = new Paiement($db);
 			$paiement->datepaye     = $datepaye;
-			$paiement->amounts      = $amounts;   // Array with all payments dispatching
-			$paiement->multicurrency_amounts = $multicurrency_amounts;   // Array with all payments dispatching
-			$paiement->paiementid   = dol_getIdFromCode($db,$paiementcode,'c_paiement');
+			$paiement->amounts      = $amounts; // Array with all payments dispatching
+			$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+			$paiement->paiementid   = dol_getIdFromCode($db, $paiementcode, 'c_paiement');
 			$paiement->num_paiement = $charge->message;
 			$paiement->note         = GETPOST('comment');
 			$paiement->ext_payment_id = $charge->id;
 			$paiement->ext_payment_site = $service;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 
 			$paiement_id = $paiement->create($user, 0);
@@ -348,47 +348,47 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $facture->thirdparty->default_lang;
-				if (! empty($newlang)) {
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model=$facture->modelpdf;
+				$model = $facture->modelpdf;
 				$ret = $facture->fetch($facid); // Reload to get new records
 
 				$facture->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$label='(CustomerInvoicePayment)';
-			if (GETPOST('type') == 2) $label='(CustomerInvoicePaymentBack)';
-			$result=$paiement->addPaymentToBank($user,'payment',$label,GETPOST('accountid'),'','');
+			$label = '(CustomerInvoicePayment)';
+			if (GETPOST('type') == 2) $label = '(CustomerInvoicePaymentBack)';
+			$result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), '', '');
 			if ($result < 0)
 			{
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
 			}
-			elseif (GETPOST('closepaidinvoices')=='on') {
+			elseif (GETPOST('closepaidinvoices') == 'on') {
 				$facture->set_paid($user);
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$db->commit();
 
 			// If payment dispatching on more than one invoice, we keep on summary page, otherwise go on invoice card
-			$invoiceid=0;
+			$invoiceid = 0;
 			foreach ($paiement->amounts as $key => $amount)
 			{
 				$facid = $key;
 				if (is_numeric($amount) && $amount <> 0)
 				{
-					if ($invoiceid != 0) $invoiceid=-1; // There is more than one invoice payed by this payment
-					else $invoiceid=$facid;
+					if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
+					else $invoiceid = $facid;
 				}
 			}
 			if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
@@ -416,39 +416,39 @@ 
 
 llxHeader();
 
-if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha')) {
+if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
 	$service = 'StripeLive';
 	$servicestatus = 0;
 } else {
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Stripe'),'','warning');
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 
-if (GETPOST('error')){
+if (GETPOST('error')) {
 	setEventMessages(GETPOST('error'), null, 'errors');
 }
 
 if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
 {
 	$facture = new Facture($db);
-	$result=$facture->fetch($facid);
+	$result = $facture->fetch($facid);
 
 	if ($result >= 0)
 	{
 		$facture->fetch_thirdparty();
 
-		$title='';
-		if ($facture->type != 2) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
-		if ($facture->type == 2) $title.=$langs->trans("EnterPaymentDueToCustomer");
+		$title = '';
+		if ($facture->type != 2) $title .= $langs->trans("EnterPaymentReceivedFromCustomer");
+		if ($facture->type == 2) $title .= $langs->trans("EnterPaymentDueToCustomer");
 		print load_fiche_titre($title);
 
 		// Initialize data for confirmation (this is used because data can be change during confirmation)
 		if ($action == 'add_paiement')
 		{
-			$i=0;
+			$i = 0;
 
-			$formquestion[$i++]=array('type' => 'hidden','name' => 'facid', 'value' => $facture->id);
-			$formquestion[$i++]=array('type' => 'hidden','name' => 'socid', 'value' => $facture->socid);
-			$formquestion[$i++]=array('type' => 'hidden','name' => 'type',  'value' => $facture->type);
+			$formquestion[$i++] = array('type' => 'hidden', 'name' => 'facid', 'value' => $facture->id);
+			$formquestion[$i++] = array('type' => 'hidden', 'name' => 'socid', 'value' => $facture->socid);
+			$formquestion[$i++] = array('type' => 'hidden', 'name' => 'type', 'value' => $facture->type);
 		}
 
 
@@ -543,7 +543,7 @@ 
 			';
 
 			print '	});'."\n";
-			if (!empty($conf->use_javascript_ajax)){
+			if (!empty($conf->use_javascript_ajax)) {
 				//Add js for AutoFill
 				print ' $(document).ready(function () {';
 				print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
@@ -576,7 +576,7 @@ 
         print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans('Company').'</span></td><td>'.$facture->thirdparty->getNomUrl(4)."</td></tr>\n";
 
         // Bank account
-        if (! empty($conf->banque->enabled))
+        if (!empty($conf->banque->enabled))
         {
             //$form->select_comptes($accountid,'accountid',0,'',2);
             print '<input name="accountid" type="hidden" value="'.$conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS.'">';
@@ -607,17 +607,17 @@ 
 		// Comments
 		print '<tr><td>'.$langs->trans('Comments').'</td>';
 		print '<td class="tdtop">';
-		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment','none').'</textarea></td></tr>';
+		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment', 'none').'</textarea></td></tr>';
 
         print '</table>';
 
         dol_fiche_end();
 
 
-        $customerstripe=$stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
+        $customerstripe = $stripe->customerStripe($facture->thirdparty, $stripeacc, $servicestatus);
 
         print '<br>';
-        print_barre_liste($langs->trans('StripeSourceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+        print_barre_liste($langs->trans('StripeSourceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
         print '<table class="liste" width="100%">'."\n";
         // Titles with sort buttons
@@ -631,75 +631,75 @@ 
             print '<tr>';
 
             print '<td align="center" width="20" ';
-            if (($action == 'add_paiement' && $src->id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
+            if (($action == 'add_paiement' && $src->id != $source) or ($src->object == 'source' && $src->card->three_d_secure == 'required')) {
                 print'class="opacitymedium"';
             }
             print '><input type="radio" id="source_id" class="flat" name="source_id"  value="'.$src->id.'"';
-            if (($action == 'add_paiement' && $src->id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
+            if (($action == 'add_paiement' && $src->id != $source) or ($src->object == 'source' && $src->card->three_d_secure == 'required')) {
                 print ' disabled';
-            } elseif (($customerstripe->default_source==$src->id && $action != 'add_paiement') or ($source==$src->id && $action == 'add_paiement')) {
+            } elseif (($customerstripe->default_source == $src->id && $action != 'add_paiement') or ($source == $src->id && $action == 'add_paiement')) {
                 print ' checked';
             }
             print '></td>';
 
             print '<td ';
-            if (($action == 'add_paiement' && $src->id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
+            if (($action == 'add_paiement' && $src->id != $source) or ($src->object == 'source' && $src->card->three_d_secure == 'required')) {
                 print'class="opacitymedium"';
             }
 
             print' >';
-            if ($src->object=='card') {
+            if ($src->object == 'card') {
                 print img_credit_card($src->brand);
-            } elseif ($src->object=='source' && $src->type=='card') {
+            } elseif ($src->object == 'source' && $src->type == 'card') {
                 print img_credit_card($src->card->brand);
-            } elseif ($src->object=='source' && $src->type=='sepa_debit') {
+            } elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
                 print '<span class="fa fa-university fa-2x fa-fw"></span>';
             }
             print '</td>';
             print '<td ';
-            if (($action == 'add_paiement' && $src->id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
+            if (($action == 'add_paiement' && $src->id != $source) or ($src->object == 'source' && $src->card->three_d_secure == 'required')) {
                 print'class="opacitymedium"';
             }
             print' >';
-            if ($src->object=='card') {
+            if ($src->object == 'card') {
                 print '....'.$src->last4.' - '.$src->exp_month.'/'.$src->exp_year.'';
                 print '</td><td>';
                 if ($src->country) {
                     $img = picto_from_langcode($src->country);
-                    print $img?$img.' ':'';
-                    print getCountry($src->country,1);
+                    print $img ? $img.' ' : '';
+                    print getCountry($src->country, 1);
                 } else {
-                    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+                    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
                 }
-            } elseif ($src->object=='source' && $src->type=='card') {
+            } elseif ($src->object == 'source' && $src->type == 'card') {
                 print $src->owner->name.'<br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
                 print '</td><td>';
                 if ($src->card->country) {
                     $img = picto_from_langcode($src->card->country);
-                    print $img?$img.' ':'';
-                    print getCountry($src->card->country,1);
+                    print $img ? $img.' ' : '';
+                    print getCountry($src->card->country, 1);
                 } else {
-                    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+                    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
                 }
-            } elseif ($src->object=='source' && $src->type=='sepa_debit') {
+            } elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
                 print 'info sepa';
                 print '</td><td>';
                 if ($src->sepa_debit->country) {
                     $img = picto_from_langcode($src->sepa_debit->country);
-                    print $img?$img.' ':'';
-                    print getCountry($src->sepa_debit->country,1);
+                    print $img ? $img.' ' : '';
+                    print getCountry($src->sepa_debit->country, 1);
                 } else {
-                    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+                    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
                 }
             }
             print '</td>';
             // Default
             print '<td align="center" width="50" ';
-            if (($action == 'add_paiement' && $src->id!=$source) or ($src->object=='source' && $src->card->three_d_secure=='required')) {
+            if (($action == 'add_paiement' && $src->id != $source) or ($src->object == 'source' && $src->card->three_d_secure == 'required')) {
                 print'class="opacitymedium"';
             }
             print'>';
-            if (($customerstripe->default_source==$src->id)) {
+            if (($customerstripe->default_source == $src->id)) {
                 print "<SPAN class=' fa fa-star  fa-2x'></SPAN>";
             }
             print '</td>';
@@ -710,32 +710,32 @@ 
         //    $account=\Stripe\Account::retrieve("".$stripe->getStripeCustomerAccount($facture->socid)."");
         //}
 
-        if (($account->type=='custom' or $account->type=='express') && $entity==1) {
+        if (($account->type == 'custom' or $account->type == 'express') && $entity == 1) {
             print '<tr class="oddeven">';
 
             print '<td align="center" width="20" ';
-            if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid)!=$source) {
+            if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid) != $source) {
                 print'class="opacitymedium"';
             }
             print'><input type="radio" id="source_id" class="flat" name="source_id"  value="'.$conf->global->STRIPE_EXTERNAL_ACCOUNT.'"';
-            if ((empty($input) && $action != 'add_paiement') or ($source==$conf->global->STRIPE_EXTERNAL_ACCOUNT && $action == 'add_paiement')) {
+            if ((empty($input) && $action != 'add_paiement') or ($source == $conf->global->STRIPE_EXTERNAL_ACCOUNT && $action == 'add_paiement')) {
                 print ' checked';
-            } elseif ($action == 'add_paiement' && $conf->global->STRIPE_EXTERNAL_ACCOUNT!=$source) {
+            } elseif ($action == 'add_paiement' && $conf->global->STRIPE_EXTERNAL_ACCOUNT != $source) {
                 print ' disabled';
             }
             print '></td><td ';
-            if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid)!=$source) {
+            if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid) != $source) {
                 print'class="opacitymedium"';
             }
             print '><span class="fa fa-cc-stripe fa-3x fa-fw"></span></td>';
 
             print '<td ';
-            if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid)!=$source) {
+            if ($action == 'add_paiement' && $stripe->getStripeCustomerAccount($facture->socid) != $source) {
                 print'class="opacitymedium"';
             }
             print'>'.$langs->trans('sold');
             print'</td><td ';
-            if ($action == 'add_paiement' && $src->id!=$source) {
+            if ($action == 'add_paiement' && $src->id != $source) {
                 print'class="opacitymedium"';
             }
             print'>';
@@ -743,7 +743,7 @@ 
             print '</td>';
             // Default
             print '<td align="center" width="50" ';
-            if ($action == 'add_paiement' && $src->id!=$source) {
+            if ($action == 'add_paiement' && $src->id != $source) {
                 print'class="opacitymedium"';
             }
             print'>';
@@ -755,7 +755,7 @@ 
             print '</td>';
             print '</tr>';
         }
-        if (empty($input)&&!$stripe->getStripeCustomerAccount($facture->socid)) {
+        if (empty($input) && !$stripe->getStripeCustomerAccount($facture->socid)) {
             print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
         }
 
@@ -767,33 +767,33 @@ 
          */
 
         $sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type, ';
-        $sql.= ' f.datef as df, f.fk_soc as socid';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f';
+        $sql .= ' f.datef as df, f.fk_soc as socid';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS)) {
-			$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON (f.fk_soc = s.rowid)';
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON (f.fk_soc = s.rowid)';
 		}
 
-		$sql.= ' WHERE f.entity = '.$conf->entity;
-        $sql.= ' AND (f.fk_soc = '.$facture->socid;
+		$sql .= ' WHERE f.entity = '.$conf->entity;
+        $sql .= ' AND (f.fk_soc = '.$facture->socid;
 
 		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
-			$sql.= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
+			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.$facture->thirdparty->parent.')';
 		}
 
-        $sql.= ') AND f.paye = 0';
-        $sql.= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
+        $sql .= ') AND f.paye = 0';
+        $sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
         if ($facture->type != 2)
         {
-            $sql .= ' AND type IN (0,1,3,5)';	// Standard invoice, replacement, deposit, situation
+            $sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
         }
         else
         {
-            $sql .= ' AND type = 2';		// If paying back a credit note, we show all credit notes
+            $sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
         }
 
         // Sort invoices by date and serial number: the older one comes first
-        $sql.=' ORDER BY f.datef ASC, f.ref ASC';
+        $sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
         $resql = $db->query($sql);
         if ($resql)
@@ -801,22 +801,22 @@ 
             $num = $db->num_rows($resql);
             if ($num > 0)
             {
-            	$sign=1;
-            	if ($facture->type == 2) $sign=-1;
-
-				$arraytitle=$langs->trans('Invoice');
-				if ($facture->type == 2) $arraytitle=$langs->trans("CreditNotes");
-				$alreadypayedlabel=$langs->trans('Received');
-				$multicurrencyalreadypayedlabel=$langs->trans('MulticurrencyReceived');
-				if ($facture->type == 2) { $alreadypayedlabel=$langs->trans("PaidBack"); $multicurrencyalreadypayedlabel=$langs->trans("MulticurrencyPaidBack"); }
-				$remaindertopay=$langs->trans('RemainderToTake');
-				$multicurrencyremaindertopay=$langs->trans('MulticurrencyRemainderToTake');
-				if ($facture->type == 2) { $remaindertopay=$langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay=$langs->trans("MulticurrencyRemainderToPayBack"); }
+            	$sign = 1;
+            	if ($facture->type == 2) $sign = -1;
+
+				$arraytitle = $langs->trans('Invoice');
+				if ($facture->type == 2) $arraytitle = $langs->trans("CreditNotes");
+				$alreadypayedlabel = $langs->trans('Received');
+				$multicurrencyalreadypayedlabel = $langs->trans('MulticurrencyReceived');
+				if ($facture->type == 2) { $alreadypayedlabel = $langs->trans("PaidBack"); $multicurrencyalreadypayedlabel = $langs->trans("MulticurrencyPaidBack"); }
+				$remaindertopay = $langs->trans('RemainderToTake');
+				$multicurrencyremaindertopay = $langs->trans('MulticurrencyRemainderToTake');
+				if ($facture->type == 2) { $remaindertopay = $langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay = $langs->trans("MulticurrencyRemainderToPayBack"); }
 
                 $i = 0;
                 //print '<tr><td colspan="3">';
                 print '<br>';
-                print_barre_liste($langs->trans('StripeInvoiceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+                print_barre_liste($langs->trans('StripeInvoiceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
                 print '<table class="noborder" width="100%">';
                 print '<tr class="liste_titre">';
                 print '<td>'.$arraytitle.'</td>';
@@ -837,10 +837,10 @@ 
                 print '<td align="right">&nbsp;</td>';
                 print "</tr>\n";
 
-                $total=0;
-                $totalrecu=0;
-                $totalrecucreditnote=0;
-                $totalrecudeposits=0;
+                $total = 0;
+                $totalrecu = 0;
+                $totalrecucreditnote = 0;
+                $totalrecudeposits = 0;
 
                 while ($i < $num)
                 {
@@ -849,33 +849,33 @@ 
 					$soc = new Societe($db);
 					$soc->fetch($objp->socid);
 
-                    $invoice=new Facture($db);
+                    $invoice = new Facture($db);
                     $invoice->fetch($objp->facid);
                     $paiement = $invoice->getSommePaiement();
-                    $creditnotes=$invoice->getSumCreditNotesUsed();
-                    $deposits=$invoice->getSumDepositsUsed();
-                    $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT');
-                    $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT');
+                    $creditnotes = $invoice->getSumCreditNotesUsed();
+                    $deposits = $invoice->getSumDepositsUsed();
+                    $alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+                    $remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 					// Multicurrency Price
 					if (!empty($conf->multicurrency->enabled))
 					{
 						$multicurrency_payment = $invoice->getSommePaiement(1);
-						$multicurrency_creditnotes=$invoice->getSumCreditNotesUsed(1);
-						$multicurrency_deposits=$invoice->getSumDepositsUsed(1);
-						$multicurrency_alreadypayed=price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits,'MT');
-	                    $multicurrency_remaintopay=price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits,'MT');
+						$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
+						$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
+						$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
+	                    $multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
 					}
 
                     print '<tr class="oddeven">';
 
                     print '<td>';
-                    print $invoice->getNomUrl(1,'');
-                    if($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
+                    print $invoice->getNomUrl(1, '');
+                    if ($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
                     print "</td>\n";
 
                     // Date
-                    print '<td align="center">'.dol_print_date($db->jdate($objp->df),'day')."</td>\n";
+                    print '<td align="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
 
                     // Currency
                     if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$objp->multicurrency_code."</td>\n";
@@ -926,7 +926,7 @@ 
                     if ($action != 'add_paiement')
                     {
                         if (!empty($conf->use_javascript_ajax))
-							print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+							print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
                         print '<input type=hidden class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
                         print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
                     }
@@ -938,7 +938,7 @@ 
                     print "</td>";
 
 					// Multicurrency Price
-					if (! empty($conf->multicurrency->enabled))
+					if (!empty($conf->multicurrency->enabled))
 					{
 						print '<td align="right">';
 
@@ -951,7 +951,7 @@ 
     	                    if ($action != 'add_paiement')
     	                    {
     	                        if (!empty($conf->use_javascript_ajax))
-    								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+    								print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
     	                        print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
     	                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
     	                    }
@@ -974,21 +974,21 @@ 
                     }
                     print '</td>';
 
-					$parameters=array();
-					$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$objp,$action); // Note that $action and $object may have been modified by hook
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
                     print "</tr>\n";
 
-                    $total+=$objp->total;
-                    $total_ttc+=$objp->total_ttc;
-                    $totalrecu+=$paiement;
-                    $totalrecucreditnote+=$creditnotes;
-                    $totalrecudeposits+=$deposits;
+                    $total += $objp->total;
+                    $total_ttc += $objp->total_ttc;
+                    $totalrecu += $paiement;
+                    $totalrecucreditnote += $creditnotes;
+                    $totalrecudeposits += $deposits;
                     $i++;
                 }
                 if ($i > 1)
                 {
-                $amount=round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits,'MT'))*100);
+                $amount = round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')) * 100);
                     // Print total
                     print '<tr class="liste_total">';
                     print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
@@ -1002,7 +1002,7 @@ 
                     if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
                     if ($totalrecudeposits) print '+'.price($totalrecudeposits);
                     print '</b></td>';
-                    print '<td align="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits,'MT')).'</b></td>';
+                    print '<td align="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
                     print '<td align="right" id="result" style="font-weight: bold;"></td>';
 					if (!empty($conf->multicurrency->enabled)) {
                         print '<td align="right" id="multicurrency_result" style="font-weight: bold;"></td>';
@@ -1023,10 +1023,10 @@ 
         // Bouton Enregistrer
         if ($action != 'add_paiement')
         {
-        	$checkboxlabel=$langs->trans("ClosePaidInvoicesAutomatically");
-        	if ($facture->type == 2) $checkboxlabel=$langs->trans("ClosePaidCreditNotesAutomatically");
-        	$buttontitle=$langs->trans('ToMakePayment');
-        	if ($facture->type == 2) $buttontitle=$langs->trans('ToMakePaymentBack');
+        	$checkboxlabel = $langs->trans("ClosePaidInvoicesAutomatically");
+        	if ($facture->type == 2) $checkboxlabel = $langs->trans("ClosePaidCreditNotesAutomatically");
+        	$buttontitle = $langs->trans('ToMakePayment');
+        	if ($facture->type == 2) $buttontitle = $langs->trans('ToMakePaymentBack');
 
         	print '<br><div class="center">';
         	print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
@@ -1042,21 +1042,21 @@ 
         // Form to confirm payment
         if ($action == 'add_paiement')
         {
-            $preselectedchoice=$addwarning?'no':'yes';
+            $preselectedchoice = $addwarning ? 'no' : 'yes';
 
             print '<br>';
             if (!empty($totalpayment)) {
                 $text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
             }
 			if (!empty($multicurrency_totalpayment)) {
-				$text.='<br>'.$langs->trans('ConfirmCustomerPayment', $multicurrency_totalpayment, $langs->trans("paymentInInvoiceCurrency"));
+				$text .= '<br>'.$langs->trans('ConfirmCustomerPayment', $multicurrency_totalpayment, $langs->trans("paymentInInvoiceCurrency"));
 			}
             if (GETPOST('closepaidinvoices'))
             {
-                $text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
+                $text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
                 print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
             }
-            print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type,$langs->trans('ReceivedCustomersPayments'),$text,'confirm_paiement',$formquestion,$preselectedchoice);
+            print $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$facture->id.'&socid='.$facture->socid.'&type='.$facture->type, $langs->trans('ReceivedCustomersPayments'), $text, 'confirm_paiement', $formquestion, $preselectedchoice);
         }
 
         print "</form>\n";
@@ -1068,27 +1068,27 @@ 
  *  Show list of payments
  */
 
-if (! GETPOST('action'))
+if (!GETPOST('action'))
 {
-    if ($page == -1) $page = 0 ;
-    $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-    $offset = $limit * $page ;
+    if ($page == -1) $page = 0;
+    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+    $offset = $limit * $page;
 
-    if (! $sortorder) $sortorder='DESC';
-    if (! $sortfield) $sortfield='p.datep';
+    if (!$sortorder) $sortorder = 'DESC';
+    if (!$sortfield) $sortfield = 'p.datep';
 
     $sql = 'SELECT p.datep as dp, p.amount, f.amount as fa_amount, f.ref';
-    $sql.=', f.rowid as facid, c.libelle as paiement_type, p.num_paiement';
-    $sql.= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'c_paiement as c';
-    $sql.= ' WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id';
-    $sql.= ' AND f.entity = '.$conf->entity;
+    $sql .= ', f.rowid as facid, c.libelle as paiement_type, p.num_paiement';
+    $sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p, '.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'c_paiement as c';
+    $sql .= ' WHERE p.fk_facture = f.rowid AND p.fk_paiement = c.id';
+    $sql .= ' AND f.entity = '.$conf->entity;
     if ($socid)
     {
-        $sql.= ' AND f.fk_soc = '.$socid;
+        $sql .= ' AND f.fk_soc = '.$socid;
     }
 
-    $sql.= ' ORDER BY '.$sortfield.' '.$sortorder;
-    $sql.= $db->plimit($limit+1, $offset);
+    $sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
+    $sql .= $db->plimit($limit + 1, $offset);
     $resql = $db->query($sql);
 
     if ($resql)
@@ -1096,17 +1096,17 @@ 
         $num = $db->num_rows($resql);
         $i = 0;
 
-        print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"],'',$sortfield,$sortorder,'',$num);
+        print_barre_liste($langs->trans('Payments'), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num);
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
-        print_liste_field_titre('Invoice',$_SERVER["PHP_SELF"],'ref','','','',$sortfield,$sortorder);
-        print_liste_field_titre('Date',$_SERVER["PHP_SELF"],'dp','','','',$sortfield,$sortorder);
-        print_liste_field_titre('Type',$_SERVER["PHP_SELF"],'libelle','','','',$sortfield,$sortorder);
-        print_liste_field_titre('Amount',$_SERVER["PHP_SELF"],'fa_amount','','','align="right"',$sortfield,$sortorder);
-		print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+        print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'ref', '', '', '', $sortfield, $sortorder);
+        print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder);
+        print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'libelle', '', '', '', $sortfield, $sortorder);
+        print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
         print "</tr>\n";
 
-        while ($i < min($num,$limit))
+        while ($i < min($num, $limit))
         {
             $objp = $db->fetch_object($resql);
             print '<tr class="oddeven">';
@@ -1115,8 +1115,8 @@ 
             print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
             print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
 
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('printObjectLine',$parameters,$objp,$action); // Note that $action and $object may have been modified by hook
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
             print '</tr>';
             $i++;

dolibarr/htdocs/stripe/admin/stripe.php

Indentation +141 added lines, -141 removed lines

@@ -43,92 +43,92 @@ 
 
 if ($action == 'setvalue' && $user->admin)
 {
-	$db->begin();
-
-	if (empty($conf->stripeconnect->enabled)) {
-		$result = dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY", GETPOST('STRIPE_TEST_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
-		$result = dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY", GETPOST('STRIPE_TEST_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
-		$result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY", GETPOST('STRIPE_TEST_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
-		$result = dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY", GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
-		$result = dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY", GETPOST('STRIPE_LIVE_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
-		$result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY", GETPOST('STRIPE_LIVE_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
-	}
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+    $db->begin();
+
+    if (empty($conf->stripeconnect->enabled)) {
+        $result = dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY", GETPOST('STRIPE_TEST_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! $result > 0)
+            $error ++;
+        $result = dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY", GETPOST('STRIPE_TEST_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! $result > 0)
+            $error ++;
+        $result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY", GETPOST('STRIPE_TEST_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! $result > 0)
+            $error ++;
+        $result = dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY", GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! $result > 0)
+            $error ++;
+        $result = dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY", GETPOST('STRIPE_LIVE_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! $result > 0)
+            $error ++;
+        $result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY", GETPOST('STRIPE_LIVE_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
+        if (! $result > 0)
+            $error ++;
+    }
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+    $result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
     $result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
     if (! $result > 0) {
         $error ++;
     }
     $result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+    if (! $result > 0)
+        $error ++;
     $result = dolibarr_set_const($db, "STRIPE_MINIMAL_3DSECURE", GETPOST('STRIPE_MINIMAL_3DSECURE', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	// Stock decrement
-	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_WAREHOUSE", (GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') > 0 ? GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-
-	// Payment token for URL
-	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
-
-	if (! $error) {
-		$db->commit();
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		$db->rollback();
-		dol_print_error($db);
-	}
+    if (! $result > 0)
+        $error ++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+    // Stock decrement
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_WAREHOUSE", (GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') > 0 ? GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+
+    // Payment token for URL
+    $result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+    $result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (! $result > 0)
+        $error ++;
+
+    if (! $error) {
+        $db->commit();
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    } else {
+        $db->rollback();
+        dol_print_error($db);
+    }
 }
 
 if ($action=="setlive")
 {
-	$liveenable = GETPOST('value','int');
-	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
-	if ($res > 0) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
+    $liveenable = GETPOST('value','int');
+    $res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
+    if ($res > 0) {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
 }
 //TODO: import script for stripe account saving in alone or connect mode for stripe.class.php
 
@@ -168,72 +168,72 @@ 
 print $langs->trans("StripeLiveEnabled").'</td><td>';
 if (!empty($conf->global->STRIPE_LIVE))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
-	print '</a>';
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+    print '</a>';
 }
 else
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
-	print '</a>';
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+    print '</a>';
 }
 print '</td></tr>';
 
 if (empty($conf->stripeconnect->enabled))
 {
-	print '<tr class="oddeven"><td>';
-	print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-	print '</td></tr>';
-
-	print '<tr class="oddeven"><td>';
-	print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
-	print '</td></tr>';
-
-	print '<tr class="oddeven"><td>';
-	print '<span>'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
+    print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
+    print ' &nbsp; '.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+    print '</td></tr>';
+
+    print '<tr class="oddeven"><td>';
+    print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
+    print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
+    print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+    print '</td></tr>';
+
+    print '<tr class="oddeven"><td>';
+    print '<span>'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
+    print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'">';
+    print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
+    print '</td></tr>';
 } else {
-	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
-	print '<td><b>'.$langs->trans("StripeConnect_Mode").'</b><br/>';
-	print $langs->trans("STRIPE_APPLICATION_FEE_PLATFORM").' ';
-	print price($conf->global->STRIPE_APPLICATION_FEE_PERCENT);
-	print '% + ';
-	print price($conf->global->STRIPE_APPLICATION_FEE);
-	print ' '.$langs->getCurrencySymbol($conf->currency).' '.$langs->trans("minimum").' '.price($conf->global->STRIPE_APPLICATION_FEE_MINIMAL).' '.$langs->getCurrencySymbol($conf->currency).' </td></tr>';
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
+    print '<td><b>'.$langs->trans("StripeConnect_Mode").'</b><br/>';
+    print $langs->trans("STRIPE_APPLICATION_FEE_PLATFORM").' ';
+    print price($conf->global->STRIPE_APPLICATION_FEE_PERCENT);
+    print '% + ';
+    print price($conf->global->STRIPE_APPLICATION_FEE);
+    print ' '.$langs->getCurrencySymbol($conf->currency).' '.$langs->trans("minimum").' '.price($conf->global->STRIPE_APPLICATION_FEE_MINIMAL).' '.$langs->getCurrencySymbol($conf->currency).' </td></tr>';
+    print '</td></tr>';
 }
 
 if (empty($conf->stripeconnect->enabled))
 {
-	print '<tr class="oddeven"><td>';
-	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
-	print '</td></tr>';
-
-	print '<tr class="oddeven"><td>';
-	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
-	print '</td></tr>';
-
-	print '<tr class="oddeven"><td>';
-	print '<span>'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
+    print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
+    print ' &nbsp; '.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+    print '</td></tr>';
+
+    print '<tr class="oddeven"><td>';
+    print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
+    print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
+    print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+    print '</td></tr>';
+
+    print '<tr class="oddeven"><td>';
+    print '<span>'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
+    print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
+    print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
+    print '</td></tr>';
 }
 else
 {
-	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
-	print '<td>'.$langs->trans("StripeConnect_Mode").'</td></tr>';
+    print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
+    print '<td>'.$langs->trans("StripeConnect_Mode").'</td></tr>';
 }
 
 
@@ -266,27 +266,27 @@ 
 
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
 {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("BankAccountForBankTransfer").'</td><td>';
-	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("BankAccountForBankTransfer").'</td><td>';
+    print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+    print '</td></tr>';
 }
 
 // Minimal amount for force 3Dsecure if it's optionnal
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("STRIPE_MINIMAL_3DSECURE").'</td><td>';
-	print '<input class="flat" name="STRIPE_MINIMAL_3DSECURE" size="3" value="' .$conf->global->STRIPE_MINIMAL_3DSECURE . '">'.$langs->getCurrencySymbol($conf->currency).'</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("STRIPE_MINIMAL_3DSECURE").'</td><td>';
+    print '<input class="flat" name="STRIPE_MINIMAL_3DSECURE" size="3" value="' .$conf->global->STRIPE_MINIMAL_3DSECURE . '">'.$langs->getCurrencySymbol($conf->currency).'</td></tr>';
 }
 
 // Warehouse for automatic decrement
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
 {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
-	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
+    print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
+    print '</td></tr>';
 }
 
 print '<tr class="oddeven"><td>';
@@ -324,7 +324,7 @@ 
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
 if (! empty($conf->use_javascript_ajax))
-	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
@@ -351,15 +351,15 @@ 
 
 if (! empty($conf->use_javascript_ajax))
 {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
+    print "\n".'<script type="text/javascript">';
+    print '$(document).ready(function () {
             $("#apidoc").hide();
             $("#apidoca").click(function() {
                 $("#apidoc").show();
             	$("#apidoca").hide();
             });
     });';
-	print '</script>';
+    print '</script>';
 }
 
 // End of page

Braces +71 added lines, -47 removed lines

@@ -36,7 +36,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox', 'stripe'));
 
-if (! $user->admin) accessforbidden();
+if (! $user->admin) {
+    accessforbidden();
+}
 
 $action = GETPOST('action','alpha');
 
@@ -47,67 +49,85 @@ 
 
 	if (empty($conf->stripeconnect->enabled)) {
 		$result = dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY", GETPOST('STRIPE_TEST_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (! $result > 0) {
+					$error ++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY", GETPOST('STRIPE_TEST_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (! $result > 0) {
+					$error ++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY", GETPOST('STRIPE_TEST_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (! $result > 0) {
+					$error ++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY", GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (! $result > 0) {
+					$error ++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY", GETPOST('STRIPE_LIVE_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (! $result > 0) {
+					$error ++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY", GETPOST('STRIPE_LIVE_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (! $result > 0) {
+					$error ++;
+		}
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
     $result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
     if (! $result > 0) {
         $error ++;
     }
     $result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
     $result = dolibarr_set_const($db, "STRIPE_MINIMAL_3DSECURE", GETPOST('STRIPE_MINIMAL_3DSECURE', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	// Stock decrement
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_WAREHOUSE", (GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') > 0 ? GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 
 	// Payment token for URL
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (! $result > 0) {
+			$error ++;
+	}
 
 	if (! $error) {
 		$db->commit();
@@ -124,8 +144,7 @@ 
 	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
 	if ($res > 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -171,8 +190,7 @@ 
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
 	print img_picto($langs->trans("Activated"),'switch_on');
 	print '</a>';
-}
-else
+} else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
 	print img_picto($langs->trans("Disabled"),'switch_off');
@@ -229,8 +247,7 @@ 
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'">';
 	print ' &nbsp; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
 	print '</td></tr>';
-}
-else
+} else
 {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td>'.$langs->trans("StripeConnect_Mode").'</td></tr>';
@@ -264,26 +281,32 @@ 
 print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 print '</td></tr>';
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+    // What is this for ?
 {
 	print '<tr class="oddeven"><td>';
+}
 	print $langs->trans("BankAccountForBankTransfer").'</td><td>';
 	print $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
 	print '</td></tr>';
 }
 
 // Minimal amount for force 3Dsecure if it's optionnal
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+    // TODO Not used by current code
 {
 	print '<tr class="oddeven"><td>';
+}
 	print $langs->trans("STRIPE_MINIMAL_3DSECURE").'</td><td>';
 	print '<input class="flat" name="STRIPE_MINIMAL_3DSECURE" size="3" value="' .$conf->global->STRIPE_MINIMAL_3DSECURE . '">'.$langs->getCurrencySymbol($conf->currency).'</td></tr>';
 }
 
 // Warehouse for automatic decrement
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+    // What is this for ?
 {
 	print '<tr class="oddeven"><td>';
+}
 	print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
 	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
 	print '</td></tr>';
@@ -323,8 +346,9 @@ 
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
-if (! empty($conf->use_javascript_ajax))
+if (! empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+}
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';

Spacing +62 added lines, -62 removed lines

@@ -28,20 +28,20 @@ 
 
 // 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.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
-$servicename='Stripe';
+$servicename = 'Stripe';
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox', 'stripe'));
 
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action','alpha');
+$action = GETPOST('action', 'alpha');
 
 
 if ($action == 'setvalue' && $user->admin)
@@ -50,69 +50,69 @@ 
 
 	if (empty($conf->stripeconnect->enabled)) {
 		$result = dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY", GETPOST('STRIPE_TEST_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (!$result > 0)
+			$error++;
 		$result = dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY", GETPOST('STRIPE_TEST_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (!$result > 0)
+			$error++;
 		$result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY", GETPOST('STRIPE_TEST_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (!$result > 0)
+			$error++;
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY", GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (!$result > 0)
+			$error++;
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY", GETPOST('STRIPE_LIVE_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (!$result > 0)
+			$error++;
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY", GETPOST('STRIPE_LIVE_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (! $result > 0)
-			$error ++;
+		if (!$result > 0)
+			$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
     $result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
-    if (! $result > 0) {
-        $error ++;
+    if (!$result > 0) {
+        $error++;
     }
     $result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
     $result = dolibarr_set_const($db, "STRIPE_MINIMAL_3DSECURE", GETPOST('STRIPE_MINIMAL_3DSECURE', 'int'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	// Stock decrement
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_WAREHOUSE", (GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') > 0 ? GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 
 	// Payment token for URL
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (! $result > 0)
-		$error ++;
+	if (!$result > 0)
+		$error++;
 
-	if (! $error) {
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -121,9 +121,9 @@ 
 	}
 }
 
-if ($action=="setlive")
+if ($action == "setlive")
 {
-	$liveenable = GETPOST('value','int');
+	$liveenable = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
 	if ($res > 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -140,15 +140,15 @@ 
  *	View
  */
 
-$form=new Form($db);
-$formproduct=new FormProduct($db);
+$form = new Form($db);
+$formproduct = new FormProduct($db);
 
-llxHeader('',$langs->trans("StripeSetup"));
+llxHeader('', $langs->trans("StripeSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ModuleSetup").' Stripe',$linkback);
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' Stripe', $linkback);
 
-$head=stripeadmin_prepare_head();
+$head = stripeadmin_prepare_head();
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -172,13 +172,13 @@ 
 if (!empty($conf->global->STRIPE_LIVE))
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
-	print img_picto($langs->trans("Activated"),'switch_on');
+	print img_picto($langs->trans("Activated"), 'switch_on');
 	print '</a>';
 }
 else
 {
 	print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
-	print img_picto($langs->trans("Disabled"),'switch_off');
+	print img_picto($langs->trans("Disabled"), 'switch_off');
 	print '</a>';
 }
 print '</td></tr>';
@@ -280,7 +280,7 @@ 
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_MINIMAL_3DSECURE").'</td><td>';
-	print '<input class="flat" name="STRIPE_MINIMAL_3DSECURE" size="3" value="' .$conf->global->STRIPE_MINIMAL_3DSECURE . '">'.$langs->getCurrencySymbol($conf->currency).'</td></tr>';
+	print '<input class="flat" name="STRIPE_MINIMAL_3DSECURE" size="3" value="'.$conf->global->STRIPE_MINIMAL_3DSECURE.'">'.$langs->getCurrencySymbol($conf->currency).'</td></tr>';
 }
 
 // Warehouse for automatic decrement
@@ -288,7 +288,7 @@ 
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("ONLINE_PAYMENT_WAREHOUSE").'</td><td>';
-	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE,'ONLINE_PAYMENT_WAREHOUSE','',1,$disabled);
+	print $formproduct->selectWarehouses($conf->global->ONLINE_PAYMENT_WAREHOUSE, 'ONLINE_PAYMENT_WAREHOUSE', '', 1, $disabled);
 	print '</td></tr>';
 }
 
@@ -300,19 +300,19 @@ 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MessageForm").'</td><td>';
-$doleditor=new DolEditor('ONLINE_PAYMENT_MESSAGE_FORM',$conf->global->ONLINE_PAYMENT_MESSAGE_FORM,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_FORM', $conf->global->ONLINE_PAYMENT_MESSAGE_FORM, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_2, '90%');
 $doleditor->Create();
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MessageOK").'</td><td>';
-$doleditor=new DolEditor('ONLINE_PAYMENT_MESSAGE_OK',$conf->global->ONLINE_PAYMENT_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_OK', $conf->global->ONLINE_PAYMENT_MESSAGE_OK, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_2, '90%');
 $doleditor->Create();
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MessageKO").'</td><td>';
-$doleditor=new DolEditor('ONLINE_PAYMENT_MESSAGE_KO',$conf->global->ONLINE_PAYMENT_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_2,'90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_KO', $conf->global->ONLINE_PAYMENT_MESSAGE_KO, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_2, '90%');
 $doleditor->Create();
 print '</td></tr>';
 
@@ -326,13 +326,13 @@ 
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityTokenIsUnique").'</td><td>';
-print $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYMENT_SECURITY_TOKEN)?0:$conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE),1);
+print $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE", (empty($conf->global->PAYMENT_SECURITY_TOKEN) ? 0 : $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE), 1);
 print '</td></tr>';
 
 print '</table>';
@@ -346,13 +346,13 @@ 
 print '<br><br>';
 
 
-$token='';
+$token = '';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
 print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242', '4000000000000101', '4000000000000069', '4000000000000341'));
 
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {

dolibarr/htdocs/stripe/transaction.php

Indentation +105 added lines, -105 removed lines

@@ -62,14 +62,14 @@ 
 
 if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
 {
-	$service = 'StripeTest';
-	$servicestatus = '0';
-	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+    $service = 'StripeTest';
+    $servicestatus = '0';
+    dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 else
 {
-	$service = 'StripeLive';
-	$servicestatus = '1';
+    $service = 'StripeLive';
+    $servicestatus = '1';
 }
 
 $stripeacc = $stripe->getStripeAccount($service);
@@ -80,54 +80,54 @@ 
 
 if (! $rowid) {
 
-	print '<form method="POST" 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 . '">';
-
-	$title=$langs->trans("StripeTransactionList");
-	$title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)');
-
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
-
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	//print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
-	//print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	//print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
-	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"');
-	print "</tr>\n";
-
-	print "</tr>\n";
-
-	if ($stripeacc)
-	{
-		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else
-	{
-		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
-	}
-
-	foreach ($txn->data as $txn)
-	{
-		//$charge = $txn;
-		//var_dump($txn);
-
-		// The metadata FULLTAG is defined by the online payment page
-		/*$FULLTAG=$charge->metadata->FULLTAG;
+    print '<form method="POST" 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 . '">';
+
+    $title=$langs->trans("StripeTransactionList");
+    $title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)');
+
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
+
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
+
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+    //print_liste_field_titre("StripeCustomerId",$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder);
+    //print_liste_field_titre("CustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+    //print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+    print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", 'align="center"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"');
+    print "</tr>\n";
+
+    print "</tr>\n";
+
+    if ($stripeacc)
+    {
+        $txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
+    }
+    else
+    {
+        $txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
+    }
+
+    foreach ($txn->data as $txn)
+    {
+        //$charge = $txn;
+        //var_dump($txn);
+
+        // The metadata FULLTAG is defined by the online payment page
+        /*$FULLTAG=$charge->metadata->FULLTAG;
 
 		// Save into $tmparray all metadata
 		$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
@@ -149,21 +149,21 @@ 
 			$memberstatic->id = 0;
 		}*/
 
-		$societestatic->fetch($charge->metadata->idcustomer);
-		$societestatic->id = $charge->metadata->idcustomer;
-		$societestatic->lastname = $obj->lastname;
-		$societestatic->firstname = $obj->firstname;
-		$societestatic->admin = $obj->admin;
-		$societestatic->login = $obj->login;
-		$societestatic->email = $obj->email;
-		$societestatic->societe_id = $obj->fk_soc;
+        $societestatic->fetch($charge->metadata->idcustomer);
+        $societestatic->id = $charge->metadata->idcustomer;
+        $societestatic->lastname = $obj->lastname;
+        $societestatic->firstname = $obj->firstname;
+        $societestatic->admin = $obj->admin;
+        $societestatic->login = $obj->login;
+        $societestatic->email = $obj->email;
+        $societestatic->societe_id = $obj->fk_soc;
 
-		print '<tr class="oddeven">';
+        print '<tr class="oddeven">';
 
-		// Ref
+        // Ref
         if (!empty($stripeacc)) $connect=$stripeacc.'/';
     
-		// Ref
+        // Ref
         if (preg_match('/po_/i', $txn->source)){
             $origin="payouts";
         } elseif (preg_match('/fee_/i', $txn->source)) {
@@ -172,20 +172,20 @@ 
             $origin="payments";
         }
 
-		$url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
-		if ($servicestatus) {
-			$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
-		}
+        $url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
+        if ($servicestatus) {
+            $url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
+        }
         if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
             print "<td>".$txn->type."</td>";
         } else {
             print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";
         }
 
-		// Stripe customer
-		//print "<td>".$charge->customer."</td>\n";
-		// Link
-		/*print "<td>";
+        // Stripe customer
+        //print "<td>".$charge->customer."</td>\n";
+        // Link
+        /*print "<td>";
 		if ($societestatic->id > 0)
 		{
 			print $societestatic->getNomUrl(1);
@@ -195,39 +195,39 @@ 
 			print $memberstatic->getNomUrl(1);
 		}
 		print "</td>\n";*/
-		// Origine
-		//print "<td>";
-		////if ($charge->metadata->dol_type=="order"){
-		//	$object = new Commande($db);
-		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
-		//} elseif ($charge->metadata->dol_type=="invoice"){
-		//	$object = new Facture($db);
-		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
-		//}
-		//print "</td>\n";
-		// Date payment
-		print '<td align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</td>\n";
-		// Type
-		print '<td>' . $txn->type . '</td>';
-		// Amount
-		print "<td align=\"right\">" . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
-		print "<td align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
-		// Status
-		print "<td align='right'>";
-		if ($txn->status=='available')
- 		{print img_picto($langs->trans("".$txn->status.""),'statut4');}
-		elseif ($txn->status=='pending')
-		{print img_picto($langs->trans("".$txn->status.""),'statut7');}
-		elseif ($txn->status=='failed')
-		{print img_picto($langs->trans("".$txn->status.""),'statut8');}
-		print '</td>';
-		print "</tr>\n";
-	}
-	print "</table>";
-	print '</div>';
-	print '</form>';
+        // Origine
+        //print "<td>";
+        ////if ($charge->metadata->dol_type=="order"){
+        //	$object = new Commande($db);
+        //	$object->fetch($charge->metadata->dol_id);
+        //	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
+        //} elseif ($charge->metadata->dol_type=="invoice"){
+        //	$object = new Facture($db);
+        //	$object->fetch($charge->metadata->dol_id);
+        //	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
+        //}
+        //print "</td>\n";
+        // Date payment
+        print '<td align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</td>\n";
+        // Type
+        print '<td>' . $txn->type . '</td>';
+        // Amount
+        print "<td align=\"right\">" . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
+        print "<td align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
+        // Status
+        print "<td align='right'>";
+        if ($txn->status=='available')
+            {print img_picto($langs->trans("".$txn->status.""),'statut4');}
+        elseif ($txn->status=='pending')
+        {print img_picto($langs->trans("".$txn->status.""),'statut7');}
+        elseif ($txn->status=='failed')
+        {print img_picto($langs->trans("".$txn->status.""),'statut8');}
+        print '</td>';
+        print "</tr>\n";
+    }
+    print "</table>";
+    print '</div>';
+    print '</form>';
 }
 
 // End of page

Braces +16 added lines, -13 removed lines

@@ -26,14 +26,18 @@ 
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+if (! empty($conf->accounting->enabled)) {
+    require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
 $socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -65,8 +69,7 @@ 
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
+} else
 {
 	$service = 'StripeLive';
 	$servicestatus = '1';
@@ -81,8 +84,9 @@ 
 if (! $rowid) {
 
 	print '<form method="POST" 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">';
@@ -115,8 +119,7 @@ 
 	if ($stripeacc)
 	{
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else
+	} else
 	{
 		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 	}
@@ -161,7 +164,9 @@ 
 		print '<tr class="oddeven">';
 
 		// Ref
-        if (!empty($stripeacc)) $connect=$stripeacc.'/';
+        if (!empty($stripeacc)) {
+            $connect=$stripeacc.'/';
+        }
     
 		// Ref
         if (preg_match('/po_/i', $txn->source)){
@@ -217,10 +222,8 @@ 
 		// Status
 		print "<td align='right'>";
 		if ($txn->status=='available')
- 		{print img_picto($langs->trans("".$txn->status.""),'statut4');}
-		elseif ($txn->status=='pending')
-		{print img_picto($langs->trans("".$txn->status.""),'statut7');}
-		elseif ($txn->status=='failed')
+ 		{print img_picto($langs->trans("".$txn->status.""),'statut4');} elseif ($txn->status=='pending')
+		{print img_picto($langs->trans("".$txn->status.""),'statut7');} elseif ($txn->status=='failed')
 		{print img_picto($langs->trans("".$txn->status.""),'statut8');}
 		print '</td>';
 		print "</tr>\n";

Spacing +38 added lines, -38 removed lines

@@ -21,7 +21,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.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -30,21 +30,21 @@ 
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
-$socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST("socid", "int");
+if ($user->societe_id) $socid = $user->societe_id;
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$rowid = GETPOST("rowid",'alpha');
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$rowid = GETPOST("rowid", 'alpha');
+$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;
@@ -64,7 +64,7 @@ 
 
 llxHeader('', $langs->trans("StripeTransactionList"));
 
-if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha')))
+if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
 {
 	$service = 'StripeTest';
 	$servicestatus = '0';
@@ -82,25 +82,25 @@ 
 	print $langs->trans('ErrorStripeAccountNotDefined');
 }*/
 
-if (! $rowid) {
+if (!$rowid) {
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
+	print '<form method="POST" 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="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="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	$title=$langs->trans("StripeTransactionList");
-	$title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)');
+	$title = $langs->trans("StripeTransactionList");
+	$title .= ($stripeaccount ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
@@ -165,25 +165,25 @@ 
 		print '<tr class="oddeven">';
 
 		// Ref
-        if (!empty($stripeacc)) $connect=$stripeacc.'/';
+        if (!empty($stripeacc)) $connect = $stripeacc.'/';
     
 		// Ref
-        if (preg_match('/po_/i', $txn->source)){
-            $origin="payouts";
+        if (preg_match('/po_/i', $txn->source)) {
+            $origin = "payouts";
         } elseif (preg_match('/fee_/i', $txn->source)) {
-            $origin="connect/application_fees";
+            $origin = "connect/application_fees";
         } else {
-            $origin="payments";
+            $origin = "payments";
         }
 
-		$url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
+		$url = 'https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source;
 		if ($servicestatus) {
-			$url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
+			$url = 'https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source;
 		}
         if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') {
             print "<td>".$txn->type."</td>";
         } else {
-            print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "</a></td>\n";
+            print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'object_globe')." ".$txn->source."</a></td>\n";
         }
 
 		// Stripe customer
@@ -212,20 +212,20 @@ 
 		//}
 		//print "</td>\n";
 		// Date payment
-		print '<td align="center">' . dol_print_date($txn->created, '%d/%m/%Y %H:%M') . "</td>\n";
+		print '<td align="center">'.dol_print_date($txn->created, '%d/%m/%Y %H:%M')."</td>\n";
 		// Type
-		print '<td>' . $txn->type . '</td>';
+		print '<td>'.$txn->type.'</td>';
 		// Amount
-		print "<td align=\"right\">" . price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
-		print "<td align=\"right\">" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . "</td>";
+		print "<td align=\"right\">".price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
+		print "<td align=\"right\">".price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
 		// Status
 		print "<td align='right'>";
-		if ($txn->status=='available')
- 		{print img_picto($langs->trans("".$txn->status.""),'statut4');}
-		elseif ($txn->status=='pending')
-		{print img_picto($langs->trans("".$txn->status.""),'statut7');}
-		elseif ($txn->status=='failed')
-		{print img_picto($langs->trans("".$txn->status.""),'statut8');}
+		if ($txn->status == 'available')
+ 		{print img_picto($langs->trans("".$txn->status.""), 'statut4'); }
+		elseif ($txn->status == 'pending')
+		{print img_picto($langs->trans("".$txn->status.""), 'statut7'); }
+		elseif ($txn->status == 'failed')
+		{print img_picto($langs->trans("".$txn->status.""), 'statut8'); }
 		print '</td>';
 		print "</tr>\n";
 	}