projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Strict SQL related error when background journal transaction was saved. Fixed.
[fa-stable.git]
/
purchasing
/
view
/
view_supp_invoice.php
diff --git
a/purchasing/view/view_supp_invoice.php
b/purchasing/view/view_supp_invoice.php
index ae97355f8caf63ffdb2f50505c6b9aae8ccb46e0..4f72076febbd2ca341dc1c6f09cedac31bfbe868 100644
(file)
--- a/
purchasing/view/view_supp_invoice.php
+++ b/
purchasing/view/view_supp_invoice.php
@@
-13,12
+13,13
@@
$page_security = 'SA_SUPPTRANSVIEW';
$path_to_root = "../..";
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
$path_to_root = "../..";
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
+include_once($path_to_root . "/includes/ui/items_cart.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
$js = "";
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
$js = "";
-if ($use_popup_windows)
+if ($
SysPrefs->
use_popup_windows)
$js .= get_js_open_window(900, 500);
page(_($help_context = "View Supplier Invoice"), true, false, "", $js);
$js .= get_js_open_window(900, 500);
page(_($help_context = "View Supplier Invoice"), true, false, "", $js);
@@
-31,8
+32,7
@@
elseif (isset($_POST["trans_no"]))
$trans_no = $_POST["trans_no"];
}
$trans_no = $_POST["trans_no"];
}
-$supp_trans = new supp_trans();
-$supp_trans->is_invoice = true;
+$supp_trans = new supp_trans(ST_SUPPINVOICE);
read_supp_invoice($trans_no, ST_SUPPINVOICE, $supp_trans);
read_supp_invoice($trans_no, ST_SUPPINVOICE, $supp_trans);
@@
-41,7
+41,7
@@
$supplier_curr_code = get_supplier_currency($supp_trans->supplier_id);
display_heading(_("SUPPLIER INVOICE") . " # " . $trans_no);
echo "<br>";
display_heading(_("SUPPLIER INVOICE") . " # " . $trans_no);
echo "<br>";
-start_table(
"$table_style width=95%");
+start_table(
TABLESTYLE, "width='95%'");
start_row();
label_cells(_("Supplier"), $supp_trans->supplier_name, "class='tableheader2'");
label_cells(_("Reference"), $supp_trans->reference, "class='tableheader2'");
start_row();
label_cells(_("Supplier"), $supp_trans->supplier_name, "class='tableheader2'");
label_cells(_("Reference"), $supp_trans->reference, "class='tableheader2'");
@@
-62,20
+62,25
@@
$total_grn = display_grn_items($supp_trans, 2);
$display_sub_tot = number_format2($total_gl+$total_grn,user_price_dec());
$display_sub_tot = number_format2($total_gl+$total_grn,user_price_dec());
-start_table(
"width=95% $table_style
");
-label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width=
15%
");
+start_table(
TABLESTYLE, "width='95%'
");
+label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width=
'15%'
");
$tax_items = get_trans_tax_details(ST_SUPPINVOICE, $trans_no);
display_supp_trans_tax_details($tax_items, 1);
$display_total = number_format2($supp_trans->ov_amount + $supp_trans->ov_gst,user_price_dec());
$tax_items = get_trans_tax_details(ST_SUPPINVOICE, $trans_no);
display_supp_trans_tax_details($tax_items, 1);
$display_total = number_format2($supp_trans->ov_amount + $supp_trans->ov_gst,user_price_dec());
-label_row(_("TOTAL INVOICE"), $display_total, "colspan=1 align=right", "nowrap align=right");
+label_row(_("TOTAL INVOICE")
.' ('.$supplier_curr_code.')'
, $display_total, "colspan=1 align=right", "nowrap align=right");
end_table(1);
end_table(1);
-is_voided_display(ST_SUPPINVOICE, $trans_no, _("This invoice has been voided."));
+
$voided =
is_voided_display(ST_SUPPINVOICE, $trans_no, _("This invoice has been voided."));
-end_page(true);
+if (!$voided)
+{
+ display_allocations_to(PT_SUPPLIER, $supp_trans->supplier_id, ST_SUPPINVOICE, $trans_no,
+ ($supp_trans->ov_amount + $supp_trans->ov_gst));
+}
+
+end_page(true, false, false, ST_SUPPINVOICE, $trans_no);
-?>
\ No newline at end of file