X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_account_reconcile.php;h=55481789606ef729459625a0cc0c3dd5904d9cba;hb=c428c827fef8156052be0e430be9af738536e3b0;hp=4fa56550696664b5d957fc36fdd3c86497908a50;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php index 4fa56550..55481789 100644 --- a/gl/bank_account_reconcile.php +++ b/gl/bank_account_reconcile.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -/* Author Rob Mallon */ $page_security = 'SA_RECONCILE'; $path_to_root = ".."; include($path_to_root . "/includes/db_pager.inc"); @@ -23,9 +22,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 +85,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. @@ -223,7 +220,7 @@ echo "
"; 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 +251,3 @@ end_form(); end_page(); -?> \ No newline at end of file