Improved layout on documents.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d2c2bbfc5b1b7a35958706eeab9a6ce8dede120e..ee1ccf72e7707564998b8789a627fe978873a214 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -21,8 +21,12 @@ $ -> Affected files
 
 04-Jan-2010 Joe Hunt
 ! Making the stretch parameter = 1 on default print pdf all over
+  Improved layout on documents.
 $ /reporting/includes/class.pdf.inc
   /reporting/includes/pdf_report.inc
+  /reporting/includes/doctext.inc
+  /reporting/includes/doctext2.inc
+  /reporting/includes/header2.inc
   
 31-Dec-2009 Joe Hunt
 # When updating tax rate, it didn't show and calculate correct in documents.

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index d94ffe0cde8490ff2559b57ce364dd75e1713e98..79812ecead1e63500e18832032831717ac8d7791 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -42,7 +42,7 @@ if (isset($header2type))
        }       
        else
        {
-               $doc_Our_Ref = _("Our Ref.");
+               $doc_Our_Ref = _("Sales Person");
                $doc_Your_VAT_no = _("Your VAT no.");
                $doc_Payment_Terms = _("Payment Terms");
                $doc_Customers_Ref = _("Customers Reference");

diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index d4a725b76ab43c1189dd74efa4a48c74917b4392..f1e3e0ee9abfe65cfcbb637baf83d318bd197da9 100644 (file)
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -42,7 +42,7 @@ if (isset($header2type))
        }       
        else
        {
-               $doc_Our_Ref = "Our Ref.";
+               $doc_Our_Ref = "Sales Person";
                $doc_Your_VAT_no = "Your VAT no.";
                $doc_Payment_Terms = "Payment Terms";
                $doc_Customers_Ref = "Customers Reference";

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index c3fd180b9baab9f7b6f98efadee875b038390b56..da51522863ada247a47af88398718ff25b19ef47 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -120,7 +120,7 @@
                $this->Font();
                $this->row = $adrline;
                $this->NewLine(3);
-               $this->Text($mcol + 100, $doc_Date.":");
+               $this->Text($mcol + 100, $doc_Date);
                if ($doctype == 7 || $doctype == 8 || $doctype == 9)
                        $this->Text($mcol + 180, sql2date($myrow['ord_date']));
                elseif ($doctype == 26)