projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dimensions not utilized in Direct Invoice/Delivery
[fa-stable.git]
/
reporting
/
rep704.php
diff --git
a/reporting/rep704.php
b/reporting/rep704.php
index b584c97c529e1056070defe62127f08143f85577..e8063a82a1d7174284d1355ee1ff08c713e64235 100644
(file)
--- a/
reporting/rep704.php
+++ b/
reporting/rep704.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_GLREP'
;
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
// ----------------------------------------------------------------
// $ Revision: 2.0 $
// Creator: Joe Hunt
@@
-19,6
+19,7
@@
$page_security = 2;
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
include_once($path_to_root . "/includes/date_functions.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 . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/gl/includes/gl_db.inc");
@@
-31,7
+32,7
@@
print_GL_transactions();
function print_GL_transactions()
{
function print_GL_transactions()
{
- global $path_to_root;
+ global $path_to_root
, $systypes_array
;
$dim = get_company_pref('use_dimension');
$dimension = $dimension2 = 0;
$dim = get_company_pref('use_dimension');
$dimension = $dimension2 = 0;
@@
-66,21
+67,22
@@
function print_GL_transactions()
$rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize());
$dec = user_price_dec();
$rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize());
$dec = user_price_dec();
- $cols = array(0, 70, 90, 140, 210, 280, 340, 400, 450, 510, 570);
+ //$cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570);
+ $cols = array(0, 65, 105, 125, 175, 230, 290, 345, 405, 465, 525);
//------------0--1---2---3----4----5----6----7----8----9----10-------
//-----------------------dim1-dim2-----------------------------------
//-----------------------dim1----------------------------------------
//-------------------------------------------------------------------
//------------0--1---2---3----4----5----6----7----8----9----10-------
//-----------------------dim1-dim2-----------------------------------
//-----------------------dim1----------------------------------------
//-------------------------------------------------------------------
- $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right');
+ $aligns = array('left', 'left', 'left', 'left', 'left', 'left', '
left', '
right', 'right', 'right');
if ($dim == 2)
if ($dim == 2)
- $headers = array(_('Type'), _('
#'),
_('Date'), _('Dimension')." 1", _('Dimension')." 2",
+ $headers = array(_('Type'), _('
Ref'), _('#'),
_('Date'), _('Dimension')." 1", _('Dimension')." 2",
_('Person/Item'), _('Debit'), _('Credit'), _('Balance'));
elseif ($dim == 1)
_('Person/Item'), _('Debit'), _('Credit'), _('Balance'));
elseif ($dim == 1)
- $headers = array(_('Type'), _('
#'),
_('Date'), _('Dimension'), "", _('Person/Item'),
+ $headers = array(_('Type'), _('
Ref'), _('#'),
_('Date'), _('Dimension'), "", _('Person/Item'),
_('Debit'), _('Credit'), _('Balance'));
else
_('Debit'), _('Credit'), _('Balance'));
else
- $headers = array(_('Type'), _('
#'),
_('Date'), "", "", _('Person/Item'),
+ $headers = array(_('Type'), _('
Ref'), _('#'),
_('Date'), "", "", _('Person/Item'),
_('Debit'), _('Credit'), _('Balance'));
if ($dim == 2)
_('Debit'), _('Credit'), _('Balance'));
if ($dim == 2)
@@
-110,7
+112,7
@@
function print_GL_transactions()
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
- $rep->
Header
();
+ $rep->
NewPage
();
$accounts = get_gl_accounts($fromacc, $toacc);
$accounts = get_gl_accounts($fromacc, $toacc);
@@
-120,7
+122,7
@@
function print_GL_transactions()
$begin = "";
else
{
$begin = "";
else
{
- $begin =
begin_fiscalyear(
);
+ $begin =
get_fiscalyear_begin_for_date($from
);
if (date1_greater_date2($begin, $from))
$begin = $from;
$begin = add_days($begin, -1);
if (date1_greater_date2($begin, $from))
$begin = $from;
$begin = add_days($begin, -1);
@@
-132,12
+134,12
@@
function print_GL_transactions()
if ($prev_balance == 0.0 && $rows == 0)
continue;
$rep->Font('bold');
if ($prev_balance == 0.0 && $rows == 0)
continue;
$rep->Font('bold');
- $rep->TextCol(0,
3, $account['account_code'] . " " . $account['account_name']
);
- $rep->TextCol(
3, 5
, _('Opening Balance'));
+ $rep->TextCol(0,
4, $account['account_code'] . " " . $account['account_name'], -2
);
+ $rep->TextCol(
4, 6
, _('Opening Balance'));
if ($prev_balance > 0.0)
if ($prev_balance > 0.0)
- $rep->AmountCol(6, 7, abs($prev_balance), $dec);
- else
$rep->AmountCol(7, 8, abs($prev_balance), $dec);
$rep->AmountCol(7, 8, abs($prev_balance), $dec);
+ else
+ $rep->AmountCol(8, 9, abs($prev_balance), $dec);
$rep->Font();
$total = $prev_balance;
$rep->NewLine(2);
$rep->Font();
$total = $prev_balance;
$rep->NewLine(2);
@@
-147,34
+149,45
@@
function print_GL_transactions()
{
$total += $myrow['amount'];
{
$total += $myrow['amount'];
- $rep->TextCol(0, 1, systypes::name($myrow["type"]));
- $rep->TextCol(1, 2, $myrow['type_no']);
- $rep->DateCol(2, 3, $myrow["tran_date"], true);
+ $rep->TextCol(0, 1, $systypes_array[$myrow["type"]], -2);
+ $reference = get_reference($myrow["type"], $myrow["type_no"]);
+ $rep->TextCol(1, 2, $reference);
+ $rep->TextCol(2, 3, $myrow['type_no'], -2);
+ $rep->DateCol(3, 4, $myrow["tran_date"], true);
if ($dim >= 1)
if ($dim >= 1)
- $rep->TextCol(
3, 4
, get_dimension_string($myrow['dimension_id']));
+ $rep->TextCol(
4, 5
, get_dimension_string($myrow['dimension_id']));
if ($dim > 1)
if ($dim > 1)
- $rep->TextCol(4, 5, get_dimension_string($myrow['dimension2_id']));
- $rep->TextCol(5, 6, payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false));
- if ($myrow['amount'] > 0.0)
- $rep->AmountCol(6, 7, abs($myrow['amount']), $dec);
+ $rep->TextCol(5, 6, get_dimension_string($myrow['dimension2_id']));
+ $txt = payment_person_name($myrow["person_type_id"],$myrow["person_id"], false);
+ $memo = $myrow['memo_'];
+ if ($txt != "")
+ {
+ if ($memo != "")
+ $txt = $txt."/".$memo;
+ }
else
else
+ $txt = $memo;
+ $rep->TextCol(6, 7, $txt, -2);
+ if ($myrow['amount'] > 0.0)
$rep->AmountCol(7, 8, abs($myrow['amount']), $dec);
$rep->AmountCol(7, 8, abs($myrow['amount']), $dec);
- $rep->TextCol(8, 9, number_format2($total, $dec));
+ else
+ $rep->AmountCol(8, 9, abs($myrow['amount']), $dec);
+ $rep->TextCol(9, 10, number_format2($total, $dec));
$rep->NewLine();
if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
{
$rep->Line($rep->row - 2);
$rep->NewLine();
if ($rep->row < $rep->bottomMargin + $rep->lineHeight)
{
$rep->Line($rep->row - 2);
- $rep->
Header
();
+ $rep->
NewPage
();
}
}
$rep->NewLine();
}
$rep->Font('bold');
}
}
$rep->NewLine();
}
$rep->Font('bold');
- $rep->TextCol(
3, 5
, _("Ending Balance"));
+ $rep->TextCol(
4, 6
, _("Ending Balance"));
if ($total > 0.0)
if ($total > 0.0)
- $rep->AmountCol(6, 7, abs($total), $dec);
- else
$rep->AmountCol(7, 8, abs($total), $dec);
$rep->AmountCol(7, 8, abs($total), $dec);
+ else
+ $rep->AmountCol(8, 9, abs($total), $dec);
$rep->Font();
$rep->Line($rep->row - $rep->lineHeight + 4);
$rep->NewLine(2, 1);
$rep->Font();
$rep->Line($rep->row - $rep->lineHeight + 4);
$rep->NewLine(2, 1);