Wrong linked credit data on invoices/credits table when view PO

[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 a8b6e0dc48631201d458bfb2f5d7497b69ff9ff7..c95e5de4a994d8006eab52d3513d94e00fe0fd99 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -379,8 +379,10 @@ function get_po_invoices_credits($po_number)
                FROM ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items, "
                .TB_PREF."purch_order_details, ".TB_PREF."purch_orders
                WHERE ".TB_PREF."supp_invoice_items.supp_trans_no = ".TB_PREF."supp_trans.trans_no
+               AND ".TB_PREF."supp_invoice_items.supp_trans_type = ".TB_PREF."supp_trans.type
                AND ".TB_PREF."supp_invoice_items.po_detail_item_id = ".TB_PREF."purch_order_details.po_detail_item
                AND ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."supp_trans.supplier_id
+               AND ".TB_PREF."purch_orders.order_no = ".TB_PREF."purch_order_details.order_no
                AND ".TB_PREF."purch_order_details.order_no = ".db_escape($po_number);
 
        return db_query($sql, "The invoices/credits for the po $po_number could not be retreived");
@@ -580,6 +582,21 @@ function remove_not_invoice_item($id)
 
        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']);
+               
+    $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"));
+               }       
+       }
 
        commit_transaction();
 }