projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed session name to avoid conflicts during multiuser debugging.
[fa-stable.git]
/
purchasing
/
view
/
view_po.php
diff --git
a/purchasing/view/view_po.php
b/purchasing/view/view_po.php
index 878c59af80d042939ddc7efb4f2c8dd2e30cee9c..144192df7f1021a43d5a9f40d0308352648c300b 100644
(file)
--- a/
purchasing/view/view_po.php
+++ b/
purchasing/view/view_po.php
@@
-6,11
+6,15
@@
$path_to_root="../..";
include($path_to_root . "/purchasing/includes/po_class.inc");
include($path_to_root . "/includes/session.inc");
include($path_to_root . "/purchasing/includes/po_class.inc");
include($path_to_root . "/includes/session.inc");
-page(_("View Purchase Order"), true);
-
include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
-if (!isset($_GET['trans_no']))
+$js = "";
+if ($use_popup_windows)
+ $js .= get_js_open_window(900, 500);
+page(_("View Purchase Order"), true, false, "", $js);
+
+
+if (!isset($_GET['trans_no']))
{
die ("<br>" . _("This page must be called with a purchase order number to review."));
}
{
die ("<br>" . _("This page must be called with a purchase order number to review."));
}
@@
-41,7
+45,7
@@
table_header($th);
$total = $k = 0;
$overdue_items = false;
$total = $k = 0;
$overdue_items = false;
-foreach ($purchase_order->line_items as $stock_item)
+foreach ($purchase_order->line_items as $stock_item)
{
$line_total = $stock_item->quantity * $stock_item->price;
{
$line_total = $stock_item->quantity * $stock_item->price;
@@
-52,21
+56,22
@@
foreach ($purchase_order->line_items as $stock_item)
{
start_row("class='overduebg'");
$overdue_items = true;
{
start_row("class='overduebg'");
$overdue_items = true;
- }
- else
+ }
+ else
{
alt_table_row_color($k);
}
label_cell($stock_item->stock_id);
label_cell($stock_item->item_description);
{
alt_table_row_color($k);
}
label_cell($stock_item->stock_id);
label_cell($stock_item->item_description);
- qty_cell($stock_item->quantity);
+ $dec = get_qty_dec($stock_item->stock_id);
+ qty_cell($stock_item->quantity, false, $dec);
label_cell($stock_item->units);
amount_cell($stock_item->price);
amount_cell($line_total);
label_cell($stock_item->req_del_date);
label_cell($stock_item->units);
amount_cell($stock_item->price);
amount_cell($line_total);
label_cell($stock_item->req_del_date);
- qty_cell($stock_item->qty_received);
- qty_cell($stock_item->qty_inv);
+ qty_cell($stock_item->qty_received
, false, $dec
);
+ qty_cell($stock_item->qty_inv
, false, $dec
);
end_row();
$total += $line_total;
end_row();
$total += $line_total;