.

htdocs/comm/actioncomm.php3

@@ -40,10 +40,6 @@ $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-print "<A href=\"$PHP_SELF?page=$pageprev&begin=$begin&stcomm=$stcomm\">< Prev</A>\n| ";
-print " <A href=\"$PHP_SELF?page=$pagenext&begin=$begin&stcomm=$stcomm\">Next ></A>\n";
-
-
 $bc1="bgcolor=\"#90c090\"";
 $bc2="bgcolor=\"#b0e0b0\"";
 /*
@@ -86,14 +82,16 @@ if ($action=='create' && $actionid && $contactid) {
   print '<input type="hidden" name="socid" value="'.$socid.'">';
 
   print '<table width="100%" border="1" cellspacing="0" cellpadding="3">';
-  print '<tr><td width="10%">Action</td><td colspan="3" bgcolor="#e0e0e0"><b>'.$caction->libelle.'</td></tr>';
+  print '<tr><td width="10%">Action</td><td bgcolor="#e0e0e0"><b>'.$caction->libelle.'</td></tr>';
-  print '<tr><td width="10%">Société</td><td width="40%"bgcolor="#e0e0e0"><b>'.$societe->nom.'</td>';
+  print '<tr><td width="10%">Société</td><td width="40%"bgcolor="#e0e0e0"><b><a href="index.php3?socid='.$socid.'">'.$societe->nom.'</a></td></tr>';
-  print '<td width="10%">Contact</td><td width="40%"bgcolor="#e0e0e0"><b>'.$contact->fullname.'</td></tr>';
+  print '<tr><td width="10%">Contact</td><td width="40%"bgcolor="#e0e0e0"><b>'.$contact->fullname.'</td></tr>';
-  print '<tr><td>Auteur</td><td>'.$user->fullname.'</td>';
   print '<td>Date</td><td>'.strftime('%d %B %Y %H:%M',time()).'</td></tr>';
-  print '<tr><td valign="top">Commentaire</td><td colspan="3">';
+  print '<tr><td valign="top">Commentaire</td><td>';
   print '<textarea cols="60" rows="6" name="note"></textarea></td></tr>';
-  print '<tr><td colspan="4" align="center"><input type="submit"></td></tr>';
+
+  print '<tr><td width="10%">A recontacter le</td><td width="40%"bgcolor="#e0e0e0"><b>'.$contact->fullname.'</td></tr>';
+
+  print '<tr><td colspan="2" align="center"><input type="submit"></td></tr>';
 
   print '</form></table>';
   $limit = 10;

htdocs/comm/bookmark.php3

@@ -30,9 +30,7 @@ if ($sortfield == "") {
   $sortfield="idp";
 }
 
-$cr["t"] = "Cab. Recrut.";
+
-$cr["f"] = "-";
-$cr[""] = "????";
 
 $yn["t"] = "oui";
 $yn["f"] = "non";
@@ -57,9 +55,9 @@ $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-print "Bookmark<p>";
+print '<div class="titre">Bookmark</div>';
  
-$sql = "SELECT s.idp, s.nom, cabrecrut,".$db->pdate("b.dateb")." as dateb, s.c_nom,s.c_prenom, s.cjn,st.libelle as stcomm, b.rowid as bid, b.author";
+$sql = "SELECT s.idp, s.nom, ".$db->pdate("b.dateb")." as dateb, st.libelle as stcomm, b.rowid as bid, b.author";
 $sql .= " FROM societe as s, c_stcomm as st, llx_bookmark as b";
 $sql .= " WHERE b.fk_soc = s.idp AND s.fk_stcomm = st.id AND s.datea is not null";
 

htdocs/comm/index.php3

@@ -91,22 +91,7 @@ $offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-print "<DIV align=\"center\">";
 
-print "<A href=\"$PHP_SELF?page=$pageprev&begin=$begin&stcomm=$stcomm&sortfield=$sortfield&sortorder=$sortorder&aclasser=$aclasser&coord=$coord\">&lt;- Prev</A>\n| ";
-print "<A href=\"$PHP_SELF?page=$pageprev&stcomm=$stcomm&sortfield=$sortfield&sortorder=$sortorder&aclasser=$aclasser&coord=$coord\">*</A>\n| ";
-for ($i = 65 ; $i < 91; $i++) {
-  print "<A href=\"$PHP_SELF?begin=" . chr($i) . "&stcomm=$stcomm\" class=\"T3\">";
-  
-  if ($begin == chr($i) ) {
-    print  "<b>-&gt;" . chr($i) . "&lt;-</b>" ; 
-  } else {
-    print  chr($i)  ; 
-  }
-  print "</A> | ";
-}
-print " <A href=\"$PHP_SELF?page=$pagenext&begin=$begin&stcomm=$stcomm&sortfield=$sortfield&sortorder=$sortorder&aclasser=$aclasser&coord=$coord\">Next -></A>\n";
-print "</DIV><P>";
 /*
  * Recherche
  *
@@ -130,6 +115,7 @@ if ($mode == 'search') {
 
 
 /*
+ *
  * Mode fiche
  *
  *
@@ -158,52 +144,13 @@ if ($socid > 0) {
     if ($errmesg) {
       print "<b>$errmesg</b><br>";
     }
-    print "<form action=\"index.php3?socid=$objsoc->idp\" method=\"post\">";
-    print "<input type=\"hidden\" name=\"action\" value=\"stcomm\">";
-    print "<input type=\"hidden\" name=\"oldstcomm\" value=\"$objsoc->fk_stcomm\">";
-    
-    $sql = "SELECT st.id, st.libelle FROM c_stcomm as st ORDER BY id";
-    $result = $db->query($sql);
-    print "<select name=\"stcommid\">\n";
-    print "<option value=\"null\" SELECTED>\n";
-    if ($result) {
-      $num = $db->num_rows();
-      $i = 0 ;
-      while ($i < $num) {
-	$objse = $db->fetch_object( $i);
-	
-	print "<option value=\"$objse->id\"";
-	if ($objse->id == $objsoc->fk_stcomm) { print " SELECTED"; }
-	print ">$objse->libelle\n";
-	$i++;
-      }
-    }
-    print "</select>\n";
-    $sql = "SELECT st.id, st.libelle FROM c_actioncomm as st ORDER BY id";
-    $result = $db->query($sql);
-    print "<select name=\"actioncommid\">\n";
-    print "<option value=\"0\" SELECTED>\n";
-    if ($result) {
-      $num = $db->num_rows();
-      $i = 0 ;
-      while ($i < $num) {
-	$objse = $db->fetch_object($i);
-	
-	print "<option value=\"$objse->id\">$objse->libelle\n";
-	$i++;
-      }
-    }
-    print "</select>\n";
 
-    print "<input type=\"text\" name=\"dateaction\" size=\"16\" value=\"$dac\">";
-    print "<input type=\"submit\" value=\"Update\">";
-    print "</form>\n";
     /*
      *
      */
     print "<table width=\"100%\" border=\"0\" cellspacing=\"1\">\n";
 
-    print "<tr><td><big>N° $objsoc->idp - $objsoc->nom - [$objsoc->stcomm]</big></td>";
+    print "<tr><td><div class=\"titre\">Fiche client : $objsoc->nom</div></td>";
     print "<td bgcolor=\"#e0E0E0\" align=\"center\"><a href=\"bookmark.php3?socidp=$objsoc->idp&action=add\">[Bookmark]</a></td>";
     print "<td bgcolor=\"#e0E0E0\" align=\"center\"><a href=\"projet/fiche.php3?socidp=$objsoc->idp&action=create\">[Projet]</a></td>";
     print "<td bgcolor=\"#e0E0E0\" align=\"center\"><a href=\"addpropal.php3?socidp=$objsoc->idp&action=create\">[Propal]</a></td>";
