diff --git a/app/controllers/documents_controller.php b/app/controllers/documents_controller.php
index 741bcaae..565fef0d 100755
--- a/app/controllers/documents_controller.php
+++ b/app/controllers/documents_controller.php
@@ -6,7 +6,7 @@ class DocumentsController extends AppController {
 
 
 	var $paginate = array(
-		'contain' => false,
+		'contain' => true,
 		'limit' => 200,
 		'order'=>array('Document.id' => 'desc')
 	);
diff --git a/app/views/documents/pdf_orderack.ctp b/app/views/documents/pdf_orderack.ctp
index 36fbe3cf..90911c91 100755
--- a/app/views/documents/pdf_orderack.ctp
+++ b/app/views/documents/pdf_orderack.ctp
@@ -19,7 +19,7 @@ $pageNo = $pdfdoc->PageNoFormatted();
 $totalCount = $pdfdoc->getAliasNbPages();
 
 
-$shippingBillingBox = $this->element('pdf_shipping_billing_box', array('pageNo'=>$pageNo, 'totalCount'=>$totalCount));
+$shippingBillingBox = $this->element('pdf_shipping_billing_box_oa', array('pageNo'=>$pageNo, 'totalCount'=>$totalCount));
 
 $pdfdoc->writeHTML($shippingBillingBox, false);
 
@@ -39,4 +39,4 @@ $this->element('pdf_output', array('pdfdoc'=>$pdfdoc));
 
 
 <? //debug($document); ?>
-<? //debug($enquiry); ?>
\ No newline at end of file
+<? //debug($enquiry); ?>
diff --git a/app/views/elements/pdf_shipping_billing_box_oa.ctp b/app/views/elements/pdf_shipping_billing_box_oa.ctp
new file mode 100755
index 00000000..08b9b2b9
--- /dev/null
+++ b/app/views/elements/pdf_shipping_billing_box_oa.ctp
@@ -0,0 +1,56 @@
+<?
+$col1width = '30%';
+$col2width = '30%';
+$col3width = '30%';
+
+?>
+<table cellpadding="2" cellspacing="0" >
+    <tr>
+	<td style="width: <?=$col1width?>; border-top: 1px solid black; border-left: 1px solid black;  border-bottom: 1px solid black; background-color: #f2f2f2">BILL TO:</td>
+	<td style="width: <?=$col1width?>; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; border-bottom: 1px solid black; background-color: #f2f2f2">SHIP TO:</td>
+	<td style="width: 3%;"></td>
+	<td style="font-size: 9pt; width: 37%;" colspan="4" rowspan="2">
+	    <span style="text-decoration: underline; font-size: 11pt">CMC <?=$docTypeFullName?>#:</span> <span style="font-size: 11pt"><?=$docTitle?></span><br>
+	    <span style="text-decoration: none;">Date: <?=$issue_date_string?></span><br>
+	    <? if($docType == 'orderAck'): ?>
+	    <span style="text-decoration: none;">Estimated Delivery:</span> <span style="text-align: right;"><?=$estimated_delivery?></span><br>
+	    <? endif; ?>
+	    <span style="text-decoration: none;">Page: <?=$pageNo?> of <?=$totalCount?></span><br><br>
+	    <span style="text-decoration: underline;">MAKE PAYMENT TO:</span><br>
+	    <span style="text-decoration: none;">Account Name: CMC Technologies Pty Ltd<br>
+	    Bank Number BSB#: 062-458<br>
+	    Account Number: 10067982<br>
+	    SWIFT Code: CTBAAU2S
+	    </span>
+	</td>
+    </tr>
+    <tr>
+	<td style="width: <?=$col1width?>; border-top: 1px solid black; border-left: 1px solid black;  border-bottom: 1px solid black;">
+<?=$document['Document']['bill_to'];?>
+	</td>
+	<td style="width: <?=$col1width?>; border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; border-bottom: 1px solid black;">
+<?=$document['Document']['ship_to'];?>
+	</td>
+    </tr>
+</table>
+<br>
+<table border="1" cellpadding="2" cellspacing="0">
+    <tr bgcolor="#f2f2f2" align="center">
+	<? $moreDetailsFont = '9pt'; ?>
+	<td style="font-size: <?=$moreDetailsFont?>;">CUSTOMER ORDER NO</td>
+	<td style="font-size: <?=$moreDetailsFont?>">CMC ENQUIRY #</td>
+	<td style="font-size: <?=$moreDetailsFont?>">FOB</td>
+	<td style="font-size: <?=$moreDetailsFont?>">SHIP VIA</td>
+	<td style="font-size: <?=$moreDetailsFont?>">TERMS</td>
+	<td style="font-size: <?=$moreDetailsFont?>">CUSTOMER ABN</td>
+    </tr>
+    <tr align="center">
+	<td style="font-size: <?=$moreDetailsFont?>"><?=$job['Job']['customer_order_number'];?></td>
+	<td style="font-size: 8pt"><?=$enquiry['Enquiry']['title'];?></td>
+	<td style="font-size: <?=$moreDetailsFont?>"><?=$fob;?></td>
+	<td style="font-size: <?=$moreDetailsFont?>"><?=$ship_via;?></td>
+	<td style="font-size: <?=$moreDetailsFont?>"><?=$job['Customer']['payment_terms'];?></td>
+	<td style="font-size: <?=$moreDetailsFont?>"><?=$this->element('abn', array('abn'=>$job['Customer']['abn']));?></td>
+    </tr>
+</table>
+<br>