include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
$js .= get_js_date_picker();
-page(_("Journal Inquiry"), false, false, "", $js);
+page(_($help_context = "Journal Inquiry"), false, false, "", $js);
//-----------------------------------------------------------------------------------
// Ajax updates
start_form();
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
start_row();
ref_cells(_("Reference:"), 'Ref', '',null, _('Enter reference fragment or leave empty'));
journal_types_list_cells(_("Type:"), "filterType");
-date_cells(_("From:"), 'FromDate', '', null, 0, 0, -1);
+date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
date_cells(_("To:"), 'ToDate');
+end_row();
+start_row();
+ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty'));
+users_list_cells(_("User:"), 'userid', null, false);
+if (get_company_pref('use_dimension') && isset($_POST['dimension'])) // display dimension only, when started in dimension mode
+ dimensions_list_cells(_('Dimension:'), 'dimension', null, true, null, true);
check_cells( _("Show closed:"), 'AlsoClosed', null);
-
submit_cells('Search', _("Search"), '', '', 'default');
-
end_row();
end_table();
-end_form();
-
function journal_pos($row)
{
return $row['gl_seq'] ? $row['gl_seq'] : '-';
function view_link($row)
{
- return get_trans_view_str($row["type"], $row["type_no"]);
+ return get_trans_view_str($row["trans_type"], $row["trans_no"]);
}
function gl_link($row)
{
- return get_gl_view_str($row["type"], $row["type_no"]);
+ return get_gl_view_str($row["trans_type"], $row["trans_no"]);
}
-$editors = array(
- 0 => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
-// 1=> Bank Payment,
-// 2=> Bank Deposit,
-// 4=> Funds Transfer,
- ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
-// 11=>
-// free hand (debtors_trans.order_==0)
-// "/sales/credit_note_entry.php?ModifyCredit=%d"
-// credit invoice
-// "/sales/customer_credit_invoice.php?ModifyCredit=%d"
-// 12=> Customer Payment,
- ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d",
-// 16=> Location Transfer,
-// 17=> Inventory Adjustment,
-// 20=> Supplier Invoice,
-// 21=> Supplier Credit Note,
-// 22=> Supplier Payment,
-// 25=> Purchase Order Delivery,
-// 28=> Work Order Issue,
-// 29=> Work Order Production",
-// 35=> Cost Update,
-);
-
function edit_link($row)
{
- global $editors;
- return isset($editors[$row["type"]]) && !is_closed_trans($row["type"], $row["type_no"]) ?
- pager_link(_("Edit"),
- sprintf($editors[$row["type"]], $row["type_no"], $row["type"]),
- ICON_EDIT) : '';
+ $ok = true;
+ if ($row['trans_type'] == ST_SALESINVOICE)
+ {
+ $myrow = get_customer_trans($row["trans_no"], $row["trans_type"]);
+ if ($myrow['alloc'] != 0 || get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) !== false)
+ $ok = false;
+ }
+ return $ok ? trans_editor_link( $row["trans_type"], $row["trans_no"]) : '';
}
-$sql = "SELECT a.gl_seq,
- gl.tran_date,
- gl.type,
- gl.type_no,
- refs.reference,
- SUM(IF(gl.amount>0, gl.amount,0)) as amount,"
- ."com.memo_,"
- ."u.user_id"
- ." FROM ". TB_PREF."gl_trans as gl"
- ." LEFT JOIN ". TB_PREF."audit_trail as a ON
- (gl.type=a.type AND gl.type_no=a.trans_no)"
- ." LEFT JOIN ". TB_PREF."comments as com ON
- (gl.type=com.type AND gl.type_no=com.id)"
- ." LEFT JOIN ". TB_PREF."refs as refs ON
- (gl.type=refs.type AND gl.type_no=refs.id)"
- ." LEFT JOIN ". TB_PREF."users as u ON
- a.user=u.id
- WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
- AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
- AND gl.amount!=0 AND !ISNULL(a.gl_seq)";
-
-if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
- $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
-}
-if (get_post('filterType') != -1) {
- $sql .= " AND gl.type=".get_post('filterType');
-}
-if (!check_value('AlsoClosed')) {
- $sql .= " AND a.gl_seq=0";
+function invoice_supp_reference($row)
+{
+ return $row['supp_reference'];
}
-$sql .= " GROUP BY gl.type, gl.type_no";
+$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'), get_post('userid'));
$cols = array(
_("#") => array('fun'=>'journal_pos', 'align'=>'center'),
_("Date") =>array('name'=>'tran_date','type'=>'date','ord'=>'desc'),
_("Type") => array('fun'=>'systype_name'),
_("Trans #") => array('fun'=>'view_link'),
+ _("Counterparty") => array('ord' => ''),
+ _("Supplier's Reference") => 'skip',
_("Reference"),
_("Amount") => array('type'=>'amount'),
_("Memo"),
$cols[_("#")] = 'skip';
}
+if($_POST['filterType'] == ST_SUPPINVOICE) //add the payment column if shown supplier invoices only
+{
+ $cols[_("Supplier's Reference")] = array('fun'=>'invoice_supp_reference', 'align'=>'center');
+}
+
$table =& new_db_pager('journal_tbl', $sql, $cols);
-if (get_post('Search')) {
- $table->set_sql($sql);
- $table->set_columns($cols);
-}
$table->width = "80%";
-start_form();
display_db_pager($table);
end_form();
end_page();
-?>
projects / fa-stable.git / blobdiff