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(_($help_context = "Journal Inquiry"), false, false, "", $js);
start_form();
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
start_row();
ref_cells(_("Reference:"), 'Ref', '',null, _('Enter reference fragment or leave empty'));
date_cells(_("From:"), 'FromDate', '', null, 0, -1, 0);
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'));
+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);
+users_list_cells(_("User:"), 'userid', null, false);
+check_cells( _("Show closed:"), 'AlsoClosed', null);
end_row();
end_table();
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_type"]) : '';
}
-// Tom Hallman 11 Nov 2009
-// IF(gl.type = 1... statement is for deposits/payments that may not actually result
-// in a deposit, such as when a fix is made. Without that statement (and the
-// joining of the bank_trans table), the fix deposit/payment amount would show up
-// incorrectly as only the positive side of the fix.
-$sql = "SELECT IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
- gl.tran_date,
- gl.type,
- gl.type_no,
- refs.reference,
- IF(gl.type = 1 OR gl.type = 2,
- bank_trans.amount,
- SUM(IF(gl.amount>0, gl.amount,0))) as amount,
- com.memo_,
- IF(ISNULL(u.user_id),'',u.user_id) as 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
- LEFT JOIN ".TB_PREF."bank_trans as bank_trans ON
- (gl.type=bank_trans.type AND gl.type_no=bank_trans.trans_no)
- WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
- AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
- AND gl.amount!=0";
-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 gl_seq=0";
-}
-$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'));
$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' => ''),
_("Reference"),
_("Amount") => array('type'=>'amount'),
_("Memo"),
end_form();
end_page();
-?>
projects / fa-stable.git / blobdiff