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 5846af6e6b5c37c3cd3eb4231c76cda8bc908a2a..11ebbf7ed2f32f96b2ab75cd699c2f843164c511 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -19,7 +19,6 @@ function copy_from_trans(&$supp_trans)
        $_POST['supp_reference'] = $supp_trans->supp_reference;
        $_POST['reference'] = $supp_trans->reference;
        $_POST['supplier_id'] = $supp_trans->supplier_id;
-       $_POST['tax_algorithm'] = $supp_trans->tax_algorithm;
     $_POST['dimension'] = $supp_trans->dimension;
     $_POST['dimension2'] = $supp_trans->dimension2;
 
@@ -38,8 +37,6 @@ function copy_to_trans(&$supp_trans)
        $supp_trans->due_date = $_POST['due_date'];
        $supp_trans->supp_reference = $_POST['supp_reference'];
        $supp_trans->reference = $_POST['reference'];
-       if (isset($_POST['tax_algorithm']))
-           $supp_trans->tax_algorithm = $_POST['tax_algorithm'];
        $supp_trans->dimension = @$_POST['dimension'];
        $supp_trans->dimension2 =  @$_POST['dimension2'];
 
@@ -83,7 +80,7 @@ function invoice_header(&$supp_trans)
        if (!isset($_POST['tran_date']))
                copy_from_trans($supp_trans);
 
-       start_outer_table(TABLESTYLE2, "width=95%");
+       start_outer_table(TABLESTYLE2, "width='95%'");
 
        table_section(1);
 
@@ -120,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)
        {
@@ -136,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'];
@@ -180,7 +179,7 @@ function invoice_totals(&$supp_trans)
        $dim = get_company_pref('use_dimension');
        $colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
        div_start('tax_table');
-       start_table(TABLESTYLE, "width=95%");
+       start_table(TABLESTYLE, "width='95%'");
        label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right");
 
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
@@ -197,11 +196,6 @@ function invoice_totals(&$supp_trans)
 
     end_table(1);
     start_table(TABLESTYLE2);
-    tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
-       if (list_updated('tax_algorithm')) {
-               $supp_trans->tax_algorithm = $_POST['tax_algorithm'];
-           $Ajax->activate('tax_table');
-       }
     textarea_row(_("Memo:"), "Comments", null, 50, 3);
     end_table(1);
        div_end();
@@ -253,7 +247,7 @@ function display_gl_items(&$supp_trans, $mode=0)
        else
                $heading = _("GL Items for this Credit Note");
 
-       start_outer_table(TABLESTYLE, "width=95%");
+       start_outer_table(TABLESTYLE, "width='95%'");
 
        if ($mode == 1)
        {
@@ -283,7 +277,7 @@ function display_gl_items(&$supp_trans, $mode=0)
        end_outer_table(0, false);
 
        div_start('gl_items');
-       start_table(TABLESTYLE, "width=95%");
+       start_table(TABLESTYLE, "width='95%'");
 
        $dim = get_company_pref('use_dimension');
        if ($dim == 2)
@@ -401,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"]);
@@ -464,7 +457,7 @@ function display_grn_items(&$supp_trans, $mode=0)
     if (($mode == 2  || $mode == 3) && count($supp_trans->grn_items) == 0)
        return 0;
 
-       start_outer_table("style='border:1px solid #cccccc;' width=95%");
+       start_outer_table("style='border:1px solid #cccccc;' width='95%'");
 
        $heading2 = "";
        if ($mode == 1)
@@ -504,17 +497,17 @@ function display_grn_items(&$supp_trans, $mode=0)
                {
                        display_note($heading2, 0, 0, "class='overduefg'");
                }
-               echo "</td><td width=10% align='right'>";
+               echo "</td><td width='10%' align='right'>";
                submit('InvGRNAll', _("Add All Items"), true, false,true);
        }
 
        end_outer_table(0, false);
 
        div_start('grn_items');
-       start_table(TABLESTYLE, "width=95%");
+       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"), "");
@@ -522,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
@@ -545,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
                        }