X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Fincludes%2Fdimensions_ui.inc;h=1dd0a56cbaf32a7ddad676cafeeccfc9a4282d4d;hb=314da04d8ef9a6d7f8482aeb069d9cbc3d34724c;hp=9355c99992e573e3afb700188401acd6ae802ae9;hpb=31f499a5d3c59743e9a72005352719dadcd06c49;p=fa-stable.git
diff --git a/dimensions/includes/dimensions_ui.inc b/dimensions/includes/dimensions_ui.inc
index 9355c999..1dd0a56c 100644
--- a/dimensions/includes/dimensions_ui.inc
+++ b/dimensions/includes/dimensions_ui.inc
@@ -1,52 +1,58 @@
.
+***********************************************************************/
include_once($path_to_root . "/includes/ui.inc");
//--------------------------------------------------------------------------------------
-function display_dimension_payments($id)
+function display_dimension_balance($id, $from, $to)
{
- 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";
- $result = db_query($sql, "Transactions could not be calculated");
+ global $path_to_root;
- echo "
";
+ $result = get_dimension_balance_all($id, $from, $to);
if (db_num_rows($result) == 0)
{
- display_note(_("There are no transactions for this dimension."));
+ display_note(_("There are no transactions for this dimension for the selected period."));
}
else
{
- display_heading2(_("Transactions for this Dimension"));
- start_table($table_style);
- $th = array(_("Type"), _("#"), _("Account"),
- _("Date"), _("Debit"), _("Credit"));
+ display_heading2(_("Balance for this Dimension"));
+ br();
+ start_table(TABLESTYLE);
+ $th = array(_("Account"), _("Debit"), _("Credit"));
table_header($th);
$total = $k = 0;
-
while ($myrow = db_fetch($result))
{
-
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(sql2date($myrow["tran_date"]));
- display_debit_or_credit_cells($myrow["amount"]);
-
- $total += $myrow["amount"];
-
+ label_cell($myrow["account"]." ".$myrow['account_name']);
+ display_debit_or_credit_cells($myrow["amt"]);
+ $total += $myrow["amt"];
end_row();
}
-
start_row();
- label_cell(_("Total"), "colspan=4");
- display_debit_or_credit_cells($total);
+ label_cell(""._("Balance")."");
+ if ($total >= 0)
+ {
+ amount_cell($total, true);
+ label_cell("");
+ }
+ else
+ {
+ label_cell("");
+ amount_cell(abs($total), true);
+ }
end_row();
end_table();
@@ -55,4 +61,3 @@ function display_dimension_payments($id)
//--------------------------------------------------------------------------------------
-?>
\ No newline at end of file