X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=faa2a3c8e2c2283b7be83a6ad7a0e7efba442fdf;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=2170595a986968b819ff621cb729f4906cc8c4d4;hpb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;p=fa-stable.git
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 2170595a..faa2a3c8 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -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);
}
- if ($order->payment_terms['cash_sale']) {
+ 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 -$stock_item->qty_done) > $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);
@@ -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:")
- . '
'. $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));
}
@@ -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');