X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=11cd376a9af97ad124208afa5ccda84d65c5cbf9;hb=902f1015d874c33bd7946b17de2ad80b4f2144b6;hp=28f7f33b982c9846f6e4f2e1759e751b901e1532;hpb=0517097815894f0221e3755a2d14612f69f72b86;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 28f7f33b..11cd376a 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security=5;
-$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_SUPPLIERINVOICE';
+$path_to_root = "..";
 
 include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
 
@@ -18,23 +27,10 @@ if ($use_date_picker)
 	$js .= get_js_date_picker();
 page(_("Enter Supplier Invoice"), 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'])) 
@@ -49,6 +45,8 @@ if (isset($_GET['AddedID']))
 
 	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
 
+	hyperlink_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"));
+
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
 
 	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no");
@@ -84,7 +82,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');
 }
 //------------------------------------------------------------------------------------------------
@@ -121,6 +119,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,
@@ -180,7 +184,11 @@ function check_data()
 		return false;
 	}
 
-	$sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id='" . $_SESSION['supp_trans']->supplier_id . "' AND supp_reference='" . $_POST['supp_reference'] . "'";
+	$sql = "SELECT Count(*) FROM ".TB_PREF."supp_trans WHERE supplier_id='" 
+		. $_SESSION['supp_trans']->supplier_id . "' AND supp_reference='" 
+		. $_POST['supp_reference'] 
+		. "' AND ov_amount!=0"; // ignore voided invoice references
+
 	$result=db_query($sql,"The sql to check for the previous entry of the same invoice failed");
 
 	$myrow = db_fetch_row($result);
@@ -265,12 +273,11 @@ 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))
 	{
-    	if (input_num('this_quantity_inv'.$id) >= ($_POST['qty_recd'.$id] - $_POST['prev_quantity_inv'.$id]))
+    	if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
     	{
     		$complete = true;
     	}
@@ -279,79 +286,58 @@ if ($id != -1)
     		$complete = false;
     	}
 
-		$_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_quantity_inv'.$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_quantity_inv'.$n),
+			$_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
+			$_POST['std_cost_unit'.$n], "");
 	}
 }
 
-//--------------------------------------------------------------------------------------------------
-$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');
+$id = find_submit('grn_item_id');
 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_style2 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 "<center>";
-
-	display_grn_items($_SESSION['supp_trans'], 1);
-	//display_grn_items_for_selection();
-	display_gl_items($_SESSION['supp_trans'], 1);
-	//display_gl_controls();
-
-	//echo "</td></tr><tr><td align=center colspan=2>"; // outer table
-	echo "<br>";
-	div_start('inv_tot');
-	invoice_totals($_SESSION['supp_trans']);
-	div_end();
+	commit_item_data($id);
 }
-echo "</td></tr>";
 
-end_table(); // outer table
+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);
+		}
+    }
+}	
 
-//-----------------------------------------------------------------------------------------
-$id = find_submit('grn_item_id');
-$id2 = find_submit('void_item_id');
-if ($id != -1 || $id2 != -1)
+//--------------------------------------------------------------------------------------------------
+$id3 = find_submit('Delete');
+if ($id3 != -1)
 {
-	$Ajax->activate('grn_table');
+	$_SESSION['supp_trans']->remove_grn_from_trans($id3);
 	$Ajax->activate('grn_items');
 	$Ajax->activate('inv_tot');
 }
 
-if (get_post('AddGLCodeToTrans'))
+$id4 = find_submit('Delete2');
+if ($id4 != -1)
+{
+	$_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
+	clear_fields();
+	$Ajax->activate('gl_items');
 	$Ajax->activate('inv_tot');
+}
 
+$id2 = -1;
 if ($_SESSION["wa_current_user"]->access == 2)
 {
-	if ($id2 != -1) // Added section 2008-10-18 Joe Hunt for voiding delivery lines
+	$id2 = find_submit('void_item_id');
+	if ($id2 != -1) 
 	{
 		begin_transaction();
 		
@@ -374,12 +360,53 @@ if ($_SESSION["wa_current_user"]->access == 2)
 	   		-$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
 	   		
 	   	commit_transaction();
+		display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
+
 	}   		
 }
 
-echo "<br>";
-submit_center('PostInvoice', _("Enter Invoice"), true, '', true);
-echo "<br>";
+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();
+
+invoice_header($_SESSION['supp_trans']);
+
+if ($_POST['supplier_id']=='') 
+	display_error('No supplier found for entered search text');
+else {
+	start_outer_table("$table_style2 width=98%", 5);
+
+	display_grn_items($_SESSION['supp_trans'], 1);
+
+	display_gl_items($_SESSION['supp_trans'], 1);
+
+	div_start('inv_tot');
+	invoice_totals($_SESSION['supp_trans']);
+	div_end();
+
+	end_outer_table(0, false);
+}
+
+//-----------------------------------------------------------------------------------------
+
+if ($id != -1 || $id2 != -1)
+{
+	$Ajax->activate('grn_items');
+	$Ajax->activate('inv_tot');
+}
+
+if (get_post('AddGLCodeToTrans'))
+	$Ajax->activate('inv_tot');
+
+br();
+submit_center('PostInvoice', _("Enter Invoice"), true, '', 'default');
+br();
 
 end_form();