X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sql-ledger%2Ftemplates%2FDefault-purchase_order.html;fp=sql-ledger%2Ftemplates%2FDefault-purchase_order.html;h=f353a11df60200a71f33305845e996f41979378a;hb=5fc8c5edf574ab024d4646914b6432d458e2ffbd;hp=7df399ed6f339eaa0f244ea9b4e5812a4b1c0370;hpb=a4fc489e860b7bc51b5282a87ea21750b30b905e;p=freeside.git
diff --git a/sql-ledger/templates/Default-purchase_order.html b/sql-ledger/templates/Default-purchase_order.html
index 7df399ed6..f353a11df 100644
--- a/sql-ledger/templates/Default-purchase_order.html
+++ b/sql-ledger/templates/Default-purchase_order.html
@@ -15,10 +15,13 @@
+
-
-
-
-
- Order Date | | <%orddate%> |
-
-
-
- Required by | | <%reqdate%> |
-
-
-
- Number | | <%ordnumber%> |
-
-
-
- |
-
-
-
- |
-
@@ -66,11 +47,14 @@
<%name%>
- <%addr1%>
- <%addr2%>
- <%addr3%>
- <%addr4%>
-
+ <%address1%>
+ <%if address2%>
+ <%address2%>
+ <%end address2%>
+ <%city%> <%state%> <%zipcode%>
+ <%if country%>
+ <%country%>
+ <%end country%>
<%if contact%>
Attn: <%contact%>
@@ -84,11 +68,14 @@
|
<%shiptoname%>
- <%shiptoaddr1%>
- <%shiptoaddr2%>
- <%shiptoaddr3%>
- <%shiptoaddr4%>
-
+ <%shiptoaddress1%>
+ <%if shiptoaddress2%>
+ <%shiptoaddress2%>
+ <%end shiptoaddress2%>
+ <%shiptocity%> <%shiptostate%> <%shiptozipcode%>
+ <%if shiptocountry%>
+ <%shiptocountry%>
+ <%end shiptocountry%>
<%if shiptocontact%>
Attn: <%shiptocontact%>
@@ -99,16 +86,38 @@
<%if shiptofax%>
Fax: <%shiptofax%>
<%end shiptofax%>
-
|
|
+ |
+
- |
+
+
+
+ Order # |
+ Order Date |
+ Required by |
+ Contact |
+ Shipping Point |
+ Ship Via |
+
+
+
+ <%ordnumber%> |
+ <%orddate%> |
+ <%reqdate%> |
+ <%employee%> |
+ <%shippingpoint%> |
+ <%shipvia%> |
+
+
+ |
-
+
+
@@ -119,12 +128,14 @@
Qt'y |
|
Price |
+ % |
Amount |
<%foreach number%>
<%number%> |
@@ -132,40 +143,69 @@ adjust the colspan if you include this to shift subtotal one to the right
<%qty%> |
<%unit%> |
<%sellprice%> |
+ <%discountrate%>
| <%linetotal%> |
<%end number%>
-
|
+
|
- Subtotal |
- <%subtotal%> |
+<%if taxincluded%>
+ Total |
+ <%ordtotal%> |
+<%end taxincluded%>
+
+<%if not taxincluded%>
+ Subtotal |
+ <%subtotal%> |
+<%end taxincluded%>
<%foreach tax%>
- <%taxdescription%> @ <%taxrate%> % |
- <%tax%> |
+ <%taxdescription%> on <%taxbase%> @ <%taxrate%> % |
+ <%tax%> |
<%end tax%>
- |
+ |
|
+
+<%if not taxincluded%>
+ Total |
+ <%ordtotal%> |
+<%end taxincluded%>
+
+<%if terms%>
+
+ Terms Net <%terms%> days |
+ Total |
+ <%ordtotal%> |
+
+<%end terms%>
+<%if taxincluded%>
- Terms Net <%terms%> days |
- Total |
- <%ordtotal%> |
+ Tax included |
+<%end taxincluded%>
|
+
+<%if ordtotal%>
+
+
+ All prices in <%currency%> Funds
+ |
+
+<%end ordtotal%>
|
@@ -174,16 +214,12 @@ adjust the colspan if you include this to shift subtotal one to the right
-
<%if notes%>
+
Notes |
- <%notes%> |
-<%end notes%>
-
- All prices in <%currency%> Funds
- <%shippingpoint%>
- |
+ <%notes%> |
+<%end notes%>
|
@@ -195,17 +231,9 @@ adjust the colspan if you include this to shift subtotal one to the right
-
- Payment due NET <%terms%> Days from date of Invoice.
- Interest on overdue amounts will acrue at the rate of 1.5% per month
- from due date until paid in full. Items returned are subject to
- a 10% restocking charge. A return authorization must be obtained
- from <%company%> before goods are returned. Returns must be shipped
- prepaid and properly insured. <%company%> will not be responsible
- for damages during transit.
-
- |
-
+ | |
+
+
X
|
|