projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ab81e5f462688d7864db8ba01a2ebb8c2f815ebf..5ef26f8cad0e7b3386da24c41a4cf16b772416f4 100644
(file)
--- a/
sales/includes/ui/sales_order_ui.inc
+++ b/
sales/includes/ui/sales_order_ui.inc
@@
-167,7
+167,8
@@
function display_order_summary($title, &$order, $editable_items=false)
view_stock_status_cell($stock_item->stock_id);
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)
qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id));
if ($order->trans_no!=0)
@@
-437,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['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']);
$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
$Ajax->activate('items_table');
}
else // prepare new line
@@
-573,6
+576,7
@@
function check_qoh($order)
{
$msg = '';
foreach($order->line_items as $line_no => $line) {
{
$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 . ": " .
$qoh = get_qoh_on_date($line->stock_id, $_POST['Location'], $_POST['OrderDate']);
if ($line->qty_dispatched > $qoh) {
$msg .= $line->stock_id . " - " . $line->item_description . ": " .