Index: src/main/groovy/com/lemans/builders/CciPdfBuilder.groovy
===================================================================
diff -u -r8a04940cfd0f0c1e80e215dc781f639841e1c67f -ra8d6519d81ccb694b3da08cc0dcd407fa0f2b91a
--- src/main/groovy/com/lemans/builders/CciPdfBuilder.groovy	(.../CciPdfBuilder.groovy)	(revision 8a04940cfd0f0c1e80e215dc781f639841e1c67f)
+++ src/main/groovy/com/lemans/builders/CciPdfBuilder.groovy	(.../CciPdfBuilder.groovy)	(revision a8d6519d81ccb694b3da08cc0dcd407fa0f2b91a)
@@ -33,17 +33,20 @@
     List contents1
     List contents2
     Map footer
+    Map user
 
 
     private static final String BLANK_TEMPLATE = "/templates/ci1.pdf"
 
-    byte[] cciPdf(Map data) {
+    byte[] cciPdf(Map data, Map userDetails) {
         header = data?.header[0]
         contents1 = data?.body1
         contents2 = data?.body2
         footer = data?.footer
+        user = userDetails
 
 
+
         header.totalNetWeight = contents1*.netExtendedWeight.findAll { it != null  }.sum()
 
         document = new Document(PageSize.LETTER, -5, -7, 360, 280)
@@ -55,7 +58,7 @@
         document.open()
         content = writer.getDirectContent()
 
-        CciFooter sk = new CciFooter(document, writer, page, content, header, contents, contents1, footer, byteStream)
+        CciFooter sk = new CciFooter(document, writer, page, content, header, contents, contents1, footer, byteStream, user)
         writer.setPageEvent(sk)
 
         addContents()
@@ -97,6 +100,7 @@
     List<List> contents
     List contents1
     Map footer
+    Map user
 
     ByteArrayOutputStream byteStream
 
@@ -111,7 +115,9 @@
             List contents,
             List contents1,
             Map footer,
-            ByteArrayOutputStream byteStream
+            ByteArrayOutputStream byteStream,
+            Map user
+
     ) {
         this.document = document
         this.writer = writer
@@ -122,6 +128,7 @@
         this.contents1 = contents1
         this.footer = footer
         this.byteStream = byteStream
+        this.user = user
     }
 
    // PdfTemplate total
@@ -158,26 +165,36 @@
         addAbsoluteText(header?.shipToCity?.toString() ?: '', 50, 620, Element.ALIGN_MIDDLE)
         addAbsoluteText(header?.shipToCountryName?.toString() ?: '', 50, 610, Element.ALIGN_MIDDLE)
 
-        addAbsoluteText(header?.transportationMode?.toString() ?: '', 50, 530, Element.ALIGN_MIDDLE)
+        addAbsoluteText("Mode of Transportation:" + header?.modeOfTransport?.toString() ?: '', 50, 530, Element.ALIGN_MIDDLE)
+        addAbsoluteText("Place of Direct shipment: Janesville, WI 53545 - USA", 50, 520, Element.ALIGN_MIDDLE)
 
         addAbsoluteText(new SimpleDateFormat('YYYY/MM/dd').format(new Date()), 340, 715, Element.ALIGN_MIDDLE)
 
-        addAbsoluteText("${header?.dealerCode ?: ''} - ${header?.customerReference ?: ''}", 340, 685, Element.ALIGN_MIDDLE)
+        addAbsoluteText("${header?.dealerCode ?: ''} / ${header?.pickingRouteId ?: ''}", 340, 685, Element.ALIGN_MIDDLE)
 
 
         //purchaser
-        addAbsoluteText(header?.shipTo?.toString() ?: '', 340, 650, Element.ALIGN_MIDDLE)
-        addAbsoluteText(header?.shipToAddressLine1?.toString() ?: '', 340, 640, Element.ALIGN_MIDDLE)
-        addAbsoluteText(header?.shipToAddressLine2?.toString() ?: '', 340, 630, Element.ALIGN_MIDDLE)
-        addAbsoluteText(header?.shipToCity?.toString() ?: '', 340, 620, Element.ALIGN_MIDDLE)
-        addAbsoluteText(header?.shipToCountryName?.toString() ?: '', 338, 610, Element.ALIGN_MIDDLE)
+        if (header?.forwarderAddressLine1) {
+            addAbsoluteText(header?.forwardTo?.toString() ?: '', 340, 650, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.forwarderAddressLine1?.toString() ?: '', 340, 640, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.forwarderAddressLine2?.toString() ?: '', 340, 630, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.forwarderCity?.toString() ?: '', 340, 620, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.forwarderCountryName?.toString() ?: '', 338, 610, Element.ALIGN_MIDDLE)
+        } else {
+            addAbsoluteText(header?.shipTo?.toString() ?: '', 340, 650, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.shipToAddressLine1?.toString() ?: '', 340, 640, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.shipToAddressLine2?.toString() ?: '', 340, 630, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.shipToCity?.toString() ?: '', 340, 620, Element.ALIGN_MIDDLE)
+            addAbsoluteText(header?.shipToCountryName?.toString() ?: '', 338, 610, Element.ALIGN_MIDDLE)
+        }
 
+
         addAbsoluteText(header?.countryOfTranshipment?.toString() ?: 'N/A', 340, 585, Element.ALIGN_MIDDLE)
 
 
         addAbsoluteText( contents1?.groupBy { it.countryName }?.keySet()?.toString() ?: '', 340, 560, Element.ALIGN_MIDDLE )
 
-        addAbsoluteText(header?.paymentTermsName?.toString() ?: '', 340, 510, Element.ALIGN_MIDDLE)
+        addAbsoluteText(header?.paymentTermsName?.toString() ?: 'Open Acct', 340, 510, Element.ALIGN_MIDDLE)
         addAbsoluteText(header?.currencyOfSettlement?.toString() ?: 'U.S. Dollars', 340, 490, Element.ALIGN_MIDDLE)
     }
 
