Fixed handling extended journal entries in various places.

[fa-stable.git] / gl / bank_account_reconcile.php

diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php
index f59ee696adfc0b9a4e3099f22951837e720addce..e7b584b1302c829e4f26e847a35247636af842fc 100644 (file)
--- a/gl/bank_account_reconcile.php
+++ b/gl/bank_account_reconcile.php
@@ -23,9 +23,9 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/includes/banking.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 add_js_file('reconcile.js');
@@ -86,20 +86,18 @@ function fmt_credit($row)
        return $value>0 ? price_format($value) : '';
 }
 
-function fmt_person($row)
+function fmt_person($trans)
 {
-       return payment_person_name($row["person_type_id"],$row["person_id"]);
+       return get_counterparty_name($trans["type"], $trans["trans_no"]);
 }
 
-$update_pager = false;
 function update_data()
 {
-       global $Ajax, $update_pager;
+       global $Ajax;
        
        unset($_POST["beg_balance"]);
        unset($_POST["end_balance"]);
        $Ajax->activate('summary');
-       $update_pager = true;
 }
 //---------------------------------------------------------------------------------------------
 // Update db record if respective checkbox value has changed.
@@ -161,7 +159,7 @@ if (isset($_POST['Reconcile'])) {
 
 //------------------------------------------------------------------------------------------------
 start_form();
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 bank_accounts_list_cells(_("Account:"), 'bank_account', null, true);
 
@@ -194,7 +192,7 @@ echo "<hr>";
 
 div_start('summary');
 
-start_table($table_style);
+start_table(TABLESTYLE);
 $th = array(_("Reconcile Date"), _("Beginning<br>Balance"), 
        _("Ending<br>Balance"), _("Account<br>Total"),_("Reconciled<br>Amount"), _("Difference"));
 table_header($th);
@@ -223,7 +221,7 @@ echo "<hr>";
 if (!isset($_POST['bank_account']))
     $_POST['bank_account'] = "";
 
-$sql = get_sql_for_bank_account_reconcile($_POST['bank_account'], get_post('reconcile_date'));
+$sql = get_sql_for_bank_account_reconcile(get_post('bank_account'), get_post('reconcile_date'));
 
 $act = get_bank_account($_POST["bank_account"]);
 display_heading($act['bank_account_name']." - ".$act['bank_curr_code']);
@@ -254,4 +252,3 @@ end_form();
 
 end_page();
 
-?>
\ No newline at end of file