X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=d401f5e67ca612344195b5bea292938eb908f4d9;hb=9502b1b3fc30a8b12c647f7e024e8b8da6a50af6;hp=308e937ab632d8e6af59e2d50e4a8298951c2c1a;hpb=d7bad8234ae701d84e132bb57b19814badd8b6c9;p=fa-stable.git

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index 308e937a..d401f5e6 100644
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -34,7 +34,7 @@ function add_po(&$po_obj)
          db_escape($po_obj->Comments) . ",'" .
          date2sql($po_obj->orig_order_date) . "', " .
 		 db_escape($po_obj->reference) . ", " .
-         db_escape($po_obj->requisition_no) . ", " .
+         db_escape($po_obj->supp_ref) . ", " .
          db_escape($po_obj->Location) . ", " .
          db_escape($po_obj->delivery_address) . ")";
 
@@ -44,7 +44,7 @@ function add_po(&$po_obj)
      $po_obj->order_no = db_insert_id();
 
      /*Insert the purchase order detail records */
-     foreach ($po_obj->line_items as $po_line)
+     foreach ($po_obj->line_items as $line_no => $po_line)
      {
 		$sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date,	unit_price,	quantity_ordered) VALUES (";
 		$sql .= $po_obj->order_no . ", " . db_escape($po_line->stock_id). "," .
@@ -53,6 +53,7 @@ function add_po(&$po_obj)
 		db_escape($po_line->price) . ", " .
 		db_escape($po_line->quantity). ")";
 		db_query($sql, "One of the purchase order detail records could not be inserted");
+		$po_obj->line_items[$line_no]->po_detail_rec = db_insert_id();
      }
 
 	$Refs->save(ST_PURCHORDER, $po_obj->order_no, $po_obj->reference);
@@ -73,7 +74,7 @@ function update_po(&$po_obj)
 
     /*Update the purchase order header with any changes */
     $sql = "UPDATE ".TB_PREF."purch_orders SET Comments=" . db_escape($po_obj->Comments) . ",
-		requisition_no= ". db_escape( $po_obj->requisition_no). ",
+		requisition_no= ". db_escape( $po_obj->supp_ref). ",
 		into_stock_location=" . db_escape($po_obj->Location). ",
 		ord_date='" . date2sql($po_obj->orig_order_date) . "',
 		delivery_address=" . db_escape($po_obj->delivery_address);
@@ -102,7 +103,7 @@ function update_po(&$po_obj)
 
 	// add_comments(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments);
 
-	add_audit_trail($po_obj->trans_type, $po_obj->order_no, $po_obj->document_date, _("Updated."));
+	add_audit_trail($po_obj->trans_type, $po_obj->order_no, Today(), _("Updated."));
 	commit_transaction();
 
 	return $po_obj->order_no;
@@ -134,7 +135,7 @@ function read_po_header($order_no, &$order)
       	$order->orig_order_date = sql2date($myrow["ord_date"]);
       	$order->Comments = $myrow["comments"];
       	$order->Location = $myrow["into_stock_location"];
-      	$order->requisition_no = $myrow["requisition_no"];
+      	$order->supp_ref = $myrow["requisition_no"];
       	$order->reference = $myrow["reference"];
       	$order->delivery_address = $myrow["delivery_address"];
 
@@ -185,12 +186,15 @@ function read_po_items($order_no, &$order, $open_items_only=false)
                 $units = $myrow["units"];
             }
 
-            if ($order->add_to_order($order->lines_on_order+1, $myrow["item_code"],
+            if ($order->add_to_order($order->lines_on_order, $myrow["item_code"],
             	$myrow["quantity_ordered"],$myrow["description"],
             	$myrow["unit_price"],$units, sql2date($myrow["delivery_date"]),
             	$myrow["qty_invoiced"], $myrow["quantity_received"])) {
-					$order->line_items[$order->lines_on_order]->po_detail_rec = $myrow["po_detail_item"];
-					$order->line_items[$order->lines_on_order]->standard_cost = $myrow["std_cost_unit"];  /*Needed for receiving goods and GL interface */
+            		$newline = &$order->line_items[$order->lines_on_order-1];
+					$newline->po_detail_rec = $myrow["po_detail_item"];
+					$newline->standard_cost = $myrow["std_cost_unit"];  /*Needed for receiving goods and GL interface */
+				// set for later GRN edition
+//	   	    	$newline->receive_qty = $newline->quantity - $newline->qty_dispatched;
 			}
         } /* line po from purchase order details */
     } //end of checks on returned data set