Merging version 2.1 RC to main trunk.

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

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index dfb4c21b1ce244cc88c2431fbc07eed2858db591..9172bca56eed507959039aa1f579c54afb83a97b 100644 (file)
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //----------------------------------------------------------------------------------------
 // if ($writeoff_acc==0) return goods into $cart->Location
 // if src_docs!=0 => credit invoice else credit note
@@ -62,7 +71,8 @@ function write_credit_note($credit_note, $write_off_acc)
                $credit_note->freight_cost, $freight_added_tax,
                $credit_note->sales_type,
                $credit_note->order_no, $credit_invoice, $credit_note->ship_via,
-               null, $alloc); // 2008-06-14 extra $alloc
+               null, $alloc, 0, $credit_note->dimension_id, $credit_note->dimension2_id); 
+               // 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt
 
        if ($trans_no==0) {
                $credit_note->trans_no = array($credit_no=>0);
@@ -72,7 +82,7 @@ function write_credit_note($credit_note, $write_off_acc)
                void_cust_allocations(11, $credit_no, $credit_date);
                void_gl_trans(11, $credit_no, true);
                void_stock_move(11, $credit_no);
-               void_customer_trans_tax_details(11, $credit_no);
+               void_trans_tax_details(11, $credit_no);
        }
        if ($credit_invoice) {
                $invoice_alloc_balance = get_DebtorTrans_allocation_balance(10, $credit_invoice);
@@ -142,10 +152,12 @@ function write_credit_note($credit_note, $write_off_acc)
        }
 
        foreach ($taxes as $taxitem) {
-               if ($taxitem['Value'] != 0) {
+               if ($taxitem['Net'] != 0) {
 
-                       add_customer_trans_tax_detail_item(11, $credit_no, $taxitem['tax_type_id'],
-                               $taxitem['rate'], $credit_note->tax_included, $taxitem['Value']);
+                       $ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($credit_note->customer_id), $credit_note->document_date);
+                       add_trans_tax_details(11, $credit_no, $taxitem['tax_type_id'],
+                               $taxitem['rate'], $credit_note->tax_included, $taxitem['Value'],
+                               $taxitem['Net'], $credit_note->document_date, $credit_note->reference);
 
                        $total += add_gl_trans_customer(11, $credit_no, $credit_date, $taxitem['sales_gl_code'], 0, 0,
                                $taxitem['Value'], $credit_note->customer_id,
@@ -211,8 +223,10 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_,
        $customer = get_customer($order->customer_id);
        // 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_codes["dimension_id"]);
-       $dim2 = ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_codes["dimension2_id"]);
+       $dim = ($order->dimension_id != $customer['dimension_id'] ? $order->dimension_id : 
+               ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"]));
+       $dim2 = ($order->dimension2_id != $customer['dimension2_id'] ? $order->dimension2_id : 
+               ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_codes["dimension2_id"]));
 
        $total = 0;
        /* insert gl_trans to credit stock and debit cost of sales at standard cost*/