X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_delivery.php;h=eb78f62e295731f6ec2dd3ad37e051e078709400;hb=d90c082fc6dc6c5a5343c7ebc90c76442817523d;hp=8ed9ad275015379b4cc2c56f14e04a26039fee16;hpb=eb5ce68f102785be92a201b87abbfc37f0a09ee2;p=fa-stable.git
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 8ed9ad27..eb78f62e 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -13,8 +13,8 @@
//
// 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");
@@ -35,10 +35,10 @@ if ($use_date_picker) {
if (isset($_GET['ModifyDelivery'])) {
$_SESSION['page_title'] = sprintf(_("Modifying Delivery Note # %d."), $_GET['ModifyDelivery']);
- $help_page_title = _("Modifying Delivery Note");
+ $help_context = "Modifying Delivery Note";
processing_start();
} elseif (isset($_GET['OrderNumber'])) {
- $_SESSION['page_title'] = _("Deliver Items for a Sales Order");
+ $_SESSION['page_title'] = _($help_context = "Deliver Items for a Sales Order");
processing_start();
}
@@ -47,11 +47,14 @@ page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['AddedID'])) {
$dispatch_no = $_GET['AddedID'];
- 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, "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);
@@ -67,9 +70,12 @@ if (isset($_GET['AddedID'])) {
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, "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");
@@ -81,9 +87,7 @@ if (isset($_GET['AddedID'])) {
if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
- $ord = new Cart(30, $_GET['OrderNumber'], true);
-
- /*read in all the selected order into the Items cart */
+ $ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true);
if ($ord->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
@@ -91,18 +95,15 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
die ("
" . _("This order has no items. There is nothing to delivery.") . "");
}
- $ord->trans_type = 13;
- $ord->src_docs = $ord->trans_no;
- $ord->order_no = key($ord->trans_no);
- $ord->trans_no = 0;
- $ord->reference = references::get_next(13);
- $ord->document_date = Today();
+ // 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) {
- $_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",
@@ -130,15 +131,18 @@ 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');
+ }
}
//-----------------------------------------------------------------------------
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');
@@ -158,17 +162,11 @@ function check_data()
}
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)) {
- display_error(_("The entered reference is already in use."));
- set_focus('ref');
- return false;
- }
}
if ($_POST['ChargeFreightCost'] == "") {
$_POST['ChargeFreightCost'] = price_format(0);
@@ -186,8 +184,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;
}
@@ -203,8 +199,10 @@ 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)
- $dn->ref = $_POST['ref'];
+ $cart->reference = $_POST['ref'];
}
//------------------------------------------------------------------------------
@@ -218,7 +216,10 @@ 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;
}
//------------------------------------------------------------------------------
@@ -262,26 +263,38 @@ function check_quantities()
function check_qoh()
{
- if (!sys_prefs::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']) {
@@ -292,27 +305,35 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
$newdelivery = ($dn->trans_no == 0);
copy_to_cart();
+ if ($newdelivery) new_doc_date($dn->document_date);
$delivery_no = $dn->write($bo_policy);
-
- processing_end();
- if ($newdelivery) {
- meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no");
- } else {
- meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no");
+ if ($delivery_no == -1)
+ {
+ display_error(_("The entered reference is already in use."));
+ set_focus('ref');
}
+ else
+ {
+ processing_end();
+ if ($newdelivery) {
+ meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no");
+ } else {
+ meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no");
+ }
+ }
}
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);
+start_table(TABLESTYLE2, "width=80%", 5);
echo "