From 1686c85f8d537a2d51afa79655f32c15670aaf96 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Fri, 12 Aug 2011 22:55:54 +0200 Subject: [PATCH] 0000984: SO doesn't print the reference when the $print_invoice_no is set to 0. --- reporting/includes/doctext.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc index 6d28e27..7044cee 100644 --- a/reporting/includes/doctext.inc +++ b/reporting/includes/doctext.inc @@ -38,7 +38,8 @@ $this->title = _("SALES QUOTATION"); $this->formData['document_name'] =_("Quotation No."); $this->formData['document_date'] = $this->formData['ord_date']; - $this->formData['document_number'] = $this->formData['order_no']; + $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"], _("Sales Person") => get_salesman_name($this->formData['salesman']), @@ -52,7 +53,8 @@ $this->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER")); $this->formData['document_name'] =_("Order No."); $this->formData['document_date'] = $this->formData['ord_date']; - $this->formData['document_number'] = $this->formData['order_no']; + $this->formData['document_number'] = $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( @@ -151,7 +153,7 @@ $Addr1['address'] = $this->formData['address']; $Addr2['title'] = _("Deliver To"); $Addr2['name'] = $this->company['coy_name']; - $Addr2['address'] = $this->company['postal_address']; + //$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['reference'] : $this->formData['order_no']; -- 2.30.2