[0000598] Added tax_included field to debtor_trans table.
[fa-stable.git] / sales / includes / db / sales_delivery_db.inc
index 4d20f62367c90ca0122cea20f7d46fdc9ba65e6a..8f1c48718c2e440bde837942e73eea83cbfa4c0b 100644 (file)
@@ -1,24 +1,27 @@
 <?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 
-       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
 //
 function write_sales_delivery(&$delivery,$bo_policy)
 {
+       global $Refs;
 
        $trans_no = $delivery->trans_no;
        if (is_array($trans_no)) $trans_no = key($trans_no);
 
        begin_transaction();
+       $delivery->bo_policy = $bo_policy;
+       hook_db_prewrite($delivery, ST_CUSTDELIVERY);
 
        $customer = get_customer($delivery->customer_id);
        $delivery_items_total = $delivery->get_items_total_dispatch();
@@ -31,28 +34,31 @@ 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 */
-       $delivery_no = write_customer_trans(13, $trans_no, $delivery->customer_id,
+       $delivery_no = write_customer_trans(ST_CUSTDELIVERY, $trans_no, $delivery->customer_id,
                $delivery->Branch, $delivery->document_date, $delivery->reference,
                $delivery_items_total, 0,
                $delivery->tax_included ? 0 : $tax_total-$freight_tax,
                $delivery->freight_cost,
                $delivery->tax_included ? 0 : $freight_tax,
-               $delivery->sales_type, $delivery->order_no, 0,
-               $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, $delivery->dimension2_id);
+               $delivery->sales_type, $delivery->order_no,
+               $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, 
+               $delivery->dimension2_id, $delivery->payment, $delivery->tax_included);
 
        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_trans_tax_details(13, $delivery_no);
-               delete_comments(13, $delivery_no);
+               void_gl_trans(ST_CUSTDELIVERY, $delivery_no, true);
+               void_stock_move(ST_CUSTDELIVERY, $delivery_no);
+               void_trans_tax_details(ST_CUSTDELIVERY, $delivery_no);
+               delete_comments(ST_CUSTDELIVERY, $delivery_no);
        }
 
-       foreach ($delivery->line_items as $delivery_line) {
+       foreach ($delivery->line_items as $line_no => $delivery_line) {
+
                $line_price = $delivery_line->line_price();
                $line_taxfree_price = get_tax_free_price_for_item($delivery_line->stock_id,
                        $delivery_line->price, 0, $delivery->tax_included,
@@ -65,19 +71,19 @@ function write_sales_delivery(&$delivery,$bo_policy)
                        $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
 
                /* add delivery details for all lines */
-               write_customer_trans_detail_item(13, $delivery_no, $delivery_line->stock_id,
+               write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id,
                        $delivery_line->item_description, $delivery_line->qty_dispatched,
                        $delivery_line->line_price(), $line_tax,
-                       $delivery_line->discount_percent, $delivery_line->standard_cost,
+                       $delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id,
                        $trans_no ? $delivery_line->id : 0);
 
        // Now update sales_order_details for the quantity delivered
                if ($delivery_line->qty_old != $delivery_line->qty_dispatched)
-                       update_parent_line(13, $delivery_line->src_id,
+                       update_parent_line(ST_CUSTDELIVERY, $delivery_line->src_id,
                                $delivery_line->qty_dispatched-$delivery_line->qty_old);
 
                if ($delivery_line->qty_dispatched != 0) {
-                       add_stock_move_customer(13, $delivery_line->stock_id, $delivery_no,
+                       add_stock_move_customer(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
                                $delivery->Location, $delivery->document_date, $delivery->reference,
                                -$delivery_line->qty_dispatched, $delivery_line->standard_cost,1,
                                $line_price, $delivery_line->discount_percent);
@@ -86,7 +92,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                        $stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
 
                        /* insert gl_trans to credit stock and debit cost of sales at standard cost*/
-                       if ($delivery_line->standard_cost != 0) {
+                       if (is_inventory_item($delivery_line->stock_id) && $delivery_line->standard_cost != 0) {
 
                                /*first the cost of sales entry*/
                                // 2008-08-01. If there is a Customer Dimension, then override with this,
@@ -96,19 +102,18 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                $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,
+                               add_gl_trans_std_cost(ST_CUSTDELIVERY, $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*/
-                               //$stock_gl_code = get_stock_gl_code($order_line->stock_id);
 
-                               add_gl_trans_std_cost(13, $delivery_no, $delivery->document_date,
+                               add_gl_trans_std_cost(ST_CUSTDELIVERY, $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 */
@@ -124,19 +129,20 @@ function write_sales_delivery(&$delivery,$bo_policy)
        // taxes - this is for printing purposes
        foreach ($taxes as $taxitem) {
                if ($taxitem['Net'] != 0) {
-                   add_trans_tax_details(13, $delivery_no, $taxitem['tax_type_id'],
+                               $ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($delivery->customer_id), $delivery->document_date);
+                   add_trans_tax_details(ST_CUSTDELIVERY, $delivery_no, $taxitem['tax_type_id'],
                                $taxitem['rate'], $delivery->tax_included, $taxitem['Value'],
-                               $taxitem['Net'], $delivery->document_date, $delivery->reference );
+                               $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference );
                }
        }
 
-       add_comments(13, $delivery_no, $delivery->document_date, $delivery->Comments);
+       add_comments(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $delivery->Comments);
 
        if ($trans_no == 0) {
-               if ($delivery->reference!='auto')
-                       references::save_last($delivery->reference, 13);
+                       $Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
        }
 
+       hook_db_postwrite($delivery, ST_CUSTDELIVERY);
        commit_transaction();
 
        return $delivery_no;
@@ -144,10 +150,13 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
 //--------------------------------------------------------------------------------------------------
 
-function void_sales_delivery($type, $type_no)
+function void_sales_delivery($type, $type_no, $transactions=true)
 {
-       begin_transaction();
+       if ($transactions)
+               begin_transaction();
 
+       hook_db_prevoid($type, $type_no);
+       
        void_gl_trans($type, $type_no, true);
 
        // reverse all the changes in the sales order
@@ -156,10 +165,11 @@ function void_sales_delivery($type, $type_no)
        $order = get_customer_trans_order($type, $type_no);
 
        if ($order) {
-               $order_items = get_sales_order_details($order);
+               $auto = (get_reference(ST_SALESORDER, $order) == "auto");
+               $order_items = get_sales_order_details($order, ST_SALESORDER);
                while ($row = db_fetch($items_result)) {
                        $order_line = db_fetch($order_items);
-                       update_parent_line(13, $order_line['id'], -$row['quantity']);
+                       update_parent_line(ST_CUSTDELIVERY, $order_line['id'], -$row['quantity'], $auto);
                }
        }
 
@@ -174,6 +184,7 @@ function void_sales_delivery($type, $type_no)
        // DO NOT MOVE THIS ABOVE VOIDING or we can end up with trans with alloc < 0
        void_customer_trans($type, $type_no);
 
-       commit_transaction();
+       if ($transactions)
+               commit_transaction();
 }
 ?>
\ No newline at end of file