X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=fbcab725c477dae92e2b8444c3ea605e4a8ee116;hb=960bbc5e344bce59854afae242a269dd6b54671b;hp=e1c6b759edf706cf92e912d3583b4c168164e034;hpb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index e1c6b759..fbcab725 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -17,8 +17,8 @@ // Entry Direct Invoice // -$page_security = 'SA_SALESORDER'; $path_to_root = ".."; +$page_security = 'SA_SALESORDER'; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -27,6 +27,20 @@ include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_types_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); + +set_page_security( @$_SESSION['Items']->trans_type, + array( ST_SALESORDER=>'SA_SALESORDER', + ST_SALESQUOTE => 'SA_SALESQUOTE', + ST_CUSTDELIVERY => 'SA_SALESDELIVERY', + ST_SALESINVOICE => 'SA_SALESINVOICE'), + array( 'NewOrder' => 'SA_SALESORDER', + 'ModifySalesOrder' => 'SA_SALESORDER', + 'NewQuotation' => 'SA_SALESQUOTE', + 'ModifyQuotationNumber' => 'SA_SALESQUOTE', + 'NewDelivery' => 'SA_SALESDELIVERY', + 'NewInvoice' => 'SA_SALESINVOICE') +); + $js = ''; if ($use_popup_windows) { @@ -39,37 +53,37 @@ if ($use_date_picker) { if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { - $_SESSION['page_title'] = _("Direct Sales Delivery"); - create_cart(13, $_GET['NewDelivery']); + $_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"); - create_cart(10, $_GET['NewInvoice']); + $_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(30, $_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(32, $_GET['ModifyQuotationNumber']); + create_cart(ST_SALESQUOTE, $_GET['ModifyQuotationNumber']); } elseif (isset($_GET['NewOrder'])) { - $_SESSION['page_title'] = _("New Sales Order Entry"); - create_cart(30, 0); + $_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"); - create_cart(32, 0); + $_SESSION['page_title'] = _($help_context = "New Sales Quotation Entry"); + create_cart(ST_SALESQUOTE, 0); } elseif (isset($_GET['NewQuoteToSalesOrder'])) { - $_SESSION['page_title'] = _("Sales Order Entry"); - create_cart(32, $_GET['NewQuoteToSalesOrder']); + $_SESSION['page_title'] = _($help_context = "Sales Order Entry"); + create_cart(ST_SALESQUOTE, $_GET['NewQuoteToSalesOrder']); } page($_SESSION['page_title'], false, false, "", $js); @@ -86,10 +100,10 @@ if (isset($_GET['AddedID'])) { $order_no = $_GET['AddedID']; display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no)); - submenu_view(_("&View This Order"), 30, $order_no); + submenu_view(_("&View This Order"), ST_SALESORDER, $order_no); - submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt'); - submenu_print(_("&Email This Order"), 30, $order_no, null, 1); + submenu_print(_("&Print This Order"), ST_SALESORDER, $order_no, 'prtopt'); + submenu_print(_("&Email This Order"), ST_SALESORDER, $order_no, null, 1); set_focus('prtopt'); submenu_option(_("Make &Delivery Against This Order"), @@ -104,10 +118,10 @@ if (isset($_GET['AddedID'])) { display_notification_centered(sprintf( _("Order # %d has been updated."),$order_no)); - submenu_view(_("&View This Order"), 30, $order_no); + submenu_view(_("&View This Order"), ST_SALESORDER, $order_no); - submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt'); - submenu_print(_("&Email This Order"), 30, $order_no, null, 1); + submenu_print(_("&Print This Order"), ST_SALESORDER, $order_no, 'prtopt'); + submenu_print(_("&Email This Order"), ST_SALESORDER, $order_no, null, 1); set_focus('prtopt'); submenu_option(_("Confirm Order Quantities and Make &Delivery"), @@ -122,10 +136,10 @@ if (isset($_GET['AddedID'])) { $order_no = $_GET['AddedQU']; display_notification_centered(sprintf( _("Quotation # %d has been entered."),$order_no)); - submenu_view(_("&View This Quotation"), 32, $order_no); + submenu_view(_("&View This Quotation"), ST_SALESQUOTE, $order_no); - submenu_print(_("&Print This Quotation"), 32, $order_no, 'prtopt'); - submenu_print(_("&Email This Quotation"), 32, $order_no, null, 1); + submenu_print(_("&Print This Quotation"), ST_SALESQUOTE, $order_no, 'prtopt'); + submenu_print(_("&Email This Quotation"), ST_SALESQUOTE, $order_no, null, 1); set_focus('prtopt'); submenu_option(_("Make &Sales Order Against This Quotation"), @@ -140,17 +154,17 @@ if (isset($_GET['AddedID'])) { display_notification_centered(sprintf( _("Quotation # %d has been updated."),$order_no)); - submenu_view(_("&View This Quotation"), 32, $order_no); + submenu_view(_("&View This Quotation"), ST_SALESQUOTE, $order_no); - submenu_print(_("&Print This Quotation"), 32, $order_no, 'prtopt'); - submenu_print(_("&Email This Quotation"), 32, $order_no, null, 1); + submenu_print(_("&Print This Quotation"), ST_SALESQUOTE, $order_no, 'prtopt'); + submenu_print(_("&Email This Quotation"), ST_SALESQUOTE, $order_no, null, 1); set_focus('prtopt'); submenu_option(_("Make &Sales Order Against This Quotation"), "/sales/sales_order_entry.php?NewQuoteToSalesOrder=$order_no"); submenu_option(_("Select A Different &Quotation"), - "/sales/inquiry/sales_orders_view.php?type=32"); + "/sales/inquiry/sales_orders_view.php?type=".ST_SALESQUOTE); display_footer_exit(); } elseif (isset($_GET['AddedDN'])) { @@ -158,13 +172,15 @@ if (isset($_GET['AddedID'])) { display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery)); - submenu_view(_("&View This Delivery"), 13, $delivery); + submenu_view(_("&View This Delivery"), ST_CUSTDELIVERY, $delivery); - submenu_print(_("&Print Delivery Note"), 13, $delivery, 'prtopt'); - submenu_print(_("&Email Delivery Note"), 13, $delivery, null, 1); + submenu_print(_("&Print Delivery Note"), ST_CUSTDELIVERY, $delivery, 'prtopt'); + submenu_print(_("&Email Delivery Note"), ST_CUSTDELIVERY, $delivery, null, 1); + submenu_print(_("P&rint as Packing Slip"), ST_CUSTDELIVERY, $delivery, 'prtopt', null, 1); + submenu_print(_("E&mail as Packing Slip"), ST_CUSTDELIVERY, $delivery, null, 1, 1); set_focus('prtopt'); - display_note(get_gl_view_str(13, $delivery, _("View the GL Journal Entries for this Dispatch")),0, 1); + display_note(get_gl_view_str(ST_CUSTDELIVERY, $delivery, _("View the GL Journal Entries for this Dispatch")),0, 1); submenu_option(_("Make &Invoice Against This Delivery"), "/sales/customer_invoice.php?DeliveryNumber=$delivery"); @@ -183,13 +199,20 @@ if (isset($_GET['AddedID'])) { display_notification_centered(sprintf(_("Invoice # %d has been entered."), $invoice)); - submenu_view(_("&View This Invoice"), 10, $invoice); + submenu_view(_("&View This Invoice"), ST_SALESINVOICE, $invoice); - submenu_print(_("&Print Sales Invoice"), 10, $invoice, 'prtopt'); - submenu_print(_("&Email Sales Invoice"), 10, $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(10, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1); + display_note(get_gl_view_str(ST_SALESINVOICE, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1); if ((isset($_GET['Type']) && $_GET['Type'] == 1)) submenu_option(_("Enter a &New Template Invoice"), @@ -212,12 +235,15 @@ function copy_to_cart() $cart->Comments = $_POST['Comments']; $cart->document_date = $_POST['OrderDate']; - if ($cart->trans_type == 10) - $cart->cash = $_POST['cash']; - if ($cart->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']); + } + if ($cart->payment_terms['cash_sale']) { $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 { @@ -238,7 +264,7 @@ function copy_to_cart() $cart->Branch = $_POST['branch_id']; $cart->sales_type = $_POST['sales_type']; // POS - if ($cart->trans_type!=30 && $cart->trans_type!=32) { // 2008-11-12 Joe Hunt + 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']; } @@ -268,9 +294,8 @@ function copy_from_cart() $_POST['branch_id'] = $cart->Branch; $_POST['sales_type'] = $cart->sales_type; // POS - if ($cart->trans_type == 10) - $_POST['cash'] = $cart->cash; - if ($cart->trans_type!=30 && $cart->trans_type!=32) { // 2008-11-12 Joe Hunt + $_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; } @@ -288,12 +313,28 @@ 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!=30 && $_SESSION['Items']->trans_type!=32 && !is_date_in_fiscalyear($_POST['OrderDate'])) { + 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")); set_focus('OrderDate'); return false; @@ -303,13 +344,14 @@ 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) { 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'); @@ -325,7 +367,7 @@ function can_process() { return false; } if (!is_date($_POST['delivery_date'])) { - if ($_SESSION['Items']->trans_type==32) + if ($_SESSION['Items']->trans_type==ST_SALESQUOTE) display_error(_("The Valid date is invalid.")); else display_error(_("The delivery date is invalid.")); @@ -334,7 +376,7 @@ function can_process() { } //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==32) + if ($_SESSION['Items']->trans_type==ST_SALESQUOTE) display_error(_("The requested valid date is before the date of the quotation.")); else display_error(_("The requested delivery date is before the date of the order.")); @@ -342,11 +384,25 @@ function can_process() { return false; } } - if (!references::is_valid($_POST['ref'])) { + 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; + } return true; } @@ -367,26 +423,37 @@ if (isset($_POST['ProcessOrder']) && can_process()) { new_doc_date($_SESSION['Items']->document_date); processing_end(); if ($modified) { - if ($trans_type == 32) + 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 == 30) { + } elseif ($trans_type == ST_SALESORDER) { meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no"); - } elseif ($trans_type == 32) { + } elseif ($trans_type == ST_SALESQUOTE) { meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no"); - } elseif ($trans_type == 10) { + } 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'); +} + //-------------------------------------------------------------------------------- function check_item_data() { - if (!check_num('qty', 0) || !check_num('Disc', 0, 100)) { + global $SysPrefs; + + 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; @@ -401,7 +468,7 @@ 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!=30 && $_SESSION['Items']->trans_type!=32 && !sys_prefs::allow_negative_stock() && + elseif ($_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE && !$SysPrefs->allow_negative_stock() && is_inventory_item($_POST['stock_id'])) { $qoh = get_qoh_on_date($_POST['stock_id'], $_POST['Location'], $_POST['OrderDate']); @@ -427,6 +494,7 @@ function handle_update_item() input_num('qty'), input_num('price'), input_num('Disc') / 100, $_POST['item_description'] ); } + page_modified(); line_start_focus(); } @@ -450,9 +518,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(); } @@ -463,28 +533,29 @@ function handle_cancel_order() global $path_to_root, $Ajax; - if ($_SESSION['Items']->trans_type == 13) { - display_note(_("Direct delivery entry has been cancelled as requested."), 1); - submenu_option(_("Enter a New Sales Delivery"), $_SERVER['PHP_SELF']."?NewDelivery=0"); + 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 == 10) { - display_note(_("Direct invoice entry has been cancelled as requested."), 1); - submenu_option(_("Enter a New Sales Invoice"), $_SERVER['PHP_SELF']."?NewInvoice=0"); + } 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 { 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 == 32) + 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 { @@ -494,55 +565,50 @@ function handle_cancel_order() } $Ajax->activate('_page_body'); processing_end(); - br(1); - end_page(); - exit; + display_footer_exit(); } //-------------------------------------------------------------------------------- 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(32, $trans_no); + $doc = new Cart(ST_SALESQUOTE, $trans_no); $doc->trans_no = 0; - $doc->trans_type = 30; - $doc->reference = references::get_next($doc->trans_type); + $doc->trans_type = ST_SALESORDER; + $doc->reference = $Refs->get_next($doc->trans_type); $doc->document_date = $doc->due_date = new_doc_date(); $doc->Comments = _("Sales Quotation") . " # " . $trans_no; $_SESSION['Items'] = $doc; } - elseif($type != 30 && $type != 32 && $trans_no != 0) { // this is template - $doc_type = 30; + elseif($type != ST_SALESORDER && $type != ST_SALESQUOTE && $trans_no != 0) { // this is template - $doc = new Cart(30, array($trans_no)); + $doc = new Cart(ST_SALESORDER, array($trans_no)); $doc->trans_type = $type; $doc->trans_no = 0; $doc->document_date = new_doc_date(); - if ($type == 10) { - $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_diff($doc->due_date, Today(), 'd')<2; + if ($type == ST_SALESINVOICE) { + $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 = references::get_next($doc->trans_type); + $doc->reference = $Refs->get_next($doc->trans_type); //$doc->Comments=''; foreach($doc->line_items as $line_no => $line) { $doc->line_items[$line_no]->qty_done = 0; } $_SESSION['Items'] = $doc; } else - $_SESSION['Items'] = new Cart($type,array($trans_no)); + $_SESSION['Items'] = new Cart($type, array($trans_no)); copy_from_cart(); } @@ -570,19 +636,19 @@ 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.")); -if ($_SESSION['Items']->trans_type == 10) { +if ($_SESSION['Items']->trans_type == ST_SALESINVOICE) { $idate = _("Invoice Date:"); $orderitems = _("Sales Invoice Items"); $deliverydetails = _("Enter Delivery Details and Confirm Invoice"); $cancelorder = _("Cancel Invoice"); $porder = _("Place Invoice"); -} elseif ($_SESSION['Items']->trans_type == 13) { +} elseif ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY) { $idate = _("Delivery Date:"); $orderitems = _("Delivery Note Items"); $deliverydetails = _("Enter Delivery Details and Confirm Dispatch"); $cancelorder = _("Cancel Delivery"); $porder = _("Place Delivery"); -} elseif ($_SESSION['Items']->trans_type == 32) { +} elseif ($_SESSION['Items']->trans_type == ST_SALESQUOTE) { $idate = _("Quotation Date:"); $orderitems = _("Sales Quotation Items"); $deliverydetails = _("Enter Delivery Details and Confirm Quotation"); @@ -600,12 +666,11 @@ if ($_SESSION['Items']->trans_type == 10) { 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 ""; @@ -631,5 +696,4 @@ if ($customer_error == "") { } end_form(); end_page(); - ?> \ No newline at end of file