X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=0fad0e6eddfc06f0d06b5072da58049106f129d5;hb=2383d33373d6ddec06906658a0ed6398077c1147;hp=148e7b92b9b18aec0ad0a0b6e71ebf0af0c94e44;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 148e7b92..0fad0e6e 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -130,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,
@@ -189,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);
@@ -337,18 +347,8 @@ if ($id4 != -1)
 $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();
 		
@@ -384,7 +384,7 @@ if (isset($_POST['go']))
 	$Ajax->activate('inv_tot');
 }
 
-start_form(false, true);
+start_form();
 
 invoice_header($_SESSION['supp_trans']);
 
@@ -416,7 +416,7 @@ if (get_post('AddGLCodeToTrans'))
 	$Ajax->activate('inv_tot');
 
 br();
-submit_center('PostInvoice', _("Enter Invoice"), true, '', true);
+submit_center('PostInvoice', _("Enter Invoice"), true, '', 'default');
 br();
 
 end_form();