Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
a6c5a247
Commit
a6c5a247
authored
9 years ago
by
Florian Henry
Browse files
Options
Downloads
Patches
Plain Diff
add total and title in page records banck account
parent
ca53d3b6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/compta/bank/account.php
+19
-5
19 additions, 5 deletions
htdocs/compta/bank/account.php
with
19 additions
and
5 deletions
htdocs/compta/bank/account.php
+
19
−
5
View file @
a6c5a247
...
...
@@ -7,7 +7,7 @@
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@@2byte.es>
* Copyright (C) 2012-2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2011-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2015
Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015
Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
@@ -163,7 +163,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->m
* View
*/
llxHeader
();
llxHeader
(
''
,
$langs
->
trans
(
"FinancialAccount"
)
.
'-'
.
$langs
->
trans
(
"Transactions"
)
);
$societestatic
=
new
Societe
(
$db
);
$userstatic
=
new
User
(
$db
);
...
...
@@ -598,7 +598,7 @@ if ($id > 0 || ! empty($ref))
$var
=
true
;
$num
=
$db
->
num_rows
(
$result
);
$i
=
0
;
$total
=
0
;
$sep
=
-
1
;
$i
=
0
;
$total
=
0
;
$sep
=
-
1
;
$total_deb
=
0
;
$total_cred
=
0
;
while
(
$i
<
$num
)
{
...
...
@@ -833,10 +833,12 @@ if ($id > 0 || ! empty($ref))
if
(
$objp
->
amount
<
0
)
{
print
'<td align="right" class="nowrap">'
.
price
(
$objp
->
amount
*
-
1
)
.
'</td><td> </td>'
.
"
\n
"
;
$total_deb
+=
$objp
->
amount
;
}
else
{
print
'<td> </td><td align="right" class="nowrap"> '
.
price
(
$objp
->
amount
)
.
'</td>'
.
"
\n
"
;
$total_cred
+=
$objp
->
amount
;
}
// Balance
...
...
@@ -905,14 +907,26 @@ if ($id > 0 || ! empty($ref))
$i
++
;
}
// Show total
// Show total
if
(
$page
==
0
&&
!
$mode_search
)
{
//Real account situation
print
'<tr class="liste_total"><td align="left" colspan="8">'
;
if
(
$sep
>
0
)
print
' '
;
// If we had at least one line in future
else
print
$langs
->
trans
(
"CurrentBalance"
);
print
' '
.
$object
->
currency_code
.
'</td>'
;
print
'<td align="right" class="nowrap"><b>'
.
price
(
$total
,
0
,
$langs
,
0
,
0
,
-
1
,
$object
->
currency_code
)
.
'</b></td>'
;
print
'<td align="right" class="nowrap"><b>'
.
price
(
$solde
,
0
,
$langs
,
0
,
0
,
-
1
,
$object
->
currency_code
)
.
'</b></td>'
;
print
'<td> </td>'
;
print
'</tr>'
;
}
else
{
// Only total according row displays
print
'<tr class="liste_total"><td align="left" colspan="6">'
;
if
(
$sep
>
0
)
print
' '
;
// If we had at least one line in future
else
print
$langs
->
trans
(
"Total"
);
print
' '
.
$object
->
currency_code
.
'</td>'
;
print
'<td align="right" class="nowrap"><b>'
.
price
(
$total_deb
*-
1
,
0
,
$langs
,
0
,
0
,
-
1
,
$object
->
currency_code
)
.
'</b></td>'
;
print
'<td align="right" class="nowrap"><b>'
.
price
(
$total_cred
,
0
,
$langs
,
0
,
0
,
-
1
,
$object
->
currency_code
)
.
'</b></td>'
;
print
'<td align="right" class="nowrap"><b>'
.
price
(
$total_cred
-
(
$total_deb
*-
1
),
0
,
$langs
,
0
,
0
,
-
1
,
$object
->
currency_code
)
.
'</b></td>'
;
print
'<td> </td>'
;
print
'</tr>'
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment