[Phpcompta-dev] r4767 - in phpcompta/tags/rel600: doc include

[phpcompta-dev]

Author: danydb
Date: 2012-02-09 10:20:29 +0100 (Thu, 09 Feb 2012)
New Revision: 4767

Modified:
   phpcompta/tags/rel600/doc/
   phpcompta/tags/rel600/doc/manuel-fr.odt
   phpcompta/tags/rel600/doc/manuel-fr.pdf
   phpcompta/tags/rel600/include/class_document.php
Log:
Improve : generate document :add DATE_LIMIT_CALC to allow date formatting in 
calc


Property changes on: phpcompta/tags/rel600/doc
___________________________________________________________________
Name: svn:ignore
   - *.html
*.pdf
*.txt
.~lock.manuel-fr.odt#
.a.swp

   + *.html
*.pdf
*.txt
.~lock.manuel-fr.odt#
.a.swp
.~lock.manuel-fr.pdf#


Modified: phpcompta/tags/rel600/doc/manuel-fr.odt
===================================================================
(Binary files differ)

Modified: phpcompta/tags/rel600/doc/manuel-fr.pdf
===================================================================
(Binary files differ)

Modified: phpcompta/tags/rel600/include/class_document.php
===================================================================
--- phpcompta/tags/rel600/include/class_document.php    2012-02-08 19:00:18 UTC 
(rev 4766)
+++ phpcompta/tags/rel600/include/class_document.php    2012-02-09 09:20:29 UTC 
(rev 4767)
@@ -468,7 +468,10 @@
      *  - [VEN_TVAC]
      *  - [VEN_TVA]
      *  - [TOTAL_VEN_HTVA]
-     *  - [DATE_DOC]
+     *  - [DATE_CALC]
+     *  - [DATE]
+     *  - [DATE_LIMIT]
+     *  - [DATE_LIMIT_CALC]
      *  - [NUMBER]
      *  - [MY_NAME]
      *  - [MY_CP]
@@ -782,13 +785,18 @@
              *  - [TOTAL_VEN_HTVA]
              *  - [DATE_LIMIT]
              */
-        case 'DATE_LIMIT':
+        case 'DATE_LIMIT_CALC':
             extract ($p_array);
             $id='e_ech' ;
             if ( !isset (${$id}) ) return "";
             $r=format_date(${$id},'DD.MM.YYYY','YYYY-MM-DD');
             break;
-
+      case 'DATE_LIMIT':
+            extract ($p_array);
+            $id='e_ech' ;
+            if ( !isset (${$id}) ) return "";
+            $r=${$id};
+            break;
         case 'MARCH_NEXT':
             $counter++;
             $r='';



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu