}
foreach ($delivery->line_items as $line_no => $delivery_line) {
+ $qty = $delivery_line->qty_dispatched;
$line_price = $delivery_line->line_price();
$line_taxfree_price = get_tax_free_price_for_item($delivery_line->stock_id,
- $delivery_line->price, 0, $delivery->tax_included,
+ $delivery_line->price*$qty, 0, $delivery->tax_included,
$delivery->tax_group_array);
- $line_tax = get_full_price_for_item($delivery_line->stock_id, $delivery_line->price,
- 0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
+ $line_tax = get_full_price_for_item($delivery_line->stock_id,
+ $delivery_line->price * $qty, 0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
$delivery_line->standard_cost = get_unit_cost($delivery_line->stock_id);
/* add delivery details for all lines */
write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id,
$delivery_line->item_description, $delivery_line->qty_dispatched,
- $delivery_line->line_price(), $line_tax,
+ $delivery_line->line_price(), $qty ? $line_tax/$qty : 0,
$delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id,
$trans_no ? $delivery_line->id : 0);
$sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
$total += add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $sales_account, $dim, $dim2,
- -$line_taxfree_price*$delivery_line->qty_dispatched, // FIXME - calculation order should be exactly like in invoice to minimalize roundings
- $delivery->customer_id, "The sales price GL posting could not be inserted");
+ -$line_taxfree_price, $delivery->customer_id, "The sales price GL posting could not be inserted");
}
/* insert gl_trans to credit stock and debit cost of sales at standard cost*/
"The cost of sales GL posting could not be inserted");
/*then remove asset*/
add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
- $stock_gl_code["inventory_account"], 0, 0, "",
+ $stock_gl_code["inventory_account"], $dim, $dim2, "",
-$fa_purchase_cost,
PT_CUSTOMER, $delivery->customer_id,
"The stock side of the cost of sales GL posting could not be inserted");
/*finally adjust sales account with the remaining*/
add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
- $stock_gl_code["cogs_account"], 0, 0, "",
+ $stock_gl_code["cogs_account"], $dim, $dim2, "",
($fa_purchase_cost - $fa_depreciation),
PT_CUSTOMER, $delivery->customer_id,
"The stock side of the cost of sales GL posting could not be inserted");
/*now the stock entry*/
add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
- $stock_gl_code["inventory_account"], 0, 0, "",
+ $stock_gl_code["inventory_account"], $dim, $dim2, "",
(-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
PT_CUSTOMER, $delivery->customer_id,
"The stock side of the cost of sales GL posting could not be inserted");
if ($delivery->is_prepaid())
{
$deferred_act = get_company_pref('deferred_income_act');
- add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $deferred_act, 0, 0,
- -$total, $delivery->customer_id, "The deferred income GL posting could not be inserted");
+ add_gl_trans(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $deferred_act, 0, 0,
+ "The deferred income GL posting could not be inserted",
+ -$total, null, PT_CUSTOMER, $delivery->customer_id);
}
if ($bo_policy == 0) {
$sql = "SELECT sum(ov_freight) as freight FROM ".TB_PREF."debtor_trans WHERE order_ = $trans_no AND type = " . ST_CUSTDELIVERY . " AND debtor_no = " . $delivery->customer_id;
$result = db_query($sql, "Can not find delivery notes");
$row = db_fetch_row($result);
- if (!$row[0]) $freight = 0;
+ if (!is_array($row)) $freight = 0;
else $freight = $row[0];
if ($freight < $delivery->freight_cost) $delivery->freight_cost = $delivery->freight_cost - $freight;
else $delivery->freight_cost = 0;