projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow reuse of references previously used on voided documents.
[fa-stable.git]
/
purchasing
/
po_entry_items.php
diff --git
a/purchasing/po_entry_items.php
b/purchasing/po_entry_items.php
index 3ce35fdadb3944e653acfaed84cea9b38237ce35..ed6308c953d613f746320154e8ea2e8073b46fc1 100644
(file)
--- a/
purchasing/po_entry_items.php
+++ b/
purchasing/po_entry_items.php
@@
-14,6
+14,7
@@
$page_security = 'SA_PURCHASEORDER';
include_once($path_to_root . "/purchasing/includes/po_class.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
include_once($path_to_root . "/purchasing/includes/po_class.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include_once($path_to_root . "/purchasing/includes/db/suppliers_db.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
set_page_security( @$_SESSION['PO']->trans_type,
include_once($path_to_root . "/reporting/includes/reporting.inc");
set_page_security( @$_SESSION['PO']->trans_type,
@@
-77,7
+78,7
@@
if (isset($_GET['AddedID']))
display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1);
display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1);
- display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 1));
+ display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "
printlink
", "", 1));
hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no");
hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no");
@@
-94,7
+95,7
@@
if (isset($_GET['AddedID']))
display_notification_centered(_("Direct GRN has been entered"));
display_notification_centered(_("Direct GRN has been entered"));
- display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0
, 1
);
+ display_note(get_trans_view_str($trans_type, $trans_no, _("&View this GRN")), 0);
// not yet
// display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
// not yet
// display_note(print_document_link($trans_no, _("&Print This GRN"), true, $trans_type), 0, 1);
@@
-317,6
+318,13
@@
function can_commit()
{
global $Refs;
{
global $Refs;
+ if (!get_post('supplier_id'))
+ {
+ display_error(_("There is no supplier selected."));
+ set_focus('supplier_id');
+ return false;
+ }
+
if (!is_date($_POST['OrderDate']))
{
display_error(_("The entered order date is invalid."));
if (!is_date($_POST['OrderDate']))
{
display_error(_("The entered order date is invalid."));
@@
-406,8
+414,7
@@
function handle_commit_order()
meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$grn_no");
}
// Direct Purchase Invoice
meta_forward($_SERVER['PHP_SELF'], "AddedGRN=$grn_no");
}
// Direct Purchase Invoice
- $inv = new supp_trans;
- $inv->is_invoice = true;
+ $inv = new supp_trans(ST_SUPPINVOICE);
$inv->Comments = $cart->Comments;
$inv->supplier_id = $cart->supplier_id;
$inv->tran_date = $cart->orig_order_date;
$inv->Comments = $cart->Comments;
$inv->supplier_id = $cart->supplier_id;
$inv->tran_date = $cart->orig_order_date;
@@
-478,7
+485,7
@@
echo "<br>";
display_po_items($_SESSION['PO']);
display_po_items($_SESSION['PO']);
-start_table(
$table_style
2);
+start_table(
TABLESTYLE
2);
textarea_row(_("Memo:"), 'Comments', null, 70, 4);
end_table(1);
textarea_row(_("Memo:"), 'Comments', null, 70, 4);
end_table(1);