Fixing tax_included in gl_items.

[fa-stable.git] / purchasing / includes / db / invoice_db.inc

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 26ff38a4fd674ee3dcdd899c4592a14e6f03f988..48e33987503ab0704e3058224cb8516a0cdd0ec3 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -157,7 +157,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
     /*First insert the invoice into the supp_trans table*/
        $invoice_id = add_supp_trans($trans_type, $supp_trans->supplier_id, $date_, $supp_trans->due_date,
                $supp_trans->reference, $supp_trans->supp_reference,
-               $invoice_items_total, $item_added_tax, $supp_trans->ov_discount);
+               $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included);
 
        $total = 0;
     /* Now the control account */
@@ -188,7 +188,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                        $entered_gl_code->amount = -$entered_gl_code->amount;
                add_gl_tax_details($entered_gl_code->gl_code, 
                        $trans_type, $invoice_id, $entered_gl_code->amount,
-                       $ex_rate, $date_, $supp_trans->supp_reference);
+                       $ex_rate, $date_, $supp_trans->supp_reference, $supp_trans->tax_included);
     }
     foreach ($supp_trans->grn_items as $line_no => $entered_grn)
     {
@@ -201,11 +201,11 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id);
                $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree;
                $stock_gl_code = get_stock_gl_code($entered_grn->item_code);
-               $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : $stock_gl_code["cogs_account"]);
-
-               $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["purchase_account"],
+               $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : 
+                       ($supplier_accounts["purchase_account"] ? $supplier_accounts["purchase_account"] : $stock_gl_code["cogs_account"]));
+               $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
                        $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-                       $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);             
+                       $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);
                /*$total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
                        $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
                        $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);*/
@@ -229,29 +229,31 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                        //{
                        //$diff = $entered_grn->chg_price - $old_price;
                        $old_date = sql2date($old[1]);
-                       $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
-                               $entered_grn->chg_price);       
+                       if (is_inventory_item($entered_grn->item_code))
+                       {
+                               $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
+                                       $entered_grn->chg_price);       
                        
-                       // always return due to change in currency.
-                       /*$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
-                               $diff, $entered_grn->this_quantity_inv, $old_date, true); */
-                       $mat_cost = update_average_material_cost(null, $entered_grn->item_code,
-                               $diff, $entered_grn->this_quantity_inv, null, true);
+                               // always return due to change in currency.
+                               /*$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
+                                       $diff, $entered_grn->this_quantity_inv, $old_date, true); */
+                               $mat_cost = update_average_material_cost(null, $entered_grn->item_code,
+                                       $diff, $entered_grn->this_quantity_inv, null, true);
                                
-                       //Add GL transaction for GRN Provision in case of difference
-                       if (($diff * $entered_grn->this_quantity_inv) != 0 )
-                       {
-                               $diff_amt = $diff * $entered_grn->this_quantity_inv;
-                               add_gl_trans($trans_type, $invoice_id, $date_,  $iv_act,
-                                       $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], 'GRN Provision',
-                                       $diff_amt, null, null, null,
-                                       "The general ledger transaction could not be added for the GRN of the inventory item"); 
+                               //Add GL transaction for GRN Provision in case of difference
+                               if (($diff * $entered_grn->this_quantity_inv) != 0 )
+                               {
+                                       $diff_amt = $diff * $entered_grn->this_quantity_inv;
+                                       add_gl_trans($trans_type, $invoice_id, $date_,  $iv_act,
+                                               $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], 'GRN Provision',
+                                               $diff_amt, null, null, null,
+                                               "The general ledger transaction could not be added for the GRN of the inventory item"); 
                                        
-                               add_gl_trans($trans_type, $invoice_id, $date_,  $stock_gl_code["cogs_account"],
-                                       0, 0, 'GRN Provision', -$diff_amt, null, null, null,
-                                       "The general ledger transaction could not be added for the GRN of the inventory item");                         
-                       }
-                       
+                                       add_gl_trans($trans_type, $invoice_id, $date_,  $stock_gl_code["cogs_account"],
+                                               0, 0, 'GRN Provision', -$diff_amt, null, null, null,
+                                               "The general ledger transaction could not be added for the GRN of the inventory item");                         
+                               }
+                       }       
                        // added 2008-12-08 Joe Hunt. Update the purchase data table
                        add_or_update_purchase_data($supp_trans->supplier_id, $entered_grn->item_code, $entered_grn->chg_price); 
                        /*$deliveries = get_deliveries_between($entered_grn->item_code, $old_date, Today()); // extend the period, if invoice is before any deliveries.
@@ -276,7 +278,8 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                                }               
                                update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost);
                        } */
-                       update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
+                       if (is_inventory_item($entered_grn->item_code))
+                               update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
                //}
                }
        // ----------------------------------------------------------------------