X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdashboard.inc;h=69654c88e39f9ba6e4624c6e55e1c663dead245d;hb=cf776631b028241405a5b2c41d0c03da456880f7;hp=4b552cfb33d0677649c01e2a12264fdfe4695c6d;hpb=ab957b7b0aeb7e12c108ba6445ed5d5fef87072b;p=fa-stable.git

diff --git a/includes/dashboard.inc b/includes/dashboard.inc
index 4b552cfb..69654c88 100644
--- a/includes/dashboard.inc
+++ b/includes/dashboard.inc
@@ -53,9 +53,12 @@ function dashboard($sel_app)
 		display_all();
 }
 
-function display_title($title, $colspan=2)
+function display_title($title)
 {
-	echo "<tr><td colspan=$colspan class='headingtext' style='text-align:center;border:0;height:40px;'>$title</td></tr>\n";
+	br();
+	display_heading($title);
+	br();
+	//echo "<tr><td colspan=$colspan class='headingtext' style='background-color:#fff;text-align:center;border:0;height:40px;'>$title</td></tr>\n";
 }	
 
 function table_one()
@@ -115,7 +118,8 @@ function display_stock_topten($type=0)
 		$source = _("Manufacturing");
 	else	
 		$source = _("Items");
-	source_graphic($today, $title, $source, $pg, ($type == 0 ? _("Sales") : _("Value")));
+	source_graphic($today, $title, $source, $pg, ($type == 0 ? _("Sales") : _("Amount")), 
+		($type == 0 ? _("Costs") : null));
 	table_end();
 }
 
@@ -178,9 +182,9 @@ function customer_top($today, $limit=10, $width="33", &$pg=null)
 		LIMIT $limit";
 	$result = db_query($sql);
 	$title = _("Top $limit customers in fiscal year");
+	display_title($title);
 	$th = array(_("Customer"), _("Amount"));
 	start_table(TABLESTYLE, "width='$width%'");
-	display_title($title, count($th));
 	table_header($th);
 	check_page_security('SA_SALESTRANSVIEW');
 	$k = 0; //row colour counter
@@ -215,9 +219,9 @@ function supplier_top($today, $limit=10, $width="33", &$pg=null)
 		LIMIT $limit";
 	$result = db_query($sql);
 	$title = _("Top $limit suppliers in fiscal year");
+	display_title($title);
 	$th = array(_("Supplier"), _("Amount"));
 	start_table(TABLESTYLE, "width='$width%'");
-	display_title($title, count($th));
 	table_header($th);
 	check_page_security('SA_SUPPTRANSVIEW');
 	$k = 0; //row colour counter
