[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5644 - in phpcompta/trunk: . html include
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5644 - in phpcompta/trunk: . html include |
Date: |
Mon, 6 Jan 2014 02:54:44 +0100 (CET) |
Author: danydb
Date: 2014-01-06 02:54:44 +0100 (Mon, 06 Jan 2014)
New Revision: 5644
Modified:
phpcompta/trunk/
phpcompta/trunk/html/index.php
phpcompta/trunk/html/style-light.css
phpcompta/trunk/include/class_sendmail.php
phpcompta/trunk/include/constant.php
Log:
Merged revisions 5638-5642 via svnmerge from
svn+ssh://address@hidden/svn/phpcompta/tags/rel671
........
r5638 | danydb | 2013-12-30 16:32:36 +0100 (lun., 30 d?\195?\169c. 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
........
Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
- /phpcompta/tags/rel671:1-5636
+ /phpcompta/tags/rel671:1-5643
Modified: phpcompta/trunk/html/index.php
===================================================================
--- phpcompta/trunk/html/index.php 2014-01-06 01:54:15 UTC (rev 5643)
+++ phpcompta/trunk/html/index.php 2014-01-06 01:54:44 UTC (rev 5644)
@@ -189,7 +189,7 @@
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>
Modified: phpcompta/trunk/html/style-light.css
===================================================================
--- phpcompta/trunk/html/style-light.css 2014-01-06 01:54:15 UTC (rev
5643)
+++ phpcompta/trunk/html/style-light.css 2014-01-06 01:54:44 UTC (rev
5644)
@@ -962,16 +962,7 @@
}
-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;
Modified: phpcompta/trunk/include/class_sendmail.php
===================================================================
--- phpcompta/trunk/include/class_sendmail.php 2014-01-06 01:54:15 UTC (rev
5643)
+++ phpcompta/trunk/include/class_sendmail.php 2014-01-06 01:54:44 UTC (rev
5644)
@@ -120,6 +120,7 @@
$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 . "--";
Modified: phpcompta/trunk/include/constant.php
===================================================================
--- phpcompta/trunk/include/constant.php 2014-01-06 01:54:15 UTC (rev
5643)
+++ phpcompta/trunk/include/constant.php 2014-01-06 01:54:44 UTC (rev
5644)
@@ -181,6 +181,8 @@
/** -- 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');
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5644 - in phpcompta/trunk: . html include,
phpcompta-dev <=