Function line misplaced.
[fa-stable.git] / sales / includes / ui / sales_order_ui.inc
index 29459dc816aaa6b8be907b9d1ad63606e60035e2..72ad103b1ebe6237b13ef88ba37062e38c85ec21 100644 (file)
@@ -1,28 +1,78 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 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
+        $std_price = get_kit_price($new_item, $order->customer_currency, 
+               $order->sales_type,     $order->price_factor, get_post('OrderDate'), true);
 
-       foreach ($order->line_items AS $order_item)
-       {
-               if (strcasecmp($order_item->stock_id, $new_item) == 0)
-               {
-                       display_notification(_("For Part :") . $new_item . " " . _("This item is already on this order. You have been warned."));
-                       break;
+       if ($std_price == 0)
+               $price_factor = 0;
+       else
+               $price_factor = $price/$std_price;
+
+       $kit = get_item_kit($new_item);
+       $item_num = db_num_rows($kit);
+
+       while($item = db_fetch($kit)) {
+               $std_price = get_kit_price($item['stock_id'], $order->customer_currency, 
+                       $order->sales_type,     $order->price_factor, get_post('OrderDate'), true);
+
+               // rounding differences are included in last price item in kit
+               $item_num--;
+               if ($item_num) {
+                       $price -= $item['quantity']*$std_price*$price_factor;
+                       $item_price = $std_price*$price_factor;
+               } else {
+                       if ($item['quantity']) 
+                               $price = $price/$item['quantity'];
+                       $item_price = $price;
+               }
+               $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);
+               }
+               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)
+                               {
+                                       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),$new_item, $new_item_qty, $price, $discount);
 }
-
 //---------------------------------------------------------------------------------
 
 function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 {
+       global $SysPrefs;
+       
        $ret_error = "";
 
        $myrow = get_customer_to_order($customer_id);
@@ -32,39 +82,53 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        if ($myrow['dissallow_invoices'] == 1)
                $ret_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
 
-       $deliver = $myrow['address']; // in case no delivery address.
+       $deliver = $myrow['address']; // in case no branch address use company address
 
-       $order->set_customer($customer_id, $name, $myrow['curr_code'], $myrow['discount']);
+       $order->set_customer($customer_id, $name, $myrow['curr_code'], 
+               $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->Branch != 0)
+       $order->credit = $myrow['cur_credit'];
+
+       if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE)
        {
-               $result = get_branch_to_order($customer_id, $branch_id);
+               $order->dimension_id = $myrow['dimension_id'];
+               $order->dimension2_id = $myrow['dimension2_id'];
+       }
+       $result = get_branch_to_order($customer_id, $branch_id);
 
-               if (db_num_rows($result) == 0)
-               {
+       if (db_num_rows($result) == 0)
+       {
                return _("The selected customer and branch are not valid, or the customer does not have any branches.");
-               }
-
-               $myrow = db_fetch($result);
+       }
 
-               $order->set_branch($branch_id, $myrow["tax_group_id"],
-               $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
+       $myrow = db_fetch($result);
 
-               $address = $myrow["br_post_address"];
+       // 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"], @$contact["phone"], @$contact["email"]);
 
-               if (strlen($address) <= 1)      // if branch has no address
-                       $address = $deliver;    // set sales order address
+       $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"]
+               : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver);
 
-               $order->set_location($myrow["default_location"], $myrow["location_name"]);
-               $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
+       $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->trans_type == ST_SALESINVOICE) {
+               $order->due_date = get_invoice_duedate($order->payment, $order->document_date);
        }
+       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;
 }
@@ -73,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, $Ajax;
 
        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] );
@@ -96,24 +160,30 @@ function display_order_summary($title, &$order, $editable_items=false)
        $k = 0;  //row colour counter
 
        $id = find_submit('Edit');
-       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),
                   user_price_dec());
 
-
+               $qoh_msg = '';
                if (!$editable_items || $id != $line_no)
                {
-                       alt_table_row_color($k);
+                       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" );
-                       qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id));
+                       label_cell($stock_item->item_description );
+                       $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);
@@ -125,7 +195,7 @@ function display_order_summary($title, &$order, $editable_items=false)
                        {
                                edit_button_cell("Edit$line_no", _("Edit"),
                                _('Edit document line'));
-                               edit_button_cell("Delete$line_no", _("Delete"),
+                               delete_button_cell("Delete$line_no", _("Delete"),
                                _('Remove line from document'));
                        }
                        end_row();
@@ -141,38 +211,60 @@ 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 ($low_stock)
+               display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='stockmankofg'");
+
     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_table("width=80% $table_style");
-       echo "<tr><td valign=top>"; // outer table
-       echo "<table>";
+       start_outer_table(TABLESTYLE2, "width='80%'");
 
+       table_section(1);
+       
        $customer_error = "";
        $change_prices = 0;
 
        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 != ST_SALESORDER  && $order->trans_type != ST_SALESQUOTE) {
+                       hidden('dimension_id', $order->dimension_id); // 2008-11-12 Joe Hunt
+                       hidden('dimension2_id', $order->dimension2_id);
+               }       
        }
        else
        {
-               customer_list_row(_("Customer:"), 'customer_id', null, false, true);
+               customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true);
 
                if ($order->customer_id != get_post('customer_id', -1))
                {
@@ -180,11 +272,11 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                        $Ajax->activate('branch_id');
                }
                customer_branches_list_row(_("Branch:"),
-                 $_POST['customer_id'], 'branch_id', null, false, true, true);
+                 $_POST['customer_id'], 'branch_id', null, false, true, true, true);
 
                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'] == "")
