From 002d4ce01a2558259133ec954326f1837b70cca7 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Fri, 11 Jun 2010 20:01:43 +0000
Subject: [PATCH] Merged revisions 3280-3284 via svnmerge from
 svn+ssh://danydb@svn/svn/phpcompta/branches/rel510

........
  r3280 | danydb | 2010-06-11 14:50:28 +0200 (Fri, 11 Jun 2010) | 2 lines

  Print the accounting in PDF in the right order
........
  r3281 | danydb | 2010-06-11 17:37:07 +0200 (Fri, 11 Jun 2010) | 2 lines

  Improve cosmetic
........
  r3282 | danydb | 2010-06-11 17:38:09 +0200 (Fri, 11 Jun 2010) | 1 line

  Add check for restore of folder or template
........
  r3283 | danydb | 2010-06-11 17:46:21 +0200 (Fri, 11 Jun 2010) | 2 lines

  truncate table quant_*
........
  r3284 | danydb | 2010-06-11 17:55:18 +0200 (Fri, 11 Jun 2010) | 1 line

  Cosmetic : anchorbutton style
........
---
 html/image/bg-submit2.gif    | Bin 0 -> 1213 bytes
 html/image/bg-submit3.gif    | Bin 0 -> 982 bytes
 html/poste_pdf.php           |   2 +-
 html/style-color.css         |  42 ++++++++++++++++++++
 html/style-light.css         |  60 +++++++++++++++++++++++++---
 html/style.css               |  75 +++++++++++++++++++++++++++++++----
 include/class_html_input.php |   2 +-
 include/modele.inc.php       |   5 ++-
 include/pref.inc.php         |   4 --
 include/restore.inc.php      |  28 +++++++++++--
 include/user_menu.php        |   8 ++--
 11 files changed, 198 insertions(+), 28 deletions(-)
 create mode 100644 html/image/bg-submit2.gif
 create mode 100644 html/image/bg-submit3.gif

