Allowed multiply bank accounts on same gl account, removed bank trans type.

[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..d11786356d4d2820942ec0e985515b461da0ae52 100644 (file)
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -19,6 +19,8 @@ function write_sales_invoice(&$invoice)
 
        $branch_data = get_branch_accounts($invoice->Branch);
 
+       $customer = get_customer($invoice->customer_id);
+
        // offer price values without freight costs
        $items_total = $invoice->get_items_total_dispatch();
        $freight_tax = $invoice->get_shipping_tax();
@@ -43,6 +45,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 +60,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);
@@ -83,7 +91,7 @@ function write_sales_invoice(&$invoice)
 
                // Update delivery items for the quantity invoiced
                if ($invoice_line->qty_old != $invoice_line->qty_dispatched)
-                       update_parent_line(10, $invoice_line->id, ($invoice_line->qty_dispatched-$invoice_line->qty_old));
+                       update_parent_line(10, $invoice_line->src_id, ($invoice_line->qty_dispatched-$invoice_line->qty_old));
 
                if ($invoice_line->qty_dispatched != 0) {
                        $stock_gl_code = get_stock_gl_code($invoice_line->stock_id);
@@ -91,16 +99,21 @@ function write_sales_invoice(&$invoice)
                        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"],
-                                               $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");
+                               // 2008-06-14. If there is a Branch Sales Account, then override with this,
+                               // else take the Item Sales Account
+                               $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,
+                               // else take the Item Dimension (if any)
+                               $dim = ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]);
+                               $dim2 = ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]);
+                               add_gl_trans_customer(10, $invoice_no, $date_, $sales_account, $dim, $dim2,
+                                       (-$line_taxfree_price * $invoice_line->qty_dispatched),
+                                       $invoice->customer_id, "The sales price GL posting could not be inserted");
 
                                if ($invoice_line->discount_percent != 0) {
 
                                        add_gl_trans_customer(10, $invoice_no, $date_,
-                                               $branch_data["sales_discount_account"], $stock_gl_code["dimension_id"],
-                                               $stock_gl_code["dimension2_id"],
+                                               $branch_data["sales_discount_account"], $dim, $dim2,
                                                ($line_taxfree_price * $invoice_line->qty_dispatched * $invoice_line->discount_percent),
                                                $invoice->customer_id, "The sales discount GL posting could not be inserted");
                                } /*end of if discount !=0 */
@@ -134,10 +147,22 @@ 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);
+               if ($invoice->cash) {
+                       $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->cash_account, $date_,
+                               references::get_next(12), $amount-$discount, $discount,
+                               _('Cash invoice').' '.$invoice->trans_no);
+                       add_cust_allocation($amount, 12, $pmtno, 10, $invoice_no);
+               }
        }
-
        commit_transaction();
 
        return $invoice_no;
@@ -152,18 +177,18 @@ function void_sales_invoice($type, $type_no)
        void_bank_trans($type, $type_no, true);
        void_gl_trans($type, $type_no, true);
 
-       // for invoices and credits related to invoices,
-       // reverse all the changes in the sales order
+       // reverse all the changes in parent document(s)
        $items_result = get_customer_trans_details($type, $type_no);
 
-       $delivery = get_customer_trans_link($type, $type_no);
+       $deliveries = get_parent_trans($type, $type_no);
 
-       if ($delivery) {
+       if (count($deliveries)) {
+               $srcdetails = get_customer_trans_details(get_parent_type($type), $deliveries);
                while ($row = db_fetch($items_result)) {
-                       update_parent_line(10, $row['id'], -$row['quantity']);
+                       $src_line = db_fetch($srcdetails);
+                       update_parent_line(10, $src_line['id'], -$row['quantity']);
                }
        }
-
        // clear details after they've been reversed in the sales order
        void_customer_trans_details($type, $type_no);