X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=26bd6eeccde8dd9dcc4790094ddf4556824c55c8;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=6575598ad4fc69081313c921149b666a4a15cbab;hpb=e871e7b7f097ec86efa815e2005786710afb79e4;p=fa-stable.git
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 6575598a..26bd6eec 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -1,10 +1,20 @@
.
+***********************************************************************/
//-----------------------------------------------------------------------------
//
// Entry/Modify Delivery Note against Sales Order
//
-$page_security = 2;
-$path_to_root="..";
+$page_security = 'SA_SALESDELIVERY';
+$path_to_root = "..";
include_once($path_to_root . "/sales/includes/cart_class.inc");
include_once($path_to_root . "/includes/session.inc");
@@ -36,13 +46,15 @@ page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['AddedID'])) {
$dispatch_no = $_GET['AddedID'];
- print_hidden_script(13);
- display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true);
+ display_notification_centered(sprintf(_("Delivery # %d has been entered."),$dispatch_no));
- display_note(get_customer_trans_view_str(13, $dispatch_no, _("View this dispatch")), 0, 1);
+ display_note(get_customer_trans_view_str(ST_CUSTDELIVERY, $dispatch_no, _("&View This Delivery")), 0, 1);
- display_note(print_document_link($dispatch_no, _("Print this delivery"), true, 13));
+ 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(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
@@ -55,13 +67,15 @@ if (isset($_GET['AddedID'])) {
} elseif (isset($_GET['UpdatedID'])) {
$delivery_no = $_GET['UpdatedID'];
- print_hidden_script(13);
display_notification_centered(sprintf(_('Delivery Note # %d has been updated.'),$delivery_no));
- display_note(get_trans_view_str(13, $delivery_no, _("View this delivery")));
- echo '
';
- display_note(print_document_link($delivery_no, _("Print this delivery"), true, 13));
+ 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);
hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
@@ -73,7 +87,7 @@ if (isset($_GET['AddedID'])) {
if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
- $ord = new Cart(30,$_GET['OrderNumber'], true);
+ $ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true);
/*read in all the selected order into the Items cart */
@@ -83,17 +97,18 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
die ("
" . _("This order has no items. There is nothing to delivery.") . "");
}
- $ord->trans_type = 13;
+ $ord->trans_type = ST_CUSTDELIVERY;
$ord->src_docs = $ord->trans_no;
$ord->order_no = key($ord->trans_no);
$ord->trans_no = 0;
- $ord->reference = references::get_next(13);
+ $ord->reference = $Refs->get_next(ST_CUSTDELIVERY);
+ $ord->document_date = new_doc_date();
$_SESSION['Items'] = $ord;
copy_from_cart();
} elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) {
- $_SESSION['Items'] = new Cart(13,$_GET['ModifyDelivery']);
+ $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']);
if ($_SESSION['Items']->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
@@ -104,7 +119,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
}
copy_from_cart();
-
+
} elseif ( !processing_active() ) {
/* This page can only be called with an order number for invoicing*/
@@ -115,56 +130,71 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
end_page();
exit;
-} elseif (!check_quantities()) {
- display_error(_("Selected quantity cannot be less then quantity invoiced nor more then quantity
- not dispatched on sales order."));
+} else {
+ check_edit_conflicts();
+
+ 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))
+ display_error(_("Freight cost cannot be less than zero"));
+ set_focus('ChargeFreightCost');
}
+
//-----------------------------------------------------------------------------
function check_data()
{
+ global $Refs;
+
if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
display_error(_("The entered date of delivery is invalid."));
+ set_focus('DispatchDate');
return false;
}
if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
display_error(_("The entered date of delivery is not in fiscal year."));
+ set_focus('DispatchDate');
return false;
}
if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
display_error(_("The entered dead-line for invoice is invalid."));
+ set_focus('due_date');
return false;
}
if ($_SESSION['Items']->trans_no==0) {
- if (!references::is_valid($_POST['ref'])) {
+ if (!$Refs->is_valid($_POST['ref'])) {
display_error(_("You must enter a reference."));
+ set_focus('ref');
return false;
}
- if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], 13)) {
+ 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'] = 0;
+ $_POST['ChargeFreightCost'] = price_format(0);
}
- if (!is_numeric($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] < 0) {
+ if (!check_num('ChargeFreightCost',0)) {
display_error(_("The entered shipping value is not numeric."));
+ set_focus('ChargeFreightCost');
return false;
}
- if ($_SESSION['Items']->has_items_dispatch() == 0 && $_POST['ChargeFreightCost'] == 0) {
+ if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) {
display_error(_("There are no item quantities on this delivery note."));
return false;
}
if (!check_quantities()) {
- display_error(_("Selected quantity cannot be less then quantity invoiced nor more then quantity
+ display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
not dispatched on sales order."));
return false;
}
@@ -176,12 +206,14 @@ function copy_to_cart()
{
$cart = &$_SESSION['Items'];
$cart->ship_via = $_POST['ship_via'];
- $cart->freight_cost = $_POST['ChargeFreightCost'];
- $cart->document_date = $_POST['DispatchDate'];
+ $cart->freight_cost = input_num('ChargeFreightCost');
+ $cart->document_date = $_POST['DispatchDate'];
$cart->due_date = $_POST['due_date'];
$cart->Location = $_POST['Location'];
$cart->Comments = $_POST['Comments'];
- $cart->sales_type = $_POST['sales_type_id'];
+ if ($cart->trans_no == 0)
+ $dn->ref = $_POST['ref'];
+
}
//------------------------------------------------------------------------------
@@ -189,12 +221,13 @@ function copy_from_cart()
{
$cart = &$_SESSION['Items'];
$_POST['ship_via'] = $cart->ship_via;
- $_POST['ChargeFreightCost'] = $cart->freight_cost;
- $_POST['DispatchDate']= $cart->document_date;
+ $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+ $_POST['DispatchDate'] = $cart->document_date;
$_POST['due_date'] = $cart->due_date;
- $_POST['Location']= $cart->Location;
- $_POST['Comments']= $cart->Comments;
- $_POST['sales_type_id'] = $cart->sales_type;
+ $_POST['Location'] = $cart->Location;
+ $_POST['Comments'] = $cart->Comments;
+ $_POST['cart_id'] = $cart->cart_id;
+ $_POST['ref'] = $cart->reference;
}
//------------------------------------------------------------------------------
@@ -204,12 +237,19 @@ function check_quantities()
// Update cart delivery quantities/descriptions
foreach ($_SESSION['Items']->line_items as $line=>$itm) {
if (isset($_POST['Line'.$line])) {
- $line_qty = $_POST['Line'.$line];
- if (is_numeric($line_qty) && ($_POST['Line'.$line] <= $itm->quantity) &&
- ($_POST['Line'.$line] >= $itm->qty_done)) {
-
- $_SESSION['Items']->line_items[$line]->qty_dispatched = $line_qty;
+ if($_SESSION['Items']->trans_no) {
+ $min = $itm->qty_done;
+ $max = $itm->quantity;
+ } else {
+ $min = 0;
+ $max = $itm->quantity - $itm->qty_done;
+ }
+
+ if (check_num('Line'.$line, $min, $max)) {
+ $_SESSION['Items']->line_items[$line]->qty_dispatched =
+ input_num('Line'.$line);
} else {
+ set_focus('Line'.$line);
$ok = 0;
}
@@ -222,15 +262,18 @@ function check_quantities()
}
}
}
- $_SESSION['Items']->freight_cost = $_POST['ChargeFreightCost'];
-
+// ...
+// else
+// $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost');
return $ok;
}
//------------------------------------------------------------------------------
function check_qoh()
{
- if (!sys_prefs::allow_negative_stock()) {
+ global $SysPrefs;
+
+ if (!$SysPrefs->allow_negative_stock()) {
foreach ($_SESSION['Items']->line_items as $itm) {
if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) {
@@ -257,15 +300,13 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
} else {
$bo_policy = 1;
}
- $newdelivery = $dn->trans_no==0;
-
- if ($newdelivery)
- $dn->ref = $_POST['ref'];
+ $newdelivery = ($dn->trans_no == 0);
copy_to_cart();
+ if ($newdelivery) new_doc_date($dn->document_date);
$delivery_no = $dn->write($bo_policy);
- processing_end();
+ processing_end();
if ($newdelivery) {
meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no");
} else {
@@ -273,8 +314,12 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
}
}
+if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
+ $Ajax->activate('Items');
+}
//------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
+hidden('cart_id');
start_table("$table_style2 width=80%", 5);
echo "