SF.net SVN: ledger-smb:[2492] trunk

[..hidden..]

Revision: 2492
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2492&view=rev
Author:   einhverfr
Date:     2009-03-13 17:29:10 +0000 (Fri, 13 Mar 2009)

Log Message:
-----------
Fix for clobbering statement balance in UI

Modified Paths:
--------------
    trunk/UI/reconciliation/report.html
    trunk/scripts/recon.pl

Modified: trunk/UI/reconciliation/report.html
===================================================================
--- trunk/UI/reconciliation/report.html	2009-03-13 01:02:09 UTC (rev 2491)
+++ trunk/UI/reconciliation/report.html	2009-03-13 17:29:10 UTC (rev 2492)
@@ -4,24 +4,37 @@
 <form action="recon.pl" method="post">
 <div class="listtop" id="title"><?lsmb text('Reconciliation Report') ?></div>
 <div class="info">
-<div> <?lsmb text('Account:') ?><?lsmb account ?></div>
-<div><?lsmb text('Through date:') ?><?lsmb end_date ?></div>
-<div><?lsmb text('Statement Balance:') ?><?lsmb INCLUDE input element_data = {
+<div><span class="heading"><?lsmb text('Account:') ?></span>
+<span class="data"><?lsmb account ?></span></div>
+<br />
+<div><span class="heading"><?lsmb text('Reconciliation Date:') ?></span>
+<span class="data"><?lsmb end_date ?></span></div>
+<div><span class="heading"><?lsmb text('Beginning Statement Balance:') ?></span>
+<span class="data"><?lsmb beginning_balance ?></span>
+<div><span class="heading"><?lsmb text('Ending Statement Balance:') ?></span>
+<span class="data"><?lsmb INCLUDE input element_data = {
 	name = "their_total",
 	type = "text",
 	class = "money",
 	size = "15",
 	value = their_total
-	} ?>
+	} ?></span>
 </div>
-<div><?lsmb text('Beginning Balance:') ?><?lsmb beginning_balance ?></div>
-<div><?lsmb text('Ledger Balance:') ?><?lsmb our_total ?></div>
-<div><?lsmb text('Difference:') ?><?lsmb out_of_balance ?></div>
+<div><span class="heading"><?lsmb text('Variance:') ?></span>
+<span class="data"><?lsmb out_of_balance ?></span></div>
+<br />
+<div><span class="heading"><?lsmb text('Ending Statement Balance:') ?></span>
+<span class="data"><?lsmb their_total ?></span></div>
+<div><span class="heading"><?lsmb text('Less Outstanding Checks:') ?></span>
+<span class="data"><?lsmb outstanding_total ?></span></div>
+<div><span class="heading"><?lsmb text('Ending GL Balance:') ?></span>
+<span class="data"><?lsmb our_total ?></span></div>
+<br />
 	<div id="csv-file">
         <label for="file_upload"><?lsmb text('CSV File:') ?></label>
         <input type="file" name="csv_file" id="file_upload" /></div>
 
-<center>Report generated by <?lsmb user ?></center>
+<center>Report generated by <?lsmb enteredby_username ?></center>
 
 <?lsmb IF error ?>
 <div style="border-color:red; border-width:1px; border-style:solid; margin:3px;" >

Modified: trunk/scripts/recon.pl
===================================================================
--- trunk/scripts/recon.pl	2009-03-13 01:02:09 UTC (rev 2491)
+++ trunk/scripts/recon.pl	2009-03-13 17:29:10 UTC (rev 2492)
@@ -75,7 +75,7 @@
     my ($request) = shift;
     my $recon = LedgerSMB::DBObject::Reconciliation->new(base => $request);
     $recon->add_entries($recon->import_file()) if !$recon->{submitted};
-    $recon->{their_total} = $recon->parse_amount(amount => $recon->{their_total}); 
+    $recon->{their_total} = $recon->parse_amount(amount => $recon->{their_total}) if defined $recon->{their_total}; 
     $recon->{dbh}->commit;
     if ($recon->{line_order}){
        $recon->set_ordering(
@@ -425,6 +425,8 @@
 		{amount => $recon->{our_total}, money => 1});
 	$recon->{beginning_balance} = $recon->format_amount(
 		{amount => $recon->{beginning_balance}, money => 1});
+	$recon->{out_of_balance} = $recon->format_amount(
+		{amount => $recon->{out_of_balance}, money => 1});
 
         return $template->render($recon);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.