if (!$invoice->is_prepaid())
update_customer_trans_version(get_parent_type(ST_SALESINVOICE), $invoice->src_docs);
+ elseif (count($invoice->prepayments)) { // partial invoice
+ $last_payment = end($invoice->prepayments);
+ $gl_date = sql2date($last_payment['tran_date']);
+ } else { // final invoice
+ $gl_date = $invoice->document_date;
+ }
$ov_gst = 0;
$taxes = $invoice->get_taxes(); // all taxes with freight_tax
$sales_order = $sales_order[0]; // assume all crucial SO data are same for every delivery
if ($trans_no) {
- $allocs = get_payments_for($trans_no, ST_SALESINVOICE);
+ $allocs = get_payments_for($trans_no, ST_SALESINVOICE, $invoice->customer_id);
delete_comments(ST_SALESINVOICE, $trans_no);
void_gl_trans(ST_SALESINVOICE, $trans_no, true);
void_trans_tax_details(ST_SALESINVOICE, $trans_no);
} else
- $allocs = get_payments_for($invoice->order_no, ST_SALESORDER);
+ $allocs = get_payments_for($invoice->order_no, ST_SALESORDER, $invoice->customer_id);
if ($invoice->is_prepaid()) // selected prepayment is already in cart
{
$invoice->sales_type, $sales_order, $invoice->ship_via,
$invoice->due_date, 0, 0, $invoice->dimension_id,
$invoice->dimension2_id, $invoice->payment, $invoice->tax_included, $invoice->prep_amount);
- // 2008-06-14 extra $alloc, 2008-11-12 added dimension_id Joe Hunt
if ($trans_no == 0) {
$invoice->trans_no = array($invoice_no=>0);
- }
+ } else
+ move_trans_attachments(ST_SALESINVOICE, $trans_no, $invoice_no);
$total = 0;
// for prepayments use deferred income account if set
if ($invoice_line->line_price() != 0) {
//Post sales transaction to GL credit sales
- // 2008-06-14. If there is a Branch Sales Account, then override with this,
+ // If there is a Branch Sales Account, then override with this,
// else take the Item Sales Account
if (!$invoice->is_prepaid())
$sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
- // 2008-08-01. If there is a Customer Dimension, then override with this,
+ // If there is a Customer Dimension, then override with this,
// else take the Item Dimension (if any)
$dim = ($invoice->dimension_id != $customer['dimension_id'] ? $invoice->dimension_id :
($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
} /*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");
}
if ($taxitem['Net'] != 0) {
$ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($invoice->customer_id), $date_);
add_trans_tax_details(ST_SALESINVOICE, $invoice_no, $taxitem['tax_type_id'],
- $taxitem['rate'], $invoice->tax_included, $taxitem['Value'],
- $taxitem['Net'], $ex_rate, $date_, $invoice->reference, $date_, $prepaid_factor*$taxitem['Value']);
- if (isset($taxitem['sales_gl_code']))
- $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
+ $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'], $invoice->dimension_id, $invoice->dimension2_id,
(-$taxitem['Value'])*$prepaid_factor, $invoice->customer_id,
"A tax GL posting could not be inserted");
}
add_comments(ST_SALESINVOICE, $invoice_no, $date_, $invoice->Comments);
if ($trans_no == 0) {
- $Refs->save(ST_SALESINVOICE, $invoice_no, $invoice->reference);
+ $Refs->save(ST_SALESINVOICE, $invoice_no, $invoice->reference, null, $invoice->fixed_asset);
if ($invoice->payment_terms['cash_sale'] && $invoice->pos['pos_account']) {
$amount = $items_total + $items_added_tax + $invoice->freight_cost
+ $freight_added_tax;
-
- // to use debtors.pmt_discount on cash sale:
- // extend invoice entry page with final amount after discount
- // and change line below.
- $discount = 0; // $invoice->cash_discount*$amount;
- $pmtno = write_customer_payment(0, $invoice->customer_id,
- $invoice->Branch, $invoice->pos['pos_account'], $date_,
- $Refs->get_next(ST_CUSTPAYMENT), $amount-$discount, $discount,
- _('Cash invoice').' '.$invoice_no);
- add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no);
-
- update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no);
- update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno);
+ if ($amount != 0) {
+ // to use debtors.pmt_discount on cash sale:
+ // 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, $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);
+ update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno, $invoice->customer_id);
+ }
}
}
-//_vd($allocs);
- reallocate_payments($invoice_no, ST_SALESINVOICE, $date_, $to_allocate, $allocs);
-//_vd(get_payments_for($sales_order, ST_SALESORDER));
-//_vd(get_payments_for($invoice_no, ST_SALESINVOICE));
-//_vd(get_gl(ST_SALESINVOICE, $invoice_no));
-//_vd(get_customer_trans($invoice_no, ST_SALESINVOICE));
-//_vd(get_sales_order_header($sales_order, ST_SALESORDER));
+ reallocate_payments($invoice_no, ST_SALESINVOICE, $date_, $to_allocate, $allocs, $invoice->customer_id);
hook_db_postwrite($invoice, ST_SALESINVOICE);
-//$result = get_trans_tax_details(ST_SALESINVOICE, $invoice_no);
-//while($row=db_fetch($result))
-// _vd($row);
-//exit;
+
commit_transaction();
return $invoice_no;
if ($deliveries !== 0) {
if ($type == ST_SALESINVOICE && count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
{
+ $trans = get_customer_trans($deliveries[0], ST_CUSTDELIVERY);
void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
- $date_ = Today();
+ $date_ = sql2date($trans['tran_date']);
add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided."));
add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, "");
}
commit_transaction();
}
+function is_cust_invoice_credited($trans_no)
+{
+ return db_num_rows(get_sales_child_lines(ST_SALESINVOICE, $trans_no));
+}
+
function get_cust_prepayment_invoice_factor($trans_no)
{
$sql = "SELECT IF(dt.prep_amount>0, dt.prep_amount/so.total ,0)
LEFT JOIN ".TB_PREF."sales_orders so ON so.trans_type=".ST_SALESORDER." AND so.order_no=dt.order_
WHERE dt.type=".ST_SALESINVOICE." AND trans_no=".db_escape($trans_no);
$row = db_fetch(db_query($sql, 'cannot retrieve prepaid invoice factor'));
- return $row[0];
+ return is_array($row) ? $row[0] : false;
}
+/*
+ Return yet not invoiced amount of prepayment invoice (or 0 if normal invoice)
+*/
function prepaid_invoice_remainder($order)
{
$sql = "SELECT so.total - IFNULL(SUM(inv.prep_amount),0) FROM "
.TB_PREF."sales_orders so,
- ".TB_PREF."debtor_trans inv
- LEFT JOIN ".TB_PREF."payment_terms pt ON inv.payment_terms=pt.terms_indicator
+ ".TB_PREF."debtor_trans inv,
+ ".TB_PREF."payment_terms pt
WHERE so.order_no=".db_escape($order)
." AND so.trans_type=".ST_SALESORDER
." AND inv.type=".ST_SALESINVOICE
." AND inv.order_=so.order_no"
- ." AND pt.days_before_due<0";
+ ." AND so.payment_terms=pt.terms_indicator"
+ ." AND inv.payment_terms=pt.terms_indicator"
+ ." AND pt.days_before_due = -1";
$result = db_fetch(db_query($sql, "cannot find final invoice value"));
- return $result[0];
+ return $result[0] ? $result[0] : 0;
}
+
/*
Find oldest delivery date for sales invoice
*/
projects / fa-stable.git / blobdiff