projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PHP 8 rerun of number_format fix.
[fa-stable.git]
/
reporting
/
rep203.php
diff --git
a/reporting/rep203.php
b/reporting/rep203.php
index daa5d8a78d084a1d88475a4c751f8f89b3f934a0..38b7ac9f6a90be4d9801712b0a53d61cd0e03a30 100644
(file)
--- a/
reporting/rep203.php
+++ b/
reporting/rep203.php
@@
-83,7
+83,7
@@
function print_payment_report()
if ($no_zeros) $nozeros = _('Yes');
else $nozeros = _('No');
if ($no_zeros) $nozeros = _('Yes');
else $nozeros = _('No');
- $cols = array(0, 100, 1
30, 19
0, 250, 320, 385, 450, 515);
+ $cols = array(0, 100, 1
60, 21
0, 250, 320, 385, 450, 515);
$headers = array(_('Trans Type'), _('#'), _('Due Date'), '', '',
'', _('Total'), _('Balance'));
$headers = array(_('Trans Type'), _('#'), _('Due Date'), '', '',
'', _('Total'), _('Balance'));
@@
-107,11
+107,11
@@
function print_payment_report()
$total = array();
$grandtotal = array(0,0);
$total = array();
$grandtotal = array(0,0);
- $sql = "SELECT supplier_id, supp_name AS name, curr_code,
".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms
+ $sql = "SELECT supplier_id, supp_name AS name, curr_code,
s.inactive, pt.terms FROM ".TB_PREF."suppliers s, ".TB_PREF."payment_terms pt
WHERE ";
if ($fromsupp != ALL_TEXT)
$sql .= "supplier_id=".db_escape($fromsupp)." AND ";
WHERE ";
if ($fromsupp != ALL_TEXT)
$sql .= "supplier_id=".db_escape($fromsupp)." AND ";
- $sql .= "
".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms
.terms_indicator
+ $sql .= "
s.payment_terms = pt
.terms_indicator
ORDER BY supp_name";
$result = db_query($sql, "The customers could not be retrieved");
ORDER BY supp_name";
$result = db_query($sql, "The customers could not be retrieved");
@@
-123,7
+123,7
@@
function print_payment_report()
if ($no_zeros && db_num_rows($res)==0) continue;
$rep->fontSize += 2;
if ($no_zeros && db_num_rows($res)==0) continue;
$rep->fontSize += 2;
- $rep->TextCol(0, 6, $myrow['name'] . " - " . $myrow['terms']);
+ $rep->TextCol(0, 6, $myrow['name']
.($myrow['inactive']==1 ? " ("._("Inactive").")" : "")
. " - " . $myrow['terms']);
if ($convert)
$rep->TextCol(6, 7, $myrow['curr_code']);
$rep->fontSize -= 2;
if ($convert)
$rep->TextCol(6, 7, $myrow['curr_code']);
$rep->fontSize -= 2;