// save a couple of db calls like get_supplier()
$supp = get_supplier($supplier);
- if ($supplier != null)
+ if ($supplier != null) {
$currency = $supp['curr_code'];
- else
+ if ($supp['tax_included'])
+ $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'],
+ $supp['tax_included']);
+ } else
$currency = null;
- if ($supp['tax_included'])
- $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'],
- $supp['tax_included']);
-
if ($currency != null)
{
$ex_rate = get_exchange_rate_to_home_currency($currency, $date);
$po->line_items[$line_no]->grn_item_id = $grn_item;
/* Update location stock records - NB a po cannot be entered for a service/kit parts done automatically */
add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
- $order_line->receive_qty, $order_line->standard_cost,
- $po->supplier_id, 1, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);
+ $order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);
} /*quantity received is != 0 */
} /*end of order_line loop */
if ($clearing_act && $total != 0.0) {
+ $accs = get_supplier_accounts($po->supplier_id);
$total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $clearing_act,
- 0, 0, -$total, null);
+ $accs['dimension_id'], $accs['dimension2_id'], -$total, null);
}
$Refs->save(ST_SUPPRECEIVE, $grn, $po->reference);
function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false,
$is_invoiced_only=false, $invoice_no=0, $begin="", $end="")
{
- $sql = "SELECT grn.*, grn_item.*,
+ $sql = "SELECT grn.*, grn_item.*, po_item.delivery_date as req_del_date,
grn_item.quantity_inv".($invoice_no ? "-invoice_item.quantity" : '')." quantity_inv,
po_item.unit_price,
po_item.act_price,
$order->add_to_order($order->lines_on_order, $myrow["item_code"],
$myrow["qty_recd"],$myrow["description"], $myrow["unit_price"],$units,
- sql2date($myrow["delivery_date"]), $myrow["quantity_inv"],
+ sql2date($myrow["req_del_date"]), $myrow["quantity_inv"],
$myrow["qty_recd"]);
$order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];