projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Selecting the cancel button in confirming the voiding of document did not work properly.
[fa-stable.git]
/
purchasing
/
po_receive_items.php
diff --git
a/purchasing/po_receive_items.php
b/purchasing/po_receive_items.php
index d5fb35d169e70d188d432d36b780c3aeea2557b4..f80130e6402cea4caaf3a7b8eab51a09aefe6bfe 100644
(file)
--- a/
purchasing/po_receive_items.php
+++ b/
purchasing/po_receive_items.php
@@
-34,6
+34,10
@@
if (isset($_GET['AddedID']))
display_notification_centered(_("Purchase Order Delivery has been processed"));
display_note(get_trans_view_str($trans_type, $grn, _("&View this Delivery")));
display_notification_centered(_("Purchase Order Delivery has been processed"));
display_note(get_trans_view_str($trans_type, $grn, _("&View this Delivery")));
+
+ $clearing_act = get_company_pref('grn_clearing_act');
+ if ($clearing_act)
+ display_note(get_gl_view_str($trans_type, $grn, _("View the GL Journal Entries for this Delivery")), 1);
hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1");
hyperlink_params("$path_to_root/purchasing/supplier_invoice.php", _("Entry purchase &invoice for this receival"), "New=1");
@@
-172,6
+176,13
@@
function can_process()
return false;
}
return false;
}
+ if (!is_date_in_fiscalyear($_POST['DefaultReceivedDate']))
+ {
+ display_error(_("The entered date is not in fiscal year"));
+ set_focus('DefaultReceivedDate');
+ return false;
+ }
+
if (!$Refs->is_valid($_POST['ref']))
{
display_error(_("You must enter a reference."));
if (!$Refs->is_valid($_POST['ref']))
{
display_error(_("You must enter a reference."));
@@
-255,6
+266,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);
@@
-314,7
+326,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();