admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev-7201' into entreprise

Browse source 
* dev-7201:
  Bug 1786: Comptabilité analytique : TVA non déductible bloque
  http_input , trim on array is invalid
  Test : correct test for Acc_Ledger_Factory : payment status
  Bug in reconcile for bank amount: total_invoice is null for FIN and ODS
  Bug : search
  Bug #1783 : les nombres commençant par zéro ne sont pas supportés
  zero is considered as empty value
  http_input replace empty by a value
  export historic card csv : column wrong
  Remove direct access to $http
  Documentation + bug cosmetic about TVA_SIDED : total operation shown instead of total_invoice (VAT REVERSED)
  Fix cosmetic + export histo CSV with operation filter
  Round VAT
  add forgotten file
  Change logo
  warning about session_start
  Acc_Ledger_Search , fix small bug + Test file
  Documentation
  TEST fix bug in acc_balanceTest
This commit is contained in:
Dany De Bontridder 2020-01-17 20:27:49 +01:00
commit cb0a8491de
28 changed files with 319 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/export/export_fiche_balance_csv.php
View file

@ -181,13 +181,13 @@ else
if ($row['j_debit'] == 't')
{
$export->add($row['j_montant'],"number");
$export->add("");
$export->add(0,"number");
$amount_deb=bcadd($amount_deb,$row['j_montant']);
$prog = bcadd($prog, $row['j_montant']);
}
else
{
$export->add("");
$export->add(0,"number");
$export->add($row['j_montant'],"number");
$amount_cred=bcadd($amount_cred,$row['j_montant']);
$prog = bcsub($prog, $row['j_montant']);

3
include/export/export_fiche_csv.php
View file

@ -30,6 +30,7 @@ require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
$gDossier=dossier::id();
$cn=Dossier::connect();
$http=new HttpInput();
require_once NOALYSS_INCLUDE.'/class/user.class.php';
@ -40,7 +41,7 @@ $export->send_header();
if ( isset ($_GET['fd_id']))
{
$fiche_def=new Fiche_Def($cn,$_GET ['fd_id']);
$fiche_def=new Fiche_Def($cn,$http->get('fd_id',"number"));
$fiche=new Fiche($cn);
$e=$fiche_def->get_by_type();
$o=0;

4
include/export/export_gl_csv.php
View file

@ -22,7 +22,7 @@
/*! \file
* \brief create GL comptes as CSV.
* Argument $_GET
* @code
@code
* Array
(
[gDossier] => 10104
@ -35,7 +35,7 @@
[from_poste] =>
[to_poste] =>
)
* @encode
@encode
*/
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');

5
include/export/export_histo_csv.php
View file

@ -26,7 +26,10 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
require_once NOALYSS_INCLUDE.'/lib/noalyss_csv.class.php';
require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php';
$ledger=new Acc_Ledger_Search($cn,0);
$http=new HttpInput();
$ledger=new Acc_Ledger_Search($http->get("ledger_type"),0);
list($sql,$where)=$ledger->build_search_sql($_GET);
$order=" order by jr_date_order asc,substring(jr_pj_number,'[0-9]+$')::numeric asc ";