Bug [0000044] Standard Cost error on credit note. Reopened. Stock Movement forgot...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ea485d1c35077376593dfb25dba6391013d4c46b..7b377430d611b99dbf2a9ddf25bcca61b8ddf0db 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+03-Sep-2008 Joe Hunt
+# Bug [0000044] Standard Cost error on credit note. Reopened. Stock Movement forgot the credit note.
+$ /inventory/inquiry/stock_movements.php
+  /purchasing/includes/db/grn_db.inc
+  /purchasing/includes/invoice_db.inc
+
 03-Sep-2008 Joe Hunt
 # Bug [0000043] Inventory Adjustment Session doesn't update standard cost
 # Bug [0000044] Standard Cost error on credit note

diff --git a/config.php b/config.php
index 731e26f3aaf586121c1e1ea526a73124329ed6bc..68fa5aafb849366ed39ab4ad9b9ba55d3b3a0b1f 100644 (file)
--- a/config.php
+++ b/config.php
@@ -38,7 +38,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Main Title
        $app_title = "FrontAccounting";
        // application version
-       $version                = "2.0";
+       $version                = "2.0 RC2";
 
        // Build for development purposes
        $build_version  = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 0f4b21daaf8c2a8220596379bd7dac48ebbe5117..47b1ad7cc471d6899385395f1ffbfc3d4d7c6215 100644 (file)
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -19,7 +19,7 @@ if ($use_date_picker)
 page(_("Inventory Item Movement"), false, false, "", $js);
 //------------------------------------------------------------------------------------------------
 
-if(get_post('ShowMoves')) 
+if(get_post('ShowMoves'))
 {
        $Ajax->activate('doc_tbl');
 }
@@ -134,7 +134,7 @@ while ($myrow = db_fetch($result))
                        $person = $cust_row['name'] . " (" . $cust_row['br_name'] . ")";
 
        }
-       elseif ($myrow["type"] == 25)
+       elseif ($myrow["type"] == 25 || $myrow['type'] == 21)
        {
                // get the supplier name
                $sql = "SELECT supp_name FROM ".TB_PREF."suppliers WHERE supplier_id = '" . $myrow["person_id"] . "'";

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 8bd47b45ce3e9fcea6d828eb243e2da58c20c4b7..0335e64f3b98c400116ee5efb5d903494e61ba04 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -129,6 +129,25 @@ function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $descri
 
 //----------------------------------------------------------------------------------------
 
+function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date)
+{
+       $sql = "SELECT ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.*
+       FROM ".TB_PREF."grn_batch, ".TB_PREF."grn_items
+       WHERE ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id
+               AND ".TB_PREF."grn_items.id=$entered_grn->id
+       AND ".TB_PREF."grn_items.item_code='$entered_grn->item_code' ";
+       $result = db_query($sql, "Could not retreive GRNS");
+       $myrow = db_fetch($result);
+       //$sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=0, quantity_inv=0 WHERE id=$entered_grn->id";
+       $sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=qty_recd+$entered_grn->this_quantity_inv,
+               quantity_inv=quantity_inv+$entered_grn->this_quantity_inv WHERE id=$entered_grn->id";
+       db_query($sql);
+       $mcost = update_average_material_cost($supplier, $entered_grn->item_code,
+               $entered_grn->chg_price, $entered_grn->this_quantity_inv, $date);
+    add_stock_move(21, $entered_grn->item_code, $transno, $myrow['loc_code'], $date, "",
+               $entered_grn->this_quantity_inv, $mcost, $supplier, 1, $entered_grn->chg_price);
+}
+
 function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false,
        $is_invoiced_only=false)
 {

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index a743106fe8d23ecf79948008bd23e6c754a70a87..3b4bcbedaa0dbf699a51a6c8d9ed49cc976c264b 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -170,47 +170,48 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang
        if (!$supp_trans->is_invoice)
        {
                        $entered_grn->this_quantity_inv = -$entered_grn->this_quantity_inv;
-                       update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code,
-                       $entered_grn->chg_price, $entered_grn->this_quantity_inv, $date_);
+                       set_grn_item_credited($entered_grn, $supp_trans->supplier_id, $invoice_id, $date_);
        }
 
                $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;
-
-       $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item,
-               $entered_grn->this_quantity_inv, $entered_grn->chg_price);
                $stock_gl_code = get_stock_gl_code($entered_grn->item_code);
 
                add_gl_trans_supplier($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"],
                        $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
                        $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);
        // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt
-               $old_price = $old[0];
-       if ($supp_trans->is_invoice && $old_price != $entered_grn->chg_price) // price-change, so update
+       if($supp_trans->is_invoice)
        {
-               $diff = $entered_grn->chg_price - $old_price;
-                       $old_date = sql2date($old[1]);
-                       // only update the diff (last parameter, adj_only is set to true).
-               $mat_cost = update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code,
-                       $diff, $entered_grn->this_quantity_inv, $old_date, true);
-               // function just above this
-               $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, $date_);
-                       if ($deliveries[0] != 0) // have deliveries been done during the period?
-               {
-
-                       $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency
-
-                               add_gl_trans($trans_type, $invoice_id, $date_,  $stock_gl_code["cogs_account"],
-                                       $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."),
-                               $amt, null, null, null,
-                               "The general ledger transaction could not be added for the price variance of the inventory item");
-                               add_gl_trans($trans_type, $invoice_id, $date_,  $stock_gl_code["inventory_account"],
-                                       0, 0, _("Cost diff."), -$amt, null, null, null,
-                               "The general ledger transaction could not be added for the price variance of the inventory item");
-                               update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost);
-               }
-                       update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
-       }
+               $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item,
+                       $entered_grn->this_quantity_inv, $entered_grn->chg_price);
+                       $old_price = $old[0];
+                       if ($old_price != $entered_grn->chg_price) // price-change, so update
+                       {
+                               $diff = $entered_grn->chg_price - $old_price;
+                               $old_date = sql2date($old[1]);
+                               // only update the diff (last parameter, adj_only is set to true).
+                               $mat_cost = update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code,
+                                       $diff, $entered_grn->this_quantity_inv, $old_date, true);
+                               // function just above this
+                               $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, $date_);
+                               if ($deliveries[0] != 0) // have deliveries been done during the period?
+                               {
+
+                                       $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency
+
+                                       add_gl_trans($trans_type, $invoice_id, $date_,  $stock_gl_code["cogs_account"],
+                                               $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."),
+                                               $amt, null, null, null,
+                                               "The general ledger transaction could not be added for the price variance of the inventory item");
+                                       add_gl_trans($trans_type, $invoice_id, $date_,  $stock_gl_code["inventory_account"],
+                                               0, 0, _("Cost diff."), -$amt, null, null, null,
+                                               "The general ledger transaction could not be added for the price variance of the inventory item");
+                                       update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost);
+                               }
+                               update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
+                       }
+               }
        // ----------------------------------------------------------------------
 
                add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code,