From e11c827d1990eb16102c4938a0653ef5d8dd7fa7 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Fri, 13 Feb 2004 17:32:22 +0000 Subject: [PATCH] Synchro --- htdocs/compta/paiement/index.php | 91 +------------------------------- htdocs/contact/fiche.php | 24 +++++++-- htdocs/contact/vcard.php | 2 +- htdocs/expedition/pre.inc.php | 4 +- 4 files changed, 25 insertions(+), 96 deletions(-) diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php index 327c852eb29..482684e91cc 100644 --- a/htdocs/compta/paiement/index.php +++ b/htdocs/compta/paiement/index.php @@ -29,106 +29,17 @@ if ($user->societe_id > 0) exit; } -require("../../includes/modules/rapport/pdf_paiement.class.php"); - -$dir = DOL_DOCUMENT_ROOT."/document/rapport/"; - -if ($HTTP_POST_VARS["action"] == 'gen') -{ - $rap = new pdf_paiement($db); - $rap->write_pdf_file($dir, $HTTP_POST_VARS["remonth"], $HTTP_POST_VARS["reyear"]); - - $year = $HTTP_POST_VARS["reyear"]; -} - llxHeader(); - +print_titre("Paiements"); /* * * */ -print_titre("Rapport paiements"); -print '
'; -print ''; -$cmonth = date("n", time()); -$syear = date("Y", time()); - -$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"; -print '"; - -print '\n"; -print ''; -print '
'; -clearstatcache(); - -$handle=opendir($dir); - -while (($file = readdir($handle))!==false) -{ - if (is_dir($dir.$file) && substr($file, 0, 1) <> '.') - { - print ''.$file.' '; - } -} - -if ($year) -{ - $handle=opendir($dir.'/'.$year); - - print ''; - print ''; - while (($file = readdir($handle))!==false) - { - if (substr($file, 0, 8) == 'paiement') - { - $tfile = $dir . '/'.$year.'/'.$file; - print ''; - print ''; - print ''; - } - } - print '
RapportTailleDate de génération
'.$file.''.filesize($tfile). ' bytes'.strftime("%d %b %Y %H:%M:%S",filemtime($tfile)).'
'; -} $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 96bfefb3bb9..7b9d485ee3b 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -34,6 +34,10 @@ if ($HTTP_POST_VARS["action"] == 'add') $contact->poste = $HTTP_POST_VARS["poste"]; + $contact->address = $HTTP_POST_VARS["adresse"]; + $contact->cp = $HTTP_POST_VARS["cp"]; + $contact->ville = $HTTP_POST_VARS["ville"]; + $contact->fax = $HTTP_POST_VARS["fax"]; $contact->note = $HTTP_POST_VARS["note"]; $contact->email = $HTTP_POST_VARS["email"]; @@ -69,6 +73,10 @@ if ($action == 'update') $contact->firstname = $HTTP_POST_VARS["firstname"]; $contact->poste = $HTTP_POST_VARS["poste"]; + $contact->address = $HTTP_POST_VARS["adresse"]; + $contact->cp = $HTTP_POST_VARS["cp"]; + $contact->ville = $HTTP_POST_VARS["ville"]; + $contact->phone_pro = $HTTP_POST_VARS["phone_pro"]; $contact->phone_perso = $HTTP_POST_VARS["phone_perso"]; $contact->phone_mobile = $HTTP_POST_VARS["phone_mobile"]; @@ -104,8 +112,15 @@ print 'Informations personnel print 'VCard'; print 'Info'; print ''; -print '
'; +if ($mesg) +{ + print '
'.$mesg; + print '
'; +} + + +print '
'; if ($_GET["socid"] > 0) { @@ -140,7 +155,7 @@ if ($_GET["action"] == 'create') print 'Portable'; - print 'CP Ville '; + print 'CP Ville '; print 'Fax'; print 'Email'; @@ -189,8 +204,11 @@ elseif ($_GET["action"] == 'edit') print 'Jabberid'; print 'Note'; - print ''; print ""; + + print '
'; + + print ""; } else diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php index 71e4ca5b9a9..5ba57b315b2 100644 --- a/htdocs/contact/vcard.php +++ b/htdocs/contact/vcard.php @@ -49,7 +49,7 @@ $filename = $v->getFileName(); Header("Content-Disposition: attachment; filename=$filename"); Header("Content-Length: ".strlen($output)); -//Header("Connection: close"); +Header("Connection: close"); Header("Content-Type: text/x-vCard; name=$filename"); echo $output; diff --git a/htdocs/expedition/pre.inc.php b/htdocs/expedition/pre.inc.php index ad211274cdb..7aa80f8b12e 100644 --- a/htdocs/expedition/pre.inc.php +++ b/htdocs/expedition/pre.inc.php @@ -28,7 +28,7 @@ Rechercher une exp   '; -function llxHeader($head = "", $title="", $help_url='', $form_search='') +function llxHeader($head = "", $title="", $help_url='', $form_search='', $author='') { global $user, $conf, $form_search; @@ -47,6 +47,6 @@ function llxHeader($head = "", $title="", $help_url='', $form_search='') $menu->add(DOL_URL_ROOT."/expedition/stats/", "Statistiques"); - left_menu($menu->liste, $help_url, $form_search); + left_menu($menu->liste, $help_url, $form_search, $author); } ?>