Small cleanup to branch name length in input form and printouts.
[fa-stable.git] / sales / includes / ui / sales_order_ui.inc
index 841294de4ec3eb03b97c46405454cb844e59ace4..d60431bf74bf680a292f4b47ed9920666326a924 100644 (file)
@@ -72,6 +72,8 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $des
 
 function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 {
+       global $SysPrefs;
+       
        $ret_error = "";
 
        $myrow = get_customer_to_order($customer_id);
@@ -116,14 +118,19 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 
        $order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
                $address);
-       if ($order->trans_type == ST_SALESINVOICE || $order->trans_type == ST_SALESORDER) {
+       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;
 }
 
@@ -131,7 +138,6 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 
 function display_order_summary($title, &$order, $editable_items=false)
 {
-       global $SysPrefs;
 
        display_heading($title);
 
@@ -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,22 +171,10 @@ function display_order_summary($title, &$order, $editable_items=false)
                $qoh_msg = '';
                if (!$editable_items || $id != $line_no)
                {
-                       if (!$SysPrefs->allow_negative_stock() && is_inventory_item($stock_item->stock_id)) {
-                               $qoh = get_qoh_on_date($stock_item->stock_id, 
-                                       $_POST['Location'], $_POST['delivery_date']);
-                               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)) . '<br>';
-                                       $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);
 
@@ -238,12 +233,9 @@ function display_order_summary($title, &$order, $editable_items=false)
        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 && !$SysPrefs->allow_negative_stock())
-                       display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:")
-                               . '<br>'. $qoh_msg);
-       }
+
     div_end();
 }
 
@@ -366,7 +358,6 @@ function display_order_header(&$order, $editable, $date_text)
                        $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.");
-               
                }
        }
 
@@ -374,10 +365,10 @@ function display_order_header(&$order, $editable, $date_text)
 
        table_section(2);
 
-       if (!is_company_currency($order->customer_currency))
+       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));
        }
 
@@ -386,7 +377,8 @@ function display_order_header(&$order, $editable, $date_text)
        label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 
        table_section(3);
-       if ($order->pos['cash_sale'] || $order->pos['credit_sale']) {
+       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');
@@ -402,11 +394,10 @@ function display_order_header(&$order, $editable, $date_text)
                $paymcat = !$order->pos['cash_sale'] ? PM_CREDIT : 
                        (!$order->pos['credit_sale'] ? PM_CASH : PM_ANY);
                // all terms are available for SO
-               sale_payment_list_cells(_('Payment:'), 'payment', 
-                       (in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)) 
-                       ? PM_ANY : $paymcat), null);
+               $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']);
+               label_cells(_('Payment:'), $order->payment_terms['terms'], "class='label'");
        }
 
        if($editable) {
@@ -514,7 +505,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
        }
        else    // prepare new line
        {
-               sales_items_list_cells(null,'stock_id', null, false, true);
+               sales_items_list_cells(null,'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
                            $Ajax->activate('units');
@@ -588,6 +579,7 @@ function display_delivery_details(&$order)
                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)
                {
@@ -614,6 +606,14 @@ function display_delivery_details(&$order)
                table_section(1);
 
                locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
+               if ($order->payment_terms['days_before_due'] < 0)
+               {
+                       $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');
 
@@ -621,7 +621,7 @@ function display_delivery_details(&$order)
                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, 40, 40,
+               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,
@@ -642,4 +642,3 @@ function display_delivery_details(&$order)
        div_end();
 }
 
-?>
\ No newline at end of file