X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=8ee6eff78945ec935104bff7a5a9c02f1187834c;hb=827b3428d4c8c473cb637ac9df6621f4a0ba6f9a;hp=c16211be0771282ba03f4710d367cc7c96739e19;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index c16211be..8ee6eff7 100644
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -23,6 +23,18 @@ page(_("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'])) 
@@ -57,6 +69,63 @@ if (isset($_GET['New']))
 	$_SESSION['supp_trans']->is_invoice = false;
 }
 
+function clear_fields()
+{
+	global $Ajax;
+	
+	unset($_POST['gl_code']);
+	unset($_POST['dimension_id']);
+	unset($_POST['dimension2_id']);
+	unset($_POST['amount']);
+	unset($_POST['memo_']);
+	unset($_POST['AddGLCodeToTrans']);
+	$Ajax->activate('gl_ctrls');
+	set_focus('gl_code');
+}
+//------------------------------------------------------------------------------------------------
+//	GL postings are often entered in the same form to two accounts
+//  so fileds are cleared only on user demand.
+//
+if (isset($_POST['ClearFields']))
+{
+	clear_fields();
+}
+
+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");
+	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."));
+		set_focus('gl_code');
+		$input_error = true;
+	}
+	else
+	{
+		$myrow = db_fetch_row($result);
+		$gl_act_name = $myrow[1];
+		if (!check_num('amount'))
+		{
+			display_error(_("The amount entered is not numeric. This line cannot be added to the transaction."));
+			set_focus('amount');
+			$input_error = true;
+		}
+	}
+
+	if ($input_error == false)
+	{
+		$_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name,
+			$_POST['dimension_id'], $_POST['dimension2_id'], 
+			input_num('amount'), $_POST['memo_']);
+		set_focus('gl_code');
+	}
+}
+
+
 //---------------------------------------------------------------------------------------------------
 
 function check_data()
@@ -143,32 +212,110 @@ if (isset($_POST['PostCreditNote']))
 	handle_commit_credit_note();
 }
 
+function check_item_data($n)
+{
+	if (!check_num('This_QuantityCredited'.$n, 0))
+	{
+		display_error(_("The quantity to credit must be numeric and greater than zero."));
+		set_focus('This_QuantityCredited'.$n);
+		return false;
+	}
+
+	if (!check_num('ChgPrice'.$n, 0))
+	{
+		display_error(_("The price is either not numeric or negative."));
+		set_focus('ChgPrice'.$n);
+		return false;
+	}
+
+	return true;
+}
+
+//-----------------------------------------------------------------------------------------
+
+$id = find_submit('grn_item_id');
+if ($id != -1)
+{
+	if (check_item_data($id))
+	{
+		$complete = False;
+
+		//$_SESSION['supp_trans']->add_grn_to_trans($_POST['GRNNumber'],
+    	//	$_POST['po_detail_item'], $_POST['item_code'],
+    	//	$_POST['item_description'], $_POST['qty_recd'],
+    	//	$_POST['prev_quantity_inv'], $_POST['This_QuantityCredited'],
+    	//	$_POST['order_price'], $_POST['ChgPrice'], $complete,
+    	//	$_POST['std_cost_unit'], $_POST['gl_code']);
+		$_SESSION['supp_trans']->add_grn_to_trans($id,
+    		$_POST['po_detail_item'.$id], $_POST['item_code'.$id],
+    		$_POST['item_description'.$id], $_POST['qty_recd'.$id],
+    		$_POST['prev_quantity_inv'.$id], input_num('This_QuantityCredited'.$id),
+    		$_POST['order_price'.$id], input_num('ChgPrice'.$id), $complete,
+    		$_POST['std_cost_unit'.$id], "");
+	}
+}
+
+//--------------------------------------------------------------------------------------------------
+$id = find_submit('Delete');
+if ($id != -1)
+{
+	$_SESSION['supp_trans']->remove_grn_from_trans($id);
+	$Ajax->activate('grn_items');
+	$Ajax->activate('grn_table');
+	$Ajax->activate('inv_tot');
+}
+
+$id = find_submit('Delete2');
+if ($id != -1)
+{
+	$_SESSION['supp_trans']->remove_gl_codes_from_trans($id);
+	clear_fields();
+	$Ajax->activate('gl_items');
+	$Ajax->activate('inv_tot');
+}
+
+
 //--------------------------------------------------------------------------------------------------
 
 start_form(false, true);
 
-start_table("$table_style width=80%", 8);
+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
 
-echo "</td></tr><tr><td valign=center>"; // outer table
+	$total_grn_value = display_grn_items($_SESSION['supp_trans'], 1);
 
-$total_grn_value = display_grn_items($_SESSION['supp_trans']);
+	$total_gl_value = display_gl_items($_SESSION['supp_trans'], 1);
 
-$total_gl_value = display_gl_items($_SESSION['supp_trans']);
+	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>";
 
-echo "</td></tr><tr><td align=center colspan=2>"; // outer table
+end_table(1); // outer table
 
-invoice_totals($_SESSION['supp_trans']);
+$id = find_submit('grn_item_id');
+if ($id != -1)
+{
+	$Ajax->activate('grn_table');
+	$Ajax->activate('grn_items');
+	$Ajax->activate('inv_tot');
+}
 
-echo "</td></tr>";
+if (get_post('AddGLCodeToTrans'))
+	$Ajax->activate('inv_tot');
 
-end_table(1); // outer table
 
-submit_center('PostCreditNote', _("Enter Credit Note"));
+submit_center('PostCreditNote', _("Enter Credit Note"), true, '', true);
 echo "<br><br>";
 
 end_form();