X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fpurchasing_data.php;h=cb3ac40e2030ee8773cbc416ee40976253a3f881;hb=2a5c4dfc9b28b81fc858eddc7cfb42ad9b4bfdba;hp=286ad1350718de574ae1ee8f67eb750bf45e7915;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 286ad135..cb3ac40e 100644
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -10,19 +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/manufacturing.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
-if (!@$_GET['popup'])
-	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."));
@@ -107,19 +109,18 @@ if (list_updated('stock_id'))
 //--------------------------------------------------------------------------------------------------
 
 $action = $_SERVER['PHP_SELF'];
-if (@$_GET['popup'])
+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();
 
-if (!@$_GET['popup'])
+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
@@ -132,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
@@ -144,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"), "", "");
@@ -196,11 +198,6 @@ if ($Mode =='Edit')
 
 br();
 hidden('selected_id', $selected_id);
-if (@$_GET['popup'])
-{
-	hidden('_tabs_sel', get_post('_tabs_sel'));
-	hidden('popup', @$_GET['popup']);
-}
 
 start_table(TABLESTYLE2);
 
@@ -214,16 +211,18 @@ else
 	supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
 	$_POST['price'] = $_POST['suppliers_uom'] = $_POST['conversion_factor'] = $_POST['supplier_description'] = "";
 }
-amount_row(_("Price:"), 'price', null,'', get_supplier_currency($selected_id), $dec2);
+echo "<tr>";
+unit_amount_cells(_("Price"), 'price', null, '', get_supplier_currency($selected_id));
+echo "</tr>\n";
+
 text_row(_("Suppliers Unit of Measure:"), 'suppliers_uom', null, 50, 51);
 
 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');
-text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 51);
+amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor', null, null, null, 'max');
+text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 50);
 
 end_table(1);
 
@@ -231,4 +230,3 @@ submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
 end_page();
-?>