projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[0005735] Problems with sending emails with encoding other than ASCII - fixed.
[fa-stable.git]
/
inventory
/
purchasing_data.php
diff --git
a/inventory/purchasing_data.php
b/inventory/purchasing_data.php
index 8c36581ddd5d30823652d613f56eb02dc3c01b47..cb3ac40e2030ee8773cbc416ee40976253a3f881 100644
(file)
--- a/
inventory/purchasing_data.php
+++ b/
inventory/purchasing_data.php
@@
-21,7
+21,10
@@
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/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."));
@@
-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
@@
-207,7
+211,10
@@
else
supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
$_POST['price'] = $_POST['suppliers_uom'] = $_POST['conversion_factor'] = $_POST['supplier_description'] = "";
}
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'] == "")
text_row(_("Suppliers Unit of Measure:"), 'suppliers_uom', null, 50, 51);
if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "")
@@
-215,7
+222,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);