From 851cb8b26470e4dc34ac389fe2c64538fa43a348 Mon Sep 17 00:00:00 2001
From: unknown <karunesh@andLinux>
Date: Tue, 15 Nov 2011 04:29:41 -0500
Subject: [PATCH] invoice template done

---
 .../formaprint/templatetags/__init__.py       |  0
 printaform/formaprint/templatetags/random.py  |  0
 printaform/templates/types/amc.html           | 17 +++-
 printaform/templates/types/invoice.html       | 95 +++++++++++++++----
 4 files changed, 90 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 printaform/formaprint/templatetags/__init__.py
 mode change 100644 => 100755 printaform/formaprint/templatetags/random.py

diff --git a/printaform/formaprint/templatetags/__init__.py b/printaform/formaprint/templatetags/__init__.py
old mode 100644
new mode 100755
diff --git a/printaform/formaprint/templatetags/random.py b/printaform/formaprint/templatetags/random.py
old mode 100644
new mode 100755
diff --git a/printaform/templates/types/amc.html b/printaform/templates/types/amc.html
index 6126536..82ee5c2 100755
--- a/printaform/templates/types/amc.html
+++ b/printaform/templates/types/amc.html
@@ -17,6 +17,7 @@ html, body {
 
 body {
 	font-family:Helvetica, Arial, sans-serif;
+	font-size:12px;
 }
 
 
@@ -31,7 +32,7 @@ display:block; page-break-before:always;
 
 table {
 	margin:0 auto;
-}
+    font-size:12px;}
 
 th {
 	text-align:left;
@@ -42,6 +43,12 @@ td {
 	width: 40%;
 }
 
+#tableAMC td {
+	width:75%;
+}
+
+
+
 </style>
 
 </head>
@@ -57,7 +64,7 @@ td {
 
 
 
-<table width="90%" border="1" cellspacing="0" cellpadding="6" id="tableAMC">
+<table width="90%" border="1" cellspacing="0" cellpadding="6">
   <tr>
     <th scope="row"><p>Parties</p></th>
     <td><p>{{ company_name }}</p></td>
@@ -91,9 +98,6 @@ td {
 	  </ul>
     </td>
   </tr>
-</table>
-
-<table width="90%" border="1" cellspacing="0" cellpadding="6" class="pageBreak">
    <tr>
     <th scope="row"><p>Considerations</p></th>
     <td colspan="2">
@@ -105,6 +109,9 @@ td {
 	  </ul>
     </td>
   </tr>
+</table>
+
+<table width="90%" border="1" cellspacing="0" cellpadding="6" class="pageBreak" id="tableAMC">
   <tr>
     <th scope="row"><p>Payment Schedule</p></th>
     <td colspan="2">
diff --git a/printaform/templates/types/invoice.html b/printaform/templates/types/invoice.html
index 945c4db..041d116 100755
--- a/printaform/templates/types/invoice.html
+++ b/printaform/templates/types/invoice.html
@@ -11,7 +11,16 @@
 html, body {
 	width:100%;
 	height:100%;
-	font-size:14px;
+	
+}
+
+body {
+	font-size:12px;
+	font-family:Helvetica, Arial, sans-serif;
+}
+
+table {
+	font-size:12px;
 }
 
 .clear {
@@ -22,8 +31,12 @@ html, body {
 	text-align:center;
 }
 
+#companyAddress {
+	font-size:10px;
+}
+
 hr {
-	width:70%;
+	width:90%;
 }
 
 #companyTitle {
@@ -31,14 +44,19 @@ hr {
 	font-size:120%;
 }
 
-#clientAddress {
+td {
+width:75%;
+}
+
+
+/*#clientAddress {
 	float:left;
 }
 
 #date {
 	float:right;
 }
-
+*/
 </style>
 
 </head>
@@ -48,32 +66,75 @@ hr {
 <div id="wrapper">
 	<div id="header">
 		<p id="companyTitle">{{ company_name }}</p>
-        <p>To:{{ company_address|markdown }}</p>
-		<div id="companyAddress"></div>
+        
+		<div id="companyAddress">
+        <p>{{ company_address|markdown }}</p>
         <p>Tel No: {{ company_tel }}</p>
         <p>Email: {{ company_email }}</p>
+        <p>Pan No: {{ pan_no }}</p>
         <hr>
+        </div>
 	</div><!-- HEADER CLOSING -->
 	
-    <div id="clientAddress">{{ client_address|markdown }}
-    <p>Tel No: {{ company_tel }}</p>
-    <p>Email: {{ company_email }}</p>
+    <div id="clientAddress"><strong>To:</strong>{{ client_address|markdown }}
+    <p>Tel No: {{ client_tel }}</p>
+    <p>Email: {{ client_email }}</p>
     </div><!-- CLIENT ADDRESS CLOSING -->
         
-	<div id="date">{{ date }}</div>
+	<div id="date"><strong>Invoice Date</strong>{{ date }}</div>
+    <div id="invoiceNo"><strong>Invoice Number: </strong>{{ invoice_no }}</div>
+	<br>	
 
-	<div class="clear"></div>
 
 	<div id="attention"><strong>Attn:</strong> {{ client_rep_name }}</div>
-	
-    <div id="invoiceNo"><strong>Invoice #: </strong>{{ invoice_no }}</div>
-	
+	<br>	
     <div id="content">
-    <p>Dear Sir,</p>
-    <p>The following are my professional charges for Web Design and Development work done on your website {{ website_name }}.</p>
+    <p>Dear {{ sir_or_madam }},</p>
+    <p>Below is a statement of professional fees for {{ website_name }}.</p>
     </div>
 	
-    <div id="amount"></div>
+    <div id="paymentTable">
+    
+    <table width="90%" border="1" cellspacing="0" cellpadding="1">
+  <tr>
+    <th scope="col">Particulars</th>
+    <th scope="col">Amount</th>
+  </tr>
+  <tr>
+    <td>{{ particulars }};</td>
+    <td>{{ amount }}</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td><strong>Total Amount</strong>
+    <p>In words: {{ amount_words }}</p>
+    </td>
+    <td><strong>{{ amount_final }}</strong></td>
+  </tr>
+
+</table>  
+<br>
+    </div>
+    
+    <div class="paymentTo"><strong>Payment to:</strong> {{ company_name }}</div> 
+    
+    <div class="bankInfo">
+    <p><strong>{{ bank_name }}:</strong></p> 
+    <p>{{ ifsc_code }}</p> 
+    <p>{{ account_number }}</p> 
+    <p>{{ account_branch }}</p>     
+   
+    </div> 
+	<br>
+    <br>
+    <br>
+    <br>
+    <br>
+	<p style="text-align:right";><strong>{{ client_name }}</strong></p>
+    
 </div>
 
 </body>