[0005214] Stock Check Sheet: changed option name to less confusing for shortages...
[fa-stable.git] / reporting / rep602.php
index fec3d0eda3f0ae4813228c84f58b0443a7b20dab..dd7c5427fefecac9c9d2ad4c7b0c543a0fb9a1ee 100644 (file)
@@ -15,7 +15,7 @@ $page_security = 'SA_BANKREP';
 // Creator:    Chaitanya-India <3chaitanya@gmail.com>
 // date_:      2005-05-19
 // Title:      Bank Statements w/Reconcile
-// Desc:       Bank Statement w/ Reconcile like the normal Bank Statement but with reconcile columns\r
+// Desc:       Bank Statement w/ Reconcile like the normal Bank Statement but with reconcile columns
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -44,14 +44,14 @@ function get_bank_transactions($from, $to, $account)
 {
        $from = date2sql($from);
        $to = date2sql($to);
-       $sql = "SELECT ".TB_PREF."bank_trans.*, ".TB_PREF."comments.memo_\r
-                       FROM ".TB_PREF."bank_trans LEFT JOIN ".TB_PREF."comments ON \r
-                       (".TB_PREF."bank_trans.type = ".TB_PREF."comments.type\r
-                       AND ".TB_PREF."bank_trans.trans_no = ".TB_PREF."comments.id)\r
-               WHERE ".TB_PREF."bank_trans.bank_act = '$account'
+       $sql = "SELECT trans.*, com.memo_
+                       FROM "
+                               .TB_PREF."bank_trans trans
+                               LEFT JOIN ".TB_PREF."comments com ON trans.type = com.type AND trans.trans_no = com.id
+               WHERE trans.bank_act = '$account'
                AND trans_date >= '$from'
                AND trans_date <= '$to'
-               ORDER BY trans_date,".TB_PREF."bank_trans.id";
+               ORDER BY trans_date,trans.id";
 
        return db_query($sql,"The transactions for '$account' could not be retrieved");
 }
@@ -73,12 +73,12 @@ function print_bank_transactions_reconcile()
        $rep = new FrontReport(_('Bank Statement w/Reconcile'), "BankStatementReconcile", user_pagesize(), 9, "L");
        $dec = user_price_dec();
 
-       $cols = array(0, 90, 110, 170, 225, 450, 500, 550, 600, 660, 700);\r
+       $cols = array(0, 90, 120, 170, 225, 450, 500, 550, 600, 660, 700);
 
-       $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right', 'center', 'left');\r
+       $aligns = array('left', 'left', 'left', 'left', 'left', 'right', 'right', 'right', 'center', 'left');
 
        $headers = array(_('Type'),     _('#'), _('Reference'), _('Date'), _('Person/Item'),
-               _('Debit'),     _('Credit'), _('Balance'), _('Reco Date'), _('Narration'));\r
+               _('Debit'),     _('Credit'), _('Balance'), _('Reco Date'), _('Narration'));
 
        $account = get_bank_account($acc);
        $act = $account['bank_account_name']." - ".$account['bank_curr_code']." - ".$account['bank_account_number'];
@@ -108,11 +108,11 @@ function print_bank_transactions_reconcile()
                $rep->Font();
                $total = $prev_balance;
                $rep->NewLine(2);
