From 5291746252e9e0ba9ae841d5f7a291831b9e0f86 Mon Sep 17 00:00:00 2001
From: asolslk <52134143+asolslk@users.noreply.github.com>
Date: Sat, 8 Aug 2020 19:04:38 +0800
Subject: [PATCH 1/3] Update listbyaccount.php
fixed #14408
---
htdocs/accountancy/bookkeeping/listbyaccount.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 1f4ac513806..8ff9abc52f7 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -543,7 +543,13 @@ while ($i < min($num, $limit))
// Show the break account
print "
";
- print '| ';
+ if ($totalarray['nbfield']==""){
+ print ' | ';
+ }
+ else
+ {
+ print ' | ';
+ }
if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
else print ''.$langs->trans("Unknown").'';
print ' | ';
From d3cb704a0e4709bb293192dfcdfd12e755e1c260 Mon Sep 17 00:00:00 2001
From: stickler-ci
Date: Sat, 8 Aug 2020 11:05:19 +0000
Subject: [PATCH 2/3] Fixing style errors.
---
htdocs/accountancy/bookkeeping/listbyaccount.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 8ff9abc52f7..bca2ab3a5a8 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -546,8 +546,7 @@ while ($i < min($num, $limit))
if ($totalarray['nbfield']==""){
print '';
}
- else
- {
+ else {
print ' | ';
}
if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
From f8557879fb2b882db101de701658283ab3d8cdd4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur
Date: Sat, 8 Aug 2020 13:15:29 +0200
Subject: [PATCH 3/3] Update listbyaccount.php
---
htdocs/accountancy/bookkeeping/listbyaccount.php | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index bca2ab3a5a8..0d8e3836b31 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -543,12 +543,7 @@ while ($i < min($num, $limit))
// Show the break account
print "";
- if ($totalarray['nbfield']==""){
- print '| ';
- }
- else {
- print ' | ';
- }
+ print ' | ';
if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
else print ''.$langs->trans("Unknown").'';
print ' | ';
|