Synchro

doc/install/Makefile

@@ -33,7 +33,7 @@ all: $(DOC).pdf $(DOC).html $(DOC).txt
 	linuxdoc --language=french --backend=latex -o pdf -c latin dolibarr-install.sgml
 
 %.html: %.sgml
-	linuxdoc --language=french --backend=html -c latin dolibarr-install.sgml
+	cd ../../htdocs/install/doc/ ; linuxdoc --language=french --backend=html -c latin ../../../doc/install/dolibarr-install.sgml
 
 put:
 	$(RSYNC) $(ROPT) $(RSSH) *pdf *html www.dolibarr.com:/home/www/www.dolibarr.com/htdocs/documentation

doc/install/dolibarr-install.txt

@@ -1,6 +1,6 @@
   Dolibarr Installation
   Rodolphe Quiédeville
-  $Id: dolibarr-install.sgml,v 1.8 2003/10/24 10:59:15
+  $Id: dolibarr-install.sgml,v 1.10 2003/10/28 12:45:55
   rodolphe Exp $
 
   Installation et mise à jour de Dolibarr

htdocs/admin/update/pre.inc.php

@@ -18,7 +18,7 @@
  * $Id$
  * $Source$
  */
-require("../main.inc.php");
+require("../../main.inc.php");
 
 function llxHeader($head = "", $urlp = "") {
   global $user, $conf;

htdocs/contact/perso.php

@@ -23,60 +23,10 @@ require("./pre.inc.php");
 require("../contact.class.php");
 require (DOL_DOCUMENT_ROOT."/lib/vcard/vcard.class.php");
 
-if ($HTTP_POST_VARS["action"] == 'add') 
-{
-  $contact = new Contact($db);
-
-  $contact->socid        = $HTTP_POST_VARS["socid"];
-
-  $contact->name         = $HTTP_POST_VARS["name"];
-  $contact->firstname    = $HTTP_POST_VARS["firstname"];
-
-  $contact->poste        = $HTTP_POST_VARS["poste"];
-
-  $contact->fax          = $HTTP_POST_VARS["fax"];
-  $contact->note         = $HTTP_POST_VARS["note"];
-  $contact->email        = $HTTP_POST_VARS["email"];
-  $contact->phone_pro    = $HTTP_POST_VARS["phone_pro"];
-  $contact->phone_perso  = $HTTP_POST_VARS["phone_perso"];
-  $contact->phone_mobile = $HTTP_POST_VARS["phone_mobile"];  
-  $contact->jabberid     = $HTTP_POST_VARS["jabberid"];
-
-  $_GET["id"] =  $contact->create($user);
-}
-
-if ($_GET["action"] == 'delete') 
-{
-  $contact = new Contact($db);
-
-  $contact->old_name      = $HTTP_POST_VARS["old_name"];
-  $contact->old_firstname = $HTTP_POST_VARS["old_firstname"];
-
-  $result = $contact->delete($_GET["id"]);
-
-  Header("Location: index.php");
-}
-
-
 if ($action == 'update') 
 {
   $contact = new Contact($db);
 
-  $contact->old_name      = $HTTP_POST_VARS["old_name"];
-  $contact->old_firstname = $HTTP_POST_VARS["old_firstname"];
-
-  $contact->name          = $HTTP_POST_VARS["name"];
-  $contact->firstname     = $HTTP_POST_VARS["firstname"];
-  $contact->poste         = $HTTP_POST_VARS["poste"];
-
-  $contact->phone_pro     = $HTTP_POST_VARS["phone_pro"];
-  $contact->phone_perso   = $HTTP_POST_VARS["phone_perso"];
-  $contact->phone_mobile  = $HTTP_POST_VARS["phone_mobile"];
-  $contact->fax           = $HTTP_POST_VARS["fax"];
-  $contact->note          = $HTTP_POST_VARS["note"];
-  $contact->email         = $HTTP_POST_VARS["email"];
-  $contact->jabberid      = $HTTP_POST_VARS["jabberid"];
-
   $contact->birthday = mktime(12, 1 , 1, 
 			      $HTTP_POST_VARS["remonth"], 
 			      $HTTP_POST_VARS["reday"], 
@@ -84,20 +34,10 @@ if ($action == 'update')
 
   $contact->birthday_alert = $HTTP_POST_VARS["birthday_alert"];
 
-  $result = $contact->update($HTTP_POST_VARS["contactid"], $user);
+  $result = $contact->update_perso($HTTP_POST_VARS["contactid"], $user);
 
 }
 
-if ($action == 'create_user') 
-{
-  $nuser = new User($db);
-  $contact = new Contact($db);
-  $nuser->nom = $contact->nom;
-  $nuser->prenom = $contact->prenom;
-  $result = $contact->fetch($contactid);
-  $nuser->create_from_contact($contact);
-}
-
 /*
  *
  *
@@ -137,7 +77,7 @@ if ($_GET["action"] == 'edit')
 
   print '<tr><td>Date de naissance</td><td>';
   $html = new Form($db);
-  print $html->select_date();
+  print $html->select_date('','re',0,0,1);
   print '</td><td>Alerte : ';
   if ($contact->birthday_alert)
     {
@@ -148,9 +88,10 @@ if ($_GET["action"] == 'edit')
       print '<input type="checkbox" name="birthday_alert"></td></tr>';
     }
 
-  print '<tr><td align="center" colspan="3"><input type="submit" value="Enregistrer"></td></tr>';
   print "</table>";
 
+  print '<div class="FicheSubmit"><input type="submit" value="Enregistrer">';
+
   print "</form>";
 }
 else
@@ -173,14 +114,6 @@ else
       print 'Société : '.$objsoc->nom.'<br>';
     }
 
-  print 'Nom : '.$contact->name.' '.$contact->firstname ."<br>";
-
-  if ($contact->poste)
-    print 'Poste : '.$contact->poste ."<br>";
-
-  if ($contact->email)
-    print 'Email : '.$contact->email ."<br>";
-
   if ($contact->birthday)
     print 'Date de naissance : '.strftime("%d %B %Y",$contact->birthday);
 

htdocs/install/etape1.php

@@ -199,10 +199,8 @@ if ($HTTP_POST_VARS["action"] == "set")
 	    }
 	  
 	  $db->close();	  
-	  
 	}
             
-      
       $conf = new Conf();
       $conf->db->host = $dolibarr_main_db_host;
       $conf->db->name = $dolibarr_main_db_name;

htdocs/theme/yellow/yellow.css

@@ -25,16 +25,6 @@ body {
 /*
  * Onglets
  */
-
-div.message {
-  background: #dee7ec;
-  padding: 0em 1.5em;
-  margin: 0em 0em 0em 0em;
-  border-top: 1px solid #8CACBB;
-  border-left: 1px solid #8CACBB;
-  border-right: 1px solid #8CACBB;
-}
-
 div.tabBar {
   background: #dcdcd3;
   padding: 0em 0.5em 0.5em;
@@ -60,6 +50,14 @@ div.FicheSubmit {
   text-align: center;
 }
 
+div.message {
+  background: #dee7ec;
+  padding: 0em 1.5em;
+  margin: 0em 0em 0em 0em;
+  border-top: 1px solid #8CACBB;
+  border-left: 1px solid #8CACBB;
+  border-right: 1px solid #8CACBB;
+}
 
 a.tab {
   background: white;
@@ -183,6 +181,30 @@ div.menus {
             border-left:   1px dashed #ccccb3;
             }
 
+
+a.leftmenu { 
+             font-weight: bold; 
+             color: #202020;
+             }
+
+a.leftsubmenu { 
+                font-weight: bold; 
+                font-size: 0.95em;
+                color: #202020;
+                margin: 1em 1em 1em 1em;
+                }
+
+div.leftmenu { 
+               background: #ccccb3; 
+               text-align: left;
+               border-right: 1px solid #000000;
+               border-bottom: 1px solid #000000;
+               margin: 1px 0em 0em 0em;
+               padding: 2px;
+               }
+
+
+
 .menu 
 { 
   background: #ccccb3; 

mysql/tables/llx_paiement_facture.sql

@@ -24,8 +24,9 @@ create table llx_paiement_facture
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_paiement     integer,
   fk_facture      integer,
-  amount          real default 0,
+  amount          real     default 0,
   
   key (fk_paiement),
   key (fk_facture)
+
 )type=innodb;