X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=dad3c63c1e846014e232a26c246676a1dd59a384;hb=6073c62f33af72638076b01b1c538f8f5521d46d;hp=f44baf48ef1effd236ef06399c981db1cb73ff20;hpb=e1ddcdca793bc615768f1cea2c06e4182d771a0e;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index f44baf48..dad3c63c 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -34,32 +34,45 @@ 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 = ''; -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(); } if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { $_SESSION['page_title'] = _($help_context = "Direct Sales Delivery"); - create_cart(ST_CUSTDELIVERY, 0); + create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']); } elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) { - $_SESSION['page_title'] = _($help_context = "Direct Sales Invoice"); - create_cart(ST_SALESINVOICE, 0); + create_cart(ST_SALESINVOICE, $_GET['NewInvoice']); + + if (isset($_GET['FixedAsset'])) { + $_SESSION['page_title'] = _($help_context = "Fixed Assets Sale"); + $_SESSION['Items']->fixed_asset = true; + } else + $_SESSION['page_title'] = _($help_context = "Direct Sales Invoice"); } elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) { @@ -87,6 +100,17 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { } page($_SESSION['page_title'], false, false, "", $js); + +if (isset($_GET['ModifyOrderNumber']) && is_prepaid_order_open($_GET['ModifyOrderNumber'])) +{ + display_error(_("This order cannot be edited because there are invoices or payments related to it, and prepayment terms were used.")); + end_page(); exit; +} +if (isset($_GET['ModifyOrderNumber'])) + check_is_editable(ST_SALESORDER, $_GET['ModifyOrderNumber']); +elseif (isset($_GET['ModifyQuotationNumber'])) + check_is_editable(ST_SALESQUOTE, $_GET['ModifyQuotationNumber']); + //----------------------------------------------------------------------------- if (list_updated('branch_id')) { @@ -206,13 +230,10 @@ if (isset($_GET['AddedID'])) { submenu_print(_("&Print Sales Invoice"), ST_SALESINVOICE, $invoice."-".ST_SALESINVOICE, 'prtopt'); submenu_print(_("&Email Sales Invoice"), ST_SALESINVOICE, $invoice."-".ST_SALESINVOICE, null, 1); set_focus('prtopt'); - - $sql = "SELECT trans_type_from, trans_no_from FROM ".TB_PREF."cust_allocations - WHERE trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice); - $result = db_query($sql, "could not retrieve customer allocation"); - $row = db_fetch($result); + + $row = db_fetch(get_allocatable_from_cust_transactions(null, $invoice, ST_SALESINVOICE)); if ($row !== false) - submenu_print(_("Print &Receipt"), $row['trans_type_from'], $row['trans_no_from']."-".$row['trans_type_from'], 'prtopt'); + submenu_print(_("Print &Receipt"), $row['type'], $row['trans_no']."-".$row['type'], 'prtopt'); display_note(get_gl_view_str(ST_SALESINVOICE, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1); @@ -223,11 +244,14 @@ 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(); + check_edit_conflicts(get_post('cart_id')); //----------------------------------------------------------------------------- function copy_to_cart() @@ -241,6 +265,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']); @@ -250,8 +275,9 @@ function copy_to_cart() if ($newpayment) { $cart->due_date = $cart->document_date; $cart->phone = $cart->cust_ref = $cart->delivery_address = ''; - $cart->ship_via = 1; + $cart->ship_via = 0; $cart->deliver_to = ''; + $cart->prep_amount = 0; } } else { $cart->due_date = $_POST['delivery_date']; @@ -260,6 +286,8 @@ function copy_to_cart() $cart->delivery_address = $_POST['delivery_address']; $cart->phone = $_POST['phone']; $cart->ship_via = $_POST['ship_via']; + if (!$cart->trans_no || ($cart->trans_type == ST_SALESORDER && !$cart->is_started())) + $cart->prep_amount = input_num('prep_amount', 0); } $cart->Location = $_POST['Location']; $cart->freight_cost = input_num('freight_cost'); @@ -275,6 +303,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); } //----------------------------------------------------------------------------- @@ -300,27 +329,31 @@ function copy_from_cart() $_POST['branch_id'] = $cart->Branch; $_POST['sales_type'] = $cart->sales_type; + $_POST['prep_amount'] = price_format($cart->prep_amount); // POS $_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; - } + } $_POST['cart_id'] = $cart->cart_id; - + $_POST['_ex_rate'] = $cart->ex_rate; } //-------------------------------------------------------------------------------- function line_start_focus() { - global $Ajax; + global $Ajax; - $Ajax->activate('items_table'); - set_focus('_stock_id_edit'); + $Ajax->activate('items_table'); + set_focus('_stock_id_edit'); } //-------------------------------------------------------------------------------- function can_process() { - global $Refs; + + global $Refs, $SysPrefs; + + copy_to_cart(); if (!get_post('customer_id')) { @@ -342,7 +375,7 @@ function can_process() { 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; } @@ -351,13 +384,23 @@ 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 (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due'] == -1) && ((input_num('prep_amount')<=0) || + input_num('prep_amount')>$_SESSION['Items']->get_trans_total())) { + display_error(_("Pre-payment required have to be positive and less than total amount.")); + set_focus('prep_amount'); + return false; + } + 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.")); @@ -381,7 +424,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.")); @@ -399,7 +441,7 @@ function can_process() { return false; } } - if (!$Refs->is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'], $_SESSION['Items']->trans_type)) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; @@ -411,6 +453,10 @@ function can_process() { display_error("Invoice total amount cannot be less than zero."); return false; } + + if ($_SESSION['Items']->payment_terms['cash_sale'] && + ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY || $_SESSION['Items']->trans_type == ST_SALESINVOICE)) + $_SESSION['Items']->due_date = $_SESSION['Items']->document_date; return true; } @@ -422,7 +468,7 @@ if (isset($_POST['update'])) { } if (isset($_POST['ProcessOrder']) && can_process()) { - copy_to_cart(); + $modified = ($_SESSION['Items']->trans_no != 0); $so_type = $_SESSION['Items']->so_type; @@ -430,6 +476,12 @@ if (isset($_POST['ProcessOrder']) && can_process()) { if ($ret == -1) { display_error(_("The entered reference is already in use.")); + $ref = $Refs->get_next($_SESSION['Items']->trans_type, null, array('date' => Today())); + if ($ref != $_SESSION['Items']->reference) + { + unset($_POST['ref']); // force refresh reference + display_error(_("The reference number field has been increased. Please save the document again.")); + } set_focus('ref'); } else @@ -463,7 +515,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) { function check_item_data() { - global $SysPrefs, $allow_negative_prices; + global $SysPrefs; $is_inventory_item = is_inventory_item(get_post('stock_id')); if(!get_post('stock_id_text', true)) { @@ -475,7 +527,7 @@ function check_item_data() 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) && (!$allow_negative_prices || $is_inventory_item)) { + } elseif (!check_num('price', 0) && (!$SysPrefs->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; @@ -485,22 +537,9 @@ 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()) - { - $qoh = get_qoh_on_date($_POST['stock_id'], $_POST['Location'], $_POST['OrderDate']); - if (input_num('qty') > $qoh) - { - $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; - } - return true; } - $cost_home = get_standard_cost(get_post('stock_id')); // Added 2011-03-27 Joe Hunt + + $cost_home = get_unit_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) { @@ -539,7 +578,7 @@ function handle_delete_item($line_no) if ($_SESSION['Items']->some_already_delivered($line_no) == 0) { $_SESSION['Items']->remove_from_cart($line_no); } else { - display_error(_("This item cannot be deleted because some of it has already been delivered.")); + display_error(_("This item cannot be deleted because some of it has already been delivered.")); } line_start_focus(); } @@ -570,34 +609,34 @@ 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'); } } - $Ajax->activate('_page_body'); processing_end(); display_footer_exit(); } @@ -606,9 +645,9 @@ function handle_cancel_order() function create_cart($type, $trans_no) { - global $Refs; + global $Refs, $SysPrefs; - if (!$_SESSION['SysPrefs']->db_ok) // create_cart is called before page() where the check is done + if (!$SysPrefs->db_ok) // create_cart is called before page() where the check is done return; processing_start(); @@ -631,7 +670,7 @@ function create_cart($type, $trans_no) $doc->pos = get_sales_point(user_pos()); } else $doc->due_date = $doc->document_date; - $doc->reference = $Refs->get_next($doc->trans_type); + $doc->reference = $Refs->get_next($doc->trans_type, null, array('date' => Today())); //$doc->Comments=''; foreach($doc->line_items as $line_no => $line) { $doc->line_items[$line_no]->qty_done = 0; @@ -662,7 +701,10 @@ if (isset($_POST['CancelItemChanges'])) { } //-------------------------------------------------------------------------------- -check_db_has_stock_items(_("There are no inventory items defined in the system.")); +if ($_SESSION['Items']->fixed_asset) + check_db_has_disposable_fixed_assets(_("There are no fixed assets defined in the system.")); +else + check_db_has_stock_items(_("There are no inventory items defined in the system.")); check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches.")); @@ -696,11 +738,10 @@ 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); +$customer_error = display_order_header($_SESSION['Items'], !$_SESSION['Items']->is_started(), $idate); if ($customer_error == "") { - start_table(TABLESTYLE, "width=80%", 10); + start_table(TABLESTYLE, "width='80%'", 10); echo "