X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_credit.php;h=fc16875ce1b1214053447a7cdc30d8ad56c7ac94;hb=f338f2d7ea4c0de20a53b83be6442d792735e5e1;hp=8ee6eff78945ec935104bff7a5a9c02f1187834c;hpb=5fd0dc3121923fccc027d76a5abd617fa8f524e5;p=fa-stable.git

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 8ee6eff7..fc16875c 100644
--- 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()
@@ -79,7 +93,7 @@ function clear_fields()
 	unset($_POST['amount']);
 	unset($_POST['memo_']);
 	unset($_POST['AddGLCodeToTrans']);
-	$Ajax->activate('gl_ctrls');
+	$Ajax->activate('gl_items');
 	set_focus('gl_code');
 }
 //------------------------------------------------------------------------------------------------
@@ -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']);
@@ -231,82 +248,98 @@ function check_item_data($n)
 	return true;
 }
 
-//-----------------------------------------------------------------------------------------
-
-$id = find_submit('grn_item_id');
-if ($id != -1)
+function commit_item_data($n)
 {
-	if (check_item_data($id))
+	if (check_item_data($n))
 	{
 		$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], "");
+		$_SESSION['supp_trans']->add_grn_to_trans($n,
+    		$_POST['po_detail_item'.$n], $_POST['item_code'.$n],
+    		$_POST['item_description'.$n], $_POST['qty_recd'.$n],
+    		$_POST['prev_quantity_inv'.$n], input_num('This_QuantityCredited'.$n),
+    		$_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+    		$_POST['std_cost_unit'.$n], "");
 	}
 }
 
-//--------------------------------------------------------------------------------------------------
-$id = find_submit('Delete');
+//-----------------------------------------------------------------------------------------
+
+$id = find_submit('grn_item_id');
 if ($id != -1)
 {
-	$_SESSION['supp_trans']->remove_grn_from_trans($id);
+	commit_item_data($id);
+}
+
+if (isset($_POST['InvGRNAll']))
+{
+   	foreach($_POST as $postkey=>$postval )
+    {
+		if (strpos($postkey, "qty_recd") === 0)
+		{
+			$id = substr($postkey, strlen("qty_recd"));
+			$id = (int)$id;
+			commit_item_data($id);
+		}
+    }
+}	
+
+
+//--------------------------------------------------------------------------------------------------
+$id3 = find_submit('Delete');
+if ($id3 != -1)
+{
+	$_SESSION['supp_trans']->remove_grn_from_trans($id3);
 	$Ajax->activate('grn_items');
-	$Ajax->activate('grn_table');
 	$Ajax->activate('inv_tot');
 }
 
-$id = find_submit('Delete2');
-if ($id != -1)
+$id4 = find_submit('Delete2');
+if ($id4 != -1)
 {
-	$_SESSION['supp_trans']->remove_gl_codes_from_trans($id);
+	$_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
 	clear_fields();
 	$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);
+}
 
-$id = find_submit('grn_item_id');
 if ($id != -1)
 {
-	$Ajax->activate('grn_table');
 	$Ajax->activate('grn_items');
 	$Ajax->activate('inv_tot');
 }
@@ -314,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();