Record status edition added.

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

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 8fb7b1eb46ef13643b81c662b359182f83a972c1..9155c0894e4c3b4dab8f0193a146a4f9c18c734e 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //-----------------------------------------------------------------------------
 // insert/update sales delivery
@@ -31,6 +31,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
        $taxes = $delivery->get_taxes(); // all taxes with freight_tax
 
        foreach ($taxes as $taxitem) {
+               $taxitem['Value'] =  round2($taxitem['Value'], user_price_dec());
                $tax_total +=  $taxitem['Value'];
        }
        /* Insert/update the debtor_trans */
@@ -48,7 +49,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
        } else {
                void_gl_trans(13, $delivery_no, true);
                void_stock_move(13, $delivery_no);
-               void_customer_trans_tax_details(13, $delivery_no);
+               void_trans_tax_details(13, $delivery_no);
                delete_comments(13, $delivery_no);
        }
 
@@ -123,9 +124,11 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
        // taxes - this is for printing purposes
        foreach ($taxes as $taxitem) {
-               if ($taxitem['Value'] != 0) {
-                   add_customer_trans_tax_detail_item(13, $delivery_no, $taxitem['tax_type_id'],
-                               $taxitem['rate'], $delivery->tax_included, $taxitem['Value']);
+               if ($taxitem['Net'] != 0) {
+                               $ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($delivery->customer_id), $delivery->document_date);
+                   add_trans_tax_details(13, $delivery_no, $taxitem['tax_type_id'],
+                               $taxitem['rate'], $delivery->tax_included, $taxitem['Value'],
+                               $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference );
                }
        }
 
@@ -165,7 +168,7 @@ function void_sales_delivery($type, $type_no)
        // clear details after they've been reversed in the sales order
        void_customer_trans_details($type, $type_no);
 
-       void_customer_trans_tax_details($type, $type_no);
+       void_trans_tax_details($type, $type_no);
 
        void_cust_allocations($type, $type_no);