Fixed link bugs in sales order entry and optimized a couple of functions in ui_contro...

[fa-stable.git] / sales / includes / ui / sales_credit_ui.inc

diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index f4725d3febdace0525b325f6cde00c173e2ab504..e9bb8ebe259dade19f5d2d190d2254403a5058a2 100644 (file)
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/ui.inc");
 
@@ -81,7 +81,7 @@ function display_credit_header(&$order)
 
        if (!isset($_POST['ref']))
                $_POST['ref'] = references::get_next(11);
-       if ($_SESSION['Items']->trans_no==0)
+       if ($order->trans_no==0)
            ref_row(_("Reference").':', 'ref');
        else
            label_row(_("Reference").':', $_POST['ref'] );
@@ -91,11 +91,9 @@ function display_credit_header(&$order)
        {
                table_section(2);
                
-           div_start('currency');
                label_row(_("Customer Currency:"), $order->customer_currency);
                exchange_rate_display($order->customer_currency, get_company_currency(),
                        $_POST['OrderDate']);
-           div_end();
        }
        table_section(3);
 
@@ -120,10 +118,13 @@ function display_credit_header(&$order)
        if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
                $_POST['OrderDate'] = $order->document_date;
 
-       date_row(_("Date:"), 'OrderDate', '', null, 0, 0, 0, null, true);
+       date_row(_("Date:"), 'OrderDate', '', $order->trans_no==0, 0, 0, 0, null, true);
        if (isset($_POST['_OrderDate_changed'])) {
-               $change_prices = 1;
-               $Ajax->activate('currency');
+               if (!is_company_currency($order->customer_currency) 
+                       && (get_base_sales_type()>0)) {
+                               $change_prices = 1;
+               }
+               $Ajax->activate('_ex_rate');
        }
        // 2008-11-12 Joe Hunt added dimensions
        $dim = get_company_pref('use_dimension');
@@ -184,7 +185,7 @@ function display_credit_items($title, &$order)
        {
            alt_table_row_color($k);
 
-           label_cell("<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?" . SID . "stock_id=" . $line->stock_id . "'>$line->stock_id</a>");
+           label_cell("<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?stock_id=" . $line->stock_id . "'>$line->stock_id</a>");
            label_cell($line->item_description, "nowrap");
            qty_cell($line->qty_dispatched, false, get_qty_dec($line->stock_id));
            label_cell($line->units);
@@ -222,7 +223,7 @@ function display_credit_items($title, &$order)
 
     $taxes = $order->get_taxes($_POST['ChargeFreightCost']);
 
-    $tax_total = display_edit_tax_items($taxes, 6, $_SESSION['Items']->tax_included);
+    $tax_total = display_edit_tax_items($taxes, 6, $order->tax_included);
 
     $display_total = price_format(($subtotal + $_POST['ChargeFreightCost'] + $tax_total));
 
@@ -302,7 +303,7 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
 
 //---------------------------------------------------------------------------------
 
-function credit_options_controls()
+function credit_options_controls($credit)
 {
        global $table_style2, $Ajax;
        echo "<br>";
@@ -320,7 +321,7 @@ if (isset($_POST['_CreditType_update']))
 
                /*if the credit note is a return of goods then need to know which location to receive them into */
                if (!isset($_POST['Location']))
-                       $_POST['Location'] = $_SESSION['Items']->Location;
+                       $_POST['Location'] = $credit->Location;
                locations_list_row(_("Items Returned to Location"), 'Location', $_POST['Location']);
        }
        else