X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_invoice.php;h=b1bd2ece237921d589dd3402bdb57646c2a927c8;hb=6a26a9c96379ef1dce88c995fe861579f3ac7d01;hp=5fe8028490d82296d390e1e0bdd741903ac3a43f;hpb=0696e813066e84e4e0bee51ebc7c46deb0367b7b;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 5fe80284..b1bd2ece 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.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>.
+***********************************************************************/
 $page_security=5;
 $path_to_root="..";
 
@@ -49,8 +58,10 @@ if (isset($_GET['AddedID']))
 
 	display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
 
-    hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
+	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");
+	
 	display_footer_exit();
 }
 
@@ -119,6 +130,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,
@@ -178,7 +195,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);
@@ -323,20 +344,11 @@ if ($id4 != -1)
 	$Ajax->activate('inv_tot');
 }
 
+$id2 = -1;
 if ($_SESSION["wa_current_user"]->access == 2)
 {
-	$id3 = find_submit('void_item_id');
-	if ($id3 != -1) 
-	{
-		$js = "if(confirm(\""
-		.sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $id3)
-		."\")) {
-			JsHttpRequest.request(\"void_confirm".$id3."\");
-		}";
-		$Ajax->addScript(true,$js);
-	}
-	$id2 = find_submit('void_confirm');
-	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();
 		
@@ -364,39 +376,36 @@ if ($_SESSION["wa_current_user"]->access == 2)
 	}   		
 }
 
-start_form(false, true);
-
-start_table("$table_style2 width=98%", 8);
-echo "<tr><td valign=center>"; // outer table
+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');
+}
 
-echo "<center>";
+start_form(false, true);
 
 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>";
+	start_outer_table("$table_style2 width=98%", 5);
 
 	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();
-}
-echo "</td></tr>";
 
-end_table(); // outer table
+	end_outer_table(0, false);
+}
 
 //-----------------------------------------------------------------------------------------
 
-
 if ($id != -1 || $id2 != -1)
 {
 	$Ajax->activate('grn_items');
@@ -406,9 +415,9 @@ if ($id != -1 || $id2 != -1)
 if (get_post('AddGLCodeToTrans'))
 	$Ajax->activate('inv_tot');
 
-echo "<br>";
+br();
 submit_center('PostInvoice', _("Enter Invoice"), true, '', true);
-echo "<br>";
+br();
 
 end_form();