function get_supplier_details_to_order(&$order, $supplier_id)
{
- $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included,
+ $sql = "SELECT curr_code, supp_name, tax_group_id, supp.tax_included, dimension_id, dimension2_id,
supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1)
* (ov_amount + ov_gst + ov_discount),0)) as cur_credit,
terms.terms, terms.days_before_due, terms.day_in_following_month
$_POST['supplier_id'] = $supplier_id;
$_POST['supplier_name'] = $myrow["supp_name"];
$_POST['curr_code'] = $myrow["curr_code"];
+ $_POST['dimension'] = $myrow["dimension_id"];
+ $_POST['dimension2'] = $myrow["dimension2_id"];
$order->set_supplier($supplier_id, $myrow["supp_name"], $myrow["curr_code"],
$myrow["tax_group_id"], $myrow["tax_included"]);
$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();
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);
$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;
}
{
if ($data['supplier_description'] != "")
$myrow['description'] = $data['supplier_description'];
- //if ($data['suppliers_uom'] != "")
- // $myrow['units'] = $data['suppliers_uom'];
}
if (is_null($myrow["units"]))
{
$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