New: Ajout caractéristique "rapprochable" sur les comptes bancaires.
Uniformisation page des journaux de comptes Debuggage de la fonction des graphiques de solde
This commit is contained in:
parent
c59b23a3f5
commit
9ca30b4cd4
@ -462,6 +462,7 @@ alter table llx_bank_account modify domiciliation varchar(255);
|
|||||||
alter table llx_bank_account add proprio varchar(60) after domiciliation ;
|
alter table llx_bank_account add proprio varchar(60) after domiciliation ;
|
||||||
alter table llx_bank_account add adresse_proprio varchar(255) after proprio ;
|
alter table llx_bank_account add adresse_proprio varchar(255) after proprio ;
|
||||||
alter table llx_bank_account add account_number varchar(8) after clos ;
|
alter table llx_bank_account add account_number varchar(8) after clos ;
|
||||||
|
alter table llx_bank_account add rappro smallint DEFAULT 1 after clos;
|
||||||
alter table llx_bank_account modify label varchar(30) unique;
|
alter table llx_bank_account modify label varchar(30) unique;
|
||||||
update llx_bank_account set account_number = '51' where account_number is null;
|
update llx_bank_account set account_number = '51' where account_number is null;
|
||||||
|
|
||||||
|
|||||||
@ -43,5 +43,6 @@ create table llx_bank_account
|
|||||||
adresse_proprio varchar(255),
|
adresse_proprio varchar(255),
|
||||||
courant smallint DEFAULT 0 NOT NULL,
|
courant smallint DEFAULT 0 NOT NULL,
|
||||||
clos smallint DEFAULT 0 NOT NULL,
|
clos smallint DEFAULT 0 NOT NULL,
|
||||||
|
rappro smallint DEFAULT 1 integer,
|
||||||
account_number varchar(8)
|
account_number varchar(8)
|
||||||
)type=innodb;
|
)type=innodb;
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
#!/usr/bin/php
|
||||||
<?PHP
|
<?PHP
|
||||||
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
*
|
*
|
||||||
@ -17,21 +18,64 @@
|
|||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
* $Source$
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require ("../../htdocs/master.inc.php");
|
/**
|
||||||
|
\file scripts/banque/graph-solde.php
|
||||||
|
\ingroup banque
|
||||||
|
\brief Script de génération des images des soldes des comptes
|
||||||
|
*/
|
||||||
|
|
||||||
include_once (JPGRAPH_DIR."jpgraph.php");
|
|
||||||
include_once (JPGRAPH_DIR."jpgraph_line.php");
|
// Test si mode batch
|
||||||
include_once (JPGRAPH_DIR."jpgraph_bar.php");
|
$sapi_type = php_sapi_name();
|
||||||
include_once (JPGRAPH_DIR."jpgraph_pie.php");
|
if (substr($sapi_type, 0, 3) == 'cgi') {
|
||||||
include_once (JPGRAPH_DIR."jpgraph_error.php");
|
echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
|
||||||
include_once (JPGRAPH_DIR."jpgraph_canvas.php");
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Recupere root dolibarr
|
||||||
|
$path=eregi_replace('graph-solde.php','',$_SERVER["PHP_SELF"]);
|
||||||
|
|
||||||
|
require ($path."../../htdocs/master.inc.php");
|
||||||
|
|
||||||
|
// Vérifie que chemin vers JPGRAHP est connu et defini $jpgraph
|
||||||
|
if (! defined('JPGRAPH_DIR') && ! defined('JPGRAPH_PATH'))
|
||||||
|
{
|
||||||
|
print 'Erreur: Définissez la constante JPGRAPH_PATH sur la valeur du répertoire contenant JPGraph';
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
if (! defined('JPGRAPH_DIR')) define('JPGRAPH_DIR', JPGRAPH_PATH);
|
||||||
|
$jpgraphdir=JPGRAPH_DIR;
|
||||||
|
if (! eregi('[\\\/]$',$jpgraphdir)) $jpgraphdir.='/';
|
||||||
|
|
||||||
|
|
||||||
|
include_once ($jpgraphdir."jpgraph.php");
|
||||||
|
include_once ($jpgraphdir."jpgraph_line.php");
|
||||||
|
include_once ($jpgraphdir."jpgraph_bar.php");
|
||||||
|
include_once ($jpgraphdir."jpgraph_pie.php");
|
||||||
|
include_once ($jpgraphdir."jpgraph_error.php");
|
||||||
|
include_once ($jpgraphdir."jpgraph_canvas.php");
|
||||||
|
|
||||||
$error = 0;
|
$error = 0;
|
||||||
|
|
||||||
|
// Initialise opt, tableau des parametres
|
||||||
|
if (function_exists("getopt"))
|
||||||
|
{
|
||||||
|
// getopt existe sur ce PHP
|
||||||
$opt = getopt("m:y:");
|
$opt = getopt("m:y:");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// getopt n'existe sur ce PHP
|
||||||
|
$opt=array('m'=>$argv[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Crée répertoire accueil
|
||||||
|
create_exdir($conf->banque->dir_images);
|
||||||
|
|
||||||
|
|
||||||
$datetime = time();
|
$datetime = time();
|
||||||
|
|
||||||
@ -191,7 +235,7 @@ foreach ($accounts as $account)
|
|||||||
$graph->Add($b2plot);
|
$graph->Add($b2plot);
|
||||||
$graph->img->SetImgFormat("png");
|
$graph->img->SetImgFormat("png");
|
||||||
|
|
||||||
$file= DOL_DATA_ROOT."/graph/banque/solde.$account.$year.$month.png";
|
$file= $conf->banque->dir_images."/solde.$account.$year.$month.png";
|
||||||
|
|
||||||
$graph->Stroke($file);
|
$graph->Stroke($file);
|
||||||
}
|
}
|
||||||
@ -311,7 +355,7 @@ foreach ($accounts as $account)
|
|||||||
$graph->Add($b2plot);
|
$graph->Add($b2plot);
|
||||||
$graph->img->SetImgFormat("png");
|
$graph->img->SetImgFormat("png");
|
||||||
|
|
||||||
$file= DOL_DATA_ROOT."/graph/banque/solde.$account.$year.png";
|
$file= $conf->banque->dir_images."/solde.$account.$year.png";
|
||||||
|
|
||||||
$graph->Stroke($file);
|
$graph->Stroke($file);
|
||||||
}
|
}
|
||||||
@ -415,7 +459,7 @@ foreach ($accounts as $account)
|
|||||||
$graph->Add($b2plot);
|
$graph->Add($b2plot);
|
||||||
$graph->img->SetImgFormat("png");
|
$graph->img->SetImgFormat("png");
|
||||||
|
|
||||||
$file= DOL_DATA_ROOT."/graph/banque/solde.$account.png";
|
$file= $conf->banque->dir_images."/solde.$account.png";
|
||||||
|
|
||||||
$graph->Stroke($file);
|
$graph->Stroke($file);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user