X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_account_reconcile.php;h=4fa56550696664b5d957fc36fdd3c86497908a50;hb=eb165f28009ba988edb4384d81843405d4938d46;hp=a195292b04609261587069c5f0e169cdc7a82c8a;hpb=cf67cec296e611c30be010686a5ea96d730418b0;p=fa-stable.git diff --git a/gl/bank_account_reconcile.php b/gl/bank_account_reconcile.php index a195292b..4fa56550 100644 --- a/gl/bank_account_reconcile.php +++ b/gl/bank_account_reconcile.php @@ -10,8 +10,8 @@ See the License here . ***********************************************************************/ /* Author Rob Mallon */ -$page_security = 8; -$path_to_root=".."; +$page_security = 'SA_RECONCILE'; +$path_to_root = ".."; include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -30,7 +30,7 @@ if ($use_date_picker) add_js_file('reconcile.js'); -page(_("Reconcile Bank Account"), false, false, "", $js); +page(_($help_context = "Reconcile Bank Account"), false, false, "", $js); check_db_has_bank_accounts(_("There are no bank accounts defined in the system.")); @@ -59,7 +59,9 @@ function rec_checkbox($row) function systype_name($dummy, $type) { - return systypes::name($type); + global $systypes_array; + + return $systypes_array[$type]; } function trans_view($trans) @@ -86,7 +88,7 @@ function fmt_credit($row) function fmt_person($row) { - return payment_person_types::person_name($row["person_type_id"],$row["person_id"]); + return payment_person_name($row["person_type_id"],$row["person_id"]); } $update_pager = false; @@ -106,7 +108,8 @@ function change_tpl_flag($reconcile_id) { global $Ajax; - if (!check_date()) + if (!check_date() + && check_value("rec_".$reconcile_id)) // temporary fix return false; if (get_post('bank_date')=='') // new reconciliation @@ -115,23 +118,17 @@ function change_tpl_flag($reconcile_id) $_POST['bank_date'] = date2sql(get_post('reconcile_date')); $reconcile_value = check_value("rec_".$reconcile_id) ? ("'".$_POST['bank_date'] ."'") : 'NULL'; - $sql = "UPDATE ".TB_PREF."bank_trans SET reconciled=$reconcile_value WHERE id=$reconcile_id"; - - db_query($sql, "Can't change reconciliation status"); - // save last reconcilation status (date, end balance) - $sql2="UPDATE ".TB_PREF."bank_accounts SET last_reconciled_date='" - .date2sql($_POST["reconcile_date"])."', - ending_reconcile_balance=".input_num("end_balance") - ." WHERE id=".$_POST["bank_account"]; - - $result = db_query($sql2,"Error updating reconciliation information"); + + update_reconciled_values($reconcile_id, $reconcile_value, $_POST['reconcile_date'], + input_num('end_balance'), $_POST['bank_account']); + $Ajax->activate('reconciled'); $Ajax->activate('difference'); return true; } if (!isset($_POST['reconcile_date'])) { // init page - $_POST['reconcile_date'] = Today(); + $_POST['reconcile_date'] = new_doc_date(); // $_POST['bank_date'] = date2sql(Today()); } @@ -164,7 +161,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); @@ -173,17 +170,7 @@ bank_reconciliation_list_cells(_("Bank Statement:"), get_post('bank_account'), end_row(); end_table(); -$date = date2sql(get_post('reconcile_date')); - -$sql = "SELECT MAX(reconciled) as last_date, - SUM(IF(reconciled<='$date', amount, 0)) as end_balance, - SUM(IF(reconciled<'$date', amount, 0)) as beg_balance, - SUM(amount) as total - FROM ".TB_PREF."bank_trans trans - WHERE bank_act=".$_POST['bank_account']; -// ." AND trans.reconciled IS NOT NULL"; - -$result = db_query($sql,"Cannot retrieve reconciliation data"); +$result = get_max_reconciled(get_post('reconcile_date'), $_POST['bank_account']); if ($row = db_fetch($result)) { $_POST["reconciled"] = price_format($row["end_balance"]-$row["beg_balance"]); @@ -194,11 +181,8 @@ if ($row = db_fetch($result)) { $_POST["end_balance"] = price_format($row["end_balance"]); if (get_post('bank_date')) { // if it is the last updated bank statement retrieve ending balance - $sql = "SELECT ending_reconcile_balance - FROM ".TB_PREF."bank_accounts WHERE id=".$_POST['bank_account'] - . " AND last_reconciled_date='".$_POST['bank_date']."'"; - $result = db_query($sql,"Cannot retrieve last reconciliation"); - $row = db_fetch($result); + + $row = get_ending_reconciled($_POST['bank_account'], $_POST['bank_date']); if($row) { $_POST["end_balance"] = price_format($row["ending_reconcile_balance"]); } @@ -210,14 +194,14 @@ echo "
"; div_start('summary'); -start_table($table_style); +start_table(TABLESTYLE); $th = array(_("Reconcile Date"), _("Beginning
Balance"), _("Ending
Balance"), _("Account
Total"),_("Reconciled
Amount"), _("Difference")); table_header($th); start_row(); date_cells("", "reconcile_date", _('Date of bank statement to reconcile'), - null, 0, 0, 0, null, true); + get_post('bank_date')=='', 0, 0, 0, null, true); amount_cells_ex("", "beg_balance", 15); @@ -239,13 +223,7 @@ echo "
"; if (!isset($_POST['bank_account'])) $_POST['bank_account'] = ""; -$sql = "SELECT type, trans_no, ref, trans_date, - amount, person_id, person_type_id, reconciled, id - FROM ".TB_PREF."bank_trans - WHERE ".TB_PREF."bank_trans.bank_act = '" . $_POST['bank_account'] . "' - AND (reconciled IS NULL OR reconciled='". $date ."') - ORDER BY trans_date,".TB_PREF."bank_trans.id"; -// or ORDER BY reconciled desc, trans_date,".TB_PREF."bank_trans.id"; +$sql = get_sql_for_bank_account_reconcile($_POST['bank_account'], get_post('reconcile_date')); $act = get_bank_account($_POST["bank_account"]); display_heading($act['bank_account_name']." - ".$act['bank_curr_code']); @@ -263,11 +241,8 @@ display_heading($act['bank_account_name']." - ".$act['bank_curr_code']); "X"=>array('insert'=>true, 'fun'=>'rec_checkbox') ); $table =& new_db_pager('trans_tbl', $sql, $cols); - if ($update_pager) { - $table->set_sql($sql); - $table->set_columns($cols); - } - $table->width = "60%"; + + $table->width = "80%"; display_db_pager($table); br(1);