X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=a21d0c9123d846c8f98ab1c8903472e7d6e3bde5;hb=c001557f8ebee630494c6323477bd865a61942d9;hp=5302ee670e774011182c69145e0670d2f8304802;hpb=6689754b6114b76ee9bc4c53762f0dfb03b95238;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 5302ee67..a21d0c91 100644
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -21,14 +21,35 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
-page(_("Enter Supplier Invoice"), false, false, "", $js);
-
 //----------------------------------------------------------------------------------------
 
+if (isset($_GET['New']))
+{
+	if (isset( $_SESSION['supp_trans']))
+	{
+		unset ($_SESSION['supp_trans']->grn_items);
+		unset ($_SESSION['supp_trans']->gl_codes);
+		unset ($_SESSION['supp_trans']);
+	}
+	$help_context = "Enter Supplier Invoice";
+	$_SESSION['page_title'] = _("Enter Supplier Invoice");
+
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE);
+} else if(isset($_GET['ModifyInvoice'])) {
+	$help_context = 'Modifying Purchase Invoice';
+	$_SESSION['page_title'] = sprintf( _("Modifying Purchase Invoice # %d"), $_GET['ModifyInvoice']);
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
+}
+
+page($_SESSION['page_title'], false, false, "", $js);
+
+if (isset($_GET['ModifyInvoice']))
+	check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
+
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
 //---------------------------------------------------------------------------------------------------------------
@@ -36,7 +57,7 @@ check_db_has_suppliers(_("There are no suppliers defined in the system."));
 if (isset($_GET['AddedID'])) 
 {
 	$invoice_no = $_GET['AddedID'];
-	$trans_type = 20;
+	$trans_type = ST_SUPPINVOICE;
 
 
     echo "<center>";
@@ -45,7 +66,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("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
+		"PInvoice=".$invoice_no."&trans_type=".$trans_type);
 
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
 
@@ -65,10 +87,9 @@ if (isset($_GET['New']))
 		unset ($_SESSION['supp_trans']);
 	}
 
-	//session_register("SuppInv");
-	session_register("supp_trans");
-	$_SESSION['supp_trans'] = new supp_trans;
-	$_SESSION['supp_trans']->is_invoice = true;
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE);
+} else if(isset($_GET['ModifyInvoice'])) {
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -85,6 +106,15 @@ function clear_fields()
 	$Ajax->activate('gl_items');
 	set_focus('gl_code');
 }
+
+function reset_tax_input()
+{
+	global $Ajax;
+
+	unset($_POST['mantax']);
+	$Ajax->activate('inv_tot');
+}
+
 //------------------------------------------------------------------------------------------------
 //	GL postings are often entered in the same form to two accounts
 //  so fileds are cleared only on user demand.
@@ -99,8 +129,7 @@ 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");
+	$result = get_gl_account_info($_POST['gl_code']);
 	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."));
@@ -130,6 +159,7 @@ if (isset($_POST['AddGLCodeToTrans'])){
 		$_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_']);
+		reset_tax_input();
 		set_focus('gl_code');
 	}
 }
@@ -138,33 +168,20 @@ if (isset($_POST['AddGLCodeToTrans'])){
 
 function check_data()
 {
-	If (!$_SESSION['supp_trans']->is_valid_trans_to_post())
-	{
-		display_error(_("The invoice cannot be processed because the there are no items or values on the invoice.  Invoices are expected to have a charge."));
-		return false;
-	}
+	global $Refs;
 
-	if (!references::is_valid($_SESSION['supp_trans']->reference)) 
+	if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
 	{
-		display_error(_("You must enter an invoice reference."));
-		set_focus('reference');
+		display_error(_("The invoice cannot be processed because the there are no items or values on the invoice.  Invoices are expected to have a charge."));
 		return false;
 	}
 
-	if (!is_new_reference($_SESSION['supp_trans']->reference, 20)) 
+	if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
 	{
-		display_error(_("The entered reference is already in use."));
 		set_focus('reference');
 		return false;
 	}
 
-	if (!references::is_valid($_SESSION['supp_trans']->supp_reference)) 
-	{
-		display_error(_("You must enter a supplier's invoice reference."));
-		set_focus('supp_reference');
-		return false;
-	}
-
 	if (!is_date( $_SESSION['supp_trans']->tran_date))
 	{
 		display_error(_("The invoice as entered cannot be processed because the invoice date is in an incorrect format."));
@@ -173,7 +190,7 @@ function check_data()
 	} 
 	elseif (!is_date_in_fiscalyear($_SESSION['supp_trans']->tran_date)) 
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('trans_date');
 		return false;
 	}
@@ -184,17 +201,17 @@ 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'] 
-		. "' 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");
+	if (trim(get_post('supp_reference')) == false)
+	{
+		display_error(_("You must enter a supplier's invoice reference."));
+		set_focus('supp_reference');
+		return false;
+	}
 
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] == 1)
+	if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
 	{ 	/*Transaction reference already entered */
-		display_error(_("This invoice number has already been entered. It cannot be entered again." . " (" . $_POST['supp_reference'] . ")"));
+		display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
+		set_focus('supp_reference');
 		return false;
 	}
 
@@ -209,8 +226,8 @@ function handle_commit_invoice()
 
 	if (!check_data())
 		return;
