X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fjournal_inquiry.php;h=dccef78f5c568c503730cb8c06bedfc5504eb6cc;hb=aad1fb7fcaf1f0e9c97f82150092ccf1e936a1a3;hp=08610201310ad62716cd4a1fe0161a21bbd3d3e5;hpb=49d2702ed98abe7a564a4abb4c8c5fa225f362e8;p=fa-stable.git diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php index 08610201..dccef78f 100644 --- a/gl/inquiry/journal_inquiry.php +++ b/gl/inquiry/journal_inquiry.php @@ -39,7 +39,7 @@ if (!isset($_POST['filterType'])) start_form(); -start_table("class='tablestyle_noborder'"); +start_table(TABLESTYLE_NOBORDER); start_row(); ref_cells(_("Reference:"), 'Ref', '',null, _('Enter reference fragment or leave empty')); @@ -51,7 +51,9 @@ date_cells(_("To:"), 'ToDate'); check_cells( _("Show closed:"), 'AlsoClosed', null); submit_cells('Search', _("Search"), '', '', 'default'); - +end_row(); +start_row(); +ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty')); end_row(); end_table(); @@ -78,9 +80,9 @@ function gl_link($row) } $editors = array( - 0 => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d", -// 1=> Bank Payment, -// 2=> Bank Deposit, + ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d", + ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d", + ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d", // 4=> Funds Transfer, ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d", // 11=> @@ -110,7 +112,9 @@ function edit_link($row) sprintf($editors[$row["type"]], $row["type_no"], $row["type"]), ICON_EDIT) : ''; } -$sql = get_sql_for_journal_inquiry(); + +$sql = get_sql_for_journal_inquiry(get_post('filterType', -1), get_post('FromDate'), + get_post('ToDate'), get_post('Ref'), get_post('Memo'), check_value('AlsoClosed')); $cols = array( _("#") => array('fun'=>'journal_pos', 'align'=>'center'),