--- /tmp/dsg/dolibarr/htdocs/compta/charges/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/compta/charges/client_index.php
@@ -51,7 +51,7 @@
 $mode = GETPOST("mode", 'alpha');

 $year = GETPOST("year", 'int');

 $filtre = GETPOST("filtre", 'alpha');

-if (!$year) { $year = date("Y", time()); }

+if (!$year && $mode != 'sconly') { $year = date("Y", time()); }

 

 $search_account = GETPOST('search_account', 'int');

 

@@ -80,10 +80,12 @@
 llxHeader('', $langs->trans("SpecialExpensesArea"));

 

 $title = $langs->trans("SpecialExpensesArea");

+if ($mode == 'sconly') $title = $langs->trans("SocialContributionsPayments");

 

 $param = '';

 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;

 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;

+if ($mode == 'sconly') $param = '&mode=sconly';

 if ($sortfield) $param .= '&sortfield='.$sortfield;

 if ($sortorder) $param .= '&sortorder='.$sortorder;

 

@@ -99,18 +101,32 @@
 print '<input type="hidden" name="page" value="'.$page.'">';

 print '<input type="hidden" name="mode" value="'.$mode.'">';

 

-$nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");

-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);

+$nav = '';

+if ($mode != 'sconly')

+{

+    $nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");

+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);

+}

+else

+{

+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);

+}

 

 if ($year) $param .= '&year='.$year;

 

-print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';

-print "<br>";

+if ($mode != 'sconly')

+{

+	print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';

+	print "<br>";

+}

 

 if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)

 {

 	// Social contributions only

-	print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');

+	if ($mode != 'sconly')

+	{

+		print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');

+	}

 

 	print '<table class="noborder centpercent">';

 	print '<tr class="liste_titre">';

@@ -121,7 +137,7 @@
 	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);

 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);

 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);

-	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);

+    if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);

 	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);

 	print "</tr>\n";

 

@@ -186,27 +202,28 @@
 			print '<td>'.$payment_sc_static->getNomUrl(1)."</td>\n";

 			// Date payment

 			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';

-			// Type payment

-			print '<td>';

-			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';

-			print $obj->num_payment.'</td>';

+	        // Type payment

+    	    print '<td>';

+    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';

+    	    print $obj->num_payment.'</td>';

 			// Account

-			if (!empty($conf->banque->enabled))

-			{

-				print '<td>';

-				if ($obj->fk_bank > 0)

-				{

-					//$accountstatic->fetch($obj->fk_bank);

-					$accountstatic->id = $obj->bid;

-					$accountstatic->ref = $obj->bref;

-					$accountstatic->number = $obj->bnumber;

-					$accountstatic->accountancy_number = $obj->account_number;

-					$accountstatic->accountancy_journal = $obj->accountancy_journal;

-					$accountstatic->label = $obj->blabel;

-					print $accountstatic->getNomUrl(1);

-				} else print '&nbsp;';

-				print '</td>';

-			}

+	    	if (!empty($conf->banque->enabled))

+		    {

+		        print '<td>';

+		        if ($obj->fk_bank > 0)

+		        {

+		        	//$accountstatic->fetch($obj->fk_bank);

+		            $accountstatic->id = $obj->bid;

+		            $accountstatic->ref = $obj->bref;

+		            $accountstatic->number = $obj->bnumber;

+		            $accountstatic->accountancy_number = $obj->account_number;

+		            $accountstatic->accountancy_journal = $obj->accountancy_journal;

+		            $accountstatic->label = $obj->blabel;

+		            print $accountstatic->getNomUrl(1);

+		        }

+		        else print '&nbsp;';

+		        print '</td>';

+		    }

 			// Paid

 			print '<td class="right">';

 			if ($obj->totalpaye) print price($obj->totalpaye);

@@ -218,15 +235,17 @@
 			$totalpaye = $totalpaye + $obj->totalpaye;

 			$i++;

 		}

