X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_receive_items.php;h=cec4715f05c66b0224c93e0486f47fdbd9469bac;hb=902f1015d874c33bd7946b17de2ad80b4f2144b6;hp=4029dfc1c64f4a4e1f4eaea43f6187e2ff8e40fb;hpb=e91772a2716825a6aeb358d1defba47d5f3892c1;p=fa-stable.git

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 4029dfc1..cec4715f 100644
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 11;
-$path_to_root="..";
+$page_security = 'SA_GRN';
+$path_to_root = "..";
 include_once($path_to_root . "/purchasing/includes/po_class.inc");
 
 include_once($path_to_root . "/includes/session.inc");
@@ -39,6 +39,8 @@ if (isset($_GET['AddedID']))
 	//echo get_gl_view_str(25, $grn, _("View the GL &Journal Entries for this Delivery"));
 
 //	echo "<br>";
+	hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1");
+
 	hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different &purchase order for receiving items against"));
 
 	display_footer_exit();
@@ -78,7 +80,7 @@ function display_po_receive_items()
 
     		$qty_outstanding = $ln_itm->quantity - $ln_itm->qty_received;
 
-    	  	if ($ln_itm->receive_qty == 0)
+ 			if (!isset($_POST['Update']) && !isset($_POST['ProcessGoodsReceived']) && $ln_itm->receive_qty == 0)
     	  	{   //If no quantites yet input default the balance to be received
     	    	$ln_itm->receive_qty = $qty_outstanding;
     		}
@@ -102,7 +104,7 @@ function display_po_receive_items()
 			else
 				label_cell(number_format2($ln_itm->receive_qty, $dec), "align=right");
 
-			amount_cell($ln_itm->price);
+			amount_decimal_cell($ln_itm->price);
 			amount_cell($line_total);
 			end_row();
        	}
@@ -310,8 +312,8 @@ display_heading(_("Items to Receive"));
 display_po_receive_items();
 
 echo '<br>';
-submit_center_first('Update', _("Update"), '', 'default');
-submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), true);
+submit_center_first('Update', _("Update"), '', true);
+submit_center_last('ProcessGoodsReceived', _("Process Receive Items"), _("Clear all GL entry fields"), 'default');
 
 end_form();