projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from main trunk up to 2.2.3
[fa-stable.git]
/
purchasing
/
supplier_payment.php
diff --git
a/purchasing/supplier_payment.php
b/purchasing/supplier_payment.php
index a2603dfb113c43b1710bec4e80384b66fe7b1bee..0c8aa7dd4940c75979d984fafdf4f6ec9e786a93 100644
(file)
--- a/
purchasing/supplier_payment.php
+++ b/
purchasing/supplier_payment.php
@@
-9,8
+9,8
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$pa
th_to_root=".."
;
-$pa
ge_security = 5
;
+$pa
ge_security = 'SA_SUPPLIERPAYMNT'
;
+$pa
th_to_root = ".."
;
include_once($path_to_root . "/includes/ui/allocation_cart.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui/allocation_cart.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
@@
-19,6
+19,7
@@
include_once($path_to_root . "/includes/banking.inc");
include_once($path_to_root . "/includes/data_checks.inc");
//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc");
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
include_once($path_to_root . "/includes/data_checks.inc");
//include_once($path_to_root . "/purchasing/includes/ui/supp_alloc_ui.inc");
include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
$js = "";
if ($use_popup_windows)
$js = "";
if ($use_popup_windows)
@@
-28,7
+29,7
@@
if ($use_date_picker)
add_js_file('payalloc.js');
add_js_file('payalloc.js');
-page(_("Supplier Payment Entry"), false, false, "", $js);
+page(_(
$help_context =
"Supplier Payment Entry"), false, false, "", $js);
if (isset($_GET['supplier_id']))
{
if (isset($_GET['supplier_id']))
{
@@
-69,6
+70,9
@@
if (isset($_GET['AddedID']))
display_notification_centered( _("Payment has been sucessfully entered"));
display_notification_centered( _("Payment has been sucessfully entered"));
+ submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt');
+ submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1);
+
display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment")));
// hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment")));
// hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
@@
-82,6
+86,8
@@
if (isset($_GET['AddedID']))
function check_inputs()
{
function check_inputs()
{
+ global $Refs;
+
if ($_POST['amount'] == "")
{
$_POST['amount'] = price_format(0);
if ($_POST['amount'] == "")
{
$_POST['amount'] = price_format(0);
@@
-100,6
+106,15
@@
function check_inputs()
return false;
}
return false;
}
+ if (isset($_POST['charge']) && input_num('charge') > 0) {
+ $charge_acct = get_company_pref('bank_charge_act');
+ if (get_gl_account($charge_acct) == false) {
+ display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
+ set_focus('charge');
+ return false;
+ }
+ }
+
if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
{
display_error(_("The exchange rate must be numeric and greater than zero."));
if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
{
display_error(_("The exchange rate must be numeric and greater than zero."));
@@
-138,14
+153,14
@@
function check_inputs()
set_focus('DatePaid');
return false;
}
set_focus('DatePaid');
return false;
}
- if (!
references::
is_valid($_POST['ref']))
+ if (!
$Refs->
is_valid($_POST['ref']))
{
display_error(_("You must enter a reference."));
set_focus('ref');
return false;
}
{
display_error(_("You must enter a reference."));
set_focus('ref');
return false;
}
- if (!is_new_reference($_POST['ref'],
22
))
+ if (!is_new_reference($_POST['ref'],
ST_SUPPAYMENT
))
{
display_error(_("The entered reference is already in use."));
set_focus('ref');
{
display_error(_("The entered reference is already in use."));
set_focus('ref');
@@
-153,7
+168,11
@@
function check_inputs()
}
$_SESSION['alloc']->amount = -input_num('amount');
}
$_SESSION['alloc']->amount = -input_num('amount');
- return check_allocations();
+
+ if (isset($_POST["TotalNumberOfAllocs"]))
+ return check_allocations();
+ else
+ return true;
}
//----------------------------------------------------------------------------------------
}
//----------------------------------------------------------------------------------------
@@
-211,7
+230,7
@@
start_form();
supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
if (!isset($_POST['bank_account'])) // first page call
supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
if (!isset($_POST['bank_account'])) // first page call
- $_SESSION['alloc'] = new allocation(
22
, 0);
+ $_SESSION['alloc'] = new allocation(
ST_SUPPAYMENT
, 0);
set_global_supplier($_POST['supplier_id']);
set_global_supplier($_POST['supplier_id']);
@@
-219,7
+238,7
@@
start_form();
table_section(2);
table_section(2);
- ref_row(_("Reference:"), 'ref', '',
references::get_next(22
));
+ ref_row(_("Reference:"), 'ref', '',
$Refs->get_next(ST_SUPPAYMENT
));
date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);