-		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';

-		print '<td class="liste_total right"></td>'; // A total here has no sense

-		print '<td align="center" class="liste_total">&nbsp;</td>';

-		print '<td align="center" class="liste_total">&nbsp;</td>';

-		print '<td align="center" class="liste_total">&nbsp;</td>';

-		if (!empty($conf->banque->enabled)) print '<td></td>';

-		print '<td class="liste_total right">'.price($totalpaye)."</td>";

+	    print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';

+	    print '<td class="liste_total right"></td>'; // A total here has no sense

+	    print '<td align="center" class="liste_total">&nbsp;</td>';

+	    print '<td align="center" class="liste_total">&nbsp;</td>';

+	    print '<td align="center" class="liste_total">&nbsp;</td>';

+        if (!empty($conf->banque->enabled)) print '<td></td>';

+	    print '<td class="liste_total right">'.price($totalpaye)."</td>";

 		print "</tr>";

-	} else {

+	}

+	else

+	{

 		dol_print_error($db);

 	}

 	print '</table>';

@@ -235,110 +254,116 @@
 // VAT

 if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)

 {

-	print "<br>";

-

-	$tva = new Tva($db);

-

-	print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');

-

-	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.fk_bank,";

-	$sql .= " pct.code as payment_code,";

-	$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";

-	$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pv.fk_bank = b.rowid";

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";

-	$sql .= " WHERE pv.entity IN (".getEntity("tax").")";

-	if ($year > 0)

+	if (!$mode || $mode != 'sconly')

 	{

-		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,

-		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire

-		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";

-	}

-	if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);

-

-	$result = $db->query($sql);

-	if ($result)

-	{

-		$num = $db->num_rows($result);

-		$i = 0;

-		$total = 0;

-		print '<table class="noborder centpercent">';

-		print '<tr class="liste_titre">';

-		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);

-		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);

-		print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);

-		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);

-		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);

-		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);

-		if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);

-		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);

-		print "</tr>\n";

-		$var = 1;

-		while ($i < $num)

-		{

-			$obj = $db->fetch_object($result);

-

-			$total = $total + $obj->amount;

-

-

-			print '<tr class="oddeven">';

-			print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";

-

-			print "<td>".$obj->label."</td>\n";

-

-			print '<td class="right">'.price($obj->amount)."</td>";

-

-			// Ref payment

-			$tva_static->id = $obj->rowid;

-			$tva_static->ref = $obj->rowid;

-			print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";

-

-			// Date

-			print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";

-

-			// Type payment

-			print '<td>';

-			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';

-			print $obj->num_payment.'</td>';

-

-			// Account

-			if (!empty($conf->banque->enabled))

-			{

-				print '<td>';

-				if ($obj->fk_bank > 0)

-				{

-					//$accountstatic->fetch($obj->fk_bank);

-					$accountstatic->id = $obj->bid;

-					$accountstatic->ref = $obj->bref;

-					$accountstatic->number = $obj->bnumber;

-					$accountstatic->accountancy_number = $obj->account_number;

-					$accountstatic->accountancy_journal = $obj->accountancy_journal;

-					$accountstatic->label = $obj->blabel;

-					print $accountstatic->getNomUrl(1);

-				} else print '&nbsp;';

-				print '</td>';

-			}

-

-			// Paid

-			print '<td class="right">'.price($obj->amount)."</td>";

-			print "</tr>\n";

-

-			$i++;

-		}

-		print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';

-		print '<td class="right">'.price($total).'</td>';

-		print '<td>&nbsp;</td>';

-		print '<td>&nbsp;</td>';

-		print '<td>&nbsp;</td>';

-		print '<td>&nbsp;</td>';

-		print '<td class="right">'.price($total)."</td>";

-		print "</tr>";

-

-		print "</table>";

-		$db->free($result);

