From 2bc01f19af32fbdf03a239c7a8deb0aaca3a7079 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Tue, 20 Apr 2010 09:33:52 +0000
Subject: [PATCH] Merged revisions 3036-3038 via svnmerge from
 file:///home/developper/svn/phpcompta/branches/rel500

........
  r3037 | danydb | 2010-04-19 20:31:22 +0200 (Mon, 19 Apr 2010) | 3 lines


  Remove a card, do not remove from tmp_pcmn
........
  r3038 | danydb | 2010-04-20 11:19:07 +0200 (Tue, 20 Apr 2010) | 4 lines


  Bug : centralize periode give the error 'periode undefined'
  Fixed'
........
---
 include/central.inc.php |  8 ++++----
 include/class_fiche.php | 20 --------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/include/central.inc.php b/include/central.inc.php
index 93fce402b..475a85f5d 100644
--- a/include/central.inc.php
+++ b/include/central.inc.php
@@ -51,12 +51,12 @@ echo '<H2 CLASS="info"> Centralise </H2><BR>';
 if ( isset ($_POST["central"] )) {
 
   //demande centralise
-if ( $_POST["periode"] != "" ) {
-    $ret=Centralise($cn,$_POST["periode"]);
+if ( $_POST["period"] != "" ) {
+    $ret=Centralise($cn,$_POST["period"]);
     if ($ret==NOERROR) {
-      echo '<H2 class="info">La p&eacute;riode '.$_POST["periode"].' est centralis&eacute;e</H2>';
+      echo '<H2 class="info">La p&eacute;riode '.$_POST["period"].' est centralis&eacute;e</H2>';
     } else {
-      echo '<H2 class="error">La p&eacute;riode '.$_POST["periode"].' n\' a pu être centralis&eacute;e</H2>';
+      echo '<H2 class="error">La p&eacute;riode '.$_POST["period"].' n\' a pu être centralis&eacute;e</H2>';
     }
   } 
 }// if ( isset ($_POST["central"] ))
diff --git a/include/class_fiche.php b/include/class_fiche.php
index b02a3641f..d8c8248b3 100644
--- a/include/class_fiche.php
+++ b/include/class_fiche.php
@@ -813,26 +813,6 @@ Array
 	   return;
 	 }
 
-       if ( $fiche_def->create_account=='t' ) {
-	 // Retrieve the 'poste comptable'
-	 $class=$this->strAttribut(ATTR_DEF_ACCOUNT);
-	 $is_used_jrnx=0;
-	 if ( trim(strlen($class)) != 0 && isNumber($class) == 1 )
-	   $is_used_jrnx= $this->cn->count_sql("select * from jrnx where j_poste=$1",array($class));
-	 // if class is not NULL and if we use it before, we can't remove it
-	 if (FormatString($class) != null && $is_used_jrnx     != 0 )
-	   {
-	     alert('Impossible ce poste est utilisée dans un journal');
-	     return;
-	   }
-	 else
-	   // Remove in PCMN
-	   if ( trim(strlen($class)) != 0 && isNumber($class) == 1 && $is_used_jrnx == 0)
-	     {
-	       $this->cn->exec_sql("delete from tmp_pcmn where pcm_val=$1",array($class));
-	     }
-
-       }
        $this->delete();
      }