include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(900, 500);
if (user_use_date_picker())
$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");
{
global $Refs;
- if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
+ if (!get_post('supplier_id'))
{
- display_error(_("The invoice cannot be processed because the there are no items or values on the invoice. Invoices are expected to have a charge."));
+ display_error(_("There is no supplier selected."));
+ set_focus('supplier_id');
return false;
- }
+ }
- if (!$Refs->is_valid($_SESSION['supp_trans']->reference))
+ if (!$_SESSION['supp_trans']->is_valid_trans_to_post())
{
- display_error(_("You must enter an invoice reference."));
- set_focus('reference');
+ display_error(_("The invoice cannot be processed because the there are no items or values on the invoice. Invoices are expected to have a charge."));
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;
}
$inv = $_SESSION['supp_trans'];
$invoice_no = add_supp_invoice($inv);
- // presume supplier data need correction
- if ($inv->stored_algorithm != $inv->tax_algorithm)
- update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
-
$_SESSION['supp_trans']->clear_items();
unset($_SESSION['supp_trans']);
function check_item_data($n)
{
- global $check_price_charged_vs_order_price,
- $check_qty_charged_vs_del_qty, $SysPrefs;
+ global $SysPrefs;
if (!check_num('this_quantity_inv'.$n, 0) || input_num('this_quantity_inv'.$n)==0)
{
}
$margin = $SysPrefs->over_charge_allowance();
- if ($check_price_charged_vs_order_price == True)
+ if ($SysPrefs->check_price_charged_vs_order_price == True)
{
if ($_POST['order_price'.$n]!=input_num('ChgPrice'.$n)) {
if ($_POST['order_price'.$n]==0 ||
}
}
- if ($check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
+ if ($SysPrefs->check_qty_charged_vs_del_qty == true && ($_POST['qty_recd'.$n] != $_POST['prev_quantity_inv'.$n]))
{
if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
(1+ ($margin / 100)))
{
if (check_item_data($n))
{
- if (input_num('this_quantity_inv'.$n) >= ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]))
- {
- $complete = true;
- }
- else
- {
- $complete = false;
- }
-
$_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n],
$_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n],
$_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
- $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
- $_POST['std_cost_unit'.$n], "");
+ $_POST['order_price'.$n], input_num('ChgPrice'.$n));
reset_tax_input();
}
}
$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'))
{
$Ajax->activate('inv_tot');
}
-if (get_post('AddGLCodeToTrans'))
+if (get_post('AddGLCodeToTrans') || get_post('update'))
$Ajax->activate('inv_tot');
br();
//--------------------------------------------------------------------------------------------------
end_page();
-?>
projects / fa-stable.git / blobdiff