First round of template changes for new TT system

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

1 files changed, 53 insertions, 52 deletions

diff --git a/templates/demo/ap_transaction.html b/templates/demo/ap_transaction.html
index 153b208f..74d269c7 100644
--- a/templates/demo/ap_transaction.html
+++ b/templates/demo/ap_transaction.html
@@ -3,7 +3,7 @@
 
 <table width="100%">
 
-  <?lsmb include letterhead.html ?>
+  <?lsmb INCLUDE letterhead.html ?>
   
   <tr>
     <td width=10>&nbsp;</td>
@@ -21,39 +21,39 @@
         <tr valign=top>
           <td><?lsmb name ?>
           <br><?lsmb address1 ?>
-	  <?lsmb if address2 ?>
+	  <?lsmb IF address2 ?>
           <br><?lsmb address2 ?>
-	  <?lsmb end address2 ?>
+	  <?lsmb END ?>
           <br><?lsmb city ?>
-	  <?lsmb if state ?>
+	  <?lsmb IF state ?>
 	  , <?lsmb state ?>
-	  <?lsmb end state ?>
+	  <?lsmb END ?>
 	  <?lsmb zipcode ?>
-	  <?lsmb if country ?>
+	  <?lsmb IF country ?>
 	  <br><?lsmb country ?>
-	  <?lsmb end country ?>
+	  <?lsmb END ?>
           <br>
 
-          <?lsmb if contact ?>
+          <?lsmb IF contact ?>
           <br><?lsmb contact ?>
           <br>
-          <?lsmb end contact ?>
+          <?lsmb END ?>
 
-          <?lsmb if vendorphone ?>
+          <?lsmb IF vendorphone ?>
           <br>Tel: <?lsmb vendorphone ?>
-          <?lsmb end vendorphone ?>
+          <?lsmb END ?>
 
-          <?lsmb if vendorfax ?>
+          <?lsmb IF vendorfax ?>
           <br>Fax: <?lsmb vendorfax ?>
-          <?lsmb end vendorfax ?>
+          <?lsmb END ?>
 
-          <?lsmb if email ?>
+          <?lsmb IF email ?>
           <br><?lsmb email ?>
-          <?lsmb end email ?>
+          <?lsmb END ?>
 
-          <?lsmb if vendortaxnumber ?>
+          <?lsmb IF vendortaxnumber ?>
           <p>Taxnumber: <?lsmb vendortaxnumber ?>
-          <?lsmb end vendortaxnumber ?>
+          <?lsmb END ?>
           </td>
    
 	  <td align=right>
@@ -70,18 +70,18 @@
 		<th align=left nowrap>Due</th>
 		<td><?lsmb duedate ?></td>
 	      </tr>
-	      <?lsmb if ponumber ?>
+	      <?lsmb IF ponumber ?>
               <tr>
                 <th align=left>PO #</th>
 		<td><?lsmb ponumber ?>&nbsp;</td>
 	      </tr>
-	      <?lsmb end ponumber ?>
-	      <?lsmb if ordnumber ?>
+	      <?lsmb END ?>
+	      <?lsmb IF ordnumber ?>
 	      <tr>
 		<th align=left>Order #</th>
 		<td><?lsmb ordnumber ?>&nbsp;</td>
 	      </tr>
-	      <?lsmb end ordnumber ?>
+	      <?lsmb END ?>
 	      <tr>
 		<th align=left nowrap>Employee</th>
 		<td><?lsmb employee ?>&nbsp;</td>
@@ -100,48 +100,48 @@
   
     <td>
       <table>
-	<?lsmb foreach account ?>
+	<?lsmb FOREACH account ?>
+	<?lsmb loop_count = loop.count - 1 ?>
 	<tr valign=top>
-	  <td><?lsmb accno ?></td>
-	  <td><?lsmb account ?></td>
+	  <td><?lsmb accno.${loop_count} ?></td>
+	  <td><?lsmb account.${loop_count} ?></td>
 	  <td width=10> </td>
-	  <td align=right><?lsmb amount ?></td>
+	  <td align=right><?lsmb amount.${loop_count} ?></td>
 	  <td width=10> </td>
