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

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

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 811bcb880148779fca35c22074693190d1212d9e..c0770d3ee3be57fda62c67869e78adf749cee7a6 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -26,7 +26,6 @@ function copy_from_cart()
        $_POST['Comments'] = $cart->Comments;
     $_POST['StkLocation'] = $cart->Location;
     $_POST['delivery_address'] = $cart->delivery_address;
-    $_POST['tax_algorithm'] = $cart->tax_algorithm;
        $_POST['prep_amount'] = price_format($cart->prep_amount);
        $_POST['_ex_rate'] = $cart->ex_rate;
        $_POST['cash_account'] = $cart->cash_account;
@@ -54,8 +53,6 @@ function copy_to_cart()
        $cart->delivery_address = $_POST['delivery_address'];
        $cart->dimension = @$_POST['dimension'];
        $cart->dimension2 =  @$_POST['dimension2'];
-       if (isset($_POST['tax_algorithm']))
-           $cart->tax_algorithm = $_POST['tax_algorithm'];
        $cart->prep_amount = input_num('prep_amount', 0);
        $cart->ex_rate = input_num('_ex_rate', null);
 
@@ -87,7 +84,8 @@ function create_new_po($trans_type, $trans_no)
                read_po($trans_no, $cart);
                $cart->order_no = $trans_no;
        } else
-               $cart->reference = $Refs->get_next($trans_type);
+               $cart->reference = $Refs->get_next($trans_type, null,
+                       array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
        $_SESSION['PO'] = &$cart;
 }
 
@@ -99,7 +97,7 @@ function display_po_header(&$order)
 
        $editable = ($order->order_no == 0);
 
-       start_outer_table(TABLESTYLE2, 'width=80%');
+       start_outer_table(TABLESTYLE2, "width='80%'");
 
        table_section(1);
     if ($editable)
@@ -120,7 +118,6 @@ function display_po_header(&$order)
                get_supplier_details_to_order($order, $_POST['supplier_id']); 
            get_duedate_from_terms($order);
                $_POST['due_date'] = $order->due_date;
-               $_POST['tax_algorithm'] = $order->tax_algorithm;
 
                // supplier default price update
                foreach ($order->line_items as $line_no=>$item) {
@@ -132,7 +129,6 @@ function display_po_header(&$order)
                }
            $Ajax->activate('items_table');
            $Ajax->activate('due_date');
-           $Ajax->activate('tax_algorithm');
        }
        set_global_supplier($_POST['supplier_id']);
 
@@ -213,7 +209,7 @@ function display_po_items(&$order, $editable=true)
     display_heading(_("Order Items"));
 
     div_start('items_table');
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
 
        $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
                _("Received"), _("Unit"),
@@ -278,7 +274,8 @@ function display_po_items(&$order, $editable=true)
 
        start_row();
        label_cells(_("Amount Total"), $display_total, "colspan=$colspan align='right'","align='right'");
-       $order->order_no ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true)
+       $order->trans_type == ST_SUPPINVOICE
+        ? submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true)
                : label_cell('', "colspan=2");
        end_row();
 
@@ -290,7 +287,7 @@ function display_po_items(&$order, $editable=true)
 
 function display_po_summary(&$po, $is_self=false, $editable=false)
 {
-    start_table(TABLESTYLE, "width=90%");
+    start_table(TABLESTYLE, "width='90%'");
 
     start_row();
     label_cells(_("Reference"), $po->reference, "class='tableheader2'");
@@ -388,7 +385,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 //             hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
                //Chaitanya : Manufcatured item can be purchased
-               stock_items_list_cells(null, 'stock_id', null, false, true, false, true);
+               stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30));
                //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
@@ -453,13 +450,7 @@ function display_po_footer(&$trans)
 
 start_table(TABLESTYLE2);
 
-if (list_updated('tax_algorithm')) {
-       $trans->tax_algorithm = $_POST['tax_algorithm'];
-    $Ajax->activate('items_table');
-}
-
 if ($trans->trans_type == ST_SUPPINVOICE) {
-       tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
        cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
 } elseif ($trans->trans_type == ST_PURCHORDER)
        amount_row(_("Pre-Payment Required:"), 'prep_amount');