From 3bb079febb7753bf280c8dbd0347d4fd8af10459 Mon Sep 17 00:00:00 2001
From: Jesse Terry <jessedterry@gmail.com>
Date: Mon, 4 Jul 2011 14:59:55 -0700
Subject: [PATCH] Reports: Client Statement: Corrected column label and fixed
 amount alignments.

---
 .../reports/views/client_statement_pdf.php    | 35 +------------------
 .../reports/views/client_statement_view.php   | 25 +++++++------
 2 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/application/modules_core/reports/views/client_statement_pdf.php b/application/modules_core/reports/views/client_statement_pdf.php
index f1f17ea..0c452d8 100644
--- a/application/modules_core/reports/views/client_statement_pdf.php
+++ b/application/modules_core/reports/views/client_statement_pdf.php
@@ -2,37 +2,4 @@
 
 <h1><?php echo $this->lang->line('client_statement'); ?></h1>
 
-<table style="width: 100%;">
-
-    <tr>
-        <th style="width: 25%;"><?php echo $this->lang->line('client'); ?></th>
-        <th style="width: 15%;"><?php echo $this->lang->line('invoice_number'); ?></th>
-        <th style="width: 15%;"><?php echo $this->lang->line('due_date'); ?></th>
-        <th style="width: 15%;"><?php echo $this->lang->line('total'); ?></th>
-        <th style="width: 15%;"><?php echo $this->lang->line('paid'); ?></th>
-        <th style="width: 15%;"><?php echo $this->lang->line('balance'); ?></th>
-    </tr>
-
-    <?php foreach ($invoices as $invoice) { ?>
-
-        <tr <?php if ($invoice->invoice_is_quote) { ?>style="font-style: italic;"<?php } ?>>
-            <td class="first"><?php echo $invoice->client_name; ?></td>
-            <td><?php echo $invoice->invoice_number; ?></td>
-            <td><?php echo format_date($invoice->invoice_date_entered); ?></td>
-            <td><?php echo display_currency($invoice->invoice_total); ?></td>
-            <td><?php echo display_currency($invoice->invoice_paid); ?></td>
-            <td class="last"><?php echo display_currency($invoice->invoice_balance); ?></td>
-        </tr>
-
-    <?php } ?>
-
-    <tr style="font-weight: bold;">
-        <td class="first"><?php echo $this->lang->line('total'); ?></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td><?php echo display_currency($totals['total_invoice']); ?></td>
-        <td><?php echo display_currency($totals['total_paid']); ?></td>
-        <td><?php echo display_currency($totals['total_balance']); ?></td>
-    </tr>
-
-</table>
\ No newline at end of file
+<?php $this->load->view('client_statement_view'); ?>
\ No newline at end of file
diff --git a/application/modules_core/reports/views/client_statement_view.php b/application/modules_core/reports/views/client_statement_view.php
index 91bf788..0787fa1 100644
--- a/application/modules_core/reports/views/client_statement_view.php
+++ b/application/modules_core/reports/views/client_statement_view.php
@@ -2,11 +2,12 @@
 
     <tr>
         <th scope="col" class="first" style="width: 25%;"><?php echo $this->lang->line('client'); ?></th>
-        <th scope="col" style="width: 15%;"><?php echo $this->lang->line('invoice_number'); ?></th>
-        <th scope="col" style="width: 15%;"><?php echo $this->lang->line('due_date'); ?></th>
-        <th scope="col" style="width: 15%;"><?php echo $this->lang->line('total'); ?></th>
-        <th scope="col" style="width: 15%;"><?php echo $this->lang->line('paid'); ?></th>
-        <th scope="col" class="last" style="width: 15%;"><?php echo $this->lang->line('balance'); ?></th>
+        <th scope="col" style="width: 10%;"><?php echo $this->lang->line('invoice_number'); ?></th>
+        <th scope="col" style="width: 10%;"><?php echo $this->lang->line('invoice_date'); ?></th>
+        <th scope="col" style="width: 10%;"><?php echo $this->lang->line('due_date'); ?></th>
+        <th scope="col" style="width: 15%; text-align: right;"><?php echo $this->lang->line('total'); ?></th>
+        <th scope="col" style="width: 15%; text-align: right;"><?php echo $this->lang->line('paid'); ?></th>
+        <th scope="col" class="last" style="width: 15%; text-align: right;"><?php echo $this->lang->line('balance'); ?></th>
     </tr>
 
     <?php foreach ($invoices as $invoice) { ?>
@@ -15,9 +16,10 @@
             <td class="first"><?php echo $invoice->client_name; ?></td>
             <td><?php echo $invoice->invoice_number; ?></td>
             <td><?php echo format_date($invoice->invoice_date_entered); ?></td>
-            <td><?php echo display_currency($invoice->invoice_total); ?></td>
-            <td><?php echo display_currency($invoice->invoice_paid); ?></td>
-            <td class="last"><?php echo display_currency($invoice->invoice_balance); ?></td>
+            <td><?php echo format_date($invoice->invoice_due_date); ?></td>
+            <td style="text-align: right;"><?php echo display_currency($invoice->invoice_total); ?></td>
+            <td style="text-align: right;"><?php echo display_currency($invoice->invoice_paid); ?></td>
+            <td class="last" style="text-align: right;"><?php echo display_currency($invoice->invoice_balance); ?></td>
         </tr>
 
     <?php } ?>
@@ -26,9 +28,10 @@
         <td class="first"><?php echo $this->lang->line('total'); ?></td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
-        <td><?php echo display_currency($totals['total_invoice']); ?></td>
-        <td><?php echo display_currency($totals['total_paid']); ?></td>
-        <td><?php echo display_currency($totals['total_balance']); ?></td>
+        <td>&nbsp;</td>
+        <td style="text-align: right;"><?php echo display_currency($totals['total_invoice']); ?></td>
+        <td style="text-align: right;"><?php echo display_currency($totals['total_paid']); ?></td>
+        <td style="text-align: right;"><?php echo display_currency($totals['total_balance']); ?></td>
     </tr>
 
 </table>
\ No newline at end of file