diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 4e20989870f..355393c2891 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -262,6 +262,10 @@ NoExample=No example FindBug=Report a bug NbOfCustomers=Number of customers NbOfLines=Number of lines +NbOfObjects=Number of objects +NbOfReferers=Number of referers +Referers=Referers +TotalQuantity=Total quantity # Countries CountryFR=France CountryBE=Belgium diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 2ab8b8c0f9c..79465a030b6 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -262,6 +262,10 @@ NoExample=Pas d'exemple FindBug=Signaler un bug NbOfCustomers=Nombre de clients NbOfLines=Nombre de lignes +NbOfObjects=Nombre d'objets +NbOfReferers=Nombre de référents +Referers=Référents +TotalQuantity=Quantité totale # Countries CountryFR=France CountryBE=Belgique diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index acb961b6422..f14bde9c518 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -348,7 +348,7 @@ if ($_GET["id"]) $h++; $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; - $head[$h][1] = $langs->trans('Bills'); + $head[$h][1] = $langs->trans('Referers'); $h++; dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 817706d33d6..2dee8a2a40d 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -20,7 +20,6 @@ * * $Id$ * $Source$ - * */ /** @@ -221,7 +220,7 @@ if ($_GET["id"]) $h++; $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; - $head[$h][1] = $langs->trans('Bills'); + $head[$h][1] = $langs->trans('Referers'); $h++; dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index f1e6ebc8178..43576f4088b 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -147,7 +147,7 @@ if ($_GET["id"]) $h++; $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; - $head[$h][1] = $langs->trans('Bills'); + $head[$h][1] = $langs->trans('Referers'); $h++; dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index a191ce4a398..19c10582d20 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -20,7 +20,6 @@ * * $Id$ * $Source$ - * */ /** @@ -138,7 +137,7 @@ $head[$h][1] = $langs->trans('Packs'); $h++; $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; -$head[$h][1] = $langs->trans("Bills"); +$head[$h][1] = $langs->trans("Referers"); $h++; dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index e8bac873f4f..b4f80e032e2 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -45,21 +45,21 @@ if ($page == -1) $page = 0; $limit = $conf->liste_limit; $offset = $limit * $page ; - if ($user->societe_id > 0) { $action = ''; $socid = $user->societe_id; } -llxHeader(); - /* * Affiche fiche * */ +llxHeader(); + + if ($_GET["id"]) { $product = new Product($db); @@ -126,7 +126,7 @@ if ($_GET["id"]) $h++; $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; - $head[$h][1] = $langs->trans('Bills'); + $head[$h][1] = $langs->trans('Referers'); $hselected=$h; $h++; @@ -137,20 +137,95 @@ if ($_GET["id"]) print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Prix - print ''; + print ''; // Statut - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + // Propals + if ($conf->propal->enabled) + { + $ret=$product->load_stats_propale($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("propal"); + print ''; + print ''; + } + // Commandes + if ($conf->commande->enabled) + { + $ret=$product->load_stats_commande($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("orders"); + print ''; + print ''; + } + // Contrats + if ($conf->contrat->enabled) + { + $ret=$product->load_stats_contrat($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("contracts"); + print ''; + print ''; + } + // Factures + if ($conf->facture->enabled) + { + $ret=$product->load_stats_facture($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("bills"); + print ''; + print ''; + } + print "
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Status").''; + print '
'.$langs->trans("Status").''; if ($product->envente) print $langs->trans("OnSell"); else print $langs->trans("NotOnSell"); print '
'.$langs->trans("Referers").''.$langs->trans("NbOfCustomers").''.$langs->trans("NbOfReferers").''.$langs->trans("TotalQuantity").'
'; + print ''.$langs->trans("Proposals").''; + print ''; + print $product->stats_propale['customers']; + print ''; + print $product->stats_propale['nb']; + print ''; + print $product->stats_propale['qty']; + print '
'; + print ''.$langs->trans("Orders").''; + print ''; + print $product->stats_commande['customers']; + print ''; + print $product->stats_commande['nb']; + print ''; + print $product->stats_commande['qty']; + print '
'; + print ''.$langs->trans("Contracts").''; + print ''; + print $product->stats_contrat['customers']; + print ''; + print $product->stats_contrat['nb']; + print ''; + print $product->stats_contrat['qty']; + print '
'; + print ''.$langs->trans("Bills").''; + print ''; + print $product->stats_facture['customers']; + print ''; + print $product->stats_facture['nb']; + print ''; + print $product->stats_facture['qty']; + print '
"; print ''; diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php index 08f7b7d754f..2147096a9a1 100644 --- a/htdocs/product/stats/fiche.php +++ b/htdocs/product/stats/fiche.php @@ -20,7 +20,6 @@ * * $Id$ * $Source$ - * */ /** @@ -178,7 +177,7 @@ if ($_GET["id"]) $h++; $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; - $head[$h][1] = $langs->trans('Bills'); + $head[$h][1] = $langs->trans('Referers'); $h++; dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); @@ -186,86 +185,108 @@ if ($_GET["id"]) print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; - print ''; - print ''; + print ''; // Statut - print ''; - print "
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).''; - // Propals - if ($conf->propal->enabled) - { - $langs->load("propal"); - print ''.$langs->trans("Proposals").' : '.$product->count_propale($socid); - print " (Proposé à ".$product->count_propale_client($socid)." clients)
"; - } - // Commande - if ($conf->commande->enabled) - { - $langs->load("orders"); - print ''.$langs->trans("Orders").' : '.$product->count_facture($socid)."
"; - } - // Factures - if ($conf->facture->enabled) - { - $langs->load("bills"); - print ''.$langs->trans("Bills").' : '.$product->count_facture($socid); - } - print '
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Status").''; + print '
'.$langs->trans("Status").''; if ($product->envente) print $langs->trans("OnSell"); else print $langs->trans("NotOnSell"); print '
"; + print ''.$langs->trans("Referers").''; + print ''.$langs->trans("NbOfCustomers").''; + print ''.$langs->trans("NbOfReferers").''; + print ''.$langs->trans("TotalQuantity").''; + print ''; - print '
'; - print ''; - print ''; - - print ''; - if (file_exists($filenbvente) && filemtime($filenbvente)) + // Propals + if ($conf->propal->enabled) { - print ''; + $ret=$product->load_stats_propale($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("propal"); + print ''; + print ''; } - else + // Commandes + if ($conf->commande->enabled) { - print ''; + $ret=$product->load_stats_commande($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("orders"); + print ''; + print ''; } - print ''; - if (file_exists($filenbpiece) && filemtime($filenbpiece)) + // Contrats + if ($conf->contrat->enabled) { - print ''; + $ret=$product->load_stats_contrat($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("contracts"); + print ''; + print ''; } - else + // Factures + if ($conf->facture->enabled) { - print ''; + $ret=$product->load_stats_facture($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("bills"); + print ''; + print ''; } - print ''; - print ''; + print '
Nombre de ventes
sur les 12 derniers mois
Nombre de pièces vendues
'; - $file=$product->id.'/vente12mois.png'; - print 'Ventes sur les 12 derniers mois'; - - print ''; - $file=$product->id.'/vendu12mois.png'; - print 'Nombre de pièces vendues sur les 12 derniers mois'; - - print '
'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbvente),"%d %b %Y %H:%M:%S")).'
'; + print ''.$langs->trans("Proposals").''; + print ''; + print $product->stats_propale['customers']; + print ''; + print $product->stats_propale['nb']; + print ''; + print $product->stats_propale['qty']; + print '
'.$langs->trans("ChartNotGenerated").'
'; + print ''.$langs->trans("Orders").''; + print ''; + print $product->stats_commande['customers']; + print ''; + print $product->stats_commande['nb']; + print ''; + print $product->stats_commande['qty']; + print '
['.$langs->trans("ReCalculate").']'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbpiece),"%d %b %Y %H:%M:%S")).'
'; + print ''.$langs->trans("Contracts").''; + print ''; + print $product->stats_contrat['customers']; + print ''; + print $product->stats_contrat['nb']; + print ''; + print $product->stats_contrat['qty']; + print '
'.$langs->trans("ChartNotGenerated").'
'; + print ''.$langs->trans("Bills").''; + print ''; + print $product->stats_facture['customers']; + print ''; + print $product->stats_facture['nb']; + print ''; + print $product->stats_facture['qty']; + print '
['.$langs->trans("ReCalculate").']
Statistiques effectuées sur les factures payées uniquement
'; + print ''; + + print ''; + + + // Ligne de graph print ''; print ''; - + // Place pour autre graphique print ''; + print ''; + print ''; if (file_exists($filenbpropal) && filemtime($filenbpropal)) { print ''; @@ -284,10 +305,41 @@ if ($_GET["id"]) print ''; } print ''; + + // Ligne de graph + print ''; + print ''; + print ''; + print ''; + if (file_exists($filenbvente) && filemtime($filenbvente)) + { + print ''; + } + else + { + print ''; + } + print ''; + if (file_exists($filenbpiece) && filemtime($filenbpiece)) + { + print ''; + } + else + { + print ''; + } + print ''; + + print '
Nombre de propositions commerciales
sur les 12 derniers mois
-
'; $file=$product->id.'/'.$img_propal_name; print 'Nombre de propales sur les 12 derniers mois'; - - print ' '; - - // Place pour autre graphique - - print '
 
