Fixed nested forms in Items tab.

[fa-stable.git] / inventory / prices.php

diff --git a/inventory/prices.php b/inventory/prices.php
index 861b7daabbe3aee70f1d8b0393335aa4a8b46f8c..66d3bee099482041a449b56a27ddec6f9c900918 100644 (file)
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -10,18 +10,21 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_SALESPRICE';
-$path_to_root = "..";
-include_once($path_to_root . "/includes/session.inc");
-
-page(_($help_context = "Inventory Item Sales prices"));
+if (!@$_GET['popup'])
+       $path_to_root = "..";
+else   
+       $path_to_root = "../..";
 
+include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
-
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
+if (!@$_GET['popup'])
+       page(_($help_context = "Inventory Item Sales prices"));
+
 //---------------------------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no items defined in the system."));
@@ -47,16 +50,20 @@ if (!isset($_POST['curr_abrev']))
 }
 
 //---------------------------------------------------------------------------------------------------
-
-start_form();
+if (!@$_GET['popup'])
+       start_form();
 
 if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
 
-echo "<center>" . _("Item:"). "&nbsp;";
-echo sales_items_list('stock_id', $_POST['stock_id'], false, true, '', array('editable' => false));
-echo "<hr></center>";
-
+if (!@$_GET['popup'])
+{
+       echo "<center>" . _("Item:"). "&nbsp;";
+       echo sales_items_list('stock_id', $_POST['stock_id'], false, true, '', array('editable' => false));
+       echo "<hr></center>";
+}
+else
+       br(2);
 set_global_stock_item($_POST['stock_id']);
 
 //----------------------------------------------------------------------------------------------------
@@ -70,8 +77,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
                display_error( _("The price entered must be numeric."));
                set_focus('price');
        }
-       elseif(!db_has_currency_rates($_POST['curr_abrev'], Today(), true))
-               $input_error = 1;
+       elseif ($Mode == 'ADD_ITEM' && get_stock_price_type_currency($_POST['stock_id'], $_POST['sales_type_id'], $_POST['curr_abrev']))
+       {
+       $input_error = 1;
+       display_error( _("The sales pricing for this item, sales type and currency has already been added."));
+               set_focus('supplier_id');
+       }
 
        if ($input_error != 1)
        {
@@ -170,6 +181,11 @@ if ($Mode == 'Edit')
 }
 
 hidden('selected_id', $selected_id);
+if (@$_GET['popup'])
+{
+       hidden('_tabs_sel', get_post('_tabs_sel'));
+       hidden('popup', @$_GET['popup']);
+}
 div_start('price_details');
 start_table(TABLESTYLE2);
 
@@ -192,6 +208,9 @@ if ($calculated)
 submit_add_or_update_center($selected_id == -1, '', 'both');
 div_end();
 
-end_form();
-end_page();
+if (!@$_GET['popup'])
+{
+       end_form();
+       end_page(@$_GET['popup'], false, false);
+}      
 ?>