$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']),
- _("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;
$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(
_("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;
$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'];