X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_payment.php;h=82ad2750a09926bc664eb0a3f0582e3b9ba8b14f;hb=2a878e547f50149b44bfdd1187179a7df8260d10;hp=c731c491493581e7ed2eef3d114e1c0472d749ae;hpb=5b8ee3cb748382ab5a2665a620183f08c8ba204b;p=fa-stable.git
diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index c731c491..82ad2750 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$path_to_root="..";
$page_security = 5;
include_once($path_to_root . "/includes/session.inc");
@@ -29,8 +38,6 @@ check_db_has_suppliers(_("There are no suppliers defined in the system."));
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));
-check_db_has_bank_trans_types(_("There are no bank payment types defined in the system."));
-
//----------------------------------------------------------------------------------------
if ($ret = context_restore()) {
if(isset($ret['supplier_id']))
@@ -38,8 +45,11 @@ if ($ret = context_restore()) {
}
if (isset($_POST['_supplier_id_editor'])) {
context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'],
- array( 'supplier_id', 'bank_account', 'DatePaid',
- 'PaymentType', 'ref', 'amount', 'discount', 'memo_') );
+ array( 'supplier_id', 'bank_account', 'DatePaid', 'ref', 'amount',
+ 'discount', 'memo_') );
+}
+if (isset($_POST['_DatePaid_changed'])) {
+ $Ajax->activate('_ex_rate');
}
//----------------------------------------------------------------------------------------
@@ -49,11 +59,11 @@ if (isset($_GET['AddedID']))
display_notification_centered( _("Payment has been sucessfully entered"));
- display_note(get_gl_view_str(22, $payment_id, _("View the GL Journal Entries for this Payment")));
+ 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");
+ hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
- hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier payment"), "supplier_id=" . $_POST['supplier_id']);
+ hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier &payment"), "supplier_id=" . $_POST['supplier_id']);
display_footer_exit();
}
@@ -73,43 +83,36 @@ function display_controls()
if (!is_date_in_fiscalyear($_POST['DatePaid']))
$_POST['DatePaid'] = end_fiscalyear();
}
- start_table($table_style2, 5, 7);
- echo "
"; // outer table
-
- echo "";
+ start_outer_table($table_style2, 5);
+ table_section(1);
+
bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
amount_row(_("Amount of Payment:"), 'amount');
amount_row(_("Amount of Discount:"), 'discount');
- date_row(_("Date Paid") . ":", 'DatePaid');
+ date_row(_("Date Paid") . ":", 'DatePaid', '', null, 0, 0, 0, null, true);
- echo " ";
- echo " | "; // outer table
- echo "";
+ table_section(2);
supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
set_global_supplier($_POST['supplier_id']);
+ $comp_currency = get_company_currency();
$supplier_currency = get_supplier_currency($_POST['supplier_id']);
$bank_currency = get_bank_account_currency($_POST['bank_account']);
if ($bank_currency != $supplier_currency)
{
- exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid']);
+ exchange_rate_display($bank_currency, $supplier_currency, $_POST['DatePaid'], ($bank_currency == $comp_currency));
}
- bank_trans_types_list_row(_("Payment Type:"), 'PaymentType', null);
-
ref_row(_("Reference:"), 'ref', '', references::get_next(22));
text_row(_("Memo:"), 'memo_', null, 52,50);
- echo " ";
-
- echo " |
";
- end_table(1); // outer table
+ end_outer_table(1); // outer table
submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', true);
@@ -137,6 +140,13 @@ function check_inputs()
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."));
+ set_focus('_ex_rate');
+ return false;
+ }
+
if ($_POST['discount'] == "")
{
$_POST['discount'] = 0;
@@ -151,7 +161,7 @@ function check_inputs()
if (input_num('amount') - input_num('discount') <= 0)
{
- display_error(_("The total of the amount and the discount negative. Please enter positive values."));
+ display_error(_("The total of the amount and the discount is zero or negative. Please enter positive values."));
set_focus('amount');
return false;
}
@@ -189,14 +199,21 @@ function check_inputs()
function handle_add_payment()
{
+ $supp_currency = get_supplier_currency($_POST['supplier_id']);
+ $bank_currency = get_bank_account_currency($_POST['bank_account']);
+ $comp_currency = get_company_currency();
+ if ($comp_currency != $bank_currency && $bank_currency != $supp_currency)
+ $rate = 0;
+ else
+ $rate = input_num('_ex_rate');
+
$payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
- $_POST['PaymentType'], $_POST['bank_account'],
- input_num('amount'), input_num('discount'), $_POST['ref'], $_POST['memo_']);
+ $_POST['bank_account'], input_num('amount'), input_num('discount'),
+ $_POST['ref'], $_POST['memo_'], $rate);
//unset($_POST['supplier_id']);
unset($_POST['bank_account']);
unset($_POST['DatePaid']);
- unset($_POST['PaymentType']);
unset($_POST['currency']);
unset($_POST['memo_']);
unset($_POST['amount']);