From: Joe Hunt Date: Thu, 18 Dec 2008 17:21:02 +0000 (+0000) Subject: [0000101] Roll back of yeasterday issues X-Git-Tag: 2.3-final~1352 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=45a5f52abef5d22959d69ec5bc0cde204531f489;p=fa-stable.git [0000101] Roll back of yeasterday issues --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d3e6efd1..226ad9fe 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,14 @@ Legend: ! -> Note $ -> Affected files +18-Dec-2008 Joe Hunt +# [0000101] Roll back of yeasterday issues +$ /purchasing/includes/db/invoice_db.inc + /purchasing/includes/db/supp_payment_db.inc + /sales/includes/db/payment_db.inc + /sales/includes/db/sales_credit_db.inc + /sales/includes/db/sales_invoice_db.inc + 17-Dec-2008 Joe Hunt # [0000101] More wonderful rounding issues $ /includes/ui/ui_view.inc diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 05704c3a..f69ebe40 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -145,6 +145,10 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang $total = 0; /* Now the control account */ $supplier_accounts = get_supplier_accounts($supp_trans->supplier_id); + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0, + -($invoice_items_total + $tax_total + $supp_trans->ov_discount), + $supp_trans->supplier_id, + "The general ledger transaction for the control total could not be added"); /*Loop through the GL Entries and create a debit posting for each of the accounts entered */ @@ -259,10 +263,6 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang } } - $total += add_gl_trans($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0, "", - -$total, null, payment_person_types::supplier(), $supp_trans->supplier_id, - "The general ledger transaction for the control total could not be added"); - /*Post a balance post if $total != 0 */ add_gl_balance($trans_type, $invoice_id, $date_, -$total, payment_person_types::supplier(), $supp_trans->supplier_id); diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc index ea9430ca..48e4c8cb 100644 --- a/purchasing/includes/db/supp_payment_db.inc +++ b/purchasing/includes/db/supp_payment_db.inc @@ -31,6 +31,8 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account, $total = 0; $supplier_accounts = get_supplier_accounts($supplier_id); + $total += add_gl_trans_supplier($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, + $supp_amount + $supp_discount, $supplier_id, "", $rate); // Now credit discount received account with discounts if ($supp_discount != 0) @@ -45,10 +47,6 @@ function add_supp_payment($supplier_id, $date_, $payment_type, $bank_account, -$supp_amount, $supplier_id, "", $rate); } - $total += add_gl_trans($trans_type, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0, "", - -$total, null, payment_person_types::supplier(), $supplier_id, - "The general ledger transaction for the control total could not be added"); - /*Post a balance post if $total != 0 */ add_gl_balance($trans_type, $payment_id, $date_, -$total, payment_person_types::supplier(), $supplier_id); diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc index e31c432d..cda2d68a 100644 --- a/sales/includes/db/payment_db.inc +++ b/sales/includes/db/payment_db.inc @@ -36,6 +36,12 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou $discount_account = $company_record["default_prompt_payment_act"]; } + if (($discount + $amount) != 0) { + /* Now Credit Debtors account with receipts + discounts */ + $total += add_gl_trans_customer(12, $payment_no, $date_, + $debtors_account, 0, 0, -($discount + $amount), $customer_id, + "Cannot insert a GL transaction for the debtors account credit", $rate); + } if ($discount != 0) { /* Now Debit discount account with discounts allowed*/ $total += add_gl_trans_customer(12, $payment_no, $date_, @@ -43,13 +49,6 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou "Cannot insert a GL transaction for the payment discount debit", $rate); } - if (($discount + $amount) != 0) { - /* Now Credit Debtors account with receipts + discounts */ - $total += add_gl_trans(12, $payment_no, $date_, $debtors_account, 0, 0, "", - -$total, null, payment_person_types::customer(), $customer_id, - "Cannot insert a GL transaction for the debtors account credit"); - } - /*Post a balance post if $total != 0 */ add_gl_balance(12, $payment_no, $date_, -$total, payment_person_types::customer(), $customer_id); diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc index 9b387637..dfb4c21b 100644 --- a/sales/includes/db/sales_credit_db.inc +++ b/sales/includes/db/sales_credit_db.inc @@ -127,6 +127,14 @@ function write_credit_note($credit_note, $write_off_acc) /*Post credit note transaction to GL credit debtors, debit freight re-charged and debit sales */ + if (($credit_note_total + $credit_note->freight_cost) != 0) { + + $total += add_gl_trans_customer(11, $credit_no, $credit_date, $branch_data["receivables_account"], 0, 0, + -($credit_note_total + $credit_note->freight_cost + $items_added_tax + $freight_added_tax), + $credit_note->customer_id, + "The total debtor GL posting for the credit note could not be inserted"); + } + if ($credit_note->freight_cost !=0) { $total += add_gl_trans_customer(11, $credit_no, $credit_date, $company_data["freight_act"], 0, 0, $credit_note->get_tax_free_shipping(), $credit_note->customer_id, @@ -144,13 +152,6 @@ function write_credit_note($credit_note, $write_off_acc) "A tax GL posting for this credit note could not be inserted"); } } - if (($credit_note_total + $credit_note->freight_cost) != 0) { - - $total += add_gl_trans(11, $credit_no, $credit_date, $branch_data["receivables_account"], 0, 0, "", - -$total, null, payment_person_types::customer(), $credit_note->customer_id, - "The total debtor GL posting for the credit note could not be inserted"); - } - /*Post a balance post if $total != 0 */ add_gl_balance(11, $credit_no, $credit_date, -$total, payment_person_types::customer(), $credit_note->customer_id); diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc index 0dc6de56..87b9eb7e 100644 --- a/sales/includes/db/sales_invoice_db.inc +++ b/sales/includes/db/sales_invoice_db.inc @@ -122,6 +122,12 @@ function write_sales_invoice(&$invoice) } /*quantity dispatched is more than 0 */ } /*end of delivery_line loop */ + if (($items_total + $charge_shipping) != 0) { + $total += add_gl_trans_customer(10, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0, + ($items_total + $charge_shipping + $items_added_tax + $freight_added_tax), + $invoice->customer_id, "The total debtor GL posting could not be inserted"); + } + if ($charge_shipping != 0) { $total += add_gl_trans_customer(10, $invoice_no, $date_, $company_data["freight_act"], 0, 0, -$invoice->get_tax_free_shipping(), $invoice->customer_id, @@ -139,11 +145,6 @@ function write_sales_invoice(&$invoice) } } - if (($items_total + $charge_shipping) != 0) { - $total += add_gl_trans(10, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0, "", - -$total, null, payment_person_types::customer(), $invoice->customer_id, "The total debtor GL posting could not be inserted"); - } - /*Post a balance post if $total != 0 */ add_gl_balance(10, $invoice_no, $date_, -$total, payment_person_types::customer(), $invoice->customer_id);