@@ -200,22 +292,41 @@ 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 ($order->trans_type == 10)
-                               {
-                                       $_POST['delivery_date'] = $order->due_date;
-                                       $Ajax->activate('delivery_date');
+                               $_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('payment');
+                               } else {
+                                       if ($order->trans_type == ST_SALESINVOICE)
+                                       {
+                                               $_POST['delivery_date'] = $order->due_date;
+                                               $Ajax->activate('delivery_date');
+                                       }
+                                       $Ajax->activate('Location');
+                                       $Ajax->activate('deliver_to');
+                                       $Ajax->activate('phone');
+                                       $Ajax->activate('delivery_address');
                                }
-                               $Ajax->activate('Location');
-                               $Ajax->activate('deliver_to');
-                               $Ajax->activate('phone');
-                               $Ajax->activate('delivery_address');
                                // change prices if necessary
                                // what about discount in template case?
                                if ($old_order->customer_currency != $order->customer_currency) {
@@ -227,6 +338,14 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                                        $Ajax->activate('sales_type');
                                        $change_prices = 1;
                                }
+                               if ($old_order->dimension_id != $order->dimension_id) {
+                                       $_POST['dimension_id'] = $order->dimension_id;
+                                   $Ajax->activate('dimension_id');
+                               }
+                               if ($old_order->dimension2_id != $order->dimension2_id) {
+                                       $_POST['dimension2_id'] = $order->dimension2_id;
+                                   $Ajax->activate('dimension2_id');
+                               }
                                unset($old_order);
                        }
                        set_global_customer($_POST['customer_id']);
@@ -236,34 +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.");
-               
                }
        }
 
-       if ($_SESSION['Items']->trans_type!=30) {
-               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']));
 
-       echo "</table>";
+       table_section(2);
 
-       echo "</td><td>"; // outer table
-
-       if (!is_company_currency($order->customer_currency))
+       if (!is_company_currency($order->customer_currency) && in_array($order->trans_type, array(ST_SALESINVOICE, ST_CUSTDELIVERY)))
        {
-           div_start('currency');
-               echo "<table height='5'>";
                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));
-               echo "</table>";
-           div_end();
-               echo "</td><td>"; // outer table
        }
 
+       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');
+               }
+               $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();
 
-       echo "<table height='5'>";
        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);
        }
@@ -275,32 +412,42 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                $change_prices = 1;
        }
 
