projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tax included ption added.
[fa-stable.git]
/
reporting
/
rep104.php
diff --git
a/reporting/rep104.php
b/reporting/rep104.php
index ecd2c9674524dc29c45312d3244f57694eb34b21..eabb5956881d0af33c9eba004ef1af0f3d1bb4b2 100644
(file)
--- a/
reporting/rep104.php
+++ b/
reporting/rep104.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_PRICEREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-24,11
+24,10
@@
include_once($path_to_root . "/includes/ui/ui_input.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/gl/includes/gl_db.inc");
include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/gl/includes/gl_db.inc");
include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
-include_once($path_to_root . "/inventory/includes/
db/items_categ
ory_db.inc");
+include_once($path_to_root . "/inventory/includes/
invent
ory_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
-// trial_inquiry_controls();
print_price_listing();
function fetch_items($category=0)
print_price_listing();
function fetch_items($category=0)
@@
-39,9
+38,9
@@
function fetch_items($category=0)
".TB_PREF."stock_category.description
FROM ".TB_PREF."stock_master,
".TB_PREF."stock_category
".TB_PREF."stock_category.description
FROM ".TB_PREF."stock_master,
".TB_PREF."stock_category
- WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id";
+ WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
AND NOT ".TB_PREF."stock_master.inactive
";
if ($category != 0)
if ($category != 0)
- $sql .= " AND ".TB_PREF."stock_category.category_id =
'$category'"
;
+ $sql .= " AND ".TB_PREF."stock_category.category_id =
".db_escape($category)
;
$sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_master.stock_id";
$sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_master.stock_id";
@@
-58,7
+57,7
@@
function get_kits($category=0)
ON i.category_id=c.category_id";
$sql .= " WHERE !i.is_foreign AND i.item_code!=i.stock_id";
if ($category != 0)
ON i.category_id=c.category_id";
$sql .= " WHERE !i.is_foreign AND i.item_code!=i.stock_id";
if ($category != 0)
- $sql .= " AND c.category_id =
'$category'"
;
+ $sql .= " AND c.category_id =
".db_escape($category)
;
$sql .= " GROUP BY i.item_code";
return db_query($sql,"No kits were returned");
}
$sql .= " GROUP BY i.item_code";
return db_query($sql,"No kits were returned");
}
@@
-67,7
+66,7
@@
function get_kits($category=0)
function print_price_listing()
{
function print_price_listing()
{
- global $
comp_path, $
path_to_root, $pic_height, $pic_width;
+ global $path_to_root, $pic_height, $pic_width;
$currency = $_POST['PARAM_0'];
$category = $_POST['PARAM_1'];
$currency = $_POST['PARAM_0'];
$category = $_POST['PARAM_1'];
@@
-77,26
+76,20
@@
function print_price_listing()
$comments = $_POST['PARAM_5'];
$destination = $_POST['PARAM_6'];
if ($destination)
$comments = $_POST['PARAM_5'];
$destination = $_POST['PARAM_6'];
if ($destination)
- {
include_once($path_to_root . "/reporting/includes/excel_report.inc");
include_once($path_to_root . "/reporting/includes/excel_report.inc");
- $filename = "PriceListing.xml";
- }
else
else
- {
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
- $filename = "PriceListing.pdf";
- }
$dec = user_price_dec();
$home_curr = get_company_pref('curr_default');
$dec = user_price_dec();
$home_curr = get_company_pref('curr_default');
- if ($currency ==
reserved_words::get_all()
)
+ if ($currency ==
ALL_TEXT
)
$currency = $home_curr;
$curr = get_currency($currency);
$curr_sel = $currency . " - " . $curr['currency'];
$currency = $home_curr;
$curr = get_currency($currency);
$curr_sel = $currency . " - " . $curr['currency'];
- if ($category ==
reserved_words::get_all_numeric()
)
+ if ($category ==
ALL_NUMERIC
)
$category = 0;
$category = 0;
- if ($salestype ==
reserved_words::get_all_numeric()
)
+ if ($salestype ==
ALL_NUMERIC
)
$salestype = 0;
if ($category == 0)
$cat = _('All');
$salestype = 0;
if ($category == 0)
$cat = _('All');
@@
-128,11
+121,11
@@
function print_price_listing()
else
$user_comp = "";
else
$user_comp = "";
- $rep = new FrontReport(_('Price Listing'), "PriceListing
.pdf
", user_pagesize());
+ $rep = new FrontReport(_('Price Listing'), "PriceListing", user_pagesize());
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
- $rep->
Header
();
+ $rep->
NewPage
();
$result = fetch_items($category);
$result = fetch_items($category);
@@
-166,13
+159,14
@@
function print_price_listing()
}
if ($pictures)
{
}
if ($pictures)
{
- $image = $comp_path . '/'. $user_comp . "/images/" . $myrow['stock_id'] . ".jpg";
+ $image = company_path(). "/images/"
+ . item_img_name($myrow['stock_id']) . ".jpg";
if (file_exists($image))
{
$rep->NewLine();
if ($rep->row - $pic_height < $rep->bottomMargin)
if (file_exists($image))
{
$rep->NewLine();
if ($rep->row - $pic_height < $rep->bottomMargin)
- $rep->
Header
();
- $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height,
$pic_width
, $pic_height);
+ $rep->
NewPage
();
+ $rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height,
0
, $pic_height);
$rep->row -= $pic_height;
$rep->NewLine();
}
$rep->row -= $pic_height;
$rep->NewLine();
}