X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fdoctext.inc;h=4b87fa6df229df98b78d41ccfc5c18e7b8276c29;hb=c001557f8ebee630494c6323477bd865a61942d9;hp=98a59c8b0585000a523d85d7e383b89b2f6a5a78;hpb=1f791242a00fa0766f0452ba68024c45490c2960;p=fa-stable.git diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc index 98a59c8b..4b87fa6d 100644 --- a/reporting/includes/doctext.inc +++ b/reporting/includes/doctext.inc @@ -78,7 +78,7 @@ break; case ST_CUSTDELIVERY: - $this->title = ($packing_slip==1 ? _("PACKING SLIP") : _("DELIVERY NOTE")); + $this->title = ($this->params['packing_slip'] ? _("PACKING SLIP") : _("DELIVERY NOTE")); $this->formData['document_name'] = _("Delivery Note No."); if (@$packing_slip) $Payment_Terms = ''; @@ -183,7 +183,7 @@ _("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'], + _("Supplier's Reference") => @$this->formData['requisition_no'], _("Order Date") => sql2date($this->formData['document_date']), ); @@ -197,6 +197,8 @@ $this->title = _("RECEIPT"); $this->formData['document_name'] =_("Receipt No."); $Addr1['title'] = _("With thanks from"); + if ($this->formData['order_'] == "0") + $this->formData['order_'] = ""; $aux_info = array( _("Customer's Reference") => $this->formData["debtor_ref"], _("Type") =>$systypes_array[$this->formData["type"]],