@@ -186,19 +203,20 @@
         if(invoiceTotal && (header?.noFreightOnInvoiceInd == null || header?.noFreightOnInvoiceInd == false)) { invoiceTotal += header.freightCost }*/
         //18
         addAbsoluteText('X', 339, 288, Element.ALIGN_MIDDLE)
+        addAbsoluteText("${header?.pickingRouteId ?: ''}", 240, 270, Element.ALIGN_MIDDLE)
 
         //Totals - 16 and 17
         addAbsoluteText("${header?.totalNetWeight ?: ''}", 370, 270, Element.ALIGN_MIDDLE)
         addAbsoluteText("${header?.totalGrossWeight ?: ''}", 460, 270, Element.ALIGN_MIDDLE)
         addAbsoluteText("${footer.invoiceTotalAmount ?: ''}", 520, 270, Element.ALIGN_MIDDLE)
 
-        addAbsoluteText("${header?.exporterName ?: ''}", 50, 240, Element.ALIGN_MIDDLE)
-        addAbsoluteText("${header?.exporterAddr1 ?: ''}", 50, 233, Element.ALIGN_MIDDLE)
-        addAbsoluteText("${header?.exporterAddr2 ?: ''}", 50, 222, Element.ALIGN_MIDDLE)
-        addAbsoluteText("${header?.exporterCountryName ?: ''}", 50, 214, Element.ALIGN_MIDDLE)
+        addAbsoluteText("${header?.exporterName ?: 'LeMans Corporation'}", 50, 240, Element.ALIGN_MIDDLE)
+        addAbsoluteText("${header?.exporterAddr1 ?: '3501 Kennedy Road'}", 50, 233, Element.ALIGN_MIDDLE)
+        addAbsoluteText("${header?.exporterAddr2 ?: 'Janesville, WI. 53545'}", 50, 222, Element.ALIGN_MIDDLE)
+        addAbsoluteText("${header?.exporterCountryName ?: 'USA'}", 50, 214, Element.ALIGN_MIDDLE)
 
 
-        addAbsoluteText("${header?.exporterName ?: ''}", 340, 240, Element.ALIGN_MIDDLE)
+        addAbsoluteText("${user?.firstName} ${user?.lastName}", 340, 240, Element.ALIGN_MIDDLE)
         addAbsoluteText("${header?.name ?: ''}", 340, 233, Element.ALIGN_MIDDLE)
         addAbsoluteText("${header?.address1 ?: ''}", 340, 226, Element.ALIGN_MIDDLE)
         addAbsoluteText("${header?.address2 ?: ''}", 340, 218, Element.ALIGN_MIDDLE)
