include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
-if (!@$_GET['popup'])
-{
- $js = "";
- if ($use_popup_windows)
- $js .= get_js_open_window(900, 500);
- if ($use_date_picker)
- $js .= get_js_date_picker();
- page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false, "", $js);
-}
+$js = "";
+if ($SysPrefs->use_popup_windows)
+ $js .= get_js_open_window(900, 500);
+if (user_use_date_picker())
+ $js .= get_js_date_picker();
+page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false, "", $js);
+
if (isset($_GET['supplier_id'])){
$_POST['supplier_id'] = $_GET['supplier_id'];
}
+
if (isset($_GET['FromDate'])){
$_POST['TransAfterDate'] = $_GET['FromDate'];
}
//------------------------------------------------------------------------------------------------
-if (!@$_GET['popup'])
- start_form();
+start_form();
if (!isset($_POST['supplier_id']))
$_POST['supplier_id'] = get_global_supplier();
start_table(TABLESTYLE_NOBORDER);
start_row();
-if (!@$_GET['popup'])
- supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, !@$_GET['popup']);
+if (!$page_nested)
+ supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true, false, false, true);
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
date_cells(_("To:"), 'TransToDate');
supp_transactions_list_cell("filterType", null, true);
$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
- start_table(TABLESTYLE, "width=80%");
+ start_table(TABLESTYLE, "width='80%'");
$th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
$pastdue1, $pastdue2, _("Total Balance"));
function credit_link($row)
{
- if (@$_GET['popup'])
+ global $page_nested;
+
+ if ($page_nested)
return '';
return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ?
pager_link(_("Credit This"),
: '';
}
-function fmt_debit($row)
+function fmt_amount($row)
{
$value = $row["TotalAmount"];
- return $value>0 ? price_format($value) : '';
-
-}
-
-function fmt_credit($row)
-{
- $value = -$row["TotalAmount"];
- return $value>0 ? price_format($value) : '';
+ return price_format($value);
}
function prt_link($row)
return $row['OverDue'] == 1
&& (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
}
+
+function edit_link($row)
+{
+ global $page_nested;
+
+ if ($page_nested)
+ return '';
+ return trans_editor_link($row['type'], $row['trans_no']);
+}
//------------------------------------------------------------------------------------------------
-$sql = get_sql_for_supplier_inquiry($_POST['filterType'], $_POST['TransAfterDate'], $_POST['TransToDate'], $_POST['supplier_id']);
+$sql = get_sql_for_supplier_inquiry(get_post('filterType'), get_post('TransAfterDate'), get_post('TransToDate'), get_post('supplier_id'));
$cols = array(
_("Type") => array('fun'=>'systype_name', 'ord'=>''),
_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'),
_("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
_("Currency") => array('align'=>'center'),
- _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'),
- _("Credit") => array('align'=>'right', 'insert'=>true,'fun'=>'fmt_credit'),
+ _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'),
array('insert'=>true, 'fun'=>'gl_view'),
array('insert'=>true, 'fun'=>'credit_link'),
- array('insert'=>true, 'fun'=>'prt_link')
+ array('insert'=>true, 'fun'=>'prt_link'),
+ array('insert'=>true, 'fun'=>'edit_link')
);
if ($_POST['supplier_id'] != ALL_TEXT)
$cols[_("Supplier")] = 'skip';
$cols[_("Currency")] = 'skip';
}
-//------------------------------------------------------------------------------------------------
-
/*show a table of the transactions returned by the sql */
$table =& new_db_pager('trans_tbl', $sql, $cols);
display_db_pager($table);
-if (!@$_GET['popup'])
-{
- end_form();
- end_page(@$_GET['popup'], false, false);
-}
-?>
+end_form();
+end_page();
+