X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=f9933b318d7919f7ce3750cd605c2a2c2aa94210;hb=d5618f84e921515fa6ce6ec05180f0651119c297;hp=60ba5def06fef3a04777098b255db7d39500353a;hpb=80f8b008d24d78ccac82fd31f276f32d820907c7;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index 60ba5def..f9933b31 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -34,11 +34,19 @@ set_page_security( @$_SESSION['Items']->trans_type, ST_CUSTDELIVERY => 'SA_SALESDELIVERY', ST_SALESINVOICE => 'SA_SALESINVOICE'), array( 'NewOrder' => 'SA_SALESORDER', - 'ModifySalesOrder' => 'SA_SALESORDER', + 'ModifyOrderNumber' => 'SA_SALESORDER', + 'AddedID' => 'SA_SALESORDER', + 'UpdatedID' => 'SA_SALESORDER', 'NewQuotation' => 'SA_SALESQUOTE', 'ModifyQuotationNumber' => 'SA_SALESQUOTE', + 'NewQuoteToSalesOrder' => 'SA_SALESQUOTE', + 'AddedQU' => 'SA_SALESQUOTE', + 'UpdatedQU' => 'SA_SALESQUOTE', 'NewDelivery' => 'SA_SALESDELIVERY', - 'NewInvoice' => 'SA_SALESINVOICE') + 'AddedDN' => 'SA_SALESDELIVERY', + 'NewInvoice' => 'SA_SALESINVOICE', + 'AddedDI' => 'SA_SALESINVOICE' + ) ); $js = ''; @@ -223,6 +231,11 @@ if (isset($_GET['AddedID'])) { submenu_option(_("Enter a &New Direct Invoice"), "/sales/sales_order_entry.php?NewInvoice=0"); + if ($row === false) + submenu_option(_("Entry &customer payment for this invoice"), "/sales/customer_payments.php?SInvoice=".$invoice); + + submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESINVOICE."&trans_no=$invoice"); + display_footer_exit(); } else check_edit_conflicts(); @@ -239,6 +252,7 @@ function copy_to_cart() $cart->document_date = $_POST['OrderDate']; $newpayment = false; + if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) { $cart->payment = $_POST['payment']; $cart->payment_terms = get_payment_terms($_POST['payment']); @@ -248,22 +262,19 @@ function copy_to_cart() if ($newpayment) { $cart->due_date = $cart->document_date; $cart->phone = $cart->cust_ref = $cart->delivery_address = ''; - $cart->freight_cost = input_num('freight_cost'); - $cart->ship_via = 1; + $cart->ship_via = 0; $cart->deliver_to = ''; - $cart->Location = $cart->pos['pos_location']; - $cart->location_name = $cart->pos['location_name']; } } else { $cart->due_date = $_POST['delivery_date']; $cart->cust_ref = $_POST['cust_ref']; - $cart->freight_cost = input_num('freight_cost'); $cart->deliver_to = $_POST['deliver_to']; $cart->delivery_address = $_POST['delivery_address']; $cart->phone = $_POST['phone']; $cart->ship_via = $_POST['ship_via']; - $cart->Location = $_POST['Location']; } + $cart->Location = $_POST['Location']; + $cart->freight_cost = input_num('freight_cost'); if (isset($_POST['email'])) $cart->email =$_POST['email']; else @@ -276,6 +287,7 @@ function copy_to_cart() $cart->dimension_id = $_POST['dimension_id']; $cart->dimension2_id = $_POST['dimension2_id']; } + $cart->ex_rate = input_num('_ex_rate', null); } //----------------------------------------------------------------------------- @@ -306,9 +318,9 @@ function copy_from_cart() if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt $_POST['dimension_id'] = $cart->dimension_id; $_POST['dimension2_id'] = $cart->dimension2_id; - } + } $_POST['cart_id'] = $cart->cart_id; - + $_POST['_ex_rate'] = $cart->ex_rate; } //-------------------------------------------------------------------------------- @@ -321,7 +333,10 @@ function line_start_focus() { //-------------------------------------------------------------------------------- function can_process() { - global $Refs; + + global $Refs, $SysPrefs; + + copy_to_cart(); if (!get_post('customer_id')) { @@ -352,14 +367,20 @@ function can_process() { set_focus('AddItem'); return false; } - if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) { - if (strlen($_POST['deliver_to']) <= 1) { - display_error(_("You must enter the person or company to whom delivery should be made to.")); - set_focus('deliver_to'); + + 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; } + if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) { + if (strlen($_POST['deliver_to']) <= 1) { + display_error(_("You must enter the person or company to whom delivery should be made to.")); + set_focus('deliver_to'); + return false; + } if ($_SESSION['Items']->trans_type != ST_SALESQUOTE && strlen($_POST['delivery_address']) <= 1) { display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address.")); set_focus('delivery_address'); @@ -382,7 +403,6 @@ function can_process() { set_focus('delivery_date'); return false; } - //if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) { if (date1_greater_date2($_POST['OrderDate'], $_POST['delivery_date'])) { if ($_SESSION['Items']->trans_type==ST_SALESQUOTE) display_error(_("The requested valid date is before the date of the quotation.")); @@ -405,12 +425,10 @@ function can_process() { set_focus('ref'); return false; } - if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], - $_SESSION['Items']->trans_type)) { - display_error(_("The entered reference is already in use.")); - set_focus('ref'); - return false; - } elseif ($_SESSION['Items']->get_items_total() < 0) { + if (!db_has_currency_rates($_SESSION['Items']->customer_currency, $_POST['OrderDate'])) + return false; + + if ($_SESSION['Items']->get_items_total() < 0) { display_error("Invoice total amount cannot be less than zero."); return false; } @@ -419,37 +437,54 @@ function can_process() { //----------------------------------------------------------------------------- -if (isset($_POST['ProcessOrder']) && can_process()) { +if (isset($_POST['update'])) { copy_to_cart(); + $Ajax->activate('items_table'); +} + +if (isset($_POST['ProcessOrder']) && can_process()) { + $modified = ($_SESSION['Items']->trans_no != 0); $so_type = $_SESSION['Items']->so_type; - $_SESSION['Items']->write(1); - if (count($messages)) { // abort on failure or error messages are lost - $Ajax->activate('_page_body'); - display_footer_exit(); - } - $trans_no = key($_SESSION['Items']->trans_no); - $trans_type = $_SESSION['Items']->trans_type; - new_doc_date($_SESSION['Items']->document_date); - processing_end(); - if ($modified) { - if ($trans_type == ST_SALESQUOTE) - meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no"); - else - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no"); - } elseif ($trans_type == ST_SALESORDER) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); - } elseif ($trans_type == ST_SALESQUOTE) { - meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no"); - } elseif ($trans_type == ST_SALESINVOICE) { - meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type"); - } else { - meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type"); - } -} -if (isset($_POST['update'])) { - $Ajax->activate('items_table'); + $ret = $_SESSION['Items']->write(1); + if ($ret == -1) + { + display_error(_("The entered reference is already in use.")); + $ref = get_next_reference($_SESSION['Items']->trans_type); + if ($ref != $_SESSION['Items']->reference) + { + display_error(_("The reference number field has been increased. Please save the document again.")); + $_POST['ref'] = $_SESSION['Items']->reference = $ref; + $Ajax->activate('ref'); + } + set_focus('ref'); + } + else + { + if (count($messages)) { // abort on failure or error messages are lost + $Ajax->activate('_page_body'); + display_footer_exit(); + } + $trans_no = key($_SESSION['Items']->trans_no); + $trans_type = $_SESSION['Items']->trans_type; + new_doc_date($_SESSION['Items']->document_date); + processing_end(); + if ($modified) { + if ($trans_type == ST_SALESQUOTE) + meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no"); + else + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no"); + } elseif ($trans_type == ST_SALESORDER) { + meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); + } elseif ($trans_type == ST_SALESQUOTE) { + meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no"); + } elseif ($trans_type == ST_SALESINVOICE) { + meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type"); + } else { + meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type"); + } + } } //-------------------------------------------------------------------------------- @@ -478,21 +513,24 @@ function check_item_data() set_focus('qty'); display_error(_("You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively.")); return false; - } // Joe Hunt added 2008-09-22 ------------------------- - elseif ($is_inventory_item && $_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE - && !$SysPrefs->allow_negative_stock()) + } + + $cost_home = get_standard_cost(get_post('stock_id')); // Added 2011-03-27 Joe Hunt + $cost = $cost_home / get_exchange_rate_from_home_currency($_SESSION['Items']->customer_currency, $_SESSION['Items']->document_date); + if (input_num('price') < $cost) { - $qoh = get_qoh_on_date($_POST['stock_id'], $_POST['Location'], $_POST['OrderDate']); - if (input_num('qty') > $qoh) + $dec = user_price_dec(); + $curr = $_SESSION['Items']->customer_currency; + $price = number_format2(input_num('price'), $dec); + if ($cost_home == $cost) + $std_cost = number_format2($cost_home, $dec); + else { - $stock = get_item($_POST['stock_id']); - display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") . - " " . $stock['stock_id'] . " - " . $stock['description'] . " - " . - _("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($_POST['stock_id']))); - return false; + $price = $curr . " " . $price; + $std_cost = $curr . " " . number_format2($cost, $dec); } - return true; - } + display_warning(sprintf(_("Price %s is below Standard Cost %s"), $price, $std_cost)); + } return true; } @@ -547,28 +585,29 @@ function handle_cancel_order() if ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY) { display_notification(_("Direct delivery entry has been cancelled as requested."), 1); submenu_option(_("Enter a New Sales Delivery"), "/sales/sales_order_entry.php?NewDelivery=1"); - } elseif ($_SESSION['Items']->trans_type == ST_SALESINVOICE) { display_notification(_("Direct invoice entry has been cancelled as requested."), 1); submenu_option(_("Enter a New Sales Invoice"), "/sales/sales_order_entry.php?NewInvoice=1"); - } else { + } elseif ($_SESSION['Items']->trans_type == ST_SALESQUOTE) + { + if ($_SESSION['Items']->trans_no != 0) + delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type); + display_notification(_("This sales quotation has been cancelled as requested."), 1); + submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes"); + } else { // sales order if ($_SESSION['Items']->trans_no != 0) { - if ($_SESSION['Items']->trans_type == ST_SALESORDER && - sales_order_has_deliveries(key($_SESSION['Items']->trans_no))) - display_error(_("This order cannot be cancelled because some of it has already been invoiced or dispatched. However, the line item quantities may be modified.")); - else { + $order_no = key($_SESSION['Items']->trans_no); + if (sales_order_has_deliveries($order_no)) + { + close_sales_order($order_no); + display_notification(_("Undelivered part of order has been cancelled as requested."), 1); + submenu_option(_("Select Another Sales Order for Edition"), "/sales/inquiry/sales_orders_view.php?type=".ST_SALESORDER); + } else { delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type); - if ($_SESSION['Items']->trans_type == ST_SALESQUOTE) - { - display_notification(_("This sales quotation has been cancelled as requested."), 1); - submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes"); - } - else - { - display_notification(_("This sales order has been cancelled as requested."), 1); - submenu_option(_("Enter a New Sales Order"), "/sales/sales_order_entry.php?NewOrder=Yes"); - } - } + + display_notification(_("This sales order has been cancelled as requested."), 1); + submenu_option(_("Enter a New Sales Order"), "/sales/sales_order_entry.php?NewOrder=Yes"); + } } else { processing_end(); meta_forward($path_to_root.'/index.php','application=orders'); @@ -677,7 +716,7 @@ $customer_error = display_order_header($_SESSION['Items'], ($_SESSION['Items']->any_already_delivered() == 0), $idate); if ($customer_error == "") { - start_table(TABLESTYLE, "width=80%", 10); + start_table(TABLESTYLE, "width='80%'", 10); echo ""; display_order_summary($orderitems, $_SESSION['Items'], true); echo ""; @@ -690,17 +729,24 @@ if ($customer_error == "") { submit_center_first('ProcessOrder', $porder, _('Check entered data and save document'), 'default'); + submit_center_last('CancelOrder', $cancelorder, + _('Cancels document entry or removes sales order when editing an old document'), true); submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?')); } else { submit_center_first('ProcessOrder', $corder, _('Validate changes and update document'), 'default'); + submit_center_last('CancelOrder', $cancelorder, + _('Cancels document entry or removes sales order when editing an old document'), true); + if ($_SESSION['Items']->trans_type==ST_SALESORDER) + submit_js_confirm('CancelOrder', _('You are about to cancel undelivered part of this order.\nDo you want to continue?')); + else + submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?')); } - submit_center_last('CancelOrder', $cancelorder, - _('Cancels document entry or removes sales order when editing an old document')); } else { display_error($customer_error); } + end_form(); end_page(); ?> \ No newline at end of file