diff --git a/html/fiche_search.php b/html/fiche_search.php index 8ec1e6a0b..898be9bd4 100644 --- a/html/fiche_search.php +++ b/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.="
Adresse: ".$row['vw_addr']." ".$row['vw_cp'].""; $r.=""; } } diff --git a/html/user_impress.php b/html/user_impress.php index dfa29251c..a8522510e 100644 --- a/html/user_impress.php +++ b/html/user_impress.php @@ -46,6 +46,7 @@ echo "
"; $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(); diff --git a/html/balance.php b/include/balance.php similarity index 60% rename from html/balance.php rename to include/balance.php index 3aaa59688..58ce2ab07 100644 --- a/html/balance.php +++ b/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 ''; - // Show the form for period echo '
'; echo '
'; diff --git a/include/form_input.php b/include/form_input.php index 6d249524e..9464c801f 100644 --- a/include/form_input.php +++ b/include/form_input.php @@ -647,7 +647,7 @@ for ($o = 0;$o < $p_number; $o++) { // $r.=''; // If the total == 0 prevent the insert if ( $sum_with_vat != 0 ) { - $r.=''; + $r.=''; } $r.=''; $r.='
'; diff --git a/include/impress_jrn.php b/include/impress_jrn.php index 637e411bb..dc13a26b0 100644 --- a/include/impress_jrn.php +++ b/include/impress_jrn.php @@ -78,8 +78,8 @@ include("class_jrn.php"); "".$op['j_date']."". "".$op['poste']."". "".$op['description']."". - "".$op['cred_montant']."". "".$op['deb_montant']."". + "".$op['cred_montant']."". ""; } echo ""; @@ -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 ) diff --git a/include/user_action_ven.php b/include/user_action_ven.php index 4b472b163..af8f0b66a 100644 --- a/include/user_action_ven.php +++ b/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 '
'; - echo $form; - echo "
"; +// // $form=FormVenteView($cn,$g_jrn,$g_user,$HTTP_POST_VARS,$nb_number,'pdf',$comment); +// echo '
'; +// echo $form; +// echo "
"; } diff --git a/include/user_menu.php b/include/user_menu.php index 523f40142..ba5e47795 100644 --- a/include/user_menu.php +++ b/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;