Display of newlines in memo show as html

[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 9bc64d4c6208da34a53985290202581ad2572939..dd4929ed38fd0d89e9a16c49e86219ff62528319 100644 (file)
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -102,8 +102,6 @@ function add_po(&$po_obj)
 
        $Refs->save(ST_PURCHORDER, $po_obj->order_no, $po_obj->reference);
 
-       //add_comments(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments);
-
        add_audit_trail(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date);
        hook_db_postwrite($po_obj, ST_PURCHORDER);
        commit_transaction();
@@ -150,13 +148,7 @@ function update_po(&$po_obj)
                db_query($sql, "One of the purchase order detail records could not be updated");
     }
 
-//_vd($po_obj->prepayments);
-       reallocate_payments($po_obj->order_no, ST_PURCHORDER, $po_obj->orig_order_date, $po_obj->get_trans_total(), $po_obj->prepayments);
-//_vd($p = get_payments_for($po_obj->order_no, ST_PURCHORDER));
-//_vd(get_supp_trans($p[0]['trans_no_from'], $p[0]['trans_type_from']));
-//exit;
-
-       // add_comments(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments);
+       reallocate_payments($po_obj->order_no, ST_PURCHORDER, $po_obj->orig_order_date, $po_obj->get_trans_total(), $po_obj->prepayments, $po_obj->supplier_id);
 
        add_audit_trail($po_obj->trans_type, $po_obj->order_no, Today(), _("Updated."));
        hook_db_postwrite($po_obj, ST_PURCHORDER);
@@ -193,14 +185,14 @@ function read_po_header($order_no, &$order)
                $order->credit = get_current_supp_credit($order->supplier_id);
 
        $order->orig_order_date = sql2date($myrow["ord_date"]);
-       $order->Comments = nl2br($myrow["comments"]);
+       $order->Comments = $myrow["comments"];
        $order->Location = $myrow["into_stock_location"];
        $order->supp_ref = $myrow["requisition_no"];
        $order->reference = $myrow["reference"];
        $order->delivery_address = $myrow["delivery_address"];
        $order->alloc = $myrow["alloc"];
        $order->prep_amount = $myrow["prep_amount"];
-       $order->prepayments = get_payments_for($order_no, ST_PURCHORDER);
+       $order->prepayments = get_payments_for($order_no, ST_PURCHORDER, $myrow["supplier_id"]);
 
        return true;
        }
@@ -236,8 +228,6 @@ function read_po_items($order_no, &$order, $open_items_only=false)
                {
                        if ($data['supplier_description'] != "")
                                $myrow['description'] = $data['supplier_description'];
-                       //if ($data['suppliers_uom'] != "")
-                       //      $myrow['units'] = $data['suppliers_uom'];
                }               
             if (is_null($myrow["units"]))
             {
@@ -252,11 +242,7 @@ function read_po_items($order_no, &$order, $open_items_only=false)
                $myrow["quantity_ordered"],$myrow["description"],
                $myrow["unit_price"],$units, sql2date($myrow["delivery_date"]),
                $myrow["qty_invoiced"], $myrow["quantity_received"])) {
-                       $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;
+                               $order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];
                        }
         } /* line po from purchase order details */
     } //end of checks on returned data set