Merged revisions 5638-5642 via svnmerge from

svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel671

........
  r5638 | danydb | 2013-12-30 16:32:36 +0100 (lun., 30 déc. 2013) | 1 line
  
  version
........
  r5639 | danydb | 2014-01-04 16:34:00 +0100 (sam., 04 janv. 2014) | 1 line
  
  Bug in style.css
........
  r5640 | danydb | 2014-01-06 02:28:16 +0100 (lun., 06 janv. 2014) | 1 line
  
  missing eol
........
  r5641 | danydb | 2014-01-06 02:34:03 +0100 (lun., 06 janv. 2014) | 1 line
  
  missing eol
........
  r5642 | danydb | 2014-01-06 02:52:14 +0100 (lun., 06 janv. 2014) | 1 line
  
  update doc
........
This commit is contained in:
Dany De Bontridder 2014-01-06 01:54:44 +00:00
parent 4511c8fe86
commit 49ab24e159
4 changed files with 4 additions and 10 deletions

View file

@ -189,7 +189,7 @@ if ( strlen(domaine) > 0 )
echo '
<span style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
version 6.7 SVNINFO - '.$my_domain.'
version 6.7.1 SVNINFO - '.$my_domain.'
</span>
<BR>
<BR>

View file

@ -962,16 +962,7 @@ div.op_detail_title {
}
div#div_jrn{
position:absolute;
border:1px solid black;
top:15%;left:100;
visibility:hidden;
z-index:2;
width:50em;
background-color:#EDF3FF;
}
div#div_cat{
position:absolute;
border:1px solid black;

View file

@ -120,6 +120,7 @@ class Sendmail
$headers .= "Content-Type: " . $file->type . "; name=\"" . $file->filename . "\"" . $eol;
$headers .= "Content-Disposition: attachment; filename=\"" . $file->filename . "\"" . $eol;
$headers .= "Content-Transfer-Encoding: base64" . $eol;
$headers.=$eol;
$headers .= $content . $eol . $eol;
}
$headers .= "--" . $separator . "--";

View file

@ -181,6 +181,8 @@ define ("FICHE_TYPE_ACH_MAT",7);
/** -- pour utiliser unoconv démarrer un server libreoffice
* commande
* libreoffice --headless --accept="socket,host=127.0.0.1,port=2002;urp;" --nofirststartwizard
* ou
* unoconv -l -v -s localhost
*/
define ('OFFICE','unoconv ');
define ('GENERATE_PDF','YES');