diff --git a/html/image/bg-submit2.gif b/html/image/bg-submit2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..74666bcb211e155811058bb21428d06757f6bb31
GIT binary patch
literal 1213
zcmb```%}^f003}yx9jX$*Ymm_KQynEX7+TVCFKi65PStbQ3MeI4N?)I$P|<}fuw0^
zrFJW<+b%QV`{n!PAs`TlsaS2Rm4=n(54F{<TC2AG5BvNN9}G4<{vb6H5rKH|9I-Xu
zw3|2-UI6SR-P%z&8c_sClo&Ttz^D>yR4ITgHpLZLqsoS(%fLNl=DieXdnLG^W;#p-
zFcct>24<9liS!X1)r_T$B-5cx8l1u~<uT;(EFhC^N?{HY=vI6sfM$XT)n)<%Ok<hT
z*dy6h<|8$5L8TePhSIBzIZP;<Wz1#4$Xa`L%}^fOnp+LT)s5ng*{~ciuLjKJ+@^3;
z#2Wk2W9CCVC;m7@<UmKc#)JkJp%x}_VHAHXMi4k4^yDA6khvyOEs(_nOOFHjbzotw
zEr(|>s5ckY*$a749^aAM2$$DG#SL&_qp6HPMCHNd4W<&lrAPpf8?6-$R;0vIECgwd
zV5z`XAuy9qLMVxkc4CAsgeWH*r6M?^#aD6Ch-z~mY4yj-W)4d|Sn)XHq$RN}P$>ea
zB3F#kSKefeRZLcitVz-d#wqZK!bv@Ci&49AZC>UnTdc}o)ntxSPNm51qNVrCTcGbX
z9#)ebCvzq%e9Y5OlG25j-l=FAWuJCr%EwsEFhS-^R=LrNsd!BwRp~#Z4${R=yu!_H
zv81RyHO)@6YCK&z&5{6>5?8g@nyT@psRLO`&q19JqY5%w$7&?D9OVQ@JeI0;rk%Ny
zp`JnMrZAej1dZcZs~xR#<*4tZYki!y(X{q4jLuKgOp(q^<J*HN9rtSGV_c<;FSp@3
zeTBN2v~v#%^pm6xA6FeH*59wwID{%k_POb-?m$jgkksWaI5%F@InC3$L>d?N!oz~|
z-s0|wR-I9x_ZIi~OM9l|9cEEC#O;}ocY10sPFD5%g}syYm#38%-26Tdci>mW#ZgVK
zSKBio8kp?7=u`DgHC_ugU!D2#zluiu>%R+#u+ND0QpdJy+Hh>xx+t=DUw^-B_12d{
z;$rSriFz~p(Z>Bxx1sdJA76$Br`=~)B&3r^*lV{S`|tz3gMUyjkj^g{+TSjp$9Kf8
z{PP2E-@WUy#FqQ$?ThXGd5WJ6xDy8qm+-`4Bz-;h#)DR}t!d@1{9V7?BHkVNG|1oW
zGjihU0%+4uzd?dGFMn9El>6xNsn>sR!UH$wobq+6c3i(Y6!Pe{WnOx;QNKC7JEr>a
zI5=E2p2|mWB$#h61`S8GO|$mqr3W`F{Few1V-a74)h#^^K&Dquz~#~1Nigtx$a{8I
z#2Kns`eO1*=H)EQU-hdtp_or5EYQ1Gvm;kjVaZnb!<&WRjlC3_<>R}hlHQzToAuMj
z_ivW2JrTF5zaW-H&NhF&;XP&L{)N6-@i)kYS;^`>%+%KP`C)TwP;dL@q?x>hIoY?;
z$fq(4V$Hz1$g75@%4nluU@ajdJfzN^VTLsE&kZ3B0Y4YgCN0}JuS0(pv~4K+Zg5_Y
oM=s8v#p%PJbrADe&pHdUSkf(I{^GN)a_LS+m+<wP)rf?D0GSq*y8r+H

literal 0
HcmV?d00001

diff --git a/html/image/bg-submit3.gif b/html/image/bg-submit3.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3020e7d291b594683caa85e543a526c704d4a1e1
GIT binary patch
literal 982
zcmV;{11bDRNk%w1VIlxE0O$Vz0{{j90ssd900IIJ00ajS0Rs^S00s*H1qvGv5e@?v
z1Qizr2NyIM8yPkh6;}=r5iJ=gDJMuH2^B1O88J&EHUt_nU?ws>m=z!uG;=gIGp`sL
zZ8HTlL1;5XP)tN2EKVQGA0I<SLI7Ja*&-t)P;)Lw!#7$63t5vbOS*tYE?879QBzOb
zE-x=sy%%x}q)Y{YPf!kQoEB@O)I3$ZNJKemghgP+={-I<X_#SSUwC8^DR)sqb1)}>
z83%g6Rcm^pUlvJeyB~P9R(lOea-&gf)AvbA+fQP2aZBh=P!WU1Z*gqmRY+HLxl?u9
zBbx_0k|+R^*TQE}?O+|Ua4_CpbXtJ1=4TdOfWJnG%WIGs0iMi&fqX`v1+sfNgojt>
za2}$9H+h7dw0c*1kS*19H9C~f%yeIHi;+R70DXv#VVoOIp*L%cx?-aa?r~ykkI?XW
zB}A|i(1a}Yd>`P0E1{E0V6OnPkvBx4;8L^z@_;pxl#kYgaf6k`Gpx_Xlp}1N-CMIr
zX`$0#vpsaMB*B^<|BDfPwE*moHSCT_ZMh^pw%Oy8RCuK8pP`-pk{bDtLVmGlXu|;K
zj+&pMtJsx<-;$pDn-_$?64#_Gg1kKbnlDzo&#J6_eZ(O4pGN$gS(~oRX}R@G!t(N?
zSKgzV<*g`-xX=5k8?Ujhl*tsDyq>1A;M=O5<*1g2(hmEpPLIq``>b%7&pZCKC3N09
zhT2J_)HLX|s*%X@__uTZza+H6<d)(9{<>Sk#H{(iH>}oA!^Oe+zG$u2UjNJn`ooTu
z<!AcEef-Qt&(N#B&+OmI!mQZz{?{w5@gmXI&(YP{{nTQ&+~nHWytVcKs_lQj;PBJl
z%+1{N{@+sm+J*eyeE;5)%I5C4{7U`hZ2sV+!TeF<=feBtl*RR?=;+Pa>GaI`fBWaB
z=;rIi|6Szg_R9Wl`{}yy==SgI>h|)Q<MHFw{+8bTqu%_m+W7qT^xX0F<nr|J<o?6)
z_Wbz#>-_%uEC2ui03rZ2000QP0ByJ-q^F?4g9sBUH2CaUwucZSN}Nbh;<IfPGisFB
ztXad4AVZ2ANwTELlh1bTLdjC3%9k)>%A85Frp=o;bL!m5v!~CWJ4p#0O0=laqezn~
zUCOkn)2C3QN}Wozs@1DlvufSSRp`R6U=^MjOSY`pvuM+*UCXwu+qZDz%AHHMuHCzM
z^XlEpx3Ay7fCCF2OjxcIErk>J)dQHZ;=Y6;OP)-*vgOJuQvrpUs<Y=*HqL|{{WTx}
EJ9HrY3;+NC

literal 0
HcmV?d00001

diff --git a/html/poste_pdf.php b/html/poste_pdf.php
index 3a101a8a2..a80851f1b 100644
--- a/html/poste_pdf.php
+++ b/html/poste_pdf.php
@@ -44,7 +44,7 @@ $User->can_request(IMPPOSTE,0);
 extract($_GET);
 
  if ( isset ( $poste_fille) ){ //choisit de voir tous les postes
-   $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text like '$poste_id%'");
+   $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text like '$poste_id%' order by pcm_val");
  } else 
  $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text = '$poste_id'");
       
diff --git a/html/style-color.css b/html/style-color.css
index dab9bab9d..42607865a 100644
--- a/html/style-color.css
+++ b/html/style-color.css
@@ -518,6 +518,7 @@ fieldset fieldset legend {
 select {
 border: 1px solid blue;
 margin:2px;
+background-color:white;
 
 }
 
@@ -771,4 +772,45 @@ cursor:inherit;
 	font-color:blue;
 	margin:1 2 1 2;
 	}
+	td.tool {
+	border: 0;
+	
+	}
+div.topmenu {
+	float:left;
+	width:100%;
+	
+}
+
+h2.dossier {
+	color:white;
+	font-style: oblique;
+	
+font-size:15px;
+margin:0;
+padding:0;
+text-align:center;
+}
+a#anchorbutton {
+	font-size:10;
+	color:black;
+	text-decoration:none;
+	font-family: helvetica,arial,sans-serif;
+	background-color:#DFDFDF;
+	border-style:  outset ;
+	border-color:  blue ;
+	border-width:1;
+	padding:2 4 2 4;
+	cursor:pointer;
+	margin:1 2 1 2;
+	-moz-border-radius:2 2;
+	
+}	
+a#anchorbutton :hover {
+	cursor:pointer;
+	background-color:white;
+	border-style:  inset ;
+	font-color:blue;
+	margin:1 2 1 2;
+	}
 /* </style> */
diff --git a/html/style-light.css b/html/style-light.css
index 494b9cf73..1e3a4649b 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -90,9 +90,9 @@ h1.title {
 
 div.u_tmenu {
   position: float;
-  margin-top:1px;
+  margin-top:0px;
   width:100%;	
-  background-color:#879ED4;
+ /* background-color:#879ED4; */
   
   
 }
@@ -104,7 +104,6 @@ div.u_subtmenu {
 
 }
 div.u_tmenu div.u_tool {
-	   background-color:#879ED4;	
 	   float:left;
 	   
 }
@@ -753,10 +752,15 @@ cursor:inherit;
 
 .button {
 	font-size:10;
-	color:black;
+	color:white;
+	font-weight: bold;
+	
 	text-decoration:none;
 	font-family: helvetica,arial,sans-serif;
-	background-color:#DFDFDF;
+	background-image: url("image/bg-submit3.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+	
 	border-style:  outset ;
 	border-color:  blue ;
 	border-width:1;
@@ -773,4 +777,50 @@ cursor:inherit;
 	font-color:blue;
 	margin:1 2 1 2;
 	}
+	td.tool {
+	border: solid 1px gray;
+	
+	}
+div.topmenu {
+	float:left;
+	width:100%;
+	
+}
+
+h2.dossier {
+	color:darkblue;
+	font-style: italic;
+	
+font-size:14px;
+margin:0;
+padding:0;
+text-align:center;
+}
+a#anchorbutton {
+	font-size:10;
+	color:white;
+	font-weight: bold;
+	
+	text-decoration:none;
+	font-family: helvetica,arial,sans-serif;
+	background-image: url("image/bg-submit3.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+	
+	border-style:  outset ;
+	border-color:  blue ;
+	border-width:1;
+	padding:2 4 2 4;
+	cursor:pointer;
+	margin:1 2 1 2;
+	-moz-border-radius:2 2;
+	
+}
+a#anchorbutton:hover {
+	cursor:pointer;
+	background-color:white;
+	border-style:  inset ;
+	font-color:blue;
+	margin:1 2 1 2;
+	}
 /* </style> */
diff --git a/html/style.css b/html/style.css
index 106666209..d8db757ed 100644
--- a/html/style.css
+++ b/html/style.css
@@ -17,14 +17,17 @@ table.result {
   color:blue;
   border:blue solid 1px; 
   width:100%;
+ 
+  
 }
 table.result th { 
   font-weight:bold;
   font-family:helvetica,arial,sans-serif;
-  border-bottom:1px solid blue;
+  border-bottom:0;
   padding-left:10px;
   padding-right:10px;
-  background-color: silver;
+  background-color: #7CBBFF;
+	      color:darkblue;
 }
 
 h2 {
@@ -210,10 +213,7 @@ table.document th{
 	      background-color:lightgrey;
 	      color:darkblue;
 }
-table.result th{
-	      background-color:lightgrey;
-	      color:darkblue;
-}
+
 span.error {
 color:black;  
 background-color:red;
@@ -523,6 +523,7 @@ fieldset fieldset legend {
 select {
 border: 1px solid blue;
 margin:2px;
+background-color:white;
 
 }
 
@@ -751,10 +752,17 @@ cursor:inherit;
 
 .button {
 	font-size:10;
-	color:black;
+	color:white;
+	font-weight: bold;
+	
 	text-decoration:none;
 	font-family: helvetica,arial,sans-serif;
-	background-color:#DFDFDF;
+	background-image: url("image/bg-submit2.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+	text-decoration:none;
+	font-family: helvetica,arial,sans-serif;
+	
 	border-style:  outset ;
 	border-color:  blue ;
 	border-width:1;
@@ -771,4 +779,55 @@ cursor:inherit;
 	font-color:blue;
 	margin:1 2 1 2;
 	}
+		td.tool {
+	border: 0;
+	
+	
+	}
+div.topmenu {
+	float:left;
+	width:100%;
+	
+}
+
+h2.dossier {
+	color:white;
+	font-style: italic;
+	
+font-size:14px;
+margin:0;
+padding:0;
+text-align:center;
+}
+a#anchorbutton {
+	font-size:10;
+	color:white;
+	font-weight: bold;
+	
+	text-decoration:none;
+	font-family: helvetica,arial,sans-serif;
+	background-image: url("image/bg-submit2.gif");
+	background-repeat: repeat-x;
+	background-position: left;
+	text-decoration:none;
+	font-family: helvetica,arial,sans-serif;
+	
+	border-style:  outset ;
+	border-color:  blue ;
+	border-width:1;
+	padding:2 4 2 4;
+	cursor:pointer;
+	margin:1 2 1 2;
+	-moz-border-radius:2 2;
+	display:inline;
+		
+}
+a#anchorbutton:hover{
+	cursor:pointer;
+	background-color:white;
+	border-style:  inset ;
+	font-color:blue;
+	margin:1 2 1 2;
+}
+
 /* </style> */
diff --git a/include/class_html_input.php b/include/class_html_input.php
index 081c1771d..bc6b25c28 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -206,7 +206,7 @@ echo $string => {'prop':'1','prop2':'2','prop3':'3'};
    *\return string with htmlcode
    */
   static function button_anchor($p_label,$p_value,$p_name="") {
-    $r=sprintf('<span id="%s"> <A class="button" href="%s" style="color:black;width:75;display:inline">%s</A></span>',
+    $r=sprintf('<span id="%s"> <A id="anchorbutton" style="display:inline;" href="%s" >%s</A></span>',
 	       $p_name,
 	       $p_value,
 	       $p_label);
diff --git a/include/modele.inc.php b/include/modele.inc.php
index fe53118cb..c2b23359c 100644
--- a/include/modele.inc.php
+++ b/include/modele.inc.php
@@ -118,8 +118,11 @@ if ( isset ($_POST["FMOD_NAME"]) ) {
   $Res=$cn_mod->exec_sql('delete from operation_analytique');
 
   // TODO 
-  // Nettoyage table quant_*
+
   $Res=$cn_mod->exec_sql("truncate table jrn_rapt");
+  $Res=$cn_mod->exec_sql("truncate table quant_fin");
+  $Res=$cn_mod->exec_sql("truncate table quant_purchase");
+  $Res=$cn_mod->exec_sql("truncate table quant_sold");
   $Res=$cn_mod->exec_sql("truncate table import_tmp");
   //	Reset the closed periode
   $Res=$cn_mod->exec_sql("update parm_periode set p_closed='f'");
diff --git a/include/pref.inc.php b/include/pref.inc.php
index 5275b3301..66127a54d 100644
--- a/include/pref.inc.php
+++ b/include/pref.inc.php
@@ -36,11 +36,7 @@ echo '<DIV class="content">';
 if ( isset($_POST['pass_1'])
      && strlen(trim($_POST['pass_1'])) != 0 ) {
   if ($_POST['pass_1'] != $_POST['pass_2'] ) {
-  ?>
-<script>
       alert(_("Les mots de passe ne correspondent pas. Mot de passe inchangé"));
-</script>
-<?php  
     }
     else {
       $Rep=new Database();
diff --git a/include/restore.inc.php b/include/restore.inc.php
index 97cac9cd5..fd7a5c9c0 100644
--- a/include/restore.inc.php
+++ b/include/restore.inc.php
@@ -85,9 +85,18 @@ if ( isset ($_REQUEST['sa'] )) {
     $cn->exec_sql("create database ".$name." encoding='utf8'");
     $args=" --no-owner  -d $name ".$_FILES['file']['tmp_name'];
 
-    $status=passthru(PG_RESTORE.$args);
-    echo '<h2 class="info"> Restauration réussie du dossier '.$lname.'</h2>';
-
+    exec(PG_RESTORE.$args);
+    $test=new Database($id);
+    if ( $test->exist_table('version') ){
+      echo '<h2 class="info"> Restauration réussie du dossier '.$lname.'</h2>';
+      $test->close();
+    } else {
+      $test->close();
+      echo '<h2 class="error"> Problème lors de la restauration '.$lname.'</h2>';
+      $cn->exec_sql('delete from ac_dossier where dos_id=$1',array($id));
+      $cn->exec_sql('drop database '.$name);
+      exit();
+    }
     $new_cn=new Database($id);
 
     $new_cn->apply_patch($name,0);
@@ -131,7 +140,18 @@ if ( isset ($_REQUEST['sa'] )) {
     $args="   -d $name ".$_FILES['file']['tmp_name'];
     $status=exec(PG_RESTORE.$args);
 
-    echo '<h2 class="info"> Restauration réussie du modèle '.$lname.'</h2>';
+    $test=new Database($id,'mod');
+    if ( $test->exist_table('version') ){
+      echo '<h2 class="info"> Restauration réussie du dossier '.$lname.'</h2>';
+      $test->close();
+    } else {
+      $test->close();
+      echo '<h2 class="error"> Problème lors de la restauration '.$lname.'</h2>';
+      $cn->exec_sql('delete from modeledef where mod_id=$1',array($id));
+      $cn->exec_sql('drop database '.$name);
+      exit();
+    }
+
     $new_cn=new Database($id,'mod');
 
     $new_cn->apply_patch($name,0);
diff --git a/include/user_menu.php b/include/user_menu.php
index 70684b867..58754878c 100644
--- a/include/user_menu.php
+++ b/include/user_menu.php
@@ -202,7 +202,7 @@ function ShowMenuCompta($p_high="")
   $str_dossier=dossier::get();
   $r="";
   $r.=menu_tool("compta.php");
-  $r.='<div style="float:left;background-color:#879ED4;width:100%;">';
+  $r.='<div class="topmenu">';
   $r.=$result;
   $r.='</div>';
 
@@ -431,7 +431,7 @@ function menu_tool($p_from) {
 
   $r.= '<div class="u_tool">';
   $r.= '<div class="name">';
-  $r.= "<H2 class=\"info\"> Dossier : ".h(dossier::name())."</h2> ";
+  $r.= "<H2 class=\"dossier\"> Dossier : ".h(dossier::name())."</h2> ";
   $r.= '</div>';
   $r.= '<div class="acces_direct">';
   if ( $p_from == 'compta') $view='E';
@@ -465,13 +465,13 @@ function menu_tool($p_from) {
 	$r.='</tr><tr>';
 	continue;
       }
-      $r.= '<td>'.
+      $r.= '<td class="tool">'.
 	'<a class="cell" href="'.$url.'" >'.$col['label'].'</a>'.
 	'</td>';
     }
 
   }
-   $r.='<td class="mtitle2">';
+   $r.='<td class="tool">';
   $r.= '<A class="cell" HREF="javascript:openRecherche('.$gDossier.')">'.
     _('Recherche').'</a></td>';
   $r.='</tr>';