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 ($use_date_picker)
+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_no_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"));
+ hyperlink_params("$path_to_root/purchasing/supplier_payment.php", _("Entry supplier &payment for this invoice"),
+ "PInvoice=".$invoice_no."&trans_type=".$trans_type);
hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Invoice"), "New=1");
$Ajax->activate('gl_items');
set_focus('gl_code');
}
+
+function reset_tax_input()
+{
+ global $Ajax;
+
+ unset($_POST['mantax']);
+ $Ajax->activate('inv_tot');
+}
+
//------------------------------------------------------------------------------------------------
// GL postings are often entered in the same form to two accounts
// so fileds are cleared only on user demand.
$_SESSION['supp_trans']->add_gl_codes_to_trans($_POST['gl_code'], $gl_act_name,
$_POST['dimension_id'], $_POST['dimension2_id'],
input_num('amount'), $_POST['memo_']);
+ reset_tax_input();
set_focus('gl_code');
}
}
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;
}
$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;
+
+ $item = get_grn_item($n);
+
+ if (!$item)
+ {
+ display_error( _("Invalid GRN item selected."));
+ return false;
+ }
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 ||
- input_num('ChgPrice'.$n)/$_POST['order_price'.$n] >
- (1 + ($margin/ 100)))
+ if ($item['unit_price'] != input_num('ChgPrice'.$n)) {
+ if ($item['unit_price'] == 0 || input_num('ChgPrice'.$n)/$item['unit_price'] > (1 + ($margin/ 100)))
{
display_error(_("The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.") .
_("The over-charge percentage allowance is :") . $margin . "%");
}
}
- if ($check_qty_charged_vs_del_qty == True)
+ if ($SysPrefs->check_qty_charged_vs_del_qty == true && ($item['qty_recd'] != $item['quantity_inv']))
{
- if (input_num('this_quantity_inv'.$n) / ($_POST['qty_recd'.$n] - $_POST['prev_quantity_inv'.$n]) >
+ if (input_num('this_quantity_inv'.$n) / ($item['qty_recd'] - $item['quantity_inv']) >
(1+ ($margin / 100)))
{
display_error( _("The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary.")
}
}
- return true;
+ $item['quantity'] = input_num('this_quantity_inv'.$n);
+ $item['chg_price'] = input_num('ChgPrice'.$n);
+
+ return $item;
}
function commit_item_data($n)
{
- if (check_item_data($n))
+ $item = check_item_data($n);
+ if ($item)
{
- 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], "");
- unset($_POST['mantax']);
+ $_SESSION['supp_trans']->add_grn_to_trans($n,
+ $item['po_detail_item'], $item['item_code'],
+ $item['description'], $item['qty_recd'],
+ $item['quantity_inv'], $item['quantity'],
+ $item['unit_price'], $item['chg_price'], $item['std_cost_unit']);
+
+ reset_tax_input();
}
}
{
foreach($_POST as $postkey=>$postval )
{
- if (strpos($postkey, "qty_recd") === 0)
+ if (strpos($postkey, "this_quantity_inv") === 0)
{
- $id = substr($postkey, strlen("qty_recd"));
+ $id = substr($postkey, strlen("this_quantity_inv"));
$id = (int)$id;
commit_item_data($id);
}
if ($id3 != -1)
{
$_SESSION['supp_trans']->remove_grn_from_trans($id3);
- unset($_POST['mantax']);
$Ajax->activate('grn_items');
- $Ajax->activate('inv_tot');
+ reset_tax_input();
}
$id4 = find_submit('Delete2');
{
$_SESSION['supp_trans']->remove_gl_codes_from_trans($id4);
clear_fields();
+ reset_tax_input();
$Ajax->activate('gl_items');
- $Ajax->activate('inv_tot');
}
-$id2 = -1;
-if ($_SESSION["wa_current_user"]->can_access('SA_GRNDELETE'))
+$id5 = find_submit('Edit');
+if ($id5 != -1)
{
- $id2 = find_submit('void_item_id');
- if ($id2 != -1)
- {
- remove_not_invoice_item($id2);
- display_notification(sprintf(_('All yet non-invoiced items on delivery line # %d has been removed.'), $id2));
-
- }
+ $_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');
}
if (isset($_POST['go']))
$Ajax->activate('gl_items');
display_quick_entries($_SESSION['supp_trans'], $_POST['qid'], input_num('totamount'), QE_SUPPINV);
$_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
- $Ajax->activate('inv_tot');
+ reset_tax_input();
}
start_form();
//-----------------------------------------------------------------------------------------
-if ($id != -1 || $id2 != -1)
+if ($id != -1)
{
$Ajax->activate('grn_items');
$Ajax->activate('inv_tot');
//--------------------------------------------------------------------------------------------------
end_page();
-?>
projects / fa-stable.git / blobdiff