Fixed bug 0000008

[fa-stable.git] / sales / includes / db / sales_invoice_db.inc

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index 21ba9c5cc42b2b8512e887c92df0a304a9e20baa..8270ea6eaf3f92c2d9d7f9cc72f4556fece6dfd5 100644 (file)
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -43,6 +43,12 @@ function write_sales_invoice(&$invoice)
            $items_added_tax = 0;
            $freight_added_tax = 0;
        }
+       // 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;
 
        /* Insert/update the debtor_trans */
        $sales_order = $invoice->order_no;
@@ -52,8 +58,8 @@ function write_sales_invoice(&$invoice)
        $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 ($trans_no == 0) {
                $invoice->trans_no = array($invoice_no=>0);
@@ -87,11 +93,17 @@ function write_sales_invoice(&$invoice)
 
                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'];
 
                        if ($invoice_line->line_price() != 0) {
                                //Post sales transaction to GL credit sales
 
-                                       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");
@@ -134,7 +146,6 @@ function write_sales_invoice(&$invoice)
        add_comments(10, $invoice_no, $date_, $invoice->Comments);
 
        if ($trans_no == 0) {
-               //add_forms_for_sys_type(10, $invoice_no, $invoice->Location);
                references::save_last($invoice->reference, 10);
        }