X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_sales_order.php;h=9d7eb795f3a76b557fd45af329fe56734ec42b60;hb=c061e1b478cb41d22c23627ddff39a4ea7d849ed;hp=1c3d95b43f68c6d901f8943f48ef35d4ab300289;hpb=4fb55e726607d40a22272c0c432c3df8b422b447;p=fa-stable.git

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 1c3d95b4..9d7eb795 100644
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -67,6 +67,8 @@ start_row();
 label_cells(_("Ordered On"), $_SESSION['View']->document_date, "class='tableheader2'");
 if ($_GET['trans_type'] == ST_SALESQUOTE)
 	label_cells(_("Valid until"), $_SESSION['View']->due_date, "class='tableheader2'");
+elseif ($_SESSION['View']->reference == "auto")
+	label_cells(_("Due Date"), $_SESSION['View']->due_date, "class='tableheader2'");
 else
 	label_cells(_("Requested Delivery"), $_SESSION['View']->due_date, "class='tableheader2'");
 end_row();
@@ -95,7 +97,7 @@ label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'",
 label_row(_("Telephone"), $_SESSION['View']->phone, "class='tableheader2'", "colspan=3");
 label_row(_("E-mail"), "<a href='mailto:" . $_SESSION['View']->email . "'>" . $_SESSION['View']->email . "</a>",
 	"class='tableheader2'", "colspan=3");
-label_row(_("Comments"), nl2br($_SESSION['View']->Comments), "class='tableheader2'", "colspan=3");
+label_row(_("Comments"), !empty($_SESSION['View']->Comments) ? nl2br($_SESSION['View']->Comments) : "", "class='tableheader2'", "colspan=3");
 end_table();
 
 if ($_GET['trans_type'] != ST_SALESQUOTE)
@@ -181,7 +183,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
 
 	$credits_total = 0;
 
-	if (get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
+	if ($result = get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
 		$k = 0;
 
 		while ($credits_row = db_fetch($result))