} /*end of delivery_line loop */
if (($items_total + $charge_shipping) != 0) {
- $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0,
+ $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $branch_data["receivables_account"], $invoice->dimension_id, $invoice->dimension2_id,
($items_total + $charge_shipping + $items_added_tax + $freight_added_tax)*$prepaid_factor,
$invoice->customer_id, "The total debtor GL posting could not be inserted");
}
$to_allocate = ($items_total + $charge_shipping + $items_added_tax + $freight_added_tax);
if ($charge_shipping != 0) {
- $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $company_data["freight_act"], 0, 0,
+ $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $company_data["freight_act"], $invoice->dimension_id, $invoice->dimension2_id,
-$invoice->get_tax_free_shipping()*$prepaid_factor, $invoice->customer_id,
"The freight GL posting could not be inserted");
}
$taxitem['rate'], $invoice->tax_included, $prepaid_factor*$taxitem['Value'],
$taxitem['Net'], $ex_rate, $date_, $invoice->reference, TR_OUTPUT);
if (isset($taxitem['sales_gl_code']) && !empty($taxitem['sales_gl_code']) && $taxitem['Value'] != 0)
- $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
+ $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], $invoice->dimension_id, $invoice->dimension2_id,
(-$taxitem['Value'])*$prepaid_factor, $invoice->customer_id,
"A tax GL posting could not be inserted");
}
// extend invoice entry page with final amount after discount
// and change line below.
$discount = 0; // $invoice->cash_discount*$amount;
+ $payment_info = $invoice->pos['pos_name'].' #'.$invoice_no;
+ if (!empty($invoice->payment_info))
+ $payment_info .= ' ' . $invoice->payment_info;
$pmtno = write_customer_payment(0, $invoice->customer_id,
$invoice->Branch, $invoice->pos['pos_account'], $date_,
$Refs->get_next(ST_CUSTPAYMENT, null, array('customer' => $invoice->customer_id,
'branch' => $invoice->Branch, 'date' => $date_)),
- $amount-$discount, $discount,
- $invoice->pos['pos_name'].' #'.$invoice_no);
+ $amount-$discount, $discount, $payment_info,
+ 0,0,0,$invoice->dimension_id, $invoice->dimension2_id);
add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no, $invoice->customer_id, $date_);
update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $invoice->customer_id);