X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=69ead86d7e8ea2c6c2b6c77577a74f4d1651c66a;hb=5f06887dedd4d14701864fb72994d7e20352086d;hp=00a8cd5eaac2e321083c103440dea82a72de4021;hpb=53ce24049be7e47179b98f69af45352001855f50;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 00a8cd5e..69ead86d 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -1,20 +1,19 @@
 <?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>.
 ***********************************************************************/
-$path_to_root="..";
+$page_security = 'SA_SUPPLIERCREDIT';
+$path_to_root = "..";
 
 include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
 
-$page_security=5;
-
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/data_checks.inc");
@@ -26,30 +25,18 @@ if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
 	$js .= get_js_date_picker();
-page(_("Supplier Credit Note"), false, false, "", $js);
+page(_($help_context = "Supplier Credit Note"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------
 
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
-//---------------------------------------------------------------------------------------------------------------
-if ($ret = context_restore()) {
- // return from supplier editor
-	copy_from_trans($_SESSION['supp_trans']);
-	if(isset($ret['supplier_id']))
-		$_POST['supplier_id'] = $ret['supplier_id'];
-}
-if (isset($_POST['_supplier_id_editor'])) {
-	copy_to_trans($_SESSION['supp_trans']);
-	context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans');
-}
-
 //---------------------------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
 {
 	$invoice_no = $_GET['AddedID'];
-	$trans_type = 21;
+	$trans_type = ST_SUPPCREDIT;
 
 
     echo "<center>";
@@ -110,8 +97,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 	$Ajax->activate('gl_items');
 	$input_error = false;
 
-	$sql = "SELECT account_code, account_name FROM ".TB_PREF."chart_master WHERE account_code='" . $_POST['gl_code'] . "'";
-	$result = db_query($sql,"get account information");
+	$result = get_gl_account_info($_POST['gl_code']);
 	if (db_num_rows($result) == 0)
 	{
 		display_error(_("The account code entered is not a valid code, this line cannot be added to the transaction."));
@@ -130,6 +116,12 @@ if (isset($_POST['AddGLCodeToTrans'])){
 		}
 	}
 
+	if (!is_tax_gl_unique(get_post('gl_code'))) {
+   		display_error(_("Cannot post to GL account used by more than one tax type."));
+		set_focus('gl_code');
+   		$input_error = true;
+	}
+
 	if ($input_error == false)
 	{
 		$_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name,
@@ -144,7 +136,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 
 function check_data()
 {
-	global $total_grn_value, $total_gl_value;
+	global $total_grn_value, $total_gl_value, $Refs;
 	
 	if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
 	{
@@ -153,21 +145,21 @@ function check_data()
 		return false;
 	}
 
-	if (!references::is_valid($_SESSION['supp_trans']->reference)) 
+	if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
 	{
 		display_error(_("You must enter an credit note reference."));
 		set_focus('reference');
 		return false;
 	}
 
-	if (!is_new_reference($_SESSION['supp_trans']->reference, 21)) 
+	if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPCREDIT)) 
 	{
 		display_error(_("The entered reference is already in use."));
 		set_focus('reference');
 		return false;
 	}
 
-	if (!references::is_valid($_SESSION['supp_trans']->supp_reference)) 
+	if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference)) 
 	{
 		display_error(_("You must enter a supplier's credit note reference."));
 		set_focus('supp_reference');
@@ -311,14 +303,15 @@ if (isset($_POST['RefreshInquiry']))
 if (isset($_POST['go']))
 {
 	$Ajax->activate('gl_items');
-	display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), true, true);
+	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_form();
 
 invoice_header($_SESSION['supp_trans']);
 if ($_POST['supplier_id']=='') 
@@ -347,7 +340,7 @@ if (get_post('AddGLCodeToTrans'))
 	$Ajax->activate('inv_tot');
 
 br();
-submit_center('PostCreditNote', _("Enter Credit Note"), true, '', true);
+submit_center('PostCreditNote', _("Enter Credit Note"), true, '', 'default');
 br();
 
 end_form();