-       label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
-       echo "</table>";
-
-       echo "</td><td>"; // outer table
-
-       echo "<table height='5'>";
+       table_section(4);
 
        if ($editable)
        {
                if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
                        $_POST['OrderDate'] = $order->document_date;
 
-               date_row($date_text, 'OrderDate',
-                 _('Date of order receive'), null, 0, 0, 0, null, true);
-               if (isset($_POST['_OrderDate_changed'])) {
+               date_row($date_text, 'OrderDate', _('Date of order receive'),
+                       $order->trans_no==0, 0, 0, 0, null, true);
+               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('currency');
-                       if ($order->trans_type == 10) {
-                               $_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate'));
+                       $Ajax->activate('_ex_rate');
+                       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 != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE)
+               {       // 2008-11-12 Joe Hunt added dimensions
+                       $dim = get_company_pref('use_dimension');
+                       if ($dim > 0)
+                               dimensions_list_row(_("Dimension").":", 'dimension_id', 
+                                       null, true, ' ', false, 1, false);
+                       else
+                               hidden('dimension_id', 0);
+                       if ($dim > 1)
+                               dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', 
+                                       null, true, ' ', false, 2, false);
+                       else
+                               hidden('dimension2_id', 0);
+               }       
        }
        else
        {
@@ -308,23 +455,13 @@ 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', $_SESSION['Items']->tax_group_id);
-       }
-       echo "</table>";
-
-       echo "</td></tr>";
-
-       end_table(1); // outer table
+       end_outer_table(1); // outer table
 
        if ($change_prices != 0) {
                foreach ($order->line_items as $line_no=>$item) {
                        $line = &$order->line_items[$line_no];
-                       $line->price = get_price($line->stock_id, $order->customer_currency,
+                       $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');
        }
@@ -341,7 +478,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
        alt_table_row_color($rowcounter);
 
        $id = find_submit('Edit');
-       if ($line_no!=-1 && $line_no == $id)
+       if ($line_no!=-1 && $line_no == $id) // edit old line
        {
                $_POST['stock_id'] = $order->line_items[$id]->stock_id;
                $dec = get_qty_dec($_POST['stock_id']);
@@ -349,35 +486,48 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
                $_POST['price'] = price_format($order->line_items[$id]->price);
                $_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100);
                $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']);
-               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
+       else    // prepare new line
        {
-               stock_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"];
-               $dec = get_qty_dec($_POST['stock_id']);
+               $dec = $item_info['decimals'];
                $_POST['qty'] = number_format2(1, $dec);
-
-               $_POST['price'] = price_format(get_price ($_POST['stock_id'],
+               $price = get_kit_price($_POST['stock_id'],
                        $order->customer_currency, $order->sales_type,
-                       $order->price_factor, get_post('OrderDate')));
+                       $order->price_factor, get_post('OrderDate'));
+               $_POST['price'] = price_format($price);
                // default to the customer's discount %
                $_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);
@@ -385,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());
 
@@ -395,16 +545,16 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 
        if ($id!=-1)
        {
-               edit_button_cell('UpdateItem', _("Update"),
-                               _('Confirm changes'));
-               edit_button_cell('CancelItemChanges', _("Cancel"),
-                               _('Cancel changes'));
+               button_cell('UpdateItem', _("Update"),
+                               _('Confirm changes'), ICON_UPDATE);
+               button_cell('CancelItemChanges', _("Cancel"),
+                               _('Cancel changes'), ICON_CANCEL);
                hidden('LineNo', $line_no);
                set_focus('qty');
        }
        else
        {
-               submit_cells('AddItem', _("Add Item"), "colspan=2",
+               submit_cells('AddItem', _("Add Item"), "colspan=2 align='center'",
                    _('Add new item to document'), true);
        }
 
@@ -415,61 +565,82 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 
 function display_delivery_details(&$order)
 {
-       global $table_style2;
-       if ($order->trans_type==10)
-       {
-               $title = _("Delivery Details");
-               $delname = _("Due Date").':';
-       }
-       elseif ($order->trans_type==13)
-       {
-               $title = _("Invoice Delivery Details");
-               $delname = _("Invoice before").':';
-       }
-       else
-       {
-               $title = _("Order Delivery Details");
-               $delname = _("Required Delivery Date").':';
-       }
-       display_heading($title);
-       echo "<br>";
-       start_table("$table_style2 width=90%");
-       echo "<tr valign=top><td>"; // outer table
+       global $Ajax;
 
-       echo "<table>";
+       div_start('delivery');  
 
-       locations_list_row(_("Deliver from Location:"), 'Location', $order->Location);
 
-       date_row($delname, 'delivery_date',
-           _('Enter requested day of delivery'), $order->due_date, 0, 0, 0);
+       if ($order->payment_terms['cash_sale']) {       // Direct payment sale
+               $Ajax->activate('items_table');
+               display_heading(_('Cash payment'));
+               start_table(TABLESTYLE2, "width='60%'");
 
-       text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,
-       _('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'));
+               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==ST_SALESINVOICE)
+               {
+                       $title = _("Delivery Details");
+                       $delname = _("Due Date").':';
+               }
+               elseif ($order->trans_type==ST_CUSTDELIVERY)
+               {
+                       $title = _("Invoice Delivery Details");
+                       $delname = _("Invoice before").':';
+               }
+               elseif ($order->trans_type==ST_SALESQUOTE)
+               {
+                       $title = _("Quotation Delivery Details");
+                       $delname = _("Valid until").':';
+               }
+               else
+               {
+                       $title = _("Order Delivery Details");
+                       $delname = _("Required Delivery Date").':';
+               }
+               display_heading($title);
+               start_outer_table(TABLESTYLE2, "width='90%'");
+               table_section(1);
 
-       echo "</table>";
+               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');
 
-       echo "</td><td>"; // outer table
 
-       echo "<table>";
+               date_row($delname, 'delivery_date',
+                       $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'));
 
-       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);
+               textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5,
+                       _('Delivery address. Default is address of customer branch'));
 
-       small_amount_row(_("Shipping Charge:"), 'freight_cost',
-           price_format(get_post('freight_cost',0)));
+               table_section(2);
 
-       shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
+               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);
 
-       echo "</table>";
+               shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
 
-       echo "</td></tr>";
-       end_table(1); // outer table
+               end_outer_table(1);
+       }
+       div_end();
 }
 
-?>
\ No newline at end of file