X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=0dfa4ebba560b9ec5854727fcf5df5839a20893c;hb=91bede4226ba8b45151f0501ac88eb946ed5f2a1;hp=bffe486a78c4f198e5a933655989e1ee8c59ef91;hpb=9af96a2e461b905dbb20f2b87ffb5c28f9b3461c;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index bffe486a..0dfa4ebb 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -23,8 +23,11 @@ set_page_security( @$_SESSION['PO']->trans_type,
 			ST_SUPPINVOICE => 'SA_SUPPLIERINVOICE'),
 	array(	'NewOrder' => 'SA_PURCHASEORDER',
 			'ModifyOrderNumber' => 'SA_PURCHASEORDER',
+			'AddedID' => 'SA_PURCHASEORDER',
 			'NewGRN' => 'SA_GRN',
-			'NewInvoice' => 'SA_SUPPLIERINVOICE')
+			'AddedGRN' => 'SA_GRN',
+			'NewInvoice' => 'SA_SUPPLIERINVOICE',
+			'AddedPI' => 'SA_SUPPLIERINVOICE')
 );
 
 $js = '';
@@ -57,6 +60,9 @@ if (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber']))
 
 page($_SESSION['page_title'], false, false, "", $js);
 
+if (isset($_GET['ModifyOrderNumber']))
+	check_is_editable(ST_PURCHORDER, $_GET['ModifyOrderNumber']);
+
 //---------------------------------------------------------------------------------------------------
 
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
@@ -97,6 +103,9 @@ if (isset($_GET['AddedID']))
 
 	display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0);
 
+    $clearing_act = get_company_pref('grn_clearing_act');
+	if ($clearing_act)	
+		display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Journal Entries for this Delivery")), 1);
 // not yet
 //	display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
 
@@ -324,21 +333,27 @@ function can_commit()
 		set_focus('supplier_id');
 		return false;
 	} 
-	
+
 	if (!is_date($_POST['OrderDate'])) 
 	{
 		display_error(_("The entered order date is invalid."));
 		set_focus('OrderDate');
 		return false;
 	} 
-	
+	if (($_SESSION['PO']->trans_type == ST_SUPPRECEIVE || $_SESSION['PO']->trans_type == ST_SUPPINVOICE) 
+		&& !is_date_in_fiscalyear($_POST['OrderDate'])) {
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
+		set_focus('OrderDate');
+		return false;
+	}
+
 	if (($_SESSION['PO']->trans_type==ST_SUPPINVOICE) && !is_date($_POST['due_date'])) 
 	{
 		display_error(_("The entered due date is invalid."));
 		set_focus('due_date');
 		return false;
 	} 
-	
+
 	if (!$_SESSION['PO']->order_no) 
 	{
     	if (!$Refs->is_valid(get_post('ref'))) 
@@ -347,7 +362,7 @@ function can_commit()
 			set_focus('ref');
     		return false;
     	} 
-    	
+
     	if (!is_new_reference(get_post('ref'), $_SESSION['PO']->trans_type)) 
     	{
     		display_error(_("The entered reference is already in use."));
@@ -355,13 +370,20 @@ function can_commit()
     		return false;
     	}
 	}
-	
+
 	if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE && !$Refs->is_valid(get_post('supp_ref'))) 
 	{
 		display_error(_("You must enter a supplier's invoice reference."));
 		set_focus('supp_ref');
 		return false;
 	}
+	if ($_SESSION['PO']->trans_type==ST_SUPPINVOICE 
+		&& is_reference_already_there($_SESSION['PO']->supplier_id, get_post('supp_ref'), $_SESSION['PO']->order_no))
+	{
+		display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . get_post('supp_ref') . ")");
+		set_focus('supp_ref');
+		return false;
+	}
 	if ($_SESSION['PO']->trans_type == ST_PURCHORDER && get_post('delivery_address') == '')
 	{
 		display_error(_("There is no delivery address specified."));
@@ -374,13 +396,20 @@ function can_commit()
 		set_focus('StkLocation');
 		return false;
 	} 
