From df0fd2e5ff26de79e7d86c4206582012833bcef5 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 16 Jun 2008 13:32:37 +0000 Subject: [PATCH] Changed so Customer's Reference is printed on all sales documents (you can f.i. enter PO number here). --- CHANGELOG.txt | 6 ++++++ reporting/includes/doctext.inc | 1 + reporting/includes/doctext2.inc | 1 + reporting/includes/header2.inc | 10 ++++++---- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 799bc44d..6dbbad15 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,12 @@ Legend: ! -> Note $ -> Affected files +16-Jun-2008 Joe Hunt +! Changed so Customer's Reference is printed on all sales documents (you can f.i. enter PO number here). +$ /reporting/includes/header2.inc + /reporting/doctext.inc + /reporting/doctext2.inc + 16-Jun-2008 Joe Hunt ! Changed the Quantity routines to use the Item Units decimals if any. A lot of files. $ /includes/current_user.inc diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc index d2366c20..5753447d 100644 --- a/reporting/includes/doctext.inc +++ b/reporting/includes/doctext.inc @@ -15,6 +15,7 @@ if (isset($header2type)) $doc_Your_VAT_no = _("Your VAT no."); $doc_Our_VAT_no = _("Our VAT No."); $doc_Payment_Terms = _("Payment Terms"); + $doc_Customers_Ref = _("Customers Reference:"); $doc_Our_Order_No = _("Our Order No"); $doc_Domicile = _("Domicile"); if($doctype == 13) { diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc index 6a7078f1..0bbe57e7 100644 --- a/reporting/includes/doctext2.inc +++ b/reporting/includes/doctext2.inc @@ -15,6 +15,7 @@ if (isset($header2type)) $doc_Your_VAT_no = "Your VAT No."; $doc_Our_VAT_no = "Our VAT No."; $doc_Payment_Terms = "Payment Terms"; + $doc_Customers_Ref = "Customers Reference:"; $doc_Our_Order_No = "Our Order No"; $doc_Domicile = "Domicile"; if($doctype == 13) { diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc index 5fdf36f2..3da42fcc 100644 --- a/reporting/includes/header2.inc +++ b/reporting/includes/header2.inc @@ -57,10 +57,8 @@ $this->Font(); $this->fontSize -= 4; } - if ($doctype == 8) // PO + if ($doctype == 8 || $doctype == 9) // PO or SO $this->Text($mcol, $myrow['order_no'], $mcol + 90); - else if ($doctype == 9) // SO - $this->Text($mcol, $myrow['order_no'] ." ".$myrow['customer_ref'], $mcol + 90); else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA { if ($print_invoice_no == 1) @@ -156,7 +154,11 @@ $this->Text($mcol, $doc_Our_Order_No . ":", $mcol2); if (isset($myrow['order_'])) $this->Text($mcol2, $myrow['order_']); - + // 2008-06-16. Added customer's reference + $this->NewLine(); + $this->Text($ccol, $doc_Customers_Ref, $ccol2); + if ($sales_order != NULL) + $this->Text($ccol2, $sales_order["customer_ref"], $mcol); $locale = $path_to_root . "lang/" . $_SESSION['language']->code . "/locale.inc"; if (file_exists($locale)) { -- 2.30.2