Skip to content

Commit

Permalink
Reports: Client Statement: Corrected column label and fixed amount al…
Browse files Browse the repository at this point in the history 
…ignments.
  • Loading branch information
Jesse Terry committed Jul 4, 2011
1 parent d1efc65 commit 3bb079f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 45 deletions.
35 changes: 1 addition & 34 deletions application/modules_core/reports/views/client_statement_pdf.php
View file
Expand Up @@ -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>
<?php $this->load->view('client_statement_view'); ?>
25 changes: 14 additions & 11 deletions application/modules_core/reports/views/client_statement_view.php
View file
Expand Up @@ -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) { ?>
Expand All @@ -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 } ?>
Expand All @@ -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>

0 comments on commit 3bb079f

Please sign in to comment.