';
- ImportCSV($cn,$_FILES['fupload']['tmp_name'],$_POST['import_bq'],$_POST['format_csv'],$_POST['import_jrn']);
- echo "
";
- } else {
- echo '';
+ ImportCSV($cn,$_FILES['fupload']['tmp_name'],$_POST['import_bq'],$_POST['format_csv'],$_POST['import_jrn']);
+ echo "
";
+ }
+ else
+ {
+ echo '';
- /* show the possible period */
- $default_period=$User->get_periode();
- $ip=new IPeriod('period');
- $ip->filter_year=true;
- $ip->user=$User;
- $ip->value=(isset($_GET['period']))?$_GET['period']:$default_period;
- $ip->cn=$cn;
- $ip->type=OPEN;
- $ip->javascript="onchange=submit(this)";
- echo '';
- // TransferCSV($cn,
- ConfirmTransfert($cn,$ip->value);
- echo "
";
- }
-}
+ echo '';
+ /* show the possible period */
+ $default_period=$User->get_periode();
+ $ip=new IPeriod('period');
+ $ip->filter_year=true;
+ $ip->user=$User;
+ $ip->value=(isset($_GET['period']))?$_GET['period']:$default_period;
+ $ip->cn=$cn;
+ $ip->type=OPEN;
+ $ip->javascript="onchange=submit(this)";
+ echo '';
+ // TransferCSV($cn,
+ ConfirmTransfert($cn,$ip->value);
+ echo "
";
+ }
+}
/*-----------------------------------------------
* transfert or remove the wrong record
*
*-----------------------------------------------*/
-if ( isset ($_POST['action'])) {
- $action=$_POST['action'];
- if ($action == "transfer" ) {
- echo '';
- RemoveCSV($cn);
- ConfirmTransfert($cn,$User->get_periode());
- echo "
";
- }
+ if ($action == "remove" )
+ {
+ echo '';
+ RemoveCSV($cn);
+ ConfirmTransfert($cn,$User->get_periode());
+ echo "
";
+ }
}
-if ( isset($_REQUEST['action']) && $_REQUEST['action']=='purge') {
- if ( isset($_POST['ok'])) {
- echo '';
- echo h2info('Toutes les données CSV sont effacées');
- $cn->exec_sql('truncate import_tmp');
- echo '
';
+if ( isset($_REQUEST['action']) && $_REQUEST['action']=='purge')
+{
+ if ( isset($_POST['ok']))
+ {
+ echo '';
+ echo h2info('Toutes les données CSV sont effacées');
+ $cn->exec_sql('truncate import_tmp');
+ echo '
';
- } else {
- echo '
Pour une meilleure expérience web, nous vous conseillons firefox
diff --git a/html/jrn_csv.php b/html/jrn_csv.php
index 72ea45fa8..dea2b6b9e 100644
--- a/html/jrn_csv.php
+++ b/html/jrn_csv.php
@@ -42,8 +42,11 @@ $User->Check();
$User->can_request(IMPJRN,0);
$User->check_dossier($gDossier);
-if ($_GET['jrn_id']!=0 && $User->check_jrn($_GET['jrn_id']) =='X') {
- NoAccess(); exit();}
+if ($_GET['jrn_id']!=0 && $User->check_jrn($_GET['jrn_id']) =='X')
+{
+ NoAccess();
+ exit();
+}
$Jrn=new Acc_Ledger($cn,$_GET['jrn_id']);
@@ -52,135 +55,140 @@ $jrn_type=$Jrn->get_type();
// Detailled printing
//---
-if ( $_GET['p_simple'] == 0 )
- {
+if ( $_GET['p_simple'] == 0 )
+{
$Jrn->get_row( $_GET['from_periode'],
- $_GET['to_periode']
- );
+ $_GET['to_periode']
+ );
- if ( count($Jrn->row) == 0)
- exit;
- foreach ( $Jrn->row as $op ) {
- // should clean description : remove
tag and '; char
- $desc=$op['description'];
- $desc=str_replace("","",$desc);
- $desc=str_replace(" ","",$desc);
- $desc=str_replace("","",$desc);
- $desc=str_replace(" ","",$desc);
- $desc=str_replace('"',"'",$desc);
- $desc=str_replace(";",",",$desc);
+ if ( count($Jrn->row) == 0)
+ exit;
+ foreach ( $Jrn->row as $op )
+ {
+ // should clean description : remove tag and '; char
+ $desc=$op['description'];
+ $desc=str_replace("","",$desc);
+ $desc=str_replace(" ","",$desc);
+ $desc=str_replace("","",$desc);
+ $desc=str_replace(" ","",$desc);
+ $desc=str_replace('"',"'",$desc);
+ $desc=str_replace(";",",",$desc);
+
+ printf("\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";%s;%s\n",
+ $op['j_id'],
+ $op['internal'],
+ $op['j_date'],
+ $op['poste'],
+ $desc,
+ nb($op['deb_montant']),
+ nb($op['cred_montant'])
+ );
- printf("\"%s\";\"%s\";\"%s\";\"%s\";\"%s\";%s;%s\n",
- $op['j_id'],
- $op['internal'],
- $op['j_date'],
- $op['poste'],
- $desc,
- nb($op['deb_montant']),
- nb($op['cred_montant'])
- );
-
}
exit;
- }
- else
- {
- $Row=$Jrn->get_rowSimple($_GET['from_periode'],
- $_GET['to_periode'],
- 0);
+}
+else
+{
+ $Row=$Jrn->get_rowSimple($_GET['from_periode'],
+ $_GET['to_periode'],
+ 0);
//-----------------------------------------------------
- if ( $jrn_type == 'ODS' || $jrn_type == 'FIN' || $jrn_type=='GL')
- {
- printf ('" operation";'.
- '"Date";'.
- '"commentaire";'.
- '"internal";'.
- '"montant";'.
- "\r\n");
- // set a filter for the FIN
- $a_parm_code=$cn->get_array("select p_value from parm_code where p_code in ('BANQUE','COMPTE_COURANT','CAISSE')");
- $sql_fin="(";
- $or="";
- foreach ($a_parm_code as $code) {
- $sql_fin.="$or j_poste::text like '".$code['p_value']."%'";
- $or=" or ";
- }
- $sql_fin.=")";
+ if ( $jrn_type == 'ODS' || $jrn_type == 'FIN' || $jrn_type=='GL')
+ {
+ printf ('" operation";'.
+ '"Date";'.
+ '"commentaire";'.
+ '"internal";'.
+ '"montant";'.
+ "\r\n");
+ // set a filter for the FIN
+ $a_parm_code=$cn->get_array("select p_value from parm_code where p_code in ('BANQUE','COMPTE_COURANT','CAISSE')");
+ $sql_fin="(";
+ $or="";
+ foreach ($a_parm_code as $code)
+ {
+ $sql_fin.="$or j_poste::text like '".$code['p_value']."%'";
+ $or=" or ";
+ }
+ $sql_fin.=")";
- foreach ($Row as $line)
- {
-
- echo $line['num'].";";
- echo $line['date'].";";
- echo $line['comment'].";";
- echo $line['jr_internal'].";";
- // echo " ".$line['pj'].";";
- // If the ledger is financial :
- // the credit must be negative and written in red
- // Get the jrn type
- if ( $line['jrn_def_type'] == 'FIN' ) {
- $positive = $cn->get_value("select qf_amount from quant_fin ".
- " where jr_id=".$line['jr_id']);
-
- echo nb($positive);
- echo ";";
- }
- else
- {
- echo nb($line['montant']).";";
- }
-
- printf("\r\n");
- }
- }
+ foreach ($Row as $line)
+ {
+
+ echo $line['num'].";";
+ echo $line['date'].";";
+ echo $line['comment'].";";
+ echo $line['jr_internal'].";";
+ // echo " ".$line['pj'].";";
+ // If the ledger is financial :
+ // the credit must be negative and written in red
+ // Get the jrn type
+ if ( $line['jrn_def_type'] == 'FIN' )
+ {
+ $positive = $cn->get_value("select qf_amount from quant_fin ".
+ " where jr_id=".$line['jr_id']);
+
+ echo nb($positive);
+ echo ";";
+ }
+ else
+ {
+ echo nb($line['montant']).";";
+ }
+
+ printf("\r\n");
+ }
+ }
//-----------------------------------------------------
- if ( $jrn_type=='ACH' || $jrn_type=='VEN')
- {
- $own=new Own($cn);
- $col_tva="";
+ if ( $jrn_type=='ACH' || $jrn_type=='VEN')
+ {
+ $own=new Own($cn);
+ $col_tva="";
- if ( $own->MY_TVA_USE=='Y') {
- $a_Tva=$cn->get_array("select tva_id,tva_label from tva_rate where tva_rate != 0.0000 order by tva_rate");
- foreach($a_Tva as $line_tva)
- {
- $col_tva.='"Tva '.$line_tva['tva_label'].'";';
- }
- }
- echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";"HTVA";'.$col_tva.'"TVAC"'."\n\r";
- foreach ($Row as $line)
- {
- printf('"%s";"%s";"%s";"%s";"%s";%s;',
- $line['date'],
- $line['num'],
- $line['client'],
- $line['comment'],
- $line['jr_internal'],
- nb($line['HTVA']));
- $a_tva_amount=array();
- foreach ($line['TVA'] as $lineTVA)
- {
- foreach ($a_Tva as $idx=>$line_tva)
- {
-
- if ($line_tva['tva_id'] == $lineTVA[1][0])
- {
- $a=$line_tva['tva_id'];
- $a_tva_amount[$a]=$lineTVA[1][2];
- }
- }
- }
- if ($own->MY_TVA_USE == 'Y' ) {
- foreach ($a_Tva as $line_tva)
- {
- $a=$line_tva['tva_id'];
- if ( isset($a_tva_amount[$a]))
- echo nb($a_tva_amount[$a]);
- else
- printf("0;");
- }
- }
- echo nb ($line['TVAC']);
- }
- }
- }
+ if ( $own->MY_TVA_USE=='Y')
+ {
+ $a_Tva=$cn->get_array("select tva_id,tva_label from tva_rate where tva_rate != 0.0000 order by tva_rate");
+ foreach($a_Tva as $line_tva)
+ {
+ $col_tva.='"Tva '.$line_tva['tva_label'].'";';
+ }
+ }
+ echo '"Date";"operation";"Client/Fourn.";"Commentaire";"inter.";"HTVA";'.$col_tva.'"TVAC"'."\n\r";
+ foreach ($Row as $line)
+ {
+ printf('"%s";"%s";"%s";"%s";"%s";%s;',
+ $line['date'],
+ $line['num'],
+ $line['client'],
+ $line['comment'],
+ $line['jr_internal'],
+ nb($line['HTVA']));
+ $a_tva_amount=array();
+ foreach ($line['TVA'] as $lineTVA)
+ {
+ foreach ($a_Tva as $idx=>$line_tva)
+ {
+
+ if ($line_tva['tva_id'] == $lineTVA[1][0])
+ {
+ $a=$line_tva['tva_id'];
+ $a_tva_amount[$a]=$lineTVA[1][2];
+ }
+ }
+ }
+ if ($own->MY_TVA_USE == 'Y' )
+ {
+ foreach ($a_Tva as $line_tva)
+ {
+ $a=$line_tva['tva_id'];
+ if ( isset($a_tva_amount[$a]))
+ echo nb($a_tva_amount[$a]);
+ else
+ printf("0;");
+ }
+ }
+ echo nb ($line['TVAC']);
+ }
+ }
+}
?>
diff --git a/html/jrn_pdf.php b/html/jrn_pdf.php
index 1fe200f28..fd8252815 100644
--- a/html/jrn_pdf.php
+++ b/html/jrn_pdf.php
@@ -1,30 +1,30 @@
check_dossier($gDossier);
$User->can_request(IMPJRN,0);
// Security
-if ( $_GET['jrn_id']!=0 && $User->check_jrn($_GET['jrn_id']) == 'X' ){
- /* Cannot Access */
- NoAccess();
+if ( $_GET['jrn_id']!=0 && $User->check_jrn($_GET['jrn_id']) == 'X' )
+{
+ /* Cannot Access */
+ NoAccess();
}
$ret="";
@@ -72,8 +73,8 @@ $jrn_type=$Jrn->get_type();
//----------------------------------------------------------------------
// Detailled Printing
//---------------------------------------------------------------------
-if ( $_REQUEST['p_simple']== 0 )
- {
+if ( $_REQUEST['p_simple']== 0 )
+{
$pdf=new Print_Ledger_Detail($cn);
$pdf->setDossierInfo($Jrn->name);
$pdf->AliasNbPages();
@@ -85,77 +86,81 @@ if ( $_REQUEST['p_simple']== 0 )
$pdf->Output('journal-'.$fDate.'.pdf','I');
exit(0);
- } // impression detaillé
+} // impression detaillé
//----------------------------------------------------------------------
// Simple Printing Purchase Ledger
//---------------------------------------------------------------------
-if ( $_REQUEST['p_simple']== 1 )
- {
+if ( $_REQUEST['p_simple']== 1 )
+{
if ( $jrn_type=='ACH' || $jrn_type=='VEN')
- {
- if ( $jrn_type=='ACH' && $cn->get_value('select count(qp_id) from quant_purchase') == 0 ) {
- $pdf= new Print_Ledger_Simple_without_vat($cn,$Jrn);
- $pdf->setDossierInfo($Jrn->name);
- $pdf->AliasNbPages();
- $pdf->AddPage();
- $pdf->Cell(0,6,'Ce journal ne peut être imprimé en mode simple');
- $pdf->output('erreur.pdf','I');
- exit();
- }
- if ( $jrn_type=='VEN' && $cn->get_value('select count(qs_id) from quant_sold') == 0 ) {
- $pdf= new Print_Ledger_Simple_without_vat($cn,$Jrn);
- $pdf->setDossierInfo($Jrn->name);
- $pdf->AliasNbPages();
- $pdf->AddPage();
- $pdf->Cell(0,6,'Ce journal ne peut être imprimé en mode simple');
- $pdf->output('erreur.pdf','I');
- exit();
- }
+ {
+ if ( $jrn_type=='ACH' && $cn->get_value('select count(qp_id) from quant_purchase') == 0 )
+ {
+ $pdf= new Print_Ledger_Simple_without_vat($cn,$Jrn);
+ $pdf->setDossierInfo($Jrn->name);
+ $pdf->AliasNbPages();
+ $pdf->AddPage();
+ $pdf->Cell(0,6,'Ce journal ne peut être imprimé en mode simple');
+ $pdf->output('erreur.pdf','I');
+ exit();
+ }
+ if ( $jrn_type=='VEN' && $cn->get_value('select count(qs_id) from quant_sold') == 0 )
+ {
+ $pdf= new Print_Ledger_Simple_without_vat($cn,$Jrn);
+ $pdf->setDossierInfo($Jrn->name);
+ $pdf->AliasNbPages();
+ $pdf->AddPage();
+ $pdf->Cell(0,6,'Ce journal ne peut être imprimé en mode simple');
+ $pdf->output('erreur.pdf','I');
+ exit();
+ }
- if ( $own->MY_TVA_USE=='Y')
- {
- $pdf= new Print_Ledger_Simple($cn,$Jrn);
- $pdf->setDossierInfo($Jrn->name);
- $pdf->AliasNbPages();
- $pdf->AddPage();
- $pdf->export();
- $fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
- exit(0);
- }
- if ( $own->MY_TVA_USE=='N')
- {
- $pdf= new Print_Ledger_Simple_without_vat($cn,$Jrn);
- $pdf->setDossierInfo($Jrn->name);
- $pdf->AliasNbPages();
- $pdf->AddPage();
- $pdf->export($Jrn);
- $fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
- exit(0);
- }
+ if ( $own->MY_TVA_USE=='Y')
+ {
+ $pdf= new Print_Ledger_Simple($cn,$Jrn);
+ $pdf->setDossierInfo($Jrn->name);
+ $pdf->AliasNbPages();
+ $pdf->AddPage();
+ $pdf->export();
+ $fDate=date('dmy-Hi');
+ $pdf->Output('journal-'.$fDate.'.pdf','I');
+ exit(0);
+ }
+ if ( $own->MY_TVA_USE=='N')
+ {
+ $pdf= new Print_Ledger_Simple_without_vat($cn,$Jrn);
+ $pdf->setDossierInfo($Jrn->name);
+ $pdf->AliasNbPages();
+ $pdf->AddPage();
+ $pdf->export($Jrn);
+ $fDate=date('dmy-Hi');
+ $pdf->Output('journal-'.$fDate.'.pdf','I');
+ exit(0);
+ }
- }
-
- if ($jrn_type=='FIN') {
- $pdf= new Print_Ledger_Financial($cn,$Jrn);
- $pdf->setDossierInfo($Jrn->name);
- $pdf->AliasNbPages();
- $pdf->AddPage();
- $pdf->export();
- $fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
- exit(0);
}
- if ( $jrn_type=='ODS' || $Jrn->id==0) {
- $pdf= new Print_Ledger_Misc($cn,$Jrn);
- $pdf->setDossierInfo($Jrn->name);
- $pdf->AliasNbPages();
- $pdf->AddPage();
- $pdf->export();
- $fDate=date('dmy-Hi');
- $pdf->Output('journal-'.$fDate.'.pdf','I');
- exit(0);
+
+ if ($jrn_type=='FIN')
+ {
+ $pdf= new Print_Ledger_Financial($cn,$Jrn);
+ $pdf->setDossierInfo($Jrn->name);
+ $pdf->AliasNbPages();
+ $pdf->AddPage();
+ $pdf->export();
+ $fDate=date('dmy-Hi');
+ $pdf->Output('journal-'.$fDate.'.pdf','I');
+ exit(0);
}
- }
+ if ( $jrn_type=='ODS' || $Jrn->id==0)
+ {
+ $pdf= new Print_Ledger_Misc($cn,$Jrn);
+ $pdf->setDossierInfo($Jrn->name);
+ $pdf->AliasNbPages();
+ $pdf->AddPage();
+ $pdf->export();
+ $fDate=date('dmy-Hi');
+ $pdf->Output('journal-'.$fDate.'.pdf','I');
+ exit(0);
+ }
+}
?>
diff --git a/html/jrn_search.php b/html/jrn_search.php
index 99552f5db..c1df05064 100644
--- a/html/jrn_search.php
+++ b/html/jrn_search.php
@@ -40,9 +40,10 @@ $gDossier=dossier::id();
// Javascript
echo JS_LEDGER;
-if ( isset( $p_jrn )) {
- $p_jrn=$p_jrn;
- $_SESSION[ "p_jrn"]=$p_jrn;
+if ( isset( $p_jrn ))
+{
+ $p_jrn=$p_jrn;
+ $_SESSION[ "p_jrn"]=$p_jrn;
}
if (isset ($_GET['p_ctl'])) $p_ctl=$_GET['p_ctl'];
@@ -62,64 +63,76 @@ $condition="";
$part=" where ";
$cn=new Database($gDossier);
// if search then build the condition
-if ( isset ($_GET["search"]) ) {
- $c1=0;
- foreach( $_GET as $key=>$element){
- ${"$key"}=$element;
- }
- $c_comment="";
- if ( isset ($p_comment) && strlen(trim($p_comment)) != 0 ) {
- $c_comment=" $part upper(jr_comment) like upper('%$p_comment%')";
- $part=" and ";
- }
- $c_montant="";
- if ( isset ($p_montant) && strlen($p_montant) != 0 && isNumber($p_montant) )
- {
- $p_montant=abs($p_montant);
- $opt_montant.=''.$p_montant_sel;
- $part=" and ";
- /* if the sign is equal then we look into the details */
- if ( $p_montant_sel != '=' ) {
- $c_montant=sprintf(" $part jr_montant %s abs(%s)",$p_montant_sel,$p_montant);
- } else {
- $c_montant=$part.' jr_grpt_id in (select j_grpt from jrnx where j_montant = '.$p_montant.')';
- }
- }
- if ( isset ($p_date) && strlen(trim($p_date)) != 0 ) {
- $c_date=sprintf(" $part j_date %s to_date('%s','DD.MM.YYYY')",$p_date_sel,$p_date);
- $part=" and ";
- $opt_date.=' '.$p_date_sel;
- }
- $c_internal="";
- if ( isset($p_internal) && strlen(trim($p_internal)) != 0 ) {
- $c_internal=$part." jr_internal like ('%".$p_internal."%')";
- $part=" and ";
+if ( isset ($_GET["search"]) )
+{
+ $c1=0;
+ foreach( $_GET as $key=>$element)
+ {
+ ${"$key"}=$element;
+ }
+ $c_comment="";
+ if ( isset ($p_comment) && strlen(trim($p_comment)) != 0 )
+ {
+ $c_comment=" $part upper(jr_comment) like upper('%$p_comment%')";
+ $part=" and ";
+ }
+ $c_montant="";
+ if ( isset ($p_montant) && strlen($p_montant) != 0 && isNumber($p_montant) )
+ {
+ $p_montant=abs($p_montant);
+ $opt_montant.=' '.$p_montant_sel;
+ $part=" and ";
+ /* if the sign is equal then we look into the details */
+ if ( $p_montant_sel != '=' )
+ {
+ $c_montant=sprintf(" $part jr_montant %s abs(%s)",$p_montant_sel,$p_montant);
+ }
+ else
+ {
+ $c_montant=$part.' jr_grpt_id in (select j_grpt from jrnx where j_montant = '.$p_montant.')';
+ }
+ }
+ if ( isset ($p_date) && strlen(trim($p_date)) != 0 )
+ {
+ $c_date=sprintf(" $part j_date %s to_date('%s','DD.MM.YYYY')",$p_date_sel,$p_date);
+ $part=" and ";
+ $opt_date.=' '.$p_date_sel;
+ }
+ $c_internal="";
+ if ( isset($p_internal) && strlen(trim($p_internal)) != 0 )
+ {
+ $c_internal=$part." jr_internal like ('%".$p_internal."%')";
+ $part=" and ";
- }
- $c_paid="";
- if (isset($paid)) {
- $c_paid=$part." (jr_rapt != 'paid' or jr_rapt is null) ";
- $part=" and ";
- }
- $condition=$c_comment.$c_montant.$c_date.$c_internal.$c_paid;
- }
+ }
+ $c_paid="";
+ if (isset($paid))
+ {
+ $c_paid=$part." (jr_rapt != 'paid' or jr_rapt is null) ";
+ $part=" and ";
+ }
+ $condition=$c_comment.$c_montant.$c_date.$c_internal.$c_paid;
+}
$condition=$condition." ".$part;
// If the usr is admin he has all right
-if ( $User->admin != 1 && $User->is_local_admin()!=1) {
- $condition.=" uj_priv in ('W','R') and uj_login='".$User->login."'" ;
-} else {
- $condition.=" true ";
-}
+if ( $User->admin != 1 && $User->is_local_admin()!=1)
+{
+ $condition.=" uj_priv in ('W','R') and uj_login='".$User->login."'" ;
+}
+else
+{
+ $condition.=" true ";
+}
?>
-';
+ ';
echo dossier::hidden();
if (isset($paid))
- echo '
Uniquement les non opérations non payées
';
- else
- echo '
Toutes les opérations
';
+ echo '
Uniquement les non opérations non payées
';
+else
+ echo '
Toutes les opérations
';
echo '
';
echo '';
@@ -152,120 +165,134 @@ echo '';
+ var row=table.insertRow(line);
+ // left cell
+ var cellPos = row.insertCell(0);
+ cellPos.innerHTML=' Cliquez ici pour télécharger le rapport ';
+function report_export_success(request,json)
+{
+ var answer = request.responseText.evalJSON(true);
+ var ok=answer.answer;
+ var link=answer.link;
+ $('export').hide();
+ $('export_link').innerHTML=' Cliquez ici pour télécharger le rapport ';
}
\ No newline at end of file
diff --git a/html/js/accounting_item.js b/html/js/accounting_item.js
index 42747f22e..4fb2902fb 100644
--- a/html/js/accounting_item.js
+++ b/html/js/accounting_item.js
@@ -24,17 +24,20 @@
* containing the javascript for opening a windows to search an account (poste comptable)
*/
-function set_poste_parent(p_ctl,p_value) {
- var f=g(p_ctl);
- f.value+='['+p_value+']';
+function set_poste_parent(p_ctl,p_value)
+{
+ var f=g(p_ctl);
+ f.value+='['+p_value+']';
}
-function set_jrn_parent(p_ctl,p_value) {
- var f=g(p_ctl);
- if ( f ) {
- if ( trim(f.value)!="") f.value+=' ';
- f.value+=p_value;
- }
+function set_jrn_parent(p_ctl,p_value)
+{
+ var f=g(p_ctl);
+ if ( f )
+ {
+ if ( trim(f.value)!="") f.value+=' ';
+ f.value+=p_value;
+ }
}
@@ -60,43 +63,76 @@ function PcmnUpdate(p_value,p_lib,p_parent,p_type,p_dossier)
* - acc_query for the initial query
*\see ajax_poste.php
*/
-function search_poste(obj) {
+function search_poste(obj)
+{
showIPopup(obj.ipopup);
var dossier=$('gDossier').value;
var queryString="?gDossier="+dossier;
queryString+="&op=sf";
- try {
- if ( obj.jrn) { queryString+="&j="+obj.jrn;}
- if ( obj.account) { queryString+="&c="+obj.account;}
- if ( obj.label) { queryString+="&l="+obj.label;}
- if ( obj.bracket) { queryString+="&b="+obj.bracket;}
- if( obj.noquery) {queryString+="&nq";}
- if( obj.no_overwrite) {queryString+="&nover";}
- if( obj.bracket) {queryString+="&bracket";}
- if ( ! obj.noquery) {
- if( obj.acc_query) {queryString+="&q="+obj.acc_query;}
- else {
- if ($(obj).account) {
- var e=$(obj).account;
- var str_account=$(e).value;
- queryString+="&q="+str_account;
- }
- }
- }
+ try
+ {
+ if ( obj.jrn)
+ {
+ queryString+="&j="+obj.jrn;
+ }
+ if ( obj.account)
+ {
+ queryString+="&c="+obj.account;
+ }
+ if ( obj.label)
+ {
+ queryString+="&l="+obj.label;
+ }
+ if ( obj.bracket)
+ {
+ queryString+="&b="+obj.bracket;
+ }
+ if( obj.noquery)
+ {
+ queryString+="&nq";
+ }
+ if( obj.no_overwrite)
+ {
+ queryString+="&nover";
+ }
+ if( obj.bracket)
+ {
+ queryString+="&bracket";
+ }
+ if ( ! obj.noquery)
+ {
+ if( obj.acc_query)
+ {
+ queryString+="&q="+obj.acc_query;
+ }
+ else
+ {
+ if ($(obj).account)
+ {
+ var e=$(obj).account;
+ var str_account=$(e).value;
+ queryString+="&q="+str_account;
+ }
+ }
+ }
- queryString+="&ctl="+obj.ipopup;
- queryString=encodeURI(queryString);
- var action=new Ajax.Request ( 'ajax_poste.php',
- {
- method:'get',
- parameters:queryString,
- onFailure:errorPoste,
- onSuccess:result_poste_search
- }
- );
- } catch (e) { alert(e.getMessage());}
+ queryString+="&ctl="+obj.ipopup;
+ queryString=encodeURI(queryString);
+ var action=new Ajax.Request ( 'ajax_poste.php',
+ {
+ method:'get',
+ parameters:queryString,
+ onFailure:errorPoste,
+ onSuccess:result_poste_search
+ }
+ );
+ }
+ catch (e)
+ {
+ alert(e.getMessage());
+ }
}
/**
*@brief when you submit the form for searching a accounting item
@@ -104,60 +140,98 @@ function search_poste(obj) {
*@note the same as search_poste, except it answer to a FORM and not
* to a click event
*/
-function search_get_poste(obj) {
+function search_get_poste(obj)
+{
var dossier=$('gDossier').value;
var queryString="?gDossier="+dossier;
queryString+="&op=sf";
- if ( obj.elements['jrn'] ) { queryString+="&j="+$F('jrn');}
- if ( obj.elements['account']) { queryString+="&c="+$F('account');}
- if ( obj.elements['label']) { queryString+="&l="+$F('label');}
- if( obj.elements['acc_query']) {queryString+="&q="+$F('acc_query');}
- if (obj.ctl ) {queryString+="&ctl="+obj.ctl;}
- if( obj.elements['nosearch']) {queryString+="&nq";}
- if( obj.elements['nover']) {queryString+="&nover";}
- if( obj.elements['bracket']) {queryString+="&bracket";}
+ if ( obj.elements['jrn'] )
+ {
+ queryString+="&j="+$F('jrn');
+ }
+ if ( obj.elements['account'])
+ {
+ queryString+="&c="+$F('account');
+ }
+ if ( obj.elements['label'])
+ {
+ queryString+="&l="+$F('label');
+ }
+ if( obj.elements['acc_query'])
+ {
+ queryString+="&q="+$F('acc_query');
+ }
+ if (obj.ctl )
+ {
+ queryString+="&ctl="+obj.ctl;
+ }
+ if( obj.elements['nosearch'])
+ {
+ queryString+="&nq";
+ }
+ if( obj.elements['nover'])
+ {
+ queryString+="&nover";
+ }
+ if( obj.elements['bracket'])
+ {
+ queryString+="&bracket";
+ }
$('asearch').innerHTML=loading();
var action=new Ajax.Request ( 'ajax_poste.php',
- {
- method:'get',
- parameters:queryString,
- onFailure:errorPoste,
- onSuccess:result_poste_search
- }
- );
+ {
+ method:'get',
+ parameters:queryString,
+ onFailure:errorPoste,
+ onSuccess:result_poste_search
+ }
+ );
}
/**
*@brief show the answer of ajax request
*@param answer in XML
*/
-function result_poste_search(req) {
- try{
- var answer=req.responseXML;
- var a=answer.getElementsByTagName('ctl');
- if ( a.length == 0 ) { var rec=req.responseText;alert ('erreur :'+rec);}
- var html=answer.getElementsByTagName('code');
+function result_poste_search(req)
+{
+ try
+ {
+ var answer=req.responseXML;
+ var a=answer.getElementsByTagName('ctl');
+ if ( a.length == 0 )
+ {
+ var rec=req.responseText;
+ alert ('erreur :'+rec);
+ }
+ var html=answer.getElementsByTagName('code');
- var name_ctl=a[0].firstChild.nodeValue;
- var nodeXml=html[0];
- var code_html=getNodeText(nodeXml);
- code_html=unescape_xml(code_html);
- $(name_ctl).innerHTML=code_html;
- }
- catch (e) {
- alert(e.message);}
- try{
- code_html.evalScripts();}
- catch(e){
- alert("Impossible executer script de la reponse\n"+e.message);}
+ var name_ctl=a[0].firstChild.nodeValue;
+ var nodeXml=html[0];
+ var code_html=getNodeText(nodeXml);
+ code_html=unescape_xml(code_html);
+ $(name_ctl).innerHTML=code_html;
+ }
+ catch (e)
+ {
+ alert(e.message);
+ }
+ try
+ {
+ code_html.evalScripts();
+ }
+ catch(e)
+ {
+ alert("Impossible executer script de la reponse\n"+e.message);
+ }
}
/**
*@brief error for ajax
*/
-function errorPoste() {
- alert('Ajax failed');
+function errorPoste()
+{
+ alert('Ajax failed');
}
diff --git a/html/js/anc_script.js b/html/js/anc_script.js
index 4df07830b..d8d44ed35 100644
--- a/html/js/anc_script.js
+++ b/html/js/anc_script.js
@@ -26,72 +26,89 @@
* \param p_table_id
* \param p_amount amount to reach
*/
-function add_row(p_table,p_seq) {
- var mytable=g(p_table).tBodies[0];
+function add_row(p_table,p_seq)
+{
+ var mytable=g(p_table).tBodies[0];
- if ( ! mytable ) {return;}
+ if ( ! mytable )
+ {
+ return;
+ }
var new_value=mytable.rows.length+1;
- if ( mytable.rows.length > 5 ) {
- alert("Maximum 5 lignes ");
- return;
- }
- // For the detail view (modify_op) there is several form and then several time the
- // element
- var rowToCopy=mytable.rows[1];
- var row=mytable.insertRow(mytable.rows.length);
+ if ( mytable.rows.length > 5 )
+ {
+ alert("Maximum 5 lignes ");
+ return;
+ }
+ // For the detail view (modify_op) there is several form and then several time the
+ // element
+ var rowToCopy=mytable.rows[1];
+ var row=mytable.insertRow(mytable.rows.length);
- for ( var i=0;i< rowToCopy.cells.length;i++) {
- var cell=row.insertCell(i);
- var txt=rowToCopy.cells[i].innerHTML;
+ for ( var i=0;i< rowToCopy.cells.length;i++)
+ {
+ var cell=row.insertCell(i);
+ var txt=rowToCopy.cells[i].innerHTML;
// txt=txt.replace(/row_1/g,"row_"+new_value);
- cell.innerHTML=txt;
- }
+ cell.innerHTML=txt;
+ }
}
-/*!
+/*!
* \brief Check the amount of the CA
* \param p_style : error or ok, if ok show a ok box if the amount are equal
*
*
* \return true if the amounts are equal
*/
-function verify_ca(div) {
- var idx=0;var amount_error=0;
+function verify_ca(div)
+{
+ var idx=0;
+ var amount_error=0;
// put a maximum
- while (idx < 50 ) {
- var table=div+'t'+idx;
- if ( g(table) ) {
- var total_amount=0;
- // table is found compute the different val[]
- var array_value=document.getElementsByName('val['+idx+'][]');
-
- for (var i=0;i < array_value.length;i++ ) {
- if ( isNaN(array_value[i].value)) {
- array_value[i].value=0;
- }
+ while (idx < 50 )
+ {
+ var table=div+'t'+idx;
+ if ( g(table) )
+ {
+ var total_amount=0;
+ // table is found compute the different val[]
+ var array_value=document.getElementsByName('val['+idx+'][]');
- total_amount+=parseFloat(array_value[i].value);
- }
- var amount=parseFloat(g('amount_t'+idx).value);
- var diff=amount-total_amount;
+ for (var i=0;i < array_value.length;i++ )
+ {
+ if ( isNaN(array_value[i].value))
+ {
+ array_value[i].value=0;
+ }
- if ( Math.round(diff,2)!= 0.0) {
- g(table).style.backgroundColor='red';
- amount_error++;
- } else {
- g(table).style.backgroundColor='lightgreen';
+ total_amount+=parseFloat(array_value[i].value);
+ }
+ var amount=parseFloat(g('amount_t'+idx).value);
+ var diff=amount-total_amount;
- }
- idx++;
- } else break;
+ if ( Math.round(diff,2)!= 0.0)
+ {
+ g(table).style.backgroundColor='red';
+ amount_error++;
+ }
+ else
+ {
+ g(table).style.backgroundColor='lightgreen';
+
+ }
+ idx++;
+ }
+ else break;
}
- if ( amount_error != 0 ) {
- alert('Désolé, les montants pour la comptabilité analytique sont incorrects');
- return false;
+ if ( amount_error != 0 )
+ {
+ alert('Désolé, les montants pour la comptabilité analytique sont incorrects');
+ return false;
}
return true;
}
-/*!
+/*!
* \brief open a window for searching a CA account,
* \param p_dossier dossier id
* \param p_target ctrl to update
@@ -102,57 +119,72 @@ function verify_ca(div) {
*/
function search_ca (p_dossier,p_target,p_source)
{
- var pa_id=g(p_source).value;
- var url="?gDossier="+p_dossier+"&c1="+p_target+"&c2="+pa_id;
- var a=window.open("search_ca.php"+url,"CA recherche",'statusbar=no,scrollbars=yes,toolbar=no');
- a.focus();
+ var pa_id=g(p_source).value;
+ var url="?gDossier="+p_dossier+"&c1="+p_target+"&c2="+pa_id;
+ var a=window.open("search_ca.php"+url,"CA recherche",'statusbar=no,scrollbars=yes,toolbar=no');
+ a.focus();
}
-function caod_checkTotal() {
- var ie4=false;
- if ( document.all ) {
- ie4=true;
- }// Ajouter getElementById par document.all[str]
- var total_deb=0.0;
- var total_cred=0.0;
- var nb_item=g('nbrow').value;
+function caod_checkTotal()
+{
+ var ie4=false;
+ if ( document.all )
+ {
+ ie4=true;
+ }// Ajouter getElementById par document.all[str]
+ var total_deb=0.0;
+ var total_cred=0.0;
+ var nb_item=g('nbrow').value;
- for (var i=0;i '+p_variable;
- p_history+="="+result.toString();
- var str_sub=" Total :"+p_variable+" = "+result.toString()+" Total :"+p_variable+" = "+result.toString()+" <'") by their HTML representation
*@return a string without the offending char.
*/
-function unescape_xml(code_html) {
+function unescape_xml(code_html)
+{
code_html=code_html.replace(/\</,'<');
code_html=code_html.replace(/\>/,'>');
code_html=code_html.replace(/\"/,'"');
@@ -255,144 +355,210 @@ function unescape_xml(code_html) {
*@param xmlNode a node (result of var data = =answer.getElementsByTagName('code'))
*@return all the content of the XML node
*/
-function getNodeText(xmlNode)
- {
- if(!xmlNode) return '';
- if(typeof(xmlNode.textContent) != "undefined") { return xmlNode.textContent; }
- if ( xmlNode.firstChild && xmlNode.firstChild.nodeValue ) return xmlNode.firstChild.nodeValue;
- return "";
- }
+function getNodeText(xmlNode)
+{
+ if(!xmlNode) return '';
+ if(typeof(xmlNode.textContent) != "undefined")
+ {
+ return xmlNode.textContent;
+ }
+ if ( xmlNode.firstChild && xmlNode.firstChild.nodeValue ) return xmlNode.firstChild.nodeValue;
+ return "";
+}
/**
*@brief change the periode in the calendar of the dashboard
*@param object select
*/
-function change_month(obj) {
+function change_month(obj)
+{
var queryString="gDossier="+obj.gDossier+"&op=cal"+"&per="+obj.value;
var action = new Ajax.Request(
- "ajax_misc.php" , { method:'get', parameters:queryString,onFailure:ajax_misc_failure,onSuccess:change_month_success}
- );
-
+ "ajax_misc.php" , { method:'get', parameters:queryString,onFailure:ajax_misc_failure,onSuccess:change_month_success}
+ );
+
}
-function change_month_success(req) {
- try{
- var answer=req.responseXML;
- var html=answer.getElementsByTagName('code');
- if ( html.length == 0 ) { var rec=req.responseText;alert ('erreur :'+rec);}
- var nodeXml=html[0];
- var code_html=getNodeText(nodeXml);
- code_html=unescape_xml(code_html);
- $("user_cal").innerHTML=code_html;
- }
- catch (e) {
- alert(e.message);}
- try{
- code_html.evalScripts();}
- catch(e){
- alert("Impossible executer script de la reponse\n"+e.message);}
+function change_month_success(req)
+{
+ try
+ {
+ var answer=req.responseXML;
+ var html=answer.getElementsByTagName('code');
+ if ( html.length == 0 )
+ {
+ var rec=req.responseText;
+ alert ('erreur :'+rec);
+ }
+ var nodeXml=html[0];
+ var code_html=getNodeText(nodeXml);
+ code_html=unescape_xml(code_html);
+ $("user_cal").innerHTML=code_html;
+ }
+ catch (e)
+ {
+ alert(e.message);
+ }
+ try
+ {
+ code_html.evalScripts();
+ }
+ catch(e)
+ {
+ alert("Impossible executer script de la reponse\n"+e.message);
+ }
}
-function loading() { return 'un instant...';
}
@@ -412,39 +579,63 @@ function set_wait(name) {
* - id to add an id
* - class to add a class
*/
-function add_div(obj) {
- try {
- var top=document;
- var elt=top.createElement('div');
- if (obj.id ) { elt.setAttribute('id',obj.id);}
- if (obj.style) {
- if (elt.style.setAttribute) { /* IE7 bug */
- elt.style.setAttribute('cssText',obj.style);
- } else { /* good Browser */
- elt.setAttribute('style',obj.style);
- }
- }
- if (obj.cssclass ) {
- elt.setAttribute('class',obj.cssclass);/* FF */
- elt.setAttribute('className',obj.cssclass); /* IE */
- }
- if (obj.html) { elt.innerHTML=obj.html;}
+function add_div(obj)
+{
+ try
+ {
+ var top=document;
+ var elt=top.createElement('div');
+ if (obj.id )
+ {
+ elt.setAttribute('id',obj.id);
+ }
+ if (obj.style)
+ {
+ if (elt.style.setAttribute)
+ { /* IE7 bug */
+ elt.style.setAttribute('cssText',obj.style);
+ }
+ else
+ { /* good Browser */
+ elt.setAttribute('style',obj.style);
+ }
+ }
+ if (obj.cssclass )
+ {
+ elt.setAttribute('class',obj.cssclass);/* FF */
+ elt.setAttribute('className',obj.cssclass); /* IE */
+ }
+ if (obj.html)
+ {
+ elt.innerHTML=obj.html;
+ }
- var bottom_div=document.body;
- bottom_div.appendChild(elt);
- if ( obj.drag ) {
- new Draggable(obj.id,{starteffect:function(){
- new Effect.Highlight(obj.id,{scroll:window,queue:'end'}); } }
- );
- }
- } catch (e) { alert("add_div"+e.message);}
+ var bottom_div=document.body;
+ bottom_div.appendChild(elt);
+ if ( obj.drag )
+ {
+new Draggable(obj.id,{starteffect:function()
+ {
+ new Effect.Highlight(obj.id,{scroll:window,queue:'end'});
+ } }
+ );
+ }
+ }
+ catch (e)
+ {
+ alert("add_div"+e.message);
+ }
}
/**
* remove a object created with add_div
* @param elt id of the elt
*/
-function removeDiv(elt) {
- if (g(elt) ){ document.body.removeChild(g(elt)); }
+function removeDiv(elt)
+{
+ if (g(elt) )
+ {
+ document.body.removeChild(g(elt));
+ }
}
/**
*@brief call add_div to add a DIV and after call the ajax
@@ -458,26 +649,36 @@ function removeDiv(elt) {
* - obj.fixed optional let you determine the position, otherwise works like IPopup
*@see add_div IBox
*/
-function show_box(obj) {
+function show_box(obj)
+{
add_div(obj) ;
- if ( ! obj.fixed ) {
- var sx=0;
- if ( window.scrollY) { sx=window.scrollY+40;}
- else { sx=document.body.scrollTop+40;}
- g(obj.id).style.top=sx;
- show(obj.id);
- } else {
- show(obj.id);
+ if ( ! obj.fixed )
+ {
+ var sx=0;
+ if ( window.scrollY)
+ {
+ sx=window.scrollY+40;
+ }
+ else
+ {
+ sx=document.body.scrollTop+40;
+ }
+ g(obj.id).style.top=sx;
+ show(obj.id);
+ }
+ else
+ {
+ show(obj.id);
}
var action=new Ajax.Request (
- obj.callback,
- {
- method:'GET',
- parameters:obj.qs,
- onFailure:eval(obj.js_error),
- onSuccess:eval(obj.js_success)
- });
+ obj.callback,
+ {
+ method:'GET',
+ parameters:obj.qs,
+ onFailure:eval(obj.js_error),
+ onSuccess:eval(obj.js_success)
+ });
}
/**
*@brief receive answer from ajax and just display it into the IBox
@@ -486,62 +687,79 @@ function show_box(obj) {
*/
function success_box(req,json)
{
- try{
- var answer=req.responseXML;
- var a=answer.getElementsByTagName('ctl');
- var html=answer.getElementsByTagName('code');
- if ( a.length == 0 ) { var rec=req.responseText;alert ('erreur :'+rec);}
- var name_ctl=a[0].firstChild.nodeValue;
- var code_html=getNodeText(html[0]);
-
- code_html=unescape_xml(code_html);
- g(name_ctl).innerHTML=code_html;
- g(name_ctl).style.height='auto';
- // if IE set to 60 %
- if(name_ctl != 'popup')
- g(name_ctl).style.width='45%';
- else
- g(name_ctl).style.width='auto';
- }
- catch (e) {
- alert("success_box"+e.message);}
- try{
- code_html.evalScripts();}
- catch(e){
- alert("answer_box Impossible executer script de la reponse\n"+e.message);}
+ try
+ {
+ var answer=req.responseXML;
+ var a=answer.getElementsByTagName('ctl');
+ var html=answer.getElementsByTagName('code');
+ if ( a.length == 0 )
+ {
+ var rec=req.responseText;
+ alert ('erreur :'+rec);
+ }
+ var name_ctl=a[0].firstChild.nodeValue;
+ var code_html=getNodeText(html[0]);
+
+ code_html=unescape_xml(code_html);
+ g(name_ctl).innerHTML=code_html;
+ g(name_ctl).style.height='auto';
+ // if IE set to 60 %
+ if(name_ctl != 'popup')
+ g(name_ctl).style.width='45%';
+ else
+ g(name_ctl).style.width='auto';
+ }
+ catch (e)
+ {
+ alert("success_box"+e.message);
+ }
+ try
+ {
+ code_html.evalScripts();
+ }
+ catch(e)
+ {
+ alert("answer_box Impossible executer script de la reponse\n"+e.message);
+ }
}
-function error_box () {
+function error_box ()
+{
alert('IBOX : error_box ajax not implemented');
}
/**
* show the ledger choice
*/
-function show_ledger_choice() {
+function show_ledger_choice()
+{
g('div_jrn').style.visibility='visible';
}
/**
* hide the ledger choice
*/
-function hide_ledger_choice() {
+function hide_ledger_choice()
+{
g('div_jrn').style.visibility='hidden';
}
/**
* show the cat of ledger choice
*/
-function show_cat_choice() {
+function show_cat_choice()
+{
g('div_cat').style.visibility='visible';
}
/**
* hide the cat of ledger choice
*/
-function hide_cat_choice() {
+function hide_cat_choice()
+{
g('div_cat').style.visibility='hidden';
}
/**
* add a row for the forecast item
*/
-function for_add_row(tableid) {
+function for_add_row(tableid)
+{
style='class="input_text"';
var mytable=g(tableid).tBodies[0];
var nNumberRow=mytable.rows.length;
@@ -550,75 +768,102 @@ function for_add_row(tableid) {
var nNumberCell=rowToCopy.cells.length;
var nb=g("nbrow");
var oNewRow = mytable.insertRow(nNumberRow);
- for ( var e=0;e < nNumberCell;e++) {
- var newCell=oRow.insertCell(e);
- var tt=rowToCopy.cells[e].innerHTML;
- new_tt=tt.replace(/an_cat0/g,"an_cat"+nb.value);
- new_tt=new_tt.replace(/an_cat_acc0/g,"an_cat_acc"+nb.value);
- new_tt=new_tt.replace(/an_qc0/g,"an_qc"+nb.value);
- new_tt=new_tt.replace(/an_label0/g,"an_label"+nb.value);
- new_tt=new_tt.replace(/month0/g,"month"+nb.value);
- new_tt=new_tt.replace(/an_cat_amount0/g,"an_cat_amount"+nb.value);
- new_tt=new_tt.replace(/an_deb0/g,"an_deb"+nb.value);
- newCell.innerHTML=new_tt;
- new_tt.evalScripts();
- }
- $("an_cat_acc"+nb.value).value="";
- $("an_qc"+nb.value).value="";
- $("an_label"+nb.value).value="";
- $("an_cat_amount"+nb.value).value="0";
- nb.value++;
+ for ( var e=0;e < nNumberCell;e++)
+ {
+ var newCell=oRow.insertCell(e);
+ var tt=rowToCopy.cells[e].innerHTML;
+ new_tt=tt.replace(/an_cat0/g,"an_cat"+nb.value);
+ new_tt=new_tt.replace(/an_cat_acc0/g,"an_cat_acc"+nb.value);
+ new_tt=new_tt.replace(/an_qc0/g,"an_qc"+nb.value);
+ new_tt=new_tt.replace(/an_label0/g,"an_label"+nb.value);
+ new_tt=new_tt.replace(/month0/g,"month"+nb.value);
+ new_tt=new_tt.replace(/an_cat_amount0/g,"an_cat_amount"+nb.value);
+ new_tt=new_tt.replace(/an_deb0/g,"an_deb"+nb.value);
+ newCell.innerHTML=new_tt;
+ new_tt.evalScripts();
+ }
+ $("an_cat_acc"+nb.value).value="";
+ $("an_qc"+nb.value).value="";
+ $("an_label"+nb.value).value="";
+ $("an_cat_amount"+nb.value).value="0";
+ nb.value++;
}
/**
* toggle all the checkbox in a given form
* @param form_id id of the form
*/
-function toggle_checkbox(form_id) {
+function toggle_checkbox(form_id)
+{
var form=g(form_id);
- for (var i=0;i';
-shtml+=' Taper une formule (ex 20*5.1) puis enter ';
+ shtml+=' Taper une formule (ex 20*5.1) puis enter ';
- var obj={id:sid,html:shtml,drag:true,style:'position:absolute;display:block;top:30px;left:150px;width:250px;border:1px solid black;background-color:#99b1df;font-size:12;padding: 2 2 2 2;'};
+var obj={id:
+ sid,html:
+ shtml,drag:
+ true,style:'position:absolute;display:block;top:30px;left:150px;width:250px;border:1px solid black;background-color:#99b1df;font-size:12;padding: 2 2 2 2;'
+ };
add_div(obj);
- this.document.getElementById('inp').focus();
-}
\ No newline at end of file
+ this.document.getElementById('inp').focus();
+}
diff --git a/html/js/todo_list.js b/html/js/todo_list.js
index a586022b5..1317cb210 100644
--- a/html/js/todo_list.js
+++ b/html/js/todo_list.js
@@ -25,47 +25,68 @@
* the gDossier
*
*/
-function todo_list_show(p_id) {
+function todo_list_show(p_id)
+{
var gDossier=$('gDossier').value;
- $('add_todo_list').style.top=posY+offsetY;
+ $('add_todo_list').style.top=posY+offsetY;
$('add_todo_list').style.left=posX+offsetX-200;
- try {
- var action=new Ajax.Request(
- 'todo_list.php',
- {
- method:'get',
- parameters:{'show':1,'id':p_id,'gDossier':gDossier},
- onFailure:todo_list_show_error,
- onSuccess:todo_list_show_success
- }
- );
- } catch (e) {
- alert(" Envoi ajax non possible" + e.message);
+ try
+ {
+ var action=new Ajax.Request(
+ 'todo_list.php',
+ {
+ method:'get',
+ parameters:
+ {'show':
+ 1,'id':
+ p_id,'gDossier':
+ gDossier
+ },
+ onFailure:todo_list_show_error,
+ onSuccess:todo_list_show_success
+ }
+ );
+ }
+ catch (e)
+ {
+ alert(" Envoi ajax non possible" + e.message);
}
return false;
}
-function todo_list_show_success(req) {
- try {
- var answer=req.responseXML;
- var tl_id=answer.getElementsByTagName('tl_id');
- var tl_title=answer.getElementsByTagName('tl_title');
- var tl_desc=answer.getElementsByTagName('tl_desc');
- var tl_date=answer.getElementsByTagName('tl_date');
-
- if ( tl_id.length == 0 ) { var rec=req.responseText;alert ('erreur :'+rec);}
+function todo_list_show_success(req)
+{
+ try
+ {
+ var answer=req.responseXML;
+ var tl_id=answer.getElementsByTagName('tl_id');
+ var tl_title=answer.getElementsByTagName('tl_title');
+ var tl_desc=answer.getElementsByTagName('tl_desc');
+ var tl_date=answer.getElementsByTagName('tl_date');
- $('p_title').value=getNodeText(tl_title[0]);
- $('p_date_todo').value=getNodeText(tl_date[0]);
- $('p_desc').value=getNodeText(tl_desc[0]);
- $('tl_id').value=getNodeText(tl_id[0]);
- $('add_todo_list').style.display='block';
- } catch (e) { alert(e.message);}
+ if ( tl_id.length == 0 )
+ {
+ var rec=req.responseText;
+ alert ('erreur :'+rec);
+ }
+
+ $('p_title').value=getNodeText(tl_title[0]);
+ $('p_date_todo').value=getNodeText(tl_date[0]);
+ $('p_desc').value=getNodeText(tl_desc[0]);
+ $('tl_id').value=getNodeText(tl_id[0]);
+ $('add_todo_list').style.display='block';
+ }
+ catch (e)
+ {
+ alert(e.message);
+ }
}
-function todo_list_show_error(request_json) {
+function todo_list_show_error(request_json)
+{
alert ('failure');
}
-function add_todo() {
+function add_todo()
+{
$('add_todo_list').style.top=posY+offsetY;
$('add_todo_list').style.left=posX+offsetX;
@@ -76,18 +97,27 @@ function add_todo() {
$('p_desc').value='';
$('tl_id').value=0;
}
-function todo_list_remove(p_ctl) {
- if ( confirm('Effacer ?') == false ) {return;}
+function todo_list_remove(p_ctl)
+{
+ if ( confirm('Effacer ?') == false )
+ {
+ return;
+ }
$("tr"+p_ctl).hide();
var gDossier=$('gDossier').value;
var action=new Ajax.Request(
- 'todo_list.php',
- {
- method:'get',
- parameters:{'del':1,'id':p_ctl,'gDossier':gDossier}
- }
- );
+ 'todo_list.php',
+ {
+ method:'get',
+ parameters:
+ {'del':
+ 1,'id':
+ p_ctl,'gDossier':
+ gDossier
+ }
+ }
+ );
return false;
}
diff --git a/html/listing_client.php b/html/listing_client.php
index e5aa63cec..6e950e9d5 100644
--- a/html/listing_client.php
+++ b/html/listing_client.php
@@ -46,14 +46,15 @@ header('Content-Disposition: attachment;filename="declaration.bin"',FALSE);
// Submit for a magnetic declaration
// Belgium only
//-----------------------------------------------------
-if ( isset($_POST['bt_disk'])) {
- require_once("class_customer.php");
- $customer=new Customer($cn);
- $a_Res=$customer->VatListing($_POST['year']);
+if ( isset($_POST['bt_disk']))
+{
+ require_once("class_customer.php");
+ $customer=new Customer($cn);
+ $a_Res=$customer->VatListing($_POST['year']);
- require_once("decla.BE.inc.php");
- $a=MakeListingVat($cn,$a_Res,$_POST['year']);
- echo "$a";
- return;
- }
+ require_once("decla.BE.inc.php");
+ $a=MakeListingVat($cn,$a_Res,$_POST['year']);
+ echo "$a";
+ return;
+}
?>
diff --git a/html/login.php b/html/login.php
index dcb25525f..2e9c1de29 100644
--- a/html/login.php
+++ b/html/login.php
@@ -26,29 +26,31 @@ include_once ("ac_common.php");
require_once('class_database.php');
-if ( isset ($_POST["p_user"] ) ) {
- $g_user=FormatString($_POST["p_user"]);
- $g_pass=$_POST["p_pass"];
- $_SESSION['g_user']=$g_user;
- $_SESSION['g_pass']=$g_pass;
-
- // Verif if User and Pass match DB
- // if no, then redirect to the login page
- $rep=new Database();
- include_once ("class_user.php");
- $User=new User($rep);
- $User->Check();
-
- echo "';
- require_once("class_own.php");
- if ( isset ($_POST['record_company'] )) {
- $m=new Own($cn);
- extract($_POST);
- $m->MY_NAME=$p_name;
- $m->MY_TVA=$p_tva;
- $m->MY_STREET=$p_street;
- $m->MY_NUMBER=$p_no;
- $m->MY_CP=$p_cp;
- $m->MY_COMMUNE=$p_Commune;
- $m->MY_TEL=$p_tel;
- $m->MY_FAX=$p_fax;
- $m->MY_PAYS=$p_pays;
- $m->MY_CHECK_PERIODE=$p_check_periode;
- $m->MY_DATE_SUGGEST=$p_date_suggest;
- if ( $User->check_action(PARCA)!=0)$m->MY_ANALYTIC=$p_compta;
- if ( $User->check_action(PARSTR)!=0) $m->MY_STRICT=$p_strict;
- if ( $User->check_action(PARTVA)!=0)$m->MY_TVA_USE=$p_tva_use;
- $m->MY_PJ_SUGGEST=$p_pj;
- $m->Update();
- }
+if ( $p_action=='company')
+{
+ $User->can_request(PARCOORD,1);
+ echo '
';
+ require_once("class_own.php");
+ if ( isset ($_POST['record_company'] ))
+ {
+ $m=new Own($cn);
+ extract($_POST);
+ $m->MY_NAME=$p_name;
+ $m->MY_TVA=$p_tva;
+ $m->MY_STREET=$p_street;
+ $m->MY_NUMBER=$p_no;
+ $m->MY_CP=$p_cp;
+ $m->MY_COMMUNE=$p_Commune;
+ $m->MY_TEL=$p_tel;
+ $m->MY_FAX=$p_fax;
+ $m->MY_PAYS=$p_pays;
+ $m->MY_CHECK_PERIODE=$p_check_periode;
+ $m->MY_DATE_SUGGEST=$p_date_suggest;
+ if ( $User->check_action(PARCA)!=0)$m->MY_ANALYTIC=$p_compta;
+ if ( $User->check_action(PARSTR)!=0) $m->MY_STRICT=$p_strict;
+ if ( $User->check_action(PARTVA)!=0)$m->MY_TVA_USE=$p_tva_use;
+ $m->MY_PJ_SUGGEST=$p_pj;
+ $m->Update();
+ }
- $my=new Own($cn);
- ///// Compta analytic
- $array=array (
- array("value"=>"ob",'label'=>_("obligatoire")),
- array("value"=>"op",'label'=>_("optionnel")),
- array("value"=>"nu",'label'=>_("non utilisé"))
- );
- $strict_array=array(
- array('value'=>'N','label'=>_('Non')),
- array('value'=>'Y','label'=>_('Oui'))
- );
+ $my=new Own($cn);
+ ///// Compta analytic
+ $array=array (
+ array("value"=>"ob",'label'=>_("obligatoire")),
+ array("value"=>"op",'label'=>_("optionnel")),
+ array("value"=>"nu",'label'=>_("non utilisé"))
+ );
+ $strict_array=array(
+ array('value'=>'N','label'=>_('Non')),
+ array('value'=>'Y','label'=>_('Oui'))
+ );
- $compta=new ISelect();
- $compta->table=1;
- $compta->selected=$my->MY_ANALYTIC;
+ $compta=new ISelect();
+ $compta->table=1;
+ $compta->selected=$my->MY_ANALYTIC;
- $strict=new ISelect();
- $strict->table=1;
- $strict->selected=$my->MY_STRICT;
+ $strict=new ISelect();
+ $strict->table=1;
+ $strict->selected=$my->MY_STRICT;
- $tva_use=new ISelect();
- $tva_use->table=1;
- $tva_use->selected=$my->MY_TVA_USE;
+ $tva_use=new ISelect();
+ $tva_use->table=1;
+ $tva_use->selected=$my->MY_TVA_USE;
- $pj_suggest=new ISelect();
- $pj_suggest->table=1;
- $pj_suggest->selected=$my->MY_PJ_SUGGEST;
-
- $date_suggest=new ISelect();
- $date_suggest->table=1;
- $date_suggest->selected=$my->MY_DATE_SUGGEST;
-
- $check_periode=new ISelect();
- $check_periode->table=1;
- $check_periode->selected=$my->MY_CHECK_PERIODE;
+ $pj_suggest=new ISelect();
+ $pj_suggest->table=1;
+ $pj_suggest->selected=$my->MY_PJ_SUGGEST;
- // other parameters
- $all=new IText();
- $all->table=1;
- echo '
";
- echo '
';
- exit();
- }
+ $date_suggest=new ISelect();
+ $date_suggest->table=1;
+ $date_suggest->selected=$my->MY_DATE_SUGGEST;
+
+ $check_periode=new ISelect();
+ $check_periode->table=1;
+ $check_periode->selected=$my->MY_CHECK_PERIODE;
+
+ // other parameters
+ $all=new IText();
+ $all->table=1;
+ echo '
";
+ echo '
';
- require_once('document_modele.inc.php');
- echo '
';
-}
+if ( $p_action == 'document' )
+{
+ $User->can_request(PARDOC,1);
+ echo '';
+ require_once('document_modele.inc.php');
+ echo '
';
+}
//----------------------------------------------------------------------
// Plan Comptable
//----------------------------------------------------------------------
-if ( $p_action == 'pcmn' ) {
- $User->can_request(PARPCMN,1);
- require_once('param_pcmn.inc.php');
-}
+if ( $p_action == 'pcmn' )
+{
+ $User->can_request(PARPCMN,1);
+ require_once('param_pcmn.inc.php');
+}
//----------------------------------------------------------------------
// Security
//----------------------------------------------------------------------
-if ( $p_action == 'sec' ) {
- $User->can_request(PARSEC,1);
- require_once('param_sec.inc.php');
-}
+if ( $p_action == 'sec' )
+{
+ $User->can_request(PARSEC,1);
+ require_once('param_sec.inc.php');
+}
//----------------------------------------------------------------------
// Predefined operation
//----------------------------------------------------------------------
-if ( $p_action == 'preod' ) {
- $User->can_request(PARPREDE,1);
- require_once('preod.inc.php');
-}
+if ( $p_action == 'preod' )
+{
+ $User->can_request(PARPREDE,1);
+ require_once('preod.inc.php');
+}
//---------------------------------------------------------------------------
// Definition of report
//---------------------------------------------------------------------------
-if ( $p_action == 'defrapport' ) {
- $User->can_request(PARRAP,1);
- require_once('report.inc.php');
+if ( $p_action == 'defrapport' )
+{
+ $User->can_request(PARRAP,1);
+ require_once('report.inc.php');
}
//----------------------------------------------------------------------
// Ledger parameter
//----------------------------------------------------------------------
-if ( $p_action == 'jrn' ) {
- $User->can_request(PARJRN,1);
- $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
- // echo '';
- if ( $sa == "add")
- require_once ('param_jrn_add.inc.php');
- elseif ($sa=='detail')
+if ( $p_action == 'jrn' )
+{
+ $User->can_request(PARJRN,1);
+ $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
+ // echo '
';
+ if ( $sa == "add")
+ require_once ('param_jrn_add.inc.php');
+ elseif ($sa=='detail')
require_once ('param_jrn_detail.inc.php');
- else
- require_once('param_jrn.inc.php');
- // echo '
';
-}
+ else
+ require_once('param_jrn.inc.php');
+ // echo '
Cell($size[$l],6,$date,0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,$row['jr_internal'],0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,substr($row['jrn_name'],0,14),0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,$row['description'],0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,(($row['letter']!=-1)?$row['letter']:''),0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$row['deb_montant'])),0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$row['cred_montant'])),0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,(sprintf('% 12.2f',abs($prog))),0,0,$align[$l]);$l++;
- $pdf->ln();
- $tot_deb+=$row['deb_montant'];
- $tot_cred+=$row['cred_montant'];
- /* -------------------------------------- */
- /* if details are asked we show them here */
- /* -------------------------------------- */
- if ( isset($_GET['oper_detail'])){
- $detail=new Acc_Operation($cn);
- $detail->jr_id=$row['jr_id'];
- $a_detail=$detail->get_jrnx_detail();
- for ($f=0;$fCell($size[$l],6,'',0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,$a_detail[$f]['j_qcode'],0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,$a_detail[$f]['j_poste'],0,0,$align[$l]);$l++;
- if ( $a_detail[$f]['j_qcode']=='')
- $lib=$a_detail[$f]['pcm_lib'];
- else
- {
- $f_id=$cn->get_value('select f_id from vw_poste_qcode where j_qcode=$1',array($a_detail[$f]['j_qcode'])) ;
- $lib=$cn->get_value('select av_text from jnt_fic_att_value join attr_value using (jft_id) where ad_id=$1 and f_id=$2',
- array(ATTR_DEF_NAME,$f_id));
- }
- $pdf->Cell($size[$l],6,$lib,0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,(($a_detail[$f]['letter']!=-1)?$a_detail[$f]['letter']:''),0,0,$align[$l]);$l++;
-
- $deb=($a_detail[$f]['debit']=='D')?$a_detail[$f]['j_montant']:'';
- $cred=($a_detail[$f]['debit']=='C')?$a_detail[$f]['j_montant']:'';
-
- $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$deb)),0,0,$align[$l]);$l++;
- $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$cred)),0,0,$align[$l]);$l++;
- $pdf->ln();
- }
- }
- }
- $str_debit=sprintf("% 12.2f €",$tot_deb);
- $str_credit=sprintf("% 12.2f €",$tot_cred);
- $diff_solde=$tot_deb-$tot_cred;
- if ( $diff_solde < 0 ) {
- $solde=" créditeur ";
- $diff_solde*=-1;
- } else
+ $Poste=new Acc_Account_Ledger($cn,$poste['pcm_val']);
+ list($array,$tot_deb,$tot_cred)=$Poste->get_row_date($from_periode,$to_periode,$_GET['ople']);
+ // don't print empty account
+ if ( count($array) == 0 )
{
- $solde=" débiteur ";
+ continue;
}
- $str_diff_solde=sprintf("%12.2f €",$diff_solde);
-
- $pdf->SetFont('DejaVu','B',8);
-
- $pdf->Cell(160,5,'Débit',0,0,'R');
- $pdf->Cell(30,5,$str_debit,0,0,'R');$pdf->Ln();
- $pdf->Cell(160,5,'Crédit',0,0,'R');
- $pdf->Cell(30,5,$str_credit,0,0,'R');$pdf->Ln();
- $pdf->Cell(160,5,'Solde '.$solde,0,0,'R');
- $pdf->Cell(30,5,$str_diff_solde,0,0,'R');$pdf->Ln();
+ $Libelle=sprintf("(%s) %s ",$Poste->id,$Poste->get_name());
+ $pdf->SetFont('DejaVuCond','',10);
+ $pdf->Cell(0,8,$Libelle,1,0,'C');
+ $pdf->Ln();
-}
+ $pdf->SetFont('DejaVuCond','',8);
+ $l=0;
+ $pdf->Cell($size[$l],6,'Date',0,0,'L');
+ $l++;
+ $pdf->Cell($size[$l],6,'Ref',0,0,'C');
+ $l++;
+ $pdf->Cell($size[$l],6,'Journal',0,0,'C');
+ $l++;
+ $pdf->Cell($size[$l],6,'Libellé',0,0,'L');
+ $l++;
+ $pdf->Cell($size[$l],6,'Let',0,0,'R');
+ $l++;
+ $pdf->Cell($size[$l],6,'Debit',0,0,'R');
+ $l++;
+ $pdf->Cell($size[$l],6,'Credit',0,0,'R');
+ $l++;
+ $pdf->Cell($size[$l],6,'Prog',0,0,'R');
+ $l++;
+ $pdf->ln();
+ $tot_deb=0;
+ $tot_cred=0;
+ $prog=0;
+ for ($e=0;$eCell($size[$l],6,$date,0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,$row['jr_internal'],0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,substr($row['jrn_name'],0,14),0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,$row['description'],0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,(($row['letter']!=-1)?$row['letter']:''),0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$row['deb_montant'])),0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$row['cred_montant'])),0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,(sprintf('% 12.2f',abs($prog))),0,0,$align[$l]);
+ $l++;
+ $pdf->ln();
+ $tot_deb+=$row['deb_montant'];
+ $tot_cred+=$row['cred_montant'];
+ /* -------------------------------------- */
+ /* if details are asked we show them here */
+ /* -------------------------------------- */
+ if ( isset($_GET['oper_detail']))
+ {
+ $detail=new Acc_Operation($cn);
+ $detail->jr_id=$row['jr_id'];
+ $a_detail=$detail->get_jrnx_detail();
+ for ($f=0;$fCell($size[$l],6,'',0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,$a_detail[$f]['j_qcode'],0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,$a_detail[$f]['j_poste'],0,0,$align[$l]);
+ $l++;
+ if ( $a_detail[$f]['j_qcode']=='')
+ $lib=$a_detail[$f]['pcm_lib'];
+ else
+ {
+ $f_id=$cn->get_value('select f_id from vw_poste_qcode where j_qcode=$1',array($a_detail[$f]['j_qcode'])) ;
+ $lib=$cn->get_value('select av_text from jnt_fic_att_value join attr_value using (jft_id) where ad_id=$1 and f_id=$2',
+ array(ATTR_DEF_NAME,$f_id));
+ }
+ $pdf->Cell($size[$l],6,$lib,0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,(($a_detail[$f]['letter']!=-1)?$a_detail[$f]['letter']:''),0,0,$align[$l]);
+ $l++;
+
+ $deb=($a_detail[$f]['debit']=='D')?$a_detail[$f]['j_montant']:'';
+ $cred=($a_detail[$f]['debit']=='C')?$a_detail[$f]['j_montant']:'';
+
+ $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$deb)),0,0,$align[$l]);
+ $l++;
+ $pdf->Cell($size[$l],6,(sprintf('% 12.2f',$cred)),0,0,$align[$l]);
+ $l++;
+ $pdf->ln();
+ }
+ }
+ }
+ $str_debit=sprintf("% 12.2f €",$tot_deb);
+ $str_credit=sprintf("% 12.2f €",$tot_cred);
+ $diff_solde=$tot_deb-$tot_cred;
+ if ( $diff_solde < 0 )
+ {
+ $solde=" créditeur ";
+ $diff_solde*=-1;
+ }
+ else
+ {
+ $solde=" débiteur ";
+ }
+ $str_diff_solde=sprintf("%12.2f €",$diff_solde);
+
+ $pdf->SetFont('DejaVu','B',8);
+
+ $pdf->Cell(160,5,'Débit',0,0,'R');
+ $pdf->Cell(30,5,$str_debit,0,0,'R');
+ $pdf->Ln();
+ $pdf->Cell(160,5,'Crédit',0,0,'R');
+ $pdf->Cell(30,5,$str_credit,0,0,'R');
+ $pdf->Ln();
+ $pdf->Cell(160,5,'Solde '.$solde,0,0,'R');
+ $pdf->Cell(30,5,$str_diff_solde,0,0,'R');
+ $pdf->Ln();
+
+}
$fDate=date('dmy-Hi');
$pdf->Output('poste-'.$fDate.'.pdf','I');
+?>
+?>
?>
\ No newline at end of file
diff --git a/html/print_balance.php b/html/print_balance.php
index 74dd24961..d9c3333ca 100644
--- a/html/print_balance.php
+++ b/html/print_balance.php
@@ -30,7 +30,7 @@
*/
// Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
// $Revision$
-
+
include_once("ac_common.php");
require_once('class_database.php');
include_once("class_acc_balance.php");
@@ -50,23 +50,26 @@ $User->can_request(IMPBAL,1);
extract ($_GET);
$bal->jrn=null;
-switch( $_GET['p_filter']){
+switch( $_GET['p_filter'])
+{
case 0:
- $bal->jrn=null;
- break;
+ $bal->jrn=null;
+ break;
case 1:
- if ( isset($_GET['r_jrn'])) {
- $selected=$_GET['r_jrn'];
- $array_ledger=$User->get_ledger('ALL',3);
- for ($e=0;$ejrn[]=$array_ledger[$e]['jrn_def_id'];
+ if ( isset($_GET['r_jrn']))
+ {
+ $selected=$_GET['r_jrn'];
+ $array_ledger=$User->get_ledger('ALL',3);
+ for ($e=0;$ejrn[]=$array_ledger[$e]['jrn_def_id'];
+ }
}
- }
- break;
+ break;
case 2:
- if ( isset($_GET['r_cat'])) $bal->filter_cat($_GET['r_cat']);
- break;
+ if ( isset($_GET['r_cat'])) $bal->filter_cat($_GET['r_cat']);
+ break;
}
$bal->from_poste=$_GET['from_poste'];
@@ -74,10 +77,11 @@ $bal->to_poste=$_GET['to_poste'];
$array=$bal->get_row($from_periode,$to_periode);
-if ( sizeof($array) == 0 ) {
- exit();
-
- }
+if ( sizeof($array) == 0 )
+{
+ exit();
+
+}
$pPeriode=new Periode($cn);
$a=$pPeriode->get_date_limit($from_periode);
@@ -97,27 +101,34 @@ $pdf->Cell(20,6,'Solde Créditeur',0,0,'R');
$pdf->Ln();
$pdf->SetFont('DejaVuCond','',8);
-$tp_deb=0;$tp_cred=0;$tp_sold=0;$tp_solc=0;
-for ($i=0;$iSetFillColor(220,221,255);
- $fill=1;
- } else {
- $pdf->SetFillColor(0,0,0);
- $fill=0;
- }
- if ( ! isset($array[$i]))continue;
- $pdf->Cell(30,6,$array[$i]['poste'],0,0,'L',$fill);
- $pdf->Cell(80,6,$array[$i]['label'],0,0,'L',$fill);
- $pdf->Cell(20,6,$array[$i]['sum_deb'],0,0,'R',$fill);
- $pdf->Cell(20,6,$array[$i]['sum_cred'],0,0,'R',$fill);
- $pdf->Cell(20,6,$array[$i]['solde_deb'],0,0,'R',$fill);
- $pdf->Cell(20,6,$array[$i]['solde_cred'],0,0,'R',$fill);
- $pdf->Ln();
- $tp_deb+=$array[$i]['sum_deb'];
- $tp_cred+=$array[$i]['sum_cred'];
- $tp_sold+=$array[$i]['solde_deb'];
- $tp_solc+=$array[$i]['solde_cred'];
+$tp_deb=0;
+$tp_cred=0;
+$tp_sold=0;
+$tp_solc=0;
+for ($i=0;$iSetFillColor(220,221,255);
+ $fill=1;
+ }
+ else
+ {
+ $pdf->SetFillColor(0,0,0);
+ $fill=0;
+ }
+ if ( ! isset($array[$i]))continue;
+ $pdf->Cell(30,6,$array[$i]['poste'],0,0,'L',$fill);
+ $pdf->Cell(80,6,$array[$i]['label'],0,0,'L',$fill);
+ $pdf->Cell(20,6,$array[$i]['sum_deb'],0,0,'R',$fill);
+ $pdf->Cell(20,6,$array[$i]['sum_cred'],0,0,'R',$fill);
+ $pdf->Cell(20,6,$array[$i]['solde_deb'],0,0,'R',$fill);
+ $pdf->Cell(20,6,$array[$i]['solde_cred'],0,0,'R',$fill);
+ $pdf->Ln();
+ $tp_deb+=$array[$i]['sum_deb'];
+ $tp_cred+=$array[$i]['sum_cred'];
+ $tp_sold+=$array[$i]['solde_deb'];
+ $tp_solc+=$array[$i]['solde_cred'];
}
// Totaux
diff --git a/html/priv_user.php b/html/priv_user.php
index b74c4facf..f93cfb5a0 100644
--- a/html/priv_user.php
+++ b/html/priv_user.php
@@ -31,22 +31,25 @@ $User=new User($rep);
$User->Check();
/* only the global admin can modify something here
*/
-if ($User->admin != 1) {
- html_page_stop();
- return;
+if ($User->admin != 1)
+{
+ html_page_stop();
+ return;
}
-if (! isset ($_REQUEST['UID']) ) {
- html_page_stop();
- exit();
+if (! isset ($_REQUEST['UID']) )
+{
+ html_page_stop();
+ exit();
}
$uid=$_REQUEST['UID'];
$UserChange=new User($rep,$uid);
$r_UID=$UserChange->id;
-if ( $r_UID == false ) {
- // Message d'erreur
- html_page_stop();
+if ( $r_UID == false )
+{
+ // Message d'erreur
+ html_page_stop();
}
echo ' Administration Globale ';
@@ -65,82 +68,99 @@ echo 'Gestion Utilisateurs ';
exec_sql( "update ac_users set use_pass='$l_pass' where use_id=$uid");
- echo ' Password remis à phpcompta ';
+if ( isset ( $_GET['reset_passwd']) )
+{
+ $cn=new Database();
+ $l_pass=md5('phpcompta');
+ $Res=$cn->exec_sql( "update ac_users set use_pass='$l_pass' where use_id=$uid");
+ echo ' Password remis à phpcompta ';
}
/* Save the changes */
-if ( isset ($_POST['SAVE']) ){
- $uid = $_POST['UID'];
+if ( isset ($_POST['SAVE']) )
+{
+ $uid = $_POST['UID'];
- // Update User
- $cn=new Database();
- $last_name=$_POST['fname'];
- $first_name=$_POST['lname'];
- $UserChange=new User($cn,$uid);
- if ( $UserChange->load()==-1) {
- alert("Cet utilisateur n'existe pas");}
- else {
- $UserChange->first_name=$first_name;
- $UserChange->last_name=$last_name;
- $UserChange->active=$_POST['Actif'];
- $UserChange->admin=$_POST['Admin'];
- $UserChange->save();
-
- // Update Priv on Folder
- foreach ($_POST as $name=>$elem)
- {
- if ( substr_count($name,'PRIV')!=0 )
- {
- $db_id=substr($name,4);
- $cn=new Database();
- $UserChange->set_folder_access($db_id,$elem);
-
- }
-
- }
- }
-} else {
- if ( isset ($_POST["DELETE"]) ) {
+ // Update User
$cn=new Database();
- $Res=$cn->exec_sql("delete from priv_user where priv_jnt in ( select jnt_id from jnt_use_dos where use_id=$1",array($uid));
- $Res=$cn->exec_sql("delete from jnt_use_dos where use_id=$1",array($uid));
- $Res=$cn->exec_sql("delete from ac_users where use_id=$1",array($uid));
+ $last_name=$_POST['fname'];
+ $first_name=$_POST['lname'];
+ $UserChange=new User($cn,$uid);
+ if ( $UserChange->load()==-1)
+ {
+ alert("Cet utilisateur n'existe pas");
+ }
+ else
+ {
+ $UserChange->first_name=$first_name;
+ $UserChange->last_name=$last_name;
+ $UserChange->active=$_POST['Actif'];
+ $UserChange->admin=$_POST['Admin'];
+ $UserChange->save();
- echo " User ".h($_POST['fname'])." ".h($_POST['lname'])." (".
- h($_POST['login']).") est effacé User ".h($_POST['fname'])." ".h($_POST['lname'])." (".
+ h($_POST['login']).") est effacé
-
- 
+