X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=fba45c7baf06f739fcb79eabd039c3b9dad611c0;hb=3f3cfa578adbc2b71f4fd9c8d0f5536d26af43d8;hp=74595a99d34322c52d980c2d9d5b080e78718df7;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 74595a99..fba45c7b 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -52,13 +52,14 @@ 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);
 
-	hyperlink_params("$path_to_root/sales/customer_invoice.php", _("Invoice This Delivery"), "DeliveryNumber=$dispatch_no");
+	if (!isset($_GET['prepaid']))
+		hyperlink_params("$path_to_root/sales/customer_invoice.php", _("Invoice This Delivery"), "DeliveryNumber=$dispatch_no");
 
 	hyperlink_params("$path_to_root/sales/inquiry/sales_orders_view.php", _("Select Another Order For Dispatch"), "OutstandingOnly=1");
 
@@ -73,11 +74,12 @@ 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");
+	if (!isset($_GET['prepaid']))
+		hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
 
 	hyperlink_params($path_to_root . "/sales/inquiry/sales_deliveries_view.php", _("Select A Different Delivery"), "OutstandingOnly=1");
 
@@ -88,29 +90,34 @@ if (isset($_GET['AddedID'])) {
 if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 
 	$ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true);
-
-	/*read in all the selected order into the Items cart  */
+	if ($ord->is_prepaid())
+		check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices."));
 
 	if ($ord->count_items() == 0) {
+		echo "<br><center><b>" . _("This order has no items. There is nothing to delivery.") .
+			"</center></b>";
 		hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
 			_("Select a different sales order to delivery"), "OutstandingOnly=1");
-		die ("<br><b>" . _("This order has no items. There is nothing to delivery.") . "</b>");
+		display_footer_exit();
+	} else if (!$ord->prep_amount) {
+		echo "<br><center><b>"._("This prepayment order is not yet ready for delivery due to insufficient amount received.")
+			."</center></b>";
+		hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",_("Select a different sales order to delivery"),
+			"OutstandingOnly=1");
+		display_footer_exit();
 	}
-
-	$ord->trans_type = ST_CUSTDELIVERY;
-	$ord->src_docs = $ord->trans_no;
-	$ord->order_no = key($ord->trans_no);
-	$ord->trans_no = 0;
-	$ord->reference = $Refs->get_next(ST_CUSTDELIVERY);
-	$ord->document_date = new_doc_date();
+ 	// Adjust Shipping Charge based upon previous deliveries TAM
+	adjust_shipping_charge($ord, $_GET['OrderNumber']);
+ 
 	$_SESSION['Items'] = $ord;
 	copy_from_cart();
 
 } elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) {
 
+	check_is_editable(ST_CUSTDELIVERY, $_GET['ModifyDelivery']);
 	$_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']);
 
-	if ($_SESSION['Items']->count_items() == 0) {
+	if (!$_SESSION['Items']->prepaid && $_SESSION['Items']->count_items() == 0) {
 		hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
 			_("Select a different delivery"), "OutstandingOnly=1");
 		echo "<br><center><b>" . _("This delivery has all items invoiced. There is nothing to modify.") .
@@ -136,9 +143,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');
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -154,7 +162,7 @@ function check_data()
 	}
 
 	if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
-		display_error(_("The entered date of delivery is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('DispatchDate');
 		return false;
 	}
@@ -171,12 +179,6 @@ function check_data()
 			set_focus('ref');
 			return false;
 		}
-
-		if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], ST_CUSTDELIVERY)) {
-			display_error(_("The entered reference is already in use."));
-			set_focus('ref');
-			return false;
-		}
 	}
 	if ($_POST['ChargeFreightCost'] == "") {
 		$_POST['ChargeFreightCost'] = price_format(0);
@@ -194,8 +196,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;
 	}
 
@@ -211,6 +211,8 @@ function copy_to_cart()
 	$cart->due_date =  $_POST['due_date'];
 	$cart->Location = $_POST['Location'];
 	$cart->Comments = $_POST['Comments'];
+	$cart->dimension_id = $_POST['dimension_id'];
+	$cart->dimension2_id = $_POST['dimension2_id'];
 	if ($cart->trans_no == 0)
 		$cart->reference = $_POST['ref'];
 