@@ -254,7 +258,7 @@ function stock_top($today, $limit=10, $width="33", $type=0, &$pg=null)
 	if ($type == 0)
 	{
 		$sql = "SELECT SUM((trans.unit_price * trans.quantity) * d.rate) AS total, s.stock_id, s.description, 
-			SUM(trans.quantity) AS qty FROM
+			SUM(trans.quantity) AS qty, SUM((s.material_cost + s.overhead_cost + s.labour_cost) * trans.quantity) AS costs FROM
 			".TB_PREF."debtor_trans_details AS trans, ".TB_PREF."stock_master AS s, ".TB_PREF."debtor_trans AS d 
 			WHERE trans.stock_id=s.stock_id AND trans.debtor_trans_type=d.type AND trans.debtor_trans_no=d.trans_no
 			AND (d.type = ".ST_SALESINVOICE." OR d.type = ".ST_CUSTCREDIT.") ";
@@ -278,9 +282,12 @@ function stock_top($today, $limit=10, $width="33", $type=0, &$pg=null)
 		$title = _("Top $limit Fixed Assets in fiscal year");
 	else	
 		$title = _("Top $limit Sold Items in fiscal year");
-	$th = array(_("Item"), _("Amount"), _("Quantity"));
+	display_title($title);	
+	if ($type == 0)	
+		$th = array(_("Item"), _("Sales"), _("Costs"), _("Quantity"));
+	else	
+		$th = array(_("Item"), _("Amount"), _("Quantity"));
 	start_table(TABLESTYLE, "width='$width%'");
-	display_title($title, count($th));	
 	table_header($th);
 	check_page_security($sec);
 	$k = 0; //row colour counter
@@ -291,11 +298,15 @@ function stock_top($today, $limit=10, $width="33", $type=0, &$pg=null)
 		$name = $myrow["description"];
 		label_cell($name);
 		amount_cell($myrow['total']);
+		if ($type == 0)
+			amount_cell($myrow['costs']);
 		qty_cell($myrow['qty']);
 		if ($pg != NULL)
 		{
 			$pg->x[$i] = $name; 
 			$pg->y[$i] = $myrow['total'];
+			if ($type == 0)
+				$pg->z[$i] = $myrow['costs'];
 		}	
 		$i++;
 		end_row();
@@ -316,9 +327,9 @@ function dimension_top($today, $limit=10, $width="33", &$pg=null)
 		t.tran_date >= '$begin1' AND t.tran_date <= '$today1' GROUP BY d.id ORDER BY total DESC LIMIT $limit";
 	$result = db_query($sql, "Transactions could not be calculated");
 	$title = _("Top $limit Dimensions in fiscal year");
+	display_title($title);
 	$th = array(_("Dimension"), _("Amount"));
 	start_table(TABLESTYLE, "width='$width%'");
-	display_title($title, count($th));
 	table_header($th);
 	check_page_security('SA_DIMTRANSVIEW');
 	$k = 0; //row colour counter
@@ -354,8 +365,8 @@ function gl_top($today, $width="33", &$pg=null)
 		AND tran_date <= '$today1' GROUP BY c.cid ORDER BY c.cid"; 
 	$result = db_query($sql, "Transactions could not be calculated");
 	$title = _("Class Balances");
-	start_table(TABLESTYLE2, "width='$width%'");
 	display_title($title);
+	start_table(TABLESTYLE2, "width='$width%'");
 	check_page_security('SA_GLANALYTIC');
 	$i = 0;
 	$total = 0;
@@ -413,8 +424,8 @@ function gl_performance($today, $width="33", $weeks=5)
 	while ($myrow = db_fetch($result))
 	{
 		$pg->x[$i] = $myrow['week_name']; 
-		$pg->y[$i] = abs($myrow['sales']);
-		$pg->z[$i] = abs($myrow['costs']);
+		$pg->y[$i] = $myrow['sales'];
+		$pg->z[$i] = $myrow['costs'];
 		$i++;
 	}	
 	$pg->x = array_reverse($pg->x);
@@ -426,7 +437,10 @@ function gl_performance($today, $width="33", $weeks=5)
 
 function source_graphic($today, $title, $x_axis, $pg, $graphic1, $graphic2=null, $type=2)
 {
-	$pg->title     = $title . " - " . $today;
+	if (count($pg->y) ==0 || (count($pg->y) == 1 && $pg->y[0] == 0))
+		return;
+	display_title("$title ($today)");	
+	//$pg->title     = $title . " - " . $today;
 	$pg->axis_x    = $x_axis;
 	$pg->axis_y    = _("Amount");
 	$pg->graphic_1 = $graphic1;
@@ -465,14 +479,12 @@ function customer_trans($today)
 			AND DATEDIFF('$today', trans.due_date) > 0 ORDER BY days DESC";
 	$result = db_query($sql);
 	$title = db_num_rows($result) . _(" overdue Sales Invoices");
-	br(1);
-	display_heading($title);
-	br();
+  	display_title($title);
 	$th = array("#", _("Ref."), _("Date"), _("Due Date"), _("Customer"), _("Branch"), _("Currency"), 
 		_("Total"), _("Remainder"),	_("Days"));
 	start_table(TABLESTYLE);
 	table_header($th);
-	$k = 0; //row colour counter
+  	$k = 0; //row colour counter
 	while ($myrow = db_fetch($result))
 	{
 		alt_table_row_color($k);
@@ -507,12 +519,10 @@ function customer_recurrent_invoices($today)
 {
 	$result = get_recurrent_invoices($today);
 	$title = _("Overdue Recurrent Invoices");
-	br(1);
-	display_heading($title);
-	br();
+  	display_title($title);
 	$th = array(_("Description"), _("Template No"),_("Customer"),_("Branch")."/"._("Group"),_("Next invoice"));
 	start_table(TABLESTYLE, "width=70%");
-	table_header($th);
+  	table_header($th);
 	$k = 0;
 	while ($myrow = db_fetch($result)) 
 	{
@@ -554,9 +564,7 @@ function supplier_trans($today)
 			AND DATEDIFF('$today', trans.due_date) > 0 ORDER BY days DESC";
 	$result = db_query($sql);
 	$title = db_num_rows($result) . _(" overdue Purchase Invoices");
-	br(1);
-	display_heading($title);
-	br();
+	display_title($title);
 	$th = array("#", _("Ref."), _("Date"), _("Due Date"), _("Supplier"), _("Currency"), _("Total"), 
 		_("Remainder"),	_("Days"));
 	start_table(TABLESTYLE);
@@ -591,9 +599,7 @@ function bank_balance($today, $width)
 				ORDER BY bank_account_name";
 	$result = db_query($sql);
 	$title = _("Bank Account Balances");
-	br(1);
-	display_heading($title);
-	br();
+	display_title($title);
 	$th = array(_("Account"), _("Balance"));
 	start_table(TABLESTYLE, "width='$width%'");
 	table_header($th);