Eliminated non-static method calls and other bulk fixes to fix php5 warnings

[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 f2237dbd9fe0f6e21aef534990784543ae1a672c..4b38c28c6dd3c861e9e8c6589462d0056fbaed81 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -1,9 +1,20 @@
 <?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>.
+***********************************************************************/
 //-----------------------------------------------------------------------------
 // insert/update sales delivery
 //
 function write_sales_delivery(&$delivery,$bo_policy)
 {
+       global $Refs;
 
        $trans_no = $delivery->trans_no;
        if (is_array($trans_no)) $trans_no = key($trans_no);
@@ -21,6 +32,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 */
@@ -31,14 +43,14 @@ function write_sales_delivery(&$delivery,$bo_policy)
                $delivery->freight_cost,
                $delivery->tax_included ? 0 : $freight_tax,
                $delivery->sales_type, $delivery->order_no, 0,
-               $delivery->ship_via, $delivery->due_date, 0, $delivery->dimension_id, $delivery->dimension2_id);
+               $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, $delivery->dimension2_id);
 
        if ($trans_no == 0) {
                $delivery->trans_no = array($delivery_no=>0);
        } 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);
        }
 
@@ -81,13 +93,15 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                /*first the cost of sales entry*/
                                // 2008-08-01. If there is a Customer Dimension, then override with this,
                                // else take the Item Dimension (if any)
-                               $dim = ($delivery->dimension_id > 0 ? $delivery->dimension_id : ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
-                               $dim2 = ($delivery->dimension2_id > 0 ? $delivery->dimension2_id : ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
+                               $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id : 
+                                       ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+                               $dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id : 
+                                       ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
 
                                add_gl_trans_std_cost(13, $delivery_no,
                                        $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
                                        $delivery_line->standard_cost * $delivery_line->qty_dispatched,
-                                       payment_person_types::customer(), $delivery->customer_id,
+                                       PT_CUSTOMER, $delivery->customer_id,
                                        "The cost of sales GL posting could not be inserted");
 
                                /*now the stock entry*/
@@ -96,7 +110,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                add_gl_trans_std_cost(13, $delivery_no, $delivery->document_date,
                                        $stock_gl_code["inventory_account"], 0, 0, "",
                                        (-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
-                                       payment_person_types::customer(), $delivery->customer_id,
+                                       PT_CUSTOMER, $delivery->customer_id,
                                        "The stock side of the cost of sales GL posting could not be inserted");
 
                        } /* end of if GL and stock integrated and standard cost !=0 */
@@ -111,17 +125,18 @@ 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 );
                }
        }
 
        add_comments(13, $delivery_no, $delivery->document_date, $delivery->Comments);
 
        if ($trans_no == 0) {
-               if ($delivery->reference!='auto')
-                       references::save_last($delivery->reference, 13);
+                       $Refs->save(13, $delivery_no, $delivery->reference);
        }
 
        commit_transaction();
@@ -143,7 +158,7 @@ function void_sales_delivery($type, $type_no)
        $order = get_customer_trans_order($type, $type_no);
 
        if ($order) {
-               $order_items = get_sales_order_details($order);
+               $order_items = get_sales_order_details($order, 30);
                while ($row = db_fetch($items_result)) {
                        $order_line = db_fetch($order_items);
                        update_parent_line(13, $order_line['id'], -$row['quantity']);
@@ -153,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);