Changed memo message in supp invoice price variance

Changed Ourstanding GRN Report to use Actual Price instead of Std Cost.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 08368e4a7170acf6f637a5e9914c21240c2ecde9..e053ce9d1836abff0e0ebe2bc992ecf530469327 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,12 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-Jun-2010 Chaitanya/Joe Hunt
+! Changed memo message in supp invoice price variance
+$ /purchasing/includes/db/invoice_db.inc
+! Changed Ourstanding GRN Report to use Actual Price instead of Std Cost.
+$ /reporting/rep204.php
+
 23-Jun-2010 Janusz Dobrowolski
 # Restored customer payments display
 $ /sales/includes/db/cust_trans_db.inc

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 57934ae4f0952b909e7feaa506a46605b46de9ed..c584115c858330bc3bd016d50c0939cbb91a674e 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -240,12 +240,17 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                                $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency
                                if ($amt != 0.0)
                                {
+                                       $_s = $entered_grn->item_code;
+                                       $_d = $deliveries[0];
+                                       $_od = $old_date;
+                                       $_cd = $mat_cost - $deliveries[1];
+                                       $memo = _("Cost difference adjustment for $_s. $_d items delivered since $_od. The cost difference is $_cd");
                                        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."),
+                                               $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
                                                $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_,  $iv_act,
-                                               0, 0, _("Cost diff."), -$amt, null, null, null,
+                                               0, 0, $memo, -$amt, null, null, null,
                                                "The general ledger transaction could not be added for the price variance of the inventory item");
                                }               
                                update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost);

diff --git a/reporting/rep204.php b/reporting/rep204.php
index 03d1cd864303d1e51979dda8ae29cfa40caee272..61034d3516ac1e86d3d20df493cc8c3f5f2eb04e 100644 (file)
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -80,7 +80,7 @@ function print_outstanding_GRN()
        $cols = array(0, 40, 80, 190,   250, 320, 385, 450,     515);
 
        $headers = array(_('GRN'), _('Order'), _('Item') . '/' . _('Description'), _('Qty Recd'), _('qty Inv'), _('Balance'),
-               _('Std Cost'), _('Value'));
+               _('Act Price'), _('Value'));
 
        $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right', 'right');
 
@@ -122,9 +122,9 @@ function print_outstanding_GRN()
                $rep->AmountCol(3, 4, $GRNs['qty_recd'], $dec2);
                $rep->AmountCol(4, 5, $GRNs['quantity_inv'], $dec2);
                $QtyOstg = $GRNs['qty_recd'] - $GRNs['quantity_inv'];
-               $Value = ($GRNs['qty_recd'] - $GRNs['quantity_inv']) * $GRNs['std_cost_unit'];
+               $Value = ($GRNs['qty_recd'] - $GRNs['quantity_inv']) * $GRNs['act_price'];
                $rep->AmountCol(5, 6, $QtyOstg, $dec2);
-               $rep->AmountCol(6, 7, $GRNs['std_cost_unit'], $dec);
+               $rep->AmountCol(6, 7, $GRNs['act_price'], $dec);
                $rep->AmountCol(7, 8, $Value, $dec);
                $Tot_Val += $Value;
                $SuppTot_Val += $Value;