X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=25d804fd5bf572ef14d0cdb3e779ff2e62545cd0;hb=7eb7d3b1b680e17ba618b1a3f670f335eceb330e;hp=0b578aef8e75e857fe6d0141b9765e3c7fc827ca;hpb=c0ec8e1827bd2bfab21a5692ac16ebd4af3e292e;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index 0b578aef..25d804fd 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -87,6 +87,7 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { } page($_SESSION['page_title'], false, false, "", $js); + //----------------------------------------------------------------------------- if (list_updated('branch_id')) { @@ -109,6 +110,8 @@ if (isset($_GET['AddedID'])) { submenu_option(_("Make &Delivery Against This Order"), "/sales/customer_delivery.php?OrderNumber=$order_no"); + submenu_option(_("Work &Order Entry"), "/manufacturing/work_order_entry.php?"); + submenu_option(_("Enter a &New Order"), "/sales/sales_order_entry.php?NewOrder=0"); display_footer_exit(); @@ -221,6 +224,8 @@ if (isset($_GET['AddedID'])) { submenu_option(_("Enter a &New Direct Invoice"), "/sales/sales_order_entry.php?NewInvoice=0"); + submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESINVOICE."&trans_no=$invoice"); + display_footer_exit(); } else check_edit_conflicts(); @@ -235,24 +240,30 @@ function copy_to_cart() $cart->Comments = $_POST['Comments']; $cart->document_date = $_POST['OrderDate']; - if ($cart->trans_type == ST_SALESINVOICE) - $cart->cash = $_POST['cash']; - if ($cart->cash) { - $cart->due_date = $cart->document_date; - $cart->phone = $cart->cust_ref = $cart->delivery_address = ''; - $cart->freight_cost = 0; - $cart->ship_via = 1; - $cart->deliver_to = '';//$_POST['deliver_to']; + + $newpayment = false; + if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) { + $cart->payment = $_POST['payment']; + $cart->payment_terms = get_payment_terms($_POST['payment']); + $newpayment = true; + } + if ($cart->payment_terms['cash_sale']) { + if ($newpayment) { + $cart->due_date = $cart->document_date; + $cart->phone = $cart->cust_ref = $cart->delivery_address = ''; + $cart->ship_via = 1; + $cart->deliver_to = ''; + } } 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->Location = $_POST['Location']; $cart->ship_via = $_POST['ship_via']; } + $cart->Location = $_POST['Location']; + $cart->freight_cost = input_num('freight_cost'); if (isset($_POST['email'])) $cart->email =$_POST['email']; else @@ -260,11 +271,11 @@ function copy_to_cart() $cart->customer_id = $_POST['customer_id']; $cart->Branch = $_POST['branch_id']; $cart->sales_type = $_POST['sales_type']; - // POS + if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt $cart->dimension_id = $_POST['dimension_id']; $cart->dimension2_id = $_POST['dimension2_id']; - } + } } //----------------------------------------------------------------------------- @@ -291,8 +302,7 @@ function copy_from_cart() $_POST['branch_id'] = $cart->Branch; $_POST['sales_type'] = $cart->sales_type; // POS - if ($cart->trans_type == ST_SALESINVOICE) - $_POST['cash'] = $cart->cash; + $_POST['payment'] = $cart->payment; 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; @@ -313,13 +323,27 @@ function line_start_focus() { function can_process() { global $Refs; + if (!get_post('customer_id')) + { + display_error(_("There is no customer selected.")); + set_focus('customer_id'); + return false; + } + + if (!get_post('branch_id')) + { + display_error(_("This customer has no branch defined.")); + set_focus('branch_id'); + return false; + } + if (!is_date($_POST['OrderDate'])) { display_error(_("The entered date is invalid.")); set_focus('OrderDate'); return false; } if ($_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE && !is_date_in_fiscalyear($_POST['OrderDate'])) { - display_error(_("The entered date is not in fiscal year")); + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('OrderDate'); return false; } @@ -328,14 +352,15 @@ function can_process() { set_focus('AddItem'); return false; } - if ($_SESSION['Items']->cash == 0) { + 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 (strlen($_POST['delivery_address']) <= 1) { + + 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'); return false; @@ -367,21 +392,43 @@ function can_process() { return false; } } + else + { + if (!db_has_cash_accounts()) + { + display_error(_("You need to define a cash account for your Sales Point.")); + return false; + } + } if (!$Refs->is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); 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) { + display_error("Invoice total amount cannot be less than zero."); + return false; + } return true; } //----------------------------------------------------------------------------- -if (isset($_POST['ProcessOrder']) && can_process()) { +if (isset($_POST['update'])) { copy_to_cart(); + $Ajax->activate('items_table'); +} +if (isset($_POST['ProcessOrder']) && can_process()) { + copy_to_cart(); $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'); @@ -407,22 +454,24 @@ if (isset($_POST['ProcessOrder']) && can_process()) { } } -if (isset($_POST['update'])) { - $Ajax->activate('items_table'); -} - //-------------------------------------------------------------------------------- function check_item_data() { - global $SysPrefs; - - if (!check_num('qty', 0) || !check_num('Disc', 0, 100)) { + global $SysPrefs, $allow_negative_prices; + + $is_inventory_item = is_inventory_item(get_post('stock_id')); + if(!get_post('stock_id_text', true)) { + display_error( _("Item description cannot be empty.")); + set_focus('stock_id_edit'); + return false; + } + elseif (!check_num('qty', 0) || !check_num('Disc', 0, 100)) { display_error( _("The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100.")); set_focus('qty'); return false; - } elseif (!check_num('price', 0)) { - display_error( _("Price for item must be entered and can not be less than 0")); + } elseif (!check_num('price', 0) && (!$allow_negative_prices || $is_inventory_item)) { + display_error( _("Price for inventory item must be entered and can not be less than 0")); set_focus('price'); return false; } elseif (isset($_POST['LineNo']) && isset($_SESSION['Items']->line_items[$_POST['LineNo']]) @@ -432,8 +481,8 @@ function check_item_data() 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 ($_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE && !$SysPrefs->allow_negative_stock() && - is_inventory_item($_POST['stock_id'])) + elseif ($is_inventory_item && $_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE + && !$SysPrefs->allow_negative_stock()) { $qoh = get_qoh_on_date($_POST['stock_id'], $_POST['Location'], $_POST['OrderDate']); if (input_num('qty') > $qoh) @@ -446,6 +495,22 @@ function check_item_data() } return true; } + $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) + { + $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 + { + $price = $curr . " " . $price; + $std_cost = $curr . " " . number_format2($cost, $dec); + } + display_warning(sprintf(_("Price %s is below Standard Cost %s"), $price, $std_cost)); + } return true; } @@ -458,6 +523,7 @@ function handle_update_item() input_num('qty'), input_num('price'), input_num('Disc') / 100, $_POST['item_description'] ); } + page_modified(); line_start_focus(); } @@ -481,9 +547,11 @@ function handle_new_item() if (!check_item_data()) { return; } - add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'), - input_num('price'), input_num('Disc') / 100); - $_POST['_stock_id_edit'] = $_POST['stock_id'] = ""; + add_to_order($_SESSION['Items'], get_post('stock_id'), input_num('qty'), + input_num('price'), input_num('Disc') / 100, get_post('stock_id_text')); + + unset($_POST['_stock_id_edit'], $_POST['stock_id']); + page_modified(); line_start_focus(); } @@ -495,11 +563,11 @@ function handle_cancel_order() if ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY) { - display_note(_("Direct delivery entry has been cancelled as requested."), 1); + 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_note(_("Direct invoice entry has been cancelled as requested."), 1); + 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 { if ($_SESSION['Items']->trans_no != 0) { @@ -510,12 +578,12 @@ function handle_cancel_order() delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type); if ($_SESSION['Items']->trans_type == ST_SALESQUOTE) { - display_note(_("This sales quotation has been cancelled as requested."), 1); + 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_note(_("This sales order has been cancelled as requested."), 1); + 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"); } } @@ -535,36 +603,27 @@ function create_cart($type, $trans_no) { global $Refs; + if (!$_SESSION['SysPrefs']->db_ok) // create_cart is called before page() where the check is done + return; + processing_start(); - $doc_type = $type; if (isset($_GET['NewQuoteToSalesOrder'])) { $trans_no = $_GET['NewQuoteToSalesOrder']; - $doc = new Cart(ST_SALESQUOTE, $trans_no); - $doc->trans_no = 0; - $doc->trans_type = ST_SALESORDER; - $doc->reference = $Refs->get_next($doc->trans_type); - $doc->document_date = $doc->due_date = new_doc_date(); + $doc = new Cart(ST_SALESQUOTE, $trans_no, true); $doc->Comments = _("Sales Quotation") . " # " . $trans_no; $_SESSION['Items'] = $doc; } elseif($type != ST_SALESORDER && $type != ST_SALESQUOTE && $trans_no != 0) { // this is template - $doc_type = ST_SALESORDER; $doc = new Cart(ST_SALESORDER, array($trans_no)); $doc->trans_type = $type; $doc->trans_no = 0; $doc->document_date = new_doc_date(); if ($type == ST_SALESINVOICE) { - $doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date); - $doc->pos = user_pos(); - $pos = get_sales_point($doc->pos); - $doc->cash = $pos['cash_sale']; - if (!$pos['cash_sale'] || !$pos['credit_sale']) - $doc->pos = -1; // mark not editable payment type - else - $doc->cash = date_diff2($doc->due_date, Today(), 'd')<2; + $doc->due_date = get_invoice_duedate($doc->payment, $doc->document_date); + $doc->pos = get_sales_point(user_pos()); } else $doc->due_date = $doc->document_date; $doc->reference = $Refs->get_next($doc->trans_type); @@ -574,7 +633,7 @@ function create_cart($type, $trans_no) } $_SESSION['Items'] = $doc; } else - $_SESSION['Items'] = new Cart($type,array($trans_no)); + $_SESSION['Items'] = new Cart($type, array($trans_no)); copy_from_cart(); } @@ -632,12 +691,11 @@ if ($_SESSION['Items']->trans_type == ST_SALESINVOICE) { start_form(); hidden('cart_id'); - $customer_error = display_order_header($_SESSION['Items'], ($_SESSION['Items']->any_already_delivered() == 0), $idate); if ($customer_error == "") { - start_table("$table_style width=80%", 10); + start_table(TABLESTYLE, "width=80%", 10); echo ""; display_order_summary($orderitems, $_SESSION['Items'], true); echo ""; @@ -663,5 +721,4 @@ if ($customer_error == "") { } end_form(); end_page(); - ?> \ No newline at end of file