[0004904] Customer Credit Note: fixed invalid inventory GL postings for service items.

[fa-stable.git] / purchasing / view / view_supp_credit.php

diff --git a/purchasing/view/view_supp_credit.php b/purchasing/view/view_supp_credit.php
index 64ed9b8cd812e5ec37e57c39ff25c823dea1e9ee..ab0313541bf38e1da1a01921d71927edd64f75da 100644 (file)
--- a/purchasing/view/view_supp_credit.php
+++ b/purchasing/view/view_supp_credit.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 1;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       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/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
 
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 include_once($path_to_root . "/includes/session.inc");
@@ -9,9 +18,9 @@ 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 Credit Note"), true, false, "", $js);
+page(_($help_context = "View Supplier Credit Note"), true, false, "", $js);
 
 if (isset($_GET["trans_no"]))
 {
@@ -22,14 +31,13 @@ elseif (isset($_POST["trans_no"]))
        $trans_no = $_POST["trans_no"];
 }
 
-$supp_trans = new supp_trans();
-$supp_trans->is_invoice = false;
+$supp_trans = new supp_trans(ST_SUPPCREDIT);
 
-read_supp_invoice($trans_no, 21, $supp_trans);
+read_supp_invoice($trans_no, ST_SUPPCREDIT, $supp_trans);
 
-display_heading(_("SUPPLIER CREDIT NOTE") . " # " . $trans_no);
+display_heading("<font color=red>" . _("SUPPLIER CREDIT NOTE") . " # " . $trans_no . "</font>");
 echo "<br>";
-start_table($table_style2);
+start_table(TABLESTYLE, "width='95%'");
 start_row();
 label_cells(_("Supplier"), $supp_trans->supplier_name, "class='tableheader2'");
 label_cells(_("Reference"), $supp_trans->reference, "class='tableheader2'");
@@ -40,7 +48,7 @@ label_cells(_("Invoice Date"), $supp_trans->tran_date, "class='tableheader2'");
 label_cells(_("Due Date"), $supp_trans->due_date, "class='tableheader2'");
 label_cells(_("Currency"), get_supplier_currency($supp_trans->supplier_id), "class='tableheader2'");
 end_row();
-comments_display_row(21, $trans_no);
+comments_display_row(ST_SUPPCREDIT, $trans_no);
 end_table(1);
 
 $total_gl = display_gl_items($supp_trans, 3);
@@ -48,25 +56,24 @@ $total_grn = display_grn_items($supp_trans, 2);
 
 $display_sub_tot = number_format2($total_gl+$total_grn,user_price_dec());
 
-start_table("$table_style width=95%");
-label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width=17%");
+start_table(TABLESTYLE, "width='95%'");
+label_row(_("Sub Total"), $display_sub_tot, "align=right", "nowrap align=right width='17%'");
 
-$tax_items = get_supp_invoice_tax_items(21, $trans_no);
+$tax_items = get_trans_tax_details(ST_SUPPCREDIT, $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 CREDIT NOTE"), $display_total, "colspan=1 align=right", "nowrap align=right");
+label_row("<font color=red>" . _("TOTAL CREDIT NOTE") . "</font", "<font color=red>$display_total</font>", 
+       "colspan=1 align=right", "nowrap align=right");
 
 end_table(1);
 
-$voided = is_voided_display(21, $trans_no, _("This credit note has been voided."));
+$voided = is_voided_display(ST_SUPPCREDIT, $trans_no, _("This credit note has been voided."));
 
 if (!$voided)
 {
-       $tax_total = 0; // ??????
-       display_allocations_from(payment_person_types::supplier(), $supp_trans->supplier_id, 21, $trans_no, -($supp_trans->ov_amount + $tax_total));
+       display_allocations_from(PT_SUPPLIER, $supp_trans->supplier_id, ST_SUPPCREDIT, $trans_no, -($supp_trans->ov_amount + $supp_trans->ov_gst));
 }
 
-end_page(true);
+end_page(true, false, false, ST_SUPPCREDIT, $trans_no);
 
-?>
\ No newline at end of file