'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbpropal),"%d %b %Y %H:%M:%S")).''.$langs->trans("ChartNotGenerated").'['.$langs->trans("ReCalculate").']
Nombre de ventes
sur les 12 derniers mois
Nombre de pièces vendues
'; + $file=$product->id.'/vente12mois.png'; + print 'Ventes sur les 12 derniers mois'; + print ''; + $file=$product->id.'/vendu12mois.png'; + print 'Nombre de pièces vendues sur les 12 derniers mois'; + print '
'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbvente),"%d %b %Y %H:%M:%S")).''.$langs->trans("ChartNotGenerated").'['.$langs->trans("ReCalculate").']'.$langs->trans("GeneratedOn",dolibarr_print_date(filemtime($filenbpiece),"%d %b %Y %H:%M:%S")).''.$langs->trans("ChartNotGenerated").'['.$langs->trans("ReCalculate").']
'; - print ''; } } else diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 779a51f3f3b..d18a041f941 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -30,134 +30,261 @@ require("./pre.inc.php"); +$mesg = ''; + +$page = $_GET["page"]; +$sortfield=$_GET["sortfield"]; +$sortorder=$_GET["sortorder"]; +if (! $sortorder) $sortorder="DESC"; +if (! $sortfield) $sortfield="p.datec"; +if ($page == -1) $page = 0; +$limit = $conf->liste_limit; +$offset = $limit * $page ; + if ($user->societe_id > 0) { $action = ''; $socid = $user->societe_id; } +else +{ + $socid = 0; +} -llxHeader(); - -$mesg = ''; /* - * + * Affiche fiche * */ +llxHeader(); + if ($_GET["id"]) { - $product = new Product($db); - $result = $product->fetch($_GET["id"]); - - if ( $result ) - { - print_fiche_titre($langs->trans("Product").': '.$product->ref, $mesg); - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "
'.$langs->trans("Ref").''.$product->ref.''.$langs->trans("Statistics").'
'.$langs->trans("Label").''.$product->libelle.''; - // Propals - if ($conf->propal->enabled) { - $langs->load("propal"); - print ''.$langs->trans("Proposals").' : '.$product->count_propale($socid); - print " (Proposé à ".$product->count_propale_client($socid)." clients)
"; - } - // Commande - if ($conf->commande->enabled) { - $langs->load("orders"); - print ''.$langs->trans("Orders").' : '.$product->count_facture($socid)."
"; - } - // Factures - if ($conf->facture->enabled) { - $langs->load("bills"); - print ''.$langs->trans("Bills").' : '.$product->count_facture($socid); - } - print '
'.$langs->trans("CurrentPrice").''.price($product->price).'
"; + $product = new Product($db); + $result = $product->fetch($_GET["id"]); - if ($page == -1) - { - $page = 0 ; - } - $limit = $conf->liste_limit; - $offset = $limit * $page ; - - if ($sortorder == "") - { - $sortorder="DESC"; - } - if ($sortfield == "") - { - $sortfield="p.datep"; - } - - print "
"; - print_barre_liste($langs->trans("Proposals"),$page,"propal.php","&id=$product->id",$sortfield,$sortorder); - - $sql = "SELECT distinct(p.rowid), s.nom,s.idp, p.ref,".$db->pdate("p.datep")." as df,p.rowid as facid"; - $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."propaldet as d WHERE p.fk_soc = s.idp"; - $sql .= " AND d.fk_propal = p.rowid AND d.fk_product =".$product->id; - - if ($socid) - { - $sql .= " AND p.fk_soc = $socid"; - } + if ( $result > 0) + { + /* + * En mode visu + */ + + $h=0; + + $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans("Card"); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$product->id; + $head[$h][1] = $langs->trans("Price"); + $h++; + + if($product->type == 0) + { + if ($user->rights->barcode->lire) + { + if ($conf->barcode->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/barcode.php?id=".$product->id; + $head[$h][1] = $langs->trans("BarCode"); + $h++; + } + } + } + + + $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id; + $head[$h][1] = $langs->trans("Photos"); + $h++; + + if($product->type == 0) + { + if ($conf->stock->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id; + $head[$h][1] = $langs->trans("Stock"); + $h++; + } + } + + if ($conf->fournisseur->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id; + $head[$h][1] = $langs->trans("Suppliers"); + $h++; + } + + $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans('Statistics'); + $h++; + + //erics: pour créer des produits composés de x 'sous' produits + $head[$h][0] = DOL_URL_ROOT."/product/pack.php?id=".$product->id; + $head[$h][1] = $langs->trans('Packs'); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; + $head[$h][1] = $langs->trans('Referers'); + $hselected=$h; + $h++; + + + dolibarr_fiche_head($head, $hselected, $langs->trans("CardProduct".$product->type).' : '.$product->ref); - $sql .= " ORDER BY $sortfield $sortorder "; - $sql .= $db->plimit( $limit ,$offset); + print ''; + print ''; + print ''; + print ''; + print ''; - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows(); - - $i = 0; - print "
'.$langs->trans("Ref").''.$product->ref.'
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
"; - print ''; - print_liste_field_titre($langs->trans("Ref"),"propal.php","p.rowid","","&id=".$_GET["id"],'',$sortfield); - print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","","&id=".$_GET["id"],'',$sortfield); - print_liste_field_titre($langs->trans("Date"),"propal.php","f.datef","","&id=".$_GET["id"],'align="right"',$sortfield); - print "\n"; - - if ($num > 0) - { - $var=True; - while ($i < $num) - { - $objp = $db->fetch_object( $i); - $var=!$var; - - print ""; - print '\n"; - print ''; - print ""; - print "\n"; - $i++; - } - } - } - else - { - dolibarr_print_error($db); - } - print "
'; - print img_object($langs->trans("ShowPropal"),"propal").' '; - print $objp->ref; - print "'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.'"; - print strftime("%d %B %Y",$objp->df)."
"; - $db->free(); + // Statut + print ''.$langs->trans("Status").''; + if ($product->envente) print $langs->trans("OnSell"); + else print $langs->trans("NotOnSell"); + print ''; + + print ''.$langs->trans("Referers").''; + print ''.$langs->trans("NbOfCustomers").''; + print ''.$langs->trans("NbOfReferers").''; + print ''.$langs->trans("TotalQuantity").''; + print ''; + + // Propals + if ($conf->propal->enabled) + { + $ret=$product->load_stats_propale($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("propal"); + print ''; + print ''.$langs->trans("Proposals").''; + print ''; + print $product->stats_propale['customers']; + print ''; + print $product->stats_propale['nb']; + print ''; + print $product->stats_propale['qty']; + print ''; + print ''; + } + // Commandes + if ($conf->commande->enabled) + { + $ret=$product->load_stats_commande($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("orders"); + print ''; + print ''.$langs->trans("Orders").''; + print ''; + print $product->stats_commande['customers']; + print ''; + print $product->stats_commande['nb']; + print ''; + print $product->stats_commande['qty']; + print ''; + print ''; + } + // Contrats + if ($conf->contrat->enabled) + { + $ret=$product->load_stats_contrat($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("contracts"); + print ''; + print ''.$langs->trans("Contracts").''; + print ''; + print $product->stats_contrat['customers']; + print ''; + print $product->stats_contrat['nb']; + print ''; + print $product->stats_contrat['qty']; + print ''; + print ''; + } + // Factures + if ($conf->facture->enabled) + { + $ret=$product->load_stats_facture($socid); + if ($ret < 0) dolibarr_print_error($db); + $langs->load("bills"); + print ''; + print ''.$langs->trans("Bills").''; + print ''; + print $product->stats_facture['customers']; + print ''; + print $product->stats_facture['nb']; + print ''; + print $product->stats_facture['qty']; + print ''; + print ''; + } + + print ""; + + print ''; + + print_barre_liste($langs->trans("Proposals"),$page,"propal.php","&id=$product->id",$sortfield,$sortorder); + + $sql = "SELECT distinct(p.rowid), s.nom,s.idp, p.ref,".$db->pdate("p.datep")." as df,p.rowid as facid"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."propaldet as d WHERE p.fk_soc = s.idp"; + $sql .= " AND d.fk_propal = p.rowid AND d.fk_product =".$product->id; + + if ($socid) + { + $sql .= " AND p.fk_soc = $socid"; + } + + $sql .= " ORDER BY $sortfield $sortorder "; + $sql .= $db->plimit( $limit ,$offset); + + $result = $db->query($sql); + if ($result) + { + $num = $db->num_rows($result); + + $i = 0; + print ""; + print ''; + print_liste_field_titre($langs->trans("Ref"),"propal.php","p.rowid","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","","&id=".$_GET["id"],'',$sortfield); + print_liste_field_titre($langs->trans("Date"),"propal.php","f.datef","","&id=".$_GET["id"],'align="right"',$sortfield); + print "\n"; + + if ($num > 0) + { + $var=True; + while ($i < $num) + { + $objp = $db->fetch_object($result); + $var=!$var; + + print ""; + print '\n"; + print ''; + print ""; + print "\n"; + $i++; + } + } + } + else + { + dolibarr_print_error($db); + } + print "
'; + print img_object($langs->trans("ShowPropal"),"propal").' '; + print $objp->ref; + print "'.img_object($langs->trans("ShowCompany"),"company").' '.$objp->nom.'"; + print strftime("%d %B %Y",$objp->df)."
"; + $db->free($result); } } else { - print "Error"; + dolibarr_print_error(); } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?>