| '.$langs->trans("Total").' | ';
print '';
print '| '.$langs->trans("Categories").' | ';
print '| ';
@@ -246,6 +250,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
print $total;
print ' | ';
print ' ';
+ print '';
}
print '';
@@ -281,6 +286,7 @@ if ($result)
if (isset($_GET["type"]) && $_GET["type"] == 0) $transRecordedType = $langs->trans("LastRecordedProducts",$max);
if (isset($_GET["type"]) && $_GET["type"] == 1) $transRecordedType = $langs->trans("LastRecordedServices",$max);
+ print ' ';
print ' ';
$colnb=5;
@@ -355,6 +361,7 @@ if ($result)
$db->free($result);
print " ";
+ print ' ';
print ' ';
}
}
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 10bec155ded..60b0ffa0809 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -1,4 +1,4 @@
-global->PROJECT_USE_OPPORTUNITIES))
{
$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
@@ -48,7 +48,8 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
$db->free($resql);
$ponderated_opp_amount = $ponderated_opp_amount / 100;
-
+
+ print ' ';
print ' ';
print '| '.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").' | '."\n";
$var=true;
@@ -67,7 +68,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
$dataseries[]=array('label'=>$labelstatus,'data'=>(isset($valsamount[$status])?(float) $valsamount[$status]:0));
if (! $conf->use_javascript_ajax)
{
-
+
print '';
print '| '.$labelstatus.' | ';
print ''.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).' | ';
@@ -88,7 +89,10 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
//print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')';
print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1);
print ''.price(price2num($ponderated_opp_amount,'MT'), 0, '', 1, -1, -1, $conf->currency).' | ';
- print " ";
+ print " |