X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dimensions%2Fincludes%2Fdimensions_ui.inc;h=ae69b98b6ed2bdcf0bfc59f6c5daaea9ba15c584;hb=c7a295ba3be4ec3403b767f2e2bf19014a5ebc28;hp=9355c99992e573e3afb700188401acd6ae802ae9;hpb=31f499a5d3c59743e9a72005352719dadcd06c49;p=fa-stable.git

diff --git a/dimensions/includes/dimensions_ui.inc b/dimensions/includes/dimensions_ui.inc
index 9355c999..ae69b98b 100644
--- a/dimensions/includes/dimensions_ui.inc
+++ b/dimensions/includes/dimensions_ui.inc
@@ -8,8 +8,10 @@ function display_dimension_payments($id)
 {
 	global $path_to_root, $table_style;
 
-	$sql = "SELECT * FROM ".TB_PREF."gl_trans WHERE dimension_id = $id OR dimension2_id = $id
-		ORDER BY account,tran_date";
+	$sql = "SELECT ".TB_PREF."gl_trans.*,".TB_PREF."chart_master.account_name  FROM
+		".TB_PREF."gl_trans,".TB_PREF."chart_master WHERE
+		".TB_PREF."gl_trans.account = ".TB_PREF."chart_master.account_code AND
+		(dimension_id = $id OR dimension2_id = $id) ORDER BY account,tran_date";
 	$result = db_query($sql, "Transactions could not be calculated");
 
     echo "<br>";
@@ -26,29 +28,46 @@ function display_dimension_payments($id)
 			_("Date"), _("Debit"), _("Credit"));
 		table_header($th);
 
-        $total = $k = 0;
-
+        $total = $grand_total = $k = 0;
+		$account = "";
         while ($myrow = db_fetch($result))
         {
+			if ($account != $myrow["account"])
+			{
+				if ($account != "")
+				{
+					start_row();
+					label_cell(_("Total"), "colspan=4");
+					display_debit_or_credit_cells($total);
+					end_row();
+					$total = 0;
+				}
+				$account = $myrow["account"];
+			}
 
 			alt_table_row_color($k);
 
         	label_cell(systypes::name($myrow["type"]));
 			label_cell(get_gl_view_str($myrow["type"], $myrow["type_no"], $myrow["type_no"], true));
-			label_cell($myrow["account"]);
+			label_cell($myrow["account"]." ".$myrow['account_name']);
 			label_cell(sql2date($myrow["tran_date"]));
 			display_debit_or_credit_cells($myrow["amount"]);
 
 			$total += $myrow["amount"];
+			$grand_total += $myrow["amount"];
 
 			end_row();
 		}
-
 		start_row();
 		label_cell(_("Total"), "colspan=4");
 		display_debit_or_credit_cells($total);
 		end_row();
 
+		start_row();
+		label_cell(_("Grand Total"), "colspan=4");
+		display_debit_or_credit_cells($grand_total);
+		end_row();
+
 		end_table();
     }
 }