X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fview%2Fview_supp_invoice.php;h=d8417a32960478ff912626f5e811bdc950777fbf;hb=0a6988eadb9d779a9c49c79772c1c2a3e19b6b05;hp=ac8432dc2ecc4d6a26aebabb874c28dde6f0c75f;hpb=4e436722cb991b7273c08bdc1dc53b5390772972;p=fa-stable.git

diff --git a/purchasing/view/view_supp_invoice.php b/purchasing/view/view_supp_invoice.php
index ac8432dc..d8417a32 100644
--- a/purchasing/view/view_supp_invoice.php
+++ b/purchasing/view/view_supp_invoice.php
@@ -1,26 +1,27 @@
 <?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.  
-    See the License here <http://www.gnu.org/licenses/agpl-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 . "/includes/ui/items_cart.inc");
 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(_("View Supplier Invoice"), true, false, "", $js);
+page(_($help_context = "View Supplier Invoice"), true, false, "", $js);
 
 if (isset($_GET["trans_no"]))
 {
@@ -31,17 +32,19 @@ elseif (isset($_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);
 
+if (!empty($SysPrefs->prefs['company_logo_on_views']))
+	company_logo_on_view();
+
 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'");
@@ -53,7 +56,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();
-comments_display_row(20, $trans_no);
+comments_display_row(ST_SUPPINVOICE, $trans_no);
 
 end_table(1);
 
@@ -62,20 +65,25 @@ $total_grn = display_grn_items($supp_trans, 2);
 
 $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(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());
 
-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);
 
-is_voided_display(20, $trans_no, _("This invoice has been voided."));
+$voided = is_voided_display(ST_SUPPINVOICE, $trans_no, _("This invoice has been voided."));
+
+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);
+end_page(true, false, false, ST_SUPPINVOICE, $trans_no);
 
-?>
\ No newline at end of file