X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=e58eb4a719c1cbe2859384a66f909c393f3a9327;hb=97122b2b71989c3d2ec2fefd1f4ded105dbbf225;hp=605df69188fd200ccc48b3635975c51a4477d648;hpb=1b9351ae81a67726e757eba55895a4f059c7f128;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 605df691..e58eb4a7 100644 --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@ -19,14 +19,13 @@ $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 (user_use_date_picker()) { @@ -63,6 +62,8 @@ if (isset($_GET['AddedID'])) { hyperlink_params("$path_to_root/sales/inquiry/sales_orders_view.php", _("Select Another Order For Dispatch"), "OutstandingOnly=1"); + hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=".ST_CUSTDELIVERY."&trans_no=$dispatch_no"); + display_footer_exit(); } elseif (isset($_GET['UpdatedID'])) { @@ -174,7 +175,7 @@ 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; @@ -203,7 +204,7 @@ function check_data() if (!$SysPrefs->allow_negative_stock() && ($low_stock = $_SESSION['Items']->check_qoh())) { - display_error(_("This document cannot be processed because there is insufficient quantity for: ").implode(',', $low_stock)); + display_error(_("This document cannot be processed because there is insufficient quantity for items marked.")); return false; } @@ -249,13 +250,16 @@ 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. + $dec = get_unit_dec($itm->stock_id); + $dec = $dec == -1 ? user_qty_dec() : $dec; + $max = round2($itm->quantity - $itm->qty_done, $dec); + } if (check_num('Line'.$line, $min, $max)) { $_SESSION['Items']->line_items[$line]->qty_dispatched = @@ -264,7 +268,6 @@ function check_quantities() set_focus('Line'.$line); $ok = 0; } - } if (isset($_POST['Line'.$line.'Desc'])) { @@ -274,47 +277,12 @@ function check_quantities() } } } -// ... -// else -// $_SESSION['Items']->freight_cost = input_num('ChargeFreightCost'); return $ok; } -//------------------------------------------------------------------------------ - -if (isset($_POST['process_delivery']) && check_data()) -{ - 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']) { @@ -354,10 +322,10 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST start_form(); hidden('cart_id'); -start_table(TABLESTYLE2, "width=80%", 5); +start_table(TABLESTYLE2, "width='80%'", 5); echo ""; // outer table -start_table(TABLESTYLE, "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'"); @@ -365,11 +333,11 @@ label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableh end_row(); start_row(); -//if (!isset($_POST['ref'])) -// $_POST['ref'] = $Refs->get_next(ST_CUSTDELIVERY); - if ($_SESSION['Items']->trans_no==0) { - ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); + ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_CUSTDELIVERY, + array('customer' => $_SESSION['Items']->customer_id, + 'branch' => $_SESSION['Items']->Branch, + 'date' => get_post('DispatchDate'))); } else { label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'"); } @@ -406,13 +374,13 @@ end_table(); echo "";// outer table -start_table(TABLESTYLE, "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']->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(); @@ -449,7 +417,7 @@ if ($row['dissallow_invoices'] == 1) } display_heading(_("Delivery Items")); div_start('Items'); -start_table(TABLESTYLE, "width=80%"); +start_table(TABLESTYLE, "width='80%'"); $new = $_SESSION['Items']->trans_no==0; $th = array(_("Item Code"), _("Item Description"), @@ -576,4 +544,3 @@ end_form(); end_page(); -?>