From 2d1905c2bb5250746108e886789e71a73354317c Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Sat, 11 May 2002 18:25:26 +0000
Subject: [PATCH] *** empty log message ***

---
 htdocs/compta/pre.inc.php3 | 8 ++++++--
 htdocs/main.inc.php3       | 6 ++++--
 mysql/tables/Makefile      | 3 +++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/pre.inc.php3 b/htdocs/compta/pre.inc.php3
index dd908ac4762..815e8640fc5 100644
--- a/htdocs/compta/pre.inc.php3
+++ b/htdocs/compta/pre.inc.php3
@@ -33,7 +33,7 @@ function llxHeader($head = "") {
 
   $menu = new Menu();
 
-  $menu->add("/compta/index.php3","Factures");
+  $menu->add("/compta/facture.php3","Factures");
   $menu->add_submenu("paiement.php3","Paiements");
   $menu->add_submenu("fac.php3","admin fac");
 
@@ -46,10 +46,14 @@ function llxHeader($head = "") {
   $menu->add_submenu("pointmort.php3","Point mort");
   $menu->add_submenu("tva.php3","TVA");
 
-  $menu->add("/comm/propal.php3","Propal");
+  $menu->add("/compta/propal.php3","Propales");
 
   $menu->add("bank/index.php3","Bank");
 
+  $menu->add("voyage/index.php3","Voyages");
+
+  $menu->add_submenu("voyage/index.php3","Voyages");
+  $menu->add_submenu("voyage/reduc.php3","Reduc");
 
   left_menu($menu->liste);
 
diff --git a/htdocs/main.inc.php3 b/htdocs/main.inc.php3
index 1334c9cce7f..a425f5150ae 100644
--- a/htdocs/main.inc.php3
+++ b/htdocs/main.inc.php3
@@ -86,8 +86,10 @@ function top_menu($head) {
 
   print '<TD width="15%" class="menu" align="center">-</TD>';
   print '<TD width="15%" class="menu" align="center">';
-  print '<a class="menu" href="'.$conf->webcal->url.'">Calendrier</a>';
-  print '</TD>';
+  if ($conf->webcal->enabled) {
+    print '<a class="menu" href="'.$conf->webcal->url.'">Calendrier</a>';
+  };
+  print '&nbsp;</TD>';
   print '<TD width="15%" class="menu" align="center">-</TD>';
 
   print '<TD width="10%" class="menu" align="center">'.$user->code.'</td>';
diff --git a/mysql/tables/Makefile b/mysql/tables/Makefile
index bfef6a782b4..22c42f3d3cb 100644
--- a/mysql/tables/Makefile
+++ b/mysql/tables/Makefile
@@ -49,8 +49,11 @@ create:
 	$(MYSQL) $(BASE) < llx_propaldet.sql
 	$(MYSQL) $(BASE) < llx_service.sql
 	$(MYSQL) $(BASE) < llx_soc_recontact.sql
+	$(MYSQL) $(BASE) < llx_train.sql
 	$(MYSQL) $(BASE) < llx_user.sql
 	$(MYSQL) $(BASE) < llx_ventes.sql
+	$(MYSQL) $(BASE) < llx_voyage.sql
+	$(MYSQL) $(BASE) < llx_voyage_reduc.sql
 	$(MYSQL) $(BASE) < societe.sql
 	$(MYSQL) $(BASE) < socpeople.sql
 	$(MYSQL) $(BASE) < socstatutlog.sql
-- 
GitLab