X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=2284f18a87ad9ec73a293b7a919f060c7971cade;hb=4c40cfa3e45f9546731a137e8a30b45dd751c1cb;hp=cd7299a8d18d96c807129f913ce453edc8161f82;hpb=49d2702ed98abe7a564a4abb4c8c5fa225f362e8;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index cd7299a8..2284f18a 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -52,9 +52,9 @@ if (isset($_GET['AddedID'])) {
 	display_note(get_customer_trans_view_str(ST_CUSTDELIVERY, $dispatch_no, _("&View This Delivery")), 0, 1);
 
 	display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
-	display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
-	display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
-	display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
+	display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "printlink", "", 1), 1, 1);
+	display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1));
+	display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1);
 
 	display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
 
@@ -73,9 +73,9 @@ if (isset($_GET['AddedID'])) {
 	display_note(get_trans_view_str(ST_CUSTDELIVERY, $delivery_no, _("View this delivery")), 0, 1);
 
 	display_note(print_document_link($delivery_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
-	display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
-	display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
-	display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
+	display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "printlink", "", 1), 1, 1);
+	display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 0, 1));
+	display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "printlink", "", 1, 1), 1);
 
 	hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
 
@@ -320,10 +320,10 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
 start_form();
 hidden('cart_id');
 
-start_table("$table_style2 width=80%", 5);
+start_table(TABLESTYLE2, "width=80%", 5);
 echo "<tr><td>"; // outer table
 
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width=100%");
 start_row();
 label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
 label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -372,12 +372,14 @@ end_table();
 
 echo "</td><td>";// outer table
 
-start_table("$table_style width=90%");
+start_table(TABLESTYLE, "width=90%");
 
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
-	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
+	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']);
 }
-date_row(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+start_row();
+date_cells(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+end_row();
 end_table();
 
 echo "</td></tr>";
@@ -393,7 +395,7 @@ if ($row['dissallow_invoices'] == 1)
 }	
 display_heading(_("Delivery Items"));
 div_start('Items');
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width=80%");
 
 $new = $_SESSION['Items']->trans_no==0;
 $th = array(_("Item Code"), _("Item Description"), 
@@ -428,7 +430,11 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 	}
 	view_stock_status_cell($ln_itm->stock_id);
 
-	text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+	if ($ln_itm->descr_editable)
+		text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+	else
+		label_cell($ln_itm->item_description);
+
 	$dec = get_qty_dec($ln_itm->stock_id);
 	qty_cell($ln_itm->quantity, false, $dec);
 	label_cell($ln_itm->units);
@@ -476,7 +482,7 @@ end_table(1);
 if ($has_marked) {
 	display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='red'");
 }
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 policy_list_row(_("Action For Balance"), "bo_policy", null);