X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Fincludes%2Fdoctext.inc;h=16db8df5c0ab6f9d999043f371d4007ab6b59b3b;hb=4618ee761a2d5ea779858009710ed43e12325c6f;hp=1234fc3edf3715079e1d65e6fbb842f230937ba4;hpb=969c529c0d7eadc935d9787d9c820d65173ce820;p=fa-stable.git

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index 1234fc3e..16db8df5 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 = '';
@@ -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"]],
@@ -242,7 +244,7 @@
 				_("Our Order No") => '',
 				_("Delivery Date") => '',
 			);
-			$this->headers = array(_("Trans Type"), _("#"), _("Date"), _("DueDate"), _("Charges"),
+			$this->headers = array(_("Trans Type"), _("#"), _("Date"), _("DueDate"), _("Debits"),
 				_("Credits"), _("Allocated"), _("Outstanding"));
 	}