Removed many global variables from config.default.php to GL Setup, Company Setup...

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

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index f39254afee2f4a8fd830c47fd5188f43231b6296..de3082a9e1eadd6dfe906313b37786ac1219ccad 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -50,10 +50,10 @@
                        $this->title = _("SALES QUOTATION");
                        $this->formData['document_name'] =_("Quotation No.");
                        $this->formData['document_date'] = $this->formData['ord_date'];
-                       $this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+                       $this->formData['document_number'] = $SysPrefs->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'],
@@ -65,12 +65,12 @@
                        $this->title = ($print_as_quote==1 ? _("QUOTE") : ($this->formData['prepaid'] ? _("PREPAYMENT ORDER") : _("SALES ORDER")));
                        $this->formData['document_name'] =_("Order No.");
                        $this->formData['document_date'] = $this->formData['ord_date'];
-                       $this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+                       $this->formData['document_number'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
                                ? $this->formData['reference'] : $this->formData['order_no'];
                        $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'],
@@ -84,14 +84,14 @@
                        if (@$packing_slip)
                                $Payment_Terms = '';
                        $ref = $this->formData['order_'];
-                       if ($print_invoice_no == 0)
+                       if ($SysPrefs->print_invoice_no() == 0)
                        {
                                $ref = get_reference(ST_SALESORDER, $this->formData['order_']);
                                if (!$ref)
                                        $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_'],
@@ -121,14 +121,14 @@
                        $Footer[0] = _("Please quote Invoice no. when paying. All amounts stated in"). " - " . $this->formData['curr_code'];
 
                        $deliveries = get_sales_parent_numbers(ST_SALESINVOICE, $this->formData['trans_no']);
-                       if ($print_invoice_no == 0)
+                       if ($SysPrefs->print_invoice_no() == 0)
                        {
                                foreach($deliveries as $n => $delivery) {
                                        $deliveries[$n] = get_reference(ST_CUSTDELIVERY, $delivery);
                                }
                        }
                        $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"));
@@ -177,15 +177,15 @@
                        $Addr2['name'] = $this->company['coy_name'];
                        //$Addr2['address'] = $this->company['postal_address']; No, don't destroy delivery address!
                        $this->formData['document_date'] = $this->formData['ord_date'];
-                       $this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+                       $this->formData['document_number'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
                                ? $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") => '',
@@ -252,7 +252,7 @@
                $this->formData['document_date'] = $this->formData['tran_date'];
 
        if (!isset($this->formData['document_number']))
-               $this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
+               $this->formData['document_number'] = $SysPrefs->print_invoice_no() == 0 && isset($this->formData['reference'])
                        ? $this->formData['reference'] : @$this->formData['trans_no'];
 
        // footer generic content
@@ -283,3 +283,5 @@
                foreach(explode("\n", $this->company['legal_text']) as $line)
                        $Footer[] = $line;
        }
+
+       $this->formData['recipient_name'] = $Addr1['name'];