Fixed many issues in output HTML code according to HTML 4.01 Transitional format.

[fa-stable.git] / gl / view / gl_trans_view.php

diff --git a/gl/view/gl_trans_view.php b/gl/view/gl_trans_view.php
index 4feed339d7b013160683c34bbcb88619809600d1..e80914eb694875dd3234fa18803f02f9513ae99b 100644 (file)
--- a/gl/view/gl_trans_view.php
+++ b/gl/view/gl_trans_view.php
@@ -9,11 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 8;
-$path_to_root="../..";
+$page_security = 'SA_GLTRANSVIEW';
+$path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("General Ledger Transaction Details"), true);
+page(_($help_context = "General Ledger Transaction Details"), true);
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -23,22 +23,23 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 if (!isset($_GET['type_id']) || !isset($_GET['trans_no'])) 
 { /*Script was not passed the correct parameters */
 
-       echo "<p>" . _("The script must be called with a valid transaction type and transaction number to review the general ledger postings for.") . "</p>";
-       exit;
+       display_note(_("The script must be called with a valid transaction type and transaction number to review the general ledger postings for."));
+       end_page();
 }
 
 function display_gl_heading($myrow)
 {
-       global $table_style;
-       $trans_name = systypes::name($_GET['type_id']);
-    start_table("$table_style width=95%");
-    $th = array(_("General Ledger Transaction Details"),
+       global $systypes_array;
+       $trans_name = $systypes_array[$_GET['type_id']];
+    start_table(TABLESTYLE, "width='95%'");
+    $th = array(_("General Ledger Transaction Details"), _("Reference"),
        _("Date"), _("Person/Item"));
     table_header($th); 
     start_row();       
     label_cell("$trans_name #" . $_GET['trans_no']);
+    label_cell($myrow["reference"]);
        label_cell(sql2date($myrow["tran_date"]));
-       label_cell(payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]));
+       label_cell(payment_person_name($myrow["person_type_id"],$myrow["person_id"]));
        
        end_row();
 
@@ -46,18 +47,11 @@ function display_gl_heading($myrow)
 
     end_table(1);
 }
-
-$sql = "SELECT ".TB_PREF."gl_trans.*, account_name FROM "
-       .TB_PREF."gl_trans, ".TB_PREF."chart_master WHERE "
-       .TB_PREF."gl_trans.account = ".TB_PREF."chart_master.account_code AND type= " 
-       .db_escape($_GET['type_id']) . " AND type_no = ".db_escape($_GET['trans_no']) 
-       . " ORDER BY counter";
-$result = db_query($sql,"could not get transactions");
-//alert("sql = ".$sql);
+$result = get_gl_trans($_GET['type_id'], $_GET['trans_no']);
 
 if (db_num_rows($result) == 0)
 {
-    echo "<p><center>" . _("No general ledger transactions have been created for") . " " .systypes::name($_GET['type_id'])." " . _("number") . " " . $_GET['trans_no'] . "</center></p><br><br>";
+    echo "<p><center>" . _("No general ledger transactions have been created for") . " " .$systypes_array[$_GET['type_id']]." " . _("number") . " " . $_GET['trans_no'] . "</center></p><br><br>";
        end_page(true);
        exit;
 }
@@ -77,13 +71,14 @@ else
 $k = 0; //row colour counter
 $heading_shown = false;
 
+$credit = $debit = 0;
 while ($myrow = db_fetch($result)) 
 {
        if ($myrow['amount'] == 0) continue;
        if (!$heading_shown)
        {
                display_gl_heading($myrow);
-               start_table("$table_style width=95%");
+               start_table(TABLESTYLE, "width='95%'");
                table_header($th);
                $heading_shown = true;
        }       
@@ -100,14 +95,30 @@ while ($myrow = db_fetch($result))
        display_debit_or_credit_cells($myrow['amount']);
        label_cell($myrow['memo_']);
        end_row();
-
+    if ($myrow['amount'] > 0 ) 
+       $debit += $myrow['amount'];
+    else 
+       $credit += $myrow['amount'];
 }
-//end of while loop
 if ($heading_shown)
+{
+    start_row("class='inquirybg' style='font-weight:bold'");
+    label_cell(_("Total"), "colspan=2");
+    if ($dim >= 1)
+        label_cell('');
+    if ($dim > 1)
+        label_cell('');
+    amount_cell($debit);
+    amount_cell(-$credit);
+    label_cell('');
+    end_row();
        end_table(1);
+}
+
+//end of while loop
 
 is_voided_display($_GET['type_id'], $_GET['trans_no'], _("This transaction has been voided."));
 
-end_page(true);
+end_page(true, false, false, $_GET['type_id'], $_GET['trans_no']);
 
 ?>