Fixed amibiguity in few text messages to make translations easier, updated gettext...

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

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index d927fd64b66978af13a98e3324202d5a765be259..7604568f8947b4754bd852d20e99514167a102c1 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -99,7 +99,14 @@ function add_grn(&$po)
        begin_transaction();
        hook_db_prewrite($po, ST_SUPPRECEIVE);
 
-       add_new_exchange_rate(get_supplier_currency($po->supplier_id), $date_, $po->ex_rate);
+       if (!is_company_currency($po->curr_code))
+       {
+               if (!$po->ex_rate)
+                       $po->ex_rate = get_date_exchange_rate($po->curr_code, $date_);
+               else
+                       add_new_exchange_rate($po->curr_code, $date_, $po->ex_rate);
+       } else
+               $po->ex_rate = 1;
 
        $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_, $po->ex_rate);
 
@@ -145,8 +152,7 @@ function add_grn(&$po)
                        $po->line_items[$line_no]->grn_item_id = $grn_item;
                        /* Update location stock records - NB  a po cannot be entered for a service/kit parts done automatically */
                        add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
-                               $order_line->receive_qty, $order_line->standard_cost,
-                       $po->supplier_id, 1, $order_line->taxfree_charge_price($po));
+                               $order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_price($po));
 
                } /*quantity received is != 0 */
        } /*end of order_line loop */
@@ -252,7 +258,7 @@ function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date)
        db_query($sql);
 
     add_stock_move(ST_SUPPCREDIT, $entered_grn->item_code, $transno, $myrow['loc_code'], $date, "",
-               $entered_grn->this_quantity_inv, $mcost, $supplier, 1, $entered_grn->chg_price);
+               $entered_grn->this_quantity_inv, $mcost, $entered_grn->chg_price);
 }
 
 function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false,