projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Defaults for get_post also for array submits, added confirm dialog helper.
[fa-stable.git]
/
reporting
/
rep204.php
diff --git
a/reporting/rep204.php
b/reporting/rep204.php
index 120bbbc0615c9f28de30e7d5113414ffcb7d06ff..2c8250cd3ba33d195ef7ce0aa277a227b02e5500 100644
(file)
--- a/
reporting/rep204.php
+++ b/
reporting/rep204.php
@@
-9,7
+9,7
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
-$page_security =
2
;
+$page_security =
'SA_SUPPLIERANALYTIC'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-25,7
+25,6
@@
include_once($path_to_root . "/gl/includes/gl_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_outstanding_GRN();
function getTransactions($fromsupp)
print_outstanding_GRN();
function getTransactions($fromsupp)
@@
-49,8
+48,9
@@
function getTransactions($fromsupp)
AND ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id
AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."purch_order_details.po_detail_item
AND qty_recd-quantity_inv <>0 ";
AND ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id
AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."purch_order_details.po_detail_item
AND qty_recd-quantity_inv <>0 ";
- if ($fromsupp != reserved_words::get_all_numeric())
- $sql .= "AND ".TB_PREF."grn_batch.supplier_id ='" . $fromsupp . "' ";
+
+ if ($fromsupp != ALL_NUMERIC)
+ $sql .= "AND ".TB_PREF."grn_batch.supplier_id =".db_escape($fromsupp)." ";
$sql .= "ORDER BY ".TB_PREF."grn_batch.supplier_id,
".TB_PREF."grn_batch.id";
$sql .= "ORDER BY ".TB_PREF."grn_batch.supplier_id,
".TB_PREF."grn_batch.id";
@@
-67,17
+67,11
@@
function print_outstanding_GRN()
$comments = $_POST['PARAM_1'];
$destination = $_POST['PARAM_2'];
if ($destination)
$comments = $_POST['PARAM_1'];
$destination = $_POST['PARAM_2'];
if ($destination)
- {
include_once($path_to_root . "/reporting/includes/excel_report.inc");
include_once($path_to_root . "/reporting/includes/excel_report.inc");
- $filename = "OutstandingGRN.xml";
- }
else
else
- {
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
- $filename = "OutstandingGRN.pdf";
- }
- if ($fromsupp ==
reserved_words::get_all_numeric()
)
+ if ($fromsupp ==
ALL_NUMERIC
)
$from = _('All');
else
$from = get_supplier_name($fromsupp);
$from = _('All');
else
$from = get_supplier_name($fromsupp);
@@
-93,7
+87,7
@@
function print_outstanding_GRN()
$params = array( 0 => $comments,
1 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''));
$params = array( 0 => $comments,
1 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''));
- $rep = new FrontReport(_('Outstanding GRNs Report'),
$filename
, user_pagesize());
+ $rep = new FrontReport(_('Outstanding GRNs Report'),
"OutstandingGRN"
, user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);