-
-	$invoice_no = add_supp_invoice($_SESSION['supp_trans']);
+	$inv = $_SESSION['supp_trans'];
+	$invoice_no = add_supp_invoice($inv);
 
     $_SESSION['supp_trans']->clear_items();
     unset($_SESSION['supp_trans']);
@@ -227,8 +244,8 @@ if (isset($_POST['PostInvoice']))
 
 function check_item_data($n)
 {
-	global $check_price_charged_vs_order_price,
-		$check_qty_charged_vs_del_qty;
+	global $SysPrefs;
+
 	if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0)
 	{
 		display_error( _("The quantity to invoice must be numeric and greater than zero."));
@@ -243,28 +260,29 @@ function check_item_data($n)
 		return false;
 	}
 
-	if ($check_price_charged_vs_order_price == True)
+	$margin = $SysPrefs->over_charge_allowance();
+	if ($SysPrefs->check_price_charged_vs_order_price == True)
 	{
 		if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) {
 		     if ($_POST['order_price'.$n]==0 ||
 				input_num('ChgPrice'.$n)/$_POST['order_price'.$n] >
-			    (1 + (sys_prefs::over_charge_allowance() / 100)))
+			    (1 + ($margin/ 100)))
 		    {
 			display_error(_("The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") .
-			_("The over-charge percentage allowance is :") . sys_prefs::over_charge_allowance() . "%");
+			_("The over-charge percentage allowance is :") . $margin . "%");
 			set_focus('ChgPrice'.$n);
 			return false;
 		    }
 		}
 	}
 
-	if ($check_qty_charged_vs_del_qty == True)
+	if ($SysPrefs->check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
 	{
 		if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
-			(1+ (sys_prefs::over_charge_allowance() / 100)))
+			(1+ ($margin / 100)))
 		{
 			display_error( _("The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.")
-			. _("The over-charge percentage allowance is :") . sys_prefs::over_charge_allowance() . "%");
+			. _("The over-charge percentage allowance is :") . $margin . "%");
 			set_focus('this_quantity_inv'.$n);
 			return false;
 		}
@@ -291,6 +309,7 @@ function commit_item_data($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], "");
+		reset_tax_input();
 	}
 }
 
@@ -321,7 +340,7 @@ if ($id3 != -1)
 {
 	$_SESSION['supp_trans']->remove_grn_from_trans($id3);
 	$Ajax->activate('grn_items');
-	$Ajax->activate('inv_tot');
+	reset_tax_input();
 }
 
 $id4 = find_submit('Delete2');
@@ -329,8 +348,22 @@ if ($id4 != -1)
 {
 	$_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
 	clear_fields();
+	reset_tax_input();
 	$Ajax->activate('gl_items');
-	$Ajax->activate('inv_tot');
+}
+
+$id5 = find_submit('Edit');
+if ($id5 != -1)
+{
+    $_POST['gl_code'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_code;
+    $_POST['dimension_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim;
+    $_POST['dimension2_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim2;
+    $_POST['amount'] = $_SESSION['supp_trans']->gl_codes[$id5]->amount;
+    $_POST['memo_'] = $_SESSION['supp_trans']->gl_codes[$id5]->memo_;
+
+       $_SESSION['supp_trans']->remove_gl_codes_from_trans($id5);
+       reset_tax_input();
+       $Ajax->activate('gl_items');
 }
 
 $id2 = -1;
@@ -339,30 +372,10 @@ if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
 	$id2 = find_submit('void_item_id');
 	if ($id2 != -1) 
 	{
-		begin_transaction();
-		
-		$myrow = get_grn_item_detail($id2);
-
-		$grn = get_grn_batch($myrow['grn_batch_id']);
-
-	    $sql = "UPDATE ".TB_PREF."purch_order_details
-			SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
-	    db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
-
-	    $sql = "UPDATE ".TB_PREF."grn_items
-	    	SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
-		db_query($sql, "The quantity invoiced off the items received record could not be updated");
-	
-		update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
-			$myrow["unit_price"], -$myrow["QtyOstdg"], Today());
-
-	   	add_stock_move(25, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
-	   		-$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
-	   		
-	   	commit_transaction();
+		remove_not_invoice_item($id2);
 		display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
 
-	}   		
+	}
 }
 
 if (isset($_POST['go']))
@@ -370,7 +383,7 @@ 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');
+	reset_tax_input();
 }
 
 start_form();
@@ -378,10 +391,8 @@ start_form();
 invoice_header($_SESSION['supp_trans']);
 
 if ($_POST['supplier_id']=='') 
-	display_error('No supplier found for entered search text');
+		display_error(_("There is no supplier selected."));
 else {
-	start_outer_table("$table_style2 width=98%", 5);
-
 	display_grn_items($_SESSION['supp_trans'], 1);
 
 	display_gl_items($_SESSION['supp_trans'], 1);
@@ -390,7 +401,6 @@ else {
 	invoice_totals($_SESSION['supp_trans']);
 	div_end();
 
-	end_outer_table(0, false);
 }
 
 //-----------------------------------------------------------------------------------------
@@ -413,4 +423,3 @@ end_form();
 //--------------------------------------------------------------------------------------------------
 
 end_page();
-?>