projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed account auto-selection on Customer Payments page.
[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 c0c89e13bfdf67024cf8334cec7767df0634722e..4f72076febbd2ca341dc1c6f09cedac31bfbe868 100644
(file)
--- a/
purchasing/view/view_supp_invoice.php
+++ b/
purchasing/view/view_supp_invoice.php
@@
-1,26
+1,27
@@
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU
Affero General Public License,
- AGPL, as published by the Free Software Foundation, either version
-
3
of the License, or (at your option) any later version.
+ Released under the terms of the GNU
General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License here <http://www.gnu.org/licenses/
a
gpl-3.0.html>.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
***********************************************************************/
-$page_security =
1
;
-$path_to_root
=
"../..";
+$page_security =
'SA_SUPPTRANSVIEW'
;
+$path_to_root
=
"../..";
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
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);
$js .= get_js_open_window(900, 500);
-page(_("View Supplier Invoice"), true, false, "", $js);
+page(_(
$help_context =
"View Supplier Invoice"), true, false, "", $js);
if (isset($_GET["trans_no"]))
{
if (isset($_GET["trans_no"]))
{
@@
-31,17
+32,16
@@
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,
20
, $supp_trans);
+read_supp_invoice($trans_no,
ST_SUPPINVOICE
, $supp_trans);
$supplier_curr_code = get_supplier_currency($supp_trans->supplier_id);
display_heading(_("SUPPLIER INVOICE") . " # " . $trans_no);
echo "<br>";
$supplier_curr_code = get_supplier_currency($supp_trans->supplier_id);
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'");
@@
-53,7
+53,7
@@
label_cells(_("Due Date"), $supp_trans->due_date, "class='tableheader2'");
if (!is_company_currency($supplier_curr_code))
label_cells(_("Currency"), $supplier_curr_code, "class='tableheader2'");
end_row();
if (!is_company_currency($supplier_curr_code))
label_cells(_("Currency"), $supplier_curr_code, "class='tableheader2'");
end_row();
-comments_display_row(
20
, $trans_no);
+comments_display_row(
ST_SUPPINVOICE
, $trans_no);
end_table(1);
end_table(1);
@@
-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_
supp_invoice_tax_items(20
, $trans_no);
+$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());
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(20
, $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