projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor fixes in the former files
[fa-stable.git]
/
purchasing
/
po_receive_items.php
diff --git
a/purchasing/po_receive_items.php
b/purchasing/po_receive_items.php
index e12b6a4203277fc86eba319c0afcdf4749bf9ff9..e0a584280be3dcf3860b7f63fec817754b997776 100644
(file)
--- a/
purchasing/po_receive_items.php
+++ b/
purchasing/po_receive_items.php
@@
-28,7
+28,7
@@
if (isset($_GET['AddedID']))
//echo "<BR>";
//echo get_gl_view_str(25, $grn, _("View the GL Journal Entries for this Delivery"));
//echo "<BR>";
//echo get_gl_view_str(25, $grn, _("View the GL Journal Entries for this Delivery"));
-
echo "<br>";
+
//
echo "<br>";
hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different purchase order for receiving items against"));
display_footer_exit();
hyperlink_no_params("$path_to_root/purchasing/inquiry/po_search.php", _("Select a different purchase order for receiving items against"));
display_footer_exit();
@@
-85,10
+85,10
@@
function display_po_receive_items()
qty_cell($qty_outstanding);
if ($qty_outstanding > 0)
qty_cell($qty_outstanding);
if ($qty_outstanding > 0)
-
text_cells(null, $ln_itm->line_no, $ln_itm->receive_qty, 10, 10
, "align=right");
+
qty_cells(null, $ln_itm->line_no, qty_format($ln_itm->receive_qty)
, "align=right");
else
else
-
text_cells(null, $ln_itm->line_no, $ln_itm->receive_qty, 10, 10
, "align=right",
- "
", "
disabled");
+
qty_cells(null, $ln_itm->line_no, qty_format($ln_itm->receive_qty)
, "align=right",
+ "disabled");
amount_cell($ln_itm->price);
amount_cell($line_total);
amount_cell($ln_itm->price);
amount_cell($line_total);
@@
-154,18
+154,21
@@
function can_process()
if (!is_date($_POST['DefaultReceivedDate']))
{
display_error(_("The entered date is invalid."));
if (!is_date($_POST['DefaultReceivedDate']))
{
display_error(_("The entered date is invalid."));
+ set_focus('DefaultReceivedDate');
return false;
}
if (!references::is_valid($_POST['ref']))
{
display_error(_("You must enter a reference."));
return false;
}
if (!references::is_valid($_POST['ref']))
{
display_error(_("You must enter a reference."));
+ set_focus('ref');
return false;
}
if (!is_new_reference($_POST['ref'], 25))
{
display_error(_("The entered reference is already in use."));
return false;
}
if (!is_new_reference($_POST['ref'], 25))
{
display_error(_("The entered reference is already in use."));
+ set_focus('ref');
return false;
}
return false;
}
@@
-259,13
+262,13
@@
if (isset($_POST['Update']) || isset($_POST['ProcessGoodsReceived']))
{
$_POST[$line->line_no] = max($_POST[$line->line_no], 0);
{
$_POST[$line->line_no] = max($_POST[$line->line_no], 0);
- if (!
is_numeric($_POST[$line->line_no]
))
- $_POST[$line->line_no] =
0
;
+ if (!
check_num($line->line_no
))
+ $_POST[$line->line_no] =
qty_format(0)
;
if (!isset($_POST['DefaultReceivedDate']) || $_POST['DefaultReceivedDate'] == "")
$_POST['DefaultReceivedDate'] = Today();
if (!isset($_POST['DefaultReceivedDate']) || $_POST['DefaultReceivedDate'] == "")
$_POST['DefaultReceivedDate'] = Today();
- $_SESSION['PO']->line_items[$line->line_no]->receive_qty =
$_POST[$line->line_no]
;
+ $_SESSION['PO']->line_items[$line->line_no]->receive_qty =
input_num($line->line_no)
;
if (isset($_POST[$line->stock_id . "Desc"]) && strlen($_POST[$line->stock_id . "Desc"]) > 0)
{
if (isset($_POST[$line->stock_id . "Desc"]) && strlen($_POST[$line->stock_id . "Desc"]) > 0)
{