@@ -212,12 +230,12 @@
 
 
         //23(i) (ii) (iii)
-        addAbsoluteText(header?.directShipmentTransportChargeFrom?.toString() ?: '', 60, 130, Element.ALIGN_MIDDLE)
+        addAbsoluteText(header?.freightCost?.toString() ?: '', 60, 130, Element.ALIGN_MIDDLE)
         addAbsoluteText(header?.directShipmentConstructionCostFrom?.toString() ?: '', 60, 80, Element.ALIGN_MIDDLE)
         addAbsoluteText(header?.directShipmentExportPackingAmountFrom?.toString() ?: '', 60, 46, Element.ALIGN_MIDDLE)
 
         //24(i)(ii)(iii)
-        addAbsoluteText(header?.directShipmentTransportChargeTo?.toString() ?: '', 260, 130, Element.ALIGN_MIDDLE)
+        addAbsoluteText(header?.ffShipmentCost?.toString() ?: '', 260, 130, Element.ALIGN_MIDDLE)
         addAbsoluteText(header?.directShipmentCommissionAmountTo?.toString() ?: '', 260, 80, Element.ALIGN_MIDDLE)
         addAbsoluteText(header?.directShipmentExportPackingAmountTo?.toString() ?: '', 260, 46, Element.ALIGN_MIDDLE)
 
Index: src/main/groovy/com/lemans/entities/shipment/ShipmentEntity.groovy
===================================================================
diff -u -r082182230be76878a3a9d94135a2b6bc320356a1 -ra8d6519d81ccb694b3da08cc0dcd407fa0f2b91a
--- src/main/groovy/com/lemans/entities/shipment/ShipmentEntity.groovy	(.../ShipmentEntity.groovy)	(revision 082182230be76878a3a9d94135a2b6bc320356a1)
+++ src/main/groovy/com/lemans/entities/shipment/ShipmentEntity.groovy	(.../ShipmentEntity.groovy)	(revision a8d6519d81ccb694b3da08cc0dcd407fa0f2b91a)
@@ -193,6 +193,10 @@
     String forwarderCountryName
 
     String custFreightAccount
+
+    Float ffShipmentCost
+
+
 }
 
 interface ShipmentEntityRepository extends LemansCrudRepository<ShipmentEntity, Integer> {
Index: src/main/groovy/com/lemans/services/document/DocumentManagerService.groovy
===================================================================
diff -u -rf77279f1fe2d05e245fab1c7579b4f6ef08416ca -ra8d6519d81ccb694b3da08cc0dcd407fa0f2b91a
--- src/main/groovy/com/lemans/services/document/DocumentManagerService.groovy	(.../DocumentManagerService.groovy)	(revision f77279f1fe2d05e245fab1c7579b4f6ef08416ca)
+++ src/main/groovy/com/lemans/services/document/DocumentManagerService.groovy	(.../DocumentManagerService.groovy)	(revision a8d6519d81ccb694b3da08cc0dcd407fa0f2b91a)
@@ -104,7 +104,7 @@
                     break
                 case 'Canada Commercial Invoice (CCI)':
                     CciPdfBuilder cciPdfBuilder = new CciPdfBuilder()
-                    file = cciPdfBuilder.cciPdf(data)
+                    file = cciPdfBuilder.cciPdf(data, userDetails)
                     break
                 case 'SED shippers Export Declaration':
                     SedPdfBuilder sedPdfBuilder = new SedPdfBuilder()