[0000691] Error updating BOM

[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 41ae4b3ba366dc2b791408789f2424e6293e7625..7eff2392c8aabfac44e24a82664a79207acdaed4 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -96,7 +96,7 @@ function invoice_header(&$supp_trans)
                label_row(_("Supplier's Ref.:"), $_POST['invoice_no'].hidden('invoice_no', $_POST['invoice_no'], false).hidden('supp_reference', $_POST['invoice_no'], false));
        }       
        else
-               text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 20);
+               text_row(_("Supplier's Ref.:"), 'supp_reference', $_POST['supp_reference'], 20, 60);
 
        table_section(2, "33%");
 
@@ -363,6 +363,7 @@ function display_grn_items_for_selection(&$supp_trans, $k)
                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"]);
@@ -377,11 +378,16 @@ function display_grn_items_for_selection(&$supp_trans, $k)
                qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec), 
                        null, null, $dec);
             $dec2 = 0;                 
-            amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
             if ($supp_trans->trans_type == ST_SUPPINVOICE)
+            {
+               amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
                amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
-            else       
-               amount_cell(round2($myrow["unit_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
+            }
+            else
+            {
+               amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["act_price"], $dec2), null, null, $dec2);
+               amount_cell(round2($myrow["act_price"] * max($myrow['quantity_inv'], 0), user_price_dec()));
+            }  
             if ($supp_trans->trans_type == ST_SUPPINVOICE)
                        submit_cells('grn_item_id'.$n, _("Add"), '', _("Add to Invoice"), true);
                else    
@@ -494,15 +500,16 @@ function display_grn_items(&$supp_trans, $mode=0)
                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);