projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added 'View Attachments' if any in all popup view windows
[fa-stable.git]
/
purchasing
/
view
/
view_grn.php
diff --git
a/purchasing/view/view_grn.php
b/purchasing/view/view_grn.php
index 9a8cbc7fb6b5233c822103ecf62083398a8fcb4b..8336ff2c264b82d5e922123e30391a21669b1ae2 100644
(file)
--- a/
purchasing/view/view_grn.php
+++ b/
purchasing/view/view_grn.php
@@
-9,8
+9,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
2
;
-$path_to_root
=
"../..";
+$page_security =
'SA_SUPPTRANSVIEW'
;
+$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");
@@
-18,7
+18,7
@@
include($path_to_root . "/includes/session.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
-page(_("View Purchase Order Delivery"), true, false, "", $js);
+page(_(
$help_context =
"View Purchase Order Delivery"), true, false, "", $js);
include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
@@
-58,7
+58,7
@@
foreach ($purchase_order->line_items as $stock_item)
$dec = get_qty_dec($stock_item->stock_id);
qty_cell($stock_item->qty_received, false, $dec);
label_cell($stock_item->units);
$dec = get_qty_dec($stock_item->stock_id);
qty_cell($stock_item->qty_received, false, $dec);
label_cell($stock_item->units);
- amount_cell($stock_item->price);
+ amount_
decimal_
cell($stock_item->price);
amount_cell($line_total);
qty_cell($stock_item->qty_inv, false, $dec);
end_row();
amount_cell($line_total);
qty_cell($stock_item->qty_inv, false, $dec);
end_row();
@@
-72,8
+72,8
@@
label_row(_("Total Excluding Tax/Shipping"), $display_total,
end_table(1);
end_table(1);
-is_voided_display(
25
, $_GET['trans_no'], _("This delivery has been voided."));
+is_voided_display(
ST_SUPPRECEIVE
, $_GET['trans_no'], _("This delivery has been voided."));
-end_page(true);
+end_page(true
, false, false, ST_SUPPRECEIVE, $_GET['trans_no']
);
?>
?>