X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_invoice.php;h=a21d0c9123d846c8f98ab1c8903472e7d6e3bde5;hb=3713324329f0ec2effe45febe79cb659ae13d5f6;hp=1fa3cb96b6c66c0527650331c0e2bc97b06cbfe3;hpb=f0a00e7ee48c444e7282ee6fa446a54cfb6a1996;p=fa-stable.git

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index 1fa3cb96..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(_($help_context = "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."));
 
 //---------------------------------------------------------------------------------------------------------------
@@ -67,6 +88,8 @@ if (isset($_GET['New']))
 	}
 
 	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE);
+} else if(isset($_GET['ModifyInvoice'])) {
+	$_SESSION['supp_trans'] = new supp_trans(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -153,27 +176,12 @@ function check_data()
 		return false;
 	}
 
-	if (!$Refs->is_valid($_SESSION['supp_trans']->reference)) 
-	{
-		display_error(_("You must enter an invoice reference."));
-		set_focus('reference');
-		return false;
-	}
-
-	if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE)) 
+	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 (!$Refs->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."));
@@ -182,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;
 	}
@@ -193,9 +201,17 @@ function check_data()
 		return false;
 	}
 
-	if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference']))
+	if (trim(get_post('supp_reference')) == false)
+	{
+		display_error(_("You must enter a supplier's invoice reference."));
+		set_focus('supp_reference');
+		return false;
+	}
+
+	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'] . ")");
+		set_focus('supp_reference');
 		return false;
 	}
 
@@ -210,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']);
@@ -228,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, $SysPrefs;
+	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."));
@@ -245,7 +261,7 @@ function check_item_data($n)
 	}
 
 	$margin = $SysPrefs->over_charge_allowance();
-	if ($check_price_charged_vs_order_price == True)
+	if ($SysPrefs->check_price_charged_vs_order_price == True)
 	{
 		if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) {
 		     if ($_POST['order_price'.$n]==0 ||
@@ -260,7 +276,7 @@ function check_item_data($n)
 		}
 	}
 
-	if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
+	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+ ($margin / 100)))
@@ -279,10 +295,19 @@ function commit_item_data($n)
 {
 	if (check_item_data($n))
 	{
+    	if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
+    	{
+    		$complete = true;
+    	}
+    	else
+    	{
+    		$complete = false;
+    	}
+
 		$_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),
+			$_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
 			$_POST['std_cost_unit'.$n], "");
 		reset_tax_input();
 	}
@@ -327,6 +352,20 @@ if ($id4 != -1)
 	$Ajax->activate('gl_items');
 }
 
+$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;
 if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
 {
@@ -384,4 +423,3 @@ end_form();
 //--------------------------------------------------------------------------------------------------
 
 end_page();
-?>