Merging version 2.1 RC to main trunk.

[fa-stable.git] / purchasing / supplier_credit.php

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index cb737896a1c07ac85d7366e8e640c312ef5ed71e..fc16875ce1b1214053447a7cdc30d8ad56c7ac94 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    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>.
+***********************************************************************/
 $path_to_root="..";
 
 include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
@@ -50,7 +59,8 @@ if (isset($_GET['AddedID']))
        display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Credit Note")), 1);
 
     hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Credit Note"), "New=1");
-
+       hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
+       
        display_footer_exit();
 }
 
@@ -67,6 +77,10 @@ if (isset($_GET['New']))
 
        $_SESSION['supp_trans'] = new supp_trans;
        $_SESSION['supp_trans']->is_invoice = false;
+       if (isset($_GET['invoice_no']))
+       {
+               $_SESSION['supp_trans']->supp_reference = $_POST['invoice_no'] = $_GET['invoice_no'];
+       }
 }
 
 function clear_fields()
@@ -197,7 +211,10 @@ function handle_commit_credit_note()
        if (!check_data())
                return;
 
-       $invoice_no = add_supp_invoice($_SESSION['supp_trans']);
+       if (isset($_POST['invoice_no']))
+               $invoice_no = add_supp_invoice($_SESSION['supp_trans'], $_POST['invoice_no']);
+       else
+               $invoice_no = add_supp_invoice($_SESSION['supp_trans']);
 
     $_SESSION['supp_trans']->clear_items();
     unset($_SESSION['supp_trans']);
@@ -285,35 +302,41 @@ if ($id4 != -1)
        $Ajax->activate('gl_items');
        $Ajax->activate('inv_tot');
 }
+if (isset($_POST['RefreshInquiry']))
+{
+       $Ajax->activate('grn_items');
+       $Ajax->activate('inv_tot');
+}
+
+if (isset($_POST['go']))
+{
+       $Ajax->activate('gl_items');
+       display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV);
+       $_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
+       $Ajax->activate('inv_tot');
+}
 
 
 //--------------------------------------------------------------------------------------------------
 
 start_form(false, true);
 
-start_table("$table_style width=98%", 8);
-echo "<tr><td valign=center>"; // outer table
-
-echo "<center>";
-
 invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
        display_error('No supplier found for entered search text');
 else {
-       echo "</td></tr><tr><td valign=center>"; // outer table
+       start_outer_table("$table_style2 width=98%", 5);
 
        $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
 
        $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
 
-       echo "</td></tr><tr><td align=center colspan=2>"; // outer table
        div_start('inv_tot');
        invoice_totals($_SESSION['supp_trans']);
        div_end();
-}
-echo "</td></tr>";
 
-end_table(1); // outer table
+       end_outer_table(0, false);
+}
 
 if ($id != -1)
 {
@@ -324,9 +347,9 @@ if ($id != -1)
 if (get_post('AddGLCodeToTrans'))
        $Ajax->activate('inv_tot');
 
-
+br();
 submit_center('PostCreditNote', _("Enter Credit Note"), true, '', true);
-echo "<br><br>";
+br();
 
 end_form();
 end_page();