projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The average material cost test for either qoh > 0 and qoh + qty > 0 has changed to...
[fa-stable.git]
/
inventory
/
purchasing_data.php
diff --git
a/inventory/purchasing_data.php
b/inventory/purchasing_data.php
index 4482a5faf517ddc75217002ad81755993537ce6f..84b1603e8f962836f066694b5df2bf556e3b3c79 100644
(file)
--- 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';
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 = "../..";
$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");
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."));
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:"). " ";
if (!$page_nested)
{
echo "<center>" . _("Item:"). " ";
- //
Chaitanya :
All items can be purchased
+ // All items can be purchased
echo stock_items_list('stock_id', $_POST['stock_id'], false, true);
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
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."));
if ($mb_flag == -1)
{
display_error(_("Entered item is not defined. Please re-enter."));
+ $Ajax->activate('price_table');
set_focus('stock_id');
}
else
set_focus('stock_id');
}
else
@@
-194,10
+198,6
@@
if ($Mode =='Edit')
br();
hidden('selected_id', $selected_id);
br();
hidden('selected_id', $selected_id);
-if ($page_nested)
-{
- hidden('popup', @$_GET['popup']);
-}
start_table(TABLESTYLE2);
start_table(TABLESTYLE2);
@@
-219,7
+219,7
@@
if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "")
$_POST['conversion_factor'] = maxprec_format(1);
}
amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor', null, null, null, 'max');
$_POST['conversion_factor'] = maxprec_format(1);
}
amount_row(_("Conversion Factor (to our UOM):"), 'conversion_factor', null, null, null, 'max');
-text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 5
1
);
+text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 5
0
);
end_table(1);
end_table(1);