Fixed multiplied amounts in Journal Inquiry.

[fa-stable.git] / purchasing / includes / ui / invoice_ui.inc

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 48251d29be7b1d7a505d909d27ae832d0dc0fb42..67a02e668b110fb7a1db73a2019e86d8fed820db 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -319,6 +319,7 @@ function display_gl_items(&$supp_trans, $mode=0)
 
 function display_grn_items_for_selection(&$supp_trans, $k)
 {
+
        if ($supp_trans->trans_type == ST_SUPPINVOICE)
                $result = get_grn_items(0, $supp_trans->supplier_id, true);
        else
@@ -354,15 +355,15 @@ function display_grn_items_for_selection(&$supp_trans, $k)
                        alt_table_row_color($k);
 
                        $n = $myrow["id"];
-               label_cell(get_trans_view_str(25, $myrow["grn_batch_id"]));
-               label_cell($myrow["id"].
-               hidden('qty_recd'.$n, $myrow["qty_recd"], false).
-               hidden('item_code'.$n, $myrow["item_code"], false).
-               hidden('item_description'.$n, $myrow["description"], false).
-               hidden('prev_quantity_inv'.$n, $myrow['quantity_inv'], false).
-               hidden('order_price'.$n, $myrow['unit_price'], false).
-               hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false).
-               hidden('po_detail_item'.$n, $myrow['po_detail_item'], false));
+               label_cell(get_trans_view_str(25, $myrow["grn_batch_id"]).
+               hidden('qty_recd'.$n, $myrow["qty_recd"], false).
+               hidden('item_code'.$n, $myrow["item_code"], false).
+               hidden('item_description'.$n, $myrow["description"], false).
+               hidden('prev_quantity_inv'.$n, $myrow['quantity_inv'], false).
+               hidden('order_price'.$n, $myrow['unit_price'], false).
+               hidden('std_cost_unit'.$n, $myrow['std_cost_unit'], false).
+               hidden('po_detail_item'.$n, $myrow['po_detail_item'], false).
+               hidden('location'.$n, $myrow["loc_code"], false));
                label_cell(get_trans_view_str(ST_PURCHORDER, $myrow["purch_order_no"]));
             label_cell($myrow["item_code"]);
             label_cell($myrow["description"]);
@@ -394,7 +395,7 @@ function display_grn_items_for_selection(&$supp_trans, $k)
                if (($supp_trans->trans_type == ST_SUPPINVOICE) && $_SESSION["wa_current_user"]->can_access('SA_GRNDELETE')) {  // Added 2008-10-18 by Joe Hunt. Special access rights needed.
                        submit_cells('void_item_id'.$n, _("Remove"), '', _("WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"), true);
                                submit_js_confirm('void_item_id'.$n,
-                                       sprintf(_('You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?'), $n));
+                                       _('You are about to remove all yet non-invoiced items from selected delivery line. This operation also irreversibly changes related order line. Do you want to continue ?'));
                        }
                        end_row();
        }
@@ -467,7 +468,7 @@ function display_grn_items(&$supp_trans, $mode=0)
        start_table(TABLESTYLE, "width=95%");
        if ($mode == 1)
        {
-       $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
+       $th = array(_("Delivery"), _("P.O."), _("Item"), _("Description"),
                _("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
                _("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"), 
                _("Total"), "");
@@ -498,16 +499,16 @@ function display_grn_items(&$supp_trans, $mode=0)
                label_cell(get_trans_view_str(ST_SUPPRECEIVE,$grn_batch));
                if ($mode == 1)
                {
-                               label_cell($entered_grn->id);
-                               label_cell(""); // PO
-                       }       
+                               $row = get_grn_batch($grn_batch);
+                               label_cell($row['purch_order_no']); // PO
+                       }
                        label_cell($entered_grn->item_code);
                        label_cell($entered_grn->item_description);
             $dec = get_qty_dec($entered_grn->item_code);
             if ($mode == 1)
             {
-               label_cell("");
-                               qty_cell($entered_grn->qty_recd, false, $dec);
+                       label_cell(sql2date($row['delivery_date']));
+                               qty_cell($entered_grn->qty_recd, false, $dec);
                                qty_cell($entered_grn->prev_quantity_inv, false, $dec);
             }
                        qty_cell(abs($entered_grn->this_quantity_inv), true, $dec);