projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed amibiguity in few text messages to make translations easier, updated gettext...
[fa-stable.git]
/
reporting
/
rep104.php
diff --git
a/reporting/rep104.php
b/reporting/rep104.php
index eabb5956881d0af33c9eba004ef1af0f3d1bb4b2..f73a2c4a2a079c9f3b49b73da73acb795a50af7e 100644
(file)
--- a/
reporting/rep104.php
+++ b/
reporting/rep104.php
@@
-1,12
+1,12
@@
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU General Public License, GPL,
- as published by the Free Software Foundation, either version 3
+ Released under the terms of the GNU General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
$page_security = 'SA_PRICEREP';
See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
$page_security = 'SA_PRICEREP';
@@
-34,7
+34,7
@@
function fetch_items($category=0)
{
$sql = "SELECT ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_master.description AS name,
".TB_PREF."stock_master.material_cost+".TB_PREF."stock_master.labour_cost+".TB_PREF."stock_master.overhead_cost AS Standardcost,
{
$sql = "SELECT ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_master.description AS name,
".TB_PREF."stock_master.material_cost+".TB_PREF."stock_master.labour_cost+".TB_PREF."stock_master.overhead_cost AS Standardcost,
- ".TB_PREF."stock_master.category_id,
+ ".TB_PREF."stock_master.category_id,
".TB_PREF."stock_master.units,
".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
@@
-66,7
+66,7
@@
function get_kits($category=0)
function print_price_listing()
{
function print_price_listing()
{
- global $path_to_root, $
pic_height, $pic_width
;
+ global $path_to_root, $
SysPrefs
;
$currency = $_POST['PARAM_0'];
$category = $_POST['PARAM_1'];
$currency = $_POST['PARAM_0'];
$category = $_POST['PARAM_1'];
@@
-74,12
+74,14
@@
function print_price_listing()
$pictures = $_POST['PARAM_3'];
$showGP = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
$pictures = $_POST['PARAM_3'];
$showGP = $_POST['PARAM_4'];
$comments = $_POST['PARAM_5'];
- $destination = $_POST['PARAM_6'];
+ $orientation = $_POST['PARAM_6'];
+ $destination = $_POST['PARAM_7'];
if ($destination)
include_once($path_to_root . "/reporting/includes/excel_report.inc");
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
if ($destination)
include_once($path_to_root . "/reporting/includes/excel_report.inc");
else
include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+ $orientation = ($orientation ? 'L' : 'P');
$dec = user_price_dec();
$home_curr = get_company_pref('curr_default');
$dec = user_price_dec();
$home_curr = get_company_pref('curr_default');
@@
-104,11
+106,11
@@
function print_price_listing()
else
$GP = _('Yes');
else
$GP = _('Yes');
- $cols = array(0, 100, 385, 450, 515);
+ $cols = array(0, 100, 3
60, 3
85, 450, 515);
- $headers = array(_('Category/Items'), _('Description'), _('
Price'),
_('GP %'));
+ $headers = array(_('Category/Items'), _('Description'), _('
UOM'), _('Price'),
_('GP %'));
- $aligns = array('left', 'left', 'right', 'right');
+ $aligns = array('left', 'left', '
left', '
right', 'right');
$params = array( 0 => $comments,
1 => array('text' => _('Currency'), 'from' => $curr_sel, 'to' => ''),
$params = array( 0 => $comments,
1 => array('text' => _('Currency'), 'from' => $curr_sel, 'to' => ''),
@@
-121,7
+123,9
@@
function print_price_listing()
else
$user_comp = "";
else
$user_comp = "";
- $rep = new FrontReport(_('Price Listing'), "PriceListing", user_pagesize());
+ $rep = new FrontReport(_('Price Listing'), "PriceListing", user_pagesize(), 9, $orientation);
+ if ($orientation == 'L')
+ recalculate_cols($cols);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
@@
-146,8
+150,9
@@
function print_price_listing()
$rep->NewLine();
$rep->TextCol(0, 1, $myrow['stock_id']);
$rep->TextCol(1, 2, $myrow['name']);
$rep->NewLine();
$rep->TextCol(0, 1, $myrow['stock_id']);
$rep->TextCol(1, 2, $myrow['name']);
+ $rep->TextCol(2, 3, $myrow['units']);
$price = get_price($myrow['stock_id'], $currency, $salestype);
$price = get_price($myrow['stock_id'], $currency, $salestype);
- $rep->AmountCol(
2, 3
, $price, $dec);
+ $rep->AmountCol(
3, 4
, $price, $dec);
if ($showGP)
{
$price2 = get_price($myrow['stock_id'], $home_curr, $salestype);
if ($showGP)
{
$price2 = get_price($myrow['stock_id'], $home_curr, $salestype);
@@
-155,19
+160,19
@@
function print_price_listing()
$disp = ($price2 - $myrow['Standardcost']) * 100 / $price2;
else
$disp = 0.0;
$disp = ($price2 - $myrow['Standardcost']) * 100 / $price2;
else
$disp = 0.0;
- $rep->TextCol(
3, 4
, number_format2($disp, user_percent_dec()) . " %");
+ $rep->TextCol(
4, 5
, number_format2($disp, user_percent_dec()) . " %");
}
if ($pictures)
{
}
if ($pictures)
{
- $image = company_path(). "/images/"
+ $image = company_path(). "/images/"
. item_img_name($myrow['stock_id']) . ".jpg";
if (file_exists($image))
{
$rep->NewLine();
. item_img_name($myrow['stock_id']) . ".jpg";
if (file_exists($image))
{
$rep->NewLine();
- if ($rep->row - $pic_height < $rep->bottomMargin)
+ if ($rep->row - $
SysPrefs->
pic_height < $rep->bottomMargin)
$rep->NewPage();
$rep->NewPage();
- $rep->AddImage($image, $rep->cols[1], $rep->row - $
pic_height, 0, $
pic_height);
- $rep->row -= $pic_height;
+ $rep->AddImage($image, $rep->cols[1], $rep->row - $
SysPrefs->pic_height, 0, $SysPrefs->
pic_height);
+ $rep->row -= $
SysPrefs->
pic_height;
$rep->NewLine();
}
}
$rep->NewLine();
}
}
@@
-189,7
+194,7
@@
function print_price_listing()
$rep->fontSize += 2;
$rep->TextCol(0, 3, _("Sales Kits"));
$rep->fontSize -= 2;
$rep->fontSize += 2;
$rep->TextCol(0, 3, _("Sales Kits"));
$rep->fontSize -= 2;
- }
+ }
$rep->Line($rep->row - $rep->lineHeight);
$rep->NewLine(2);
$rep->fontSize += 2;
$rep->Line($rep->row - $rep->lineHeight);
$rep->NewLine(2);
$rep->fontSize += 2;
@@
-200,9
+205,9
@@
function print_price_listing()
}
$rep->NewLine();
$rep->TextCol(0, 1, $myrow['kit_code']);
}
$rep->NewLine();
$rep->TextCol(0, 1, $myrow['kit_code']);
- $rep->TextCol(1,
2
, $myrow['kit_name']);
+ $rep->TextCol(1,
3
, $myrow['kit_name']);
$price = get_kit_price($myrow['kit_code'], $currency, $salestype);
$price = get_kit_price($myrow['kit_code'], $currency, $salestype);
- $rep->AmountCol(
2, 3
, $price, $dec);
+ $rep->AmountCol(
3, 4
, $price, $dec);
$rep->NewLine(0, 1);
}
$rep->Line($rep->row - 4);
$rep->NewLine(0, 1);
}
$rep->Line($rep->row - 4);
@@
-210,4
+215,3
@@
function print_price_listing()
$rep->End();
}
$rep->End();
}
-?>
\ No newline at end of file