X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=32e5c3b5f021862b96d7ac3911b11b22735cc1e5;hb=a8282cbfa3f17059ca276dfa7769a0efaedea88f;hp=cd9e48b24ff36911a758b9bfb29b0342b51e59a1;hpb=6836ffaafca78ee5c7e3bb9b9db06c174662e6f1;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index cd9e48b2..32e5c3b5 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -53,36 +53,36 @@ if ($use_date_picker) { if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { - $_SESSION['page_title'] = _("Direct Sales Delivery"); + $_SESSION['page_title'] = _($help_context = "Direct Sales Delivery"); create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']); } elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) { - $_SESSION['page_title'] = _("Direct Sales Invoice"); + $_SESSION['page_title'] = _($help_context = "Direct Sales Invoice"); create_cart(ST_SALESINVOICE, $_GET['NewInvoice']); } elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) { - $help_page_title = _('Modifying Sales Order'); + $help_context = 'Modifying Sales Order'; $_SESSION['page_title'] = sprintf( _("Modifying Sales Order # %d"), $_GET['ModifyOrderNumber']); create_cart(ST_SALESORDER, $_GET['ModifyOrderNumber']); } elseif (isset($_GET['ModifyQuotationNumber']) && is_numeric($_GET['ModifyQuotationNumber'])) { - $help_page_title = _('Modifying Sales Quotation'); + $help_context = 'Modifying Sales Quotation'; $_SESSION['page_title'] = sprintf( _("Modifying Sales Quotation # %d"), $_GET['ModifyQuotationNumber']); create_cart(ST_SALESQUOTE, $_GET['ModifyQuotationNumber']); } elseif (isset($_GET['NewOrder'])) { - $_SESSION['page_title'] = _("New Sales Order Entry"); + $_SESSION['page_title'] = _($help_context = "New Sales Order Entry"); create_cart(ST_SALESORDER, 0); } elseif (isset($_GET['NewQuotation'])) { - $_SESSION['page_title'] = _("New Sales Quotation Entry"); + $_SESSION['page_title'] = _($help_context = "New Sales Quotation Entry"); create_cart(ST_SALESQUOTE, 0); } elseif (isset($_GET['NewQuoteToSalesOrder'])) { - $_SESSION['page_title'] = _("Sales Order Entry"); + $_SESSION['page_title'] = _($help_context = "Sales Order Entry"); create_cart(ST_SALESQUOTE, $_GET['NewQuoteToSalesOrder']); } @@ -201,9 +201,16 @@ if (isset($_GET['AddedID'])) { submenu_view(_("&View This Invoice"), ST_SALESINVOICE, $invoice); - submenu_print(_("&Print Sales Invoice"), ST_SALESINVOICE, $invoice, 'prtopt'); - submenu_print(_("&Email Sales Invoice"), ST_SALESINVOICE, $invoice, null, 1); + 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); + if ($row !== false) + submenu_print(_("Print &Receipt"), $row['trans_type_from'], $row['trans_no_from']."-".$row['trans_type_from'], 'prtopt'); display_note(get_gl_view_str(ST_SALESINVOICE, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1); @@ -228,12 +235,16 @@ 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->trans_type == ST_SALESINVOICE) { + if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) { + $cart->payment = $_POST['payment']; + $cart->payment_terms = get_payment_terms($_POST['payment']); + $cart->cash = $cart->payment_terms['cash_sale']; + } if ($cart->cash) { $cart->due_date = $cart->document_date; $cart->phone = $cart->cust_ref = $cart->delivery_address = ''; - $cart->freight_cost = 0; + $cart->freight_cost = input_num('freight_cost'); $cart->ship_via = 1; $cart->deliver_to = '';//$_POST['deliver_to']; } else { @@ -284,8 +295,8 @@ 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; + if ($cart->pos != -1) + $_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; @@ -328,6 +339,7 @@ function can_process() { return false; } + if (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'); @@ -360,6 +372,14 @@ 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'); @@ -400,13 +420,22 @@ 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)) { + + if(!get_post('stock_id_text', true)) { + display_error( _("Item description cnnot 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; @@ -470,9 +499,10 @@ 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']); line_start_focus(); } @@ -484,27 +514,28 @@ function handle_cancel_order() if ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY) { - display_note(_("Direct delivery entry has been cancelled as requested."), 1); - submenu_option(_("Enter a New Sales Delivery"), $_SERVER['PHP_SELF']."?NewDelivery=0"); + 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); - submenu_option(_("Enter a New Sales Invoice"), $_SERVER['PHP_SELF']."?NewInvoice=0"); + 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) { - if (sales_order_has_deliveries(key($_SESSION['Items']->trans_no))) + 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 { 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); - submenu_option(_("Enter a New Sales Quotation"), $_SERVER['PHP_SELF']."?NewQuotation=Yes"); + 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); - submenu_option(_("Enter a New Sales Order"), $_SERVER['PHP_SELF']."?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 { @@ -514,9 +545,7 @@ function handle_cancel_order() } $Ajax->activate('_page_body'); processing_end(); - br(1); - end_page(); - exit; + display_footer_exit(); } //-------------------------------------------------------------------------------- @@ -526,7 +555,6 @@ function create_cart($type, $trans_no) global $Refs; processing_start(); - $doc_type = $type; if (isset($_GET['NewQuoteToSalesOrder'])) { @@ -540,21 +568,20 @@ function create_cart($type, $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->due_date = get_invoice_duedate($doc->payment, $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->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; +// else +// $doc->cash = date_diff2($doc->due_date, Today(), 'd')<2; } else $doc->due_date = $doc->document_date; $doc->reference = $Refs->get_next($doc->trans_type); @@ -564,7 +591,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(); } @@ -622,7 +649,6 @@ 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); @@ -653,5 +679,4 @@ if ($customer_error == "") { } end_form(); end_page(); - ?> \ No newline at end of file