X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fpurchasing_data.php;h=43cb467e802c4602f13be6f4f509b173e22bd259;hb=2f3375b4493c1b1e0b17c2801298275f22f8d76e;hp=676540f7e753ce15bcc12b1b1f579d2018b3059c;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 676540f7..43cb467e 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -10,17 +10,21 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_PURCHASEPRICING';
-if (!@$_GET['popup'])
-	$path_to_root = "..";
-else	
+
+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/data_checks.inc");
 
-page(_($help_context = "Supplier Purchasing Data"));
+$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."));
@@ -115,9 +119,8 @@ if (!isset($_POST['stock_id']))
 if (!$page_nested)
 {
 	echo "<center>" . _("Item:"). "&nbsp;";
-	//Chaitanya : All items can be purchased
+	// All items can be purchased
 	echo stock_items_list('stock_id', $_POST['stock_id'], false, true);
-	//echo stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
 	echo "<hr></center>";
 }
 else
@@ -130,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
@@ -194,10 +198,6 @@ if ($Mode =='Edit')
 
 br();
 hidden('selected_id', $selected_id);
-if ($page_nested)
-{
-	hidden('popup', @$_GET['popup']);
-}
 
 start_table(TABLESTYLE2);
 
@@ -218,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);