+ // 2006-06-14. If the Customer Branch AR Account is set to a Bank Account,
+ // the transaction will be settled at once.
+ if (is_bank_account($branch_data['receivables_account']))
+ $alloc = $items_total + $items_added_tax + $invoice->freight_cost + $freight_added_tax;
+ else
+ $alloc = 0;
$invoice_no = write_customer_trans(10, $trans_no, $invoice->customer_id,
$invoice->Branch, $date_, $invoice->reference, $items_total, 0,
$items_added_tax, $invoice->freight_cost, $freight_added_tax,
$invoice_no = write_customer_trans(10, $trans_no, $invoice->customer_id,
$invoice->Branch, $date_, $invoice->reference, $items_total, 0,
$items_added_tax, $invoice->freight_cost, $freight_added_tax,
- $invoice->default_sales_type, $sales_order, $delivery_no,
- $invoice->ship_via, $invoice->due_date);
+ $invoice->sales_type, $sales_order, $delivery_no,
+ $invoice->ship_via, $invoice->due_date, $alloc); // 2008-06-14 extra $alloc
if ($invoice_line->qty_dispatched != 0) {
$stock_gl_code = get_stock_gl_code($invoice_line->stock_id);
if ($invoice_line->qty_dispatched != 0) {
$stock_gl_code = get_stock_gl_code($invoice_line->stock_id);
+ // 2008-06-14. If there is a Branch Sales Account, then override with this,
+ // else take the Item Sales Account
+ if ($branch_data['sales_account'] != "")
+ $sales_account = $branch_data['sales_account'];
+ else
+ $sales_account = $stock_gl_code['sales_account'];
- add_gl_trans_customer(10, $invoice_no, $date_, $stock_gl_code["sales_account"],
+ add_gl_trans_customer(10, $invoice_no, $date_, $sales_account,
$stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"],
(-$line_taxfree_price * $invoice_line->qty_dispatched),
$invoice->customer_id, "The sales price GL posting could not be inserted");
$stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"],
(-$line_taxfree_price * $invoice_line->qty_dispatched),
$invoice->customer_id, "The sales price GL posting could not be inserted");