+               // Keep a running total as we loop through
+               // the transactions.
+               $total_debit = $total_credit = 0;                       
                if ($rows > 0)
                {
-                       // Keep a running total as we loop through
-                       // the transactions.
-                       $total_debit = $total_credit = 0;                       \r
                        
                        while ($myrow=db_fetch($trans))
                        {
@@ -134,9 +134,9 @@ function print_bank_transactions_reconcile()
                                        $total_credit += abs($myrow['amount']);
                                }
                                $rep->AmountCol(7, 8, $total, $dec);
-                               if ($myrow["reconciled"] && $myrow["reconciled"] != '0000-00-00')\r
-                                       $rep->DateCol(8, 9,     $myrow["reconciled"], true);\r
-                               $rep->TextCol(9, 10, $myrow['memo_']);\r
+                               if ($myrow["reconciled"] && $myrow["reconciled"] != '0000-00-00')
+                                       $rep->DateCol(8, 9,     $myrow["reconciled"], true);
+                               $rep->TextCol(9, 10, $myrow['memo_']);
                                $rep->NewLine();
                                if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
                                {
@@ -160,7 +160,7 @@ function print_bank_transactions_reconcile()
                else
                        $rep->AmountCol(6, 7, abs($total), $dec);
                $rep->Font();
-               $rep->NewLine(2);       \r
+               $rep->NewLine(2);       
                
                // Print the difference between starting and ending balances.
                $net_change = ($total - $prev_balance); 
@@ -169,52 +169,51 @@ function print_bank_transactions_reconcile()
                        $rep->AmountCol(5, 6, $net_change, $dec, 0, 0, 0, 0, null, 1, True);
                else
                        $rep->AmountCol(6, 7, $net_change, $dec, 0, 0, 0, 0, null, 1, True);
-               $rep->Font();\r
-               $rep->NewLine(2);       \r
-               \r
-               // Calculate Bank Balance as per reco\r
-               $date = date2sql($to);\r
-               $sql = "SELECT SUM(IF(reconciled<='$date' AND reconciled !='0000-00-00', amount, 0)) as reconciled,\r
-                                SUM(amount) as books_total\r
-                       FROM ".TB_PREF."bank_trans trans\r
-                       WHERE bank_act=".db_escape($account['id'])."\r
-                       AND trans_date <= '$date'";     \r
-                       \r
-               //      ." AND trans.reconciled IS NOT NULL";\r
-               //display_notification($sql);\r
-               $t_result = db_query($sql,"Cannot retrieve reconciliation data");\r
-\r
-               if ($t_row = db_fetch($t_result)) {\r
-                       $books_total = $t_row['books_total'];\r
-                       $reconciled = $t_row['reconciled'];\r
-               }                       \r
-               $difference = $books_total - $reconciled;               \r
-               \r
-               // Bank Balance (by Reco)\r
-               $rep->Font('bold');\r
-               $rep->TextCol(3, 5,     _("Bank Balance"));\r
-               if ($reconciled > 0.0)\r
-                       $rep->AmountCol(5, 6, abs($reconciled), $dec);\r
-               else\r
-                       $rep->AmountCol(6, 7, abs($reconciled), $dec);\r
-               $rep->Font();\r
-               $rep->NewLine(2);       \r
-\r
-               // Reco Difference\r
-               $rep->Font('bold');\r
-               $rep->TextCol(3, 5,     _("Difference"));\r
-               if ($difference > 0.0)\r
-                       $rep->AmountCol(5, 6, abs($difference), $dec);\r
-               else\r
-                       $rep->AmountCol(6, 7, abs($difference), $dec);\r
-               $rep->Font();\r
-               $rep->NewLine(2);       \r
-                       \r
-               $rep->Line($rep->row - $rep->lineHeight + 4);\r
-               $rep->NewLine(2, 1);                    \r
-                       \r
+               $rep->Font();
+               $rep->NewLine(2);       
+               
+               // Calculate Bank Balance as per reco
+               $date = date2sql($to);
+               $sql = "SELECT SUM(IF(reconciled<='$date' AND reconciled !='0000-00-00', amount, 0)) as reconciled,
+                                SUM(amount) as books_total
+                       FROM ".TB_PREF."bank_trans trans
+                       WHERE bank_act=".db_escape($account['id'])."
+                       AND trans_date <= '$date'";     
+                       
+               //      ." AND trans.reconciled IS NOT NULL";
+               //display_notification($sql);
+               $t_result = db_query($sql,"Cannot retrieve reconciliation data");
+
+               if ($t_row = db_fetch($t_result)) {
+                       $books_total = $t_row['books_total'];
+                       $reconciled = $t_row['reconciled'];
+               }                       
+               $difference = $books_total - $reconciled;               
+               
+               // Bank Balance (by Reco)
+               $rep->Font('bold');
+               $rep->TextCol(3, 5,     _("Bank Balance"));
+               if ($reconciled > 0.0)
+                       $rep->AmountCol(5, 6, abs($reconciled), $dec);
+               else
+                       $rep->AmountCol(6, 7, abs($reconciled), $dec);
+               $rep->Font();
+               $rep->NewLine(2);       
+
+               // Reco Difference
+               $rep->Font('bold');
+               $rep->TextCol(3, 5,     _("Difference"));
+               if ($difference > 0.0)
+                       $rep->AmountCol(5, 6, abs($difference), $dec);
+               else
+                       $rep->AmountCol(6, 7, abs($difference), $dec);
+               $rep->Font();
+               $rep->NewLine(2);       
+                       
+               $rep->Line($rep->row - $rep->lineHeight + 4);
+               $rep->NewLine(2, 1);                    
+                       
        }
        $rep->End();
 }
 
-?>
\ No newline at end of file