-	  <td><?lsmb description ?></td>
+	  <td><?lsmb description.${loop_count} ?></td>
 	  <td width=10> </td>
-	  <td><?lsmb projectnumber ?></td>
+	  <td><?lsmb projectnumber.${loop_count} ?></td>
 	</tr>
-	<?lsmb end account ?>
+	<?lsmb END ?>
 
 	<tr>
-	  <?lsmb if taxincluded ?>
+	  <?lsmb IF taxincluded ?>
 	  <th colspan=2 align=right>Total</th>
 	  <td width=10> </td>
 	  <td align=right><?lsmb invtotal ?></td>
-	  <?lsmb end taxincluded ?>
-
-	  <?lsmb if not taxincluded ?>
+	  <?lsmb ELSE ?>
 	  <th colspan=2 align=right>Subtotal</th>
 	  <td width=10> </td>
 	  <td align=right><?lsmb subtotal ?></td>
-	  <?lsmb end taxincluded ?>
+	  <?lsmb END ?>
 	</tr>
 
-	<?lsmb foreach tax ?>
+	<?lsmb FOREACH tax ?>
+	<?lsmb loop_count = loop.count - 1 ?>
 	<tr>
-	  <th colspan=2 align=right><?lsmb taxdescription ?> @ <?lsmb taxrate ?> %</th>
+	  <th colspan=2 align=right><?lsmb taxdescription.${loop_count} ?> @ <?lsmb taxrate.${loop_count} ?> %</th>
 	  <td width=10> </td>
-	  <td align=right><?lsmb tax ?></td>
+	  <td align=right><?lsmb tax.${loop_count} ?></td>
 	</tr>
-	<?lsmb end tax ?>
+	<?lsmb END ?>
 	
-	<?lsmb if not taxincluded ?>
+	<?lsmb IF NOT taxincluded ?>
 	<tr>
 	  <th colspan=2 align=right>Total</th>
 	  <td width=10> </td>
 	  <td align=right><?lsmb invtotal ?></td>
 	</tr>
-	<?lsmb end taxincluded ?>
+	<?lsmb END ?>
       </table>
     </td>
   </tr>
@@ -162,7 +162,7 @@
     </td>
   </tr>
 
-  <?lsmb if paid_1 ?>
+  <?lsmb IF paid_1 ?>
   <tr>
     <td>&nbsp;</td>
 
@@ -188,30 +188,31 @@
 		<th>Memo</th>
 		<th>Amount</th>
 	      </tr>
-  <?lsmb end paid_1 ?>
+  <?lsmb END ?>
 
-        <?lsmb foreach payment ?>
+        <?lsmb FOREACH payment ?>
+        <?lsmb loop_count = loop.count - 1 ?>
 	      <tr>
-		<td><?lsmb paymentdate ?></td>
-		<td><?lsmb paymentaccount ?></td>
-		<td><?lsmb paymentsource ?></td>
-		<td><?lsmb paymentmemo ?></td>
-		<td align=right><?lsmb payment ?></td>
+		<td><?lsmb paymentdate.${loop_count} ?></td>
+		<td><?lsmb paymentaccount.${loop_count} ?></td>
+		<td><?lsmb paymentsource.${loop_count} ?></td>
+		<td><?lsmb paymentmemo.${loop_count} ?></td>
+		<td align=right><?lsmb payment.${loop_count} ?></td>
 	      </tr>
-        <?lsmb end payment ?>
+        <?lsmb END ?>
 
-  <?lsmb if paid_1 ?>
+  <?lsmb IF paid_1 ?>
 	    </table>
 	  </td>
         </tr>
       </table>
     </td>
   </tr>
-  <?lsmb end paid_1 ?>
+  <?lsmb END ?>
 
   <tr height=10></tr>
 
-  <?lsmb if taxincluded ?>
+  <?lsmb IF taxincluded ?>
   <tr>
     <td>&nbsp;</td>
   </tr>
@@ -219,7 +220,7 @@
   <tr>
     <th colspan=3 align=left><font size=-2>Taxes shown are included in price.</th>
   </tr>
-  <?lsmb end taxincluded ?>
+  <?lsmb END ?>
 
 </table>