X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=5ec8dfcb1d22a06769c527efd1f46ba6196f0fe0;hb=2a0f29497517eca1cde8b2832da5761edefb2268;hp=6665f468cf631d1384609d55c8a7bbafdc6edc08;hpb=e91772a2716825a6aeb358d1defba47d5f3892c1;p=fa-stable.git
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 6665f468..5ec8dfcb 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -58,7 +58,7 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0)
{
display_warning(_("For Part :").$item['stock_id']. " "
- . _("This item is already on this order. You have been warned."));
+ . _("This item is already on this document. You have been warned."));
break;
}
}
@@ -89,7 +89,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
$order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'],
$myrow['factor']);
- if ($order->trans_type != 30)
+ if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE)
{
$order->dimension_id = $myrow['dimension_id'];
$order->dimension2_id = $myrow['dimension2_id'];
@@ -111,10 +111,10 @@ 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 == 10) {
+ if ($order->trans_type == ST_SALESINVOICE) {
$order->due_date = get_invoice_duedate($customer_id, $order->document_date);
if ($order->pos != -1)
- $order->cash = date_diff($order->due_date, Today(), 'd')<2;
+ $order->cash = date_diff2($order->due_date, Today(), 'd')<2;
}
if($order->cash ) {
if($order->pos != -1) {
@@ -131,7 +131,7 @@ 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;
+ global $table_style, $path_to_root, $SysPrefs;
display_heading($title);
@@ -154,25 +154,42 @@ 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)
{
$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 (!$SysPrefs->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 {
+ 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);
@@ -205,6 +222,12 @@ function display_order_summary($title, &$order, $editable_items=false)
"nowrap align=right", 2);
end_table();
+ if ($has_marked) {
+ 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();
}
@@ -212,7 +235,7 @@ function display_order_summary($title, &$order, $editable_items=false)
function display_order_header(&$order, $editable, $date_text, $display_tax_group=false)
{
- global $table_style, $Ajax;
+ global $table_style, $Ajax, $SysPrefs;
start_outer_table("width=80% $table_style");
@@ -224,18 +247,19 @@ 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;
+ //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);
}
}
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))
{
@@ -243,7 +267,7 @@ 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)) ||
@@ -275,7 +299,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
$Ajax->activate('delivery');
$Ajax->activate('cash');
} else {
- if ($order->trans_type == 10)
+ if ($order->trans_type == ST_SALESINVOICE)
{
$_POST['delivery_date'] = $order->due_date;
$Ajax->activate('delivery_date');
@@ -317,23 +341,19 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
}
}
- if ($order->trans_type != 30) {
- ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
- }
+ ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
if (!is_company_currency($order->customer_currency))
{
table_section(2);
- div_start('currency');
label_row(_("Customer Currency:"), $order->customer_currency);
exchange_rate_display($order->customer_currency, get_company_currency(),
($editable ? $_POST['OrderDate'] : $order->document_date));
- div_end();
}
table_section(3);
- if ($order->trans_type == 10 && $order->pos != -1) {
+ if ($order->trans_type == ST_SALESINVOICE && $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
@@ -346,7 +366,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
$_POST['Location'] = $order->Location = $paym['pos_location'];
$order->location_name = $paym['location_name'];
}
- check_qoh($order);
+ $Ajax->activate('items_table');
$Ajax->activate('delivery');
set_focus($order->pos == -1 ? 'delivery_date' : 'account');
}
@@ -382,14 +402,15 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
&& (get_base_sales_type()>0)) {
$change_prices = 1;
}
- $Ajax->activate('currency');
- if ($order->trans_type == 10) {
+ $Ajax->activate('_ex_rate');
+ if ($order->trans_type == ST_SALESINVOICE) {
$_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), 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)
+ 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)
@@ -520,6 +541,7 @@ function display_delivery_details(&$order)
div_start('delivery');
if (get_post('cash', 0)) { // 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);
@@ -530,16 +552,21 @@ function display_delivery_details(&$order)
end_table();
} 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==ST_SALESQUOTE)
+ {
+ $title = _("Quotation Delivery Details");
+ $delname = _("Valid until").':';
+ }
else
{
$title = _("Order Delivery Details");
@@ -552,10 +579,11 @@ function display_delivery_details(&$order)
locations_list_row(_("Deliver from Location:"), 'Location', null,
false, true);
if (list_updated('Location'))
- check_qoh($order);
-// $_POST['delivery_date'] = get_post('delivery_date', $order->due_date);
+ $Ajax->activate('items_table');
+
+
date_row($delname, 'delivery_date',
- $order->trans_type==30 ? _('Enter requested day of delivery') : '');
+ $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,
_('Additional identifier for delivery e.g. name of receiving person'));
@@ -580,23 +608,4 @@ function display_delivery_details(&$order)
div_end();
}
-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 . ": " .
- _("Quantity On Hand") . " = "
- . number_format2($qoh, get_qty_dec($line->stock_id)) . '
';
- }
- }
- if (strlen($msg)) {
- display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:")
- . '
'. $msg);
- return false;
- }
- return true;
-}
?>
\ No newline at end of file