projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed mysqli related warnings.
[fa-stable.git]
/
purchasing
/
inquiry
/
supplier_inquiry.php
diff --git
a/purchasing/inquiry/supplier_inquiry.php
b/purchasing/inquiry/supplier_inquiry.php
index 3a341abeef10f1e29e70a25420644afee84975d1..c3f54557c665373effdf0278b8e7372f70aa5db6 100644
(file)
--- a/
purchasing/inquiry/supplier_inquiry.php
+++ b/
purchasing/inquiry/supplier_inquiry.php
@@
-11,16
+11,16
@@
***********************************************************************/
$page_security = 'SA_SUPPTRANSVIEW';
$path_to_root = "../..";
***********************************************************************/
$page_security = 'SA_SUPPTRANSVIEW';
$path_to_root = "../..";
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
+include
_once
($path_to_root . "/includes/db_pager.inc");
+include
_once
($path_to_root . "/includes/session.inc");
-include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
-include($path_to_root . "/reporting/includes/reporting.inc");
+include
_once
($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include
_once
($path_to_root . "/reporting/includes/reporting.inc");
$js = "";
$js = "";
-if ($use_popup_windows)
+if ($
SysPrefs->
use_popup_windows)
$js .= get_js_open_window(900, 500);
$js .= get_js_open_window(900, 500);
-if (
$use_date_picker
)
+if (
user_use_date_picker()
)
$js .= get_js_date_picker();
page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false, "", $js);
$js .= get_js_date_picker();
page(_($help_context = "Supplier Inquiry"), isset($_GET['supplier_id']), false, "", $js);
@@
-44,9
+44,10
@@
if (!isset($_POST['supplier_id']))
start_table(TABLESTYLE_NOBORDER);
start_row();
start_table(TABLESTYLE_NOBORDER);
start_row();
-supplier_list_cells(_("Select a supplier:"), 'supplier_id', null, true);
+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);
date_cells(_("To:"), 'TransToDate');
supp_transactions_list_cell("filterType", null, true);
@@
-68,7
+69,7
@@
function display_supplier_summary($supplier_record)
$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
- start_table(TABLESTYLE, "width=
80%
");
+ start_table(TABLESTYLE, "width=
'80%'
");
$th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
$pastdue1, $pastdue2, _("Total Balance"));
$th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
$pastdue1, $pastdue2, _("Total Balance"));
@@
-89,7
+90,7
@@
function display_supplier_summary($supplier_record)
div_start('totals_tbl');
if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT))
{
div_start('totals_tbl');
if (($_POST['supplier_id'] != "") && ($_POST['supplier_id'] != ALL_TEXT))
{
- $supplier_record = get_supplier_details($_POST['supplier_id']);
+ $supplier_record = get_supplier_details($_POST['supplier_id']
, $_POST['TransToDate']
);
display_supplier_summary($supplier_record);
}
div_end();
display_supplier_summary($supplier_record);
}
div_end();
@@
-105,6
+106,7
@@
function systype_name($dummy, $type)
global $systypes_array;
return $systypes_array[$type];
}
global $systypes_array;
return $systypes_array[$type];
}
+div_end();
function trans_view($trans)
{
function trans_view($trans)
{
@@
-123,6
+125,10
@@
function gl_view($row)
function credit_link($row)
{
function credit_link($row)
{
+ global $page_nested;
+
+ if ($page_nested)
+ return '';
return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ?
pager_link(_("Credit This"),
"/purchasing/supplier_credit.php?New=1&invoice_no=".
return $row['type'] == ST_SUPPINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ?
pager_link(_("Credit This"),
"/purchasing/supplier_credit.php?New=1&invoice_no=".
@@
-145,23
+151,23
@@
function fmt_credit($row)
function prt_link($row)
{
function prt_link($row)
{
- if ($row['type'] == ST_SUPPAYMENT || $row['type'] == ST_BANKPAYMENT)
+ if ($row['type'] == ST_SUPPAYMENT || $row['type'] == ST_BANKPAYMENT
|| $row['type'] == ST_SUPPCREDIT
)
return print_document_link($row['trans_no']."-".$row['type'], _("Print Remittance"), true, ST_SUPPAYMENT, ICON_PRINT);
}
return print_document_link($row['trans_no']."-".$row['type'], _("Print Remittance"), true, ST_SUPPAYMENT, ICON_PRINT);
}
-function edit_link($row)
-{
- return edit_trans_link($row['type'], $row['trans_no']);
-}
-
function check_overdue($row)
{
return $row['OverDue'] == 1
&& (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
}
function check_overdue($row)
{
return $row['OverDue'] == 1
&& (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
}
+
+function edit_link($row)
+{
+ return trans_editor_link($row['type'], $row['trans_no']);
+}
//------------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------------
-$sql = get_sql_for_supplier_inquiry();
+$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'=>''),
$cols = array(
_("Type") => array('fun'=>'systype_name', 'ord'=>''),
@@
-185,8
+191,6
@@
if ($_POST['supplier_id'] != ALL_TEXT)
$cols[_("Supplier")] = 'skip';
$cols[_("Currency")] = 'skip';
}
$cols[_("Supplier")] = 'skip';
$cols[_("Currency")] = 'skip';
}
-//------------------------------------------------------------------------------------------------
-
/*show a table of the transactions returned by the sql */
$table =& new_db_pager('trans_tbl', $sql, $cols);
/*show a table of the transactions returned by the sql */
$table =& new_db_pager('trans_tbl', $sql, $cols);
@@
-199,4
+203,3
@@
display_db_pager($table);
end_form();
end_page();
end_form();
end_page();
-?>