Bulk updarte for the entirety of Reconciliation code to date. All code, SQL, and templates as provided.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2180 4979c152-3d1c-0410-bac9-87ea11338e46

5 files changed, 123 insertions, 24 deletions

diff --git a/UI/Reconciliation/correct.html b/UI/Reconciliation/correct.html
index e69de29b..b74ab4b0 100644
--- a/UI/Reconciliation/correct.html
+++ b/UI/Reconciliation/correct.html
@@ -0,0 +1,44 @@
+<div>
+    
+    <div class="title">Correction for Reconciliation Entry</div>
+    <table>
+        <tr>
+            <td>
+                Account/SCN
+            </td>
+            <td>
+                <input type="input" name="scn" value="<?lsmb entry.scn?>"/>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Amount
+            </td>
+            <td>
+                <input type="input" name="amount" value="<?lsmb entry.their_balance?>"/>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Cleared
+            </td>
+            <td>
+                <input type="input" name="cleared" value="<?lsmb entry.clear_time?>"/>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Cleared
+            </td>
+            <td>
+                <input type="input" name="cleared" value="<?lsmb entry.clear?>"/>
+            </td>
+        </tr>
+        <tr>
+            <td>Reason</td>
+            <td><textarea rows="15" cols="15"></textarea></td>
+        </tr>
+    </table>
+    
+    
+</div>
\ No newline at end of file
diff --git a/UI/Reconciliation/list.html b/UI/Reconciliation/list.html
new file mode 100644
index 00000000..48d9bb31
--- /dev/null
+++ b/UI/Reconciliation/list.html
@@ -0,0 +1,12 @@
+<div>
+    <table>
+        <td>
+            <tr>ID</tr>
+            <tr>Account</tr>
+            <tr></tr>
+        </td>
+    <?lsmb FOR result IN results?>
+
+    <?lsmb END?>
+    </table>
+</div>
\ No newline at end of file
diff --git a/UI/Reconciliation/report.html b/UI/Reconciliation/report.html
index cd6c8972..41c24a9d 100644
--- a/UI/Reconciliation/report.html
+++ b/UI/Reconciliation/report.html
@@ -1,22 +1,22 @@
-<center>Reconciliation Report for [% total.account %] for the month of [%total.month%]</center>
+<center>Reconciliation Report for <?lsmb total.account ?> for the month of <?lsmbtotal.month?></center>
 
 <center>
-	[%IF total.errorcode != 0 %]
+	<?lsmbIF total.errorcode != 0 ?>
 	<div style="color:blue; border-style:solid; border-width:1px; border-color: blue;">
-	[%ELSE%]
+	<?lsmbELSE?>
 	<div style="color:red; border-style:solid; border-width:1px; border-color: blue;">
-	[%END%]
+	<?lsmbEND?>
 		Our Balance: total.our_balance | Bank Balance: total.their_balance
 	</div>
 </center>
 
-<center>Report generated by [% total.user %]</center>
+<center>Report generated by <?lsmb total.user ?></center>
 
-[% if recon.error %]
+<?lsmb if recon.error ?>
 <div style="border-color:red; border-width:1px; border-style:solid; margin:3px;" >
-	[% recon.error %]	
+	<?lsmb recon.error ?>	
 </div>
-[%end%]
+<?lsmbend?>
 
 <table border=0>
 	
@@ -27,26 +27,34 @@
 		<td>Their Balance</td>
 		<td>Error Corrections</td>
 		<td>Error Code</td>
+		<td></td>
 	</tr>
 	
-	[% FOREACH row = records %]
-		[%IF row.errorcode != 0 %]
+	<?lsmb FOREACH row = records ?>
+		<?lsmbIF row.errorcode != 0 ?>
 		<tr style="background-color:red;">
-		[% ELSIF row.id = corrected %]
+		<?lsmb ELSIF row.id = corrected ?>
 		<tr style="background-color:yellow;">		
-		[%ELSE%]
+		<?lsmbELSE?>
 		<tr>
-		[%END%]
-			<td>[% row.clear_time %]</td>
-			<td>[% row.transaction_type %] </td>
-			<td>[% row.our_balance %]</td>
-			<td>[% row.their_balance%]</td>
-			<td>[% row.corrections  %]</td>
-			[% IF row.errorcode > 0 %]
-			<td>[% row.errorcode %] <a href="/reconciliation.pl?corrections&amp;entry=[%row.entry_id%]">View Corrections</a> </td>		
-			[%ELSE%]
+		<?lsmbEND?>
+			<td><?lsmb row.clear_time ?></td>
+			<td><?lsmb row.transaction_type ?> </td>
+			<td><?lsmb row.our_balance ?></td>
+			<td><?lsmb row.their_balance?></td>
+			<td><?lsmb row.corrections  ?></td>
+			<?lsmb IF row.errorcode > 0 ?>
+			<td><?lsmb row.errorcode ?> <a href="/reconciliation.pl?action=corrections&amp;entry=<?lsmbrow.entry_id?>">View Corrections</a> </td>		
+			<?lsmbELSE?>
 			<td>0</td>
-			[%END%]
+			<?lsmbEND?>
+			<td><a href="/reconciliation.pl?action=correct&amp;report_id=<?lsmbrow.report_id?>&amp;entry_id=<?lsmbrow.entry_id?>">Correct</a></td>
 		</tr>
-	[% END %]
-</table>
\ No newline at end of file
+	<?lsmb END ?>
+</table>
+
+<?lsmb if not recon.error?>
+<form name="approval" method="POST" action="/reconciliation.pl">
+    <input type="submit" name="action" value="Approve" />
+</form>
+<?lsmb end?>
\ No newline at end of file
diff --git a/UI/Reconciliation/search.html b/UI/Reconciliation/search.html
new file mode 100644
index 00000000..58528c64
--- /dev/null
+++ b/UI/Reconciliation/search.html
@@ -0,0 +1,18 @@
+<form name="reconciliation__search" method="POST" action="">
+    
+    <div>
+    Date:<br/>
+    <input type="input" size="15" name="date_begin" alt="mon/day/year"/> to <input type="input" size="15" name="date_end" alt="mon/day/year"/><br/>
+    </div>
+    
+    <div>
+        Account:<br/>
+        <input type="input" size="15" name="account" alt="Chart account #"/>
+    </div>
+    
+    <div>
+        Status:<br/>
+        
+    </div>
+    
+</form>
\ No newline at end of file
diff --git a/UI/Reconciliation/upload.html b/UI/Reconciliation/upload.html
new file mode 100644
index 00000000..fdf3ac4e
--- /dev/null
+++ b/UI/Reconciliation/upload.html
@@ -0,0 +1,17 @@
+<div>
+    <div class="title">
+        New Reconciliation Report
+    </div>
+    <?lsmb IF error?>
+        <div class="error">Error detected in file upload: <?lsmb error?><br/>
+            Please check your CSV file and try again.
+        </div>
+    <?lsmb END?>
+    <form name="csv_upload" method="POST" action="/reconciliation.pl">
+        
+        <input type="hidden" name="action" value="new_report" />
+        <label for="file_upload">CSV File:</label>
+        <input type="file" name="csv_file" id="file_upload" />
+        <input type="submit" action="submit" value="Create New Report">
+    </form>
+</div>
\ No newline at end of file