diff --git a/htdocs/comm/askpricesupplier/list.php b/htdocs/comm/askpricesupplier/list.php
index 148156f4da2..7beebf643ff 100644
--- a/htdocs/comm/askpricesupplier/list.php
+++ b/htdocs/comm/askpricesupplier/list.php
@@ -282,11 +282,19 @@ if ($result)
print '
';
print_liste_field_titre($langs->trans('Ref'),$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder);
+
+ /* PHFAVRE
print_liste_field_titre($langs->trans('RefCustomer'),$_SERVER["PHP_SELF"],'p.ref_client','',$param,'',$sortfield,$sortorder);
+ */
+
print_liste_field_titre($langs->trans('Company'),$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder);
+
+ /* PHFAVRE
print_liste_field_titre($langs->trans('Town'),$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Date'),$_SERVER["PHP_SELF"],'p.datep','',$param, 'align="center"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans('DateEndPropalShort'),$_SERVER["PHP_SELF"],'dfv','',$param, 'align="center"',$sortfield,$sortorder);
+ */
+
+ print_liste_field_titre($langs->trans('AskPriceSupplierDate'),$_SERVER["PHP_SELF"],'dfv','',$param, 'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('AmountHT'),$_SERVER["PHP_SELF"],'p.total_ht','',$param, 'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Author'),$_SERVER["PHP_SELF"],'u.login','',$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans('Status'),$_SERVER["PHP_SELF"],'p.fk_statut','',$param,'align="right"',$sortfield,$sortorder);
@@ -297,13 +305,21 @@ if ($result)
print '| ';
print '';
print ' | ';
+
+ /* PHFAVRE
print '';
print '';
print ' | ';
+ */
+
print '';
print '';
print ' | ';
+
+ /* PHFAVRE
print ' | ';
+ */
+
// Date
print '';
//print $langs->trans('Month').': ';
@@ -312,9 +328,13 @@ if ($result)
$syear = $year;
$formother->select_year($syear,'year',1, 20, 5);
print ' | ';
+
+ /* PHFAVRE
print ' | ';
+ */
+
// Amount
- print '';
+ print ' | ';
print '';
print ' | ';
// Author
@@ -373,9 +393,11 @@ if ($result)
print "\n";
// Customer ref
+ /* PHFAVRE
print '';
print $objp->ref_client;
print ' | ';
+ */
$url = DOL_URL_ROOT.'/comm/card.php?socid='.$objp->rowid;
@@ -389,16 +411,19 @@ if ($result)
print '';
// Town
+ /* PHFAVRE
print '';
print $objp->town;
print ' | ';
-
+ */
+
// Date proposal
print '';
print dol_print_date($db->jdate($objp->dp), 'day');
print " | \n";
// Date end validity
+ /* PHFAVRE
if ($objp->dfv)
{
print ''.dol_print_date($db->jdate($objp->dfv),'day');
@@ -408,7 +433,8 @@ if ($result)
{
print ' | | ';
}
-
+ */
+
print ''.price($objp->total_ht)." | \n";
$userstatic->id=$objp->fk_user_author;
@@ -431,22 +457,22 @@ if ($result)
}
if ($total>0)
- {
- if($num<$limit){
- $var=!$var;
- print '
| '.$langs->trans("TotalHT").' | ';
- print ''.price($total).' | | ';
- print '
';
- }
- else
- {
- $var=!$var;
- print '| '.$langs->trans("TotalHTforthispage").' | ';
- print ''.price($total).' | | ';
- print '
';
- }
+ {
+ if($num<$limit){
+ $var=!$var;
+ print '| '.$langs->trans("TotalHT").' | ';
+ print ''.price($total).' | | ';
+ print '
';
+ }
+ else
+ {
+ $var=!$var;
+ print '| '.$langs->trans("TotalHTforthispage").' | ';
+ print ''.price($total).' | | ';
+ print '
';
+ }
- }
+ }
print '';