Tax Inquiry: fixed refrences to non-existing database fields.

[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 1da839bbc1bab8fe48de5c3d881f7319c81ec802..11ebbf7ed2f32f96b2ab75cd699c2f843164c511 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -117,7 +117,10 @@ function invoice_header(&$supp_trans)
                copy_from_trans($supp_trans);
        }
 
-       ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type));
+       date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
+
+       ref_row(_("Reference:"), 'reference', '', $Refs->get_next($supp_trans->trans_type, null, 
+               array('supplier' => get_post('supplier_id'), 'date' => get_post('tran_date'))), false, $supp_trans->trans_type);
 
        if ($supp_trans->trans_type == ST_SUPPCREDIT)
        {
@@ -133,7 +136,6 @@ function invoice_header(&$supp_trans)
 
        table_section(2, "33%");
 
-       date_row(_("Date") . ":", 'tran_date', '', true, 0, 0, 0, "", true);
        if (isset($_POST['_tran_date_changed'])) {
                $Ajax->activate('_ex_rate');
                $supp_trans->tran_date = $_POST['tran_date'];
@@ -393,14 +395,13 @@ function display_grn_items_for_selection(&$supp_trans, $k)
 
                        $n = $myrow["id"];
                label_cell(get_trans_view_str(ST_SUPPRECEIVE, $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));
+               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(ST_PURCHORDER, $myrow["purch_order_no"]));
             label_cell($myrow["item_code"]);
             label_cell($myrow["description"]);
@@ -506,7 +507,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"), "");
@@ -514,7 +515,7 @@ function display_grn_items(&$supp_trans, $mode=0)
                $th[] = "";
                if ($supp_trans->trans_type == ST_SUPPCREDIT)
                {
-                       $th[8] = _("Qty Yet To Credit");
+                       $th[7] = _("Qty Yet To Credit");
                }
     }
     else
@@ -537,7 +538,7 @@ 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($entered_grn->id);
                                $row = get_grn_batch($grn_batch);
                                label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"])); // PO
                        }