-	} else {

-		dol_print_error($db);

+		print "<br>";

+

+		$tva = new Tva($db);

+

+		print load_fiche_titre($langs->trans("VATPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');

+

+		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.fk_bank,";

+		$sql .= " pct.code as payment_code,";

+		$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";

+		$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pv.fk_bank = b.rowid";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";

+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";

+		$sql .= " WHERE pv.entity IN (".getEntity("tax").")";

+		if ($year > 0)

+		{

+			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,

+			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire

+			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";

+		}

+		if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);

+

+		$result = $db->query($sql);

+		if ($result)

+		{

+		    $num = $db->num_rows($result);

+		    $i = 0;

+		    $total = 0;

+		    print '<table class="noborder centpercent">';

+		    print '<tr class="liste_titre">';

+			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);

+			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);

+			print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);

+			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);

+			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);

+			print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);

+			if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);

+			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);

+		    print "</tr>\n";

+		    $var = 1;

+		    while ($i < $num)

+		    {

+		        $obj = $db->fetch_object($result);

+

+		        $total = $total + $obj->amount;

+

+

+		        print '<tr class="oddeven">';

+		        print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";

+

+		        print "<td>".$obj->label."</td>\n";

+

+		        print '<td class="right">'.price($obj->amount)."</td>";

+

+		        // Ref payment

+				$tva_static->id = $obj->rowid;

+				$tva_static->ref = $obj->rowid;

+		        print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";

+

+		        // Date

+		        print '<td class="center">'.dol_print_date($db->jdate($obj->dm), 'day')."</td>\n";

+

+		        // Type payment

+	    	    print '<td>';

+	    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';

+	    	    print $obj->num_payment.'</td>';

+

+		    	// Account

+		    	if (!empty($conf->banque->enabled))

+			    {

+			        print '<td>';

+			        if ($obj->fk_bank > 0)

+			        {

+			        	//$accountstatic->fetch($obj->fk_bank);

+			            $accountstatic->id = $obj->bid;

+			            $accountstatic->ref = $obj->bref;

+			            $accountstatic->number = $obj->bnumber;

+			            $accountstatic->accountancy_number = $obj->account_number;

+			            $accountstatic->accountancy_journal = $obj->accountancy_journal;

+			            $accountstatic->label = $obj->blabel;

+			            print $accountstatic->getNomUrl(1);

+			        }

+			        else print '&nbsp;';

+			        print '</td>';

+			    }

+

+	    	    // Paid

+		    	print '<td class="right">'.price($obj->amount)."</td>";

+		        print "</tr>\n";

+

+		        $i++;

+		    }

+		    print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';

+		    print '<td class="right">'.price($total).'</td>';

+		    print '<td>&nbsp;</td>';

+		    print '<td>&nbsp;</td>';

+		    print '<td>&nbsp;</td>';

+		    print '<td>&nbsp;</td>';

+		    print '<td class="right">'.price($total)."</td>";

+		    print "</tr>";

+

+		    print "</table>";

+		    $db->free($result);

+		}

+		else

+		{

+		    dol_print_error($db);

+		}

 	}

 }

 

@@ -347,92 +372,94 @@
 {

 	$j = 1;

 	$numlt = 3;

-} elseif ($mysoc->localtax1_assuj == "1")

+}

+elseif ($mysoc->localtax1_assuj == "1")

 {

 	$j = 1;

 	$numlt = 2;

-} elseif ($mysoc->localtax2_assuj == "1")

+}

+elseif ($mysoc->localtax2_assuj == "1")

 {

 	$j = 2;

 	$numlt = 3;

-} else {

+}

+else

