Icons removed form form buttons for now.

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 5657a497b325c1031e4e7b28911b2a32fb0b04f3..5ef26f8cad0e7b3386da24c41a4cf16b772416f4 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -57,7 +57,7 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
                {
                        if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0)
                        {
-                               display_notification(_("For Part :").$item['stock_id']. " " 
+                               display_warning(_("For Part :").$item['stock_id']. " " 
                                        . _("This item is already on this order. You have been warned."));
                                break;
                        }
@@ -80,7 +80,7 @@ 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'], $myrow['pymt_discount']);
@@ -106,10 +106,9 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        $order->set_branch($branch_id, $myrow["tax_group_id"],
        $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
 
-       $address = $myrow["br_post_address"];
+       $address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"]
+               : (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver);
 
-       if (strlen($address) <= 1)      // if branch has no address
-               $address = $deliver;    // set sales order address
        $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
                $address);
        if ($order->trans_type == 10) {
@@ -168,7 +167,8 @@ function display_order_summary($title, &$order, $editable_items=false)
 
                        view_stock_status_cell($stock_item->stock_id);
 
-                       label_cell($stock_item->item_description, "nowrap" );
+                       //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));
 
                        if ($order->trans_no!=0)
@@ -308,7 +308,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                } // changed branch
        }
 
-       if ($_SESSION['Items']->trans_type!=30) {
+       if ($order->trans_type != 30) {
                ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
        }
 
@@ -369,7 +369,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                date_row($date_text, 'OrderDate',
                  _('Date of order receive'), null, 0, 0, 0, null, true);
                if (isset($_POST['_OrderDate_changed'])) {
-                       $change_prices = 1;
+                       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'));
@@ -401,7 +404,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
        if ($display_tax_group)
        {
            label_row(_("Tax Group:"), $order->tax_group_name);
-           hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
+           hidden('tax_group_id', $order->tax_group_id);
        }
 
        end_outer_table(1); // outer table
@@ -435,10 +438,12 @@ 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;
                hidden('stock_id', $_POST['stock_id']);
                label_cell($_POST['stock_id']);
-               label_cell($order->line_items[$line_no]->item_description, "nowrap");
+               text_cells(null,'item_description', null, 45, 150);
+               //label_cell($order->line_items[$line_no]->item_description, "nowrap");
            $Ajax->activate('items_table');
        }
        else    // prepare new line
@@ -571,6 +576,7 @@ function check_qoh($order)
 {
        $msg = '';
        foreach($order->line_items as $line_no => $line) {
+               if (!is_inventory_item($line['stock_id'])) continue;
                $qoh = get_qoh_on_date($line->stock_id, $_POST['Location'], $_POST['OrderDate']);
                if ($line->qty_dispatched > $qoh)       {
                        $msg .= $line->stock_id . " - " . $line->item_description . ": " .