@@ -610,6 +557,50 @@ if ($socid > 0) {
       /*
        *
        */
+
+    print "<form action=\"index.php3?socid=$objsoc->idp\" method=\"post\">";
+    print "<input type=\"hidden\" name=\"action\" value=\"stcomm\">";
+    print "<input type=\"hidden\" name=\"oldstcomm\" value=\"$objsoc->fk_stcomm\">";
+    
+    $sql = "SELECT st.id, st.libelle FROM c_stcomm as st ORDER BY id";
+    $result = $db->query($sql);
+    print "<select name=\"stcommid\">\n";
+    print "<option value=\"null\" SELECTED>\n";
+    if ($result) {
+      $num = $db->num_rows();
+      $i = 0 ;
+      while ($i < $num) {
+	$objse = $db->fetch_object( $i);
+	
+	print "<option value=\"$objse->id\"";
+	if ($objse->id == $objsoc->fk_stcomm) { print " SELECTED"; }
+	print ">$objse->libelle\n";
+	$i++;
+      }
+    }
+    print "</select>\n";
+    $sql = "SELECT st.id, st.libelle FROM c_actioncomm as st ORDER BY id";
+    $result = $db->query($sql);
+    print "<select name=\"actioncommid\">\n";
+    print "<option value=\"0\" SELECTED>\n";
+    if ($result) {
+      $num = $db->num_rows();
+      $i = 0 ;
+      while ($i < $num) {
+	$objse = $db->fetch_object($i);
+	
+	print "<option value=\"$objse->id\">$objse->libelle\n";
+	$i++;
+      }
+    }
+    print "</select>\n";
+
+    print "<input type=\"text\" name=\"dateaction\" size=\"16\" value=\"$dac\">";
+    print "<input type=\"submit\" value=\"Update\">";
+    print "</form>\n";
+
+
+
     }
   } else {
     print $db->error() . "<br>" . $sql;
@@ -621,6 +612,7 @@ if ($socid > 0) {
    *
    *
    */
+  print '<div class="titre">Liste des clients</div>';
 
   $bc[1]="bgcolor=\"#90c090\"";
   $bc[0]="bgcolor=\"#b0e0b0\"";

htdocs/comm/pre.inc.php3

@@ -22,22 +22,15 @@
 require("../main.inc.php3");
 
 function llxHeader($head = "", $urlp = "") {
-  global $PREFIX, $user, $conf;
+  global $user, $conf;
 
-  print "<HTML>\n<HEAD>$head\n</HEAD>\n";
-  ?>
-  <BODY BGCOLOR="#c0c0c0" TOPMARGIN="0" BOTTOMMARGIN="0" LEFTMARGIN="0" RIGHTMARGIN="0" MARGINHEIGHT="0" MARGINWIDTH="0">
-  <?PHP
 
-  print "<TABLE border=\"0\" width=\"100%\">\n";
+  /*
-  print "<TR bgcolor=\"".$GLOBALS["TOPBAR_BGCOLOR"]."\">";
+   *
-  
+   *
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\"><B>" . $GLOBALS["MAIN_TITLE"] . "</B></TD>";
+   */
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\"><A href=\"".$urlp."../tech/\">Technique</A></TD>";
+  top_menu($head);
-  print "<TD width=\"20%\" align=\"center\"><A href=\"".$urlp."../comm/\">Commercial</A></TD>";
+
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\"><A href=\"".$urlp."../compta/\">Compta</A></TD>";
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\"><A href=\"".$urlp."../stats/\">Stats</A></TD>";
-  print "</TR></TABLE>\n";
 
   print "<TABLE border=\"1\" width=\"100%\" cellpadding=\"0\">";
   print "<TR><TD valign=\"top\" align=\"right\">";
@@ -50,7 +43,7 @@ function llxHeader($head = "", $urlp = "") {
   print "</td></tr>";
   print "<tr><td valign=\"top\" align=\"right\">";
 
-  print "<CENTER><A href=\"".$urlp."index.php3\">Sociétés</A></CENTER>\n";
+  print "<CENTER><A href=\"".$urlp."index.php3\">Clients</A></CENTER>\n";
   print "<A href=\"".$urlp."../soc.php3?&action=create\">Nouvelle société</A><BR>\n";
   print "<A href=\"".$urlp."contact.php3\">Contacts</A><BR><br>\n";
   print "<A href=\"".$urlp."recontact.php3\">A Recontacter</A><BR>\n";

htdocs/comm/propal.class.php3

@@ -125,23 +125,24 @@ class Propal {
    *
    *
    */
-  Function fetch($db, $rowid) {
+  Function fetch($rowid) {
 
-    $sql = "SELECT ref,price,".$db->pdate(datep)."as dp FROM llx_propal WHERE rowid=$rowid;";
+    $sql = "SELECT ref,price,remise,".$this->db->pdate(datep)."as dp FROM llx_propal WHERE rowid=$rowid;";
 
-    if ($db->query($sql) ) {
+    if ($this->db->query($sql) ) {
-      if ($db->num_rows()) {
+      if ($this->db->num_rows()) {
-	$obj = $db->fetch_object(0);
+	$obj = $this->db->fetch_object(0);
 
 	$this->id = $rowid;
 	$this->datep = $obj->dp;
 	$this->ref = $obj->ref;
 	$this->price = $obj->price;
+	$this->remise = $obj->remise;
 	
-	$db->free();
+	$this->db->free();
       }
     } else {
-      print $db->error();
+      print $this->db->error();
     }    
   }
   /*
@@ -151,7 +152,7 @@ class Propal {
    */
   Function valid($userid) {
     $sql = "UPDATE llx_propal SET fk_statut = 1, date_valid=now(), fk_user_valid=$userid";
-    $sql .= " WHERE rowid = $this->id;";
+    $sql .= " WHERE rowid = $this->id AND fk_statut = 0 ;";
     
     if ($this->db->query($sql) ) {
       return 1;

htdocs/comm/propal.php3

@@ -34,15 +34,6 @@ require("./actioncomm.class.php3");
 
 llxHeader();
 
-print "<table width=\"100%\">";
-print "<tr><td>Propositions commerciales</td>";
-if ($socidp) {
-print "<td bgcolor=\"#e0e0e0\" align=\"center\">[<a href=\"addpropal.php3?socidp=$socidp&action=create\">Nouvelle Propal</a>]</td>";
-}
-print "<td align=\"right\"><a href=\"propal.php3\">Liste</a></td>";
-print "<td align=\"right\"><a href=\"/compta/prev.php3\">CA Prévisionnel</a></td>";
-print "<td align=\"right\"><a href=\"$PHP_SELF?viewstatut=2\">Propal Signées</a></td></tr>";
-print "</table>";
 
 $bc[0]="bgcolor=\"#90c090\"";
 $bc[1]="bgcolor=\"#b0e0b0\"";
@@ -91,22 +82,26 @@ if ($action == 'setstatut') {
   $propalid = 0;
   $brouillon = 1;
 }
-
+/*
+ *
+ * Mode fiche
+ *
+ *
+ */
 if ($propalid) {
-  if ($valid == 1) {
+  $propal = new Propal($db);
-    $sql = "SELECT p.fk_soc, p.fk_projet,p.price, p.ref,".$db->pdate("p.datep")." as dp";
+  $propal->fetch($propalid);
-    $sql .= " FROM llx_propal as p WHERE p.rowid = $propalid";
-    
-    if ( $db->query($sql) ) {
-      $obj = $db->fetch_object( 0 );
 
-      $propal = new Propal($db);
+
-      $propal->id = $propalid;
+  if ($valid == 1) {
-      $propal->valid($user->id);
+    $propal->valid($user->id);
-    } else {
-      print $db->error();
-    }
   }
+  /*
+   *
+   */
+  print "<table width=\"100%\">";
+  print "<tr><td><div class=\"titre\">Proposition commerciale : $propal->ref</div></td>";
+  print "</table>";
   /*
    *
    */
@@ -123,61 +118,52 @@ if ($propalid) {
             
       $color1 = "#e0e0e0";
 
-      print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">";
+      print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
 
-      print "<tr><td>Société</td><td colspan=\"4\"><a href=\"index.php3?socid=$obj->idp\">$obj->nom</a></td><td align=\"right\"><a href=\"propal.php3?socidp=$obj->idp\">Autres propales</a></td>";
+      print "<tr><td>Société</td><td><a href=\"index.php3?socid=$obj->idp\">$obj->nom</a></td><td align=\"right\"><a href=\"propal.php3?socidp=$obj->idp\">Autres propales</a></td>";
-      print "<td valign=\"top\" rowspan=\"8\">Note :<br>". nl2br($obj->note)."</td></tr>";
+      print "<td valign=\"top\" width=\"50%\" rowspan=\"8\">Note :<br>". nl2br($obj->note)."</td></tr>";
       //
+
+      print '<tr><td>date</td><td colspan="2">'.strftime("%A %d %B %Y",$obj->dp).'</td></tr>';
+
       if ($obj->fk_projet) {
 	$projet = new Project();
 	$projet->fetch($db,$obj->fk_projet); 
-	print '<tr><td>Projet</td><td colspan="5">';
+	print '<tr><td>Projet</td><td colspan="1">';
 	print '<a href="projet/fiche.php3?id='.$projet->id.'">';
 	print $projet->title.'</a></td></tr>';
       }
-      print "<tr><td>Destinataire</td><td colspan=\"5\">$obj->firstname $obj->name &lt;$obj->email&gt;</td></tr>";
+      print "<tr><td>Destinataire</td><td colspan=\"2\">$obj->firstname $obj->name &lt;$obj->email&gt;</td></tr>";
       /*
        *
        */
-      print "<tr><td>Numéro</td><td colspan=\"2\">$obj->ref</td>";
-      print "<td bgcolor=\"$color1\">Montant HT</td><td bgcolor=\"$color1\" align=\"right\">".price($obj->price)."</td>";
-      print "<td bgcolor=\"$color1\">euros</td></tr>";
-      /*
-       *
-       */
-      print "<tr><td>date</td><td colspan=\"2\" align=\"right\">".strftime("%A %d %B %Y",$obj->dp)."</td>\n";
-      print "<td bgcolor=\"$color1\">Remise</td><td bgcolor=\"$color1\" align=\"right\">".price($obj->remise)."</td>";
-      print "<td bgcolor=\"$color1\">euros</td></tr>";
 
+      print "<tr><td bgcolor=\"$color1\">Montant HT</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\">".price($obj->price)." euros</td></tr>";
+      /*
+       *
+       */
+
+      print "<tr><td bgcolor=\"$color1\">Remise</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\">".price($obj->remise)." euros</td></tr>";
+
+      /*
+       *
+       */
+
+      $totalht = $propal->price - $propal->remise ;
+
+      print "<tr><td bgcolor=\"$color1\">Total HT</td><td colspan=\"2\" bgcolor=\"$color1\" align=\"right\"><b>".price($totalht)."</b> euros</td></tr>";
       /*
        *
        */
       print '<tr><td>Auteur</td><td colspan="2">';
       $author = new User($db, $obj->fk_user_author);
       $author->fetch('');
-      print $author->fullname.'</td>';
+      print $author->fullname.'</td></tr>';
 
-      $totalht = $obj->price - $obj->remise ;
-
-      print "<td bgcolor=\"$color1\">Total HT</td><td bgcolor=\"$color1\" align=\"right\"><b>".price($totalht)."</b></td><td bgcolor=\"$color1\">euros ";
-      print "<small>soit ".francs($totalht)." francs</small></td></tr>";
       /*
        *
        */
-      print "<tr>";
+      print "<tr bgcolor=\"#f0f0f0\"><td>Statut :</td><td colspan=1 align=center><b>$obj->lst</b></td>";
-
-      print "<td colspan=3>&nbsp;</td>";
-      print "<td bgcolor=\"$color1\">TVA</td><td bgcolor=\"$color1\" align=\"right\">".price($obj->tva)."</td><td bgcolor=\"$color1\">euros</td></tr>";
-
-      print "</tr>";
-      print "<tr><td colspan=3>&nbsp;</td>";
-      print "<td bgcolor=\"$color1\">Total TTC</td><td bgcolor=\"$color1\" align=\"right\">".price($obj->total)."</td><td bgcolor=\"$color1\">euros ";
-      print "<small>soit ".francs($obj->total)." francs</small></td></tr>";
-      print "</tr>";
-      /*
-       *
-       */
-      print "<tr bgcolor=\"#f0f0f0\"><td>Statut :</td><td colspan=2 align=center><b>$obj->lst</b></td>";
       if ($obj->statut == 0) {
 	print "<td colspan=3 align=center>[<a href=\"$PHP_SELF?propalid=$propalid&valid=1\">Valider</a>]</td>";
       } elseif ($obj->statut == 1) {
@@ -462,24 +448,32 @@ if ($propalid) {
       print "Num rows = " . $db->num_rows();
       print "<p><b>$sql";
     }
+    /*
+     * Voir le suivi des actions
+     *
+     *
+     *
+     */
+    if ($suivi) {
+      $validor = new User($db, $obj->fk_user_valid);
+      $validor->fetch('');
+      $cloturor = new User($db, $obj->fk_user_cloture);
+      $cloturor->fetch('');
+      
+      print '<table cellspacing=0 border=1 cellpadding=3>';
+      print '<tr><td>&nbsp;</td><td>Nom</td><td>Date</td></tr>';
+      print '<tr><td>Création</td><td>'.$author->fullname.'</td>';
+      print '<td>'.$obj->datec.'</td></tr>';
 
-    $validor = new User($db, $obj->fk_user_valid);
+      print '<tr><td>Validation</td><td>'.$validor->fullname.'&nbsp;</td>';
-    $validor->fetch('');
+      print '<td>'.$obj->date_valid.'&nbsp;</td></tr>';
-    $cloturor = new User($db, $obj->fk_user_cloture);
+      
-    $cloturor->fetch('');
+      print '<tr><td>Cloture</td><td>'.$cloturor->fullname.'&nbsp;</td>';
-
+      print '<td>'.$obj->date_cloture.'&nbsp;</td></tr>';      
-    print '<table cellspacing=0 border=1 cellpadding=3>';
+      print '</table>';
-    print '<tr><td>&nbsp;</td><td>Nom</td><td>Date</td></tr>';
+    } else {
-    print '<tr><td>Création</td><td>'.$author->fullname.'</td>';
+      print '<p><a href="'.$PHP_SELF.'?propalid='.$propal->id.'&suivi=1">Voir le suivi des actions </a>';
-    print '<td>'.$obj->datec.'</td></tr>';
+    }
-
-    print '<tr><td>Validation</td><td>'.$validor->fullname.'&nbsp;</td>';
-    print '<td>'.$obj->date_valid.'&nbsp;</td></tr>';
-
-    print '<tr><td>Cloture</td><td>'.$cloturor->fullname.'&nbsp;</td>';
-    print '<td>'.$obj->date_cloture.'&nbsp;</td></tr>';
-
-    print '</table>';
 
   } else {
     print $db->error();
@@ -496,12 +490,14 @@ if ($propalid) {
   /*
    *
    *
-   * Liste des propales
+   * Mode Liste des propales
    *
    * 
    */
+  print "<table width=\"100%\">";
+  print "<tr><td><div class=\"titre\">Propositions commerciales</div></td>";
+  print "</table>";
 
-  print "<P>";
   $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price - p.remise as price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
   $sql .= " FROM societe as s, llx_propal as p, c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id";
 

htdocs/compta/casoc.php3

@@ -22,7 +22,7 @@
 require("./pre.inc.php3");
 
 llxHeader();
-print "Chiffres d'affaire par société";
+print '<div class="titre">Chiffre d\'affaire par société</div>';
 
 $bc[0]="bgcolor=\"#90c090\"";
 $bc[1]="bgcolor=\"#b0e0b0\"";

htdocs/compta/facture.php3

@@ -77,7 +77,7 @@ if ($facid > 0) {
   
   print "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
   print "<tr>";
-  print "<td><b>Facture $facid</b>&nbsp;[<a href=\"facture.php3?facid=$facid\">reload</a>]</td>";
+  print '<td><div class="titre">Facture : '.$obj->facnumber.'</div></td>';
   print "<td align=\"right\"><a href=\"index.php3?socidp=$obj->socidp\">Autres factures de $obj->socnom</a></td>\n";
   print "</tr>";
   print "<tr><td width=\"50%\">";
@@ -86,7 +86,7 @@ if ($facid > 0) {
    */
   print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
   print "<tr><td>Société</td><td colspan=\"2\"><b><a href=\"../comm/index.php3?socid=$obj->socidp\">$obj->socnom</a></b></td></tr>";
-  print "<tr><td>Numéro</td><td colspan=\"2\"><b>$obj->facnumber</b></td></tr>";
+
   print "<tr><td>date</td><td colspan=\"2\">".strftime("%A %d %B %Y",$obj->df)."</td></tr>\n";
   print "<tr><td>Auteur</td><td colspan=\"2\">$obj->author</td>";
   print "<tr><td>Statut</td><td align=\"center\" colspan=\"2\">$obj->statut</td>";

htdocs/compta/index.php3

@@ -22,7 +22,7 @@
 require("./pre.inc.php3");
 
 llxHeader();
-print "Factures émises";
+print '<div class="titre">Factures émises</div>';
 
 $bc[0]="bgcolor=\"#90c090\"";
 $bc[1]="bgcolor=\"#b0e0b0\"";

htdocs/compta/pre.inc.php3

@@ -24,19 +24,14 @@ require("../main.inc.php3");
 function llxHeader($head = "") {
   global $PREFIX, $user, $conf;
 
-  print "<HTML>\n<HEAD>$head\n</HEAD>\n";
-  ?>
-  <BODY BGCOLOR="#c0c0c0" TOPMARGIN="0" BOTTOMMARGIN="0" LEFTMARGIN="0" RIGHTMARGIN="0" MARGINHEIGHT="0" MARGINWIDTH="0">
-  <?PHP
 
-  print "<TABLE border=\"0\" width=\"100%\">\n";
+  /*
-  print "<TR bgcolor=\"".$GLOBALS["TOPBAR_BGCOLOR"]."\">";
+   *
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\"><B>" . $GLOBALS["MAIN_TITLE"] . "</B></TD>";
+   *
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\"><A href=\"../tech/\">Technique</A></TD>";
+   */
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\"><A href=\"../comm/\">Commercial</A></TD>";
+  top_menu($head);
-  print "<TD width=\"20%\" align=\"center\"><A href=\"../compta/\">Compta</A></TD>";
+
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\"><A href=\"../stats/\">Stats</A></TD>";
+
-  print "</TR></TABLE>\n";
 
   print "<TABLE border=\"1\" width=\"100%\">";
   print "<TR><TD valign=\"top\" align=\"right\">";

htdocs/fichinter/fiche.php3

@@ -0,0 +1,286 @@
+<?PHP
+/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ *
+ * $Id$
+ * $Source$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+require("./pre.inc.php3");
+
+require("./fichinter.class.php3");
+
+$db = new Db();
+
+$sql = "SELECT s.nom, s.idp, s.prefix_comm FROM societe as s WHERE s.idp = $socidp;";
+
+$result = $db->query($sql);
+if ($result) {
+  if ( $db->num_rows() ) {
+    $objsoc = $db->fetch_object(0);
+  }
+  $db->free();
+}
+$bc[0]="bgcolor=\"#90c090\"";
+$bc[1]="bgcolor=\"#b0e0b0\"";
+
+llxHeader();
+/*
+ * Traitements des actions
+ *
+ *
+ */
+
+if ($action == 'valid') {
+  $fichinter = new Fichinter($db);
+  $fichinter->id = $id;
+  $fichinter->valid($user->id);
+}
+
+if ($action == 'add') {
+  $fichinter = new Fichinter($db);
+
+  $fichinter->date = $db->idate(mktime(12, 1 , 1, $pmonth, $pday, $pyear));
+
+  $fichinter->projetidp = $projetidp;
+
+  $fichinter->author = $user->id;
+  $fichinter->note = $note;
+
+  $fichinter->ref = $ref;
+
+  $id = $fichinter->create();
+  
+  /*
+   *
+   *   Generation
+   *
+   */
+  if ($id) {
+    print "<hr><b>Génération du PDF</b><p>";
+
+    //$DBI = "dbi:mysql:dbname=lolixdev:host=espy:user=rodo";
+
+    $gljroot = "/home/www/dolibarr/dolibarr/htdocs";
+
+    $command = "export DBI_DSN=\"dbi:mysql:dbname=".$conf->db->name.":host=localhost\" ";
+    $command .= " ; ./propal-tex.pl --propal=".$id ." --pdf --output=".$conf->propal->outputdir;
+    $command .= " --templates=".$conf->propal->templatesdir;
+
+    $output = system($command);
+    print "<p>command : $command<br>";
+    print $output;
+  } else {
+    print $db->error();
+  }
+}
+/*
+ * Mode creation
+ * Creation d'une nouvelle propale
+ *
+ */
+if ($action == 'create') {
+  if ( $objsoc->prefix_comm ) {
+
+    $numpr = "FI-" . $objsoc->prefix_comm . "-" . strftime("%y%m%d", time());
+
+    $sql = "SELECT count(*) FROM llx_propal WHERE ref like '$numpr%'";
+
+    if ( $db->query($sql) ) {
+      $num = $db->result(0, 0);
+      $db->free();
+      if ($num > 0) {
+	$numpr .= "." . ($num + 1);
+      }
+    }
+    
+    print "<form action=\"$PHP_SELF?socidp=$socidp\" method=\"post\">";
+
+    $strmonth[1] = "Janvier";
+    $strmonth[2] = "F&eacute;vrier";
+    $strmonth[3] = "Mars";
+    $strmonth[4] = "Avril";
+    $strmonth[5] = "Mai";
+    $strmonth[6] = "Juin";
+    $strmonth[7] = "Juillet";
+    $strmonth[8] = "Ao&ucirc;t";
+    $strmonth[9] = "Septembre";
+    $strmonth[10] = "Octobre";
+    $strmonth[11] = "Novembre";
+    $strmonth[12] = "D&eacute;cembre";
+    
+    $smonth = 1;
+    $syear = date("Y", time());
+    print '<table border="1" cellspadding="3" cellspacing="0" width="100%">';
+    print "<tr><td>Date</td><td>";
+    $cday = date("d", time());
+    print "<select name=\"pday\">";    
+    for ($day = 1 ; $day < $sday + 32 ; $day++) {
+      if ($day == $cday) {
+	print "<option value=\"$day\" SELECTED>$day";
+      } else {
+	print "<option value=\"$day\">$day";
+      }
+    }
+    print "</select>";
+    $cmonth = date("n", time());
+    print "<select name=\"pmonth\">";    
+    for ($month = $smonth ; $month < $smonth + 12 ; $month++) {
+      if ($month == $cmonth) {
+	print "<option value=\"$month\" SELECTED>" . $strmonth[$month];
+      } else {
+	print "<option value=\"$month\">" . $strmonth[$month];
+      }
+    }
+    print "</select>";
+    
+    print "<select name=\"pyear\">";
+    
+    for ($year = $syear ; $year < $syear + 5 ; $year++) {
+      print "<option value=\"$year\">$year";
+    }
+    print "</select></td></tr>";
+    
+    print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+
+    print "<tr><td>Numéro</td><td><input name=\"ref\" value=\"$numpr\"></td></tr>\n";
+
+    /*
+     *
+     * Projet associé
+     *
+     */
+    print '<tr><td valign="top">Projet</td><td><select name="projetidp">';
+    print '<option value="0"></option>';
+
+    $sql = "SELECT p.rowid, p.title FROM llx_projet as p WHERE p.fk_soc = $socidp";
+    
+    if ( $db->query($sql) ) {
+      $i = 0 ;
+      $numprojet = $db->num_rows();
+      while ($i < $numprojet) {
+	$projet = $db->fetch_object($i);
+	print "<option value=\"$projet->rowid\">$projet->title</option>";
+	$i++;
+      }
+      $db->free();
+    } else {
+      print $db->error();
+    }
+    print '</select>';
+    if ($numprojet==0) {
+      print 'Cette société n\'a pas de projet.&nbsp;';
+      print '<a href=projet/fiche.php3?socidp='.$socidp.'&action=create>Créer un projet</a>';
+    }
+    print '</td></tr>';
+
+
+    print '<tr><td valign="top">Commentaires</td>';
+    print "<td><textarea name=\"note\" wrap=\"soft\" cols=\"60\" rows=\"15\"></textarea>";
+    print '</td></tr>';
+
+    print '<tr><td colspan="2" align="center">';
+    print "<input type=\"submit\" value=\"Enregistrer\">";
+    print '</td></tr>';
+    print "</table>";  
+    
+    print "</form>";
+    
+    print "<hr noshade>";
+  } else {
+    print "Vous devez d'abord associer un prefixe commercial a cette societe" ;
+  }
+}
+/*
+ * Mode Fiche 
+ * Affichage de la fiche d'intervention
+ *
+ *
+ */
+
+if ($id) {
+
+  $fichinter = new Fichinter($db);
+  $fichinter->fetch($id);
+
+  print '<table border="1" cellspadding="3" cellspacing="0" width="100%">';
+  print '<tr><td width="20%">Date</td><td>'.strftime("%A %d %B %Y",$fichinter->date).'</td></tr>';
+    
+  print '<tr><td>Numéro</td><td>'.$fichinter->ref.'</td></tr>';
+
+  print '<tr><td valign="top">Projet</td><td>&nbsp;</td></tr>';
+
+
+  print '<tr><td valign="top">Commentaires</td>';
+  print "<td>";
+  print nl2br($fichinter->note);
+  print '</td></tr>';
+
+  if ($fichinter->statut == 0) {
+
+    print '<tr><td valign="top">Action</td><td><a href="fiche.php3?id='.$id.'&action=valid">Valider</a></td></tr>';
+
+  }
+
+  print "</table>";  
+    
+}
+
+/*
+ *
+ * Liste des fiches
+ *
+ */
+$sql = "SELECT s.nom,s.idp, f.ref,".$db->pdate("f.datei")." as dp, f.rowid as fichid, f.fk_statut";
+$sql .= " FROM societe as s, llx_fichinter as f ";
+$sql .= " WHERE f.fk_soc = s.idp ";
+$sql .= " ORDER BY f.datei DESC ;";
+
+if ( $db->query($sql) ) {
+  $num = $db->num_rows();
+  $i = 0;
+  print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
+  print "<TR bgcolor=\"orange\">";
+  print "<TD>Num</TD>";
+  print "<TD><a href=\"$PHP_SELF?sortfield=lower(p.label)&sortorder=ASC\">Societe</a></td>";
+  print "<TD>Date</TD>";
+  print "<TD>Statut</TD>";
+  print "</TR>\n";
+  $var=True;
+  while ($i < $num) {
+    $objp = $db->fetch_object( $i);
+    $var=!$var;
+    print "<TR $bc[$var]>";
+    print "<TD><a href=\"fiche.php3?id=$objp->fichid\">$objp->ref</a></TD>\n";
+    print "<TD><a href=\"../comm/index.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
+    print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n";
+    print "<TD>$objp->fk_statut</TD>\n";
+    
+    print "</TR>\n";
+    
+    $i++;
+  }
+
+  print "</TABLE>";
+  $db->free();
+} else {
+  print $db->error();
+  print "<p>$sql";
+}
+$db->close();
+llxFooter();
+?>

htdocs/fichinter/fichinter.class.php3

@@ -0,0 +1,112 @@
+<?PHP
+/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ *
+ * $Id$
+ * $Source$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+class Fichinter {
+  var $id;
+  var $db;
+  var $socidp;
+  var $author;
+  var $ref;
+  var $date;
+  var $note;
+
+
+  Function Fichinter($DB, $soc_idp="") {
+    $this->db = $DB ;
+    $this->socidp = $soc_idp;
+    $this->products = array();
+  }
+
+  Function add_product($idproduct) {
+    if ($idproduct > 0) {
+      $i = sizeof($this->products);
+      $this->products[$i] = $idproduct;
+    }
+  }
+  /*
+   *
+   *
+   *
+   */
+  Function create() {
+    /*
+     *  Insertion dans la base
+     */
+    $sql = "INSERT INTO llx_fichinter (fk_soc, datei, datec, ref, fk_user_author, note) ";
+    $sql .= " VALUES ($this->socidp, $this->date, now(), '$this->ref', $this->author, '$this->note')";
+    $sqlok = 0;
+      
+    if (! $this->db->query($sql) ) {
+
+      print $this->db->error() . '<b><br>'.$sql;
+    }
+    return 1;
+  }
+  /*
+   *
+   *
+   *
+   */
+  Function fetch($rowid) {
+
+    $sql = "SELECT ref,note,fk_statut,".$this->db->pdate(datei)."as di FROM llx_fichinter WHERE rowid=$rowid;";
+
+    if ($this->db->query($sql) ) {
+      if ($this->db->num_rows()) {
+	$obj = $this->db->fetch_object(0);
+
+	$this->id = $rowid;
+	$this->date = $obj->di;
+	$this->ref = $obj->ref;
+	$this->note = $obj->note;
+	$this->statut = $obj->fk_statut;
+
+	$this->db->free();
+      }
+    } else {
+      print $this->db->error();
+    }    
+  }
+  /*
+   *
+   *
+   *
+   */
+  Function valid($userid) {
+    $sql = "UPDATE llx_fichinter SET fk_statut = 1, date_valid=now(), fk_user_valid=$userid";
+    $sql .= " WHERE rowid = $this->id AND fk_statut = 0 ;";
+    
+    if ($this->db->query($sql) ) {
+      return 1;
+    } else {
+      print $this->db->error() . ' in ' . $sql;
+    }
+  }
+  /*
+   *
+   *
+   *
+   */
+
+}    
+?>
+    

htdocs/fichinter/index.php3

@@ -36,6 +36,8 @@ $bc[1]="bgcolor=\"#b0e0b0\"";
 $bc2[0]="bgcolor=\"#c9f000\"";
 $bc2[1]="bgcolor=\"#b9e000\"";
 
+print '<div class="titre">Liste des fiches d\'intervention</div><p>';
+
 $sql = "SELECT s.nom,s.idp, f.ref,".$db->pdate("f.datei")." as dp, f.rowid as fichid, f.fk_statut";
 $sql .= " FROM societe as s, llx_fichinter as f ";
 $sql .= " WHERE f.fk_soc = s.idp ";

htdocs/fichinter/pre.inc.php3

@@ -0,0 +1,111 @@
+<?PHP
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ *
+ * $Id$
+ * $Source$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+require("../main.inc.php3");
+
+function llxHeader($head = "", $urlp = "") {
+  global $user, $conf;
+
+
+  /*
+   *
+   *
+   */
+  top_menu($head);
+
+
+  print "<TABLE border=\"1\" width=\"100%\" cellpadding=\"0\">";
+  print "<TR><TD valign=\"top\" align=\"right\">";
+
+  print "<TABLE border=\"1\" cellspacing=\"0\" width=\"100%\" cellpadding=\"3\">";
+  print "<TR><TD valign=\"top\" align=\"right\">";
+  print "<center><b>" . $conf->db->name . " - " . $user->code ."</B></center>";
+  print "<A href=\"".$urlp."../\">Accueil</A><br>";
+  print "<A href=\"".$urlp."bookmark.php3\">Bookmark</A>";
+  print "</td></tr>";
+  print "<tr><td valign=\"top\" align=\"right\">";
+
+  print "<CENTER><A href=\"".$urlp."index.php3\">Clients</A></CENTER>\n";
+  print "<A href=\"".$urlp."../soc.php3?&action=create\">Nouvelle société</A><BR>\n";
+  print "<A href=\"".$urlp."contact.php3\">Contacts</A><BR><br>\n";
+  print "</TD></TR>";
+
+
+  print '<TR><TD valign="top" align="right" bgcolor="#e0e0e0">';
+  print "<center><A href=\"index.php3\">Fiches d'intervention</center></A>\n";
+  print '</td></tr>';
+
+  /*
+   *
+   */
+  print '<TR><TD valign="top" align="right">';
+  print '<div align="center"><A href="'.$urlp.'propal.php3">Propal</A></div>';
+  print "</TD></TR>";
+  /*
+   *
+   */
+  print "<TR><TD valign=\"top\" align=\"right\">";
+  print '<div align="center"><A href="'.$urlp.'../compta/">Factures</A></div>';
+  print "</TD></TR>";
+  /*
+   *
+   */
+
+  /*
+   *
+   */
+  print "<tr><td align=\"right\" valign=\"top\">";
+  print "<CENTER><A href=\"".$urlp."index.php3\">Societes</A></CENTER>\n";
+  print "<form action=\"index.php3\">";
+  print '<input type="hidden" name="mode" value="search">';
+  print '<input type="hidden" name="mode-search" value="soc">';
+  print '<input type="text" name="socname" size="8">&nbsp;';
+  print "<input type=\"submit\" value=\"go\">";
+  print "</form>";
+
+  print "<CENTER><A href=\"".$urlp."contact.php3\">Contacts</A></CENTER>\n";
+  print "<form action=\"".$urlp."contact.php3\">";
+  print '<input type="hidden" name="mode" value="search">';
+  print '<input type="hidden" name="mode-search" value="contact">';
+  print "<input type=\"text\" name=\"contactname\" size=\"8\">&nbsp;";
+  print "<input type=\"submit\" value=\"go\">";
+  print "</form>";
+
+
+  print "<form action=\"index.php3\">";
+  print "Soc : <input type=\"text\" name=\"socid\" size=\"5\">";
+  print "<input type=\"submit\" value=\"id\">";
+  print "</form>";
+  print "</td></tr>";
+
+  print "</table>";
+
+  print "</td>";
+
+
+  print "<TD valign=\"top\" width=\"85%\">\n";
+}
+
+/*
+ * $Id$
+ * $Source$
+ */
+?>

htdocs/fichinter/tex-fichinter.pl

@@ -0,0 +1,251 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2000-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+#
+# $Id$
+# $Source$
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# or see http://www.gnu.org/
+
+use strict;
+use POSIX;
+use DBI;
+use Sys::Syslog qw(:DEFAULT setlogsock);
+use Getopt::Long;
+ Getopt::Long::Configure("bundling");
+
+Sys::Syslog::setlogsock('unix');
+Sys::Syslog::openlog($0, 'pid', 'daemon');
+
+
+
+my($debug, $verbose, $bgcolor, $idpropal, $do_fax, $do_pdf, $do_ps, 
+   $templatesdir, $outputdir) = (0,0);
+
+exit unless GetOptions("propal=i"    =>\$idpropal,
+		       "fax"         =>\$do_fax,
+		       "templates=s" =>\$templatesdir,
+		       "output=s" =>\$outputdir,
+		       "ps"          =>\$do_ps,
+		       "pdf"         =>\$do_pdf,
+		       "v+"          =>\$verbose);
+
+Sys::Syslog::syslog('info', 'Start propale '.$idpropal);
+Sys::Syslog::syslog('info', '['.$idpropal.'] Start');
+my $DEBUG = 1;
+
+my $mdir = "$outputdir";
+unless (-d $mdir) {
+    mkdir($mdir,0777) || die "cannot mkdir " . $mdir . ": $!";
+}
+print "Output in : $outputdir\n" if $verbose > 1;
+#
+#
+# Fetch datas
+#
+Sys::Syslog::syslog('info', '['.$idpropal.'] Fetch data');
+my ($numpropale, $societe, $date, $ville, $destinataire, $price, $remise, $tva, $total);
+
+my $dbh = DBI->connect("","","") || die $DBI::errstr ;
+
+my $sql = "SELECT p.rowid, p.ref, s.nom, s.cp, s.ville, unix_timestamp(p.datep) as dp, c.name, c.firstname";
+$sql .= " ,p.price, p.remise, p.tva, p.total";
+$sql .= " FROM llx_propal as p, societe as s , socpeople as c";
+$sql .= " WHERE s.idp = p.fk_soc AND p.fk_soc_contact = c.idp AND p.rowid = $idpropal";
+
+my $sth = $dbh->prepare("$sql") || die $dbh->errstr ;
+if ( $sth->execute ) {
+
+    if (! $sth->rows ) {
+	$sth->finish;
+	$dbh->disconnect if $dbh;
+	print "\n" . $dbh->errstr;
+	print "\n$sql\n";
+	exit ;
+    }
+
+    while (my $hsr = $sth->fetchrow_hashref ) {
+	$numpropale    = $hsr->{"ref"};
+	$societe       = $hsr->{"nom"};
+	$destinataire  = $hsr->{"firstname"} . " " . $hsr->{"name"};
+	$date          = $hsr->{"dp"};
+	$ville         = $hsr->{"cp"} . " " . $hsr->{"ville"};
+
+	$price         = $hsr->{"price"};
+	$remise        = $hsr->{"remise"};
+	$tva           = $hsr->{"tva"};
+	$total         = $hsr->{"total"};
+    }
+    $sth->finish;
+} else {
+    die $dbh->errstr;
+}
+
+$outputdir .= "/".$numpropale;
+Sys::Syslog::syslog('info', '['.$idpropal.'] Outputdir : ' . $outputdir);
+unless (-d $outputdir) {
+    print "Make dir : $outputdir\n" if $verbose > 1;
+    mkdir($outputdir,0777) || die "cannot mkdir " . $outputdir . ": $!";
+}
+
+print "Output in : $outputdir\n" if $verbose > 1;
+
+my $adresse1 = "";
+my $adresse2 = "";
+
+#
+#
+#
+my $headerfilename = "$templatesdir/header.tex";
+my $footerfilename = "$templatesdir/footer.tex";
+my $bodyfilename = "$templatesdir/body.tex";
+
+unless (open (FC, ">$outputdir/$numpropale.tex") ) {
+    print "can't write in $outputdir/$numpropale.tex: $!";
+    Sys::Syslog::syslog('info', '['.$idpropal.'] ' . $outputdir/$numpropale.'.tex opened');
+    Sys::Syslog::syslog('info', '['.$idpropal.'] ' . $!);
+}
+#
+# Header
+#
+open (FH, "<$headerfilename") || die "can't open $headerfilename: $!";	
+while (<FH>)  {
+    s|\#SOCIETE\#|$societe|g;
+    s|\#DESTINATAIRE\#|$destinataire|g;
+    s|\#ADRESSE1\#|$adresse1|g;
+    s|\#ADRESSE2\#|$adresse2|g;
+    s|\#VILLE\#|$ville|g;
+
+    s|\#NUMPROPALE\#|$numpropale|g;
+    s|\#DATE\#|$date|g;
+
+    print FC $_;
+}
+close (FH);
+#
+# Body
+#
+my $totalht = 0;
+my ($qty, $ref, $pu, $pricep, $label);
+#
+my $sql = "SELECT p.price, pr.ref, pr.label, pr.description";
+$sql .= " FROM llx_propaldet as p, llx_product as pr WHERE p.fk_propal = $idpropal AND p.fk_product = pr.rowid";
+
+
+$sth = $dbh->prepare("$sql") || die $dbh->errstr ;
+if ( $sth->execute ) {
+    while (my $hsr = $sth->fetchrow_hashref ) {
+	$label = $hsr->{"label"};
+	$ref = $hsr->{"ref"};
+	$societe = $hsr->{"nom"};	
+	$qty = 1 ;
+	
+	$pu     = sprintf("%.2f", $hsr->{"price"});
+	$pricep = sprintf("%.2f", $hsr->{"price"});
+	
+	open (FH, "<$bodyfilename") || die "can't open $bodyfilename: $!";	
+	while (<FH>)  {
+	    s|\#LABEL\#|$hsr->{"description"}|g;
+	    s|\#QTY\#|$qty|g;
+	    s|\#REF\#|$ref|g;
+	    s|\#PU\#|$pu|g;
+	    s|\#PRICE\#|$pricep|g;
+	    print FC $_;
+	}
+	close (FH);
+    }
+    
+    $sth->finish;
+}
+#
+#
+#
+$totalht  = $price - $remise ;
+my $francsht  = $totalht * 6.55957;
+my $francsttc = $total * 6.55957;
+#
+# Footer
+#
+$price    = sprintf("%.2f", $price);
+$remise   = sprintf("%.2f", $remise);
+$totalht  = sprintf("%.2f", $totalht);
+$tva      = sprintf("%.2f", $tva);
+$total    = sprintf("%.2f", $total);
+
+$francsttc  = sprintf("%.2f", $francsttc);
+$francsht   = sprintf("%.2f", $francsht);
+
+
+$date = strftime("%d/%m/%Y", localtime($date));
+#
+open (FF, "<$footerfilename") || die "can't open $footerfilename: $!";	
+while (<FF>)  {
+    s|\#SOCIETE\#|$societe|g;
+
+    s|\#DATE\#|$date|g;
+    s|\#TOTALHT\#|$totalht|g;
+
+    s|\#FRANCSHT\#|$francsht|g;
+
+    s|\#REMISEHT\#|$remise|g;
+    s|\#TVA\#|$tva|g;
+    s|\#TOTALTTC\#|$total|g;
+
+    s|\#FRANCSTTC\#|$francsttc|g;
+	    
+    print FC $_;
+}
+close (FF);
+
+
+close (FC);
+
+$dbh->disconnect if $dbh;
+#
+#
+#
+print "Generate dvi file<br>\n";
+system("cd $outputdir/ ; latex $numpropale.tex "); 
+#
+#
+#
+if ($do_pdf) {
+    print "<p>Generate pdf file<br>\n";
+    system("cd $outputdir/ ; pdflatex $numpropale.tex > /dev/null");
+}
+#
+#
+#
+if ($do_ps) {
+    print "Generate ps file\n";
+    system("cd $outputdir/ ; dvips $numpropale.dvi -o $numpropale.ps > /dev/null");
+}
+#
+# $outputdir/$numpropale.tex
+#
+if ($do_fax) {
+    print "Generate fax file\n";
+    system("gs -q -sDEVICE=tiffg3 -dNOPAUSE -sOutputFile=$outputdir/$numpropale.%03d $outputdir/$numpropale.ps </dev/null");
+}
+Sys::Syslog::syslog('info', 'End propale '.$idpropal);
+Sys::Syslog::closelog();
+#
+#
+#
+
+#
+# export DBI_DSN="dbi:mysql:dbname=lolixfr:host=espy" ; ../scripts/propal-tex.pl 
+#

htdocs/index.php3

@@ -29,12 +29,6 @@ $bc[1]="bgcolor=\"#b0e0b0\"";
 
 print 'Utilisateur : ' . $user->prenom . ' ' . $user->nom .' ['.$user->code.']';
 
-print "<ul>";
-print "<li><A href=\"../comm/\">Commercial</A>";
-print "<li><A href=\"../compta/\">Compta</A>";
-print "</ul>";
-
-
 
 function valeur($sql) {
   global $db;
@@ -102,21 +96,6 @@ if ($db->ok) {
   print '</td><td valign="top">';
 
 
-  print '<A href="comm/index.php3">Societes</A>';
-  print '<form action="comm/index.php3">';
-  print '<input type="hidden" name="mode" value="search">';
-  print '<input type="hidden" name="mode-search" value="soc">';
-  print '<input type="text" name="socname" size="8">&nbsp;';
-  print "<input type=\"submit\" value=\"go\">";
-  print "</form>";
-
-  print '<A href="comm/contact.php3">Contacts</A>';
-  print '<form action="comm/contact.php3">';
-  print '<input type="hidden" name="mode" value="search">';
-  print '<input type="hidden" name="mode-search" value="contact">';
-  print "<input type=\"text\" name=\"contactname\" size=\"8\">&nbsp;";
-  print "<input type=\"submit\" value=\"go\">";
-  print '</form>';
 
   print '</td></tr>';
 

htdocs/lib/webcal.class.php3

@@ -27,7 +27,7 @@ class Webcal {
   }
 
 
-  Function add($user, $texte, $desc) {
+  Function add($user, $date, $texte, $desc) {
 
     $db = new Db();
 
@@ -35,7 +35,7 @@ class Webcal {
 
     $cal_id = $id;
     $cal_create_by = $user;
-    $cal_date = strftime('%Y%m%d');
+    $cal_date = strftime('%Y%m%d', $date);
     $cal_time  = -1;
     $cal_mod_date = strftime('%Y%m%d', time());
     $cal_mod_time = strftime('%H%M', time());

htdocs/main.inc.php3

@@ -28,9 +28,6 @@ require ($GLOBALS["DOCUMENT_ROOT"]."/lib/functions.inc.php3");
 require ($GLOBALS["DOCUMENT_ROOT"]."/user.class.php3");
 require ($GLOBALS["DOCUMENT_ROOT"]."/lib/product.class.php3");
 
-
-
-
 $conf = new Conf();
 
 
@@ -50,5 +47,40 @@ function llxFooter($foot='') {
   print "</BODY></HTML>";
 }
 
+function top_menu($head) {
+  global $user, $conf;
+
+  print "<HTML><HEAD>";
+  print $head;
+  print "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=iso-8859-1\">\n";
+  print '<LINK REL="stylesheet" TYPE="text/css" HREF="/dolibarr.css">';
+  print "</HEAD>\n";
+  
+  print '<BODY BGCOLOR="#c0c0c0" TOPMARGIN="0" BOTTOMMARGIN="0" LEFTMARGIN="0" RIGHTMARGIN="0" MARGINHEIGHT="0" MARGINWIDTH="0">';
+
+
+  print "<TABLE border=\"0\" width=\"100%\">\n";
+
+  print "<TR>";
+
+  print '<TD width="20%" class="menu">&nbsp;</td>';
+
+  print '<TD width="20%" class="menu" align="center">';
+  if ($user->comm > 0) {
+    print '<A href="../comm/">Commercial</A></TD>';
+  } else {
+    print 'Commercial';
+  }
+
+  print '<TD width="20%" class="menu" align="center">-</TD>';
+  print '<TD width="20%" class="menu" align="center"><A href="../compta/">Compta</A></TD>';
+  print '<TD width="20%" class="menu" align="center">-</TD>';
+  print '</TR>';
+
+  print '</TABLE>';
+
+
+
+}
 
 ?>

htdocs/pre.inc.php3

@@ -23,31 +23,14 @@
 require ("./main.inc.php3");
 
 function llxHeader($head = "") {
-  global $PREFIX, $user, $conf;
+  global $user, $conf;
 
-  print "<HTML>\n<HEAD>$head\n</HEAD>\n";
+  /*
-  ?>
+   *
-  <BODY BGCOLOR="#c0c0c0" TOPMARGIN="0" BOTTOMMARGIN="0" LEFTMARGIN="0" RIGHTMARGIN="0" MARGINHEIGHT="0" MARGINWIDTH="0">
+   *
-  <?PHP
+   */
-
+  top_menu($head);
-  print "<TABLE border=\"0\" width=\"100%\">\n";
+     
-  print "<TR bgcolor=\"".$GLOBALS["SYS_TOPBAR_BGCOLOR"]."\">";
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\"><B>" . $GLOBALS["MAIN_TITLE"] . "</B></TD>";
-
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\">-</TD>";
-
-  print '<TD width="20%" bgcolor="#e0e0e0" align="center">';
-  if ($user->comm > 0) {
-    print '<A href="../comm/">Commercial</A></TD>';
-  } else {
-    print 'Commercial';
-  }
-
-
-  
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\"><A href=\"../compta/\">Compta</A></TD>";
-  print "<TD width=\"20%\" bgcolor=\"#e0e0e0\" align=\"center\">-</TD>";
-  print "</TR></TABLE>\n";
 
   print "<TABLE border=\"1\" width=\"100%\">";
   print "<TR><TD valign=\"top\" align=\"right\">";
@@ -64,13 +47,21 @@ function llxHeader($head = "") {
   print '</td></tr>';
 
   print "<TR><TD valign=\"top\" align=\"right\">";
-  print "<center><A href=\"/comm/propal.php3\">Propal</A></center>\n";
+  print "<center><A href=\"/comm/propal.php3\">Propales</A></center>\n";
   print '</td></tr>';
 
   print "<TR><TD valign=\"top\" align=\"right\">";
   print "<center><A href=\"/compta/\">Factures</center></A>\n";
   print '</td></tr>';
 
+  if ($conf->fichinter) {
+
+    print "<TR><TD valign=\"top\" align=\"right\">";
+    print "<center><A href=\"/fichinter/\">Fiches d'intervention</center></A>\n";
+    print '</td></tr>';
+
+  }
+
   print "<TR><TD valign=\"top\" align=\"right\">";
   print "<center><A href=\"/product/\">Produits</center></A>\n";
 
@@ -82,6 +73,24 @@ function llxHeader($head = "") {
   print '<div align="center"><A href="user.php3">Utilisateurs</div></A>';
   print '</td></tr>';
 
+  print '<TR><TD valign="top" align="center">';
+
+  print '<A href="comm/index.php3">Societes</A>';
+  print '<form action="comm/index.php3">';
+  print '<input type="hidden" name="mode" value="search">';
+  print '<input type="hidden" name="mode-search" value="soc">';
+  print '<input type="text" name="socname" size="8">&nbsp;';
+  print "<input type=\"submit\" value=\"go\">";
+  print "</form>";
+
+  print '<A href="comm/contact.php3">Contacts</A>';
+  print '<form action="comm/contact.php3">';
+  print '<input type="hidden" name="mode" value="search">';
+  print '<input type="hidden" name="mode-search" value="contact">';
+  print "<input type=\"text\" name=\"contactname\" size=\"8\">&nbsp;";
+  print "<input type=\"submit\" value=\"go\">";
+  print '</form>';
+  print '</td></tr>';
 
   print "<TR><TD valign=\"top\" align=\"right\">";
   print "<A href=\"info.php3\">Configuration</A><br>";

htdocs/soc.php3

@@ -53,6 +53,11 @@ if ($action == 'update') {
   $soc = new Societe($db);
 
   $soc->nom = $nom;
+
+  $soc->adresse = $adresse;
+  $soc->cp = $cp;
+  $soc->ville = $ville;
+
   $soc->tel = $tel;
   $soc->fax = $fax;
   $soc->url = $url;
@@ -66,11 +71,11 @@ if ($action == 'update') {
  */
 
 if ($action == 'create') {
-  print 'Nouvelle societe<br>';
+  print '<div class="titre">Nouveau client</div><br>';
   print '<form action="soc.php3" method="post">';
   print '<input type="hidden" name="action" value="add">';
 
-  print '<table>';
+  print '<table border="1" cellpadding="3" cellspacing="0">';
   print '<tr><td>Nom</td><td><input type="text" name="nom"></td></tr>';
   print '<tr><td>Adresse</td><td><textarea name="adresse" cols="30" rows="3" wrap="soft"></textarea></td></tr>';
   print '<tr><td>CP</td><td><input size="6" type="text" name="cp">&nbsp;';
@@ -90,11 +95,11 @@ if ($action == 'create') {
 
   print '</td></tr>';
 
-  print '<tr><td colspan="2"><input type="submit"></td></tr>';
+  print '<tr><td colspan="2" align="center"><input type="submit" value="Ajouter"></td></tr>';
   print '</table>';
   print '</form>';
 } elseif ($action == 'edit') {
-  print 'Edition de la société<br>';
+  print '<div class="titre">Edition de la société</div><br>';
 
   $soc = new Societe($db);
   $soc->id = $socid;
@@ -103,7 +108,7 @@ if ($action == 'create') {
   print '<form action="soc.php3?socid='.$socid.'" method="post">';
   print '<input type="hidden" name="action" value="update">';
 
-  print '<table>';
+  print '<table border="1" cellpadding="3" cellspacing="0">';
   print '<tr><td>Nom</td><td><input type="text" name="nom" value="'.$soc->nom.'"></td></tr>';
   print '<tr><td>Adresse</td><td><textarea name="adresse" cols="30" rows="3" wrap="soft"></textarea></td></tr>';
   print '<tr><td>CP</td><td><input size="6" type="text" name="cp">&nbsp;';
@@ -111,7 +116,7 @@ if ($action == 'create') {
 
   print '<tr><td>Tel</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td></tr>';
   print '<tr><td>Fax</td><td><input type="text" name="fax" value="'.$soc->fax.'"></td></tr>';
-  print '<tr><td>Web</td><td><input type="text" name="url" value="'.$soc->url.'"></td></tr>';
+  print '<tr><td>Web</td><td>http://<input type="text" name="url" value="'.$soc->url.'"></td></tr>';
 
   print '<tr><td>Siren</td><td><input type="text" name="siren"></td></tr>';
 
@@ -140,7 +145,7 @@ if ($action == 'create') {
 
   print '<tr><td>Tel</td><td>'.$soc->tel.'</td></tr>';
   print '<tr><td>Fax</td><td>'.$soc->fax.'</td></tr>';
-  print '<tr><td>Web</td><td>'.$soc->url.'</td></tr>';
+  print '<tr><td>Web</td><td><a href="http://'.$soc->url.'">http://'.$soc->url.'</a></td></tr>';
 
   print '<tr><td>Siren</td><td><input type="text" name="siren"></td></tr>';
 

htdocs/societe.class.php3

@@ -27,10 +27,13 @@ class Societe {
 
   var $id;
   var $nom;
-
+  var $adresse;
+  var $cp;
+  var $ville;
   var $tel;
   var $fax;
   var $url;
+  var $siren;
 
   var $client;
 
@@ -65,6 +68,7 @@ class Societe {
 
     $sql = "UPDATE societe ";
     $sql .= " SET nom = '" . trim($this->nom) ."'";
+    $sql .= ",address = '" . trim($this->adresse) ."'";
     $sql .= ",cp = '" . trim($this->cp) ."'";
     $sql .= ",ville = '" . trim($this->ville) ."'";
     $sql .= ",tel = '" . trim($this->tel) ."'";
@@ -82,20 +86,18 @@ class Societe {
    */
   Function fetch() {
 
-    $sql = "SELECT s.idp, s.nom,".$this->db->pdate("s.datec")." as dc,".$this->db->pdate("s.datem")." as dm,".$this->db->pdate("s.datea")." as da, s.intern, s.cjn, ";
+    $sql = "SELECT s.idp, s.nom, s.address,".$this->db->pdate("s.datec")." as dc,";
 
-    $sql .= " s.c_nom, s.c_prenom, s.c_tel, s.c_mail, s.tel, s.fax, s.fplus, s.cjn, s.viewed, st.libelle as stcomm, s.fk_stcomm, s.url,s.cp,s.ville, s.note";
+    $sql .= " s.tel, s.fax, s.url,s.cp,s.ville, s.note, s.siren";
 
-    $sql .= " FROM societe as s, c_stcomm as st ";
+    $sql .= " FROM societe as s";
-    $sql .= " WHERE s.fk_stcomm = st.id";
+    $sql .= " WHERE s.idp = ".$this->id;
-  
-    $sql .= " AND s.idp = ".$this->id;
 
     $result = $this->db->query($sql);
 
     if ($result) {
       if ($this->db->num_rows()) {
-	$obj = $this->db->fetch_object($result , 0);
+	$obj = $this->db->fetch_object(0);
 
 	$this->nom = $obj->nom;
 
@@ -103,23 +105,16 @@ class Societe {
 	$this->fax = $obj->fax;
 
 	$this->url = $obj->url;
+	$this->adresse = $obj->address;
 	$this->cp = $obj->cp;
 	$this->ville = $obj->ville;
 
-
+	$this->siren = $obj->siren;
-	$this->cjn = $obj->cjn;
-
-	$this->viewed = $obj->viewed;
-
-	$this->stcomm = $obj->stcomm;
-
-	$this->c_nom = $obj->c_nom;
-	$this->c_prenom = $obj->c_prenom;
-	$this->c_tel = $obj->c_tel;
-	$this->c_fax = $obj->c_fax;
 
       }
       $this->db->free();
+    } else {
+      print $this->db->error();
     }
   }
   /*

mysql/data/data_dev.sql

@@ -30,14 +30,14 @@ insert into llx_user (name,firstname,code,login,pass,module_comm,module_compta)
 values ('demo','demo','demo','demo','demo',1,1);
 
 delete from societe;
-insert into societe (nom,datec,cp,ville,tel,fax, client)
+insert into societe (nom,datec,cp,ville,tel,fax, client, prefix_comm)
-values ('Lolix',now(),'75001','Paris','01 40 15 03 18','01 40 15 06 18',1);
+values ('Lolix',now(),'75001','Paris','01 40 15 03 18','01 40 15 06 18',1,'LO');
 
 insert into societe (nom,cp,ville,tel,fax,client)
 values ('Easter-Eggs','75013','Paris','01 55 55 03 18','01 55 55 55 55',1);
 
-insert into societe (nom,cp,ville,tel,fax,fournisseur)
+insert into societe (nom,cp,ville,tel,fax,fournisseur,prefix_comm)
-values ('JPG','75013','Paris','01 55 55 03 18','01 55 55 55 55',1);
+values ('JPG','75013','Paris','01 55 55 03 18','01 55 55 55 55',1,'JP');
 
 delete from llx_product;
 insert into llx_product (ref, label, description, price, duration)

mysql/tables/actioncomm.sql

@@ -4,6 +4,21 @@
 -- $Id$
 -- $Source$
 --
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- Actions commerciales
 --
 -- ========================================================================

mysql/tables/c_actioncomm.sql

@@ -1,6 +1,21 @@
 -- ========================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 
 create table c_actioncomm

mysql/tables/c_effectif.sql

@@ -1,6 +1,21 @@
 -- ========================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 
 create table c_effectif

mysql/tables/c_paiement.sql

@@ -1,6 +1,21 @@
 -- ========================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 create table c_paiement
 (

mysql/tables/c_pays.sql

@@ -1,6 +1,21 @@
 -- ========================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 
 create table c_pays

mysql/tables/c_propalst.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table c_propalst

mysql/tables/c_stcomm.sql

@@ -1,6 +1,21 @@
 -- ========================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 
 create table c_stcomm

mysql/tables/c_typent.sql

@@ -1,6 +1,21 @@
 -- ========================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 
 create table c_typent

mysql/tables/drop.sql

@@ -19,10 +19,6 @@
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
 
-drop table if exists abo_can;
-
-drop table if exists abo_soc;
-
 drop table if exists actioncomm;
 
 drop table if exists bots;
@@ -67,42 +63,10 @@ drop table if exists c_prestatype ;
 
 drop table if exists c_propalst ;
 
-drop table if exists c_quality;
-
-drop table if exists c_region ;
-
-drop table if exists c_secteur ;
-
-drop table if exists c_sex;
-
-drop table if exists c_situation ;
-
-drop table if exists c_stage_type;
-
 drop table if exists c_stcomm;
 
 drop table if exists c_typent ;
 
-drop table if exists c_skilltype ;
-
-drop table if exists candidat;
-
-drop table if exists communique;
-
-drop table if exists diplome ;
-
-drop table if exists expe;
-
-drop table if exists followbots;
-
-drop table if exists indy;
-
-drop table if exists known;
-
-drop table if exists lang ;
-
-drop table if exists langoffre ;
-
 drop table if exists llx_bank;
 
 drop table if exists llx_bank_account;
@@ -117,6 +81,8 @@ drop table if exists llx_fa_pr;
 
 drop table if exists llx_facture;
 
+drop table if exists llx_fichinter;
+
 drop table if exists llx_paiement;
 
 drop table if exists llx_pointmort;
@@ -211,11 +177,4 @@ drop table if exists statof ;
 
 drop table if exists statof_day;
 
-drop table if exists tchcontrib;
-
-drop table if exists tchcorres;
-
-drop table if exists tchsociete;
-
-drop table if exists savannah_projects;
 

mysql/tables/llx_bank.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 

mysql/tables/llx_bank_account.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_bank_account

mysql/tables/llx_bank_categ.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_bank_categ

mysql/tables/llx_bank_class.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_bank_class

mysql/tables/llx_bookmark.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 

mysql/tables/llx_fa_pr.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_fa_pr

mysql/tables/llx_facturedet.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_facturedet

mysql/tables/llx_paiement.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 

mysql/tables/llx_pointmort.sql

@@ -1,6 +1,21 @@
 -- ===================================================================
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_pointmort

mysql/tables/llx_product.sql

@@ -2,9 +2,6 @@
 -- $Id$
 -- $Source$
 --
--- $Id$
--- $Source$
---
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation; either version 2 of the License, or

mysql/tables/llx_propaldet.sql

@@ -1,6 +1,23 @@
 -- ===================================================================
+-- Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_propaldet

mysql/tables/llx_service.sql

@@ -1,6 +1,5 @@
 -- ===================================================================
--- $Id$
+-- Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- $Source$
 --
 -- $Id$
 -- $Source$

mysql/tables/llx_soc_recontact.sql

@@ -1,7 +1,23 @@
 -- ===================================================================
+-- Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
 -- $Id$
 -- $Source$
 --
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- Societes a recontacter
 --
 -- ===================================================================

mysql/tables/llx_ventes.sql

@@ -1,6 +1,23 @@
 -- ===================================================================
+-- Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ===================================================================
 
 create table llx_ventes

mysql/tables/soc_events.sql

@@ -1,6 +1,23 @@
 -- ========================================================================
+-- Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 
 create table soc_events

mysql/tables/socpeople.sql

@@ -1,8 +1,22 @@
 -- ============================================================================
 -- Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
 -- $Id$
 -- $Source$
 --
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
 -- ============================================================================
 create table socpeople

mysql/tables/socstatutlog.sql

@@ -1,7 +1,24 @@
 -- ========================================================================
+-- Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+--
 -- SGBD : PostgreSQL 6.5.3
 -- $Id$
 -- $Source$
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+--
 -- ========================================================================
 create table socstatutlog
 (