projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional fixes to upgrade scripts.
[fa-stable.git]
/
reporting
/
rep401.php
diff --git
a/reporting/rep401.php
b/reporting/rep401.php
index 3c8fed88b1ecb407a4c5df9e364262a546a49b27..e72f163ce02037886435cd3e2cfd9f77c0e893c6 100644
(file)
--- a/
reporting/rep401.php
+++ b/
reporting/rep401.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_BOMREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-26,7
+26,6
@@
include_once($path_to_root . "/inventory/includes/db/items_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_bill_of_material();
function getTransactions($from, $to)
print_bill_of_material();
function getTransactions($from, $to)
@@
-41,8
+40,8
@@
function getTransactions($from, $to)
".TB_PREF."stock_master,
".TB_PREF."bom
WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component
".TB_PREF."stock_master,
".TB_PREF."bom
WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component
- AND ".TB_PREF."bom.parent >=
'$from'
- AND ".TB_PREF."bom.parent <=
'$to'
+ AND ".TB_PREF."bom.parent >=
".db_escape($from)."
+ AND ".TB_PREF."bom.parent <=
".db_escape($to)."
ORDER BY
".TB_PREF."bom.parent,
".TB_PREF."bom.component";
ORDER BY
".TB_PREF."bom.parent,
".TB_PREF."bom.component";
@@
-61,15
+60,9
@@
function print_bill_of_material()
$comments = $_POST['PARAM_2'];
$destination = $_POST['PARAM_3'];
if ($destination)
$comments = $_POST['PARAM_2'];
$destination = $_POST['PARAM_3'];
if ($destination)
- {
include_once($path_to_root . "/reporting/includes/excel_report.inc");
include_once($path_to_root . "/reporting/includes/excel_report.inc");
- $filename = "BillOfMaterial.xml";
- }
else
else
- {
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
- $filename = "BillOfMaterial.pdf";
- }
$cols = array(0, 50, 305, 375, 445, 515);
$cols = array(0, 50, 305, 375, 445, 515);
@@
-80,7
+73,7
@@
function print_bill_of_material()
$params = array( 0 => $comments,
1 => array('text' => _('Component'), 'from' => $frompart, 'to' => $topart));
$params = array( 0 => $comments,
1 => array('text' => _('Component'), 'from' => $frompart, 'to' => $topart));
- $rep = new FrontReport(_('Bill of Material Listing'),
$filename
, user_pagesize());
+ $rep = new FrontReport(_('Bill of Material Listing'),
"BillOfMaterial"
, user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);