Fix cosmetics

html/fiche_search.php

@@ -146,7 +146,9 @@ if ( isset ( $_POST['search']) )  {
 	      $row['tva_id'], 
 	      $row['tva_label']  
 	       );
-  $r.=  $row['vw_name'].$row['vw_addr'].$row['vw_cp'];
+  $r.=" ".$row['vw_name'];
+  if ( $row['vw_addr'] !="")
+    $r.="<br><font size=-1>Adresse:&nbsp;".$row['vw_addr']."&nbsp;".$row['vw_cp']."</font>";
   $r.="</span>";
  }
 }

html/user_impress.php

@@ -46,6 +46,7 @@ echo "<DIV class=\"u_subtmenu\">";
 $p_array=array(array ("user_impress.php?type=jrn","Journaux"),
 	       array("user_impress.php?type=poste","Poste"),
 	       array("user_impress.php?type=fiche","Fiche"),
+               array('user_impress.php?type=bal','Balance des comptes'),
 	       array("user_impress.php?type=form","Formulaire")
 	       );
 $default=( isset ($_GET['type']))?"user_impress.php?type=".$_GET['type']:"";
@@ -76,6 +77,10 @@ $default=( isset ($_GET['type']))?$_GET['type']:"";
   case "form":
     include ("impress_form.php");
     break;
+  case "bal":
+    include ("balance.php");
+    break;
+
   }
 
 html_page_stop();

include/balance.php

@@ -19,47 +19,8 @@
 */
 // Auteur Dany De Bontridder ddebontridder@yahoo.fr
 include_once ("ac_common.php");
-/* $Revision$ */
+// /* $Revision$ */
 include_once("preference.php");
-
-html_page_start($g_UserProperty['use_theme']);
-
-if ( ! isset ( $g_dossier ) ) {
-  echo "You must choose a Dossier ";
-  phpinfo();
-  exit -2;
-}
-include_once ("postgres.php");
-/* Admin. Dossier */
-CheckUser();
-
-// Synchronize rights
-SyncRight($g_dossier,$g_user);
-
-// Get The priv on the selected folder
-if ( $g_UserProperty['use_admin'] == 0 ) {
-  
-  $r=GetPriv($g_dossier,$g_user);
-  if ($r == 0 ){
-    /* Cannot Access */
-    NoAccess();
-  }
-
-}
-$l_jrn=sprintf("dossier%d",$g_dossier);
-$cn=DbConnect($l_jrn);
-
-//Show the top menu
-include_once ("user_menu.php");
-include_once ("top_menu_compta.php");
-ShowMenuCompta($g_dossier,$g_UserProperty);
-
-// Show Menu Left
-$left_menu=ShowMenuAdvanced();
-echo '<div class="lmenu">';
-echo $left_menu;
-echo '</DIV>';
-
 // Show the form for period
 echo '<div class="u_redcontent">';
 echo '<FORM action="print_balance.php" method="post">';

include/form_input.php

@@ -647,7 +647,7 @@ for ($o = 0;$o < $p_number; $o++) {
 	  //	  $r.='<INPUT TYPE="SUBMIT" name="record_invoice" value="Sauver">';
 	  // If the total == 0 prevent the insert
 	  if ( $sum_with_vat != 0 ) {
-	    $r.='<INPUT TYPE="SUBMIT" name="record_and_print_invoice" value="Sauver & imprimer">';
+	    $r.='<INPUT TYPE="SUBMIT" name="record_and_print_invoice" value="Sauver" >';
 	  }
 	  $r.='<INPUT TYPE="SUBMIT" name="correct_new_invoice" value="Corriger">';
 	  $r.='</FORM>';

include/impress_jrn.php

@@ -78,8 +78,8 @@ include("class_jrn.php");
 	"<TD>".$op['j_date']."</TD>".
 	"<TD>".$op['poste']."</TD>".
 	"<TD>".$op['description']."</TD>".
-	"<TD>".$op['cred_montant']."</TD>".
 	"<TD>".$op['deb_montant']."</TD>".
+	"<TD>".$op['cred_montant']."</TD>".
 	"</TR>";
   }
   echo "</table>";
@@ -123,7 +123,7 @@ if ( $User->Admin() ==0) {
     // Pour voir tout les journal ?
     if ( $NoPriv == 0 ) {
       $a=count($ret);
-      $all=array('value'=>0,'label'=>'All');
+      $all=array('value'=>0,'label'=>'Grand Livre');
       $ret[$a]=$all;
    }
 if ( count($ret) < 1 ) 

include/user_action_ven.php

@@ -110,10 +110,10 @@ if ( isset($_POST["record_and_print_invoice"])) {
   //  echo "RECORD AND PRINT INVOICE";
   $comment=RecordInvoice($cn,$HTTP_POST_VARS,$g_user,$g_jrn);
       $nb_number=$_POST["nb_item"];
-      $form=FormVenteView($cn,$g_jrn,$g_user,$HTTP_POST_VARS,$nb_number,'pdf',$comment);
-	echo '<div class="u_redcontent">';
-	echo $form;
-	echo "</div>  ";
+//       //      $form=FormVenteView($cn,$g_jrn,$g_user,$HTTP_POST_VARS,$nb_number,'pdf',$comment);
+// 	echo '<div class="u_redcontent">';
+// 	echo $form;
+// 	echo "</div>  ";
 }
 
 

include/user_menu.php

@@ -413,8 +413,7 @@ $left_menu=ShowItem(array(
 			  array('jrn_update.php','Journaux'),
 			  array('central.php','Centralise'),
 		          array('pcmn_update.php?p_start=1','Plan Comptable'),
-			  array('stock.php','stock'),
-			  array('balance.php','Balance des comptes')
+			  array('stock.php','stock')
 			  ),
 		    'V');
 return $left_menu;