Cleanup.

[fa-stable.git] / purchasing / includes / db / po_db.inc

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index 308e937ab632d8e6af59e2d50e4a8298951c2c1a..889e1a0765743b43a9c191e90c13a5cca3015c49 100644 (file)
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -29,14 +29,15 @@ function add_po(&$po_obj)
        begin_transaction();
 
      /*Insert to purchase order header record */
-     $sql = "INSERT INTO ".TB_PREF."purch_orders (supplier_id, Comments, ord_date, reference, requisition_no, into_stock_location, delivery_address) VALUES(";
+     $sql = "INSERT INTO ".TB_PREF."purch_orders (supplier_id, Comments, ord_date, reference, requisition_no, into_stock_location, delivery_address, total) VALUES(";
      $sql .= db_escape($po_obj->supplier_id) . "," .
          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) . ")";
+         db_escape($po_obj->delivery_address) . ", " .
+         db_escape($po_obj->get_trans_total()) . ")";
 
        db_query($sql, "The purchase order header record could not be inserted");
 
@@ -44,7 +45,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 +54,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,10 +75,11 @@ 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);
+               delivery_address=" . db_escape($po_obj->delivery_address).",
+               total=". db_escape($po_obj->get_trans_total());
     $sql .= " WHERE order_no = " . $po_obj->order_no;
        db_query($sql, "The purchase order could not be updated");
 
@@ -102,7 +105,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;
@@ -112,7 +115,7 @@ function update_po(&$po_obj)
 
 function read_po_header($order_no, &$order)
 {
-       $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name,
+       $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.tax_group_id,
                ".TB_PREF."suppliers.curr_code, ".TB_PREF."locations.location_name
                FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations
                WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
@@ -130,11 +133,13 @@ function read_po_header($order_no, &$order)
        $order->supplier_id = $myrow["supplier_id"];
        $order->supplier_name = $myrow["supp_name"];
        $order->curr_code = $myrow["curr_code"];
+               $order->tax_group_id = $myrow['tax_group_id'];
+               $order->credit = get_current_supp_credit($order->supplier_id);
 
        $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 +190,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