X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=366d9a29fe9b4df3bba2efbe9c0f558e7287ebab;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=9fa1a2a211ead4650b17e56d579e6384c0f9133c;hpb=99730b8d6deb7e81d2f1ebeb2ce7066d27729485;p=fa-stable.git diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php index 9fa1a2a2..366d9a29 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,13 @@ 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(13, $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, 13)); + display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, 13, false, "", "", 1), 1); display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1); @@ -55,7 +65,6 @@ 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)); @@ -73,7 +82,7 @@ if (isset($_GET['AddedID'])) { if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { - $ord = new Cart(30,$_GET['OrderNumber'], true); + $ord = new Cart(30, $_GET['OrderNumber'], true); /*read in all the selected order into the Items cart */ @@ -87,7 +96,8 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { $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(13); + $ord->document_date = new_doc_date(); $_SESSION['Items'] = $ord; copy_from_cart(); @@ -104,7 +114,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,19 +125,23 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) { end_page(); exit; -} elseif (!check_quantities()) { - display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity - not dispatched on sales order.")); +} else { + check_edit_conflicts(); -} elseif(!check_num('ChargeFreightCost', 0)) - display_error(_("Freight cost cannot be less than zero")); - set_focus('ChargeFreightCost'); + 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'); @@ -147,7 +161,7 @@ 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; @@ -188,7 +202,7 @@ function copy_to_cart() $cart = &$_SESSION['Items']; $cart->ship_via = $_POST['ship_via']; $cart->freight_cost = input_num('ChargeFreightCost'); - $cart->document_date = $_POST['DispatchDate']; + $cart->document_date = $_POST['DispatchDate']; $cart->due_date = $_POST['due_date']; $cart->Location = $_POST['Location']; $cart->Comments = $_POST['Comments']; @@ -203,10 +217,12 @@ function copy_from_cart() $cart = &$_SESSION['Items']; $_POST['ship_via'] = $cart->ship_via; $_POST['ChargeFreightCost'] = price_format($cart->freight_cost); - $_POST['DispatchDate']= $cart->document_date; + $_POST['DispatchDate'] = $cart->document_date; $_POST['due_date'] = $cart->due_date; - $_POST['Location']= $cart->Location; - $_POST['Comments']= $cart->Comments; + $_POST['Location'] = $cart->Location; + $_POST['Comments'] = $cart->Comments; + $_POST['cart_id'] = $cart->cart_id; + $_POST['ref'] = $cart->reference; } //------------------------------------------------------------------------------ @@ -216,10 +232,19 @@ function check_quantities() // Update cart delivery quantities/descriptions foreach ($_SESSION['Items']->line_items as $line=>$itm) { if (isset($_POST['Line'.$line])) { - if (!check_num('Line'.$line, $itm->qty_done, $itm->quantity) == 0) { + 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; } @@ -241,7 +266,9 @@ function check_quantities() 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)) { @@ -271,6 +298,7 @@ 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(); @@ -281,8 +309,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 ""; // outer table @@ -296,15 +328,15 @@ end_row(); start_row(); //if (!isset($_POST['ref'])) -// $_POST['ref'] = references::get_next(13); +// $_POST['ref'] = $Refs->get_next(13); if ($_SESSION['Items']->trans_no==0) { - ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'"); + ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); } else { label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'"); } -label_cells(_("For Sales Order"), get_customer_trans_view_str(systypes::sales_order(), $_SESSION['Items']->order_no), "class='tableheader2'"); +label_cells(_("For Sales Order"), get_customer_trans_view_str(ST_SALESORDER, $_SESSION['Items']->order_no), "class='tableheader2'"); label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'"); end_row(); @@ -314,7 +346,7 @@ if (!isset($_POST['Location'])) { $_POST['Location'] = $_SESSION['Items']->Location; } label_cell(_("Delivery From"), "class='tableheader2'"); -locations_list_cells(null, 'Location',$_POST['Location'], false, true); +locations_list_cells(null, 'Location', null, false, true); if (!isset($_POST['ship_via'])) { $_POST['ship_via'] = $_SESSION['Items']->ship_via; @@ -324,12 +356,12 @@ shippers_list_cells(null, 'ship_via', $_POST['ship_via']); // set this up here cuz it's used to calc qoh if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) { - $_POST['DispatchDate'] = Today(); + $_POST['DispatchDate'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['DispatchDate'])) { $_POST['DispatchDate'] = end_fiscalyear(); } } -date_cells(_("Date"), 'DispatchDate', '', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'"); +date_cells(_("Date"), 'DispatchDate', '', $_SESSION['Items']->trans_no==0, 0, 0, 0, "class='tableheader2'"); end_row(); end_table(); @@ -341,28 +373,36 @@ start_table("$table_style width=90%"); if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) { $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']); } -date_row(_("Invoice Dead-line"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'"); +date_row(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'"); end_table(); echo ""; end_table(1); // outer table +$row = get_customer_to_order($_SESSION['Items']->customer_id); +if ($row['dissallow_invoices'] == 1) +{ + display_error(_("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.")); + end_form(); + end_page(); + exit(); +} display_heading(_("Delivery Items")); - +div_start('Items'); start_table("$table_style width=80%"); $th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("Delivered"), _("This Delivery"), _("Price"), _("Tax Type"), _("Discount"), _("Total")); table_header($th); $k = 0; $has_marked = false; -$show_qoh = true; 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 - if (sys_prefs::allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) || + $show_qoh = true; + if ($SysPrefs->allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) || $ln_itm->qty_dispatched == 0) { $show_qoh = false; } @@ -400,11 +440,8 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { end_row(); } -$_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost); - -if (!check_num('ChargeFreightCost')) { - $_POST['ChargeFreightCost'] = price_format(0); -} +$_POST['ChargeFreightCost'] = get_post('ChargeFreightCost', + price_format($_SESSION['Items']->freight_cost)); start_row(); @@ -435,9 +472,11 @@ policy_list_row(_("Action For Balance"), "bo_policy", null); textarea_row(_("Memo"), 'Comments', null, 50, 4); end_table(1); - -submit_center_first('Update', _("Update")); -submit_center_last('process_delivery', _("Process Dispatch")); +div_end(); +submit_center_first('Update', _("Update"), + _('Refresh document page'), true); +submit_center_last('process_delivery', _("Process Dispatch"), + _('Check entered data and save document'), 'default'); end_form();