projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hook_db_prewrite is not properly used inside journal entry. Fixed by @kvvaradha.
[fa-stable.git]
/
reporting
/
includes
/
pdf_report.inc
diff --git
a/reporting/includes/pdf_report.inc
b/reporting/includes/pdf_report.inc
index b41bb69e867d8b4c2831dbe509868f6ef95da468..0d699731e75fbbdeaf80ac54f3a215b4e2031b1a 100644
(file)
--- a/
reporting/includes/pdf_report.inc
+++ b/
reporting/includes/pdf_report.inc
@@
-24,6
+24,7
@@
include_once($path_to_root . "/reporting/includes/reporting.inc");
include_once($path_to_root . "/admin/db/company_db.inc");
include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
include_once($path_to_root . "/admin/db/printers_db.inc");
include_once($path_to_root . "/admin/db/company_db.inc");
include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
include_once($path_to_root . "/admin/db/printers_db.inc");
+include_once($path_to_root . "/includes/ui/ui_globals.inc");
include_once($path_to_root . "/config.php");
class FrontReport extends Cpdf
include_once($path_to_root . "/config.php");
class FrontReport extends Cpdf
@@
-341,7
+342,7
@@
class FrontReport extends Cpdf
$str = $this->fiscal_year;
$this->Text($titleCol, $str, $companyCol);
$this->Text($companyCol, $this->user);
$str = $this->fiscal_year;
$this->Text($titleCol, $str, $companyCol);
$this->Text($companyCol, $this->user);
- for ($i = 1; $i < count($this->params); $i++)
+ for ($i = 1; $i < count
_array
($this->params); $i++)
{
if ($this->params[$i]['from'] != '')
{
{
if ($this->params[$i]['from'] != '')
{
@@
-371,12
+372,12
@@
class FrontReport extends Cpdf
$this->Font('italic');
if ($this->headers2 != null)
{
$this->Font('italic');
if ($this->headers2 != null)
{
- $count = count($this->headers2);
+ $count = count
_array
($this->headers2);
for ($i = 0; $i < $count; $i++)
$this->TextCol2($i, $i + 1, $this->headers2[$i]);
$this->NewLine();
}
for ($i = 0; $i < $count; $i++)
$this->TextCol2($i, $i + 1, $this->headers2[$i]);
$this->NewLine();
}
- $count = count($this->headers);
+ $count = count
_array
($this->headers);
for ($i = 0; $i < $count; $i++)
$this->TextCol($i, $i + 1, $this->headers[$i]);
$this->Font();
for ($i = 0; $i < $count; $i++)
$this->TextCol($i, $i + 1, $this->headers[$i]);
$this->Font();
@@
-389,7
+390,7
@@
class FrontReport extends Cpdf
*/
function SetCommonData($myrow, $branch, $sales_order, $bankaccount, $doctype, $contacts)
{
*/
function SetCommonData($myrow, $branch, $sales_order, $bankaccount, $doctype, $contacts)
{
-
+ $this->pageNumber = 0;
$this->formData = array();
$datnames = array(
'myrow' => array('ord_date', 'date_', 'tran_date',
$this->formData = array();
$datnames = array(
'myrow' => array('ord_date', 'date_', 'tran_date',
@@
-772,7
+773,7
@@
class FrontReport extends Cpdf
setlocale(LC_MONETARY, $amount_locale);
if ($color_red && $txt < 0)
$this->SetTextColor(255, 0, 0);
setlocale(LC_MONETARY, $amount_locale);
if ($color_red && $txt < 0)
$this->SetTextColor(255, 0, 0);
- $ret = $this->TextCol($c, $n,
money_format($amount_format,
$txt), $corr, $r, $border, $fill, $link, $stretch);
+ $ret = $this->TextCol($c, $n,
price_format(
$txt), $corr, $r, $border, $fill, $link, $stretch);
if ($color_red && $txt < 0)
$this->SetTextColor(0, 0, 0);
return $ret;
if ($color_red && $txt < 0)
$this->SetTextColor(0, 0, 0);
return $ret;
@@
-952,6
+953,9
@@
class FrontReport extends Cpdf
{
global $SysPrefs, $path_to_root;
{
global $SysPrefs, $path_to_root;
+ if (!empty($SysPrefs->prefs['print_dialog_direct']))
+ $this->includeJS("print();"); // force to open print dialog
+
if ($SysPrefs->pdf_debug == 1)
{
$pdfcode = $this->Output('','S');
if ($SysPrefs->pdf_debug == 1)
{
$pdfcode = $this->Output('','S');