@@ -226,6 +228,8 @@ function copy_from_cart()
 	$_POST['due_date'] = $cart->due_date;
 	$_POST['Location'] = $cart->Location;
 	$_POST['Comments'] = $cart->Comments;
+	$_POST['dimension_id'] = $cart->dimension_id;
+	$_POST['dimension2_id'] = $cart->dimension2_id;
 	$_POST['cart_id'] = $cart->cart_id;
 	$_POST['ref'] = $cart->reference;
 }
@@ -271,28 +275,38 @@ function check_quantities()
 
 function check_qoh()
 {
-	global $SysPrefs;
-
-	if (!$SysPrefs->allow_negative_stock())	{
-		foreach ($_SESSION['Items']->line_items as $itm) {
-
-			if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) {
-				$qoh = get_qoh_on_date($itm->stock_id, $_POST['Location'], $_POST['DispatchDate']);
-
-				if ($itm->qty_dispatched > $qoh) {
-					display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") .
-						" " . $itm->stock_id . " - " .  $itm->item_description);
-					return false;
-				}
-			}
-		}
-	}
-	return true;
+    global $SysPrefs;
+    $dn = &$_SESSION['Items'];
+    $newdelivery = ($dn->trans_no==0);
+    if (!$SysPrefs->allow_negative_stock()) {
+        foreach ($_SESSION['Items']->line_items as $itm) {
+
+            if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) {
+                $qoh_by_date = get_qoh_on_date($itm->stock_id, $_POST['Location'], $_POST['DispatchDate']);
+                $qoh_abs = get_qoh_on_date($itm->stock_id, $_POST['Location'], null);
+                //If editing current delivery delivered qty should be added 
+                if (!$newdelivery)
+                {
+                    $delivered = get_already_delivered($itm->stock_id, $_POST['Location'], key($dn->trans_no));
+
+                    $qoh_abs = $qoh_abs - $delivered;
+                    $qoh_by_date = $qoh_by_date - $delivered;
+                }
+                $qoh = ($qoh_by_date < $qoh_abs ? $qoh_by_date : $qoh_abs); 
+                if ($itm->qty_dispatched > $qoh) {
+                    display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") .
+                        " " . $itm->stock_id . " - " . $itm->item_description);
+                    return false;
+                }
+            }
+        }
+    }
+    return true;
 }
+
 //------------------------------------------------------------------------------
 
 if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
-
 	$dn = &$_SESSION['Items'];
 
 	if ($_POST['bo_policy']) {
@@ -305,12 +319,21 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
 	copy_to_cart();
 	if ($newdelivery) new_doc_date($dn->document_date);
 	$delivery_no = $dn->write($bo_policy);
+	if ($delivery_no == -1)
+	{
+		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
+	}
+	else
+	{
+		$is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : '';
 
-	processing_end();
-	if ($newdelivery) {
-		meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no");
-	} else {
-		meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no");
+		processing_end();
+		if ($newdelivery) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no$is_prepaid");
+		} else {
+			meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid");
+		}
 	}
 }
 
@@ -321,10 +344,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'");
@@ -373,12 +396,34 @@ 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'");
+customer_credit_row($_SESSION['Items']->customer_id, $_SESSION['Items']->credit, "class='tableheader2'");
+// 2010-09-03 Joe Hunt
+$dim = get_company_pref('use_dimension');
+if ($dim > 0) {
+	start_row();
+	label_cell(_("Dimension").":", "class='tableheader2'");
+	dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false);
+	end_row();
+}		
+else
+	hidden('dimension_id', 0);
+if ($dim > 1) {
+	start_row();
+	label_cell(_("Dimension")." 2:", "class='tableheader2'");
+	dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false);
+	end_row();
+}		
+else
+	hidden('dimension2_id', 0);
+//---------
+start_row();
+date_cells(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+end_row();
 end_table();
 
 echo "</td></tr>";
@@ -394,9 +439,13 @@ 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"),
+start_table(TABLESTYLE, "width=80%");
+
+$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;
@@ -425,7 +474,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);
@@ -473,7 +526,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);