Fixed warnings related to empty item/customer/supplier selector in search modes.

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

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 1969cf93f2c0aeb9aeb5ee1cbca8afbadc602724..43cb467e802c4602f13be6f4f509b173e22bd259 100644 (file)
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -10,21 +10,31 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_PURCHASEPRICING';
-$path_to_root = "..";
-include_once($path_to_root . "/includes/session.inc");
 
-page(_($help_context = "Supplier Purchasing Data"));
+if (@$_GET['page_level'] == 1)
+       $path_to_root = "../..";
+else   
+       $path_to_root = "..";
 
+include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+       $js .= get_js_open_window(900, 500);
+page(_($help_context = "Supplier Purchasing Data"), false, false, "", $js);
+
 check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system."));
 check_db_has_suppliers(_("There are no suppliers defined in the system."));
 
 //----------------------------------------------------------------------------------------
 simple_page_mode(true);
+if (isset($_GET['stock_id']))
+{
+       $_POST['stock_id'] = $_GET['stock_id'];
+}
 
 //--------------------------------------------------------------------------------------------------
 
@@ -36,7 +46,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        {
        $input_error = 1;
        display_error( _("There is no item selected."));
-       set_focus('stock_id');
+               set_focus('stock_id');
        }
        elseif (!check_num('price', 0))
        {
@@ -50,7 +60,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        display_error( _("The conversion factor entered was not numeric. The conversion factor is the number by which the price must be divided by to get the unit price in our unit of measure."));
                set_focus('conversion_factor');
        }
-
+       elseif ($Mode == 'ADD_ITEM' && get_item_purchasing_data($_POST['supplier_id'], $_POST['stock_id']))
+       {
+       $input_error = 1;
+       display_error( _("The purchasing data for this supplier has already been added."));
+               set_focus('supplier_id');
+       }
        if ($input_error == 0)
        {
        if ($Mode == 'ADD_ITEM') 
@@ -93,15 +108,23 @@ if (list_updated('stock_id'))
        $Ajax->activate('price_table');
 //--------------------------------------------------------------------------------------------------
 
-start_form();
+$action = $_SERVER['PHP_SELF'];
+if ($page_nested)
+       $action .= "?stock_id=".get_post('stock_id');
+start_form(false, false, $action);
 
 if (!isset($_POST['stock_id']))
        $_POST['stock_id'] = get_global_stock_item();
 
-echo "<center>" . _("Item:"). "&nbsp;";
-echo stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
-
-echo "<hr></center>";
+if (!$page_nested)
+{
+       echo "<center>" . _("Item:"). "&nbsp;";
+       // All items can be purchased
+       echo stock_items_list('stock_id', $_POST['stock_id'], false, true);
+       echo "<hr></center>";
+}
+else
+       br(2);
 
 set_global_stock_item($_POST['stock_id']);
 
@@ -110,6 +133,7 @@ $mb_flag = get_mb_flag($_POST['stock_id']);
 if ($mb_flag == -1)
 {
        display_error(_("Entered item is not defined. Please re-enter."));
+       $Ajax->activate('price_table');
        set_focus('stock_id');
 }
 else
@@ -122,7 +146,7 @@ else
     }
     else
     {
-        start_table(TABLESTYLE, "width=65%");
+        start_table(TABLESTYLE, "width='65%'");
 
                $th = array(_("Supplier"), _("Price"), _("Currency"),
                        _("Supplier's Unit"), _("Conversion Factor"), _("Supplier's Description"), "", "");
@@ -174,6 +198,7 @@ if ($Mode =='Edit')
 
 br();
 hidden('selected_id', $selected_id);
+
 start_table(TABLESTYLE2);
 
 if ($Mode == 'Edit')
@@ -193,8 +218,7 @@ if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "")
 {
        $_POST['conversion_factor'] = maxprec_format(1);
 }
-amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor',
-  maxprec_format($_POST['conversion_factor']), null, null, 'max');
+amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor', null, null, null, 'max');
 text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 51);
 
 end_table(1);
@@ -203,5 +227,3 @@ submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
 end_page();
-
-?>