Merged last changes from stable.

[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 8adca98b97edbaf258c81c9497f576be21e3764a..f13a197b0ea0a8c26c203d5d418dcfa4d4aff7e2 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -28,6 +28,9 @@ function copy_from_cart()
     $_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;
+    foreach($cart->tax_overrides as $id => $value)
+           $_POST['mantax'][$id] = price_format($value);
 }
 
 function copy_to_cart()
@@ -46,6 +49,12 @@ function copy_to_cart()
        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);
+
+    if (isset($_POST['mantax'])) {
+               foreach($_POST['mantax'] as $id => $tax) {
+                       $cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); }
+       }
 }
 // ------------------------------------------------------------------------------
 
@@ -94,7 +103,6 @@ function create_new_po($trans_type, $trans_no)
                $_POST['OrderDate'] = end_fiscalyear();
        $cart->due_date = $cart->orig_order_date = $_POST['OrderDate'];
 
-       
        $cart->trans_type = $trans_type;
        $cart->order_no = $trans_no;
        /*read in all the selected order into the Items cart  */
@@ -114,7 +122,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)
@@ -151,15 +159,25 @@ function display_po_header(&$order)
        }
        set_global_supplier($_POST['supplier_id']);
 
+       date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") :
+               ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")),
+               'OrderDate', '', true, 0, 0, 0, null, true);
+
+       if (isset($_POST['_OrderDate_changed'])) {
+               $order->orig_order_date = $_POST['OrderDate'];
+           get_duedate_from_terms($order);
+           $_POST['due_date'] = $order->due_date;
+               $Ajax->activate('due_date');
+       }
+       supplier_credit_row($order->supplier_id, $order->credit);
+
        if (!is_company_currency($order->curr_code))
        {
                label_row(_("Supplier Currency:"), $order->curr_code);
-               exchange_rate_display($order->curr_code, get_company_currency(),
+               exchange_rate_display(get_company_currency(), $order->curr_code,
                        $_POST['OrderDate']);
        }
 
-       supplier_credit_row($order->supplier_id, $order->credit);
-
 
     if ($editable)
     {
@@ -173,26 +191,6 @@ function display_po_header(&$order)
 
        table_section(2);
 
-       // check this out?????????
-       //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
-       //      $_POST['OrderDate'] = $order->orig_order_date;
-       //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
-       //{
-       //      $_POST['OrderDate'] = Today();
-       //      if (!is_date_in_fiscalyear($_POST['OrderDate']))
-       //              $_POST['OrderDate'] = end_fiscalyear();
-       //}
-       date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") :
-               ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")),
-               'OrderDate', '', true, 0, 0, 0, null, true);
-
-       if (isset($_POST['_OrderDate_changed'])) {
-               $order->orig_order_date = $_POST['OrderDate'];
-           get_duedate_from_terms($order);
-           $_POST['due_date'] = $order->due_date;
-               $Ajax->activate('_ex_rate');
-               $Ajax->activate('due_date');
-       }
        if ($order->trans_type==ST_SUPPINVOICE)
                date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
 
@@ -297,7 +295,7 @@ function display_po_items(&$order, $editable=true)
 
        $taxes = $order->get_taxes(input_num('freight_cost'));
        
-       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
+       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2, $order->trans_type==ST_SUPPINVOICE);
 
        $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
 
@@ -412,7 +410,9 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
        {
 //             hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-               stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
+               //Chaitanya : Manufcatured item can be purchased
+               stock_items_list_cells(null, 'stock_id', null, false, true, false, true);
+               //stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
                            $Ajax->activate('units');