$js .= get_js_date_picker();
//----------------------------------------------------------------------------------------
-check_db_has_suppliers(_("There are no suppliers defined in the system."));
-
-//--------------------------------------------------------------------------------------------------
-
if (isset($_GET['New']))
{
if (isset( $_SESSION['supp_trans']))
if (isset($_GET['ModifyInvoice']))
check_is_editable(ST_SUPPINVOICE, $_GET['ModifyInvoice']);
+check_db_has_suppliers(_("There are no suppliers defined in the system."));
+
//---------------------------------------------------------------------------------------------------------------
if (isset($_GET['AddedID']))
display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")), 1);
hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
- "PInvoice=".$invoice_no);
+ "PInvoice=".$invoice_no."&trans_type=".$trans_type);
hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
return false;
}
- if (!$Refs->is_valid($_SESSION['supp_trans']->reference))
- {
- display_error(_("You must enter an invoice reference."));
- set_focus('reference');
- return false;
- }
-
- if (!is_new_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
+ if (!check_reference($_SESSION['supp_trans']->reference, ST_SUPPINVOICE, $_SESSION['supp_trans']->trans_no))
{
- display_error(_("The entered reference is already in use."));
set_focus('reference');
return false;
}
- if (!$Refs->is_valid($_SESSION['supp_trans']->supp_reference))
- {
- display_error(_("You must enter a supplier's invoice reference."));
- set_focus('supp_reference');
- return false;
- }
-
if (!is_date( $_SESSION['supp_trans']->tran_date))
{
display_error(_("The invoice as entered cannot be processed because the invoice date is in an incorrect format."));
return false;
}
+ if (trim(get_post('supp_reference')) == false)
+ {
+ display_error(_("You must enter a supplier's invoice reference."));
+ set_focus('supp_reference');
+ return false;
+ }
+
if (is_reference_already_there($_SESSION['supp_trans']->supplier_id, $_POST['supp_reference'], $_SESSION['supp_trans']->trans_no))
{ /*Transaction reference already entered */
display_error(_("This invoice number has already been entered. It cannot be entered again.") . " (" . $_POST['supp_reference'] . ")");
+ set_focus('supp_reference');
return false;
}
$Ajax->activate('gl_items');
}
+$id5 = find_submit('Edit');
+if ($id5 != -1)
+{
+ $_POST['gl_code'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_code;
+ $_POST['dimension_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim;
+ $_POST['dimension2_id'] = $_SESSION['supp_trans']->gl_codes[$id5]->gl_dim2;
+ $_POST['amount'] = $_SESSION['supp_trans']->gl_codes[$id5]->amount;
+ $_POST['memo_'] = $_SESSION['supp_trans']->gl_codes[$id5]->memo_;
+
+ $_SESSION['supp_trans']->remove_gl_codes_from_trans($id5);
+ reset_tax_input();
+ $Ajax->activate('gl_items');
+}
+
$id2 = -1;
if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
{