[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 229/238: Task #1759 = PRINTBAL sur 4 colonnes
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 229/238: Task #1759 = PRINTBAL sur 4 colonnes |
Date: |
Sat, 26 Oct 2019 04:41:12 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit d48cffe4aa005150ad291a87acc50ddfd2e10094
Author: Dany De Bontridder <address@hidden>
Date: Fri Oct 11 19:39:12 2019 +0200
Task #1759 = PRINTBAL sur 4 colonnes
---
include/export/export_balance_csv.php | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/include/export/export_balance_csv.php
b/include/export/export_balance_csv.php
index 2201270..0d174e9 100644
--- a/include/export/export_balance_csv.php
+++ b/include/export/export_balance_csv.php
@@ -27,6 +27,8 @@ include_once ("lib/ac_common.php");
include_once("class/acc_balance.class.php");
require_once NOALYSS_INCLUDE.'/class/database.class.php';
require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
+
+$http=new HttpInput();
$gDossier=dossier::id();
require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
@@ -38,7 +40,8 @@ $http=new HttpInput();
$export=new Noalyss_Csv('balance');
$bal=new Acc_Balance($cn);
$bal->jrn=null;
-switch( $_GET['p_filter'])
+$p_filter=$http->get("p_filter");
+switch( $p_filter)
{
case 0:
$bal->jrn=null;
@@ -46,7 +49,7 @@ case 0:
case 1:
if ( isset($_GET['r_jrn']))
{
- $selected=$http->get('r_jrn','number');
+ $selected=$http->get('r_jrn');
$array_ledger=$g_user->get_ledger('ALL',3);
$array=get_array_column($array_ledger,'jrn_def_id');
for ($e=0;$e<count($selected);$e++)
@@ -73,7 +76,7 @@ $row=$bal->get_row($http->get('from_periode','number'),
$prev = ( isset ($row[0]['sum_cred_previous'])) ?1:0;
$title=array('poste','libelle');
if ($prev == 1 ) $title=array_merge($title,array('deb n-1','cred n-1','solde
n-1','d/c;'));
-$title=array_merge($title,array(_('deb'),_('cred'),_('solde'),_('d/c')));
+$title=array_merge($title,array(_('Débit'),_('Crédit'),_("Solde
débiteur"),_("Solde créditeur")));
$export->send_header();
$pstart = new Periode($cn,$http->get("from_periode"));
@@ -100,12 +103,16 @@ foreach ($row as $r)
}
$delta=bcsub($r['solde_deb'],$r['solde_cred']);
- $sign=($delta<0)?'C':'D';
- $sign=($delta == 0)?'=':$sign;
$export->add($r['sum_deb'],"number");
$export->add($r['sum_cred'],"number");
- $export->add(abs($delta),"number");
- $export->add($sign);
+
+ if ( $delta < 0 ){
+ $export->add("0","number");
+ $export->add(abs($delta),"number");
+ }else {
+ $export->add(abs($delta),"number");
+ $export->add("0","number");
+ }
$export->write();
}
- [Noalyss-commit] [noalyss] 216/238: Merge branch 'accept7100' into entreprise, (continued)
- [Noalyss-commit] [noalyss] 216/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 217/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 203/238: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 209/238: Apparence 7.1, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 197/238: translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 218/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 199/238: Merge with dev7109, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 206/238: Cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 210/238: Improve apparence, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 237/238: Acc_Ledger : problem with acc_ledger::load(), Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 229/238: Task #1759 = PRINTBAL sur 4 colonnes,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 224/238: Improve PHPUNIT Test for phpunit7 and phpunit8, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 91/238: PHP 7.2 : fix incomptability, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 117/238: Currency : cosmetic display history : show only the value of the card/accounting, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 138/238: Translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 122/238: Currency : display correctly the saldo at the end / beginning operation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 130/238: typo doc, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 123/238: Currency = payment automatic for Sales and Purchases, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 147/238: Currency : detail operation Purchase , the amount in currency were wrong in the summary, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 152/238: New function findSide return D if number is <0, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 168/238: translation, Dany De Bontridder, 2019/10/26