-	
+	if (!db_has_currency_rates($_SESSION['PO']->curr_code, $_POST['OrderDate']))
+		return false;
 	if ($_SESSION['PO']->order_has_items() == false)
 	{
      	display_error (_("The order cannot be placed because there are no lines entered on this order."));
      	return false;
 	}
-		
+	if (floatcmp(input_num('prep_amount'), $_SESSION['PO']->get_trans_total()) > 0)
+	{
+		display_error(_("Required prepayment is greater than total invoice value."));
+		set_focus('prep_amount');
+		return false;
+	}
+
 	return true;
 }
 
@@ -388,6 +417,8 @@ function can_commit()
 
 function handle_commit_order()
 {
+	global $Refs, $type_shortcuts;
+
 	$cart = &$_SESSION['PO'];
 
 	if (can_commit()) {
@@ -416,7 +447,8 @@ function handle_commit_order()
 			//Direct GRN
 			if ($cart->trans_type == ST_SUPPRECEIVE)
 				$cart->reference = $ref;
-			$cart->Comments = $cart->reference; //grn does not hold supp_ref
+			if ($cart->trans_type != ST_SUPPINVOICE)	
+				$cart->Comments = $cart->reference; //grn does not hold supp_ref
 			foreach($cart->line_items as $key => $line)
 				$cart->line_items[$key]->receive_qty = $line->quantity;
 			$grn_no = add_grn($cart);
@@ -434,29 +466,51 @@ function handle_commit_order()
 			$inv->reference = $ref;
 			$inv->supp_reference = $cart->supp_ref;
 			$inv->tax_included = $cart->tax_included;
+			$inv->tax_algorithm = $cart->tax_algorithm;
+			$inv->stored_algorithm = $cart->stored_algorithm;
 			$supp = get_supplier($cart->supplier_id);
 			$inv->tax_group_id = $supp['tax_group_id'];
-//			$inv->ov_discount 'this isn't used at all'
-			$inv->ov_amount = $inv->ov_gst = 0;
-			
+			$inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
+
+			$total = 0;
 			foreach($cart->line_items as $key => $line) {
 				$inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
 					$line->item_description, $line->receive_qty, 0, $line->receive_qty,
 					$line->price, $line->price, true, get_standard_cost($line->stock_id), '');
-				$inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec());
+				$total += round2(($line->receive_qty * $line->price), user_price_dec());
 			}
-			$taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
-			foreach( $taxes as $taxitem) {
-				$inv->ov_gst += round2($taxitem['Value'], user_price_dec());
+			$inv->tax_overrides = $cart->tax_overrides;
+			if (!$inv->tax_included) {
+				$taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
+				foreach( $taxes as $taxitem) {
+					$total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
+				}
 			}
+			$inv->ex_rate = $cart->ex_rate;
+
 			$inv_no = add_supp_invoice($inv);
-			commit_transaction(); // save PO+GRN+PI
-			// payment for cash terms...
+			// presume supplier data need correction
+			if ($inv->stored_algorithm != $inv->tax_algorithm)
+				update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
+
+			if (get_post('cash_account')) {
+
+				$pmt_no = add_supp_payment($inv->supplier_id, $inv->tran_date, get_post('cash_account'),
+					$total, 0,	$Refs->get_next(ST_SUPPAYMENT), 
+					_('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')');
+				add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date);
+				update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no);
+				update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no);
+
+			}
+
+			commit_transaction(); // save PO+GRN+PI(+SP)
+
 			unset($_SESSION['PO']);
        		meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
 		}
 		else { // order modification
-		
+
 			$order_no = update_po($cart);
 			unset($_SESSION['PO']);
         	meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");	
@@ -498,6 +552,17 @@ echo "<br>";
 display_po_items($_SESSION['PO']);
 
 start_table(TABLESTYLE2);
+
+if (list_updated('tax_algorithm')) {
+	$_SESSION['PO']->tax_algorithm = $_POST['tax_algorithm'];
+    $Ajax->activate('items_table');
+}
+
+if ($_SESSION['PO']->trans_type == ST_SUPPINVOICE) {
+	tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
+	cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
+}
+
 textarea_row(_("Memo:"), 'Comments', null, 70, 4);
 
 end_table(1);