From 9f97a3e9dab3a22432724ec9b5d77afc51d856fd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Aug 2005 14:49:20 +0000 Subject: [PATCH] New: Ajout date derniere modif sur liste des produits/services --- htdocs/product/fiche.php | 16 ++++++++-------- htdocs/product/liste.php | 15 ++++++++++----- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index ba30c85f5d2..acb961b6422 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -583,11 +583,11 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print '
'; print ""; print "propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."\n"; - print "idp\">$objp->nom\n"; + print "idp\">".dolibarr_trunc($objp->nom,18)."\n"; print "". strftime("%d %b",$objp->dp)."\n"; print ''; print ''; - print ''.$langs->trans("Discount"); + print ''.$langs->trans("Discount"); print '%'; print " ".$product->stock_proposition; print ''; @@ -621,7 +621,7 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) $htmls->select_array("propalid", $otherprop); print ''; print ''. strftime("%d %b",$objp->dp)."\n"; - print ''.$langs->trans("Discount"); + print ''.$langs->trans("Discount"); print '%'; print ''; print ''; @@ -671,12 +671,12 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print ''; print ""; print "factureid\">".img_object($langs->trans("ShowBills"),"bill")." ".$objp->facnumber."\n"; - print "idp\">$objp->nom\n"; + print "idp\">".dolibarr_trunc($objp->nom,18)."\n"; print "". strftime("%d %b",$objp->df)."\n"; print ''; print ''; - print ''.$langs->trans("Discount"); - print '%'; + print ''.$langs->trans("Discount"); + print '%'; print ''; print ''; print ''; @@ -726,8 +726,8 @@ if ($_GET["id"] && $_GET["action"] == '' && $product->envente) print "". strftime("%d %b",$objp->df)."\n"; print ''; print ''; - print ''.$langs->trans("Discount"); - print '%'; + print ''.$langs->trans("Discount"); + print '%'; print ''; print ''; print ''; diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 4353200644a..3f86a775dc6 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -65,8 +65,8 @@ if (isset($_POST["button_removefilter_x"])) { $title=$langs->trans("ProductsAndServices"); -$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.fk_product_type"; -$sql .= " FROM ".MAIN_DB_PREFIX."product as p"; +$sql = 'SELECT p.rowid, p.label, p.price, p.ref, p.fk_product_type, '.$db->pdate('p.tms').' as datem'; +$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; if ($_GET["fourn_id"] > 0) { @@ -174,6 +174,7 @@ if ($resql) print ""; print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); + print_liste_field_titre($langs->trans("DateModification"),"liste.php", "p.tms","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield); print "\n"; @@ -189,6 +190,9 @@ if ($resql) print ''; print ''; print ''; + print ''; + print ' '; + print ''; print ''; print ''; print ''; @@ -206,9 +210,10 @@ if ($resql) print "rowid\">"; if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); else print img_object($langs->trans("ShowProduct"),"product"); - print " "; - print "rowid\">$objp->ref\n"; - print "$objp->label\n"; + print ' '; + print ''.$objp->ref.''; + print ''.$objp->label.''; + print ''.dolibarr_print_date($objp->datem).''; print ''.price($objp->price).''; print "\n"; $i++;