X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fcustomer_delivery.php;h=114f3d4a9ccf0331f207d1c8561ae9bcb0cf06d9;hb=6a490756f95863cd9c86884cd65caa45b1d42e5d;hp=a1ac4eb78af9f9bc3ef9a9a1045e38903c49ba53;hpb=09d5c61846ddda0df907bb9c4e318cc7f1520653;p=fa-stable.git
diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index a1ac4eb7..114f3d4a 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");
@@ -89,29 +89,24 @@ 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->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
_("Select a different sales order to delivery"), "OutstandingOnly=1");
die ("
" . _("This order has no items. There is nothing to delivery.") . "");
}
- $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) {
- $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_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",
+ hyperlink_params($path_to_root . "/sales/inquiry/customer_inquiry.php",
_("Select a different delivery"), "OutstandingOnly=1");
echo "
" . _("This delivery has all items invoiced. There is nothing to modify.") .
"";
@@ -172,12 +167,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);
@@ -210,6 +199,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'];
@@ -225,6 +216,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;
}
@@ -270,28 +263,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']) {
@@ -304,26 +307,33 @@ 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);
-
- 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'])) {
+if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty'])) {
$Ajax->activate('Items');
}
//------------------------------------------------------------------------------
start_form();
hidden('cart_id');
-start_table("$table_style2 width=80%", 5);
+start_table(TABLESTYLE2, "width=80%", 5);
echo ""; // 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,11 +382,31 @@ end_table();
echo " | ";// 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']);
}
+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();
@@ -395,7 +425,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"),
@@ -410,32 +440,46 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
if ($ln_itm->quantity==$ln_itm->qty_done) {
continue; //this line is fully delivered
}
- // if it's a non-stock item (eg. service) don't show qoh
- $show_qoh = true;
- if ($SysPrefs->allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
- $ln_itm->qty_dispatched == 0) {
- $show_qoh = false;
+ if(isset($_POST['_Location_update']) || isset($_POST['clear_quantity']) || isset($_POST['reset_quantity'])) {
+ // reset quantity
+ $ln_itm->qty_dispatched = $ln_itm->quantity-$ln_itm->qty_done;
}
+ // if it's a non-stock item (eg. service) don't show qoh
+ $row_classes = null;
+ if (has_stock_holding($ln_itm->mb_flag) && $ln_itm->qty_dispatched) {
+ // It's a stock : call get_dispatchable_quantity hook to get which quantity to preset in the
+ // quantity input box. This allows for example a hook to modify the default quantity to what's dispatchable
+ // (if there is not enough in hand), check at other location or other order people etc ...
+ // This hook also returns a 'reason' (css classes) which can be used to theme the row.
- if ($show_qoh) {
$qoh = get_qoh_on_date($ln_itm->stock_id, $_POST['Location'], $_POST['DispatchDate']);
- }
+ $q_class = hook_get_dispatchable_quantity($ln_itm, $_POST['Location'], $_POST['DispatchDate'], $qoh);
+ // Skip line if needed
+ if($q_class === 'skip') continue;
+ if(is_array($q_class)) {
+ list($ln_itm->qty_dispatched, $row_classes) = $q_class;
+ $has_marked = true;
+ }
- if ($show_qoh && ($ln_itm->qty_dispatched > $qoh)) {
- // oops, we don't have enough of one of the component items
- start_row("class='stockmankobg'");
- $has_marked = true;
- } else {
- alt_table_row_color($k);
}
+
+ alt_table_row_color($k, $row_classes);
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);
qty_cell($ln_itm->qty_done, false, $dec);
+ if(isset($_POST['clear_quantity'])) {
+ $ln_itm->qty_dispatched = 0;
+ }
+ $_POST['Line'.$line]=$ln_itm->qty_dispatched; /// clear post so value displayed in the fiel is the 'new' quantity
small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched, $ln_itm->stock_id, $dec), null, null, $dec);
$display_discount_percent = percent_format($ln_itm->discount_percent*100) . "%";
@@ -478,7 +522,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);
@@ -487,9 +531,15 @@ textarea_row(_("Memo"), 'Comments', null, 50, 4);
end_table(1);
div_end();
submit_center_first('Update', _("Update"),
- _('Refresh document page'), true);
+ _('Refresh document page'), true);
+if(isset($_POST['clear_quantity'])) {
+ submit('reset_quantity', _('Reset quantity'), true, _('Refresh document page'));
+}
+else {
+ submit('clear_quantity', _('Clear quantity'), true, _('Refresh document page'));
+}
submit_center_last('process_delivery', _("Process Dispatch"),
- _('Check entered data and save document'), 'default');
+ _('Check entered data and save document'), 'default');
end_form();
|