X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fsupplier_payment.php;h=30cd4bb6b2d8c6dbd91ec718a8c7cb77337c3ef4;hb=95856a739a5eacda8c86dc53bff8e7a0ae7b204e;hp=4c99f95d00aef928f0f146b8950baecbf1540c7a;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 4c99f95d..30cd4bb6 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,19 @@ 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'])) + $_POST['supplier_id'] = $ret['supplier_id']; +} +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', 'ref', 'amount', + 'discount', 'memo_') ); +} +if (isset($_POST['_DatePaid_changed'])) { + $Ajax->activate('_ex_rate'); +} //---------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -39,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(); } @@ -53,31 +73,34 @@ if (isset($_GET['AddedID'])) function display_controls() { global $table_style2; - start_form(false, true); + start_form(); if (!isset($_POST['supplier_id'])) $_POST['supplier_id'] = get_global_supplier(false); if (!isset($_POST['DatePaid'])) { - $_POST['DatePaid'] = Today(); + $_POST['DatePaid'] = new_doc_date(); if (!is_date_in_fiscalyear($_POST['DatePaid'])) $_POST['DatePaid'] = end_fiscalyear(); } - start_table($table_style2, 5, 7); - echo "
"; // outer table
+ start_outer_table($table_style2, 5);
+ //echo " | "; // outer table
- echo " | "; // outer table
+ //echo " |