+{

 	$j = 0;

 	$numlt = 0;

 }

 

 while ($j < $numlt)

 {

-	print "<br>";

-

-	$tva = new Tva($db);

-

-	print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');

-

-

-	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";

-	$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";

-	$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;

-	if ($year > 0)

+	if (!$mode || $mode != 'sconly')

 	{

-		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,

-		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire

-		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";

+		print "<br>";

+

+		$tva = new Tva($db);

+

+		print load_fiche_titre($langs->transcountry(($j == 1 ? "LT1Payments" : "LT2Payments"), $mysoc->country_code).($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');

+

+

+		$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";

+		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";

+		$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;

+		if ($year > 0)

+		{

+			// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,

+			// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire

+			$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";

+		}

+		if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);

+

+		$result = $db->query($sql);

+		if ($result)

+		{

+			$num = $db->num_rows($result);

+			$i = 0;

+			$total = 0;

+			print '<table class="noborder centpercent">';

+			print '<tr class="liste_titre">';

+			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);

+			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);

+			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);

+			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);

+			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);

+			print "</tr>\n";

+

+			while ($i < $num)

+			{

+				$obj = $db->fetch_object($result);

+

+				$total = $total + $obj->amount;

+

+				print '<tr class="oddeven">';

+				print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";

+

+				print "<td>".$obj->label."</td>\n";

+

+				// Ref payment

+				$tva_static->id = $obj->rowid;

+				$tva_static->ref = $obj->rowid;

+				print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";

+

+				print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";

+				print '<td class="right">'.price($obj->amount)."</td>";

+				print "</tr>\n";

+

+				$i++;

+			}

+			print '<tr class="liste_total"><td class="right" colspan="4">'.$langs->trans("Total").'</td>';

+			print '<td class="right">'.price($total)."</td>";

+			print "</tr>";

+

+			print "</table>";

+			$db->free($result);

+		}

+		else

+		{

+			dol_print_error($db);

+		}

 	}

-	if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);

-

-	$result = $db->query($sql);

-	if ($result)

-	{

-		$num = $db->num_rows($result);

-		$i = 0;

-		$total = 0;

-		print '<table class="noborder centpercent">';

-		print '<tr class="liste_titre">';

-		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="120"', $sortfield, $sortorder);

-		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);

-		print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);

-		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);

-		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datep", "", $param, 'align="center"', $sortfield, $sortorder);

-		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);

-		print "</tr>\n";

-

-		while ($i < $num)

-		{

-			$obj = $db->fetch_object($result);

-

-			$total = $total + $obj->amount;

-

-			print '<tr class="oddeven">';

-			print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";

-

-			print "<td>".$obj->label."</td>\n";

-

-			print '<td class="right">'.price($obj->amount)."</td>";

-

-			// Ref payment

-			$tva_static->id = $obj->rowid;

-			$tva_static->ref = $obj->rowid;

-			print '<td class="left">'.$tva_static->getNomUrl(1)."</td>\n";

-

-			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'day')."</td>\n";

-			print '<td class="right">'.price($obj->amount)."</td>";

-			print "</tr>\n";

-

-			$i++;

-		}

-		print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("Total").'</td>';

-		print '<td class="right">'.price($total)."</td>";

-		print '<td align="center">&nbsp;</td>';

-		print '<td align="center">&nbsp;</td>';

-		print '<td class="right">'.price($total)."</td>";

-		print "</tr>";

-

-		print "</table>";

-		$db->free($result);

-	} else {

-		dol_print_error($db);

-	}

-

 	$j++;

 }

 

@@ -441,6 +468,8 @@
 /*

 if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))

 {

+    if (!$mode || $mode != 'sconly')

+    {

         $sal = new PaymentSalary($db);

 

         print "<br>";

@@ -521,7 +550,8 @@
 			            $accountstatic->accountancy_journal = $obj->accountancy_journal;

 			            $accountstatic->label = $obj->blabel;

 			            print $accountstatic->getNomUrl(1);

-			        } else print '&nbsp;';

+			        }

+			        else print '&nbsp;';

 			        print '</td>';

 			    }

 

@@ -539,9 +569,12 @@
             $db->free($result);

 

             print "<br>";

-        } else {

+        }

+        else

+        {

             dol_print_error($db);

         }

+    }

 }

 */