Merged latest changes from stable branch.

[fa-stable.git] / reporting / includes / doctext.inc

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index f39254afee2f4a8fd830c47fd5188f43231b6296..21b3a8479508d2d59a31a2cad12d5e5fb3eaa4db 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -53,7 +53,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'],
@@ -70,7 +70,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'],
@@ -91,7 +91,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,
@@ -105,7 +105,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_'],
@@ -128,7 +128,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'],
                        );
@@ -158,10 +158,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"));
@@ -181,11 +181,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"),
@@ -199,7 +199,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_'],
@@ -237,7 +237,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") => '',