From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 21 Dec 2009 22:17:00 +0000 (+0000)
Subject: Fixed quantity columns descriptions in delivery note edition.
X-Git-Tag: 2.3-final~1081
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=11df4e7009ad4f5f15576506e4705b972df46ab9;p=fa-stable.git

Fixed quantity columns descriptions in delivery note edition.
---

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 74595a99..cd7299a8 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -136,9 +136,10 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 	if (!check_quantities()) {
 		display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity	not dispatched on sales order."));
 
-	} elseif(!check_num('ChargeFreightCost', 0))
+	} elseif(!check_num('ChargeFreightCost', 0)) {
 		display_error(_("Freight cost cannot be less than zero"));
 		set_focus('ChargeFreightCost');
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -194,8 +195,6 @@ function check_data()
 	}
 
 	if (!check_quantities()) {
-		display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
-		not dispatched on sales order."));
 		return false;
 	}
 
@@ -395,8 +394,12 @@ if ($row['dissallow_invoices'] == 1)
 display_heading(_("Delivery Items"));
 div_start('Items');
 start_table("$table_style width=80%");
-$th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("Delivered"),
+
+$new = $_SESSION['Items']->trans_no==0;
+$th = array(_("Item Code"), _("Item Description"), 
+	$new ? _("Ordered") : _("Max. delivery"), _("Units"), $new ? _("Delivered") : _("Invoiced"),
 	_("This Delivery"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
+
 table_header($th);
 $k = 0;
 $has_marked = false;