X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=72ad103b1ebe6237b13ef88ba37062e38c85ec21;hb=2e2c1956eb2f82eebc95878752a19a376cc89485;hp=1b98e41ea6c3742e95ca1c0ff90594e18d86833f;hpb=61af570a407ed30eaad4816a4394af267ec45e67;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 1b98e41e..72ad103b 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -10,10 +10,9 @@ See the License here . ***********************************************************************/ include_once($path_to_root . "/sales/includes/cart_class.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); //-------------------------------------------------------------------------------- -function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount) +function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $description='') { // calculate item price to sum of kit element prices factor for // value distribution over all exploded kit items @@ -44,33 +43,36 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount) } $item_price = round($item_price, user_price_dec()); - if (!$item['is_foreign'] && $item['item_code'] != $item['stock_id']) - { // this is sales kit - recurse - add_to_order($order, $item['stock_id'], $new_item_qty*$item['quantity'], - $item_price, $discount, $std_price); - } - else - { // stock item record eventually with foreign code + if (!$item['is_foreign'] && $item['item_code'] != $item['stock_id']) + { // this is sales kit - recurse + add_to_order($order, $item['stock_id'], $new_item_qty*$item['quantity'], + $item_price, $discount); + } + else + { // stock item record eventually with foreign code - // check duplicate stock item - foreach ($order->line_items as $order_item) - { - if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0) + // check duplicate stock item + foreach ($order->line_items as $order_item) { - display_warning(_("For Part :").$item['stock_id']. " " - . _("This item is already on this document. You have been warned.")); - break; + if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0) + { + display_warning(_("For Part :").$item['stock_id']. " " + . _("This item is already on this document. You have been warned.")); + break; + } } + $order->add_to_cart (count($order->line_items), $item['stock_id'], + $new_item_qty*$item['quantity'], $item_price, $discount, 0,0, $description); } - $order->add_to_cart (count($order->line_items), $item['stock_id'], - $new_item_qty*$item['quantity'], $item_price, $discount); - } } + } //--------------------------------------------------------------------------------- function get_customer_details_to_order(&$order, $customer_id, $branch_id) { + global $SysPrefs; + $ret_error = ""; $myrow = get_customer_to_order($customer_id); @@ -83,13 +85,15 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) $deliver = $myrow['address']; // in case no branch address use company address $order->set_customer($customer_id, $name, $myrow['curr_code'], - $myrow['discount'], $myrow['pymt_discount']); + $myrow['discount'], $myrow['payment_terms'], $myrow['pymt_discount']); // the sales type determines the price list to be used by default $order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'], $myrow['factor']); - if ($order->trans_type != 30) + $order->credit = $myrow['cur_credit']; + + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) { $order->dimension_id = $myrow['dimension_id']; $order->dimension2_id = $myrow['dimension2_id']; @@ -103,27 +107,29 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) $myrow = db_fetch($result); + // FIX - implement editable contact selector in sales order + $contact = get_branch_contacts($branch_id, 'order', $customer_id); $order->set_branch($branch_id, $myrow["tax_group_id"], - $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]); + $myrow["tax_group_name"], @$contact["phone"], @$contact["email"]); $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"] : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver); $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"], $address); - if ($order->trans_type == 10) { - $order->due_date = get_invoice_duedate($customer_id, $order->document_date); - if ($order->pos != -1) - $order->cash = date_diff2($order->due_date, Today(), 'd')<2; + if ($order->trans_type == ST_SALESINVOICE) { + $order->due_date = get_invoice_duedate($order->payment, $order->document_date); } - if($order->cash ) { - if($order->pos != -1) { - $paym = get_sales_point($order->pos); - $order->set_location($paym["pos_location"], $paym["location_name"]); - } + elseif ($order->trans_type == ST_SALESORDER) + $order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by()); + elseif ($order->trans_type == ST_SALESQUOTE) + $order->due_date = add_days($order->document_date, $SysPrefs->default_quote_valid_days()); + + if($order->payment_terms['cash_sale']) { + $order->set_location($order->pos["pos_location"], $order->pos["location_name"]); } else $order->set_location($myrow["default_location"], $myrow["location_name"]); - + return $ret_error; } @@ -131,15 +137,15 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id) function display_order_summary($title, &$order, $editable_items=false) { - global $table_style, $path_to_root; display_heading($title); div_start('items_table'); - start_table("$table_style colspan=7 width=90%"); + start_table(TABLESTYLE, "width='90%'"); + $th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Delivered"), - _("Unit"), _("Price"), _("Discount %"), _("Total"), ""); + _("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), ""); if ($order->trans_no == 0) { unset( $th[3] ); @@ -154,8 +160,9 @@ function display_order_summary($title, &$order, $editable_items=false) $k = 0; //row colour counter $id = find_submit('Edit'); - $has_marked = false; - foreach ($order->line_items as $line_no=>$stock_item) + + $low_stock = $order->check_qoh($_POST['OrderDate'], $_POST['Location']); + foreach ($order->get_items() as $line_no=>$stock_item) { $line_total = round($stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent), @@ -164,31 +171,19 @@ function display_order_summary($title, &$order, $editable_items=false) $qoh_msg = ''; if (!$editable_items || $id != $line_no) { - if (!sys_prefs::allow_negative_stock() && is_inventory_item($stock_item->stock_id)) { - $qoh = get_qoh_on_date($stock_item->stock_id, - $_POST['Location'], $_POST['OrderDate']); - if ($stock_item->qty_dispatched > $qoh) - { - // oops, we don't have enough of one of the component items - start_row("class='stockmankobg'"); - $qoh_msg .= $stock_item->stock_id . " - " . $stock_item->item_description . ": " . - _("Quantity On Hand") . " = " - . number_format2($qoh, get_qty_dec($stock_item->stock_id)) . '
'; - $has_marked = true; - } else - alt_table_row_color($k); - } else { + if (in_array($stock_item->stock_id, $low_stock)) + start_row("class='stockmankobg'"); // notice low stock status + else alt_table_row_color($k); - } view_stock_status_cell($stock_item->stock_id); - //label_cell($stock_item->item_description, "nowrap" ); label_cell($stock_item->item_description ); - qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id)); + $dec = get_qty_dec($stock_item->stock_id); + qty_cell($stock_item->qty_dispatched, false, $dec); if ($order->trans_no!=0) - amount_cell($stock_item->qty_done); + qty_cell($stock_item->qty_done, false, $dec); label_cell($stock_item->units); amount_cell($stock_item->price); @@ -216,27 +211,40 @@ function display_order_summary($title, &$order, $editable_items=false) if ($id==-1 && $editable_items) sales_order_item_controls($order, $k); - $display_total = price_format($total); - label_row(_("Total Excluding Shipping"), $display_total, "colspan=6 align=right", - "nowrap align=right", 2); + $colspan = 6; + if ($order->trans_no!=0) + ++$colspan; + start_row(); + label_cell(_("Shipping Charge"), "colspan=$colspan align=right"); + small_amount_cells(null, 'freight_cost', price_format(get_post('freight_cost',0))); + label_cell('', 'colspan=2'); + end_row(); + $display_sub_total = price_format($total + input_num('freight_cost')); + label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2); + $taxes = $order->get_taxes(input_num('freight_cost')); + $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2); + + $display_total = price_format(($total + input_num('freight_cost') + $tax_total)); + + start_row(); + label_cells(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right"); + submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true); + end_row(); end_table(); - if ($has_marked) { + if ($low_stock) display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='stockmankofg'"); - if ($order->trans_type!=30 && !sys_prefs::allow_negative_stock()) - display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") - . '
'. $qoh_msg); - } + div_end(); } // ------------------------------------------------------------------------------ -function display_order_header(&$order, $editable, $date_text, $display_tax_group=false) +function display_order_header(&$order, $editable, $date_text) { - global $table_style, $Ajax; + global $Ajax, $SysPrefs; - start_outer_table("width=80% $table_style"); + start_outer_table(TABLESTYLE2, "width='80%'"); table_section(1); @@ -245,13 +253,11 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group if (isset($order) && !$editable) { - // can't change the customer/branch if items already received on this order - //echo $order->customer_name . " - " . $order->deliver_to; label_row(null, $order->customer_name . " - " . $order->deliver_to); hidden('customer_id', $order->customer_id); hidden('branch_id', $order->Branch); hidden('sales_type', $order->sales_type); - if ($order->trans_type != 30) { + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) { hidden('dimension_id', $order->dimension_id); // 2008-11-12 Joe Hunt hidden('dimension2_id', $order->dimension2_id); } @@ -270,7 +276,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group if( ($order->customer_id != get_post('customer_id', -1)) || ($order->Branch != get_post('branch_id', -1)) || - list_updated('customer_id')) + list_updated('customer_id')) { if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "") @@ -286,19 +292,32 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group else { - $old_order = (PHP_VERSION<5) ? $order : clone( $order ); + $old_order = (PHP_VERSION<5) ? $order : clone $order; $customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']); $_POST['Location'] = $order->Location; $_POST['deliver_to'] = $order->deliver_to; $_POST['delivery_address'] = $order->delivery_address; $_POST['phone'] = $order->phone; - if (get_post('cash') !== $order->cash) { - $_POST['cash'] = $order->cash; + $_POST['delivery_date'] = $order->due_date; + + if (!in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)) + && ($order->pos['cash_sale'] != $order->pos['credit_sale']) + && (($order->payment_terms['cash_sale'] && !$order->pos['cash_sale']) || + (!$order->payment_terms['cash_sale'] && !$order->pos['credit_sale']))) { + // force payment terms refresh if terms are editable + // and pos have no permitions for terms selected in customer record. + // Terms are set to first terms in allowed category below. + display_warning( + sprintf(_("Customer's payment terms '%s' cannot be selected on this POS"), + $order->payment_terms['terms'])); + $order->payment = ''; + } elseif (get_post('payment') !== $order->payment) { + $_POST['payment'] = $order->payment; $Ajax->activate('delivery'); - $Ajax->activate('cash'); + $Ajax->activate('payment'); } else { - if ($order->trans_type == 10) + if ($order->trans_type == ST_SALESINVOICE) { $_POST['delivery_date'] = $order->due_date; $Ajax->activate('delivery_date'); @@ -336,44 +355,52 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $row = get_customer_to_order($_POST['customer_id']); if ($row['dissallow_invoices'] == 1) $customer_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."); - } } - ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); + ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '', $order->trans_type, array('date'=> @$_POST['OrderDate'])); - if (!is_company_currency($order->customer_currency)) - { - table_section(2); + table_section(2); + if (!is_company_currency($order->customer_currency) && in_array($order->trans_type, array(ST_SALESINVOICE, ST_CUSTDELIVERY))) + { label_row(_("Customer Currency:"), $order->customer_currency); - exchange_rate_display($order->customer_currency, get_company_currency(), + exchange_rate_display(get_company_currency(), $order->customer_currency, ($editable ? $_POST['OrderDate'] : $order->document_date)); } - table_section(3); - if ($order->trans_type == 10 && $order->pos != -1) { - sale_payment_list_cells(_('Payment:'), 'cash', null, true); - $cash_payment = get_post('cash', 0); - // current user can issue both credit and cash invoices - if ($order->cash != $cash_payment) { - $order->cash = $cash_payment; - if ($cash_payment) { - $paym = get_sales_point(user_pos()); - $order->cash_account = $paym['pos_account']; - $order->account_name = $paym['bank_account_name']; - $_POST['Location'] = $order->Location = $paym['pos_location']; - $order->location_name = $paym['location_name']; + customer_credit_row($_POST['customer_id'], $order->credit); + + label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); + + table_section(3); + start_row(); + if (($order->pos['cash_sale'] || $order->pos['credit_sale']) + && !$order->is_started()) { + // editable payment type + if (get_post('payment') !== $order->payment) { + $order->payment = get_post('payment'); + $order->payment_terms = get_payment_terms($order->payment); + $order->due_date = get_invoice_duedate($order->payment, $order->document_date); + if ($order->payment_terms['cash_sale']) { + $_POST['Location'] = $order->Location = $order->pos['pos_location']; + $order->location_name = $order->pos['location_name']; } $Ajax->activate('items_table'); $Ajax->activate('delivery'); - set_focus($order->pos == -1 ? 'delivery_date' : 'account'); } - } else - hidden('cash', $order->cash); + $paymcat = !$order->pos['cash_sale'] ? PM_CREDIT : + (!$order->pos['credit_sale'] ? PM_CASH : PM_ANY); + // all terms are available for SO + $is_order = in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)); + sale_payment_list_cells(_('Payment:'), 'payment', $is_order ? PM_ANY : $paymcat, null, true, $is_order); + } else { + label_cells(_('Payment:'), $order->payment_terms['terms'], "class='label'"); + } + end_row(); if($editable) { - $str = sales_types_list_row(_("Price List"), 'sales_type', null, true); + $str = sales_types_list_row(_("Price List:"), 'sales_type', null, true); } else { label_row(_("Price List:"), $order->sales_type_name); } @@ -385,8 +412,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $change_prices = 1; } - label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%"); - table_section(4); if ($editable) @@ -396,20 +421,20 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group date_row($date_text, 'OrderDate', _('Date of order receive'), $order->trans_no==0, 0, 0, 0, null, true); - if (isset($_POST['_OrderDate_changed'])) { + if (isset($_POST['_OrderDate_changed']) || list_updated('payment')) { if (!is_company_currency($order->customer_currency) && (get_base_sales_type()>0)) { $change_prices = 1; } $Ajax->activate('_ex_rate'); - if ($order->trans_type == 10) { - $_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate')); + if ($order->trans_type == ST_SALESINVOICE) { + $_POST['delivery_date'] = get_invoice_duedate(get_post('payment'), get_post('OrderDate')); } else - $_POST['delivery_date'] = add_days(get_post('OrderDate'), sys_prefs::default_delivery_required_by()); + $_POST['delivery_date'] = add_days(get_post('OrderDate'), $SysPrefs->default_delivery_required_by()); $Ajax->activate('items_table'); $Ajax->activate('delivery_date'); } - if ($order->trans_type != 30 && $order->trans_type != 32) + if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE) { // 2008-11-12 Joe Hunt added dimensions $dim = get_company_pref('use_dimension'); if ($dim > 0) @@ -430,12 +455,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group hidden('OrderDate', $order->document_date); } - if ($display_tax_group) - { - label_row(_("Tax Group:"), $order->tax_group_name); - hidden('tax_group_id', $order->tax_group_id); - } - end_outer_table(1); // outer table if ($change_prices != 0) { @@ -443,7 +462,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group $line = &$order->line_items[$line_no]; $line->price = get_kit_price($line->stock_id, $order->customer_currency, $order->sales_type, $order->price_factor, get_post('OrderDate')); - // $line->discount_percent = $order->default_discount; } $Ajax->activate('items_table'); } @@ -467,23 +485,31 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) $_POST['qty'] = number_format2($order->line_items[$id]->qty_dispatched, $dec); $_POST['price'] = price_format($order->line_items[$id]->price); $_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100); - $_POST['item_description'] = $order->line_items[$id]->item_description; $units = $order->line_items[$id]->units; + $_POST['item_description'] = $order->line_items[$id]->item_description; hidden('stock_id', $_POST['stock_id']); label_cell($_POST['stock_id']); - text_cells(null,'item_description', null, 45, 150); - //label_cell($order->line_items[$line_no]->item_description, "nowrap"); + if ($order->line_items[$id]->descr_editable) + text_cells(null,'item_description', null, 45, 150); + else { + hidden('item_description', $_POST['item_description']); + label_cell($_POST['item_description']); + } $Ajax->activate('items_table'); } else // prepare new line { - sales_items_list_cells(null,'stock_id', null, false, true); + if ($order->fixed_asset) + stock_disposable_fa_list_cells(null,'stock_id', null, _('[Select item]'), true, $order->line_items); + else + sales_items_list_cells(null,'stock_id', null, false, true, true); if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); $Ajax->activate('qty'); $Ajax->activate('line_total'); - } + } else + sales_items_list_cells(null,'stock_id', last_sales_order_detail($order, 'stk_code'), false, true, true); $item_info = get_item_edit_info($_POST['stock_id']); $units = $item_info["units"]; @@ -497,7 +523,11 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) $_POST['Disc'] = percent_format($order->default_discount * 100); } - qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); + if ($order->fixed_asset) { + label_cell(1, '', 'qty'); + hidden('qty', 1); + } else + qty_cells(null, 'qty', $_POST['qty'], null, null, $dec); if ($order->trans_no!=0) { qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec); @@ -505,7 +535,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) label_cell($units, '', 'units'); - $str = amount_cells(null, 'price'); + amount_cells(null, 'price'); small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec()); @@ -524,7 +554,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) } else { - submit_cells('AddItem', _("Add Item"), "colspan=2", + submit_cells('AddItem', _("Add Item"), "colspan=2 align='center'", _('Add new item to document'), true); } @@ -535,33 +565,35 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1) function display_delivery_details(&$order) { - global $table_style2, $Ajax; + global $Ajax; div_start('delivery'); - if (get_post('cash', 0)) { // Direct payment sale + + if ($order->payment_terms['cash_sale']) { // Direct payment sale $Ajax->activate('items_table'); display_heading(_('Cash payment')); - start_table("$table_style2 width=60%"); - label_row(_("Deliver from Location:"), $order->location_name); + start_table(TABLESTYLE2, "width='60%'"); - hidden('Location', $order->Location); - label_row(_("Cash account:"), $order->account_name); + locations_list_row(_("Deliver from Location:"), 'Location', null, false, true); + if (list_updated('Location')) + $Ajax->activate('items_table'); + label_row(_("Cash account:"), $order->pos['bank_account_name']); textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); end_table(); + hidden('delivery_date', $order->due_date); } else { - - if ($order->trans_type==10) + if ($order->trans_type==ST_SALESINVOICE) { $title = _("Delivery Details"); $delname = _("Due Date").':'; } - elseif ($order->trans_type==13) + elseif ($order->trans_type==ST_CUSTDELIVERY) { $title = _("Invoice Delivery Details"); $delname = _("Invoice before").':'; } - elseif ($order->trans_type==32) + elseif ($order->trans_type==ST_SALESQUOTE) { $title = _("Quotation Delivery Details"); $delname = _("Valid until").':'; @@ -572,34 +604,39 @@ function display_delivery_details(&$order) $delname = _("Required Delivery Date").':'; } display_heading($title); - start_outer_table("$table_style2 width=90%"); + start_outer_table(TABLESTYLE2, "width='90%'"); table_section(1); - locations_list_row(_("Deliver from Location:"), 'Location', null, - false, true); + locations_list_row(_("Deliver from Location:"), 'Location', null, false, true, $order->fixed_asset); + if ($order->payment_terms['days_before_due'] == -1) + { + $Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update + if (!$order->is_started()) + amount_row(_("Pre-Payment Required:"), 'prep_amount'); + else + label_row(_("Pre-Payment Required:"), price_format($order->prep_amount), "class='label'"); + } if (list_updated('Location')) $Ajax->activate('items_table'); date_row($delname, 'delivery_date', - $order->trans_type==30 ? _('Enter requested day of delivery') : $order->trans_type==32 ? _('Enter Valid until Date') : ''); - text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40, + $order->trans_type==ST_SALESORDER ? _('Enter requested day of delivery') + : $order->trans_type==ST_SALESQUOTE ? _('Enter Valid until Date') : ''); + text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 50, 60, _('Additional identifier for delivery e.g. name of receiving person')); textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5, _('Delivery address. Default is address of customer branch')); - text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25, - _('Phone number of ordering person. Defaults to branch phone number')); table_section(2); + text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25, + _('Phone number of ordering person. Defaults to branch phone number')); text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25, _('Customer reference number for this order (if any)')); textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5); - small_amount_row(_("Shipping Charge:"), 'freight_cost', - price_format(get_post('freight_cost',0))); - shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via); end_outer_table(1); @@ -607,4 +644,3 @@ function display_delivery_details(&$order) div_end(); } -?> \ No newline at end of file