X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=d707dbfe11bc841776fd0deb3c779147920c02de;hb=a749d48dad4cdb0708ff272129338fa46fff7c2c;hp=3ce35fdadb3944e653acfaed84cea9b38237ce35;hpb=84e2f869630484bd9380e5c30647a483bce14d1e;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 3ce35fda..d707dbfe 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -14,6 +14,7 @@ $page_security = 'SA_PURCHASEORDER';
 include_once($path_to_root . "/purchasing/includes/po_class.inc");
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include_once($path_to_root . "/purchasing/includes/db/suppliers_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 set_page_security( @$_SESSION['PO']->trans_type,
@@ -77,7 +78,7 @@ if (isset($_GET['AddedID']))
 
 	display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1);
 
-	display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 1));
+	display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "printlink", "", 1));
 
 	hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no");
 
@@ -94,7 +95,7 @@ if (isset($_GET['AddedID']))
 
 	display_notification_centered(_("Direct GRN has been entered"));
 
-	display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0, 1);
+	display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0);
 
 // not yet
 //	display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
@@ -317,6 +318,13 @@ function can_commit()
 {
 	global $Refs;
 
+	if (!get_post('supplier_id')) 
+	{
+		display_error(_("There is no supplier selected."));
+		set_focus('supplier_id');
+		return false;
+	} 
+	
 	if (!is_date($_POST['OrderDate'])) 
 	{
 		display_error(_("The entered order date is invalid."));
@@ -324,6 +332,13 @@ function can_commit()
 		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'))) 
@@ -341,13 +356,18 @@ function can_commit()
     	}
 	}
 	
+	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_PURCHORDER && get_post('delivery_address') == '')
 	{
 		display_error(_("There is no delivery address specified."));
 		set_focus('delivery_address');
 		return false;
 	} 
-	
 	if (get_post('StkLocation') == '')
 	{
 		display_error(_("There is no location specified to move any items into."));
@@ -406,20 +426,19 @@ function handle_commit_order()
         		meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$grn_no");
 			}
 //			Direct Purchase Invoice
-			$inv = new supp_trans;
-			$inv->is_invoice = true;
+ 			$inv = new supp_trans(ST_SUPPINVOICE);
 			$inv->Comments = $cart->Comments;
 			$inv->supplier_id = $cart->supplier_id;
 			$inv->tran_date = $cart->orig_order_date;
+			$inv->due_date = $cart->due_date;
 			$inv->reference = $ref;
 			$inv->supp_reference = $cart->supp_ref;
+			$inv->tax_included = $cart->tax_included;
 			$supp = get_supplier($cart->supplier_id);
 			$inv->tax_group_id = $supp['tax_group_id'];
 //			$inv->ov_discount 'this isn't used at all'
-//			$inv->terms = not used, TODO
-			$terms =  $supp['payment_terms'];
 			$inv->ov_amount = $inv->ov_gst = 0;
-			$inv->due_date = get_invoice_duedate($terms, $inv->tran_date);
+			
 			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,
@@ -432,7 +451,7 @@ function handle_commit_order()
 			}
 			$inv_no = add_supp_invoice($inv);
 			commit_transaction(); // save PO+GRN+PI
-			// payment for cash terms...
+			// FIXME payment for cash terms. (Needs cash account selection)
 			unset($_SESSION['PO']);
        		meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
 		}
@@ -478,22 +497,35 @@ echo "<br>";
 
 display_po_items($_SESSION['PO']);
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 textarea_row(_("Memo:"), 'Comments', null, 70, 4);
 
 end_table(1);
 
 div_start('controls', 'items_table');
+$process_txt = _("Place Order");
+$update_txt = _("Update Order");
+$cancel_txt = _("Cancel Order");
+if ($_SESSION['PO']->trans_type == ST_SUPPRECEIVE) {
+	$process_txt = _("Process GRN");
+	$update_txt = _("Update GRN");
+	$cancel_txt = _("Cancel GRN");
+}	
+elseif ($_SESSION['PO']->trans_type == ST_SUPPINVOICE) {
+	$process_txt = _("Process Invoice");
+	$update_txt = _("Update Invoice");
+	$cancel_txt = _("Cancel Invoice");
+}	
 if ($_SESSION['PO']->order_has_items()) 
 {
 	if ($_SESSION['PO']->order_no)
-		submit_center_first('Commit', _("Update Order"), '', 'default');
+		submit_center_first('Commit', $update_txt, '', 'default');
 	else
-		submit_center_first('Commit', _("Place Order"), '', 'default');
-	submit_center_last('CancelOrder', _("Cancel Order")); 	
+		submit_center_first('Commit', $process_txt, '', 'default');
+	submit_center_last('CancelOrder', $cancel_txt); 	
 }
 else
-	submit_center('CancelOrder', _("Cancel Order"), true, false, 'cancel');
+	submit_center('CancelOrder', $cancel_txt, true, false, 'cancel');
 div_end();
 //---------------------------------------------------------------------------------------------------