X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=c634a94e75109bf06a1fee1d597c014e29cb1db0;hb=c47544994b38a1540dd049075948493352ca6112;hp=f085961f911fa0da782cf3125f97498b378d085c;hpb=96f82e64b766fa59a3ebc3176e4efd17736f6878;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index f085961f..c634a94e 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -19,17 +19,16 @@ $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); include_once($path_to_root . "/taxes/tax_calc.inc"); $js = ""; -if ($use_popup_windows) { +if ($SysPrefs->use_popup_windows) { $js .= get_js_open_window(900, 500); } -if ($use_date_picker) { +if (user_use_date_picker()) { $js .= get_js_date_picker(); } @@ -58,7 +57,8 @@ if (isset($_GET['AddedID'])) { 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"); @@ -77,7 +77,8 @@ if (isset($_GET['AddedID'])) { 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,6 +89,8 @@ if (isset($_GET['AddedID'])) { if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { $ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true); + 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) { hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php", @@ -134,7 +137,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { exit; } else { - check_edit_conflicts(); + check_edit_conflicts(get_post('cart_id')); if (!check_quantities()) { display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order.")); @@ -149,7 +152,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { function check_data() { - global $Refs; + global $Refs, $SysPrefs; if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) { display_error(_("The entered date of delivery is invalid.")); @@ -170,17 +173,11 @@ function check_data() } if ($_SESSION['Items']->trans_no==0) { - if (!$Refs->is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'], ST_CUSTDELIVERY)) { display_error(_("You must enter a reference.")); 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); @@ -201,6 +198,14 @@ function check_data() return false; } + copy_to_cart(); + + if (!$SysPrefs->allow_negative_stock() && ($low_stock = $_SESSION['Items']->check_qoh())) + { + display_error(_("This document cannot be processed because there is insufficient quantity for items marked.")); + return false; + } + return true; } //------------------------------------------------------------------------------ @@ -243,14 +248,15 @@ function check_quantities() // Update cart delivery quantities/descriptions foreach ($_SESSION['Items']->line_items as $line=>$itm) { if (isset($_POST['Line'.$line])) { - if($_SESSION['Items']->trans_no) { - $min = $itm->qty_done; - $max = $itm->quantity; - } else { - $min = 0; - $max = $itm->quantity - $itm->qty_done; - } - + if($_SESSION['Items']->trans_no) { + $min = $itm->qty_done; + $max = $itm->quantity; + } else { + $min = 0; + // Fixing floating point problem in PHP. + $max = round2($itm->quantity - $itm->qty_done, get_unit_dec($itm->stock_id)); + } + if (check_num('Line'.$line, $min, $max)) { $_SESSION['Items']->line_items[$line]->qty_dispatched = input_num('Line'.$line); @@ -268,48 +274,12 @@ function check_quantities() } } } -// ... -// else -// $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost'); return $ok; } -//------------------------------------------------------------------------------ - -function check_qoh() -{ - 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()) { - +if (isset($_POST['process_delivery']) && check_data()) { $dn = &$_SESSION['Items']; if ($_POST['bo_policy']) { @@ -319,29 +289,40 @@ 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); + 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 + { + $is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : ''; + + 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"); + } } } -if (isset($_POST['Update']) || isset($_POST['_Location_update'])) { +if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty']) || isset($_POST['process_delivery'])) { $Ajax->activate('Items'); } //------------------------------------------------------------------------------ start_form(); hidden('cart_id'); -start_table(TABLESTYLE2, "width=80%", 5); +start_table(TABLESTYLE2, "width='80%'", 5); echo "