projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Bank Transfer edition.
[fa-stable.git]
/
purchasing
/
po_receive_items.php
diff --git
a/purchasing/po_receive_items.php
b/purchasing/po_receive_items.php
index 85acc0adf0da063ad701cd2de6daca0d535e5dc2..bc1115897e16e3d07e3a8d7cc5cfa8bae23e5d54 100644
(file)
--- a/
purchasing/po_receive_items.php
+++ b/
purchasing/po_receive_items.php
@@
-20,7
+20,7
@@
include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
-if (
$use_date_picker
)
+if (
user_use_date_picker()
)
$js .= get_js_date_picker();
page(_($help_context = "Receive Purchase Order Items"), false, false, "", $js);
$js .= get_js_date_picker();
page(_($help_context = "Receive Purchase Order Items"), false, false, "", $js);
@@
-175,6
+175,11
@@
function can_process()
set_focus('DefaultReceivedDate');
return false;
}
set_focus('DefaultReceivedDate');
return false;
}
+ if (!is_date_in_fiscalyear($_POST['DefaultReceivedDate'])) {
+ display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
+ set_focus('DefaultReceivedDate');
+ return false;
+ }
if (!$Refs->is_valid($_POST['ref']))
{
if (!$Refs->is_valid($_POST['ref']))
{
@@
-259,6
+264,7
@@
function process_receive_po()
$grn->orig_order_date = $_POST['DefaultReceivedDate'];
$grn->reference = $_POST['ref'];
$grn->Location = $_POST['Location'];
$grn->orig_order_date = $_POST['DefaultReceivedDate'];
$grn->reference = $_POST['ref'];
$grn->Location = $_POST['Location'];
+ $grn->ex_rate = input_num('_ex_rate', null);
$grn_no = add_grn($grn);
$grn_no = add_grn($grn);
@@
-318,7
+324,7
@@
if (isset($_POST['ProcessGoodsReceived']))
start_form();
start_form();
-
display
_grn_summary($_SESSION['PO'], true);
+
edit
_grn_summary($_SESSION['PO'], true);
display_heading(_("Items to Receive"));
display_po_receive_items();
display_heading(_("Items to Receive"));
display_po_receive_items();
@@
-330,5
+336,3
@@
end_form();
//--------------------------------------------------------------------------------------------------
end_page();
//--------------------------------------------------------------------------------------------------
end_page();
-?>
-