projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed obsolete stock_move.person_id field and related handling.
[fa-stable.git]
/
gl
/
bank_account_reconcile.php
diff --git
a/gl/bank_account_reconcile.php
b/gl/bank_account_reconcile.php
index 4fa56550696664b5d957fc36fdd3c86497908a50..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 = "";
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);
$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');
$js .= get_js_date_picker();
add_js_file('reconcile.js');
@@
-86,20
+86,18
@@
function fmt_credit($row)
return $value>0 ? price_format($value) : '';
}
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()
{
function update_data()
{
- global $Ajax
, $update_pager
;
+ global $Ajax;
unset($_POST["beg_balance"]);
unset($_POST["end_balance"]);
$Ajax->activate('summary');
unset($_POST["beg_balance"]);
unset($_POST["end_balance"]);
$Ajax->activate('summary');
- $update_pager = true;
}
//---------------------------------------------------------------------------------------------
// Update db record if respective checkbox value has changed.
}
//---------------------------------------------------------------------------------------------
// Update db record if respective checkbox value has changed.
@@
-223,7
+221,7
@@
echo "<hr>";
if (!isset($_POST['bank_account']))
$_POST['bank_account'] = "";
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']);
$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();
end_page();
-?>
\ No newline at end of file