Added missing aux info on sales order/quotation reports.

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index a889e0b86fb77ec36a8d466e75beedb310973410..6d28e274933bee7ddc79b48d8942211882d05ed7 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -42,8 +42,8 @@
                        $aux_info = array(
                                _("Customers Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
-                               _("Your VAT no.") => '',
-                               _("Our Order No") => '',
+                               _("Your VAT no.") => $this->formData['tax_id'],
+                               _("Our Quotation No") => $this->formData['order_no'],
                                _("Valid until") => sql2date($this->formData['delivery_date']),
                        );
                        break;
@@ -58,8 +58,8 @@
                        $aux_info = array(
                                _("Customers Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
-                               _("Your VAT no.") => '',
-                               _("Our Order No") => '',
+                               _("Your VAT no.") => $this->formData['tax_id'],
+                               _("Our Order No") => $this->formData['order_no'],
                                _("Delivery Date") => sql2date($this->formData['delivery_date']),
                        );
                        break;

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index db8f928a1663293d1ee9d96db153743a1f2a246f..3785cb563b7e18d0b36ce15972c2955afbc71bf4 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -285,7 +285,8 @@ function get_sales_order_header($order_no, $trans_type)
          ."stype.tax_included, "
          ."ship.shipper_name, "
          ."tax_group.name AS tax_group_name , "
-         ."tax_group.id AS tax_group_id "
+         ."tax_group.id AS tax_group_id, "
+         ."cust.tax_id "
        ."FROM ".TB_PREF."sales_orders sorder, "
          .TB_PREF."debtors_master cust,"
          .TB_PREF."sales_types stype, "