Fixed multiplied amounts in Journal Inquiry.

[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 1482ebcc8804434c1c51fe1a46171e6a46563b0c..3ffc35d3abc23a8ac628a5a5f2f9074bb51f1096 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -20,7 +20,9 @@ function read_supplier_details_to_trans(&$supp_trans, $supplier_id)
                supp.tax_group_id, tax_group.name AS tax_group_name,
                supp.credit_limit - Sum(IFNULL(IF(trans.type=".ST_SUPPCREDIT.", -1, 1) 
                        * (ov_amount + ov_gst + ov_discount),0)) as cur_credit
-               FROM ".TB_PREF."suppliers supp LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, ".TB_PREF."payment_terms terms, ".TB_PREF."tax_groups tax_group
+               FROM ".TB_PREF."suppliers supp 
+                       LEFT JOIN ".TB_PREF."supp_trans trans ON supp.supplier_id = trans.supplier_id, "
+                       .TB_PREF."payment_terms terms, ".TB_PREF."tax_groups tax_group
                WHERE supp.tax_group_id = tax_group.id
                AND supp.payment_terms=terms.terms_indicator
                AND supp.supplier_id = ".db_escape($supplier_id)." GROUP BY supp.supp_name";
@@ -456,7 +458,6 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
                $supp_trans->supplier_name = $trans_row["supp_name"];
                $supp_trans->tran_date = sql2date($trans_row["tran_date"]);
                $supp_trans->due_date = sql2date($trans_row["due_date"]);
-               //$supp_trans->Comments = $trans_row["TransText"];
                $supp_trans->Comments = get_comments_string($trans_type, $trans_no);
                $supp_trans->reference = $trans_row["reference"];
                $supp_trans->supp_reference = $trans_row["supp_reference"];
@@ -651,41 +652,47 @@ function is_reference_already_there($supplier_id, $supp_reference, $trans_no=0)
 
 function remove_not_invoice_item($id)
 {
-       begin_transaction();
-
-       $myrow = get_grn_item_detail($id);
+    begin_transaction();
 
-       $grn = get_grn_batch($myrow['grn_batch_id']);
+    $myrow = get_grn_item_detail($id);
 
-       $sql = "UPDATE ".TB_PREF."purch_order_details
-               SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
-       db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
-
-       $sql = "UPDATE ".TB_PREF."grn_items
-               SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
-       db_query($sql, "The quantity invoiced off the items received record could not be updated");
+    $grn = get_grn_batch($myrow['grn_batch_id']);
+    
+    $supp = get_supplier($grn["supplier_id"]);
 
-       update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
-               $myrow["unit_price"], -$myrow["QtyOstdg"], Today());
+    $sql = "UPDATE ".TB_PREF."purch_order_details
+        SET quantity_received = qty_invoiced, quantity_ordered = qty_invoiced WHERE po_detail_item = ".$myrow["po_detail_item"];
+    db_query($sql, "The quantity invoiced of the purchase order line could not be updated");
 
-       add_stock_move(ST_SUPPRECEIVE, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
-               -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $myrow['unit_price']);
-               
+    $sql = "UPDATE ".TB_PREF."grn_items
+        SET qty_recd = quantity_inv WHERE id = ".$myrow["id"];
+    db_query($sql, "The quantity invoiced off the items received record could not be updated");
+
+    update_average_material_cost($grn["supplier_id"], $myrow["item_code"],
+        $myrow["unit_price"], -$myrow["QtyOstdg"], Today());
+        
+    $price = $myrow['unit_price'];
+    if ($supp['tax_included'])
+        $price = get_tax_free_price_for_item($myrow['item_code'], $myrow['unit_price'], $supp['tax_group_id'], $supp['tax_included']);        
+
+    add_stock_move(ST_SUPPRECEIVE, $myrow["item_code"], $myrow['grn_batch_id'], $grn['loc_code'], sql2date($grn["delivery_date"]), "",
+        -$myrow["QtyOstdg"], $myrow['std_cost_unit'], $grn["supplier_id"], 1, $price);
+        
     $clearing_act = get_company_pref('grn_clearing_act');
-       if ($clearing_act) {    // otherwise GRN clearing account is not used
-               if (is_inventory_item($myrow['item_code']))
-               {
-               $total = 0;
-                       $stock_gl_code = get_stock_gl_code($myrow['item_code']);
-                       $date = sql2date($grn["delivery_date"]);
-                       $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $stock_gl_code["inventory_account"],
-                               $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-                               -$myrow['QtyOstdg'] * $myrow['unit_price'], $grn["supplier_id"], "", 0, _("GRN Removal"));
-                       $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $clearing_act,
-                               0, 0, -$total, null, "", 0, _("GRN Removal"));
-               }       
-       }
+    if ($clearing_act) {    // otherwise GRN clearing account is not used
+        if (is_inventory_item($myrow['item_code']))
+        {
+            $total = 0;
+            $stock_gl_code = get_stock_gl_code($myrow['item_code']);
+            $date = sql2date($grn["delivery_date"]);
+            $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $stock_gl_code["inventory_account"],
+                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
+                -$myrow['QtyOstdg'] * $price, $grn["supplier_id"], "", 0, _("GRN Removal"));
+            $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $myrow['grn_batch_id'], $date, $clearing_act,
+                0, 0, -$total, null, "", 0, _("GRN Removal"));
+        }    
+    }
 
-       commit_transaction();
+    commit_transaction();
 }
 ?>