*** empty log message ***

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 09ead57c89c106c195516f2825a5fb630261ffaf..5b946b396e92fea53edaff07b001a9b3ac9f1c54 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,14 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+10-Nov-2008 Joe Hunt
+! Changed Bank Statement Report in accourding to Bank Account Change
+$ /reporting/rep601.php
+  /reporting/includes/reports_classes.inc
+# Removed Type header from bank inquiry.
+  /gl/inquiry/bank_inquiry.php
+  
+09-Nov-2008 Janusz Dobrowolski
 ! Allowed multiply bank accounts on one GL account, removed obsolete bank trans type.
 $ /applications/generalledger.php
   /gl/bank_transfer.php

diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php
index d5147f5ff1ecc624ff4fa66ef9b1e1c7534c8574..3d1ad53a23c3df39fca2d64d5954a46adf802e71 100644 (file)
--- a/gl/inquiry/bank_inquiry.php
+++ b/gl/inquiry/bank_inquiry.php
@@ -63,7 +63,7 @@ display_heading($act['bank_account_name']." - ".$act['bank_curr_code']);
 
 start_table($table_style);
 
-$th = array(_("Type"), _("#"), _("Reference"), _("Type"), _("Date"),
+$th = array(_("Type"), _("#"), _("Reference"), _("Date"),
        _("Debit"), _("Credit"), _("Balance"), _("Person/Item"), "");
 table_header($th);
 

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index fd08842fa0a54ce361367cc89f606f2ceb62f38f..c717c973937536866c7170f5d934478aa99f999d 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -196,8 +196,7 @@ class Report
                                        $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
                                        break;
                                case 'BANK_ACCOUNTS':
-                                       $sql = "SELECT ".TB_PREF."bank_accounts.account_code, concat(bank_account_name, if (bank_curr_code=curr_default,'', concat(' - ', bank_curr_code))) FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master, ".TB_PREF."company
-                                               WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
+                                       $sql = "SELECT ".TB_PREF."bank_accounts.id, concat(bank_account_name, if (bank_curr_code=curr_default,'', concat(' - ', bank_curr_code))) FROM ".TB_PREF."bank_accounts, ".TB_PREF."company";
                                        $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
                                        break;
                                case 'DIMENSION':

diff --git a/reporting/rep601.php b/reporting/rep601.php
index 0408c3ac9b1032df2c653e3aece2ee56b68eb16c..2a3ee811cdd235eb9dc8e8f450d30ca4ed3202e1 100644 (file)
--- a/reporting/rep601.php
+++ b/reporting/rep601.php
@@ -35,11 +35,10 @@ function get_bank_transactions($from, $to, $account)
 {
        $from = date2sql($from);
        $to = date2sql($to);
-       $sql = "SELECT ".TB_PREF."bank_trans.*,name AS BankTransType FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_trans_types
+       $sql = "SELECT ".TB_PREF."bank_trans.* FROM ".TB_PREF."bank_trans
                WHERE ".TB_PREF."bank_trans.bank_act = '$account'
                AND trans_date >= '$from'
                AND trans_date <= '$to'
-               AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id
                ORDER BY trans_date,".TB_PREF."bank_trans.id";
 
        return db_query($sql,"The transactions for '$account' could not be retrieved");
@@ -60,11 +59,11 @@ function print_bank_transactions()
 
        $dec = user_price_dec();
 
-       $cols = array(0, 90, 110, 170, 225, 270, 350, 400, 460, 520);
+       $cols = array(0, 90, 110, 170, 225, 350, 400, 460, 520);
 
-       $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+       $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
 
-       $headers = array(_('Type'),     _('#'), _('Reference'), _('Date'), _('Type'), _('Person/Item'),
+       $headers = array(_('Type'),     _('#'), _('Reference'), _('Date'), _('Person/Item'),
                _('Debit'),     _('Credit'), _('Balance'));
 
        $account = get_bank_account($acc);
@@ -78,9 +77,9 @@ function print_bank_transactions()
        $rep->Header();
 
 
-       $prev_balance = get_bank_balance_to($from, $account["account_code"]);
+       $prev_balance = get_bank_balance_to($from, $account["id"]);
 
-       $trans = get_bank_transactions($from, $to, $account['account_code']);
+       $trans = get_bank_transactions($from, $to, $account['id']);
 
        $rows = db_num_rows($trans);
        if ($prev_balance != 0.0 || $rows != 0)
@@ -105,13 +104,12 @@ function print_bank_transactions()
                                $rep->TextCol(1, 2,     $myrow['trans_no']);
                                $rep->TextCol(2, 3,     $myrow['ref']);
                                $rep->TextCol(3, 4,     sql2date($myrow["trans_date"]));
-                               $rep->TextCol(4, 5,     $myrow['BankTransType']);
-                               $rep->TextCol(5, 6,     payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
+                               $rep->TextCol(4, 5,     payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
                                if ($myrow['amount'] > 0.0)
-                                       $rep->TextCol(6, 7,     number_format2(abs($myrow['amount']), $dec));
+                                       $rep->TextCol(5, 6,     number_format2(abs($myrow['amount']), $dec));
                                else
-                                       $rep->TextCol(7, 8,     number_format2(abs($myrow['amount']), $dec));
-                               $rep->TextCol(8, 9,     number_format2($total, $dec));
+                                       $rep->TextCol(6, 7,     number_format2(abs($myrow['amount']), $dec));
+                               $rep->TextCol(7, 8,     number_format2($total, $dec));
                                $rep->NewLine();
                                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                                {

diff --git a/sql/alter2.1.sql b/sql/alter2.1.sql
index e6057e4d5ef74488dafae4cff1647ca992dfc1b5..e308f8dd935f06cae704ca32b7f28b1a1944aa25 100644 (file)
--- a/sql/alter2.1.sql
+++ b/sql/alter2.1.sql
@@ -6,7 +6,7 @@ ALTER TABLE `0_bank_accounts` ADD KEY (`account_code`);
 # UPDATE 0_bank_accounts SET id = account_code;
 # For any Applicable only to  MySQL >=4.0.4 :
 UPDATE `0_bank_trans`, `0_bank_accounts` SET 0_bank_trans.bank_act=0_bank_accounts.id 
-       WHERE 0_bank_trans.bank_act=0_bank_accounts.account_code; */
+       WHERE 0_bank_trans.bank_act=0_bank_accounts.account_code; 
 
 
 ALTER TABLE `0_users` ADD `query_size` TINYINT(1) DEFAULT '10';