Bug 4817: g/l account inquiry can timeout due to slow sql. @Braath Waate.

[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 7488e1786face77323572c8d2f559b986b3ad208..503ed275e3b165f338d1a32683f9ac1eddc5c868 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -70,10 +70,10 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi
                $sql = "SELECT act_price, unit_price FROM ".TB_PREF."purch_order_details WHERE
                        po_detail_item = ".db_escape($po_detail_item);
                $result = db_query($sql, "The old actual price of the purchase order line could not be retrieved");
-               $row = db_fetch_row($result);
-               $ret = $row[0];
+               $row = db_fetch($result);
+               $ret = $row['act_price'];
 
-               $unit_price = $row[1]; //Added by Rasmus
+               $unit_price = $row['unit_price']; //Added by Rasmus
 
                $sql = "SELECT delivery_date 
                        FROM ".TB_PREF."grn_batch grn,"
@@ -81,8 +81,8 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi
                        WHERE
                                grn.id = line.grn_batch_id AND line.id=".db_escape($id);
                $result = db_query($sql, "The old delivery date from the received record cout not be retrieved");
-               $row = db_fetch_row($result);
-               $date = $row[0];
+               $row = db_fetch($result);
+               $date = $row['delivery_date'];
        }
        else
        {
@@ -135,7 +135,7 @@ function add_supp_invoice(&$supp_trans)
        $tax_total = 0;
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
        if ($trans_no) {
-               $allocs = get_payments_for($trans_no, $trans_type); // save allocations
+               $allocs = get_payments_for($trans_no, $trans_type, $supp_trans->supplier_id); // save allocations
                void_transaction($trans_type, $trans_no, Today(), _("Document reentered."));
                $Refs->restore_last($trans_type, $trans_no);
        } else
@@ -393,11 +393,7 @@ function add_supp_invoice(&$supp_trans)
                }
        }
 
-//_vd($allocs);
-       reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $to_allocate, $allocs);
-//_vd(get_payments_for($sales_order, ST_PURCHORDER));
-//_vd(get_payments_for($invoice_id, ST_SUPPINVOICE));
-//exit;
+       reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $to_allocate, $allocs, $supp_trans->supplier_id);
        $supp_trans->trans_no = $invoice_id;
        hook_db_postwrite($supp_trans, $supp_trans->trans_type);
     commit_transaction();
@@ -496,8 +492,9 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
                }
                else
                {
-                       $supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), 0, 0,
-                                       $details_row["FullUnitPrice"], $details_row["memo_"], $details_row["dimension_id"], $details_row["dimension2_id"]);
+                       $supp_trans->add_gl_codes_to_trans($details_row["gl_code"], get_gl_account_name($details_row["gl_code"]), 
+                               $details_row["dimension_id"], $details_row["dimension2_id"],
+                                       $details_row["FullUnitPrice"], $details_row["memo_"]);
                }
             }
                        $supp_trans->tax_overrides = get_tax_overrides($trans_type, $trans_no);