From fc65421b2eda7dea72004ae0d87d0ed2f4f1c99f Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 16 Sep 2014 21:19:07 +0200
Subject: [PATCH] bad merge

---
 htdocs/compta/resultat/clientfourn.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index da30c04d53d..1d8a05984e3 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -542,11 +542,12 @@ if ($mysoc->tva_assuj == 'franchise')	// Non assujeti
     print '</tr>';
 }
 
+
 /*
  * Salaries
  */
 
-print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';    
+print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
 $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
 $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
@@ -556,7 +557,7 @@ if (! empty($date_start) && ! empty($date_end))
 	
 $sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
 $sql.= " ORDER BY u.firstname";
-    
+
 dol_syslog("get payment salaries");
 $result=$db->query($sql);
 $subtotal_ht = 0;
@@ -579,9 +580,9 @@ if ($result)
 
             $var = !$var;
             print "<tr ".$bc[$var]."><td>&nbsp;</td>";
-            
+
             print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
-            
+
             if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
             print '<td align="right">'.price(-$obj->amount).'</td>';
             print '</tr>';