[Phpcompta-dev] r496 - in trunk/rapport_avance: include sql

[phpcompta-dev]

Author: danydb
Date: 2013-05-10 21:19:25 +0200 (Fri, 10 May 2013)
New Revision: 496

Modified:
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/declaration.inc.php
   trunk/rapport_avance/sql/upgrade3.sql
Log:
Add step of 2 months
Adapt SQL script

Modified: trunk/rapport_avance/include/class_rapav_declaration.php
===================================================================
--- trunk/rapport_avance/include/class_rapav_declaration.php    2013-05-08 
12:42:07 UTC (rev 495)
+++ trunk/rapport_avance/include/class_rapav_declaration.php    2013-05-10 
19:19:25 UTC (rev 496)
@@ -432,7 +432,7 @@
        }
        function get_interval($p_step)
        {
-               $array_interval=array("","P7D","P14D","P1M","P3M");
+               $array_interval = array("", "P7D", "P14D", "P1M", "P2M", "P3M");
                return new DateInterval($array_interval[$p_step]);
        }
        function anchor_document()

Modified: trunk/rapport_avance/include/declaration.inc.php
===================================================================
--- trunk/rapport_avance/include/declaration.inc.php    2013-05-08 12:42:07 UTC 
(rev 495)
+++ trunk/rapport_avance/include/declaration.inc.php    2013-05-10 19:19:25 UTC 
(rev 496)
@@ -39,7 +39,17 @@
        $decl->to_keep = 'Y';
        $decl->f_id = $_POST['p_form'];
        $decl->save();
-       if ( $decl->d_step == 0 ) $decl->generate_document();
+       if ( $decl->d_step == 0 ) {
+               $decl->generate_document();
+       }       else
+       {
+               // get empty lob
+               $decl->d_filename = null;
+               $decl->d_size = null;
+               $decl->d_mimetype = null;
+               $decl->d_lob = null;
+               $decl->update();
+       }
        $decl->display();
        echo '<p class="notice">'._(' Sauvé ').date('d-m-Y H:i').'</p>';
 
@@ -86,8 +96,9 @@
                array('label'=>'7 jours','value'=>1),
                array('label'=>'14 jours','value'=>2),
                array('label'=>'1 mois','value'=>3),
-               array('label'=>'3 mois','value'=>4)
-               );
+               array('label' => '2 mois', 'value' => 4),
+       array('label' => '3 mois', 'value' => 5)
+);
 ?>
 <form id="declaration_form_id" method="GET" onsubmit="return validate()">
        <?= $hidden?>

Modified: trunk/rapport_avance/sql/upgrade3.sql
===================================================================
--- trunk/rapport_avance/sql/upgrade3.sql       2013-05-08 12:42:07 UTC (rev 
495)
+++ trunk/rapport_avance/sql/upgrade3.sql       2013-05-10 19:19:25 UTC (rev 
496)
@@ -31,3 +31,8 @@
 ALTER TABLE rapport_advanced.declaration ADD COLUMN d_size bigint;
 COMMENT ON COLUMN rapport_advanced.declaration.d_size IS 'Size of the file';
 
+ALTER TABLE rapport_advanced.declaration ADD COLUMN d_step numeric;
+
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_start date;
+
+ALTER TABLE rapport_advanced.declaration_row ADD COLUMN dr_end date;



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