projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Annual Expense Breakdown Report: another coding fix.
[fa-stable.git]
/
inventory
/
purchasing_data.php
diff --git
a/inventory/purchasing_data.php
b/inventory/purchasing_data.php
index 4b7717d546cc90d89a3d1e2219b6ee8f3bbb8376..8be2566b88555e276826ad0e10de247473c0122f 100644
(file)
--- a/
inventory/purchasing_data.php
+++ b/
inventory/purchasing_data.php
@@
-10,18
+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/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");
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."));
@@
-116,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
@@
-143,7
+145,7
@@
else
}
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"), "", "");
$th = array(_("Supplier"), _("Price"), _("Currency"),
_("Supplier's Unit"), _("Conversion Factor"), _("Supplier's Description"), "", "");
@@
-195,10
+197,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,8
+217,7
@@
if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "")
{
$_POST['conversion_factor'] = maxprec_format(1);
}
{
$_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);
text_row(_("Supplier's Code or Description:"), 'supplier_description', null, 50, 51);
end_table(1);
@@
-229,4
+226,3
@@
submit_add_or_update_center($selected_id == -1, '', 'both');
end_form();
end_page();
end_form();
end_page();
-?>