From f6f38849df876e233cd59e81ed03b6d85d9c3bbd Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 25 Jul 2011 19:58:03 +0200 Subject: [PATCH] Added missing aux info on sales order/quotation reports. --- reporting/includes/doctext.inc | 8 ++++---- sales/includes/db/sales_order_db.inc | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc index a889e0b..6d28e27 100644 --- 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 db8f928..3785cb5 100644 --- 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, " -- 2.30.2