Improved headers in printing Purchase Orders.

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index 7044cee4572eaa352406610d92d10b1ede016a04..73bdaa10ed9353971145b0b0459f252d249c8810 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -41,7 +41,7 @@
                        $this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
                                ? $this->formData['reference'] : $this->formData['order_no'];
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData["customer_ref"],
+                               _("Customer's Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
                                _("Your VAT no.") => $this->formData['tax_id'],
                                _("Our Quotation No") => $this->formData['order_no'],
@@ -58,7 +58,7 @@
                        $this->formData['document_amount'] = $this->formData['order_no'];
 
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData["customer_ref"],
+                               _("Customer's Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
                                _("Your VAT no.") => $this->formData['tax_id'],
                                _("Our Order No") => $this->formData['order_no'],
@@ -79,7 +79,7 @@
                                        $ref = $this->formData['order_'];
                        }
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData["customer_ref"],
+                               _("Customer's Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
                                _("Your VAT no.") => $this->formData['tax_id'],
                                _("Our Order No") => $ref,
@@ -93,7 +93,7 @@
                        $Footer[0] = _("Please quote Credit no. when paying. All amounts stated in") . " - " . $this->formData['curr_code'];
 
                        $aux_info = array(
-                               _("Customers Reference") => @$this->formData["customer_ref"],
+                               _("Customer's Reference") => @$this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
                                _("Your VAT no.") => $this->formData['tax_id'],
                                _("Our Order No") => $this->formData['order_'],
@@ -115,7 +115,7 @@
                                }
                        }
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData["customer_ref"],
+                               _("Customer's Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
                                _("Your VAT no.") => $this->formData['tax_id'],
                                _("Delivery Note No.") => implode(',', $deliveries),
@@ -136,10 +136,10 @@
                        $Addr2['address'] = '';
 
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData['supp_account_no'],
+                               _("Customer's Reference") => $this->formData['supp_account_no'],
                                _("Type") =>$systypes_array[$this->formData["type"]],
                                _("Your VAT no.") => $this->formData['tax_id'],
-                               _("Our Order No") => '',
+                               _("Supplier's Reference") => '',
                                _("Due Date") => sql2date($this->formData['tran_date']),
                        );
                        $this->headers = array(_("Trans Type"), _("#"), _("Date"), _("Due Date"), _("Total Amount"), _("Left to Allocate"), _("This Allocation"));
@@ -159,11 +159,11 @@
                                ? $this->formData['reference'] : $this->formData['order_no'];
 
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData['supp_account_no'],
-                               _("Sales Person") => '',
-                               _("Your VAT no.") => '',
-                               _("Our Order No") => '',
-                               _("Due Date") => '',
+                               _("Customer's Reference") => $this->formData['supp_account_no'],
+                               _("Sales Person") => $this->formData['contact'],
+                               _("Your VAT no.") => $this->formData['tax_id'],
+                               _("Supplier's Reference") => $this->formData['requisition_no'],
+                               _("Order Date") => sql2date($this->formData['document_date']),
                        );
 
                        $this->headers = array(_("Item Code"), _("Item Description"),
@@ -177,7 +177,7 @@
                        $this->formData['document_name'] =_("Receipt No.");
                        $Addr1['title'] = _("With thanks from");
                        $aux_info = array(
-                               _("Customers Reference") => $this->formData["debtor_ref"],
+                               _("Customer's Reference") => $this->formData["debtor_ref"],
                                _("Type") =>$systypes_array[$this->formData["type"]],
                                _("Your VAT no.") => $this->formData['tax_id'],
                                _("Our Order No") => $this->formData['order_'],
@@ -215,7 +215,7 @@
                        $Payment_Terms = '';
                        $this->title = _("STATEMENT");
                        $aux_info = array(
-                               _("Customers Reference") => '',
+                               _("Customer's Reference") => '',
                                _("Sales Person") => '',
                                _("Your VAT no.") => $this->formData['tax_id'],
                                _("Our Order No") => '',

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index d92ed2a8984353c4414dd4f1409cc6a4025c9c11..0a412ce87aadcc5d5d718a2433f60710108c144d 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -386,7 +386,7 @@ class FrontReport extends Cpdf
                        'DebtorName', 'supp_account_no', 'wo_ref', 'debtor_ref','type', 'trans_no', 
                        'StockItemName', 'tax_id', 'order_', 'delivery_date', 'units_issued',
                        'due_date', 'required_by', 'payment_terms', 'curr_code',
-                       'ov_freight', 'ov_gst', 'ov_amount'),
+                       'ov_freight', 'ov_gst', 'ov_amount', 'requisition_no', 'contact'),
                'branch' => array('br_address', 'br_name', 'salesman', 'disable_branch'),
                'sales_order' => array('deliver_to', 'delivery_address', 'customer_ref'),
                'bankaccount' => array('bank_name', 'bank_account_number', 'payment_service')

diff --git a/reporting/rep209.php b/reporting/rep209.php
index c7eed103c8092c3a15968f0185a3f04b70f8b778..343f9f7dee5f35dcdbaecdde094e85e6aa31703d 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -34,7 +34,7 @@ print_po();
 function get_po($order_no)
 {
        $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,  "
-               .TB_PREF."suppliers.supp_account_no,".TB_PREF."suppliers.tax_included,
+               .TB_PREF."suppliers.supp_account_no,".TB_PREF."suppliers.tax_included,".TB_PREF."suppliers.gst_no AS tax_id,
                ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."locations.location_name,
                ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact, ".TB_PREF."suppliers.tax_group_id
                FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations