diff --git a/INSTALL b/INSTALL index 02a802609ae..2eb4b265f77 100644 --- a/INSTALL +++ b/INSTALL @@ -7,6 +7,8 @@ Paquets Debian requis : - apache - libdbd-mysql-perl - libapache-mod-auth-mysql + - recode + - libtext-unaccent-perl Configuration : - dans le repertoire dolibarr/htdocs/conf recopier le fichier diff --git a/htdocs/comm/actioncomm.php3 b/htdocs/comm/actioncomm.php3 index 62145d8c495..4510f3142d8 100644 --- a/htdocs/comm/actioncomm.php3 +++ b/htdocs/comm/actioncomm.php3 @@ -82,6 +82,9 @@ if ($action=='create' && $actionid && $contactid) { print ''; print ''; + + print ''; + print ''; print ''; print ''; @@ -89,9 +92,17 @@ if ($action=='create' && $actionid && $contactid) { print ''; - print ''; + print ''; - print ''; + print ''; + + print ''; + + + print ''; print '
Action effectuée
Action'.$caction->libelle.'
Société'.$societe->nom.'
Contact'.$contact->fullname.'
Commentaire'; print '
A recontacter le'.$contact->fullname.'
Prochaine Action à faire
Date'; + print_date_select(); + print '
Commentaire'; + print '
'; $limit = 10; @@ -162,10 +173,10 @@ $sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.r $bc=$bc2; } print ""; - print "" .strftime("%d %b %Y %H:%M",$obj->da)."\n"; + print "" .strftime("%Y %b %d %H:%M",$obj->da)."\n"; print "socidp\">$obj->societe\n"; - print ''.nl2br($obj->note).''; + print ''.nl2br($obj->note).' '; print "\n"; print ""; @@ -181,61 +192,75 @@ $sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.r } else { + print '
Liste des actions commerciales effectuées
'; -$sql = "SELECT s.nom as societe, s.idp as socidp,a.id,".$db->pdate("a.datea")." as da, a.datea, c.libelle, u.code "; -$sql .= " FROM actioncomm as a, c_actioncomm as c, societe as s, llx_user as u"; -$sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid"; - -if ($type) { - $sql .= " AND c.id = $type"; -} - -$sql .= " ORDER BY $sortfield $sortorder "; -$sql .= $db->plimit( $limit, $offset); - - -if ( $db->query($sql) ) { - $num = $db->num_rows(); - $i = 0; - print "

"; - print ""; - print ''; - print ''; - print ''; - print ""; - print "\n"; - $var=True; - while ($i < $num) { - $obj = $db->fetch_object( $i); - - $var=!$var; - - if (!$var) { - $bc=$bc1; - } else { - $bc=$bc2; - } - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - - print ''; - print "\n"; - print "\n"; - print "\n"; - $i++; + $sql = "SELECT s.nom as societe, s.idp as socidp,a.id,".$db->pdate("a.datea")." as da, a.datea, c.libelle, u.code "; + $sql .= " FROM actioncomm as a, c_actioncomm as c, societe as s, llx_user as u"; + $sql .= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid"; + + if ($type) { + $sql .= " AND c.id = $type"; } - print "
DateSocieteActionAuteur
" .strftime("%d",$obj->da)."" .strftime("%b",$obj->da)."" .strftime("%Y",$obj->da)."" .strftime("%H:%M",$obj->da)."socidp\">$obj->societe'.$obj->libelle.'$obj->code$obj->stcomm
"; - $db->free(); -} + + $sql .= " ORDER BY $sortfield $sortorder "; + $sql .= $db->plimit( $limit, $offset); + + + if ( $db->query($sql) ) { + $num = $db->num_rows(); + $i = 0; + print "

"; + print ""; + print ''; + print ''; + print ''; + print ""; + print "\n"; + $var=True; + while ($i < $num) { + $obj = $db->fetch_object( $i); + + $var=!$var; + + if (!$var) { + $bc=$bc1; + } else { + $bc=$bc2; + } + print ""; + if ($oldyear == strftime("%Y",$obj->da) ) { + print ''; + } else { + print "\n"; + $oldyear = strftime("%Y",$obj->da); + } + + if ($oldmonth == strftime("%Y%b",$obj->da) ) { + print ''; + } else { + print "\n"; + $oldmonth = strftime("%Y%b",$obj->da); + } + + print "\n"; + print "\n"; + print "\n"; + + print ''; + print "\n"; + print "\n"; + print "\n"; + $i++; + } + print "
DateSociétéActionAuteur
|" .strftime("%Y",$obj->da)."|" .strftime("%b",$obj->da)."" .strftime("%d",$obj->da)."" .strftime("%H:%M",$obj->da)."socidp\">$obj->societe'.$obj->libelle.'$obj->code$obj->stcomm
"; + $db->free(); + } + } $db->close(); -llxFooter(); +llxFooter("Dernière modification $Date$ révision $Revision$"); ?> diff --git a/htdocs/comm/index.php3 b/htdocs/comm/index.php3 index 2a82b2e6359..0bef4c0c060 100644 --- a/htdocs/comm/index.php3 +++ b/htdocs/comm/index.php3 @@ -424,7 +424,7 @@ if ($socid > 0) { print ""; print "$obj->poste "; print ''.$obj->phone.' '; - print "$obj->fax "; + print ''.$obj->fax.' '; print ''.$obj->email.' '; print "idp&action=editcontact&contactid=$obj->idp\">Modifier"; print "\n"; @@ -464,12 +464,28 @@ if ($socid > 0) { } else { print ""; } - print "". strftime("%d %b %Y %H:%M", $obj->da) .""; + + if ($oldyear == strftime("%Y",$obj->da) ) { + print '|'; + } else { + print "" .strftime("%Y",$obj->da)."\n"; + $oldyear = strftime("%Y",$obj->da); + } + + if ($oldmonth == strftime("%Y%b",$obj->da) ) { + print '|'; + } else { + print "" .strftime("%b",$obj->da)."\n"; + $oldmonth = strftime("%Y%b",$obj->da); + } + + print "" .strftime("%d",$obj->da)."\n"; + print "" .strftime("%H:%M",$obj->da)."\n"; if ($obj->propalrowid) { - print "propalrowid\">$obj->libelle"; + print ''.$obj->libelle.''; } else { - print "$obj->libelle"; + print ''.$obj->libelle.''; } /* * Contact pour cette action @@ -478,13 +494,13 @@ if ($socid > 0) { if ($obj->fk_contact) { $contact = new Contact($db); $contact->fetch($obj->fk_contact); - print ''.$contact->fullname.''; + print ''.$contact->fullname.''; } else { - print ' '; + print ' '; } /* */ - print ''.$obj->code.''; + print ''.$obj->code.''; print "\n"; $i++; $tag = !$tag; @@ -651,7 +667,7 @@ if ($socid > 0) { print "Societe"; print "Contact"; print "email"; - print "Statut  "; + print "Statut  "; print "\n"; $var=True; while ($i < $num) { @@ -666,7 +682,12 @@ if ($socid > 0) { print " \n"; print "$obj->stcomm\n"; print "$obj->prefix_comm \n"; - print "idp&action=create\">[Propal]\n"; + print "idp&action=create\">[Propal]\n"; + if ($conf->fichinter->enabled) { + print "idp&action=create\">[Fiche Inter]\n"; + } else { + print " \n"; + } print "\n"; $i++; } diff --git a/htdocs/comm/pre.inc.php3 b/htdocs/comm/pre.inc.php3 index b3851eb1d56..5a98f0174a5 100644 --- a/htdocs/comm/pre.inc.php3 +++ b/htdocs/comm/pre.inc.php3 @@ -41,22 +41,22 @@ function llxHeader($head = "", $urlp = "") { print "Accueil
"; print "Bookmark"; print ""; - print ""; - print "

Clients
\n"; + print ''; + print "
Clients
\n"; print "Nouvelle société
\n"; print "Contacts

\n"; print "A Recontacter
\n"; print ""; - print ""; + print ''; print "
Actions
\n"; print ""; /* * */ - print ''; + print ''; print '
Propal
'; print 'Brouillon
'; print 'Ouvertes'; @@ -64,26 +64,26 @@ function llxHeader($head = "", $urlp = "") { /* * */ - print ""; + print ''; print '
Factures
'; print ""; /* * */ - print ""; + print ''; print '
Produits
'; print '
Services
'; print ""; /* * */ - print ""; - print "Projets
\n"; + print ''; + print '
Projets
'; print ""; /* * */ - print ""; + print ''; print "
Societes
\n"; print "
"; print ''; diff --git a/htdocs/comm/propal.php3 b/htdocs/comm/propal.php3 index b353c147960..e77df81858a 100644 --- a/htdocs/comm/propal.php3 +++ b/htdocs/comm/propal.php3 @@ -163,14 +163,10 @@ if ($propalid) { /* * */ - print "Statut :$obj->lst"; - if ($obj->statut == 0) { - print "[Valider]"; - } elseif ($obj->statut == 1) { - print "[Changer]"; - } else { - print " "; - } + print "Statut :$obj->lst"; + + print ''; + print ""; @@ -270,7 +266,11 @@ if ($propalid) { if ($obj->statut == 0) { print "[Supprimer]"; } else { - print "-"; + if ($obj->statut == 1) { + print "[Cloturer]"; + } else { + print "-"; + } } if ($obj->statut == 2) { print "Emettre une facture"; @@ -460,6 +460,7 @@ if ($propalid) { $cloturor = new User($db, $obj->fk_user_cloture); $cloturor->fetch(''); + print 'Suivi des actions
'; print ''; print ''; print ''; diff --git a/htdocs/dolibarr.css b/htdocs/dolibarr.css index 652c3779a43..15d97d296c3 100644 --- a/htdocs/dolibarr.css +++ b/htdocs/dolibarr.css @@ -19,6 +19,11 @@ * */ + +TD.barre_select { background: #d9dcc2 } + +TD.barre { background: #e0e0e0 } + TD.menu { background: #d9dcc2; font-family: Helvetica, Verdana; font-size: 14px; font-weight: bold; color: #FFFFFF; text-decoration: none } DIV.titre { font-family: Helvetica, Verdana; font-size: 16px; font-weight: bold; color: #000000; text-decoration: none } \ No newline at end of file diff --git a/htdocs/fichinter/fiche.php3 b/htdocs/fichinter/fiche.php3 index cde5aa8afeb..5461887c5f2 100644 --- a/htdocs/fichinter/fiche.php3 +++ b/htdocs/fichinter/fiche.php3 @@ -64,12 +64,13 @@ if ($action == 'add') { $fichinter->ref = $ref; $id = $fichinter->create(); - - /* - * - * Generation - * - */ +} +/* + * + * Generation + * + */ +if ($action == 'generate') { if ($id) { print "
Génération du PDF

"; @@ -77,12 +78,15 @@ if ($action == 'add') { $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; + $command = 'export DBI_DSN="dbi:'.$conf->db->type.':dbname='.$conf->db->name.':host='.$conf->db->host.'"'; + + $command .= " ; ./tex-fichinter.pl --fichinter=".$id ; + $command .= " --pdf --ps"; + $command .= " --output=" .$conf->fichinter->outputdir; + $command .= " --templates=" .$conf->fichinter->templatesdir; $output = system($command); - print "

command : $command
"; + print "

command : $command
"; print $output; } else { print $db->error(); @@ -236,6 +240,24 @@ if ($id) { } + print '

'; + + + print ''; + print "
 NomDate
Création'.$author->fullname.'
ActionGénération du pdf
Documentsliste...'; + + $file = $conf->fichinter->outputdir . "/$fichinter->ref/$fichinter->ref.pdf"; + if (file_exists($file)) { + + print '
PDF : '.$fichinter->ref.'.pdf'; + } + $file = $conf->fichinter->outputdir . "/$fichinter->ref/$fichinter->ref.ps"; + if (file_exists($file)) { + + print '
PS : '.$fichinter->ref.'.ps
'; + } + + print '
"; } diff --git a/htdocs/fichinter/pre.inc.php3 b/htdocs/fichinter/pre.inc.php3 index 34e51c95ac8..c2846b6d6a2 100644 --- a/htdocs/fichinter/pre.inc.php3 +++ b/htdocs/fichinter/pre.inc.php3 @@ -43,7 +43,7 @@ function llxHeader($head = "", $urlp = "") { print ""; print ""; - print "
Clients
\n"; + print "
Clients
\n"; print "Nouvelle société
\n"; print "Contacts

\n"; print ""; diff --git a/htdocs/info.php3 b/htdocs/info.php3 index d9f97076769..75a1dfcf5e4 100644 --- a/htdocs/info.php3 +++ b/htdocs/info.php3 @@ -25,6 +25,7 @@ llxHeader(); print ''; print ''; +print ''; print ''; print ''; print ''; @@ -36,7 +37,12 @@ print ''; print ''; print ''; - +if ($conf->fichinter->enabled) { + print ''; + print ''; + print ''; + print ''; +} print '
Database
type' . $conf->db->type . '
host' . $conf->db->host . '
user' . $conf->db->user . ' 
pass' . $conf->db->pass . ' 
templates' . $conf->propal->templatesdir . '
output dir' . $conf->propal->outputdir . '
output url' . $conf->propal->outputurl . '
Fiche d\'intervention
templates' . $conf->fichinter->templatesdir . '
output dir' . $conf->fichinter->outputdir . '
output url' . $conf->fichinter->outputurl . '
'; diff --git a/htdocs/lib/functions.inc.php3 b/htdocs/lib/functions.inc.php3 index 1f44d4561e3..18126e2862a 100644 --- a/htdocs/lib/functions.inc.php3 +++ b/htdocs/lib/functions.inc.php3 @@ -25,6 +25,48 @@ * */ +function print_date_select() { + $strmonth[1] = "Janvier"; + $strmonth[2] = "Février"; + $strmonth[3] = "Mars"; + $strmonth[4] = "Avril"; + $strmonth[5] = "Mai"; + $strmonth[6] = "Juin"; + $strmonth[7] = "Juillet"; + $strmonth[8] = "Août"; + $strmonth[9] = "Septembre"; + $strmonth[10] = "Octobre"; + $strmonth[11] = "Novembre"; + $strmonth[12] = "Décembre"; + + $smonth = 1; + $syear = date("Y", time()); + + print ""; + $cmonth = date("n", time()); + print ""; + + print ""; + +} + function price($amount) { return number_format($amount, 2, '.', ' '); diff --git a/htdocs/lib/product.class.php3 b/htdocs/lib/product.class.php3 index 294f9e839ef..af753b2fb6d 100644 --- a/htdocs/lib/product.class.php3 +++ b/htdocs/lib/product.class.php3 @@ -51,6 +51,7 @@ class Product { $this->description = $result["description"]; $this->price = $result["price"]; } + $this->db->free(); return $result; } diff --git a/htdocs/main.inc.php3 b/htdocs/main.inc.php3 index 4ef2ba0f852..ef1c54135d5 100644 --- a/htdocs/main.inc.php3 +++ b/htdocs/main.inc.php3 @@ -53,7 +53,7 @@ function top_menu($head) { print ""; print $head; print "\n"; - print ''; + print ''; print "\n"; print ''; diff --git a/htdocs/pre.inc.php3 b/htdocs/pre.inc.php3 index a38010c3114..1c42e9b8b89 100644 --- a/htdocs/pre.inc.php3 +++ b/htdocs/pre.inc.php3 @@ -54,7 +54,7 @@ function llxHeader($head = "") { print "
Factures
\n"; print ''; - if ($conf->fichinter) { + if ($conf->fichinter->enabled) { print ""; print "
Fiches d'intervention
\n"; diff --git a/htdocs/product/fiche.php3 b/htdocs/product/fiche.php3 new file mode 100644 index 00000000000..0ae1d2a57b1 --- /dev/null +++ b/htdocs/product/fiche.php3 @@ -0,0 +1,83 @@ + + * + * $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"); + +llxHeader(); + +$db = new Db(); + +if ($action == 'update') { + + $sql = "UPDATE llx_product SET description='$desc' where rowid = $rowid"; + $db->query($sql); +} + +if ($id) { + + $product = new Product($db); + $result = $product->fetch($id); + + if ( $result ) { + + print '
Fiche produit : '.$product->ref.'
'; + + print "

"; + + print ""; + print "\n"; + print "\n"; + + print "\n"; + + print ""; + + } + print "
Référence$product->ref
Libellé$product->label
Prix$product->price
Description".nl2br($product->description)."
"; + + if ($action == 'edit') { + + + print "

\n"; + print ""; + print "
"; + print ""; + print ""; + + + + } + + +} else { + print "Error"; +} + + + + +$db->close(); + +llxFooter("Dernière modification $Date$ révision $Revision$"); +?> diff --git a/htdocs/product/index.php3 b/htdocs/product/index.php3 index 205b1d83c20..009ddcdebb8 100644 --- a/htdocs/product/index.php3 +++ b/htdocs/product/index.php3 @@ -51,50 +51,8 @@ $offset = $limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; -print "Liste

"; +print '

Liste des produits
'; -if ($rowid) { - - $sql = "SELECT p.rowid, p.label, p.price, p.description, p.duration,p.ref FROM llx_product as p"; - $sql .= " WHERE p.rowid = $rowid;"; - - - if ( $db->query($sql) ) { - $num = $db->num_rows(); - $i = 0; - print "

"; - print ""; - print ""; - print ""; - print "\n"; - $var=True; - if ( $num ) { - $objp = $db->fetch_object(0); - $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - - print ""; - $i++; - } - print "
RéfNom
rowid\">$objp->ref$objp->label
prix$objp->price
duree$objp->duration
desc".nl2br($objp->description)."
"; - $db->free(); - - print "

\n"; - print ""; - print "
"; - print ""; - print "
"; - } - - - -} else { $sql = "SELECT p.rowid, p.label, p.price, p.duration,p.ref FROM llx_product as p"; @@ -109,17 +67,15 @@ if ($rowid) { print "Réf"; print "Nom"; print "Prix"; - print "Durée"; print "\n"; $var=True; while ($i < $num) { $objp = $db->fetch_object( $i); $var=!$var; print ""; - print "rowid\">$objp->ref\n"; + print "rowid\">$objp->ref\n"; print "$objp->label\n"; print ''.price($objp->price).''; - print "$objp->duration\n"; print "\n"; $i++; } @@ -127,7 +83,7 @@ if ($rowid) { $db->free(); } -} + $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/product/pre.inc.php3 b/htdocs/product/pre.inc.php3 index 4dd4e5e3d9e..249fdb6e1fe 100644 --- a/htdocs/product/pre.inc.php3 +++ b/htdocs/product/pre.inc.php3 @@ -22,59 +22,55 @@ require("../main.inc.php3"); function llxHeader($head = "", $urlp = "") { - global $PREFIX, $user, $conf; + global $user, $conf; - print "\n$head\n\n"; - ?> - - \n"; - print ""; - - print "" . $GLOBALS["MAIN_TITLE"] . ""; - print "Technique"; - print "Commercial"; - print "Compta"; - print "Stats"; - print "\n"; print ""; print "
"; print ""; - print ""; - print ""; + print '"; - print ""; /* * */ - print ""; /* * */ - print ""; /* * */ - print "
"; + print '
'; print "
" . $conf->db->name . " - " . $user->code ."
"; print "Accueil
"; print "Bookmark"; print "
"; + print '
'; print "
Societe
\n"; print "Contact
\n"; print "
'; + print ""; + print "
"; + + print '
'; print "\n"; print "
"; + print '
'; print ''; print "
"; + print '
'; print ''; print "
"; + print '
'; print "
Societes
\n"; print "
"; print ''; diff --git a/htdocs/service/index.php3 b/htdocs/service/index.php3 index 8f8b83b4bae..d7832333767 100644 --- a/htdocs/service/index.php3 +++ b/htdocs/service/index.php3 @@ -23,9 +23,6 @@ require("./pre.inc.php3"); llxHeader(); -$bc[0]="bgcolor=\"#90c090\""; -$bc[1]="bgcolor=\"#b0e0b0\""; - $db = new Db(); if ($sortfield == "") { @@ -61,9 +58,9 @@ if ( $db->query($sql) ) { $i = 0; print "

"; print ""; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; print "\n"; $var=True; while ($i < $num) { diff --git a/htdocs/service/pre.inc.php3 b/htdocs/service/pre.inc.php3 index 66adfbffe2e..f4d371982c3 100644 --- a/htdocs/service/pre.inc.php3 +++ b/htdocs/service/pre.inc.php3 @@ -22,55 +22,47 @@ require("../main.inc.php3"); function llxHeader($head = "", $urlp = "") { - global $PREFIX, $user; + global $user, $conf; - print "\n$head\n\n"; - ?> - - \n"; - print ""; - - print ""; - print ""; - print ""; - print ""; - print ""; - print "
RéfNomPrixRéfNomPrix
" . $GLOBALS["MAIN_TITLE"] . "TechniqueCommercialComptaStats
\n"; print ""; print "
"; print ""; - print ""; - print ""; - print ""; /* * */ - print ""; - print ''; - print "
"; + print '
'; print "
" . $GLOBALS["dbname"] . " - " . $user->code ."
"; print "Accueil
"; print "Bookmark"; print "
"; + print '
'; print "
Societe
\n"; print "Contact
\n"; print "
"; + print '
'; print "\n"; print "
"; + print '
'; print "
Produits
\n"; print "
'; + print '
'; print '
'; print 'Nouveau service'; print '
"; + print '
'; print "
Societes
\n"; print ""; print ''; diff --git a/htdocs/soc.php3 b/htdocs/soc.php3 index f95e521a346..a3bb6a5b8fd 100644 --- a/htdocs/soc.php3 +++ b/htdocs/soc.php3 @@ -61,6 +61,7 @@ if ($action == 'update') { $soc->tel = $tel; $soc->fax = $fax; $soc->url = $url; + $soc->siren = $siren; $soc->update($socid); } @@ -110,15 +111,18 @@ if ($action == 'create') { print ''; print ''; - print ''; - print ''; + print ''; + + print ''; print ''; print ''; print ''; - print ''; + print ''; print '
Nom
Adresse
CP '; - print 'Ville 
Adresse
CP '; + print 'Ville 
Tel
Fax
Webhttp://
Siren
Siren
Type'; @@ -137,17 +141,16 @@ if ($action == 'create') { $soc->id = $socid; $soc->fetch(); print "[Editer]"; - print ''; + print '
'; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; print '
Nom'.$soc->nom.'
Adresse
CP '; - print 'Ville 
Adresse'.nl2br($soc->adresse).'
CP'.$soc->cp.' '.$soc->ville.'
Tel'.$soc->tel.'
Fax'.$soc->fax.'
Webhttp://'.$soc->url.'
Siren
Siren'.$soc->siren.'
Type'; diff --git a/htdocs/user.class.php3 b/htdocs/user.class.php3 index 77c8132c2ad..2e0a665e795 100644 --- a/htdocs/user.class.php3 +++ b/htdocs/user.class.php3 @@ -30,7 +30,7 @@ class User { var $prenom; var $code; var $email; - + var $admin; var $comm; var $compta; @@ -49,7 +49,7 @@ class User { Function fetch($login) { - $sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.module_comm, u.module_compta"; + $sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.module_comm, u.module_compta,webcal_login"; $sql .= " FROM llx_user as u"; if ($this->id) { @@ -69,7 +69,8 @@ class User { $this->prenom = $obj->firstname; $this->fullname = $this->prenom . ' ' . $this->nom; - + $this->admin = $obj->admin; + $this->webcal_login = $obj->webcal_login; $this->code = $obj->code; $this->email = $obj->email; diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 89e47584751..5e13667e92e 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -24,6 +24,7 @@ delete from c_actioncomm; insert into c_actioncomm (id,libelle) values ( 1, 'Appel Téléphonique'); +insert into c_actioncomm (id,libelle) values ( 2, 'Envoi Fax'); insert into c_actioncomm (id,libelle) values ( 3, 'Envoi propal par mail'); insert into c_actioncomm (id,libelle) values ( 4, 'Envoi d\'un email'); insert into c_actioncomm (id,libelle) values ( 9, 'Envoi Facture'); diff --git a/mysql/tables/llx_user.sql b/mysql/tables/llx_user.sql index c873b56e3cc..1667bcc82d8 100644 --- a/mysql/tables/llx_user.sql +++ b/mysql/tables/llx_user.sql @@ -31,6 +31,8 @@ create table llx_user firstname varchar(50), code varchar(4), email varchar(255), + admin smallint default 0, + webcal_login varchar(25), module_comm smallint default 1, module_compta smallint default 1, note text, diff --git a/templates/propal/default/footer.tex b/templates/propal/default/footer.tex index 19d3c1fa3e8..3a3483e1b1a 100644 --- a/templates/propal/default/footer.tex +++ b/templates/propal/default/footer.tex @@ -1,8 +1,22 @@ -% -% footer.tex +% Copyright (C) 2002 Rodolphe Quiedeville % % $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/ \multicolumn{1}{|c|}{} & & \multicolumn{1}{|c|}{} & \multicolumn{1}{|r|}{} & \multicolumn{1}{|r|}{} \\ \hline diff --git a/templates/propal/default/header.tex b/templates/propal/default/header.tex index f2712d45499..6efec70227f 100644 --- a/templates/propal/default/header.tex +++ b/templates/propal/default/header.tex @@ -1,8 +1,23 @@ -% -% header.tex +% Copyright (C) 2002 Rodolphe Quiedeville % % $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/ + \documentclass[a4paper]{article} \usepackage{fancyhdr, hhline} \usepackage[francais]{layout}