From MAILER-DAEMON Sat Feb 01 10:27:21 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cTZ-0006ek-Et
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:27:21 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:14:35 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184036.1391268441.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r676 - trunk/transform
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:27:20 -0000

Author: danydb
Date: 2014-02-01 16:14:35 +0100 (Sat, 01 Feb 2014)
New Revision: 676

Modified:
   trunk/transform/index.php
Log:
Correct update and install procedure

Modified: trunk/transform/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/index.php	2014-01-31 23:15:23 UTC (rev 675)
+++ trunk/transform/index.php	2014-02-01 15:14:35 UTC (rev 676)
@@ -22,7 +22,7 @@
 $version_plugin=3DSVNINFO;
 Extension::check_version(4400);
 $cn=3Dnew Database(dossier::id());
-$transform_version=3D1;
+$transform_version=3D0;
=20
 if ( $cn->exist_schema('transform') =3D=3D false)
   {
@@ -31,11 +31,11 @@
     $iplugn=3Dnew Install_Transform($cn);
     $iplugn->install();
  }
- if ( $cn->get_value('select max(version_id) from transform.version') < =
$transform_version)
+ if ( $cn->get_value('select max(v_id) from transform.version') < $trans=
form_version)
 {
-	require_once('include/class_rapav_install.php');
-	$iplugn =3D new Rapav_Install($cn);
-	$iplugn->upgrade($rapav_version);
+	require_once('include/class_install_transform.php');
+	$iplugn =3D new Install_Transform($cn);
+	$iplugn->upgrade($transform_version);
 }
 echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dtransformateur" targ=
et=3D"_blank">Aide</a>'.
 '<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO</=
span>'.



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


From MAILER-DAEMON Sat Feb 01 10:27:29 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cTh-0006g8-L6
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:27:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:14:44 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184037.1391268449.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r677 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:27:29 -0000

Author: danydb
Date: 2014-02-01 16:14:44 +0100 (Sat, 01 Feb 2014)
New Revision: 677

Modified:
   trunk/transform/include/class_install_transform.php
Log:
Correct update and install procedure

Modified: trunk/transform/include/class_install_transform.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_install_transform.php	2014-02-01 15:14:=
35 UTC (rev 676)
+++ trunk/transform/include/class_install_transform.php	2014-02-01 15:14:=
44 UTC (rev 677)
@@ -43,7 +43,7 @@
     function upgrade($p_version)
     {
         global $cn;
-        $cur_version =3D $cn->get_value('select max(version_id) from tra=
nsform.version');
+        $cur_version =3D $cn->get_value('select max(v_id) from transform=
.version');
         $cur_version++;
         $file =3D dirname(__FILE__);
         for ($e =3D $cur_version; $e <=3D $p_version; $e++)



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


From MAILER-DAEMON Sat Feb 01 10:28:00 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cUC-0006he-Rv
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:28:00 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:15:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184038.1391268480.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r678 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:28:00 -0000

Author: danydb
Date: 2014-02-01 16:15:16 +0100 (Sat, 01 Feb 2014)
New Revision: 678

Modified:
   trunk/transform/include/class_transform_declarant.php
   trunk/transform/include/class_transform_representative.php
Log:
add procedure insert + periode

Modified: trunk/transform/include/class_transform_declarant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_declarant.php	2014-02-01 15:1=
4:44 UTC (rev 677)
+++ trunk/transform/include/class_transform_declarant.php	2014-02-01 15:1=
5:16 UTC (rev 678)
@@ -16,79 +16,106 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
+
 /**
  * @brief contains declarant
-@code
-$vat_number =3D "0000000097";
-$name =3D "Nom Declarant";
-$street =3D "Rue du declarant";
-$postcode =3D "9999";
-$city =3D "TESTCITY";
-$countrycode =3D "BE";
-$email =3D "dany@alch.be";
-$phone =3D "000000000";
-@endcode
+  @code
+  $vat_number =3D "0000000097";
+  $name =3D "Nom Declarant";
+  $street =3D "Rue du declarant";
+  $postcode =3D "9999";
+  $city =3D "TESTCITY";
+  $countrycode =3D "BE";
+  $email =3D "dany@alch.be";
+  $phone =3D "000000000";
+  @endcode
  */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 class Transform_Declarant
 {
-   =20
-   /**
-    * name
-    */
-   var $name;
-   /**
-    * street
-    */
-   var $street;
-   /**
-    * Postcode
-    */
-   var $postcode;
-   /**
-    * city
-    */
-   var $city;
-   /**
-    * country code (BE)
-    */
-   var $countrycode;
-   /**
-    * email
-    */
-   var $email;
-   /**
-    * phone
-    */
-   var $phone;
-   /**
-    * vatnumber
-    */
-   var $vatnumber;
-   function fromPost()
-   {
-       $this->name=3DHtmlInput::default_value_post("p_dec_name",null);
-       $this->street=3DHtmlInput::default_value_post("p_dec_street",null=
);
-       $this->postcode=3DHtmlInput::default_value_post("p_dec_postcode",=
null);
-       $this->city=3DHtmlInput::default_value_post("p_dec_city",null);
-       $this->countrycode=3DHtmlInput::default_value_post("p_dec_country=
code",null);
-       $this->email=3DHtmlInput::default_value_post("p_dec_email",null);
-       $this->phone=3DHtmlInput::default_value_post("p_dec_phone",null);
-       $this->vatnumber=3DHtmlInput::default_value_post("p_dec_vatnumber=
",null);
-   }
-   function input()
-   {
-       $h_name=3Dnew IText('p_dec_name',$this->name);
-       $h_vatnumber=3Dnew IText('p_dec_vatnumber',$this->vatnumber);
-       $h_street=3Dnew IText('p_dec_street',$this->street);
-       $h_postcode=3Dnew IText('p_dec_postcode',$this->postcode);
-       $h_city=3Dnew IText('p_dec_city',$this->city);
-       $h_countrycode=3Dnew IText('p_dec_countrycode',$this->countrycode=
);
-       $h_email=3Dnew IText('p_dec_email',$this->email);
-       $h_phone=3Dnew IText('p_dec_phone',$this->phone);
-       require_once 'template/listing_assujetti_declarant.php';
=20
-   }
+    /**
+     * name
+     */
+    var $name;
+
+    /**
+     * street
+     */
+    var $street;
+
+    /**
+     * Postcode
+     */
+    var $postcode;
+
+    /**
+     * city
+     */
+    var $city;
+
+    /**
+     * country code (BE)
+     */
+    var $countrycode;
+
+    /**
+     * email
+     */
+    var $email;
+
+    /**
+     * phone
+     */
+    var $phone;
+
+    /**
+     * vatnumber
+     */
+    var $vatnumber;
+
+    function fromPost()
+    {
+        $this->name =3D HtmlInput::default_value_post("p_dec_name", null=
);
+        $this->street =3D HtmlInput::default_value_post("p_dec_street", =
null);
+        $this->postcode =3D HtmlInput::default_value_post("p_dec_postcod=
e", null);
+        $this->city =3D HtmlInput::default_value_post("p_dec_city", null=
);
+        $this->countrycode =3D HtmlInput::default_value_post("p_dec_coun=
trycode", null);
+        $this->email =3D HtmlInput::default_value_post("p_dec_email", nu=
ll);
+        $this->phone =3D HtmlInput::default_value_post("p_dec_phone", nu=
ll);
+        $this->vatnumber =3D HtmlInput::default_value_post("p_dec_vatnum=
ber", null);
+        $this->year=3DHtmlInput::default_value_post('p_year',null);
+    }
+
+    function input()
+    {
+        $h_name =3D new IText('p_dec_name', $this->name);
+        $h_vatnumber =3D new IText('p_dec_vatnumber', $this->vatnumber);
+        $h_street =3D new IText('p_dec_street', $this->street);
+        $h_postcode =3D new IText('p_dec_postcode', $this->postcode);
+        $h_city =3D new IText('p_dec_city', $this->city);
+        $h_countrycode =3D new IText('p_dec_countrycode', $this->country=
code);
+        $h_email =3D new IText('p_dec_email', $this->email);
+        $h_phone =3D new IText('p_dec_phone', $this->phone);
+        require_once 'template/listing_assujetti_declarant.php';
+    }
+
+    function insert()
+    {
+        $this->data->d_name=3D$this->name;
+        $this->data->d_street=3D$this->street;
+        $this->data->d_postcode=3D$this->postcode;
+        $this->data->d_city=3D$this->city;
+        $this->data->d_countrycode=3D$this->countrycode;
+        $this->data->d_email=3D$this->email;
+        $this->data->d_phone=3D$this->phone;
+        $this->data->d_vatnumber=3D$this->vatnumber;
+        $this->data->d_countrycode=3D$this->countrycode;
+       =20
+        $this->data->insert();
+    }
+
 }
+
 ?>

Modified: trunk/transform/include/class_transform_representative.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_representative.php	2014-02-01=
 15:14:44 UTC (rev 677)
+++ trunk/transform/include/class_transform_representative.php	2014-02-01=
 15:15:16 UTC (rev 678)
@@ -77,9 +77,13 @@
     * phone
     */
    var $phone;
+   /**
+    * Transform_Representative_SQL
+    */
+   var $data;
    function fromPost()
    {
-       $this->id=3DHtmlInput::default_value_post("p_id",null);
+       $this->id=3DHtmlInput::default_value_post("p_id",1);
        $this->type=3DHtmlInput::default_value_post("p_type",null);
        $this->name=3DHtmlInput::default_value_post("p_name",null);
        $this->street=3DHtmlInput::default_value_post("p_street",null);
@@ -111,5 +115,20 @@
        require_once 'template/listing_assujetti_representative.php';
=20
    }
+   function insert()
+   {
+       var_dump($this->id);
+       $this->data->rp_listing_id=3D$this->id;
+       $this->data->rp_issued=3D$this->issued;
+       $this->data->rp_type=3D$this->type;
+       $this->data->rp_name=3D$this->name;
+       $this->data->rp_street=3D$this->street;
+       $this->data->rp_postcode=3D$this->postcode;
+       $this->data->rp_countrycode=3D$this->countrycode;
+       $this->data->rp_email=3D$this->email;
+       $this->data->rp_phone=3D$this->phone;
+      =20
+       $this->data->insert();
+   }
 }
=20



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


From MAILER-DAEMON Sat Feb 01 10:28:42 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cUs-0006jC-2d
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:28:42 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:15:53 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184039.1391268521.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r679 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:28:40 -0000

Author: danydb
Date: 2014-02-01 16:15:52 +0100 (Sat, 01 Feb 2014)
New Revision: 679

Modified:
   trunk/transform/include/class_transform_sql.php
Log:
add column r_type to table request

Modified: trunk/transform/include/class_transform_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_sql.php	2014-02-01 15:15:16 U=
TC (rev 678)
+++ trunk/transform/include/class_transform_sql.php	2014-02-01 15:15:52 U=
TC (rev 679)
@@ -36,6 +36,7 @@
     //------ Attributes-----
     var $r_id;
     var $r_date;
+    var $r_type;
=20
     /* example private $variable=3Darray("easy_name"=3D>column_name,"ema=
il"=3D>"column_name_email","val3"=3D>0); */
=20
@@ -48,12 +49,14 @@
=20
         $this->name =3D array(
             "r_id" =3D> "r_id",
-            "r_date" =3D> "r_date"
+            "r_date" =3D> "r_date",
+            "r_type"=3D>'r_type'
         );
=20
         $this->type =3D array(
             "r_id" =3D> "numeric",
-            "r_date" =3D> "date"
+            "r_date" =3D> "date",
+            "r_type"=3D>"text"
         );
=20
         $this->default =3D array(



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


From MAILER-DAEMON Sat Feb 01 10:29:12 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cVM-0006ky-8w
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:29:12 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:16:27 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184040.1391268551.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r680 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:29:11 -0000

Author: danydb
Date: 2014-02-01 16:16:27 +0100 (Sat, 01 Feb 2014)
New Revision: 680

Modified:
   trunk/transform/include/intervat_listing_assujetti.inc.php
Log:
if exception occurs then go back to first screen

Modified: trunk/transform/include/intervat_listing_assujetti.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti.inc.php	2014-02-01=
 15:15:52 UTC (rev 679)
+++ trunk/transform/include/intervat_listing_assujetti.inc.php	2014-02-01=
 15:16:27 UTC (rev 680)
@@ -21,17 +21,27 @@
 ?>
 <h1>Listing Assujetti Intervat </h1>
 <?php
-$step=3DHtmlInput::default_value_request('st_transf',0);
+$step =3D HtmlInput::default_value_request('st_transf', 0);
=20
-if ($step =3D=3D 0 )
+if ($step =3D=3D 0)
 {
     require 'intervat_listing_assujetti_step_1.inc.php';
 }
-if ($step =3D=3D 1 )
+if ($step =3D=3D 1)
 {
-    require 'intervat_listing_assujetti_step_2.inc.php';
+    try
+    {
+        require 'intervat_listing_assujetti_step_2.inc.php';
+    } catch (Exception $e)
+    {
+        echo '<p class=3D"notice">'.$e->getMessage().'</p>';
+        if ($e->getCode() !=3D 3)
+        {
+            require 'intervat_listing_assujetti_step_1.inc.php';
+        }
+    }
 }
-if ($step =3D=3D 2 )
+if ($step =3D=3D 2)
 {
     require 'intervat_listing_assujetti_step_3.inc.php';
 }



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


From MAILER-DAEMON Sat Feb 01 10:29:46 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cVu-0006uD-Kn
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:29:46 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:16:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184041.1391268585.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r681 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:29:44 -0000

Author: danydb
Date: 2014-02-01 16:16:58 +0100 (Sat, 01 Feb 2014)
New Revision: 681

Modified:
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
Log:
Add possibility to get data from PhpCompta

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-01 15:16:27 UTC (rev 680)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-01 15:16:58 UTC (rev 681)
@@ -22,7 +22,18 @@
 require_once 'class_transform_representative.php';
 require_once 'class_transform_declarant.php';
 $representative=3Dnew Transform_Representative();
+$representative->fromPost();
 $declarant=3Dnew Transform_Declarant();
+$declarant->fromPost();
+$radio=3Dnew IRadio('p_inputtype');
+$h_tva=3Dnew ICheckBox('h_tva[]');
+$h_year=3Dnew INum('p_year');
+$h_year->prec=3D0;
+$h_tva_compute_date=3Dnew ISelect('p_compute_date');
+$h_tva_compute_date->value=3Darray(
+    array('value'=3D>1,'label'=3D>_('Par date paiement')),
+    array('value'=3D>1,'label'=3D>_('Par date op=C3=A9ration'))
+    );
 ?>
=20
 <form method=3D"post" enctype=3D"multipart/form-data">
@@ -35,13 +46,45 @@
 $declarant->input();
 ?>
     <p>
+        <?php echo _('Ann=C3=A9e'),$h_year->input();?>
+    </p>
+    <p>
     <?php
+   =20
+    $radio->value=3D1;
+    echo $radio->input()._('Par fichier');
     $file =3D new IFile('client_assujetti');
     echo $file->input();
     ?>
     </p>
     <p>
         <?php
+        $radio->value=3D2;
+        echo $radio->input()._('Par calcul');
+        $atva=3D$cn->get_array('select tva_id,tva_rate,tva_comment from =
tva_rate order by 2');
+        $count_atva=3Dcount($atva);
+        ?>
+    <ul style=3D"list-style: none">
+        <?php
+        for ($i=3D0;$i<$count_atva;$i++):
+        ?>
+        <li>
+            <?php
+                $h_tva->value=3D$atva[$i]['tva_id'];
+                echo $h_tva->input().h($atva[$i]['tva_rate'])." ".h($atv=
a[$i]['tva_comment']);
+            ?>
+        </li>
+        <?php
+        endfor;
+        ?>
+    </ul>
+
+    <span style=3D"margin-left:30px">
+    <?php echo _('Op=C3=A9ration de vente'),$h_tva_compute_date->input()=
;?>
+    </span>
+    </p>   =20
+    <p>
+        <?php
         echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugi=
n_code', 'sa'));
         echo HtmlInput::hidden('st_transf',1);
         echo HtmlInput::submit('send_list', 'Valider');



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


From MAILER-DAEMON Sat Feb 01 10:30:01 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cW9-0006vv-PK
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:30:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:17:15 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184042.1391268600.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r682 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:29:59 -0000

Author: danydb
Date: 2014-02-01 16:17:14 +0100 (Sat, 01 Feb 2014)
New Revision: 682

Modified:
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
Log:
Add possibility to get data from PhpCompta + insert data
into tables

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-01 15:16:58 UTC (rev 681)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-01 15:17:14 UTC (rev 682)
@@ -25,73 +25,231 @@
  */
 global $cn;
 require_once 'class_transform_sql.php';
+require_once 'class_transform_representative.php';
+require_once 'class_transform_declarant.php';
+
+$inputtype =3D HtmlInput::default_value_post('p_inputtype', null);
+$year =3D HtmlInput::default_value_post('p_year', NULL);
+$atva =3D HtmlInput::default_value_post('h_tva', null);
+$compute_date =3D HtmlInput::default_value_post('p_compute_date', null);
+
+// If inputtype is null not choice between file or compute
+if ($inputtype =3D=3D null)
+{
+    throw new Exception(_('Vous devez choisir par fichier ou par calcul'=
), 4);
+}
+// if inputtype is by computing (=3D2) then year must existe as exercice=
=20
+// and tva_id must not be empty
+if ($inputtype =3D=3D 2)
+{
+    if ($atva =3D=3D null)
+    {
+        throw new Exception(_('Vous devez choisir au moins un taux TVA')=
, 5);
+    }
+    if ($year =3D=3D null)
+    {
+        throw new Exception(_("Vous devez donner l'ann=C3=A9e"), 6);
+    }
+    if ($compute_date =3D=3D null || isNumber($compute_date) =3D=3D 0)
+    {
+        throw new Exception(_("Date de calcul incorrect"), 7);
+    }
+    if ($compute_date > 3000 && $compute_date < 1940)
+    {
+        throw new Exception(_("Date de calcul incorrect"), 8);
+    }
+    foreach ($atva as $tva)
+    {
+        if (isNumber($tva) =3D=3D 0)
+        {
+            throw new Exception(_("ID Tva incorrect: [$tva]"), 9);
+        }
+    }
+}
 /**
  * Save a new request
  */
 $request =3D new Transform_Request_SQL();
+$request->r_type =3D 'intervat';
+
 $request->insert();
=20
 $representative =3D new Transform_Representative();
+$representative->data =3D new Intervat_Representative_SQL;
 $representative->data->r_id =3D $request->r_id;
 $representative->fromPost();
 $representative->insert();
=20
 $declarant =3D new Transform_Declarant();
+$declarant->data =3D new Intervat_Declarant_SQL;
 $declarant->data->r_id =3D $request->r_id;
 $declarant->fromPost();
 $declarant->insert();
=20
-/*
+/* * *******************************************************************=
*********
  * Save the file
- */
-if (count($_FILES) =3D=3D 0)
-    throw new Exception(_('Aucun fichier donn=C3=A9'), 1);
+ * *********************************************************************=
******** */
+if ($inputtype =3D=3D 1)
+{
+    if (count($_FILES) =3D=3D 0)
+        throw new Exception(_('Aucun fichier donn=C3=A9'), 1);
=20
-$name =3D $_FILES['client_assujetti']['name'];
+    $name =3D $_FILES['client_assujetti']['name'];
=20
-if (strlen($_FILES['client_assujetti']['tmp_name'][0]) !=3D 0)
-{
-    $new_name =3D tempnam($_ENV['TMP'], 'client_assujetti');
-    if (!move_uploaded_file($_FILES['file_upload']['tmp_name'][$i], $new=
_name))
+    if (strlen($_FILES['client_assujetti']['tmp_name'][0]) !=3D 0)
     {
-        throw new Exception(_('Impossible de sauver ce fichier'), 2);
-    }
-    $file =3D fopen($new_name, "r");
-    $i =3D 0;
-    $o_data=3Darray();
-    try
-    {
-        $cn->start();
-        while ($data =3D fgetcsv($file, 0, ";"))
+        $new_name =3D tempnam($_ENV['TMP'], 'client_assujetti');
+        if (!move_uploaded_file($_FILES['file_upload']['tmp_name'][$i], =
$new_name))
         {
-            $i++;
-            if (count($data) !=3D 4)
+            throw new Exception(_('Impossible de sauver ce fichier'), 2)=
;
+        }
+        $file =3D fopen($new_name, "r");
+        $i =3D 0;
+        $o_data =3D array();
+        try
+        {
+            $cn->start();
+            while ($data =3D fgetcsv($file, 0, ";"))
             {
-                $o_data[$i]=3D _('Ligne non import=C3=A9e'). join(' - ',=
 $data);
-                continue;
+                $i++;
+                if (count($data) !=3D 4 || $i =3D=3D 1)
+                {
+                    $o_data[$i] =3D _('Ligne non import=C3=A9e') . join(=
' - ', $data);
+                    continue;
+                }
+                /*
+                 * insert into transform.intervat_client
+                 */
+                $o_data[$i] =3D new Intervat_Client_SQL();
+                $o_data[$i]->d_id =3D $declarant->data->d_id;
+                $o_data[$i]->c_name =3D $data[0];
+                $o_data[$i]->c_issuedby =3D "BE";
+                $o_data[$i]->c_vatnumber =3D $data[1];
+                $o_data[$i]->c_amount_vat =3D $data[2];
+                $o_data[$i]->c_amount_novat =3D $data[3];
+                $o_data[$i]->insert();
             }
-            /*
-             * insert into transform.intervat_client
-             */
-            $o_data[$i] =3D new Intervat_Client_SQL();
-            $o_data[$i]->d_id =3D $declarant->data->d_id;
-            $o_data[$i]->c_name =3D $data[0];
-            $o_data[$i]->c_issuedby =3D "BE";
-            $o_data[$i]->c_vatnumber =3D $data[1];
-            $o_data[$i]->c_amount_vat =3D $data[2];
-            $o_data[$i]->c_amount_novat =3D $data[3];
-            $o_data[$i]->insert();
+            $cn->commit();
+        } catch (Exception $ex)
+        {
+            $cn->rollback();
+            throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i=
]->c_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
         }
-        $cn->commit();
-    } catch (Exception $ex)
+    }
+}
+//**********************************************************************=
********
+//----- Compute the data and insert them into the date
+//**********************************************************************=
********
+if ($inputtype =3D=3D 2)
+{
+    var_dump($atva);
+    $ltva =3D "(" . implode(',', $atva) . ")";
+    //------ Operation date ----------------
+    if ($compute_date =3D=3D 1)
     {
-        $cn->rollback();
-        throw new Exception(_('Ne peut pas ajouter ').h($o_data[$i]->c_n=
ame).'-'.h($o_data[$i]->c_vatnumber),3);
+        $sql =3D "
+        with  c as=20
+        (select qs_client,
+         sum(qs_vat) as vat_amount,
+         sum(qs_price) as amount=20
+         from quant_sold =20
+         where=20
+         qs_vat_code in $ltva=20
+         and j_id in (select j_id=20
+                        from jrnx=20
+                        where=20
+                        j_tech_per in=20
+                            (select  p_id=20
+                                from parm_periode=20
+                                    where p_exercice=3D$1) )=20
+        group by qs_client)
+        ,f_name as=20
+        (select f_id,ad_value=20
+            from fiche_detail=20
+            where ad_id=3D1)  ,
+        f_tvanum as=20
+        (select f_id,ad_value=20
+            from fiche_detail=20
+            where ad_id=3D13)=20
+select f_name.ad_value as name,
+    f_tvanum.ad_value as tvanumb,=20
+   vat_amount,amount
+from=20
+    c join f_name on (qs_client=3Df_name.f_id)
+    join f_tvanum on (qs_client=3Df_tvanum.f_id)
+    ";
+    } elseif ($compute_date =3D=3D 2) //------ Payment date ------------=
----
+    {
+        $sql =3D "
+        with  c as=20
+        (select qs_client,
+            sum(qs_vat) as vat_amount,
+            sum(qs_price) as amount=20
+        from=20
+            quant_sold join jrnx on (jrnx.j_id=3Dquant_sold.j_id)=20
+        where=20
+        qs_vat_code=3D1=20
+        and j_grpt in (select jr_grpt_id=20
+                        from jrn=20
+                        where=20
+                        jr_date_paid >=3D (select min(p_start) from parm=
_periode where p_exercice=3D$1 )=20
+                        and jr_date_paid <=3D  (select max(p_start) from=
 parm_periode where p_exercice=3D$1 ))
+         group by qs_client)
+    ,f_name as=20
+    (select f_id,
+        ad_value=20
+        from=20
+        fiche_detail=20
+        where=20
+        ad_id=3D1)  ,
+    f_tvanum as=20
+    (select f_id,
+        ad_value=20
+        from fiche_detail=20
+        where=20
+        ad_id=3D13)=20
+select f_name.ad_value as name,
+      f_tvanum.ad_value as tvanumb,=20
+      vat_amount,amount
+from=20
+ c join f_name on (qs_client=3Df_name.f_id)
+   join f_tvanum on (qs_client=3Df_tvanum.f_id)
+";
     }
+    $a_listing =3D $cn->get_array($sql, array($year));
    =20
+    /**
+     * Save data into Intervat_Client
+     */
+    $o_data =3D array();
+        try
+        {
+            $cn->start();
+            $nb=3Dcount($a_listing);
+            for ($i=3D0;$i <$nb; $i++)
+            {
+                /*
+                 * insert into transform.intervat_client
+                 */
+                $o_data[$i] =3D new Intervat_Client_SQL();
+                $o_data[$i]->d_id =3D $declarant->data->d_id;
+                $o_data[$i]->c_name =3D $a_listing[$i]['name'];
+                $o_data[$i]->c_issuedby =3D "BE";
+                $o_data[$i]->c_vatnumber =3D $a_listing[$i]['tvanumb'];
+                $o_data[$i]->c_amount_vat =3D  $a_listing[$i]['vat_amoun=
t'];
+                $o_data[$i]->c_amount_novat =3D  $a_listing[$i]['amount'=
];
+                $o_data[$i]->insert();
+            }
+            $cn->commit();
+        } catch (Exception $ex)
+        {
+            $cn->rollback();
+            throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i=
]->c_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
+        }
+   =20
+    /**
+     * Show the result=20
+     */
 }
-/**
- * Show the result=20
- */
+
 ?>
-



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


From MAILER-DAEMON Sat Feb 01 10:30:30 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9cWb-00072X-V9
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 10:30:29 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 16:17:43 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184047.1391268629.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r683 - trunk/transform/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 15:30:28 -0000

Author: danydb
Date: 2014-02-01 16:17:43 +0100 (Sat, 01 Feb 2014)
New Revision: 683

Modified:
   trunk/transform/sql/install.sql
Log:
add column r_type to table request

Modified: trunk/transform/sql/install.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/sql/install.sql	2014-02-01 15:17:14 UTC (rev 682)
+++ trunk/transform/sql/install.sql	2014-02-01 15:17:43 UTC (rev 683)
@@ -1,9 +1,7 @@
-create schema transform;
-
+=EF=BB=BFcreate schema transform;
 create table transform.request(
-	r_id bigserial primary key,
-        r_date timestamp default now()
-);
+	r_id bigserial primary key
+	);
 create table transform.version(
 	v_id bigint primary key,
 	v_note text);
@@ -13,7 +11,7 @@
 	r_id bigint references transform.request(r_id) on update cascade on del=
ete cascade,
 	rp_listing_id text,
 	rp_issued text,
-	rp_type text
+	rp_type text,
 	rp_name text,
 	rp_street text,
 	rp_postcode text,
@@ -46,4 +44,9 @@
 	c_amount_vat text,
 	c_amount_novat text,
 	c_issuedby char(2) default 'BE'
-);
\ No newline at end of file
+)
+
+alter table transform.request add         r_date date
+alter table transform.request alter r_date set default now()
+alter table transform.request add         r_type text=20
+



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


From MAILER-DAEMON Sat Feb 01 16:31:13 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9i9h-0008M0-SV
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 16:31:13 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 22:18:27 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184251.1391290273.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r684 - in trunk/transform: include unit-test
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 21:31:12 -0000

Author: danydb
Date: 2014-02-01 22:18:27 +0100 (Sat, 01 Feb 2014)
New Revision: 684

Modified:
   trunk/transform/include/class_transform_declarant.php
   trunk/transform/include/class_transform_intervat.php
   trunk/transform/include/class_transform_representative.php
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
   trunk/transform/unit-test/bootstrap.php
   trunk/transform/unit-test/transform_IntervatTest.php
Log:
Update test-unit + we dont give an array as parameter but a Transform_Dec=
larant for append_listing

Modified: trunk/transform/include/class_transform_declarant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_declarant.php	2014-02-01 15:1=
7:43 UTC (rev 683)
+++ trunk/transform/include/class_transform_declarant.php	2014-02-01 21:1=
8:27 UTC (rev 684)
@@ -32,6 +32,7 @@
   @endcode
  */
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
+require_once 'class_transform_sql.php';
 class Transform_Declarant
 {
=20
@@ -74,30 +75,47 @@
      * vatnumber
      */
     var $vatnumber;
-
+    /**
+     * readOnly
+     */
+    var $readOnly;
+    function __construct()
+    {
+        $this->readOnly=3Dfalse;
+        $this->data=3Dnew Intervat_Declarant_SQL;
+    }
     function fromPost()
     {
-        $this->name =3D HtmlInput::default_value_post("p_dec_name", null=
);
-        $this->street =3D HtmlInput::default_value_post("p_dec_street", =
null);
-        $this->postcode =3D HtmlInput::default_value_post("p_dec_postcod=
e", null);
-        $this->city =3D HtmlInput::default_value_post("p_dec_city", null=
);
-        $this->countrycode =3D HtmlInput::default_value_post("p_dec_coun=
trycode", null);
+        global $g_parameter;
+        $this->name =3D HtmlInput::default_value_post("p_dec_name", $g_p=
arameter->MY_NAME);
+        $this->street =3D HtmlInput::default_value_post("p_dec_street", =
$g_parameter->MY_STREET);
+        $this->postcode =3D HtmlInput::default_value_post("p_dec_postcod=
e", $g_parameter->MY_CP);
+        $this->city =3D HtmlInput::default_value_post("p_dec_city", $g_p=
arameter->MY_COMMUNE);
+        $this->countrycode =3D HtmlInput::default_value_post("p_dec_coun=
trycode", "BE");
         $this->email =3D HtmlInput::default_value_post("p_dec_email", nu=
ll);
-        $this->phone =3D HtmlInput::default_value_post("p_dec_phone", nu=
ll);
-        $this->vatnumber =3D HtmlInput::default_value_post("p_dec_vatnum=
ber", null);
+        $this->phone =3D HtmlInput::default_value_post("p_dec_phone", $g=
_parameter->MY_TEL);
+        $this->vatnumber =3D HtmlInput::default_value_post("p_dec_vatnum=
ber", $g_parameter->MY_TVA);
         $this->year=3DHtmlInput::default_value_post('p_year',null);
     }
=20
     function input()
     {
         $h_name =3D new IText('p_dec_name', $this->name);
+        $h_name->readOnly=3D$this->readOnly;
         $h_vatnumber =3D new IText('p_dec_vatnumber', $this->vatnumber);
+        $h_vatnumber->readOnly=3D$this->readOnly;
         $h_street =3D new IText('p_dec_street', $this->street);
+        $h_street->readOnly=3D$this->readOnly;
         $h_postcode =3D new IText('p_dec_postcode', $this->postcode);
+        $h_postcode->readOnly=3D$this->readOnly;
         $h_city =3D new IText('p_dec_city', $this->city);
+        $h_city->readOnly=3D$this->readOnly;
         $h_countrycode =3D new IText('p_dec_countrycode', $this->country=
code);
+        $h_countrycode->readOnly=3D$this->readOnly;
         $h_email =3D new IText('p_dec_email', $this->email);
+        $h_email->readOnly=3D$this->readOnly;
         $h_phone =3D new IText('p_dec_phone', $this->phone);
+        $h_phone->readOnly=3D$this->readOnly;
         require_once 'template/listing_assujetti_declarant.php';
     }
=20
@@ -115,6 +133,11 @@
        =20
         $this->data->insert();
     }
+    function display()
+    {
+        $this->readOnly=3Dtrue;
+        $this->input();
+    }
=20
 }
=20

Modified: trunk/transform/include/class_transform_intervat.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_intervat.php	2014-02-01 15:17=
:43 UTC (rev 683)
+++ trunk/transform/include/class_transform_intervat.php	2014-02-01 21:18=
:27 UTC (rev 684)
@@ -112,7 +112,7 @@
      @endcode
      *=20
      */
-    function append_client_listing(Transform_Declarant $p_declarant,$p_a=
rray)
+    function append_client_listing(Transform_Declarant $p_declarant)
     {
         // variable
         $vat_amount_sum =3D 0;
@@ -130,12 +130,12 @@
=20
=20
=20
-        $this->append_declarant($decl, $p_declarant,$p_array);
+        $this->append_declarant($decl, $p_declarant);
=20
         $periode =3D $this->domdoc->createElementNS($this->ns, "ns2:Peri=
od", $periode);
         $decl->appendChild($periode);
=20
-        $this->append_listing($decl, $p_array);
+        $this->append_listing($decl, $p_declarant);
=20
=20
         $l =3D $this->domdoc->getElementsByTagNameNS($this->ns, "ClientL=
istingConsignment");
@@ -163,7 +163,7 @@
         </ns2:Declarant>
      @endcode
      */
-    function append_declarant(DOMElement $p_dom, Transform_Declarant $p_=
declarant,$p_array)
+    function append_declarant(DOMElement $p_dom, Transform_Declarant $p_=
declarant)
     {
  =20
=20
@@ -196,7 +196,7 @@
      * @param type $p_array
      */
=20
-    function append_listing(DOMElement $p_dom, $p_array)
+    function append_listing(DOMElement $p_dom, Transform_Declarant $p_de=
clarant)
     {
         /*
          * Client are in array

Modified: trunk/transform/include/class_transform_representative.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_representative.php	2014-02-01=
 15:17:43 UTC (rev 683)
+++ trunk/transform/include/class_transform_representative.php	2014-02-01=
 21:18:27 UTC (rev 684)
@@ -16,119 +16,155 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 /**
  * @brief contains the representative
- @code
+  @code
   $ID =3D "0000000097";
-$issued =3D "BE";
-$type =3D 'TIN';
-$name =3D "Nom Mandataire";
-$street =3D "Nom de rue";
-$postcode =3D "9999";
-$city =3D "TESTCITY";
-$countrycode =3D "BE";
-$email =3D "dany@alch.be";
-$phone =3D "000000000";
- @endcode
+  $issued =3D "BE";
+  $type =3D 'TIN';
+  $name =3D "Nom Mandataire";
+  $street =3D "Nom de rue";
+  $postcode =3D "9999";
+  $city =3D "TESTCITY";
+  $countrycode =3D "BE";
+  $email =3D "dany@alch.be";
+  $phone =3D "000000000";
+  @endcode
  */
-
+require_once 'class_transform_sql.php';
 class Transform_Representative
 {
+
     /**
      * id is the id of the listing
      */
     var $id;
+
     /**
      * issued by
      */
-   var $issued;
-   /**
-    * Type (TIN)
-    */
-   var $type;
-   /**
-    * name
-    */
-   var $name;
-   /**
-    * street
-    */
-   var $street;
-   /**
-    * Postcode
-    */
-   var $postcode;
-   /**
-    * city
-    */
-   var $city;
-   /**
-    * country code (BE)
-    */
-   var $countrycode;
-   /**
-    * email
-    */
-   var $email;
-   /**
-    * phone
-    */
-   var $phone;
-   /**
-    * Transform_Representative_SQL
-    */
-   var $data;
-   function fromPost()
-   {
-       $this->id=3DHtmlInput::default_value_post("p_id",1);
-       $this->type=3DHtmlInput::default_value_post("p_type",null);
-       $this->name=3DHtmlInput::default_value_post("p_name",null);
-       $this->street=3DHtmlInput::default_value_post("p_street",null);
-       $this->postcode=3DHtmlInput::default_value_post("p_postcode",null=
);
-       $this->city=3DHtmlInput::default_value_post("p_city",null);
-       $this->countrycode=3DHtmlInput::default_value_post("p_countrycode=
",null);
-       $this->email=3DHtmlInput::default_value_post("p_email",null);
-       $this->phone=3DHtmlInput::default_value_post("p_phone",null);
-       $this->issued=3DHtmlInput::default_value_post("p_issued",null);
-   }
-   function input()
-   {
-       $h_type=3Dnew ISelect('p_type');
-       $h_type->value=3Darray(
-            array("label"=3D>'TIN',"value"=3D>"TIN"),
-            array("label"=3D>'NVAT',"value"=3D>"NVAT"),
-            array("label"=3D>'other',"value"=3D>"other")
-           );
-       $h_type->selected=3D$this->type;
-       $h_name=3Dnew IText('p_name',$this->name);
-       $h_street=3Dnew IText('p_street',$this->street);
-       $h_postcode=3Dnew IText('p_postcode',$this->postcode);
-       $h_city=3Dnew IText('p_city',$this->city);
-       $h_countrycode=3Dnew IText('p_countrycode',$this->countrycode);
-       $h_email=3Dnew IText('p_email',$this->email);
-       $h_phone=3Dnew IText('p_phone',$this->phone);
-       $h_id=3Dnew INum('p_id',$this->id);
-       $h_issued=3Dnew IText("p_issued",$this->issued);
-       require_once 'template/listing_assujetti_representative.php';
+    var $issued;
=20
-   }
-   function insert()
-   {
-       var_dump($this->id);
-       $this->data->rp_listing_id=3D$this->id;
-       $this->data->rp_issued=3D$this->issued;
-       $this->data->rp_type=3D$this->type;
-       $this->data->rp_name=3D$this->name;
-       $this->data->rp_street=3D$this->street;
-       $this->data->rp_postcode=3D$this->postcode;
-       $this->data->rp_countrycode=3D$this->countrycode;
-       $this->data->rp_email=3D$this->email;
-       $this->data->rp_phone=3D$this->phone;
-      =20
-       $this->data->insert();
-   }
+    /**
+     * Type (TIN)
+     */
+    var $type;
+
+    /**
+     * name
+     */
+    var $name;
+
+    /**
+     * street
+     */
+    var $street;
+
+    /**
+     * Postcode
+     */
+    var $postcode;
+
+    /**
+     * city
+     */
+    var $city;
+
+    /**
+     * country code (BE)
+     */
+    var $countrycode;
+
+    /**
+     * email
+     */
+    var $email;
+
+    /**
+     * phone
+     */
+    var $phone;
+
+    /**
+     * Transform_Representative_SQL
+     */
+    var $data;
+    /**
+     * readOnly
+     */
+    var $readOnly;
+    function __construct()
+    {
+        $this->readOnly=3Dfalse;
+        $this->data=3Dnew Intervat_Representative_SQL();
+    }
+    function fromPost()
+    {
+        $this->id =3D HtmlInput::default_value_post("p_id", 1);
+        $this->type =3D HtmlInput::default_value_post("p_type", null);
+        $this->name =3D HtmlInput::default_value_post("p_name", null);
+        $this->street =3D HtmlInput::default_value_post("p_street", null=
);
+        $this->postcode =3D HtmlInput::default_value_post("p_postcode", =
null);
+        $this->city =3D HtmlInput::default_value_post("p_city", null);
+        $this->countrycode =3D HtmlInput::default_value_post("p_countryc=
ode", null);
+        $this->email =3D HtmlInput::default_value_post("p_email", null);
+        $this->phone =3D HtmlInput::default_value_post("p_phone", null);
+        $this->issued =3D HtmlInput::default_value_post("p_issued", null=
);
+    }
+
+    function input()
+    {
+        $h_type =3D new ISelect('p_type');
+        $h_type->value =3D array(
+            array("label" =3D> 'TIN', "value" =3D> "TIN"),
+            array("label" =3D> 'NVAT', "value" =3D> "NVAT"),
+            array("label" =3D> 'other', "value" =3D> "other")
+        );
+        $h_type->selected =3D $this->type;
+        $h_type->readOnly=3D$this->readOnly;
+        $h_name =3D new IText('p_name', $this->name);
+        $h_name->readOnly=3D$this->readOnly;
+        $h_street =3D new IText('p_street', $this->street);
+        $h_street->readOnly=3D$this->readOnly;
+        $h_postcode =3D new IText('p_postcode', $this->postcode);
+        $h_postcode->readOnly=3D$this->readOnly;
+        $h_city =3D new IText('p_city', $this->city);
+        $h_city->readOnly=3D$this->readOnly;
+        $h_countrycode =3D new IText('p_countrycode', $this->countrycode=
);
+        $h_countrycode->readOnly=3D$this->readOnly;
+        $h_email =3D new IText('p_email', $this->email);
+        $h_email->readOnly=3D$this->readOnly;
+        $h_phone =3D new IText('p_phone', $this->phone);
+        $h_phone->readOnly=3D$this->readOnly;
+        $h_id =3D new INum('p_id', $this->id);
+        $h_id->readOnly=3D$this->readOnly;
+        $h_issued =3D new IText("p_issued", $this->issued);
+        $h_issued->readOnly=3D$this->readOnly;
+        require_once 'template/listing_assujetti_representative.php';
+    }
+
+    function insert()
+    {
+        $this->data->rp_listing_id =3D $this->id;
+        $this->data->rp_issued =3D $this->issued;
+        $this->data->rp_type =3D $this->type;
+        $this->data->rp_name =3D $this->name;
+        $this->data->rp_street =3D $this->street;
+        $this->data->rp_postcode =3D $this->postcode;
+        $this->data->rp_countrycode =3D $this->countrycode;
+        $this->data->rp_email =3D $this->email;
+        $this->data->rp_phone =3D $this->phone;
+
+        $this->data->insert();
+    }
+
+    function display()
+    {
+        $this->readOnly =3D true;
+        $this->input();
+    }
+
 }
-

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-01 15:17:43 UTC (rev 683)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-01 21:18:27 UTC (rev 684)
@@ -32,7 +32,8 @@
 $year =3D HtmlInput::default_value_post('p_year', NULL);
 $atva =3D HtmlInput::default_value_post('h_tva', null);
 $compute_date =3D HtmlInput::default_value_post('p_compute_date', null);
-
+$rejected=3Darray();
+   =20
 // If inputtype is null not choice between file or compute
 if ($inputtype =3D=3D null)
 {
@@ -114,7 +115,7 @@
                 $i++;
                 if (count($data) !=3D 4 || $i =3D=3D 1)
                 {
-                    $o_data[$i] =3D _('Ligne non import=C3=A9e') . join(=
' - ', $data);
+                    $rejected[] =3D _('Ligne non import=C3=A9e') . join(=
' - ', $data);
                     continue;
                 }
                 /*
@@ -246,10 +247,14 @@
             $cn->rollback();
             throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i=
]->c_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
         }
+}
    =20
     /**
      * Show the result=20
      */
-}
-
+echo $representative->display();
+echo $declarant->display();
+$a_listing=3Dnew Intervat_Client_SQL;
+$ret=3D$a_listing->seek(' where d_id =3D $1',array($declarant->data->d_i=
d));
+require 'template/listing_client_display.php';
 ?>

Modified: trunk/transform/unit-test/bootstrap.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/bootstrap.php	2014-02-01 15:17:43 UTC (rev =
683)
+++ trunk/transform/unit-test/bootstrap.php	2014-02-01 21:18:27 UTC (rev =
684)
@@ -20,8 +20,16 @@
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
=20
-$path=3D'/home/dany/developpement/phpcompta/phpcompta-trunk/include:..:.=
./include';
+$path=3D'/home/dany/developpement/phpcompta/rel671/include:..:../include=
:/usr/share/php/PHPUnit';
 $old_path=3D  get_include_path();
 set_include_path($old_path.':'.$path);
+require_once 'Framework/SelfDescribing.php';
+require_once 'Framework/Test.php';
+require_once 'Framework/Assert.php';
+require_once 'Framework/TestCase.php';
+require_once 'class_database.php';
+require_once 'class_transform_intervat.php';
+require_once 'constant.php';
+require_once 'class_own.php';
=20
=20

Modified: trunk/transform/unit-test/transform_IntervatTest.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/transform_IntervatTest.php	2014-02-01 15:17=
:43 UTC (rev 683)
+++ trunk/transform/unit-test/transform_IntervatTest.php	2014-02-01 21:18=
:27 UTC (rev 684)
@@ -47,10 +47,11 @@
  * @endcode
  *=20
  */
-require_once 'class_transform_intervat.php';
-require_once 'class_transform_representative.php';
 require_once 'bootstrap.php';
=20
+require_once 'class_transform_representative.php';
+require_once 'class_dossier.php';
+
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-01-25 at 18:01:0=
8.
  */
@@ -65,6 +66,7 @@
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
+     * @backupGlobals enabled
      */
     protected function setUp()
     {
@@ -107,7 +109,16 @@
   </ns2:ClientListing>
 </ns2:ClientListingConsignment>
 ';
+        global $cn, $g_parameter;
+        $cn =3D new Database(26);
+        $g_parameter =3D new Own($cn);
+        $_REQUEST['gDossier'] =3D 26;
+        $this->request =3D new Transform_Request_SQL;
+        $this->request->r_type =3D 'phpunit-intervat';
+        $this->request->insert();
+
         $this->representative =3D new Transform_Representative();
+        $this->representative->data->r_id =3D $this->request->r_id;
         $this->representative->id =3D "0000000097";
         $this->representative->issued =3D "BE";
         $this->representative->type =3D 'TIN';
@@ -118,10 +129,12 @@
         $this->representative->countrycode =3D "BE";
         $this->representative->email =3D "dany@alch.be";
         $this->representative->phone =3D "000000000";
-              /*
+        $this->representative->insert();
+        /*
          * Variables
          */
-        $this->declarant=3Dnew Transform_Declarant();
+        $this->declarant =3D new Transform_Declarant();
+        $this->declarant->data->r_id =3D $this->request->r_id;
         $this->declarant->vat_number =3D "0000000097";
         $this->declarant->name =3D "Nom Declarant";
         $this->declarant->street =3D "Rue du declarant";
@@ -130,6 +143,7 @@
         $this->declarant->countrycode =3D "BE";
         $this->declarant->email =3D "dany@alch.be";
         $this->declarant->phone =3D "000000000";
+        $this->declarant->insert();
     }
=20
     /**
@@ -144,9 +158,14 @@
     /**
      * @covers Intervat::append_root
      * @todo   Implement testAppend_root().
+     * @backupGlobals enabled
      */
     public function testAppend_root()
     {
+        global $cn, $g_parameter;
+        $cn =3D new Database(26);
+        $g_parameter =3D new Own($cn);
+        $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
         $result =3D $this->object->domdoc->saveXML();
         $must_march =3D '<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>=
    =20
@@ -160,7 +179,10 @@
=20
     public function testAppend_representative()
     {
-
+           global $cn, $g_parameter;
+        $cn =3D new Database(26);
+        $g_parameter =3D new Own($cn);
+        $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
         $this->object->append_representative($this->representative);
         $result =3D $this->object->domdoc->saveXML();
@@ -173,9 +195,13 @@
      */
     public function testAppend_client_listing()
     {
+           global $cn, $g_parameter;
+        $cn =3D new Database(26);
+        $g_parameter =3D new Own($cn);
+        $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
         $this->object->append_representative($this->representative);
-        $this->object->append_client_listing($this->declarant,array());
+        $this->object->append_client_listing($this->declarant);
         $result =3D $this->object->domdoc->saveXML();
         $this->assertEquals($this->result, $result);
     }
@@ -186,12 +212,16 @@
      */
     public function testAppend_declarant()
     {
+           global $cn, $g_parameter;
+        $cn =3D new Database(26);
+        $g_parameter =3D new Own($cn);
+        $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
-        $dom=3D$this->object->domdoc->createElement("Listing");
-        $this->object->append_declarant($dom,$this->declarant,array());
+        $dom =3D $this->object->domdoc->createElement("Listing");
+        $this->object->append_declarant($dom, $this->declarant);
         $this->object->domdoc->appendChild($dom);
         $result =3D $this->object->domdoc->saveXML();
-        $expected=3D'<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
+        $expected =3D '<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>
 <ns2:ClientListingConsignment xmlns:ns2=3D"http://www.minfin.fgov.be/Cli=
entListingConsignment" xmlns=3D"http://www.minfin.fgov.be/InputCommon" Cl=
ientListingsNbr=3D"1"/>
 <Listing xmlns:ns2=3D"http://www.minfin.fgov.be/ClientListingConsignment=
">
   <ns2:Declarant xmlns:ns2=3D"http://www.minfin.fgov.be/ClientListingCon=
signment">
@@ -209,5 +239,14 @@
         $this->assertEquals($expected, $result);
     }
=20
+    function call_inline()
+    {
+        $this->setUp();
+    }
=20
 }
+/*
+$a =3D new IntervatTest;
+$a->call_inline();
+$a->testAppend_representative();
+*/
\ No newline at end of file



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


From MAILER-DAEMON Sat Feb 01 16:37:43 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1W9iFz-0000rG-OT
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Feb 2014 16:37:43 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Feb 2014 22:24:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.184254.1391290663.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r685 - trunk/transform/unit-test
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Feb 2014 21:37:42 -0000

Author: danydb
Date: 2014-02-01 22:24:58 +0100 (Sat, 01 Feb 2014)
New Revision: 685

Modified:
   trunk/transform/unit-test/transform_IntervatTest.php
Log:
Backup global : phpunit reset automatically the global variables

Modified: trunk/transform/unit-test/transform_IntervatTest.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/transform_IntervatTest.php	2014-02-01 21:18=
:27 UTC (rev 684)
+++ trunk/transform/unit-test/transform_IntervatTest.php	2014-02-01 21:24=
:58 UTC (rev 685)
@@ -3,7 +3,7 @@
 /**
  * Testing of class_intervat
  *  phpunit-skelgen --bootstrap bootstrap.php --test -- Intervat ../incl=
ude/class_transform_intervat.php
- * phpunit  --colors --bootstrap bootstrap.php transform_IntervatTest.ph=
p=20
+ * phpunit  --tap --colors --bootstrap bootstrap.php transform_IntervatT=
est.php=20
  * @author dany
  * Expected result
  * @code
@@ -51,7 +51,10 @@
=20
 require_once 'class_transform_representative.php';
 require_once 'class_dossier.php';
-
+global $cn, $g_parameter;
+        $cn =3D new Database(26);
+        $g_parameter =3D new Own($cn);
+        $_REQUEST['gDossier'] =3D 26;
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-01-25 at 18:01:0=
8.
  */
@@ -109,10 +112,7 @@
   </ns2:ClientListing>
 </ns2:ClientListingConsignment>
 ';
-        global $cn, $g_parameter;
-        $cn =3D new Database(26);
-        $g_parameter =3D new Own($cn);
-        $_REQUEST['gDossier'] =3D 26;
+       =20
         $this->request =3D new Transform_Request_SQL;
         $this->request->r_type =3D 'phpunit-intervat';
         $this->request->insert();
@@ -157,15 +157,11 @@
=20
     /**
      * @covers Intervat::append_root
-     * @todo   Implement testAppend_root().
      * @backupGlobals enabled
+     * @todo   Implement testAppend_root().
      */
     public function testAppend_root()
     {
-        global $cn, $g_parameter;
-        $cn =3D new Database(26);
-        $g_parameter =3D new Own($cn);
-        $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
         $result =3D $this->object->domdoc->saveXML();
         $must_march =3D '<?xml version=3D"1.0" encoding=3D"ISO-8859-1"?>=
    =20
@@ -177,11 +173,13 @@
         $this->assertContains('ClientListingsNbr=3D"1"', $result);
     }
=20
+    /**
+     * @covers Intervat::append_representative
+     * @backupGlobals enabled
+     * @todo   Implement testAppend_representative().
+     */
     public function testAppend_representative()
     {
-           global $cn, $g_parameter;
-        $cn =3D new Database(26);
-        $g_parameter =3D new Own($cn);
         $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
         $this->object->append_representative($this->representative);
@@ -191,14 +189,11 @@
=20
     /**
      * @covers Intervat::append_client_listing
+     * @backupGlobals enabled
      * @todo   Implement testAppend_client_listing().
      */
     public function testAppend_client_listing()
     {
-           global $cn, $g_parameter;
-        $cn =3D new Database(26);
-        $g_parameter =3D new Own($cn);
-        $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
         $this->object->append_representative($this->representative);
         $this->object->append_client_listing($this->declarant);
@@ -208,14 +203,11 @@
=20
     /**
      * @covers Intervat::append_declarant
+     * @backupGlobals enabled
      * @todo   Implement testAppend_declarant().
      */
     public function testAppend_declarant()
     {
-           global $cn, $g_parameter;
-        $cn =3D new Database(26);
-        $g_parameter =3D new Own($cn);
-        $_REQUEST['gDossier'] =3D 26;
         $this->object->append_root();
         $dom =3D $this->object->domdoc->createElement("Listing");
         $this->object->append_declarant($dom, $this->declarant);
@@ -245,8 +237,3 @@
     }
=20
 }
-/*
-$a =3D new IntervatTest;
-$a->call_inline();
-$a->testAppend_representative();
-*/
\ No newline at end of file



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


From MAILER-DAEMON Tue Feb 04 13:47:01 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WAl1R-0005XR-IM
	for mharc-phpcompta-dev@gnu.org; Tue, 04 Feb 2014 13:47:01 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=mime-version:sender:in-reply-to:references:from:date:message-id
	:subject:to:content-type;
	bh=wmarBwK8RPJPqRTgAazIGpe8p99M07MLcdEs8pznbiQ=;
	b=eMa9cu2xRwz5butHHGeHxdkX6mjayr0ERP9CWzcTkBNL8TurayZIyOOW9S0t+LybK0
	mv4jLYUbulGCmTpWoexLowrxOo1apkBNu7XQrKZ+hUdSbUFsYP87S99yGLUP0uQ/aJ5M
	QuZfQbeV8MAGZPk6w0DPpBgirO0MTYBH/k8WPTmn3iwUOmkwjr+PC00EnUedpox24oHh
	ao3NQj5h3wNcn9/gT6ixcUIF3X4ReGn85s8wPVPmwFfE0+R3qiST1J+XpjpkyZXO73/o
	5LuHgy2A54d4xAAcZmmySMi1mevayUdMLhudse9y0RkYBLg+s6RmVhQ6U9k/mqPQXTnB
	nKoA==
X-Received: by 10.68.221.233 with SMTP id qh9mr44392509pbc.103.1391526787637; 
	Tue, 04 Feb 2014 07:13:07 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <CAM9dODGCfpa2rjT5GAbEdWfbNyFOc0FUrupbR3PCpYbEQpxUpw@mail.gmail.com>
References: <CAM9dODGCfpa2rjT5GAbEdWfbNyFOc0FUrupbR3PCpYbEQpxUpw@mail.gmail.com>
Date: Tue, 4 Feb 2014 16:12:27 +0100
X-Google-Sender-Auth: nauZVQT2Ylczt0hJJe5F9C8hxWo
To: PHPCompta <phpcompta-contrib@nongnu.org>, phpcompta-dev@nongnu.org, 
	phpcompta-support@nongnu.org
Content-Type: multipart/alternative; boundary=e89a8ff25178df685f04f19613d3
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Received-From: 2607:f8b0:400e:c02::229
Message-ID: <mailman.187269.1391539619.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] Fwd: FIn de cette mailing list PhpCompta
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Feb 2014 18:46:58 -0000

--e89a8ff25178df685f04f19613d3
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Bonjour,



Cette mailing-list va =EAtre clotur=E9e, pour continuer =E0 discuter ou lir=
e les
annonces, il faudra s'inscrire sur
noalyss-generale@nongnu.org

Cette liste de diffusion fonctionnera encore un certain temps avant cloture
d=E9finitive mais le mieux est de changer au plus vite.

L'h=E9bergement du code retourne sur savannah, de la Free Foundation Softwa=
re.


http://savannah.nongnu.org/projects/noalyss


Merci =E0 tous,


Dany

--e89a8ff25178df685f04f19613d3
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><br><div class=3D"gmail_quote"><div dir=3D"ltr"><div><div>=
<div>Bonjour,<br><br><br><br></div>Cette mailing-list va =EAtre clotur=E9e,=
 pour continuer =E0 discuter ou lire les annonces, il faudra s&#39;inscrire=
 sur</div>

<a href=3D"mailto:noalyss-generale@nongnu.org" target=3D"_blank">noalyss-ge=
nerale@nongnu.org</a><br><br></div>Cette liste de diffusion fonctionnera en=
core un certain temps avant cloture d=E9finitive mais le mieux est de chang=
er au plus vite.<br>


<br>L&#39;h=E9bergement du code retourne sur savannah, de la Free Foundatio=
n Software.<br><br><br><a href=3D"http://savannah.nongnu.org/projects/noaly=
ss" target=3D"_blank">http://savannah.nongnu.org/projects/noalyss</a><br><b=
r>


<br>Merci =E0 tous,<br><br><br>Dany<br></div>
</div><br></div>

--e89a8ff25178df685f04f19613d3--


From MAILER-DAEMON Tue Feb 04 15:38:54 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WAmli-0002Ze-5c
	for mharc-phpcompta-dev@gnu.org; Tue, 04 Feb 2014 15:38:54 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  4 Feb 2014 21:26:01 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.187689.1391546331.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r686 - in trunk/transform: include include/template
	sql unit-test
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Feb 2014 20:38:51 -0000

Author: danydb
Date: 2014-02-04 21:26:00 +0100 (Tue, 04 Feb 2014)
New Revision: 686

Added:
   trunk/transform/include/class_transform_client.php
   trunk/transform/include/template/listing_client_display.php
Modified:
   trunk/transform/include/class_transform_declarant.php
   trunk/transform/include/class_transform_intervat.php
   trunk/transform/include/class_transform_representative.php
   trunk/transform/include/class_transform_sql.php
   trunk/transform/include/intervat_listing_assujetti.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_3.inc.php
   trunk/transform/sql/install.sql
   trunk/transform/unit-test/transform_IntervatTest.php
Log:
create xml file + test ok

Added: trunk/transform/include/class_transform_client.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_client.php	                  =
      (rev 0)
+++ trunk/transform/include/class_transform_client.php	2014-02-04 20:26:0=
0 UTC (rev 686)
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+/**
+ * @brief manage the table intervat_client
+ */
+class Transform_Client
+{
+
+    /**
+     * vat_amount_sum  VAT amount in the listing
+     */
+    var $vat_amount_sum;
+
+    /**
+     * turnoversum amount without vat in the listing
+     */
+    var $turnoversum;
+
+    /**
+     * nb number of customer in the listing
+     */
+    var $nb;
+
+    /**
+     * Array of table intervat_client
+     */
+    var $array;
+
+    /**
+     * compute value from declarant
+     * @param integer id of declarant (intervat_declarant.d_id)
+     */
+    function compute_value($p_declarant)
+    {
+        global $cn;
+        $this->correct_data($p_declarant);
+        $this->array =3D $cn->get_array('select * from transform.interva=
t_client where d_id=3D$1', array($p_declarant));
+        $this->nb =3D count($this->array);
+       =20
+        $this->vat_amount_sum =3D $cn->get_value('select sum(c_amount_va=
t::numeric) from=20
+            transform.intervat_client where d_id=3D$1',array($p_declaran=
t));
+       =20
+        $this->turnoversum =3D $cn->get_value('select sum(c_amount_novat=
::numeric) from=20
+            transform.intervat_client where d_id=3D$1',array($p_declaran=
t));
+    }
+    private function correct_data($p_declarant)
+    {
+        global $cn;
+        $cn->exec_sql("update transform.intervat_client set c_amount_vat=
=3Dreplace(c_amount_vat,',','.'),
+            c_amount_novat=3Dreplace(c_amount_novat,',','.') where d_id=3D=
$1",array($p_declarant));
+    }
+
+}
+
+?>

Modified: trunk/transform/include/class_transform_declarant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_declarant.php	2014-02-01 21:2=
4:58 UTC (rev 685)
+++ trunk/transform/include/class_transform_declarant.php	2014-02-04 20:2=
6:00 UTC (rev 686)
@@ -128,11 +128,28 @@
         $this->data->d_countrycode=3D$this->countrycode;
         $this->data->d_email=3D$this->email;
         $this->data->d_phone=3D$this->phone;
-        $this->data->d_vatnumber=3D$this->vatnumber;
+        $this->data->d_vat_number=3D$this->vatnumber;
         $this->data->d_countrycode=3D$this->countrycode;
-       =20
+        $this->data->d_periode=3D$this->year;
         $this->data->insert();
     }
+    function from_db($request_id)
+    {
+        global $cn;
+        $id =3D $cn->get_value("select d_id from transform.intervat_decl=
arant where r_id=3D$1", array($request_id));
+        $this->data =3D new Intervat_Declarant_SQL($id);
+        $this->name =3D $this->data->d_name;
+        $this->street =3D $this->data->d_street;
+        $this->postcode =3D $this->data->d_postcode;
+        $this->city =3D $this->data->d_city;
+        $this->countrycode =3D $this->data->d_countrycode;
+        $this->email =3D $this->data->d_email;
+        $this->phone =3D $this->data->d_phone;
+        $this->vatnumber =3D $this->data->d_vat_number;
+        $this->countrycode =3D $this->data->d_countrycode;
+        $this->year =3D $this->data->d_periode;
+    }
+
     function display()
     {
         $this->readOnly=3Dtrue;

Modified: trunk/transform/include/class_transform_intervat.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_intervat.php	2014-02-01 21:24=
:58 UTC (rev 685)
+++ trunk/transform/include/class_transform_intervat.php	2014-02-04 20:26=
:00 UTC (rev 686)
@@ -19,6 +19,7 @@
  */
 require_once 'class_transform_declarant.php';
 require_once 'class_transform_representative.php';
+require_once 'class_transform_client.php';
=20
=20
 /**
@@ -114,13 +115,19 @@
      */
     function append_client_listing(Transform_Declarant $p_declarant)
     {
+        /*
+         * Fetch from intervat_client
+         */
+        $client=3Dnew Transform_Client;
+        $client->compute_value($p_declarant->data->d_id);
+       =20
         // variable
-        $vat_amount_sum =3D 0;
-        $turnoversum =3D 0;
-        $clientnb =3D 2;
+        $vat_amount_sum =3D $client->vat_amount_sum;
+        $turnoversum =3D $client->turnoversum;
+        $clientnb =3D $client->nb;
         $seqnb =3D 1;
-        $periode =3D 2009;
-        $commentaire=3D"Commentaire";
+        $periode =3D $p_declarant->data->d_periode;
+        $commentaire=3D"";
=20
         $decl =3D $this->domdoc->createElementNS($this->ns, "ns2:ClientL=
isting");
         $ai =3D $decl->setAttribute('VATAmountSum', $vat_amount_sum);
@@ -132,10 +139,10 @@
=20
         $this->append_declarant($decl, $p_declarant);
=20
-        $periode =3D $this->domdoc->createElementNS($this->ns, "ns2:Peri=
od", $periode);
+        $periode =3D $this->domdoc->createElementNS($this->ns, "ns2:Peri=
od", $p_declarant->year);
         $decl->appendChild($periode);
=20
-        $this->append_listing($decl, $p_declarant);
+        $this->append_listing($decl, $client);
=20
=20
         $l =3D $this->domdoc->getElementsByTagNameNS($this->ns, "ClientL=
istingConsignment");
@@ -168,7 +175,7 @@
  =20
=20
         $declarant =3D $this->domdoc->createElementNS($this->ns, "ns2:De=
clarant");
-        $declarant->appendChild($this->domdoc->createElement("VATNumber"=
, $p_declarant->vat_number));
+        $declarant->appendChild($this->domdoc->createElement("VATNumber"=
, $p_declarant->vatnumber));
         $declarant->appendChild($this->domdoc->createElement("Name", $p_=
declarant->name));
         $declarant->appendChild($this->domdoc->createElement("Street", $=
p_declarant->street));
         $declarant->appendChild($this->domdoc->createElement("PostCode",=
 $p_declarant->postcode));
@@ -196,33 +203,32 @@
      * @param type $p_array
      */
=20
-    function append_listing(DOMElement $p_dom, Transform_Declarant $p_de=
clarant)
+    function append_listing(DOMElement $p_dom, Transform_Client $p_clien=
t)
     {
         /*
-         * Client are in array
+         * Client are in array $p_client->array
          */
-        $nb_client =3D 2;
-        $vat_number =3D "0000000097";
-        $issued =3D "BE";
-        $turnover =3D 500;
-        $vat_amount =3D 0;
-        $vat_amount_sum =3D 0;
-
        =20
-        for ($i =3D 0; $i < $nb_client; $i++)
+        for ($i =3D 0; $i < $p_client->nb; $i++)
         {
-            $client =3D $this->domdoc->createElementNS($this->ns, "ns2:C=
lient");
-            $ai =3D $client->setAttribute('SequenceNumber', $i+1);
+            $client=3D$p_client->array[$i];
+            $dom_client =3D $this->domdoc->createElementNS($this->ns, "n=
s2:Client");
+            $ai =3D $dom_client->setAttribute('SequenceNumber', $i+1);
             $company =3D $this->domdoc->createElementNS($this->ns, "ns2:=
CompanyVATNumber");
-            $company->setAttribute('issuedBy', 'BE');
-            $de_vat_number =3D $this->domdoc->createTextNode($vat_number=
);
+            $company->setAttribute('issuedBy', $client['c_issuedby']);
+            $de_vat_number =3D $this->domdoc->createTextNode($client['c_=
vatnumber']);
             $company->appendChild($de_vat_number);
-            $client->appendChild($company);
-            $client->appendChild($this->domdoc->createElementNS($this->n=
s,"ns2:TurnOver", $turnover));
-            $client->appendChild($this->domdoc->createElementNS($this->n=
s,"ns2:VATAmount", $vat_amount));
-            $p_dom->appendChild($client);
+            $dom_client->appendChild($company);
+            $dom_client->appendChild($this->domdoc->createElementNS($thi=
s->ns,"ns2:TurnOver", $client['c_amount_novat']));
+            $dom_client->appendChild($this->domdoc->createElementNS($thi=
s->ns,"ns2:VATAmount", $client['c_amount_vat']));
+            $p_dom->appendChild($dom_client);
         }
        =20
     }
+    function toxml()
+    {
+        $str=3D$this->domdoc->saveXML();
+        return $str;
+    }
=20
 }

Modified: trunk/transform/include/class_transform_representative.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_representative.php	2014-02-01=
 21:24:58 UTC (rev 685)
+++ trunk/transform/include/class_transform_representative.php	2014-02-04=
 20:26:00 UTC (rev 686)
@@ -35,6 +35,7 @@
   @endcode
  */
 require_once 'class_transform_sql.php';
+
 class Transform_Representative
 {
=20
@@ -92,15 +93,18 @@
      * Transform_Representative_SQL
      */
     var $data;
+
     /**
      * readOnly
      */
     var $readOnly;
+
     function __construct()
     {
-        $this->readOnly=3Dfalse;
-        $this->data=3Dnew Intervat_Representative_SQL();
+        $this->readOnly =3D false;
+        $this->data =3D new Intervat_Representative_SQL();
     }
+
     function fromPost()
     {
         $this->id =3D HtmlInput::default_value_post("p_id", 1);
@@ -124,25 +128,25 @@
             array("label" =3D> 'other', "value" =3D> "other")
         );
         $h_type->selected =3D $this->type;
-        $h_type->readOnly=3D$this->readOnly;
+        $h_type->readOnly =3D $this->readOnly;
         $h_name =3D new IText('p_name', $this->name);
-        $h_name->readOnly=3D$this->readOnly;
+        $h_name->readOnly =3D $this->readOnly;
         $h_street =3D new IText('p_street', $this->street);
-        $h_street->readOnly=3D$this->readOnly;
+        $h_street->readOnly =3D $this->readOnly;
         $h_postcode =3D new IText('p_postcode', $this->postcode);
-        $h_postcode->readOnly=3D$this->readOnly;
+        $h_postcode->readOnly =3D $this->readOnly;
         $h_city =3D new IText('p_city', $this->city);
-        $h_city->readOnly=3D$this->readOnly;
+        $h_city->readOnly =3D $this->readOnly;
         $h_countrycode =3D new IText('p_countrycode', $this->countrycode=
);
-        $h_countrycode->readOnly=3D$this->readOnly;
+        $h_countrycode->readOnly =3D $this->readOnly;
         $h_email =3D new IText('p_email', $this->email);
-        $h_email->readOnly=3D$this->readOnly;
+        $h_email->readOnly =3D $this->readOnly;
         $h_phone =3D new IText('p_phone', $this->phone);
-        $h_phone->readOnly=3D$this->readOnly;
+        $h_phone->readOnly =3D $this->readOnly;
         $h_id =3D new INum('p_id', $this->id);
-        $h_id->readOnly=3D$this->readOnly;
+        $h_id->readOnly =3D $this->readOnly;
         $h_issued =3D new IText("p_issued", $this->issued);
-        $h_issued->readOnly=3D$this->readOnly;
+        $h_issued->readOnly =3D $this->readOnly;
         require_once 'template/listing_assujetti_representative.php';
     }
=20
@@ -167,4 +171,20 @@
         $this->input();
     }
=20
+    function from_db($request_id)
+    {
+        global $cn;
+        $id =3D $cn->get_value("select rp_id from transform.intervat_rep=
resentative where r_id=3D$1", array($request_id));
+        $this->data =3D new Intervat_Representative_SQL($id);
+        $this->id =3D $this->data->rp_listing_id;
+        $this->issued =3D $this->data->rp_issued;
+        $this->type =3D $this->data->rp_type;
+        $this->name =3D $this->data->rp_name;
+        $this->street =3D $this->data->rp_street;
+        $this->postcode =3D $this->data->rp_postcode;
+        $this->countrycode =3D $this->data->rp_countrycode;
+        $this->email =3D $this->data->rp_email;
+        $this->phone =3D $this->data->rp_phone;
+    }
+
 }

Modified: trunk/transform/include/class_transform_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_sql.php	2014-02-01 21:24:58 U=
TC (rev 685)
+++ trunk/transform/include/class_transform_sql.php	2014-02-04 20:26:00 U=
TC (rev 686)
@@ -37,6 +37,8 @@
     var $r_id;
     var $r_date;
     var $r_type;
+    var $r_start_date;
+    var $r_end_date;
=20
     /* example private $variable=3Darray("easy_name"=3D>column_name,"ema=
il"=3D>"column_name_email","val3"=3D>0); */
=20
@@ -50,13 +52,17 @@
         $this->name =3D array(
             "r_id" =3D> "r_id",
             "r_date" =3D> "r_date",
-            "r_type"=3D>'r_type'
+            "r_type"=3D>'r_type',
+            "r_start_date"=3D>'r_start_date',
+            "r_end_date"=3D>'r_end_date',
         );
=20
         $this->type =3D array(
             "r_id" =3D> "numeric",
             "r_date" =3D> "date",
-            "r_type"=3D>"text"
+            "r_type"=3D>"text",
+            "r_start_date" =3D> "date",
+            "r_end_date" =3D> "date"
         );
=20
         $this->default =3D array(

Modified: trunk/transform/include/intervat_listing_assujetti.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti.inc.php	2014-02-01=
 21:24:58 UTC (rev 685)
+++ trunk/transform/include/intervat_listing_assujetti.inc.php	2014-02-04=
 20:26:00 UTC (rev 686)
@@ -34,7 +34,7 @@
         require 'intervat_listing_assujetti_step_2.inc.php';
     } catch (Exception $e)
     {
-        echo '<p class=3D"notice">'.$e->getMessage().'</p>';
+        echo '<p class=3D"notice">' . $e->getMessage() . '</p>';
         if ($e->getCode() !=3D 3)
         {
             require 'intervat_listing_assujetti_step_1.inc.php';
@@ -43,6 +43,13 @@
 }
 if ($step =3D=3D 2)
 {
-    require 'intervat_listing_assujetti_step_3.inc.php';
+    try
+    {
+        require 'intervat_listing_assujetti_step_3.inc.php';
+    } catch (Exception $e)
+    {
+        echo '<p class=3D"notice">' . $e->getMessage() . '</p>';
+        require 'intervat_listing_assujetti_step_1.inc.php';
+    }
 }
 ?>
\ No newline at end of file

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-01 21:24:58 UTC (rev 685)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-04 20:26:00 UTC (rev 686)
@@ -32,8 +32,12 @@
 $h_tva_compute_date=3Dnew ISelect('p_compute_date');
 $h_tva_compute_date->value=3Darray(
     array('value'=3D>1,'label'=3D>_('Par date paiement')),
-    array('value'=3D>1,'label'=3D>_('Par date op=C3=A9ration'))
+    array('value'=3D>2,'label'=3D>_('Par date op=C3=A9ration'))
     );
+$start_date=3Dnew IDate('p_start_date');
+$start_date->value=3DHtmlInput::default_value_post('p_start_date','');
+$end_date=3Dnew IDate('p_end_date');
+$end_date->value=3DHtmlInput::default_value_post('p_end_date','');
 ?>
=20
 <form method=3D"post" enctype=3D"multipart/form-data">
@@ -46,8 +50,9 @@
 $declarant->input();
 ?>
     <p>
-        <?php echo _('Ann=C3=A9e'),$h_year->input();?>
+        <?php echo _('P=C3=A9riode'),$h_year->input();?>
     </p>
+  =20
     <p>
     <?php
    =20
@@ -78,7 +83,9 @@
         endfor;
         ?>
     </ul>
-
+     <p style=3D"margin-left:30px">
+        <?php printf(_('Entre les date %s et %s'),$start_date->input(),$=
end_date->input());?>
+    </p>
     <span style=3D"margin-left:30px">
     <?php echo _('Op=C3=A9ration de vente'),$h_tva_compute_date->input()=
;?>
     </span>

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-01 21:24:58 UTC (rev 685)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-04 20:26:00 UTC (rev 686)
@@ -32,6 +32,8 @@
 $year =3D HtmlInput::default_value_post('p_year', NULL);
 $atva =3D HtmlInput::default_value_post('h_tva', null);
 $compute_date =3D HtmlInput::default_value_post('p_compute_date', null);
+$start_date=3DHtmlInput::default_value_post('p_start_date',null);
+$end_date=3DHtmlInput::default_value_post('p_end_date',null);
 $rejected=3Darray();
    =20
 // If inputtype is null not choice between file or compute
@@ -39,6 +41,15 @@
 {
     throw new Exception(_('Vous devez choisir par fichier ou par calcul'=
), 4);
 }
+if ($start_date =3D=3D null || $end_date =3D=3D null)
+{
+    throw new Exception(_('La date donn=C3=A9e est invalide'), 9);
+}
+if (isDate($start_date) =3D=3D null || isDate($end_date) =3D=3D null )
+{
+    throw new Exception(_('La date donn=C3=A9e est invalide'), 9);
+}
+
 // if inputtype is by computing (=3D2) then year must existe as exercice=
=20
 // and tva_id must not be empty
 if ($inputtype =3D=3D 2)
@@ -72,7 +83,8 @@
  */
 $request =3D new Transform_Request_SQL();
 $request->r_type =3D 'intervat';
-
+$request->r_start_date=3D$start_date;
+$request->r_end_date=3D$end_date;
 $request->insert();
=20
 $representative =3D new Transform_Representative();
@@ -149,20 +161,15 @@
     if ($compute_date =3D=3D 1)
     {
         $sql =3D "
-        with  c as=20
+      with  c as=20
         (select qs_client,
          sum(qs_vat) as vat_amount,
          sum(qs_price) as amount=20
          from quant_sold =20
+         join jrnx using (j_id)
          where=20
-         qs_vat_code in $ltva=20
-         and j_id in (select j_id=20
-                        from jrnx=20
-                        where=20
-                        j_tech_per in=20
-                            (select  p_id=20
-                                from parm_periode=20
-                                    where p_exercice=3D$1) )=20
+         qs_vat_code in $ltva and
+         j_date between to_date($1,'DD.MM.YYYY') and to_date($2,'DD.MM.Y=
YYY')
         group by qs_client)
         ,f_name as=20
         (select f_id,ad_value=20
@@ -177,7 +184,8 @@
    vat_amount,amount
 from=20
     c join f_name on (qs_client=3Df_name.f_id)
-    join f_tvanum on (qs_client=3Df_tvanum.f_id)
+    join f_tvanum on (qs_client=3Df_tvanum.f_id);
+
     ";
     } elseif ($compute_date =3D=3D 2) //------ Payment date ------------=
----
     {
@@ -189,12 +197,11 @@
         from=20
             quant_sold join jrnx on (jrnx.j_id=3Dquant_sold.j_id)=20
         where=20
-        qs_vat_code=3D1=20
+        qs_vat_code $ltva
         and j_grpt in (select jr_grpt_id=20
                         from jrn=20
                         where=20
-                        jr_date_paid >=3D (select min(p_start) from parm=
_periode where p_exercice=3D$1 )=20
-                        and jr_date_paid <=3D  (select max(p_start) from=
 parm_periode where p_exercice=3D$1 ))
+                        jr_date_paid between to_date($1,'DD.MM.YYYY') an=
d to_date($2,'DD.MM.YYYY'))
          group by qs_client)
     ,f_name as=20
     (select f_id,
@@ -217,7 +224,7 @@
    join f_tvanum on (qs_client=3Df_tvanum.f_id)
 ";
     }
-    $a_listing =3D $cn->get_array($sql, array($year));
+    $a_listing =3D $cn->get_array($sql, array($start_date,$end_date));
    =20
     /**
      * Save data into Intervat_Client
@@ -258,3 +265,11 @@
 $ret=3D$a_listing->seek(' where d_id =3D $1',array($declarant->data->d_i=
d));
 require 'template/listing_client_display.php';
 ?>
+<form method=3D"POST">
+    <?php echo HtmlInput::hidden('r_id',$request->r_id);?>
+    <?php=20
+        echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugi=
n_code', 'sa'));
+        echo HtmlInput::hidden('st_transf',2);
+        echo HtmlInput::submit('submit','Valider');
+    ?>
+</form>

Modified: trunk/transform/include/intervat_listing_assujetti_step_3.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-01 21:24:58 UTC (rev 685)
+++ trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-04 20:26:00 UTC (rev 686)
@@ -21,4 +21,26 @@
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
=20
=20
+$request_id=3DHtmlInput::default_value_post('r_id',null);
=20
+if ($request_id =3D=3D null)
+{
+    throw new Exception(_('Acc=C3=A8s directe incorrecte'), 15);
+}
+
+require_once 'class_transform_declarant.php';
+require_once 'class_transform_representative.php';
+require_once 'class_transform_intervat.php';
+
+$declarant=3Dnew Transform_Declarant();
+$representative=3Dnew Transform_Representative;
+
+$declarant->from_db($request_id);
+$representative->from_db($request_id);
+
+$xml=3Dnew Transform_Intervat;
+
+$xml->append_root();
+$xml->append_client_listing($declarant);
+
+$xml->toxml();

Added: trunk/transform/include/template/listing_client_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/template/listing_client_display.php	         =
               (rev 0)
+++ trunk/transform/include/template/listing_client_display.php	2014-02-0=
4 20:26:00 UTC (rev 686)
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+/**
+ * @brief Display result of insert,=20
+ * parameters are $ret (return of seek) and $a_listing  (Intervat_Client=
_SQL )
+ @see intervat_listing_assujetti_step_2.inc.php
+ */
+$nb=3DDatabase::num_row($ret);
+?>
+<table>
+    <tr>
+        <th>
+            <?php echo _('Nom'); ?>
+        </th>
+        <th>
+            <?php echo _('Num=C3=A9ro TVA'); ?>
+        </th>
+        <th>
+            <?php echo _('Montant'); ?>
+        </th>
+        <th>
+            <?php echo _('TVA'); ?>
+        </th>
+        <th>
+            Action
+        </th>
+    </tr>
+<?php   =20
+    for ($i=3D0;$i<$nb;$i++):
+        $data=3D$a_listing->next($ret,$i);
+?>
+    <tr>
+        <td>
+            <?php=20
+            echo h($data->c_name);
+            ?>
+        </td>
+        <td>
+            <?php=20
+            echo h($data->c_vatnumber);
+            ?>
+        </td>
+        <td>
+            <?php=20
+            echo h($data->c_amount_novat);
+            ?>
+        </td>
+        <td>
+            <?php=20
+            echo h($data->c_amount_vat);
+            ?>
+        </td>
+        <td>
+            Modifier / enlever
+        </td>
+    </tr>
+    <?php=20
+    endfor;
+    ?>
+</table>
\ No newline at end of file

Modified: trunk/transform/sql/install.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/sql/install.sql	2014-02-01 21:24:58 UTC (rev 685)
+++ trunk/transform/sql/install.sql	2014-02-04 20:26:00 UTC (rev 686)
@@ -46,7 +46,10 @@
 	c_issuedby char(2) default 'BE'
 )
=20
-alter table transform.request add         r_date date
-alter table transform.request alter r_date set default now()
-alter table transform.request add         r_type text=20
+alter table transform.request add         r_date date;
+alter table transform.request alter r_date set default now();
+alter table transform.request add         r_type text ;
+ALTER TABLE transform.request ADD COLUMN r_start_date date;
+ALTER TABLE transform.request ADD COLUMN r_end_date date;
=20
+

Modified: trunk/transform/unit-test/transform_IntervatTest.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/transform_IntervatTest.php	2014-02-01 21:24=
:58 UTC (rev 685)
+++ trunk/transform/unit-test/transform_IntervatTest.php	2014-02-04 20:26=
:00 UTC (rev 686)
@@ -50,6 +50,7 @@
 require_once 'bootstrap.php';
=20
 require_once 'class_transform_representative.php';
+require_once 'class_transform_sql.php';
 require_once 'class_dossier.php';
 global $cn, $g_parameter;
         $cn =3D new Database(26);
@@ -86,9 +87,9 @@
     <EmailAddress>dany@alch.be</EmailAddress>
     <Phone>000000000</Phone>
   </ns2:Representative>
-  <ns2:ClientListing VATAmountSum=3D"0" TurnOverSum=3D"0" ClientsNbr=3D"=
2" SequenceNumber=3D"1">
+  <ns2:ClientListing VATAmountSum=3D"0" TurnOverSum=3D"1000" ClientsNbr=3D=
"2" SequenceNumber=3D"1">
     <ns2:Declarant>
-      <VATNumber>0000000097</VATNumber>
+      <VATNumber>1234567890</VATNumber>
       <Name>Nom Declarant</Name>
       <Street>Rue du declarant</Street>
       <PostCode>9999</PostCode>
@@ -108,13 +109,19 @@
       <ns2:TurnOver>500</ns2:TurnOver>
       <ns2:VATAmount>0</ns2:VATAmount>
     </ns2:Client>
-    <ns2:Comment>Commentaire</ns2:Comment>
+    <ns2:Comment></ns2:Comment>
   </ns2:ClientListing>
 </ns2:ClientListingConsignment>
 ';
+        global $cn, $g_parameter;
+        $cn =3D new Database(26);
+        $g_parameter =3D new Own($cn);
+        $_REQUEST['gDossier'] =3D 26;
        =20
         $this->request =3D new Transform_Request_SQL;
         $this->request->r_type =3D 'phpunit-intervat';
+        $this->request->r_start_date=3D'01.01.1900';
+        $this->request->r_end_date=3D'01.01.1900';
         $this->request->insert();
=20
         $this->representative =3D new Transform_Representative();
@@ -135,7 +142,7 @@
          */
         $this->declarant =3D new Transform_Declarant();
         $this->declarant->data->r_id =3D $this->request->r_id;
-        $this->declarant->vat_number =3D "0000000097";
+        $this->declarant->vatnumber =3D "1234567890";
         $this->declarant->name =3D "Nom Declarant";
         $this->declarant->street =3D "Rue du declarant";
         $this->declarant->postcode =3D "9999";
@@ -143,7 +150,26 @@
         $this->declarant->countrycode =3D "BE";
         $this->declarant->email =3D "dany@alch.be";
         $this->declarant->phone =3D "000000000";
+        $this->declarant->year =3D "2009";
         $this->declarant->insert();
+       =20
+        $client=3Dnew Intervat_Client_SQL;
+        $client->d_id=3D$this->declarant->data->d_id;
+        $client->c_name=3D"";
+        $client->c_vatnumber=3D"0000000097";
+        $client->c_issuedby=3D"BE";
+        $client->c_amount_vat=3D0;
+        $client->c_amount_novat=3D500;
+        $client->insert();
+        //
+        $client=3Dnew Intervat_Client_SQL;
+        $client->d_id=3D$this->declarant->data->d_id;
+        $client->c_name=3D"";
+        $client->c_vatnumber=3D"0000000097";
+        $client->c_issuedby=3D"BE";
+        $client->c_amount_vat=3D0;
+        $client->c_amount_novat=3D500;
+        $client->insert();
     }
=20
     /**
@@ -217,7 +243,7 @@
 <ns2:ClientListingConsignment xmlns:ns2=3D"http://www.minfin.fgov.be/Cli=
entListingConsignment" xmlns=3D"http://www.minfin.fgov.be/InputCommon" Cl=
ientListingsNbr=3D"1"/>
 <Listing xmlns:ns2=3D"http://www.minfin.fgov.be/ClientListingConsignment=
">
   <ns2:Declarant xmlns:ns2=3D"http://www.minfin.fgov.be/ClientListingCon=
signment">
-    <VATNumber>0000000097</VATNumber>
+    <VATNumber>1234567890</VATNumber>
     <Name>Nom Declarant</Name>
     <Street>Rue du declarant</Street>
     <PostCode>9999</PostCode>



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


From MAILER-DAEMON Tue Feb 04 17:26:57 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WAoSH-0005Ol-NG
	for mharc-phpcompta-dev@gnu.org; Tue, 04 Feb 2014 17:26:57 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  4 Feb 2014 23:14:06 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.187883.1391552817.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r687 - in trunk/transform: . include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Feb 2014 22:26:56 -0000

Author: danydb
Date: 2014-02-04 23:14:06 +0100 (Tue, 04 Feb 2014)
New Revision: 687

Added:
   trunk/transform/raw.php
Modified:
   trunk/transform/include/class_transform_declarant.php
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_3.inc.php
Log:

Add test=20
Add step
Add export to XML


Modified: trunk/transform/include/class_transform_declarant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_declarant.php	2014-02-04 20:2=
6:00 UTC (rev 686)
+++ trunk/transform/include/class_transform_declarant.php	2014-02-04 22:1=
4:06 UTC (rev 687)
@@ -128,8 +128,7 @@
         $this->data->d_countrycode=3D$this->countrycode;
         $this->data->d_email=3D$this->email;
         $this->data->d_phone=3D$this->phone;
-        $this->data->d_vat_number=3D$this->vatnumber;
-        $this->data->d_countrycode=3D$this->countrycode;
+        $this->data->d_vat_number=3Dstr_ireplace("be", "", $this->vatnum=
ber);
         $this->data->d_periode=3D$this->year;
         $this->data->insert();
     }

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-04 20:26:00 UTC (rev 686)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-04 22:14:06 UTC (rev 687)
@@ -15,86 +15,130 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
=20
 require_once 'class_transform_representative.php';
 require_once 'class_transform_declarant.php';
-$representative=3Dnew Transform_Representative();
+$representative =3D new Transform_Representative();
 $representative->fromPost();
-$declarant=3Dnew Transform_Declarant();
+$declarant =3D new Transform_Declarant();
 $declarant->fromPost();
-$radio=3Dnew IRadio('p_inputtype');
-$h_tva=3Dnew ICheckBox('h_tva[]');
-$h_year=3Dnew INum('p_year');
-$h_year->prec=3D0;
-$h_tva_compute_date=3Dnew ISelect('p_compute_date');
-$h_tva_compute_date->value=3Darray(
-    array('value'=3D>1,'label'=3D>_('Par date paiement')),
-    array('value'=3D>2,'label'=3D>_('Par date op=C3=A9ration'))
-    );
-$start_date=3Dnew IDate('p_start_date');
-$start_date->value=3DHtmlInput::default_value_post('p_start_date','');
-$end_date=3Dnew IDate('p_end_date');
-$end_date->value=3DHtmlInput::default_value_post('p_end_date','');
-?>
+$radio =3D new IRadio('p_inputtype');
+$h_tva =3D new ICheckBox('h_tva[]');
+$h_year =3D new INum('p_year');
+$h_year->prec =3D 0;
+$h_tva_compute_date =3D new ISelect('p_compute_date');
+$h_tva_compute_date->value =3D array(
+    array('value' =3D> 1, 'label' =3D> _('Par date paiement')),
+    array('value' =3D> 2, 'label' =3D> _('Par date op=C3=A9ration'))
+);
+$start_date =3D new IDate('p_start_date');
+$start_date->id=3D"p_start_date_id";
+$start_date->value =3D HtmlInput::default_value_post('p_start_date', '')=
;
+$end_date =3D new IDate('p_end_date');
+$end_date->value =3D HtmlInput::default_value_post('p_end_date', '');
+$end_date->id=3D"p_end_date_id";
=20
-<form method=3D"post" enctype=3D"multipart/form-data">
-    <h2><?php echo _('Mandataire');?></h2>
-<?php
-$representative->input();
 ?>
-    <h2><?php echo _('D=C3=A9clarant');?></h2>
-<?php
-$declarant->input();
-?>
-    <p>
-        <?php echo _('P=C3=A9riode'),$h_year->input();?>
-    </p>
-  =20
-    <p>
+<h2> <?php echo _('Etape 1/3') ?></h2>
+<form method=3D"post" enctype=3D"multipart/form-data" onsubmit=3D"return=
 check_form()">
+    <h3><?php echo _('Mandataire'); ?></h3>
     <?php
-   =20
-    $radio->value=3D1;
-    echo $radio->input()._('Par fichier');
-    $file =3D new IFile('client_assujetti');
-    echo $file->input();
+    $representative->input();
     ?>
+    <h3><?php echo _('D=C3=A9clarant'); ?></h3>
+    <?php
+    $declarant->input();
+    ?>
+    <p>
+        <?php echo _('P=C3=A9riode'), $h_year->input(); ?>
     </p>
+
     <p>
+        <input type=3D"radio" name=3D"p_inputtype" id=3D"file_radio" val=
ue=3D"1" onclick=3D"show_file();">
         <?php
-        $radio->value=3D2;
-        echo $radio->input()._('Par calcul');
-        $atva=3D$cn->get_array('select tva_id,tva_rate,tva_comment from =
tva_rate order by 2');
-        $count_atva=3Dcount($atva);
+            echo  _('Par fichier');
         ?>
-    <ul style=3D"list-style: none">
+        <span id=3D"sp_file" style=3D"display:none">
+            <?php
+            $file =3D new IFile('client_assujetti');
+            echo $file->input();
+            ?>
+        </span>
+    </p>
+    <p>
+        <input type=3D"radio" name=3D"p_inputtype" id=3D"calc_radio" val=
ue=3D"2" onclick=3D"show_calc()">
         <?php
-        for ($i=3D0;$i<$count_atva;$i++):
+        echo  _('Par calcul');
         ?>
-        <li>
+        <div id=3D"sp_calcul" style=3D"display:none">
+            <p style=3D"margin-left:30px">
+                <?php printf(_('Entre les date %s et %s'), $start_date->=
input(), $end_date->input()); ?>
+            </p>
             <?php
-                $h_tva->value=3D$atva[$i]['tva_id'];
-                echo $h_tva->input().h($atva[$i]['tva_rate'])." ".h($atv=
a[$i]['tva_comment']);
+            $atva =3D $cn->get_array('select tva_id,tva_rate,tva_comment=
 from tva_rate order by 2');
+            $count_atva =3D count($atva);
             ?>
-        </li>
-        <?php
-        endfor;
-        ?>
-    </ul>
-     <p style=3D"margin-left:30px">
-        <?php printf(_('Entre les date %s et %s'),$start_date->input(),$=
end_date->input());?>
-    </p>
-    <span style=3D"margin-left:30px">
-    <?php echo _('Op=C3=A9ration de vente'),$h_tva_compute_date->input()=
;?>
-    </span>
+            <ul style=3D"list-style: none">
+                <?php
+                for ($i =3D 0; $i < $count_atva; $i++):
+                    ?>
+                    <li>
+                        <?php
+                        $h_tva->value =3D $atva[$i]['tva_id'];
+                        echo $h_tva->input() . h($atva[$i]['tva_rate']) =
. " " . h($atva[$i]['tva_comment']);
+                        ?>
+                    </li>
+                    <?php
+                endfor;
+                ?>
+            </ul>
+           =20
+            <span style=3D"margin-left:30px">
+                <?php echo _('Op=C3=A9ration de vente'), $h_tva_compute_=
date->input(); ?>
+            </span>
+        </div>
     </p>   =20
     <p>
         <?php
         echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugi=
n_code', 'sa'));
-        echo HtmlInput::hidden('st_transf',1);
+        echo HtmlInput::hidden('st_transf', 1);
         echo HtmlInput::submit('send_list', 'Valider');
         ?>
     </p>
 </form>   =20
+<script>
+    function show_file() {
+        $('sp_file').show();
+        $('sp_calcul').hide();
+    }
+    function show_calc() {
+        $('sp_file').hide();
+        $('sp_calcul').show();
+    }
+    function check_form()
+    {
+        if ($('p_year').value=3D=3D"") {
+            alert('Vous avez oubli=C3=A9 la p=C3=A9riode');
+            $('p_year').style.borderColor=3D"red";
+            return false;
+        }
+        if ( $('p_start_date_id').value=3D=3D"" && $('calc_radio').check=
ed) {
+            alert('Date incorrect');
+            $('p_start_date_id').style.borderColor=3D"red";
+            return false;
+        }
+        if (  $('p_end_date_id').value=3D=3D"" && $('calc_radio').checke=
d) {
+            alert('Date incorrect');
+            $('p_end_date_id').style.borderColor=3D"red";
+            return false;
+        }
+        if ( ! $('calc_radio').checked && ! $('file_radio').checked ) {
+            alert('Vous devez choisir par fichier ou par calcul');
+            return false
+        }
+        return true;
+    }
+</script>   =20
\ No newline at end of file

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-04 20:26:00 UTC (rev 686)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-04 22:14:06 UTC (rev 687)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  *   This file is part of NOALYSS.
  *
@@ -32,10 +31,10 @@
 $year =3D HtmlInput::default_value_post('p_year', NULL);
 $atva =3D HtmlInput::default_value_post('h_tva', null);
 $compute_date =3D HtmlInput::default_value_post('p_compute_date', null);
-$start_date=3DHtmlInput::default_value_post('p_start_date',null);
-$end_date=3DHtmlInput::default_value_post('p_end_date',null);
-$rejected=3Darray();
-   =20
+$start_date =3D HtmlInput::default_value_post('p_start_date', null);
+$end_date =3D HtmlInput::default_value_post('p_end_date', null);
+$rejected =3D array();
+
 // If inputtype is null not choice between file or compute
 if ($inputtype =3D=3D null)
 {
@@ -45,7 +44,7 @@
 {
     throw new Exception(_('La date donn=C3=A9e est invalide'), 9);
 }
-if (isDate($start_date) =3D=3D null || isDate($end_date) =3D=3D null )
+if (isDate($start_date) =3D=3D null || isDate($end_date) =3D=3D null)
 {
     throw new Exception(_('La date donn=C3=A9e est invalide'), 9);
 }
@@ -83,8 +82,8 @@
  */
 $request =3D new Transform_Request_SQL();
 $request->r_type =3D 'intervat';
-$request->r_start_date=3D$start_date;
-$request->r_end_date=3D$end_date;
+$request->r_start_date =3D $start_date;
+$request->r_end_date =3D $end_date;
 $request->insert();
=20
 $representative =3D new Transform_Representative();
@@ -224,52 +223,58 @@
    join f_tvanum on (qs_client=3Df_tvanum.f_id)
 ";
     }
-    $a_listing =3D $cn->get_array($sql, array($start_date,$end_date));
-   =20
+    $a_listing =3D $cn->get_array($sql, array($start_date, $end_date));
+
     /**
      * Save data into Intervat_Client
      */
     $o_data =3D array();
-        try
+    try
+    {
+        $cn->start();
+        $nb =3D count($a_listing);
+        for ($i =3D 0; $i < $nb; $i++)
         {
-            $cn->start();
-            $nb=3Dcount($a_listing);
-            for ($i=3D0;$i <$nb; $i++)
-            {
-                /*
-                 * insert into transform.intervat_client
-                 */
-                $o_data[$i] =3D new Intervat_Client_SQL();
-                $o_data[$i]->d_id =3D $declarant->data->d_id;
-                $o_data[$i]->c_name =3D $a_listing[$i]['name'];
-                $o_data[$i]->c_issuedby =3D "BE";
-                $o_data[$i]->c_vatnumber =3D $a_listing[$i]['tvanumb'];
-                $o_data[$i]->c_amount_vat =3D  $a_listing[$i]['vat_amoun=
t'];
-                $o_data[$i]->c_amount_novat =3D  $a_listing[$i]['amount'=
];
-                $o_data[$i]->insert();
-            }
-            $cn->commit();
-        } catch (Exception $ex)
-        {
-            $cn->rollback();
-            throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i=
]->c_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
+            /*
+             * insert into transform.intervat_client
+             */
+            $o_data[$i] =3D new Intervat_Client_SQL();
+            $o_data[$i]->d_id =3D $declarant->data->d_id;
+            $o_data[$i]->c_name =3D $a_listing[$i]['name'];
+            $o_data[$i]->c_issuedby =3D "BE";
+            $o_data[$i]->c_vatnumber =3D $a_listing[$i]['tvanumb'];
+            $o_data[$i]->c_amount_vat =3D $a_listing[$i]['vat_amount'];
+            $o_data[$i]->c_amount_novat =3D $a_listing[$i]['amount'];
+            $o_data[$i]->insert();
         }
+        $cn->commit();
+    } catch (Exception $ex)
+    {
+        $cn->rollback();
+        throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i]->c=
_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
+    }
 }
-   =20
-    /**
-     * Show the result=20
-     */
-echo $representative->display();
-echo $declarant->display();
-$a_listing=3Dnew Intervat_Client_SQL;
-$ret=3D$a_listing->seek(' where d_id =3D $1',array($declarant->data->d_i=
d));
-require 'template/listing_client_display.php';
 ?>
+<h2> <?php echo _('Etape 2/3') ?></h2>
+<h3><?php echo _('Mandataire'); ?></h3>
+<?php
+$representative->display();
+?>
+<h3><?php echo _('D=C3=A9clarant'); ?></h3>
+<?php
+$declarant->display();
+?>
+<p>
+    <?php
+    $a_listing =3D new Intervat_Client_SQL;
+    $ret =3D $a_listing->seek(' where d_id =3D $1', array($declarant->da=
ta->d_id));
+    require 'template/listing_client_display.php';
+    ?>
 <form method=3D"POST">
-    <?php echo HtmlInput::hidden('r_id',$request->r_id);?>
-    <?php=20
-        echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugi=
n_code', 'sa'));
-        echo HtmlInput::hidden('st_transf',2);
-        echo HtmlInput::submit('submit','Valider');
+    <?php echo HtmlInput::hidden('r_id', $request->r_id); ?>
+    <?php
+    echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugin_co=
de', 'sa'));
+    echo HtmlInput::hidden('st_transf', 2);
+    echo HtmlInput::submit('submit', 'Valider');
     ?>
 </form>

Modified: trunk/transform/include/intervat_listing_assujetti_step_3.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-04 20:26:00 UTC (rev 686)
+++ trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-04 22:14:06 UTC (rev 687)
@@ -28,19 +28,14 @@
     throw new Exception(_('Acc=C3=A8s directe incorrecte'), 15);
 }
=20
-require_once 'class_transform_declarant.php';
-require_once 'class_transform_representative.php';
-require_once 'class_transform_intervat.php';
=20
-$declarant=3Dnew Transform_Declarant();
-$representative=3Dnew Transform_Representative;
-
-$declarant->from_db($request_id);
-$representative->from_db($request_id);
-
-$xml=3Dnew Transform_Intervat;
-
-$xml->append_root();
-$xml->append_client_listing($declarant);
-
-$xml->toxml();
+?>
+<h2> <?php echo _('Etape 3/3') ?></h2>
+<form method=3D"get" action=3D"extension.raw.php">
+   =20
+    <?php
+    echo HtmlInput::post_to_hidden(array('r_id','ac','gDossier','plugin_=
code'));
+    echo HtmlInput::hidden('act','listing_assujetti');
+    echo HtmlInput::submit('get','Fichier XML');
+    ?>
+</form>

Added: trunk/transform/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/raw.php	                        (rev 0)
+++ trunk/transform/raw.php	2014-02-04 22:14:06 UTC (rev 687)
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+$act =3D HtmlInput::default_value_get('act', null);
+
+switch ($act)
+{
+    case 'listing_assujetti':
+        $request_id =3D HtmlInput::default_value_get('r_id', null);
+
+        if ($request_id =3D=3D null)
+        {
+            throw new Exception(_('Acc=C3=A8s directe incorrecte'), 15);
+        }
+        require_once 'include/class_transform_declarant.php';
+        require_once 'include/class_transform_representative.php';
+        require_once 'include/class_transform_intervat.php';
+
+        $declarant =3D new Transform_Declarant();
+        $representative =3D new Transform_Representative;
+
+        $declarant->from_db($request_id);
+        $representative->from_db($request_id);
+
+        $xml =3D new Transform_Intervat;
+
+        $xml->append_root();
+        $xml->append_client_listing($declarant);
+        $file =3D "listing_assujetti" . date('d.m.y.h.mi').".xml";
+        $ref =3D $_ENV['TMP'] . "/" . $file;
+        echo $xml->domdoc->save($ref);
+        header('Content-type: application/bin');
+        header('Pragma: public');
+        header('Content-Disposition: attachment;filename=3D"'.$ref.'"',F=
ALSE);
+        $file_xml=3Dfopen($ref,'r');
+        while ($in=3Dfread($file_xml,8192)) { echo $in; }
+        break;
+}
\ No newline at end of file



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


From MAILER-DAEMON Tue Feb 04 18:07:01 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WAp53-0004a5-35
	for mharc-phpcompta-dev@gnu.org; Tue, 04 Feb 2014 18:07:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue,  4 Feb 2014 23:54:09 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.187894.1391555220.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r688 - in trunk/transform: . unit-test
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Feb 2014 23:06:59 -0000

Author: danydb
Date: 2014-02-04 23:54:09 +0100 (Tue, 04 Feb 2014)
New Revision: 688

Modified:
   trunk/transform/raw.php
   trunk/transform/unit-test/valide-xml.php
Log:
Update : generate correct xml

Modified: trunk/transform/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/raw.php	2014-02-04 22:14:06 UTC (rev 687)
+++ trunk/transform/raw.php	2014-02-04 22:54:09 UTC (rev 688)
@@ -44,13 +44,14 @@
=20
         $xml->append_root();
         $xml->append_client_listing($declarant);
-        $file =3D "listing_assujetti" . date('d.m.y.h.mi').".xml";
+        $file =3D "listing_assujetti" . date('d.m.y.hi') . ".xml";
         $ref =3D $_ENV['TMP'] . "/" . $file;
-        echo $xml->domdoc->save($ref);
+        $xml->domdoc->save($ref);
         header('Content-type: application/bin');
         header('Pragma: public');
-        header('Content-Disposition: attachment;filename=3D"'.$ref.'"',F=
ALSE);
-        $file_xml=3Dfopen($ref,'r');
-        while ($in=3Dfread($file_xml,8192)) { echo $in; }
+        header('Content-Disposition: attachment;filename=3D"' . $file . =
'"', FALSE);
+        $file_xml =3D fopen($ref, 'r');
+        $in =3D fread($file_xml, filesize($ref));
+        echo $in;
         break;
-}
\ No newline at end of file
+}

Modified: trunk/transform/unit-test/valide-xml.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/valide-xml.php	2014-02-04 22:14:06 UTC (rev=
 687)
+++ trunk/transform/unit-test/valide-xml.php	2014-02-04 22:54:09 UTC (rev=
 688)
@@ -44,7 +44,7 @@
 libxml_use_internal_errors(true);=20
=20
 //$file =3D "valide-exemple-listing.xml";
-$file =3D "test.xml";
+$file =3D "listing_assujetti04.02.14.1158.xml";
 $schema =3D "xsd/NewLK-in_v0_7.xsd";
=20
 // Instanciation d=E2=80=99un DOMDocument



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


From MAILER-DAEMON Wed Feb 05 15:07:15 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WB8kd-00009Y-QA
	for mharc-phpcompta-dev@gnu.org; Wed, 05 Feb 2014 15:07:15 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed,  5 Feb 2014 20:54:22 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.188715.1391630834.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r689 - in trunk/transform: . include
	include/template sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Feb 2014 20:07:13 -0000

Author: danydb
Date: 2014-02-05 20:54:22 +0100 (Wed, 05 Feb 2014)
New Revision: 689

Added:
   trunk/transform/ajax.php
   trunk/transform/ajax_modify_intervat_assujetti.php
   trunk/transform/ajax_save_intervat_assujetti.php
   trunk/transform/transform_javascript.js
Modified:
   trunk/transform/include/class_transform_client.php
   trunk/transform/include/class_transform_declarant.php
   trunk/transform/include/class_transform_representative.php
   trunk/transform/include/class_transform_sql.php
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
   trunk/transform/include/template/listing_client_display.php
   trunk/transform/index.php
   trunk/transform/sql/install.sql
Log:

new : can correct listing
new : comment per row
new : verify for representative and declarant


Added: trunk/transform/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/ajax.php	                        (rev 0)
+++ trunk/transform/ajax.php	2014-02-05 19:54:22 UTC (rev 689)
@@ -0,0 +1,25 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+
+$file=3DHtmlInput::default_value_get('act',null);
+if ($file=3D=3Dnull) die(_('No action'));
+require_once 'ajax_'.$file.'.php';       =20
+?>       =20
\ No newline at end of file

Added: trunk/transform/ajax_modify_intervat_assujetti.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/ajax_modify_intervat_assujetti.php	                  =
      (rev 0)
+++ trunk/transform/ajax_modify_intervat_assujetti.php	2014-02-05 19:54:2=
2 UTC (rev 689)
@@ -0,0 +1,83 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+
+require_once 'include/class_transform_client.php';
+
+echo HtmlInput::title_box(_('Client'),'modify_intervat_assujetti_div');
+$id=3DHtmlInput::default_value_get('c_id',null);
+if ($id=3D=3Dnull || isNumber($id)=3D=3D0) {
+    throw new Exception(_('Aucun client'));
+}
+$client=3Dnew Transform_Client($id);
+$name=3Dnew IText('c_name',$client->c_name);
+$vatnumber=3Dnew IText('c_vatnumber',$client->c_vatnumber);
+$c_amount_novat=3Dnew INum('c_amount_novat',$client->c_amount_novat);
+$c_amount_vat=3Dnew INum('c_amount_vat',$client->c_amount_vat);
+?>       =20
+<form method=3D"get" id=3D"save_intervat_assujetti_frm" onsubmit=3D"retu=
rn save_intervat_assujetti();return false;">
+    <table>
+        <tr>
+            <td>
+                <?php echo _('Nom')?>
+            </td>
+            <td>
+                <?php echo $name->input();?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <?php echo _('TVA')?>
+            </td>
+            <td>
+                <?php echo $vatnumber->input();?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <?php echo _('Montant')?>
+            </td>
+            <td>
+                <?php echo $c_amount_novat->input();?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <?php echo _('TVA')?>
+            </td>
+            <td>
+                <?php echo $c_amount_vat->input();?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <?php echo _('Commentaire'); ?>
+            </td>
+            <td id=3D"modify_intervat_assujetti_div_comment">
+                <?php echo $client->c_comment; ?>
+            </td>
+        </tr>
+    </table>
+    <input type=3D"checkbox" id=3D"remove_intervat_assujetti" value=3D"5=
" name=3D"remove_intervat_assujetti"><?php echo _('Cochez pour effacer ce=
tte fiche')?>
+    <?php
+    echo HtmlInput::request_to_hidden(array('c_id','ac','act','gDossier'=
,'plugin_code'));
+    echo HtmlInput::submit('save_intervat_assujetti_sb',_('Valider'));
+    ?>
+</form>
\ No newline at end of file

Added: trunk/transform/ajax_save_intervat_assujetti.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/ajax_save_intervat_assujetti.php	                    =
    (rev 0)
+++ trunk/transform/ajax_save_intervat_assujetti.php	2014-02-05 19:54:22 =
UTC (rev 689)
@@ -0,0 +1,87 @@
+<?php
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+// require_once '.php';
+require_once 'include/class_transform_client.php';
+$id =3D HtmlInput::default_value_request('c_id', null);
+$act =3D HtmlInput::default_value_request('remove_intervat_assujetti', 0=
);
+ob_start();
+if ($id =3D=3D null)
+    echo _('Client incorrect');
+else
+{
+    $client =3D new Transform_Client($id);
+    if ($act =3D=3D 0)
+    {
+        $action =3D "UPD";
+        $client->c_amount_novat =3D HtmlInput::default_value_get('c_amou=
nt_novat', $client->c_amount_novat);
+        $client->c_name =3D HtmlInput::default_value_get('c_name', $clie=
nt->c_name);
+        $client->c_vatnumber =3D HtmlInput::default_value_get('c_vatnumb=
er', $client->c_vatnumber);
+        $client->c_amount_vat =3D HtmlInput::default_value_get('c_amount=
_vat', $client->c_amount_vat);
+        $client->set_comment();
+        $client->save();
+        $js =3D sprintf('modify_intervat_assujetti(\'%s\',\'%s\',\'%s\',=
\'%s\')', $_REQUEST['gDossier'], $_REQUEST['ac'], $_REQUEST['plugin_code'=
], $client->c_id);
+        $code =3D ($client->c_comment =3D=3D "") ? "ok" : "nok";
+        if ($code =3D=3D "ok"):
+            ?>
+            <td>
+            <?php echo h($client->c_name) ?>
+            </td>
+            <td>
+            <?php echo h($client->c_vatnumber) ?>
+            </td>
+            <td>
+            <?php echo h($client->c_amount_novat) ?>
+            </td>
+            <td>
+            <?php echo h($client->c_amount_vat) ?>
+            </td>
+            <td>
+            <?php echo h($client->c_comment) ?>
+            </td>
+            <td>
+                <a class=3D"line" href=3D"javascript:void(0)" onclick=3D=
"<?php echo $js; ?>"><?php echo _('Modifier') ?></a>
+            </td>
+            <?php
+            else:
+                echo $client->c_comment;
+        endif;
+    } else
+    {
+        $action =3D "EFF";
+        $client->delete();
+        $code=3D"ok";
+        echo _('Effacer');
+    }
+}
+$response =3D ob_get_clean();
+ob_end_clean();
+$html =3D escape_xml($response);
+header('Content-type: text/xml; charset=3DUTF-8');
+echo <<<EOF
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<data>
+<code>$code</code>
+<action>$action</action>
+<rowid>$id</rowid>
+<html>$html</html>
+</data>
+EOF;
+?>       =20
\ No newline at end of file

Modified: trunk/transform/include/class_transform_client.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_client.php	2014-02-04 22:54:0=
9 UTC (rev 688)
+++ trunk/transform/include/class_transform_client.php	2014-02-05 19:54:2=
2 UTC (rev 689)
@@ -22,7 +22,9 @@
 /**
  * @brief manage the table intervat_client
  */
-class Transform_Client
+require_once 'class_transform_sql.php';
+
+class Transform_Client extends Intervat_Client_SQL
 {
=20
     /**
@@ -68,7 +70,22 @@
         $cn->exec_sql("update transform.intervat_client set c_amount_vat=
=3Dreplace(c_amount_vat,',','.'),
             c_amount_novat=3Dreplace(c_amount_novat,',','.') where d_id=3D=
$1",array($p_declarant));
     }
-
+    function set_comment()
+    {
+        $this->c_comment=3D"";
+        if ( ! preg_match('/^[0-9]{10}/', $this->c_vatnumber))
+        {
+            $this->c_comment=3D_('Num=C3=A9ro de tva incorrect');
+        }
+        if ( ! preg_match('/^[0-9]+\.[0-9]*/', $this->c_amount_novat))
+        {
+            $this->c_comment.=3D_('Montant incorrect');
+        }
+        if ( ! preg_match('/^[0-9]+\.[0-9]*/', $this->c_amount_vat))
+        {
+            $this->c_comment.=3D_('Montant TVA incorrect');
+        }
+    }
 }
=20
 ?>

Modified: trunk/transform/include/class_transform_declarant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_declarant.php	2014-02-04 22:5=
4:09 UTC (rev 688)
+++ trunk/transform/include/class_transform_declarant.php	2014-02-05 19:5=
4:22 UTC (rev 689)
@@ -121,6 +121,7 @@
=20
     function insert()
     {
+        $this->verify();
         $this->data->d_name=3D$this->name;
         $this->data->d_street=3D$this->street;
         $this->data->d_postcode=3D$this->postcode;
@@ -154,7 +155,24 @@
         $this->readOnly=3Dtrue;
         $this->input();
     }
-
+    function verify()
+    {
+        /* -- email must be valide */
+        if (!preg_match( '/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-=
z0-9-]+)*(\.[a-z]{2,3})$/',$this->email))
+        {
+            throw new Exception(_('Email incorrect'),20);
+        }
+        if ($this->countrycode !=3D 'BE') {
+            throw new Exception(_('Code Pays incorrect'),21);
+        }
+       =20
+        if ( ! preg_match('/^[0-9]+/',$this->phone)) {
+            throw new Exception(_('Num=C3=A9ro de t=C3=A9l=C3=A9phone in=
correct'),22);
+        }
+        if ( ! preg_match('/^[0-9]+/',$this->vatnumber)) {
+            throw new Exception(_('Num=C3=A9ro de TVA incorrect'),23);
+        }
+    }
 }
=20
 ?>

Modified: trunk/transform/include/class_transform_representative.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_representative.php	2014-02-04=
 22:54:09 UTC (rev 688)
+++ trunk/transform/include/class_transform_representative.php	2014-02-05=
 19:54:22 UTC (rev 689)
@@ -152,6 +152,7 @@
=20
     function insert()
     {
+        $this->verify();
         $this->data->rp_listing_id =3D $this->id;
         $this->data->rp_issued =3D $this->issued;
         $this->data->rp_type =3D $this->type;
@@ -186,5 +187,20 @@
         $this->email =3D $this->data->rp_email;
         $this->phone =3D $this->data->rp_phone;
     }
+    function verify()
+    {
+        /* -- email must be valide */
+        if (!preg_match( '/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-=
z0-9-]+)*(\.[a-z]{2,3})$/',$this->email))
+        {
+            throw new Exception(_('Email incorrect'),20);
+        }
+        if ($this->countrycode !=3D 'BE') {
+            throw new Exception(_('Code Pays incorrect'),21);
+        }
+       =20
+        if ( ! preg_match('/^[0-9]+/',$this->phone)) {
+            throw new Exception(_('Num=C3=A9ro de t=C3=A9l=C3=A9phone in=
correct'),22);
+        }
+    }
=20
 }

Modified: trunk/transform/include/class_transform_sql.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_sql.php	2014-02-04 22:54:09 U=
TC (rev 688)
+++ trunk/transform/include/class_transform_sql.php	2014-02-05 19:54:22 U=
TC (rev 689)
@@ -266,6 +266,7 @@
             , "c_amount_vat" =3D> "c_amount_vat"
             , "c_amount_novat" =3D> "c_amount_novat"
             , "c_issuedby" =3D> "c_issuedby"
+            ,'c_comment'=3D>'c_comment'
         );
=20
         $this->type =3D array(
@@ -276,6 +277,7 @@
             , "c_amount_vat" =3D> "text"
             , "c_amount_novat" =3D> "text"
             , "c_issuedby" =3D> "text"
+            , "c_comment" =3D> "text"
         );
=20
         $this->default =3D array(

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-04 22:54:09 UTC (rev 688)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-05 19:54:22 UTC (rev 689)
@@ -28,6 +28,7 @@
 $radio =3D new IRadio('p_inputtype');
 $h_tva =3D new ICheckBox('h_tva[]');
 $h_year =3D new INum('p_year');
+$h_year->value=3DHtmlInput::default_value_post('p_year',$declarant->year=
);
 $h_year->prec =3D 0;
 $h_tva_compute_date =3D new ISelect('p_compute_date');
 $h_tva_compute_date->value =3D array(

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-04 22:54:09 UTC (rev 688)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-05 19:54:22 UTC (rev 689)
@@ -26,6 +26,7 @@
 require_once 'class_transform_sql.php';
 require_once 'class_transform_representative.php';
 require_once 'class_transform_declarant.php';
+require_once 'class_transform_client.php';
=20
 $inputtype =3D HtmlInput::default_value_post('p_inputtype', null);
 $year =3D HtmlInput::default_value_post('p_year', NULL);
@@ -132,13 +133,14 @@
                 /*
                  * insert into transform.intervat_client
                  */
-                $o_data[$i] =3D new Intervat_Client_SQL();
+                $o_data[$i] =3D new Transform_Client();
                 $o_data[$i]->d_id =3D $declarant->data->d_id;
                 $o_data[$i]->c_name =3D $data[0];
                 $o_data[$i]->c_issuedby =3D "BE";
                 $o_data[$i]->c_vatnumber =3D $data[1];
                 $o_data[$i]->c_amount_vat =3D $data[2];
                 $o_data[$i]->c_amount_novat =3D $data[3];
+                $o_data[$i]->set_comment();
                 $o_data[$i]->insert();
             }
             $cn->commit();
@@ -238,13 +240,14 @@
             /*
              * insert into transform.intervat_client
              */
-            $o_data[$i] =3D new Intervat_Client_SQL();
+            $o_data[$i] =3D new Transform_Client();
             $o_data[$i]->d_id =3D $declarant->data->d_id;
             $o_data[$i]->c_name =3D $a_listing[$i]['name'];
             $o_data[$i]->c_issuedby =3D "BE";
             $o_data[$i]->c_vatnumber =3D $a_listing[$i]['tvanumb'];
             $o_data[$i]->c_amount_vat =3D $a_listing[$i]['vat_amount'];
             $o_data[$i]->c_amount_novat =3D $a_listing[$i]['amount'];
+            $o_data[$i]->set_comment();
             $o_data[$i]->insert();
         }
         $cn->commit();

Modified: trunk/transform/include/template/listing_client_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/template/listing_client_display.php	2014-02-0=
4 22:54:09 UTC (rev 688)
+++ trunk/transform/include/template/listing_client_display.php	2014-02-0=
5 19:54:22 UTC (rev 689)
@@ -41,14 +41,19 @@
             <?php echo _('TVA'); ?>
         </th>
         <th>
-            Action
+            <?php echo _('Commentaire'); ?>
         </th>
+        <th>
+           =20
+        </th>
     </tr>
-<?php   =20
+<?php
     for ($i=3D0;$i<$nb;$i++):
         $data=3D$a_listing->next($ret,$i);
+        $js=3Dsprintf('modify_intervat_assujetti(\'%s\',\'%s\',\'%s\',\'=
%s\')',
+                $_REQUEST['gDossier'],$_REQUEST['ac'],$_REQUEST['plugin_=
code'],$data->c_id);
 ?>
-    <tr>
+    <tr id=3D"tr_<?php echo $data->c_id?>">
         <td>
             <?php=20
             echo h($data->c_name);
@@ -70,8 +75,13 @@
             ?>
         </td>
         <td>
-            Modifier / enlever
+            <?php=20
+            echo h($data->c_comment);
+            ?>
         </td>
+        <td>
+            <a class=3D"line" href=3D"javascript:void(0)" onclick=3D"<?p=
hp echo $js; ?>"><?php echo _('Modifier')?></a>
+        </td>
     </tr>
     <?php=20
     endfor;

Modified: trunk/transform/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/index.php	2014-02-04 22:54:09 UTC (rev 688)
+++ trunk/transform/index.php	2014-02-05 19:54:22 UTC (rev 689)
@@ -23,6 +23,14 @@
 Extension::check_version(4400);
 $cn=3Dnew Database(dossier::id());
 $transform_version=3D0;
+/*
+ * load javascript
+ */
+ob_start();
+require_once('transform_javascript.js');
+$j =3D ob_get_contents();
+ob_end_clean();
+echo create_script($j);
=20
 if ( $cn->exist_schema('transform') =3D=3D false)
   {

Modified: trunk/transform/sql/install.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/sql/install.sql	2014-02-04 22:54:09 UTC (rev 688)
+++ trunk/transform/sql/install.sql	2014-02-05 19:54:22 UTC (rev 689)
@@ -51,5 +51,6 @@
 alter table transform.request add         r_type text ;
 ALTER TABLE transform.request ADD COLUMN r_start_date date;
 ALTER TABLE transform.request ADD COLUMN r_end_date date;
+alter table transform.intervat_client add column c_comment text;
=20
=20

Added: trunk/transform/transform_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/transform_javascript.js	                        (rev =
0)
+++ trunk/transform/transform_javascript.js	2014-02-05 19:54:22 UTC (rev =
689)
@@ -0,0 +1,116 @@
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+ */
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+function modify_intervat_assujetti(p_dossier, p_ac, p_plugin_code, c_id)
+{
+    try
+    {
+        var querystring =3D 'plugin_code=3D' + p_plugin_code + '&ac=3D' =
+ p_ac + '&gDossier=3D' + p_dossier + '&act=3Dmodify_intervat_assujetti' =
+ '&c_id=3D' + c_id;
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: querystring,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req) {
+                        remove_waiting_box();
+                        var answer =3D req.responseText;
+                        var position =3D fixed_position(451, 217);
+                        add_div({'id': 'modify_intervat_assujetti_div',
+                            'cssclass': 'inner_box', 'drag': 1, 'style':=
 position});
+
+                        $('modify_intervat_assujetti_div').innerHTML =3D=
 answer;
+                        answer.evalScripts();
+                    }
+                }
+        );
+
+    } catch (e)
+    {
+        alert(e.message);
+    }
+}
+function save_intervat_assujetti()
+{
+    try
+    {
+        var qs =3D $("save_intervat_assujetti_frm").serialize() + '&act=3D=
save_intervat_assujetti';
+        waiting_box();
+        var action =3D new Ajax.Request(
+                "ajax.php",
+                {
+                    method: 'get',
+                    parameters: qs,
+                    onFailure: error_get_predef,
+                    onSuccess: function(req, json) {
+                        try {
+                            remove_waiting_box();
+                            var answer =3D req.responseXML;
+                            var acode =3D answer.getElementsByTagName('c=
ode');
+                            var action =3D answer.getElementsByTagName('=
action');
+                            var html =3D answer.getElementsByTagName('ht=
ml');
+                            var rowid =3D answer.getElementsByTagName('r=
owid');
+
+                            if (acode.length =3D=3D 0) {
+                                var rec =3D req.responseText;
+                                alert('erreur :' + rec);
+                            }
+                            var code =3D acode[0].firstChild.nodeValue;
+                            var code_xml =3D getNodeText(html[0]);
+                            var code_html =3D unescape_xml(code_xml);
+                            var str_action =3D action[0].firstChild.node=
Value;
+                            var str_rowid =3D rowid[0].firstChild.nodeVa=
lue;
+
+                            if (code =3D=3D 'ok')
+                            {
+                                removeDiv('modify_intervat_assujetti_div=
');
+                                var row =3D $('tr_' + str_rowid);
+                                if (str_action =3D=3D 'EFF') {
+                                    row.cells[row.cells.length - 1].inne=
rHTML =3D "";
+                                    row.style.textDecoration =3D 'line-t=
hrough';
+                                } else {
+                                    row.innerHTML =3D code_html;
+                                }
+
+                            }
+                            if (code =3D=3D 'nok')
+                            {
+                                // montre erreur
+                                $('modify_intervat_assujetti_div_comment=
').innerHTML =3D code_html;
+                            }
+                        }
+                        catch (e) {
+                            alert("modify_intervat_assujetti_div " + e.m=
essage);
+                            return false;
+                        }
+
+                    }
+                }
+        );
+    }
+    catch (e)
+    {
+        alert(e.message);
+        return false;
+    }
+
+    return false;
+}
+



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


From MAILER-DAEMON Fri Feb 07 15:14:55 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBrp9-0000Ke-Bd
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 15:14:55 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 21:01:58 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190651.1391804094.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r690 - in trunk/transform: . include
	include/template unit-test
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 20:14:53 -0000

Author: danydb
Date: 2014-02-07 21:01:57 +0100 (Fri, 07 Feb 2014)
New Revision: 690

Modified:
   trunk/transform/ajax_modify_intervat_assujetti.php
   trunk/transform/ajax_save_intervat_assujetti.php
   trunk/transform/include/class_transform_declarant.php
   trunk/transform/include/class_transform_intervat.php
   trunk/transform/include/class_transform_representative.php
   trunk/transform/include/intervat_listing_assujetti.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_3.inc.php
   trunk/transform/include/template/listing_assujetti_declarant.php
   trunk/transform/include/template/listing_assujetti_representative.php
   trunk/transform/include/template/listing_client_display.php
   trunk/transform/raw.php
   trunk/transform/transform_javascript.js
   trunk/transform/unit-test/valide-xml.php
Log:
Test with INTERVAT successfull

Modified: trunk/transform/ajax_modify_intervat_assujetti.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/ajax_modify_intervat_assujetti.php	2014-02-05 19:54:2=
2 UTC (rev 689)
+++ trunk/transform/ajax_modify_intervat_assujetti.php	2014-02-07 20:01:5=
7 UTC (rev 690)
@@ -71,7 +71,7 @@
                 <?php echo _('Commentaire'); ?>
             </td>
             <td id=3D"modify_intervat_assujetti_div_comment">
-                <?php echo $client->c_comment; ?>
+                <span class=3D"notice"> <?php echo $client->c_comment; ?=
></span>
             </td>
         </tr>
     </table>

Modified: trunk/transform/ajax_save_intervat_assujetti.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/ajax_save_intervat_assujetti.php	2014-02-05 19:54:22 =
UTC (rev 689)
+++ trunk/transform/ajax_save_intervat_assujetti.php	2014-02-07 20:01:57 =
UTC (rev 690)
@@ -30,6 +30,7 @@
     $client =3D new Transform_Client($id);
     if ($act =3D=3D 0)
     {
+        global $g_failed,$g_succeed;
         $action =3D "UPD";
         $client->c_amount_novat =3D HtmlInput::default_value_get('c_amou=
nt_novat', $client->c_amount_novat);
         $client->c_name =3D HtmlInput::default_value_get('c_name', $clie=
nt->c_name);
@@ -54,14 +55,14 @@
             <?php echo h($client->c_amount_vat) ?>
             </td>
             <td>
-            <?php echo h($client->c_comment) ?>
+            <?php echo $g_succeed.h($client->c_comment) ?>
             </td>
             <td>
                 <a class=3D"line" href=3D"javascript:void(0)" onclick=3D=
"<?php echo $js; ?>"><?php echo _('Modifier') ?></a>
             </td>
             <?php
             else:
-                echo $client->c_comment;
+                echo $g_failed.$client->c_comment;
         endif;
     } else
     {

Modified: trunk/transform/include/class_transform_declarant.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_declarant.php	2014-02-05 19:5=
4:22 UTC (rev 689)
+++ trunk/transform/include/class_transform_declarant.php	2014-02-07 20:0=
1:57 UTC (rev 690)
@@ -98,7 +98,7 @@
         $this->year=3DHtmlInput::default_value_post('p_year',null);
     }
=20
-    function input()
+    function input($error=3D0,$errmsg=3D"")
     {
         $h_name =3D new IText('p_dec_name', $this->name);
         $h_name->readOnly=3D$this->readOnly;
@@ -160,17 +160,17 @@
         /* -- email must be valide */
         if (!preg_match( '/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-=
z0-9-]+)*(\.[a-z]{2,3})$/',$this->email))
         {
-            throw new Exception(_('Email incorrect'),20);
+            throw new Exception(_('Email incorrect'),24);
         }
         if ($this->countrycode !=3D 'BE') {
-            throw new Exception(_('Code Pays incorrect'),21);
+            throw new Exception(_('Code Pays incorrect'),25);
         }
        =20
         if ( ! preg_match('/^[0-9]+/',$this->phone)) {
-            throw new Exception(_('Num=C3=A9ro de t=C3=A9l=C3=A9phone in=
correct'),22);
+            throw new Exception(_('Num=C3=A9ro de t=C3=A9l=C3=A9phone in=
correct'),26);
         }
         if ( ! preg_match('/^[0-9]+/',$this->vatnumber)) {
-            throw new Exception(_('Num=C3=A9ro de TVA incorrect'),23);
+            throw new Exception(_('Num=C3=A9ro de TVA incorrect'),27);
         }
     }
 }

Modified: trunk/transform/include/class_transform_intervat.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_intervat.php	2014-02-05 19:54=
:22 UTC (rev 689)
+++ trunk/transform/include/class_transform_intervat.php	2014-02-07 20:01=
:57 UTC (rev 690)
@@ -130,8 +130,8 @@
         $commentaire=3D"";
=20
         $decl =3D $this->domdoc->createElementNS($this->ns, "ns2:ClientL=
isting");
-        $ai =3D $decl->setAttribute('VATAmountSum', $vat_amount_sum);
-        $ai =3D $decl->setAttribute('TurnOverSum', $turnoversum);
+        $ai =3D $decl->setAttribute('VATAmountSum', sprintf('%8.2f',$vat=
_amount_sum));
+        $ai =3D $decl->setAttribute('TurnOverSum', sprintf("%8.2f",$turn=
oversum));
         $ai =3D $decl->setAttribute('ClientsNbr', $clientnb);
         $ai =3D $decl->setAttribute('SequenceNumber', $seqnb);
=20
@@ -219,8 +219,8 @@
             $de_vat_number =3D $this->domdoc->createTextNode($client['c_=
vatnumber']);
             $company->appendChild($de_vat_number);
             $dom_client->appendChild($company);
-            $dom_client->appendChild($this->domdoc->createElementNS($thi=
s->ns,"ns2:TurnOver", $client['c_amount_novat']));
-            $dom_client->appendChild($this->domdoc->createElementNS($thi=
s->ns,"ns2:VATAmount", $client['c_amount_vat']));
+            $dom_client->appendChild($this->domdoc->createElementNS($thi=
s->ns,"ns2:TurnOver", sprintf("%8.2f",$client['c_amount_novat'])));
+            $dom_client->appendChild($this->domdoc->createElementNS($thi=
s->ns,"ns2:VATAmount", sprintf("%8.2f",$client['c_amount_vat'])));
             $p_dom->appendChild($dom_client);
         }
        =20

Modified: trunk/transform/include/class_transform_representative.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_representative.php	2014-02-05=
 19:54:22 UTC (rev 689)
+++ trunk/transform/include/class_transform_representative.php	2014-02-07=
 20:01:57 UTC (rev 690)
@@ -119,7 +119,7 @@
         $this->issued =3D HtmlInput::default_value_post("p_issued", null=
);
     }
=20
-    function input()
+    function input($error=3D0,$errmsg=3D"")
     {
         $h_type =3D new ISelect('p_type');
         $h_type->value =3D array(
@@ -153,6 +153,7 @@
     function insert()
     {
         $this->verify();
+        $this->issued=3D"BE";
         $this->data->rp_listing_id =3D $this->id;
         $this->data->rp_issued =3D $this->issued;
         $this->data->rp_type =3D $this->type;
@@ -162,7 +163,7 @@
         $this->data->rp_countrycode =3D $this->countrycode;
         $this->data->rp_email =3D $this->email;
         $this->data->rp_phone =3D $this->phone;
-
+        $this->data->rp_city=3D$this->city;
         $this->data->insert();
     }
=20
@@ -186,6 +187,7 @@
         $this->countrycode =3D $this->data->rp_countrycode;
         $this->email =3D $this->data->rp_email;
         $this->phone =3D $this->data->rp_phone;
+        $this->city=3D$this->data->rp_city;
     }
     function verify()
     {

Modified: trunk/transform/include/intervat_listing_assujetti.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti.inc.php	2014-02-05=
 19:54:22 UTC (rev 689)
+++ trunk/transform/include/intervat_listing_assujetti.inc.php	2014-02-07=
 20:01:57 UTC (rev 690)
@@ -19,10 +19,11 @@
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 ?>
+<div style=3D"margin-left:10%;width: 80%;margin-right: 10%">
 <h1>Listing Assujetti Intervat </h1>
 <?php
 $step =3D HtmlInput::default_value_request('st_transf', 0);
-
+$error=3D0;$errmsg=3D"";
 if ($step =3D=3D 0)
 {
     require 'intervat_listing_assujetti_step_1.inc.php';
@@ -34,6 +35,8 @@
         require 'intervat_listing_assujetti_step_2.inc.php';
     } catch (Exception $e)
     {
+        $error=3D$e->getCode();
+        $errmsg=3D$e->getMessage();
         echo '<p class=3D"notice">' . $e->getMessage() . '</p>';
         if ($e->getCode() !=3D 3)
         {
@@ -52,4 +55,5 @@
         require 'intervat_listing_assujetti_step_1.inc.php';
     }
 }
-?>
\ No newline at end of file
+?>
+</div>
\ No newline at end of file

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-05 19:54:22 UTC (rev 689)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-07 20:01:57 UTC (rev 690)
@@ -16,7 +16,6 @@
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
  */
-
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
=20
 require_once 'class_transform_representative.php';
@@ -28,7 +27,7 @@
 $radio =3D new IRadio('p_inputtype');
 $h_tva =3D new ICheckBox('h_tva[]');
 $h_year =3D new INum('p_year');
-$h_year->value=3DHtmlInput::default_value_post('p_year',$declarant->year=
);
+$h_year->value =3D HtmlInput::default_value_post('p_year', $declarant->y=
ear);
 $h_year->prec =3D 0;
 $h_tva_compute_date =3D new ISelect('p_compute_date');
 $h_tva_compute_date->value =3D array(
@@ -36,33 +35,47 @@
     array('value' =3D> 2, 'label' =3D> _('Par date op=C3=A9ration'))
 );
 $start_date =3D new IDate('p_start_date');
-$start_date->id=3D"p_start_date_id";
+$start_date->id =3D "p_start_date_id";
 $start_date->value =3D HtmlInput::default_value_post('p_start_date', '')=
;
 $end_date =3D new IDate('p_end_date');
 $end_date->value =3D HtmlInput::default_value_post('p_end_date', '');
-$end_date->id=3D"p_end_date_id";
-
+$end_date->id =3D "p_end_date_id";
+$inputtype =3D HtmlInput::default_value_post('p_inputtype', -1);
 ?>
 <h2> <?php echo _('Etape 1/3') ?></h2>
 <form method=3D"post" enctype=3D"multipart/form-data" onsubmit=3D"return=
 check_form()">
+    <div style=3D"width:45%;padding: 15px;float:left">
+   =20
     <h3><?php echo _('Mandataire'); ?></h3>
     <?php
-    $representative->input();
+    $representative->input($error, $errmsg);
     ?>
+    </div>
+    <div style=3D"width:45%;padding: 15px;float:left">
     <h3><?php echo _('D=C3=A9clarant'); ?></h3>
     <?php
-    $declarant->input();
+    $declarant->input($error, $errmsg);
     ?>
+    </div>
+    <div style=3D"clear:both;"></div>
     <p>
         <?php echo _('P=C3=A9riode'), $h_year->input(); ?>
+        <span class=3D"notice"><?php
+        if ($error =3D=3D 6)
+        {
+            echo $errmsg;
+        }
+        ?></span>
     </p>
=20
     <p>
-        <input type=3D"radio" name=3D"p_inputtype" id=3D"file_radio" val=
ue=3D"1" onclick=3D"show_file();">
+        <?php $checked=3D($inputtype=3D=3D2)?' checked ':""; ?>
+        <input type=3D"radio" name=3D"p_inputtype" id=3D"file_radio"  <?=
php echo $checked; ?>  value=3D"1" onclick=3D"show_file();">
         <?php
-            echo  _('Par fichier');
+        echo _('Par fichier');
+        $display =3D ( $inputtype =3D=3D 1) ? 'block' : 'none';
         ?>
-        <span id=3D"sp_file" style=3D"display:none">
+        <span id=3D"sp_file" style=3D"display:<?php echo $display; ?>">
             <?php
             $file =3D new IFile('client_assujetti');
             echo $file->input();
@@ -70,45 +83,50 @@
         </span>
     </p>
     <p>
-        <input type=3D"radio" name=3D"p_inputtype" id=3D"calc_radio" val=
ue=3D"2" onclick=3D"show_calc()">
         <?php
-        echo  _('Par calcul');
+        $checked=3D($inputtype=3D=3D2)?' checked ':""; ?>
+        <input type=3D"radio" name=3D"p_inputtype" <?php echo $checked; =
?> id=3D"calc_radio" value=3D"2" onclick=3D"show_calc()">
+        <?php
+        echo _('Par calcul');
+        $display =3D ( $inputtype =3D=3D 2) ? 'block' : 'none';
         ?>
-        <div id=3D"sp_calcul" style=3D"display:none">
-            <p style=3D"margin-left:30px">
-                <?php printf(_('Entre les date %s et %s'), $start_date->=
input(), $end_date->input()); ?>
-            </p>
+    <div id=3D"sp_calcul" style=3D"display:<?php echo $display; ?>">
+        <p style=3D"margin-left:30px">
+        <?php printf(_('Entre les date %s et %s'), $start_date->input(),=
 $end_date->input()); ?>
+            <span class=3D"notice"><?php if ($error=3D=3D9|| $error =3D=3D=
9.1) {echo $errmsg;}?></span>
+        </p>
+        <?php
+        $atva =3D $cn->get_array('select tva_id,tva_rate,tva_comment fro=
m tva_rate order by 2');
+        $count_atva =3D count($atva);
+        ?>
+        <span class=3D"notice"><?php if ($error=3D=3D5|| $error =3D=3D5.=
1) {echo $errmsg;}?></span>
+        <ul style=3D"list-style: none">
             <?php
-            $atva =3D $cn->get_array('select tva_id,tva_rate,tva_comment=
 from tva_rate order by 2');
-            $count_atva =3D count($atva);
+            for ($i =3D 0; $i < $count_atva; $i++):
+                ?>
+                <li>
+                    <?php
+                    $h_tva->value =3D $atva[$i]['tva_id'];
+                    echo $h_tva->input() . h($atva[$i]['tva_rate']) . " =
" . h($atva[$i]['tva_comment']);
+                    ?>
+                </li>
+                <?php
+            endfor;
             ?>
-            <ul style=3D"list-style: none">
-                <?php
-                for ($i =3D 0; $i < $count_atva; $i++):
-                    ?>
-                    <li>
-                        <?php
-                        $h_tva->value =3D $atva[$i]['tva_id'];
-                        echo $h_tva->input() . h($atva[$i]['tva_rate']) =
. " " . h($atva[$i]['tva_comment']);
-                        ?>
-                    </li>
-                    <?php
-                endfor;
-                ?>
-            </ul>
-           =20
-            <span style=3D"margin-left:30px">
-                <?php echo _('Op=C3=A9ration de vente'), $h_tva_compute_=
date->input(); ?>
-            </span>
-        </div>
-    </p>   =20
-    <p>
-        <?php
-        echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugi=
n_code', 'sa'));
-        echo HtmlInput::hidden('st_transf', 1);
-        echo HtmlInput::submit('send_list', 'Valider');
-        ?>
-    </p>
+        </ul>
+
+        <span style=3D"margin-left:30px">
+<?php echo _('Op=C3=A9ration de vente'), $h_tva_compute_date->input(); ?=
>
+        </span>
+    </div>
+</p>   =20
+<p>
+    <?php
+    echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugin_co=
de', 'sa'));
+    echo HtmlInput::hidden('st_transf', 1);
+    echo HtmlInput::submit('send_list', 'Valider');
+    ?>
+</p>
 </form>   =20
 <script>
     function show_file() {
@@ -121,22 +139,22 @@
     }
     function check_form()
     {
-        if ($('p_year').value=3D=3D"") {
+        if ($('p_year').value =3D=3D "") {
             alert('Vous avez oubli=C3=A9 la p=C3=A9riode');
-            $('p_year').style.borderColor=3D"red";
+            $('p_year').style.borderColor =3D "red";
             return false;
         }
-        if ( $('p_start_date_id').value=3D=3D"" && $('calc_radio').check=
ed) {
+        if ($('p_start_date_id').value =3D=3D "" && $('calc_radio').chec=
ked) {
             alert('Date incorrect');
-            $('p_start_date_id').style.borderColor=3D"red";
+            $('p_start_date_id').style.borderColor =3D "red";
             return false;
         }
-        if (  $('p_end_date_id').value=3D=3D"" && $('calc_radio').checke=
d) {
+        if ($('p_end_date_id').value =3D=3D "" && $('calc_radio').checke=
d) {
             alert('Date incorrect');
-            $('p_end_date_id').style.borderColor=3D"red";
+            $('p_end_date_id').style.borderColor =3D "red";
             return false;
         }
-        if ( ! $('calc_radio').checked && ! $('file_radio').checked ) {
+        if (!$('calc_radio').checked && !$('file_radio').checked) {
             alert('Vous devez choisir par fichier ou par calcul');
             return false
         }

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-05 19:54:22 UTC (rev 689)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-07 20:01:57 UTC (rev 690)
@@ -18,7 +18,6 @@
  */
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
-var_dump($_POST);
 /**
  * save data into db and display them before creating the XML
  */
@@ -41,27 +40,28 @@
 {
     throw new Exception(_('Vous devez choisir par fichier ou par calcul'=
), 4);
 }
-if ($start_date =3D=3D null || $end_date =3D=3D null)
+if ($year =3D=3D null)
 {
-    throw new Exception(_('La date donn=C3=A9e est invalide'), 9);
+    throw new Exception(_("Vous devez donner la p=C3=A9riode"), 6);
 }
-if (isDate($start_date) =3D=3D null || isDate($end_date) =3D=3D null)
-{
-    throw new Exception(_('La date donn=C3=A9e est invalide'), 9);
-}
=20
 // if inputtype is by computing (=3D2) then year must existe as exercice=
=20
 // and tva_id must not be empty
 if ($inputtype =3D=3D 2)
 {
+    if ($start_date =3D=3D null || isDate($start_date) =3D=3D null)
+    {
+        throw new Exception(_('La date donn=C3=A9e est invalide'), 9);
+    }
+    if ($end_date =3D=3D null || isDate($end_date) =3D=3D null)
+    {
+        throw new Exception(_('La date donn=C3=A9e est invalide'), 9.1);
+    }
     if ($atva =3D=3D null)
     {
         throw new Exception(_('Vous devez choisir au moins un taux TVA')=
, 5);
     }
-    if ($year =3D=3D null)
-    {
-        throw new Exception(_("Vous devez donner l'ann=C3=A9e"), 6);
-    }
+
     if ($compute_date =3D=3D null || isNumber($compute_date) =3D=3D 0)
     {
         throw new Exception(_("Date de calcul incorrect"), 7);
@@ -74,7 +74,7 @@
     {
         if (isNumber($tva) =3D=3D 0)
         {
-            throw new Exception(_("ID Tva incorrect: [$tva]"), 9);
+            throw new Exception(_("ID Tva incorrect: [$tva]"), 5.1);
         }
     }
 }
@@ -156,7 +156,6 @@
 //**********************************************************************=
********
 if ($inputtype =3D=3D 2)
 {
-    var_dump($atva);
     $ltva =3D "(" . implode(',', $atva) . ")";
     //------ Operation date ----------------
     if ($compute_date =3D=3D 1)
@@ -273,6 +272,23 @@
     $ret =3D $a_listing->seek(' where d_id =3D $1', array($declarant->da=
ta->d_id));
     require 'template/listing_client_display.php';
     ?>
+    <?php
+    if ($inputtype =3D=3D 1) :
+        ?>
+<h3><?php echo _('Rejet=C3=A9')?></h3>
+    <ol>
+        <?php
+        for ($i =3D 0; $i < count($rejected); $i++):
+            ?>       =20
+            <li>
+                <?php echo $rejected[$i]; ?>
+            </li>
+        <?php endfor; ?>
+    </ol>
+    <?php
+endif;
+?>
+
 <form method=3D"POST">
     <?php echo HtmlInput::hidden('r_id', $request->r_id); ?>
     <?php

Modified: trunk/transform/include/intervat_listing_assujetti_step_3.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-05 19:54:22 UTC (rev 689)
+++ trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-07 20:01:57 UTC (rev 690)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  *   This file is part of NOALYSS.
  *
@@ -16,26 +15,33 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
=20
+global $cn;
+$request_id =3D HtmlInput::default_value_post('r_id', null);
=20
-$request_id=3DHtmlInput::default_value_post('r_id',null);
-
 if ($request_id =3D=3D null)
 {
     throw new Exception(_('Acc=C3=A8s directe incorrecte'), 15);
 }
-
-
+$invalide =3D $cn->get_value("select count(*)=20
+        from transform.intervat_client=20
+        join transform.intervat_declarant using (d_id)=20
+        where c_comment <>'' and r_id=3D$1", array($request_id));
 ?>
 <h2> <?php echo _('Etape 3/3') ?></h2>
+<?php if ($invalide !=3D 0): ?>
+    <p class=3D"error">
+    <?php printf(_('Attention : il y a %d enregistrements incorrects '),=
 $invalide); ?>
+    </p>
+    <?php endif; ?>
 <form method=3D"get" action=3D"extension.raw.php">
-   =20
-    <?php
-    echo HtmlInput::post_to_hidden(array('r_id','ac','gDossier','plugin_=
code'));
-    echo HtmlInput::hidden('act','listing_assujetti');
-    echo HtmlInput::submit('get','Fichier XML');
-    ?>
+
+<?php
+echo HtmlInput::post_to_hidden(array('r_id', 'ac', 'gDossier', 'plugin_c=
ode'));
+echo HtmlInput::hidden('act', 'listing_assujetti');
+echo HtmlInput::submit('get', 'Fichier XML');
+?>
 </form>

Modified: trunk/transform/include/template/listing_assujetti_declarant.ph=
p
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/template/listing_assujetti_declarant.php	2014=
-02-05 19:54:22 UTC (rev 689)
+++ trunk/transform/include/template/listing_assujetti_declarant.php	2014=
-02-07 20:01:57 UTC (rev 690)
@@ -1,5 +1,4 @@
 <?php
-
 /*
  *   This file is part of NOALYSS.
  *
@@ -16,53 +15,71 @@
  *   You should have received a copy of the GNU General Public License
  *   along with NOALYSS; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
-
 ?>
 <table>
     <tr>
         <td>
-            <?php echo _('Nom') . "</td><td>" . $h_name->input(); ?>
+<?php echo _('Nom') . "</td><td>" . $h_name->input(); ?>
         </td>
     <tr>
     <tr>
         <td>
-            <?php echo _('Rue') . "</td><td>" . $h_street->input(); ?>
+<?php echo _('Rue') . "</td><td>" . $h_street->input(); ?>
         </td>
     <tr>
     <tr>
         <td>
-            <?php echo _('Code postal') . "</td><td>" . $h_postcode->inp=
ut(); ?>
+<?php echo _('Code postal') . "</td><td>" . $h_postcode->input(); ?>
         </td>
     <tr>
     <tr>
         <td>
-            <?php echo _('Ville') . "</td><td>" . $h_city->input(); ?>
+<?php echo _('Ville') . "</td><td>" . $h_city->input(); ?>
         </td>
     <tr>
     <tr>
         <td>
-            <?php echo _('Code Pays') . "</td><td>" . $h_countrycode->in=
put(); ?>
+<?php echo _('Code Pays') . "</td><td>" . $h_countrycode->input(); ?>
+            <span class=3D"notice"><?php if ($error =3D=3D 25)
+{
+    echo $errmsg;
+} ?></span>
         </td>
     <tr>
     <tr>
         <td>
-            <?php echo _('email') . "</td><td>" . $h_email->input(); ?>
+<?php echo _('email') . "</td><td>" . $h_email->input(); ?>
+            <span class=3D"notice"><?php if ($error =3D=3D 24)
+{
+    echo $errmsg;
+} ?></span>
+
         </td>
     <tr>
     <tr>
         <td>
-            <?php echo _('T=C3=A9l=C3=A9phone') . "</td><td>" . $h_phone=
->input(); ?>
+<?php echo _('T=C3=A9l=C3=A9phone') . "</td><td>" . $h_phone->input(); ?=
>
+            <span class=3D"notice"><?php if ($error =3D=3D 26)
+{
+    echo $errmsg;
+} ?></span>
+
         </td>
     <tr>
     <tr>
         <td>
-            <?php echo _('N=C2=B0 TVA') . "</td><td>" . $h_vatnumber->in=
put(); ?>
+<?php echo _('N=C2=B0 TVA') . "</td><td>" . $h_vatnumber->input(); ?>
+            <span class=3D"notice"><?php if ($error =3D=3D 27)
+{
+    echo $errmsg;
+} ?></span>
+
         </td>
     <tr>
-   =20
=20
+
 </table>
=20

Modified: trunk/transform/include/template/listing_assujetti_representati=
ve.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/template/listing_assujetti_representative.php=
	2014-02-05 19:54:22 UTC (rev 689)
+++ trunk/transform/include/template/listing_assujetti_representative.php=
	2014-02-07 20:01:57 UTC (rev 690)
@@ -43,16 +43,19 @@
     <tr>
         <td>
             <?php echo _('Code Pays') . "</td><td>" . $h_countrycode->in=
put(); ?>
+            <span class=3D"notice"><?php if ($error=3D=3D21) {echo $errm=
sg;}?></span>
         </td>
     <tr>
     <tr>
         <td>
             <?php echo _('email') . "</td><td>" . $h_email->input(); ?>
+            <span class=3D"notice"><?php if ($error=3D=3D20) {echo $errm=
sg;}?></span>
         </td>
     <tr>
     <tr>
         <td>
             <?php echo _('T=C3=A9l=C3=A9phone') . "</td><td>" . $h_phone=
->input(); ?>
+            <span class=3D"notice"><?php if ($error=3D=3D22) {echo $errm=
sg;}?></span>
         </td>
     <tr>
     <tr>

Modified: trunk/transform/include/template/listing_client_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/template/listing_client_display.php	2014-02-0=
5 19:54:22 UTC (rev 689)
+++ trunk/transform/include/template/listing_client_display.php	2014-02-0=
7 20:01:57 UTC (rev 690)
@@ -24,9 +24,10 @@
  * parameters are $ret (return of seek) and $a_listing  (Intervat_Client=
_SQL )
  @see intervat_listing_assujetti_step_2.inc.php
  */
+global $g_succeed,$g_failed;
 $nb=3DDatabase::num_row($ret);
 ?>
-<table>
+<table class=3D"result">
     <tr>
         <th>
             <?php echo _('Nom'); ?>
@@ -52,8 +53,9 @@
         $data=3D$a_listing->next($ret,$i);
         $js=3Dsprintf('modify_intervat_assujetti(\'%s\',\'%s\',\'%s\',\'=
%s\')',
                 $_REQUEST['gDossier'],$_REQUEST['ac'],$_REQUEST['plugin_=
code'],$data->c_id);
+        $class=3D($i%2=3D=3D0)?'odd':'even';
 ?>
-    <tr id=3D"tr_<?php echo $data->c_id?>">
+    <tr id=3D"tr_<?php echo $data->c_id?>" class=3D"<?php echo $class; ?=
>">
         <td>
             <?php=20
             echo h($data->c_name);
@@ -76,7 +78,8 @@
         </td>
         <td>
             <?php=20
-            echo h($data->c_comment);
+            $code=3D ($data->c_comment=3D=3D"")?$g_succeed:$g_failed;
+            echo $code.h($data->c_comment);
             ?>
         </td>
         <td>

Modified: trunk/transform/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/raw.php	2014-02-05 19:54:22 UTC (rev 689)
+++ trunk/transform/raw.php	2014-02-07 20:01:57 UTC (rev 690)
@@ -43,6 +43,7 @@
         $xml =3D new Transform_Intervat;
=20
         $xml->append_root();
+        $xml->append_representative($representative);
         $xml->append_client_listing($declarant);
         $file =3D "listing_assujetti" . date('d.m.y.hi') . ".xml";
         $ref =3D $_ENV['TMP'] . "/" . $file;

Modified: trunk/transform/transform_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/transform_javascript.js	2014-02-05 19:54:22 UTC (rev =
689)
+++ trunk/transform/transform_javascript.js	2014-02-07 20:01:57 UTC (rev =
690)
@@ -34,7 +34,7 @@
                         var answer =3D req.responseText;
                         var position =3D fixed_position(451, 217);
                         add_div({'id': 'modify_intervat_assujetti_div',
-                            'cssclass': 'inner_box', 'drag': 1, 'style':=
 position});
+                            'cssclass': 'inner_box', 'drag': 1, 'style':=
 'min-width:25%;'+position});
=20
                         $('modify_intervat_assujetti_div').innerHTML =3D=
 answer;
                         answer.evalScripts();

Modified: trunk/transform/unit-test/valide-xml.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/valide-xml.php	2014-02-05 19:54:22 UTC (rev=
 689)
+++ trunk/transform/unit-test/valide-xml.php	2014-02-07 20:01:57 UTC (rev=
 690)
@@ -44,7 +44,7 @@
 libxml_use_internal_errors(true);=20
=20
 //$file =3D "valide-exemple-listing.xml";
-$file =3D "listing_assujetti04.02.14.1158.xml";
+$file =3D "listing_assujetti07.02.14.0759.xml";
 $schema =3D "xsd/NewLK-in_v0_7.xsd";
=20
 // Instanciation d=E2=80=99un DOMDocument



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


From MAILER-DAEMON Fri Feb 07 15:16:48 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBrqy-0000Uh-5k
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 15:16:48 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 21:03:54 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190654.1391804207.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r691 - trunk/transform
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 20:16:47 -0000

Author: danydb
Date: 2014-02-07 21:03:54 +0100 (Fri, 07 Feb 2014)
New Revision: 691

Modified:
   trunk/transform/raw.php
Log:
add representative only if needed

Modified: trunk/transform/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/raw.php	2014-02-07 20:01:57 UTC (rev 690)
+++ trunk/transform/raw.php	2014-02-07 20:03:54 UTC (rev 691)
@@ -23,7 +23,7 @@
=20
 switch ($act)
 {
-    case 'listing_assujetti':
+    case 'listing_assujetti_xml':
         $request_id =3D HtmlInput::default_value_get('r_id', null);
=20
         if ($request_id =3D=3D null)
@@ -43,7 +43,9 @@
         $xml =3D new Transform_Intervat;
=20
         $xml->append_root();
-        $xml->append_representative($representative);
+        if ( $representative->name !=3D "") {
+            $xml->append_representative($representative);
+        }
         $xml->append_client_listing($declarant);
         $file =3D "listing_assujetti" . date('d.m.y.hi') . ".xml";
         $ref =3D $_ENV['TMP'] . "/" . $file;



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


From MAILER-DAEMON Fri Feb 07 16:17:41 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBsnt-0003uG-KW
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:17:41 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:04:46 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190933.1391807860.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r692 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:17:40 -0000

Author: danydb
Date: 2014-02-07 22:04:46 +0100 (Fri, 07 Feb 2014)
New Revision: 692

Modified:
   trunk/transform/include/class_transform_client.php
Log:
Amount with 2 decimal

Modified: trunk/transform/include/class_transform_client.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_client.php	2014-02-07 20:03:5=
4 UTC (rev 691)
+++ trunk/transform/include/class_transform_client.php	2014-02-07 21:04:4=
6 UTC (rev 692)
@@ -54,25 +54,39 @@
     function compute_value($p_declarant)
     {
         global $cn;
-        $this->correct_data($p_declarant);
-        $this->array =3D $cn->get_array('select * from transform.interva=
t_client where d_id=3D$1', array($p_declarant));
+        $this->array =3D $cn->get_array("select * from transform.interva=
t_client=20
+                where=20
+                d_id=3D$1 and
+                coalesce(c_comment,'') =3D ''"
+                , array($p_declarant));
         $this->nb =3D count($this->array);
        =20
-        $this->vat_amount_sum =3D $cn->get_value('select sum(c_amount_va=
t::numeric) from=20
-            transform.intervat_client where d_id=3D$1',array($p_declaran=
t));
+        $this->vat_amount_sum =3D $cn->get_value("
+            select sum(c_amount_vat::numeric) from=20
+            transform.intervat_client where d_id=3D$1 and
+                coalesce(c_comment,'') =3D ''",array($p_declarant));
        =20
-        $this->turnoversum =3D $cn->get_value('select sum(c_amount_novat=
::numeric) from=20
-            transform.intervat_client where d_id=3D$1',array($p_declaran=
t));
+        $this->turnoversum =3D $cn->get_value("select sum(c_amount_novat=
::numeric) from=20
+            transform.intervat_client where d_id=3D$1 and
+                coalesce(c_comment,'') =3D ''",array($p_declarant));
     }
-    private function correct_data($p_declarant)
+    private function correct_comment()
     {
-        global $cn;
-        $cn->exec_sql("update transform.intervat_client set c_amount_vat=
=3Dreplace(c_amount_vat,',','.'),
-            c_amount_novat=3Dreplace(c_amount_novat,',','.') where d_id=3D=
$1",array($p_declarant));
+        $this->c_vatnumber=3Dstr_replace('BE','',$this->c_vatnumber);
+        $this->c_vatnumber=3Dstr_replace(',','',$this->c_vatnumber);
+        $this->c_vatnumber=3Dstr_replace('.','',$this->c_vatnumber);
+        $this->c_vatnumber=3Dstr_replace('-','',$this->c_vatnumber);
     }
+    private function correct_amount()
+    {
+        $this->c_amount_novat=3D  str_replace(',', '.', $this->c_amount_=
novat);
+        $this->c_amount_vat=3D  str_replace(',', '.', $this->c_amount_va=
t);
+    }
     function set_comment()
     {
         $this->c_comment=3D"";
+        $this->correct_comment();
+        $this->correct_amount();
         if ( ! preg_match('/^[0-9]{10}/', $this->c_vatnumber))
         {
             $this->c_comment=3D_('Num=C3=A9ro de tva incorrect');



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


From MAILER-DAEMON Fri Feb 07 16:18:06 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBsoI-0003vq-Rp
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:18:06 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:05:13 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190934.1391807886.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r693 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:18:06 -0000

Author: danydb
Date: 2014-02-07 22:05:12 +0100 (Fri, 07 Feb 2014)
New Revision: 693

Modified:
   trunk/transform/include/intervat_listing_assujetti_step_3.inc.php
Log:
Add export CSV

Modified: trunk/transform/include/intervat_listing_assujetti_step_3.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-07 21:04:46 UTC (rev 692)
+++ trunk/transform/include/intervat_listing_assujetti_step_3.inc.php	201=
4-02-07 21:05:12 UTC (rev 693)
@@ -35,13 +35,22 @@
 <?php if ($invalide !=3D 0): ?>
     <p class=3D"error">
     <?php printf(_('Attention : il y a %d enregistrements incorrects '),=
 $invalide); ?>
+    <?php echo _('Ils ne seront inclus pas dans le fichier XML')?>
     </p>
     <?php endif; ?>
 <form method=3D"get" action=3D"extension.raw.php">
=20
 <?php
 echo HtmlInput::post_to_hidden(array('r_id', 'ac', 'gDossier', 'plugin_c=
ode'));
-echo HtmlInput::hidden('act', 'listing_assujetti');
+echo HtmlInput::hidden('act', 'listing_assujetti_xml');
 echo HtmlInput::submit('get', 'Fichier XML');
 ?>
 </form>
+<form method=3D"get" action=3D"extension.raw.php">
+
+<?php
+echo HtmlInput::post_to_hidden(array('r_id', 'ac', 'gDossier', 'plugin_c=
ode'));
+echo HtmlInput::hidden('act', 'listing_assujetti_csv');
+echo HtmlInput::submit('get', 'Fichier CSV');
+?>
+</form>
\ No newline at end of file



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


From MAILER-DAEMON Fri Feb 07 16:18:34 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBsok-0003xV-1f
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:18:34 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:05:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190935.1391807913.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r694 - trunk/transform/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:18:32 -0000

Author: danydb
Date: 2014-02-07 22:05:39 +0100 (Fri, 07 Feb 2014)
New Revision: 694

Modified:
   trunk/transform/include/template/listing_client_display.php
Log:
Invalid not in XML

Modified: trunk/transform/include/template/listing_client_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/template/listing_client_display.php	2014-02-0=
7 21:05:12 UTC (rev 693)
+++ trunk/transform/include/template/listing_client_display.php	2014-02-0=
7 21:05:39 UTC (rev 694)
@@ -27,6 +27,9 @@
 global $g_succeed,$g_failed;
 $nb=3DDatabase::num_row($ret);
 ?>
+<p class=3D"notice">
+    <?php echo _('les enregistrements incorrects ne seront inclus pas da=
ns le fichier XML')?>
+    </p>
 <table class=3D"result">
     <tr>
         <th>



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


From MAILER-DAEMON Fri Feb 07 16:19:45 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBspt-00044K-Az
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:19:45 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:06:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190936.1391807984.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r695 - trunk/transform
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:19:43 -0000

Author: danydb
Date: 2014-02-07 22:06:51 +0100 (Fri, 07 Feb 2014)
New Revision: 695

Modified:
   trunk/transform/raw.php
Log:
Add Export CSV

Modified: trunk/transform/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/raw.php	2014-02-07 21:05:39 UTC (rev 694)
+++ trunk/transform/raw.php	2014-02-07 21:06:51 UTC (rev 695)
@@ -20,7 +20,7 @@
=20
 // Copyright Author Dany De Bontridder danydb@aevalys.eu
 $act =3D HtmlInput::default_value_get('act', null);
-
+global $cn;
 switch ($act)
 {
     case 'listing_assujetti_xml':
@@ -33,17 +33,22 @@
         require_once 'include/class_transform_declarant.php';
         require_once 'include/class_transform_representative.php';
         require_once 'include/class_transform_intervat.php';
+        require_once 'include/class_transform_client.php';
=20
         $declarant =3D new Transform_Declarant();
         $representative =3D new Transform_Representative;
=20
         $declarant->from_db($request_id);
         $representative->from_db($request_id);
+        $client =3D new Transform_Client;
=20
+
+
         $xml =3D new Transform_Intervat;
=20
         $xml->append_root();
-        if ( $representative->name !=3D "") {
+        if ($representative->name !=3D "")
+        {
             $xml->append_representative($representative);
         }
         $xml->append_client_listing($declarant);
@@ -57,4 +62,32 @@
         $in =3D fread($file_xml, filesize($ref));
         echo $in;
         break;
+    case 'listing_assujetti_csv':
+        $request_id =3D HtmlInput::default_value_get('r_id', null);
+
+        if ($request_id =3D=3D null)
+        {
+            throw new Exception(_('Acc=C3=A8s directe incorrecte'), 15);
+        }
+        $aclient=3D$cn->get_array("select=20
+             c_name,c_vatnumber,c_amount_vat,c_amount_novat
+             from
+                transform.intervat_client join transform.intervat_declar=
ant using (d_id)
+                where
+                r_id=3D$1"
+                ,array($request_id)
+                );
+
+        $file =3D "listing_assujetti" . date('d.m.y.hi') . ".csv";
+        $ref =3D $_ENV['TMP'] . "/" . $file;
+        header('Content-type: application/csv');
+        header('Pragma: public');
+        header('Content-Disposition: attachment;filename=3D"' . $file . =
'"', FALSE);
+        $nb=3Dcount($aclient);
+        $handle_file=3Dfopen('php://output','w');
+        for ($i=3D0;$i<$nb;$i++)
+        {
+            fputcsv($handle_file, $aclient[$i], ";");
+        }
+        break;
 }



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


From MAILER-DAEMON Fri Feb 07 16:20:01 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBsq9-00048b-HT
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:20:01 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:07:07 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190937.1391808000.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r696 - trunk/transform/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:20:00 -0000

Author: danydb
Date: 2014-02-07 22:07:07 +0100 (Fri, 07 Feb 2014)
New Revision: 696

Modified:
   trunk/transform/sql/install.sql
Log:
Representative not mandatory

Modified: trunk/transform/sql/install.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/sql/install.sql	2014-02-07 21:06:51 UTC (rev 695)
+++ trunk/transform/sql/install.sql	2014-02-07 21:07:07 UTC (rev 696)
@@ -52,5 +52,5 @@
 ALTER TABLE transform.request ADD COLUMN r_start_date date;
 ALTER TABLE transform.request ADD COLUMN r_end_date date;
 alter table transform.intervat_client add column c_comment text;
+alter table transform.intervat_representative alter rp_countrycode drop =
not null;
=20
-



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


From MAILER-DAEMON Fri Feb 07 16:20:47 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBsqt-0004Ed-P5
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:20:47 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:07:52 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190938.1391808046.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r697 - in trunk/transform/include: . template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:20:46 -0000

Author: danydb
Date: 2014-02-07 22:07:52 +0100 (Fri, 07 Feb 2014)
New Revision: 697

Modified:
   trunk/transform/include/class_transform_representative.php
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
   trunk/transform/include/template/listing_assujetti_representative.php
Log:
More check on representative and errors display better

Modified: trunk/transform/include/class_transform_representative.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_representative.php	2014-02-07=
 21:07:07 UTC (rev 696)
+++ trunk/transform/include/class_transform_representative.php	2014-02-07=
 21:07:52 UTC (rev 697)
@@ -191,6 +191,7 @@
     }
     function verify()
     {
+        if ( trim($this->name) =3D=3D "") return;
         /* -- email must be valide */
         if (!preg_match( '/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-=
z0-9-]+)*(\.[a-z]{2,3})$/',$this->email))
         {
@@ -203,6 +204,15 @@
         if ( ! preg_match('/^[0-9]+/',$this->phone)) {
             throw new Exception(_('Num=C3=A9ro de t=C3=A9l=C3=A9phone in=
correct'),22);
         }
+        if (trim($this->street) =3D=3D "" ) {
+            throw new Exception(_('Obligatoire'),31 );
+        }
+        if (trim($this->postcode) =3D=3D "" ) {
+            throw new Exception(_('Obligatoire'),32 );
+        }
+        if (trim($this->city) =3D=3D "" ) {
+            throw new Exception(_('Obligatoire'),33 );
+        }
     }
=20
 }

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-07 21:07:07 UTC (rev 696)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-07 21:07:52 UTC (rev 697)
@@ -45,31 +45,36 @@
 <h2> <?php echo _('Etape 1/3') ?></h2>
 <form method=3D"post" enctype=3D"multipart/form-data" onsubmit=3D"return=
 check_form()">
     <div style=3D"width:45%;padding: 15px;float:left">
-   =20
-    <h3><?php echo _('Mandataire'); ?></h3>
-    <?php
-    $representative->input($error, $errmsg);
-    ?>
+
+        <h3><?php echo _('Mandataire'); ?></h3>
+        <span class=3D"notice">
+            <?php
+            echo _("Ne remplissez pas s'il n'y a pas de mandataire");
+            ?>
+        </span>
+        <?php
+        $representative->input($error, $errmsg);
+        ?>
     </div>
     <div style=3D"width:45%;padding: 15px;float:left">
-    <h3><?php echo _('D=C3=A9clarant'); ?></h3>
-    <?php
-    $declarant->input($error, $errmsg);
-    ?>
+        <h3><?php echo _('D=C3=A9clarant'); ?></h3>
+        <?php
+        $declarant->input($error, $errmsg);
+        ?>
     </div>
     <div style=3D"clear:both;"></div>
     <p>
         <?php echo _('P=C3=A9riode'), $h_year->input(); ?>
         <span class=3D"notice"><?php
-        if ($error =3D=3D 6)
-        {
-            echo $errmsg;
-        }
-        ?></span>
+            if ($error =3D=3D 6)
+            {
+                echo $errmsg;
+            }
+            ?></span>
     </p>
=20
     <p>
-        <?php $checked=3D($inputtype=3D=3D2)?' checked ':""; ?>
+        <?php $checked =3D ($inputtype =3D=3D 1) ? ' checked ' : ""; ?>
         <input type=3D"radio" name=3D"p_inputtype" id=3D"file_radio"  <?=
php echo $checked; ?>  value=3D"1" onclick=3D"show_file();">
         <?php
         echo _('Par fichier');
@@ -83,8 +88,7 @@
         </span>
     </p>
     <p>
-        <?php
-        $checked=3D($inputtype=3D=3D2)?' checked ':""; ?>
+        <?php $checked =3D ($inputtype =3D=3D 2) ? ' checked ' : ""; ?>
         <input type=3D"radio" name=3D"p_inputtype" <?php echo $checked; =
?> id=3D"calc_radio" value=3D"2" onclick=3D"show_calc()">
         <?php
         echo _('Par calcul');
@@ -92,23 +96,29 @@
         ?>
     <div id=3D"sp_calcul" style=3D"display:<?php echo $display; ?>">
         <p style=3D"margin-left:30px">
-        <?php printf(_('Entre les date %s et %s'), $start_date->input(),=
 $end_date->input()); ?>
-            <span class=3D"notice"><?php if ($error=3D=3D9|| $error =3D=3D=
9.1) {echo $errmsg;}?></span>
+            <?php printf(_('Entre les date %s et %s'), $start_date->inpu=
t(), $end_date->input()); ?>
+            <span class=3D"notice"><?php if ($error =3D=3D 9 || $error =3D=
=3D 9.1)
+            {
+                echo $errmsg;
+            } ?></span>
         </p>
         <?php
         $atva =3D $cn->get_array('select tva_id,tva_rate,tva_comment fro=
m tva_rate order by 2');
         $count_atva =3D count($atva);
         ?>
-        <span class=3D"notice"><?php if ($error=3D=3D5|| $error =3D=3D5.=
1) {echo $errmsg;}?></span>
+        <span class=3D"notice"><?php if ($error =3D=3D 5 || $error =3D=3D=
 5.1)
+        {
+            echo $errmsg;
+        } ?></span>
         <ul style=3D"list-style: none">
-            <?php
-            for ($i =3D 0; $i < $count_atva; $i++):
+                <?php
+                for ($i =3D 0; $i < $count_atva; $i++):
+                    ?>
+                <li>
+                <?php
+                $h_tva->value =3D $atva[$i]['tva_id'];
+                echo $h_tva->input() . h($atva[$i]['tva_rate']) . " " . =
h($atva[$i]['tva_comment']);
                 ?>
-                <li>
-                    <?php
-                    $h_tva->value =3D $atva[$i]['tva_id'];
-                    echo $h_tva->input() . h($atva[$i]['tva_rate']) . " =
" . h($atva[$i]['tva_comment']);
-                    ?>
                 </li>
                 <?php
             endfor;
@@ -116,16 +126,16 @@
         </ul>
=20
         <span style=3D"margin-left:30px">
-<?php echo _('Op=C3=A9ration de vente'), $h_tva_compute_date->input(); ?=
>
+    <?php echo _('Op=C3=A9ration de vente'), $h_tva_compute_date->input(=
); ?>
         </span>
     </div>
 </p>   =20
 <p>
-    <?php
-    echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugin_co=
de', 'sa'));
-    echo HtmlInput::hidden('st_transf', 1);
-    echo HtmlInput::submit('send_list', 'Valider');
-    ?>
+<?php
+echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugin_code',=
 'sa'));
+echo HtmlInput::hidden('st_transf', 1);
+echo HtmlInput::submit('send_list', 'Valider');
+?>
 </p>
 </form>   =20
 <script>

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-07 21:07:07 UTC (rev 696)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-07 21:07:52 UTC (rev 697)
@@ -112,7 +112,7 @@
     if (strlen($_FILES['client_assujetti']['tmp_name'][0]) !=3D 0)
     {
         $new_name =3D tempnam($_ENV['TMP'], 'client_assujetti');
-        if (!move_uploaded_file($_FILES['file_upload']['tmp_name'][$i], =
$new_name))
+        if (!move_uploaded_file($_FILES['client_assujetti']['tmp_name'],=
 $new_name))
         {
             throw new Exception(_('Impossible de sauver ce fichier'), 2)=
;
         }
@@ -125,7 +125,7 @@
             while ($data =3D fgetcsv($file, 0, ";"))
             {
                 $i++;
-                if (count($data) !=3D 4 || $i =3D=3D 1)
+                if (count($data) !=3D 4 )
                 {
                     $rejected[] =3D _('Ligne non import=C3=A9e') . join(=
' - ', $data);
                     continue;
@@ -249,6 +249,8 @@
             $o_data[$i]->set_comment();
             $o_data[$i]->insert();
         }
+        $correct=3Dnew Transform_Client;
+
         $cn->commit();
     } catch (Exception $ex)
     {
@@ -256,6 +258,7 @@
         throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i]->c=
_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
     }
 }
+
 ?>
 <h2> <?php echo _('Etape 2/3') ?></h2>
 <h3><?php echo _('Mandataire'); ?></h3>

Modified: trunk/transform/include/template/listing_assujetti_representati=
ve.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/template/listing_assujetti_representative.php=
	2014-02-07 21:07:07 UTC (rev 696)
+++ trunk/transform/include/template/listing_assujetti_representative.php=
	2014-02-07 21:07:52 UTC (rev 697)
@@ -28,16 +28,19 @@
     <tr>
         <td>
             <?php echo _('Rue') . "</td><td>" . $h_street->input(); ?>
+             <span class=3D"notice"><?php if ($error=3D=3D31) {echo $err=
msg;}?></span>
         </td>
     <tr>
     <tr>
         <td>
             <?php echo _('Code postal') . "</td><td>" . $h_postcode->inp=
ut(); ?>
+             <span class=3D"notice"><?php if ($error=3D=3D32) {echo $err=
msg;}?></span>
         </td>
     <tr>
     <tr>
         <td>
             <?php echo _('Ville') . "</td><td>" . $h_city->input(); ?>
+             <span class=3D"notice"><?php if ($error=3D=3D33) {echo $err=
msg;}?></span>
         </td>
     <tr>
     <tr>



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


From MAILER-DAEMON Fri Feb 07 16:27:44 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBsxc-0004o0-CR
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:27:44 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:14:49 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190945.1391808463.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r698 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:27:43 -0000

Author: danydb
Date: 2014-02-07 22:14:49 +0100 (Fri, 07 Feb 2014)
New Revision: 698

Modified:
   trunk/transform/include/class_transform_client.php
Log:
remove + in amount

Modified: trunk/transform/include/class_transform_client.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/class_transform_client.php	2014-02-07 21:07:5=
2 UTC (rev 697)
+++ trunk/transform/include/class_transform_client.php	2014-02-07 21:14:4=
9 UTC (rev 698)
@@ -81,6 +81,8 @@
     {
         $this->c_amount_novat=3D  str_replace(',', '.', $this->c_amount_=
novat);
         $this->c_amount_vat=3D  str_replace(',', '.', $this->c_amount_va=
t);
+        $this->c_amount_novat=3D  str_replace('+', '', $this->c_amount_n=
ovat);
+        $this->c_amount_vat=3D  str_replace('+', '', $this->c_amount_vat=
);
     }
     function set_comment()
     {



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


From MAILER-DAEMON Fri Feb 07 16:30:18 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBt06-0005vJ-A0
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:30:18 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:17:23 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190950.1391808617.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r699 - trunk/transform/unit-test
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:30:17 -0000

Author: danydb
Date: 2014-02-07 22:17:23 +0100 (Fri, 07 Feb 2014)
New Revision: 699

Added:
   trunk/transform/unit-test/Transform_ClientTest.php
   trunk/transform/unit-test/Transform_DeclarantTest.php
   trunk/transform/unit-test/Transform_RepresentativeTest.php
Log:
Add unit test

Added: trunk/transform/unit-test/Transform_ClientTest.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/Transform_ClientTest.php	                  =
      (rev 0)
+++ trunk/transform/unit-test/Transform_ClientTest.php	2014-02-07 21:17:2=
3 UTC (rev 699)
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-02-07 at 22:27:2=
4.
+ */
+class Transform_ClientTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Transform_Client
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->object =3D new Transform_Client;
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @covers Transform_Client::compute_value
+     * @todo   Implement testCompute_value().
+     */
+    public function testCompute_value()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Client::set_comment
+     * @todo   Implement testSet_comment().
+     */
+    public function testSet_comment()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+}

Added: trunk/transform/unit-test/Transform_DeclarantTest.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/Transform_DeclarantTest.php	               =
         (rev 0)
+++ trunk/transform/unit-test/Transform_DeclarantTest.php	2014-02-07 21:1=
7:23 UTC (rev 699)
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-02-07 at 22:27:4=
1.
+ */
+class Transform_DeclarantTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Transform_Declarant
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->object =3D new Transform_Declarant;
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @covers Transform_Declarant::fromPost
+     * @todo   Implement testFromPost().
+     */
+    public function testFromPost()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Declarant::input
+     * @todo   Implement testInput().
+     */
+    public function testInput()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Declarant::insert
+     * @todo   Implement testInsert().
+     */
+    public function testInsert()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Declarant::from_db
+     * @todo   Implement testFrom_db().
+     */
+    public function testFrom_db()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Declarant::display
+     * @todo   Implement testDisplay().
+     */
+    public function testDisplay()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Declarant::verify
+     * @todo   Implement testVerify().
+     */
+    public function testVerify()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+}

Added: trunk/transform/unit-test/Transform_RepresentativeTest.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/unit-test/Transform_RepresentativeTest.php	          =
              (rev 0)
+++ trunk/transform/unit-test/Transform_RepresentativeTest.php	2014-02-07=
 21:17:23 UTC (rev 699)
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-02-07 at 22:27:5=
4.
+ */
+class Transform_RepresentativeTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Transform_Representative
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->object =3D new Transform_Representative;
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @covers Transform_Representative::fromPost
+     * @todo   Implement testFromPost().
+     */
+    public function testFromPost()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Representative::input
+     * @todo   Implement testInput().
+     */
+    public function testInput()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Representative::insert
+     * @todo   Implement testInsert().
+     */
+    public function testInsert()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Representative::display
+     * @todo   Implement testDisplay().
+     */
+    public function testDisplay()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Representative::from_db
+     * @todo   Implement testFrom_db().
+     */
+    public function testFrom_db()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Transform_Representative::verify
+     * @todo   Implement testVerify().
+     */
+    public function testVerify()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+          'This test has not been implemented yet.'
+        );
+    }
+}



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


From MAILER-DAEMON Fri Feb 07 16:53:00 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WBtM3-0003QI-Ta
	for mharc-phpcompta-dev@gnu.org; Fri, 07 Feb 2014 16:52:59 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri,  7 Feb 2014 22:40:00 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.190965.1391809978.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r700 - in trunk: . rapport_avance
	rapport_avance/doc rapport_avance/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Feb 2014 21:52:58 -0000

Author: danydb
Date: 2014-02-07 22:40:00 +0100 (Fri, 07 Feb 2014)
New Revision: 700

Added:
   trunk/rapport_avance/doc/test_formule.bin
   trunk/rapport_avance/doc/test_listing_exemple.pdf
Modified:
   trunk/
   trunk/rapport_avance/ajax_listing_search_code.php
   trunk/rapport_avance/ajax_rapav_search_code.php
   trunk/rapport_avance/include/class_rapav_declaration.php
   trunk/rapport_avance/include/class_rapav_formulaire.php
   trunk/rapport_avance/include/class_rapav_listing_compute.php
   trunk/rapport_avance/include/class_rapav_listing_formula.php
   trunk/rapport_avance/include/formulaire.inc.php
Log:
Merged revisions 660-668 via svnmerge from=20
svn+ssh://danydb@ns352270.ovh.net/svn_extension/tag/rel671

........
  r660 | danydb | 2014-01-12 13:59:05 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  Bug compute=20
........
  r661 | danydb | 2014-01-12 17:06:37 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  Bug : better check of duplicate code
........
  r662 | danydb | 2014-01-12 17:40:38 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  Add dynamic search
........
  r663 | danydb | 2014-01-12 19:05:21 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  reorder properly declaration
........
  r664 | danydb | 2014-01-12 20:34:55 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  Check card_saldo
........
  r665 | danydb | 2014-01-12 20:40:58 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  Fix bug listing compute
........
  r666 | danydb | 2014-01-12 20:41:13 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  remove dead code
........
  r667 | danydb | 2014-01-12 20:41:24 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  Add general test
........
  r668 | danydb | 2014-01-12 21:12:42 +0100 (dim., 12 janv. 2014) | 1 lin=
e
 =20
  Bug attribut
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel671:1-658
   + /tag/rel671:1-699

Modified: trunk/rapport_avance/ajax_listing_search_code.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_listing_search_code.php	2014-02-07 21:17:23=
 UTC (rev 699)
+++ trunk/rapport_avance/ajax_listing_search_code.php	2014-02-07 21:40:00=
 UTC (rev 700)
@@ -31,8 +31,10 @@
         from rapport_advanced.listing_param=20
         where l_id=3D$1 order by 2",array($f_id));
 echo HtmlInput::title_box('Code Formulaire','search_code_div');
+echo _('Filtre').':'.HtmlInput::filter_table('code_listing_tb','0,1',1);
+
 ?>
-<table>
+<table id=3D'code_listing_tb'>
 	<tr>
 		<th>
 			Code

Modified: trunk/rapport_avance/ajax_rapav_search_code.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_rapav_search_code.php	2014-02-07 21:17:23 U=
TC (rev 699)
+++ trunk/rapport_avance/ajax_rapav_search_code.php	2014-02-07 21:40:00 U=
TC (rev 700)
@@ -29,8 +29,9 @@
 global $cn;
 $array=3D$cn->get_array("select p_id,p_code,p_libelle from rapport_advan=
ced.formulaire_param where p_type=3D3 and f_id=3D$1 order by 2",array($f_=
id));
 echo HtmlInput::title_box('Code Formulaire','search_code_div');
+echo _('Filtre').':'.HtmlInput::filter_table('code_tb','0,1',1);
 ?>
-<table>
+<table id=3D'code_tb'>
 	<tr>
 		<th>
 			Code

Copied: trunk/rapport_avance/doc/test_formule.bin (from rev 668, tag/rel6=
71/rapport_avance/doc/test_formule.bin)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/doc/test_formule.bin	                        (re=
v 0)
+++ trunk/rapport_avance/doc/test_formule.bin	2014-02-07 21:40:00 UTC (re=
v 700)
@@ -0,0 +1,115 @@
+RAPAV;4
+"Test Formule";"Test sur toutes les formules possibles"
+155;C1;"Formule + Formule2";3;110;15;1
+157;PCTVA1OP;"Poste comptable 6 et TVA 1date op=C3=A9ration ";3;150;15;1
+158;PCTVA1PAY;"Poste comptable 6 et TVA 1date Paiements";3;160;15;1
+170;T412;"Journaux Achat";6;180;15;1
+161;T42;"Total  Code TVA + Poste Comptable";2;220;15;1
+164;PCTVA2ECH;"Poste Comptable 6 et TVA 1 date Echeance";3;260;15;1
+175;T422;"Journaux Achat";6;270;15;1
+176;PCTVA22OP;"Poste comptable 6 et TVA 1date op=C3=A9ration ";3;280;15;=
1
+177;PCTVA22PAY;"Poste comptable 6 et TVA 1date Paiements";3;300;15;1
+183;PCTVA32ECH;"Poste Comptable 6 et TVA 41 date Echeance";3;390;15;1
+156;T4;"Poste comptable et TVA";1;120;15;1
+172;PCTVA12PAY;"Poste comptable 6 et TVA 1date Paiements";3;200;15;1
+173;PCTVA12ECH;"Poste Comptable 6 et TVA 1 date Echeance";3;210;15;1
+174;T421;" tous les journaux";3;230;15;1
+171;PCTVA12OP;"Poste comptable 6 et TVA 1date op=C3=A9ration ";3;190;15;=
1
+162;PCTVA2OP;"Poste comptable 6 et TVA 1date op=C3=A9ration ";3;240;15;1
+165;T43;" Poste Comptable";2;310;15;1
+179;T431;"Tous les journaux";6;320;15;1
+168;PCTVA3ECH;"Poste Comptable 6 et TVA 41 date Echeance";3;350;15;1
+153;F70ECH;"Somme 70% date =C3=A9ch=C3=A9ance";3;90;15;1
+154;T3;Compute;1;100;15;1
+169;T411;"Tous les journaux";6;140;15;1
+163;PCTVA2PAY;"Poste comptable 6 et TVA 1date Paiements";3;250;15;1
+178;PCTVA22ECH;"Poste Comptable 6 et TVA 1 date Echeance";3;290;15;1
+159;PCTVA1ECH;"Poste Comptable 6 et TVA 1 date Echeance";3;170;15;1
+160;T41;"Total Code TVA";2;130;15;1
+167;PCTVA3PAY;"Poste comptable 6 et TVA 41date Paiements";3;340;15;1
+152;F70PAY;"Somme 70% date paiement";3;80;15;1
+180;T432;"Journaux Achat";6;360;15;1
+181;PCTVA32OP;"Poste comptable 6 et TVA 41date op=C3=A9ration ";3;370;15=
;1
+182;PCTVA32PAY;"Poste comptable 6 et TVA 41date Paiements";3;380;15;1
+151;F70JRN;"Somme 70% Journaux";3;70;15;1
+150;F70OP;"Somme 70% date op=C3=A9ration";3;60;15;1
+145;FORMULE;Formule;3;20;15;1
+146;FORMULE2;"Op=C3=A9rateur ternaire sur la formule";3;30;15;1
+147;COMPUTE;"Op=C3=A9rateur ternaire sur la formule via compute";3;40;15=
;1
+149;T2;Formule;1;50;15;1
+166;PCTVA3OP;"Poste comptable 6 et TVA 41date op=C3=A9ration ";3;330;15;=
1
+188;T5;"Poste Comptable  6 & 41 date op=C3=A9ration";1;400;15;1
+189;T51;"Date op=C3=A9ration";2;410;15;1
+190;PDC51;"Solde d=C3=A9bit - cr=C3=A9dit";3;420;15;1
+191;PCD51;"Solde Cr=C3=A9dit - d=C3=A9bit";3;430;15;1
+192;PD51;D=C3=A9bit;3;440;15;1
+193;PC51;Cr=C3=A9dit;3;450;15;1
+194;T52;"Poste Comptable  6 & 41 Date Ech=C3=A9ance";2;460;15;1
+195;PDC52;"Solde d=C3=A9bit - cr=C3=A9dit";3;470;15;1
+196;PCD52;"Solde Cr=C3=A9dit - d=C3=A9bit";3;480;15;1
+197;PD52;D=C3=A9bit;3;490;15;1
+198;PC52;Cr=C3=A9dit;3;500;15;1
+199;T53;"Poste Comptable  6 & 41 Date Paiement";2;510;15;1
+200;PCD53;"Solde d=C3=A9bit - cr=C3=A9dit";3;520;15;1
+202;PDC53;"Solde Cr=C3=A9dit - d=C3=A9bit";3;530;15;1
+203;PD53;D=C3=A9bit;3;540;15;1
+204;PC53;Cr=C3=A9dit;3;550;15;1
+211;T54;"Poste comptable 6 et 41 limit=C3=A9 =C3=A0 un journal";2;560;15=
;1
+218;OR1;"Solde D=C3=A9bit - Cr=C3=A9dit solde du compte 6% utilis=C3=A9 =
avec 4% rapproch=C3=A9e avec une op=C3=A9ration 55% dans la p=C3=A9riode =
donn=C3=A9e";3;570;15;1
+213;PCD54;"Solde Cr=C3=A9dit - d=C3=A9bit";3;580;15;1
+214;PD54;"D=C3=A9bit  la date de paiement";3;590;15;1
+215;PC54;"Cr=C3=A9dit date d'=C3=A9ch=C3=A9ance";3;600;15;1
+217;T6;"Op=C3=A9ration rapproch=C3=A9es";1;610;15;1
+212;PDC54;"Solde d=C3=A9bit - cr=C3=A9dit";3;620;15;1
+222;OR5;"test order";3;630;15;1
+219;OR2;"Solde cr=C3=A9dit - d=C3=A9bit solde du compte 6% utilis=C3=A9 =
avec 4% rapproch=C3=A9e avec une op=C3=A9ration 55% dans la p=C3=A9riode =
donn=C3=A9e";3;640;15;1
+220;OR3;"D=C3=A9bit op=C3=A9ration compte 6% utilis=C3=A9 avec 4% rappro=
ch=C3=A9e avec une op=C3=A9ration 55% dans la p=C3=A9riode donn=C3=A9e";3=
;650;15;1
+221;OR4;"Cr=C3=A9dit op=C3=A9ration compte 6% utilis=C3=A9 avec 4% rappr=
och=C3=A9e avec une op=C3=A9ration 55% dans la p=C3=A9riode donn=C3=A9e l=
imit=C3=A9 au journal Achat";3;660;15;1
+148;T1;"Test sur op=C3=A9rateur ternaire";1;10;15;1
+RAPAV_DETAIL
+134;147;;;"([FORMULE] > 50000)?1:0";;;;3;;;;
+136;145;;;[7%]*2.5;;;;1;;;;0
+137;146;;;([70%]>12)?0:-12;;;;1;;;;0
+138;150;;;[70%];;;;1;;;;0
+140;152;;;[70%];;;;1;;;;2
+139;151;;;[70%];;;;1;;;;1
+141;153;;;[70%];;;;1;;;;2
+142;155;;;[FORMULE]+[C1];;;;3;;;;
+143;157;6%;1;;;ACH;1;2;;;;0
+144;158;6%;1;;;ACH;1;2;;;;1
+145;159;6%;1;;;ACH;2;2;;;;2
+146;171;6%;1;;;ACH;1;2;;;;0
+148;173;6%;1;;;ACH;1;2;;;;2
+147;172;6%;1;;;ACH;1;2;;;;1
+149;174;7%;1;;;VEN;0;2;;;;0
+150;162;7%;1;;;VEN;1;2;;;;0
+178;213;6%;;;;;;4;41%;2;;0
+151;163;6%;1;;;ACH;0;2;;;;1
+152;164;6%;1;;;ACH;0;2;;;;2
+155;176;6%;1;;;ACH;0;2;;;;0
+157;177;6%;1;;;ACH;0;2;;;;1
+179;214;61%;;;;;;4;41%;3;;1
+156;178;6%;1;;;ACH;0;2;;;;2
+158;166;6%;1;;;ACH;2;2;;;;0
+159;167;6%;1;;;ACH;2;2;;;;1
+160;168;6%;1;;;ACH;2;2;;;;2
+161;181;6%;1;;;ACH;2;2;;;;0
+162;182;6%;1;;;ACH;2;2;;;;1
+163;183;6%;1;;;ACH;2;2;;;;2
+164;190;61%;;;;;;4;41%;1;;0
+165;191;61%;;;;;;4;41%;2;;0
+166;192;61%;;;;;;4;41%;3;;0
+168;193;61%;;;;;;4;41%;4;;0
+169;195;61%;;;;;;4;41%;1;;2
+170;196;61%;;;;;;4;41%;2;;2
+171;197;61%;;;;;;4;41%;3;;2
+172;198;61%;;;;;;4;41%;4;;2
+173;200;61%;;;;;;4;41%;1;;1
+174;202;61%;;;;;;4;41%;2;;1
+175;203;61%;;;;;;4;41%;3;;1
+176;204;61%;;;;;;4;41%;4;;1
+177;212;6%;;;;;;4;41%;1;;0
+180;215;61%;;;;;;4;41%;4;;2
+181;219;61%;;;;;;5;41%;2;55%;
+182;220;61%;;;;;;5;41%;3;55%;
+183;221;6%;;;;;;4;41%;4;;0

Copied: trunk/rapport_avance/doc/test_listing_exemple.pdf (from rev 668, =
tag/rel671/rapport_avance/doc/test_listing_exemple.pdf)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: trunk/rapport_avance/include/class_rapav_declaration.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_declaration.php	2014-02-07 2=
1:17:23 UTC (rev 699)
+++ trunk/rapport_avance/include/class_rapav_declaration.php	2014-02-07 2=
1:40:00 UTC (rev 700)
@@ -1052,7 +1052,7 @@
                                 jrn1.j_poste like $1
                                 $sql_date
                                 and
-                                jrn2.j_poste like $2
+                                jrn2.j_poste like $4
                                 and
                                 jrn1.j_debit=3D'f'
                                 $filter_ledger

Modified: trunk/rapport_avance/include/class_rapav_formulaire.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_formulaire.php	2014-02-07 21=
:17:23 UTC (rev 699)
+++ trunk/rapport_avance/include/class_rapav_formulaire.php	2014-02-07 21=
:40:00 UTC (rev 700)
@@ -122,16 +122,27 @@
 	static function verify_definition(&$p_array)
 	{
 		global $cn;
-		for ($i=3D0;$i<count($p_array['p_code']);$i++)
+                $count_code=3Dcount($p_array['p_code']);
+		for ($i=3D0;$i<$count_code;$i++)
 		{
 			$c=3D$cn->get_value('select count(*) from rapport_advanced.formulaire=
_param
 				where p_code=3D$1 and p_id <> $2 and f_id=3D$3',
 					array($p_array['p_code'][$i],$p_array['p_id'][$i],$p_array['f_id'])=
);
=20
 			if ( $c > 0 ) {
-				$p_array['p_code'][$i]=3D'C'.$i.microtime();
+				$p_array['p_code'][$i]=3D'C'.$i.microtime(false);
 			}
 		}
+               =20
+                for ($i=3D0;$i<$count_code;$i++)
+                {
+                    for ($e=3D0;$e<$count_code;$e++) {
+                        if ($p_array['p_code'][$i] =3D=3D $p_array['p_co=
de'][$e] && $i !=3D $e)
+                        {
+                            $p_array['p_code'][$e]=3D'C'.$i.microtime(fa=
lse);
+                        }
+                    }
+                }
 	}
=20
 	/**
@@ -166,6 +177,7 @@
 			else
 				$form_param->update();
 		}
+               =20
 		// delete checked rows
 		if ( isset ($p_array["del_row"]))
 		{
@@ -176,6 +188,17 @@
 				}
 			}
 		}
+                // Reorder
+                //
+                $order_param=3Dnew formulaire_param_sql();
+                $ret=3D$order_param->seek(' where f_id=3D$1 order by p_o=
rder',array($p_array['f_id']));
+                $nb_rows=3DDatabase::num_row($ret);
+                for ($i=3D0;$i < $nb_rows;$i++)
+                {
+                    $param=3D$order_param->next($ret,$i);
+                    $param->p_order=3D($i+1)*10;
+                    $param->update();
+                }
 		self::load_file($rapav);
 	}
=20

Modified: trunk/rapport_avance/include/class_rapav_listing_compute.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_listing_compute.php	2014-02-=
07 21:17:23 UTC (rev 699)
+++ trunk/rapport_avance/include/class_rapav_listing_compute.php	2014-02-=
07 21:40:00 UTC (rev 700)
@@ -126,7 +126,7 @@
                  */
                 for ($i =3D 0; $i < $nb_later; $i++)
                 {
-                    $compute->set_listing_compute($this->data->lc_id);
+                    $a_later[$i]->set_listing_compute($this->data->lc_id=
);
                     $a_later[$i]->compute($p_date_start, $p_date_end);
                     $a_later[$i]->save_computed();
                 }

Modified: trunk/rapport_avance/include/class_rapav_listing_formula.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/class_rapav_listing_formula.php	2014-02-=
07 21:17:23 UTC (rev 699)
+++ trunk/rapport_avance/include/class_rapav_listing_formula.php	2014-02-=
07 21:40:00 UTC (rev 700)
@@ -209,7 +209,9 @@
     function display()
     {
         global $cn;
-        $desc =3D $cn->get_value('select ad_text from attr_def where ad_=
id=3D$1', array($this->data->getp('attribut_card')));
+        $desc =3D $cn->get_value('select ad_text from attr_def=20
+                 where ad_id=3D$1', array($this->data->getp('attribut_ca=
rd')));
+       =20
         return "Utilisant l'attribut " . h($desc);
     }
=20
@@ -239,13 +241,18 @@
     function input()
     {
         global $cn;
+        $this->cat =3D $cn->get_value('select fd_id=20
+                    from rapport_advanced.listing=20
+                    where
+                    l_id=3D$1
+                    ', array($this->data->getp('listing_id')));
         $select =3D new ISelect('p_attribute');
=20
         $select->value =3D $cn->make_array('select a.ad_id,a.ad_text=20
                                         from
                                         attr_def as a join jnt_fic_attr =
as j on (a.ad_id=3Dj.ad_id)
                                         where
-                                        fd_id=3D' . $this->data->getp('l=
isting_id') . ' order by 2');
+                                        fd_id=3D' .$this->cat . ' order =
by a.ad_text ');
=20
         $select->selected =3D $this->data->getp('attribut_card');
         return "Attribut =C3=A0 afficher pour chaque fiche " . $select->=
input();
@@ -485,6 +492,7 @@
                                 and lf.f_id =3D $3
                                 ', array($this->detail->lc_id, $search, =
$this->fiche->f_id));
             $formula =3D str_replace($piece, $value, $formula);
+          =20
         }
         /** Protect against division by zero */
         if (strpos("1" . $formula, "/0.0000") !=3D 0)
@@ -637,6 +645,8 @@
             // Saldo
             case 1:
             case 2:
+                 $card_saldo =3D ($this->data->lp_card_saldo =3D=3D 0) ?=
 "jrn1" : "jrn2";
+                 $card_saldo =3D ($this->data->lp_card_saldo =3D=3D 0) ?=
 "jrn1" : "jrn2";
                 // Compute D-C
                 $sql =3D "
                        =20
@@ -800,6 +810,7 @@
         echo '</p>';
=20
         $ck =3D new ICheckBox('card_saldo');
+        $ck->value=3D1;
         $ck->set_check($this->data->lp_card_saldo);
         echo '<p>';
         echo 'Prendre le total de la fiche ' . $ck->input();

Modified: trunk/rapport_avance/include/formulaire.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/include/formulaire.inc.php	2014-02-07 21:17:23 U=
TC (rev 699)
+++ trunk/rapport_avance/include/formulaire.inc.php	2014-02-07 21:40:00 U=
TC (rev 700)
@@ -36,7 +36,6 @@
 	}
 	else
 	{
-		//echo '<p class=3D"notice">'._(' derni=C3=A8re sauvegarde ').date('d-=
m-Y H:i').'</p>';
 		try
 		{
 			RAPAV_formulaire::save_definition($_POST);



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


From MAILER-DAEMON Sat Feb 08 08:55:38 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WC8Ne-0005AD-Li
	for mharc-phpcompta-dev@gnu.org; Sat, 08 Feb 2014 08:55:38 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  8 Feb 2014 14:42:41 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.191312.1391867737.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r701 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Feb 2014 13:55:37 -0000

Author: danydb
Date: 2014-02-08 14:42:41 +0100 (Sat, 08 Feb 2014)
New Revision: 701

Modified:
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
Log:
Bug in compute


Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-07 21:40:00 UTC (rev 700)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-08 13:42:41 UTC (rev 701)
@@ -158,7 +158,7 @@
 {
     $ltva =3D "(" . implode(',', $atva) . ")";
     //------ Operation date ----------------
-    if ($compute_date =3D=3D 1)
+    if ($compute_date =3D=3D 2)
     {
         $sql =3D "
       with  c as=20
@@ -187,7 +187,7 @@
     join f_tvanum on (qs_client=3Df_tvanum.f_id);
=20
     ";
-    } elseif ($compute_date =3D=3D 2) //------ Payment date ------------=
----
+    } elseif ($compute_date =3D=3D 1) //------ Payment date ------------=
----
     {
         $sql =3D "
         with  c as=20
@@ -197,7 +197,7 @@
         from=20
             quant_sold join jrnx on (jrnx.j_id=3Dquant_sold.j_id)=20
         where=20
-        qs_vat_code $ltva
+        qs_vat_code in $ltva
         and j_grpt in (select jr_grpt_id=20
                         from jrn=20
                         where=20



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


From MAILER-DAEMON Sat Feb 08 09:01:44 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WC8TY-0006Lx-26
	for mharc-phpcompta-dev@gnu.org; Sat, 08 Feb 2014 09:01:44 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  8 Feb 2014 14:48:48 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.191318.1391868103.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r702 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Feb 2014 14:01:43 -0000

Author: danydb
Date: 2014-02-08 14:48:48 +0100 (Sat, 08 Feb 2014)
New Revision: 702

Modified:
   trunk/transform/include/intervat_listing_assujetti_step_2.inc.php
Log:
Bug in compute + message periode, input method=20

Modified: trunk/transform/include/intervat_listing_assujetti_step_2.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-08 13:42:41 UTC (rev 701)
+++ trunk/transform/include/intervat_listing_assujetti_step_2.inc.php	201=
4-02-08 13:48:48 UTC (rev 702)
@@ -149,6 +149,7 @@
             $cn->rollback();
             throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i=
]->c_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
         }
+        $input_msg=3D_('Par fichier');
     }
 }
 //**********************************************************************=
********
@@ -187,8 +188,10 @@
     join f_tvanum on (qs_client=3Df_tvanum.f_id);
=20
     ";
+        $input_msg=3D_('Par calcul : date op=C3=A9ration');
     } elseif ($compute_date =3D=3D 1) //------ Payment date ------------=
----
     {
+        $input_msg=3D_('Par calcul : date paiement');
         $sql =3D "
         with  c as=20
         (select qs_client,
@@ -258,7 +261,7 @@
         throw new Exception(_('Ne peut pas ajouter ') . h($o_data[$i]->c=
_name) . '-' . h($o_data[$i]->c_vatnumber), 3);
     }
 }
-
+$input_msg .=3D " ".sprintf(_('p=C3=A9riode %s entre [%s]  et [%s]'),$ye=
ar,$start_date,$end_date);
 ?>
 <h2> <?php echo _('Etape 2/3') ?></h2>
 <h3><?php echo _('Mandataire'); ?></h3>
@@ -269,6 +272,9 @@
 <?php
 $declarant->display();
 ?>
+<h3>
+    <?php echo $input_msg;?>
+</h3>
 <p>
     <?php
     $a_listing =3D new Intervat_Client_SQL;



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


From MAILER-DAEMON Sat Feb 08 09:01:57 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WC8Tl-0006Md-87
	for mharc-phpcompta-dev@gnu.org; Sat, 08 Feb 2014 09:01:57 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  8 Feb 2014 14:49:01 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.191319.1391868116.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r703 - trunk/transform/sql
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Feb 2014 14:01:55 -0000

Author: danydb
Date: 2014-02-08 14:49:01 +0100 (Sat, 08 Feb 2014)
New Revision: 703

Modified:
   trunk/transform/sql/install.sql
Log:
Correct install script

Modified: trunk/transform/sql/install.sql
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/sql/install.sql	2014-02-08 13:48:48 UTC (rev 702)
+++ trunk/transform/sql/install.sql	2014-02-08 13:49:01 UTC (rev 703)
@@ -1,6 +1,11 @@
-=EF=BB=BFcreate schema transform;
+begin;
+create schema transform;
 create table transform.request(
-	r_id bigserial primary key
+	r_id bigserial primary key,
+        r_date date default now(),
+        r_type text,
+        r_start_date date ,
+        r_end_date date=20
 	);
 create table transform.version(
 	v_id bigint primary key,
@@ -18,39 +23,34 @@
 	rp_city text,
 	rp_email text,
 	rp_phone text,
-	rp_countrycode char(2) not null
+	rp_countrycode char(2) default null
=20
 );
 create table transform.intervat_declarant
 (
 	d_id bigserial primary key,
 	r_id bigint references transform.request(r_id) on update cascade on del=
ete cascade,
-	d_name text,
-	d_street text,
-	d_postcode text,
-	d_city text,
-	d_email text,
-	d_phone text,
-	d_vat_number text,
+	d_name text not null,
+	d_street text not null,
+	d_postcode text not null,
+	d_city text not null,
+	d_email text not null,
+	d_phone text not null,
+	d_vat_number text not null,
 	d_countrycode char(2) not null,
-	d_periode text
+	d_periode text not null
 );
 create table transform.intervat_client
 (
 	c_id bigserial primary key,
 	d_id bigint references transform.intervat_declarant on update cascade o=
n delete cascade,
 	c_name text,
+        c_comment text,
 	c_vatnumber text,
-	c_amount_vat text,
-	c_amount_novat text,
+	c_amount_vat text default '0',
+	c_amount_novat text default '0',
 	c_issuedby char(2) default 'BE'
-)
+);
=20
-alter table transform.request add         r_date date;
-alter table transform.request alter r_date set default now();
-alter table transform.request add         r_type text ;
-ALTER TABLE transform.request ADD COLUMN r_start_date date;
-ALTER TABLE transform.request ADD COLUMN r_end_date date;
-alter table transform.intervat_client add column c_comment text;
-alter table transform.intervat_representative alter rp_countrycode drop =
not null;
-
+insert into transform.version values(1,'Installation plugin');
+commit;
\ No newline at end of file



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


From MAILER-DAEMON Tue Feb 11 10:04:10 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDEsc-0001Gh-Bi
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 10:04:10 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 15:51:08 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.193873.1392131049.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r704 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 15:04:08 -0000

Author: danydb
Date: 2014-02-11 15:51:07 +0100 (Tue, 11 Feb 2014)
New Revision: 704

Modified:
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
Log:
Print form

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-08 13:49:01 UTC (rev 703)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-11 14:51:07 UTC (rev 704)
@@ -43,7 +43,7 @@
 $inputtype =3D HtmlInput::default_value_post('p_inputtype', -1);
 ?>
 <h2> <?php echo _('Etape 1/3') ?></h2>
-<form method=3D"post" enctype=3D"multipart/form-data" onsubmit=3D"return=
 check_form()">
+<form class=3D"print" method=3D"post" enctype=3D"multipart/form-data" on=
submit=3D"return check_form()">
     <div style=3D"width:45%;padding: 15px;float:left">
=20
         <h3><?php echo _('Mandataire'); ?></h3>



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


From MAILER-DAEMON Tue Feb 11 10:07:56 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDEwG-0001tn-89
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 10:07:56 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 15:54:51 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.193878.1392131275.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r705 - in branches: . rel672
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 15:07:55 -0000

Author: danydb
Date: 2014-02-11 15:54:51 +0100 (Tue, 11 Feb 2014)
New Revision: 705

Added:
   branches/rel672/
   branches/rel672/trunk/
Log:
Branch for NOALYSS : too many change with CSS & HTML5 to avoid quirk mode=
 with IE

Copied: branches/rel672/trunk (from rev 704, trunk)



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


From MAILER-DAEMON Tue Feb 11 13:22:03 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDHy7-0008RM-GS
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 13:22:03 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 19:08:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194135.1392142922.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r706 - branches/rel672
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 18:22:01 -0000

Author: danydb
Date: 2014-02-11 19:08:57 +0100 (Tue, 11 Feb 2014)
New Revision: 706

Removed:
   branches/rel672/trunk/
Log:
Remove stupid copy




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


From MAILER-DAEMON Tue Feb 11 13:22:33 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDHyb-0008T7-Me
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 13:22:33 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 19:09:34 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194136.1392142953.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r707 - branches/rel672
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 18:22:33 -0000

Author: danydb
Date: 2014-02-11 19:09:34 +0100 (Tue, 11 Feb 2014)
New Revision: 707

Added:
   branches/rel672/trunk/
Log:
Version for NOALYSS


Copied: branches/rel672/trunk (from rev 706, trunk)



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


From MAILER-DAEMON Tue Feb 11 13:24:05 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDI05-000091-8L
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 13:24:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 19:11:04 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194137.1392143044.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r708 - branches
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 18:24:04 -0000

Author: danydb
Date: 2014-02-11 19:11:04 +0100 (Tue, 11 Feb 2014)
New Revision: 708

Removed:
   branches/rel672/
Log:
Bad copy



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


From MAILER-DAEMON Tue Feb 11 13:24:07 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDI07-00009f-Dy
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 13:24:07 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 19:11:08 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194138.1392143046.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r709 - /
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 18:24:06 -0000

Author: danydb
Date: 2014-02-11 19:11:08 +0100 (Tue, 11 Feb 2014)
New Revision: 709

Removed:
   branches/
Log:
Bad copy



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


From MAILER-DAEMON Tue Feb 11 14:08:27 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDIh1-0000Zu-Sb
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 14:08:27 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 19:55:26 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194197.1392145707.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r704 - trunk/transform/include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 19:08:26 -0000

Author: danydb
Date: 2014-02-11 19:55:26 +0100 (Tue, 11 Feb 2014)
New Revision: 704

Modified:
   trunk/transform/include/intervat_listing_assujetti_step_1.inc.php
Log:
print form

Modified: trunk/transform/include/intervat_listing_assujetti_step_1.inc.p=
hp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-08 13:49:01 UTC (rev 703)
+++ trunk/transform/include/intervat_listing_assujetti_step_1.inc.php	201=
4-02-11 18:55:26 UTC (rev 704)
@@ -43,7 +43,7 @@
 $inputtype =3D HtmlInput::default_value_post('p_inputtype', -1);
 ?>
 <h2> <?php echo _('Etape 1/3') ?></h2>
-<form method=3D"post" enctype=3D"multipart/form-data" onsubmit=3D"return=
 check_form()">
+<form class=3D"print" method=3D"post" enctype=3D"multipart/form-data" on=
submit=3D"return check_form()">
     <div style=3D"width:45%;padding: 15px;float:left">
=20
         <h3><?php echo _('Mandataire'); ?></h3>



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


From MAILER-DAEMON Tue Feb 11 14:12:38 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDIl4-0001mW-FE
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 14:12:38 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 19:59:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194200.1392145955.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r705 - /
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 19:12:35 -0000

Author: danydb
Date: 2014-02-11 19:59:36 +0100 (Tue, 11 Feb 2014)
New Revision: 705

Added:
   rel672n/
Log:
Copy trunk to noalyss


Copied: rel672n (from rev 704, trunk)



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


From MAILER-DAEMON Tue Feb 11 14:14:10 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDImY-0002D6-0o
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 14:14:10 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 20:01:10 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194203.1392146049.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r706 - branches
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 19:14:09 -0000

Author: danydb
Date: 2014-02-11 20:01:09 +0100 (Tue, 11 Feb 2014)
New Revision: 706

Added:
   branches/rel672n/
Log:
New version


Copied: branches/rel672n (from rev 705, trunk)



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


From MAILER-DAEMON Tue Feb 11 14:14:57 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDInJ-0002zB-Pi
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 14:14:57 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 20:01:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194204.1392146096.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r707 - /
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 19:14:56 -0000

Author: danydb
Date: 2014-02-11 20:01:57 +0100 (Tue, 11 Feb 2014)
New Revision: 707

Removed:
   rel672n/
Log:
Bad copy




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


From MAILER-DAEMON Tue Feb 11 15:22:59 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDJr9-0000RV-5V
	for mharc-phpcompta-dev@gnu.org; Tue, 11 Feb 2014 15:22:59 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Tue, 11 Feb 2014 21:09:57 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.194254.1392150178.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r708 - in branches/rel672n: rapport_avance transform
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Feb 2014 20:22:57 -0000

Author: danydb
Date: 2014-02-11 21:09:57 +0100 (Tue, 11 Feb 2014)
New Revision: 708

Modified:
   branches/rel672n/rapport_avance/ajax_include_follow.php
   branches/rel672n/rapport_avance/ajax_include_follow_save.php
   branches/rel672n/rapport_avance/ajax_listing_detail_modify.php
   branches/rel672n/rapport_avance/ajax_listing_modify.php
   branches/rel672n/rapport_avance/ajax_listing_remove_modele.php
   branches/rel672n/rapport_avance/ajax_parameter_send_mail.php
   branches/rel672n/rapport_avance/ajax_save_param_listing.php
   branches/rel672n/rapport_avance/ajax_send_mail.php
   branches/rel672n/transform/ajax_save_intervat_assujetti.php
Log:
remove ob_end_clean when using ob_get_clean

Modified: branches/rel672n/rapport_avance/ajax_include_follow.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_include_follow.php	2014-02-11 19=
:01:57 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_include_follow.php	2014-02-11 20=
:09:57 UTC (rev 708)
@@ -40,7 +40,6 @@
 require_once 'include/template/include_follow.php';
=20
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: branches/rel672n/rapport_avance/ajax_include_follow_save.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_include_follow_save.php	2014-02-=
11 19:01:57 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_include_follow_save.php	2014-02-=
11 20:09:57 UTC (rev 708)
@@ -15,7 +15,6 @@
 echo '</ol>';
 echo HtmlInput::button_close('include_follow_save_result');
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: branches/rel672n/rapport_avance/ajax_listing_detail_modify.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_listing_detail_modify.php	2014-0=
2-11 19:01:57 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_listing_detail_modify.php	2014-0=
2-11 20:09:57 UTC (rev 708)
@@ -74,7 +74,6 @@
     echo '</p>';
     echo '</form>';
     $response =3D ob_get_clean();
-    ob_end_clean();
  } else {
      $response=3D'invalide id';
  }

Modified: branches/rel672n/rapport_avance/ajax_listing_modify.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_listing_modify.php	2014-02-11 19=
:01:57 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_listing_modify.php	2014-02-11 20=
:09:57 UTC (rev 708)
@@ -17,7 +17,6 @@
 echo '</p>';
 echo '</form>';
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: branches/rel672n/rapport_avance/ajax_listing_remove_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_listing_remove_modele.php	2014-0=
2-11 19:01:57 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_listing_remove_modele.php	2014-0=
2-11 20:09:57 UTC (rev 708)
@@ -7,7 +7,6 @@
 $file=3Dnew IFile('listing_mod');
 echo $file->input();
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: branches/rel672n/rapport_avance/ajax_parameter_send_mail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_parameter_send_mail.php	2014-02-=
11 19:01:57 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_parameter_send_mail.php	2014-02-=
11 20:09:57 UTC (rev 708)
@@ -29,7 +29,6 @@
    =20
 }
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: branches/rel672n/rapport_avance/ajax_save_param_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_save_param_listing.php	2014-02-1=
1 19:01:57 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_save_param_listing.php	2014-02-1=
1 20:09:57 UTC (rev 708)
@@ -139,7 +139,6 @@
 $obj->button_modify();
 echo '</td>';
 $html.=3Dob_get_clean();
-ob_end_clean();
=20
 //echo $html;exit();
 $html =3D escape_xml($html);

Modified: branches/rel672n/rapport_avance/ajax_send_mail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/rapport_avance/ajax_send_mail.php	2014-02-11 19:01:5=
7 UTC (rev 707)
+++ branches/rel672n/rapport_avance/ajax_send_mail.php	2014-02-11 20:09:5=
7 UTC (rev 708)
@@ -16,7 +16,6 @@
 echo '</ol>';
 echo HtmlInput::button_close('parameter_send_mail_result');
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: branches/rel672n/transform/ajax_save_intervat_assujetti.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/transform/ajax_save_intervat_assujetti.php	2014-02-1=
1 19:01:57 UTC (rev 707)
+++ branches/rel672n/transform/ajax_save_intervat_assujetti.php	2014-02-1=
1 20:09:57 UTC (rev 708)
@@ -73,7 +73,6 @@
     }
 }
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF



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


From MAILER-DAEMON Wed Feb 12 12:55:12 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WDe1g-000652-4a
	for mharc-phpcompta-dev@gnu.org; Wed, 12 Feb 2014 12:55:12 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 12 Feb 2014 18:42:03 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.195163.1392227711.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r709 - tag
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Feb 2014 17:55:10 -0000

Author: danydb
Date: 2014-02-12 18:42:02 +0100 (Wed, 12 Feb 2014)
New Revision: 709

Added:
   tag/rel672/
Log:
Release with transform


Copied: tag/rel672 (from rev 708, trunk)



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


From MAILER-DAEMON Thu Feb 13 14:13:46 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WE1jG-0006XZ-Uc
	for mharc-phpcompta-dev@gnu.org; Thu, 13 Feb 2014 14:13:46 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 13 Feb 2014 20:00:41 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.197279.1392318825.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r710 - in branches/rel672n/amortis: . include
	include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Feb 2014 19:13:44 -0000

Author: danydb
Date: 2014-02-13 20:00:40 +0100 (Thu, 13 Feb 2014)
New Revision: 710

Modified:
   branches/rel672n/amortis/ajax.php
   branches/rel672n/amortis/include/am_card.php
   branches/rel672n/amortis/include/am_generate.inc.php
   branches/rel672n/amortis/include/am_histo.inc.php
   branches/rel672n/amortis/include/am_print.php
   branches/rel672n/amortis/include/am_util.php
   branches/rel672n/amortis/include/class_am_card.php
   branches/rel672n/amortis/include/class_am_generate.php
   branches/rel672n/amortis/include/class_pdf_card.php
   branches/rel672n/amortis/include/material_delete.inc.php
   branches/rel672n/amortis/include/material_modify.inc.php
   branches/rel672n/amortis/include/print_all.inc.php
   branches/rel672n/amortis/include/print_fiche.inc.php
   branches/rel672n/amortis/include/template/listing_histo.php
   branches/rel672n/amortis/include/template/listing_year.php
   branches/rel672n/amortis/include/template/material_add.php
   branches/rel672n/amortis/include/template/material_detail.php
   branches/rel672n/amortis/include/template/material_display.php
   branches/rel672n/amortis/include/template/material_listing.php
   branches/rel672n/amortis/include/template/util_generate.php
   branches/rel672n/amortis/index.php
   branches/rel672n/amortis/raw.php
Log:
Translation amortissement

Modified: branches/rel672n/amortis/ajax.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/ajax.php	2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/ajax.php	2014-02-13 19:00:40 UTC (rev 710)
@@ -29,7 +29,7 @@
 extract ($_REQUEST);
=20
 $ctl=3D$t;
-$html=3D'op=C3=A9ration non trouv=C3=A9e';
+$html=3D_('op=C3=A9ration non trouv=C3=A9e');
 $extra=3D'';
 $close=3DHtmlInput::anchor_close($t);
 $html=3D$close.$html;

Modified: branches/rel672n/amortis/include/am_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/am_card.php	2014-02-12 17:42:02 UTC =
(rev 709)
+++ branches/rel672n/amortis/include/am_card.php	2014-02-13 19:00:40 UTC =
(rev 710)
@@ -40,8 +40,8 @@
 echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 $ck=3Dnew ICheckBox('all');
 $ck->selected=3D(isset ($_GET['all']))?true:false;
-echo '<p> Tous les biens y compris ceux qui sont compl=C3=A9tement amort=
is '.$ck->input();
-echo HtmlInput::submit('look','Recherche').'</p>';
+echo '<p>'._('Tous les biens y compris ceux qui sont compl=C3=A9tement a=
mortis').' '.$ck->input();
+echo HtmlInput::submit('look',_('Recherche')).'</p>';
 echo '</form>';
 echo $but->input();
 echo $good->listing($ck->selected);

Modified: branches/rel672n/amortis/include/am_generate.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/am_generate.inc.php	2014-02-12 17:42=
:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/am_generate.inc.php	2014-02-13 19:00=
:40 UTC (rev 710)
@@ -73,7 +73,7 @@
 		}
 		echo '<div class=3D"content" style=3D"width:80%;margin-left:10%">';
=20
-		$p_mesg =3D "Op=C3=A9ration sauv=C3=A9e : " . $ledger->internal;
+		$p_mesg =3D _("Op=C3=A9ration sauv=C3=A9e")." : " . $ledger->internal;
 		echo sprintf('<A class=3D"detail" style=3D"display:inline;text-decorat=
ion:underline" HREF=3D"javascript:modifyOperation(%d,%d)">%s</A>', $jr_id=
, dossier::id(), $p_mesg);
=20
 		echo '</div>';

Modified: branches/rel672n/amortis/include/am_histo.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/am_histo.inc.php	2014-02-12 17:42:02=
 UTC (rev 709)
+++ branches/rel672n/amortis/include/am_histo.inc.php	2014-02-13 19:00:40=
 UTC (rev 710)
@@ -31,11 +31,11 @@
 $r=3DHtmlInput::array_to_string(array('ac','gDossier','sa','sb','plugin_=
code'),$_REQUEST);
 $url=3Dbasename($_SERVER['PHP_SELF']).$r;
 $header->add('Quick_code',$url,'order by 1 asc','order by 1 desc','qca',=
'qcd');
-$header->add('Nom',$url,'order by vw_name asc','order by vw_name desc','=
na','nd');
-$header->add('Montant',$url,'order by h_amount asc','order by h_amount d=
esc','aa','ad');
-$header->add('Ann=C3=A9e',$url,'order by h_year asc','order by h_year de=
sc','ya','yd');
-$header->add('Pi=C3=A8ce',$url,'order by h_pj asc','order by h_pj desc',=
'pja','pjd');
-$header->add('N=C2=B0 interne',$url,'order by jr_internal asc','order by=
 jr_internal desc','nia','nid');
+$header->add(_('Nom'),$url,'order by vw_name asc','order by vw_name desc=
','na','nd');
+$header->add(_('Montant'),$url,'order by h_amount asc','order by h_amoun=
t desc','aa','ad');
+$header->add(_('Ann=C3=A9e'),$url,'order by h_year asc','order by h_year=
 desc','ya','yd');
+$header->add(_('Pi=C3=A8ce'),$url,'order by h_pj asc','order by h_pj des=
c','pja','pjd');
+$header->add(_('N=C2=B0 interne'),$url,'order by jr_internal asc','order=
 by jr_internal desc','nia','nid');
=20
 $ord=3D(isset($_REQUEST['ord']))?$_REQUEST['ord']:'na';
=20

Modified: branches/rel672n/amortis/include/am_print.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/am_print.php	2014-02-12 17:42:02 UTC=
 (rev 709)
+++ branches/rel672n/amortis/include/am_print.php	2014-02-13 19:00:40 UTC=
 (rev 710)
@@ -29,9 +29,9 @@
 $url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&s=
a=3Dreport'."&ac=3D".$_REQUEST['ac'];
=20
 $menu=3Darray(
-	    array($url.'&sb=3Ddfiche','D=C3=A9tail fiche',' D=C3=A9tail fiche '=
,1),
-	    array($url.'&sb=3Ddall','Listing','',2),
-	    array($url.'&sb=3Dtabyear','Tableau / ann=C3=A9e','Tableau amortiss=
ement par ann=C3=A9e',3)
+	    array($url.'&sb=3Ddfiche',_('D=C3=A9tail fiche'),_('D=C3=A9tail fic=
he'),1),
+	    array($url.'&sb=3Ddall',_('Listing'),'',2),
+	    array($url.'&sb=3Dtabyear',_('Tableau / ann=C3=A9e'),_('Tableau amo=
rtissement par ann=C3=A9e'),3)
 	    );
=20
=20

Modified: branches/rel672n/amortis/include/am_util.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/am_util.php	2014-02-12 17:42:02 UTC =
(rev 709)
+++ branches/rel672n/amortis/include/am_util.php	2014-02-13 19:00:40 UTC =
(rev 710)
@@ -27,8 +27,8 @@
 $url=3D'?'.dossier::get().'&plugin_code=3D'.$_REQUEST['plugin_code'].'&s=
a=3Dutil'.'&ac=3D'.$_REQUEST['ac'];
=20
 $menu=3Darray(
-	    array($url.'&sb=3Dgenerate','G=C3=A9n=C3=A9re =C3=A9criture',' G=C3=
=A9n=C3=A9ration =C3=A9criture comptable ',1),
-	    array($url.'&sb=3Dhisto','Historique','Historique des op=C3=A9ratio=
ns',3)
+	    array($url.'&sb=3Dgenerate',_('G=C3=A9n=C3=A9re =C3=A9criture'),_('=
G=C3=A9n=C3=A9ration =C3=A9criture comptable'),1),
+	    array($url.'&sb=3Dhisto',_('Historique'),_('Historique des op=C3=A9=
rations'),3)
 	    );
=20
=20

Modified: branches/rel672n/amortis/include/class_am_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/class_am_card.php	2014-02-12 17:42:0=
2 UTC (rev 709)
+++ branches/rel672n/amortis/include/class_am_card.php	2014-02-13 19:00:4=
0 UTC (rev 710)
@@ -177,9 +177,9 @@
     if ( isNumber($_POST['p_year']) =3D=3D null || $_POST['p_year']<1900=
||$_POST['p_year'] > 3000 ) $error_msg.=3D_('Ann=C3=A9e invalide')."\n";
     if ( isNumber($_POST['p_number']) =3D=3D null || $_POST['p_number']=3D=
=3D0)$error_msg.=3D_ ('Nombre annuit=C3=A9s invalide')."\n";
     if ( isNumber($_POST['p_amount']) =3D=3D null || $_POST['p_amount']=3D=
=3D0) $error_msg.=3D_ ('Montant invalide')."\n";
-    if ( $_POST['p_visible'] !=3D 'Y' && $_POST['p_visible'] !=3D 'N') $=
error_msg.=3D"Visible Y ou N\n";
-    if ( $cn->get_value('select count(*) from tmp_pcmn where pcm_val=3D$=
1',array($_POST['p_deb'])) =3D=3D 0) $error_msg.=3D" Poste de charge inco=
rrect"."\n";
-    if ( $cn->get_value('select count(*) from tmp_pcmn where pcm_val=3D$=
1',array($_POST['p_cred'])) =3D=3D 0) $error_msg.=3D" Poste =C3=A0 cr=C3=A9=
diter incorrect"."\n";
+    if ( $_POST['p_visible'] !=3D 'Y' && $_POST['p_visible'] !=3D 'N') $=
error_msg.=3D_("Visible Y ou N")."\n";
+    if ( $cn->get_value('select count(*) from tmp_pcmn where pcm_val=3D$=
1',array($_POST['p_deb'])) =3D=3D 0) $error_msg.=3D" "._("Poste de charge=
 incorrect")."\n";
+    if ( $cn->get_value('select count(*) from tmp_pcmn where pcm_val=3D$=
1',array($_POST['p_cred'])) =3D=3D 0) $error_msg.=3D" "._("Poste =C3=A0 c=
r=C3=A9diter incorrect")."\n";
     return $error_msg;
   }
   /**
@@ -242,7 +242,7 @@
=20
     if ( $amort->a_id =3D=3D'')=20
       {
-	echo '<h2 class=3D"error">Non trouv=C3=A9</h2>';
+	echo '<h2 class=3D"error">'._('Non trouv=C3=A9').'</h2>';
 	exit();
       }
     $amort->load();

Modified: branches/rel672n/amortis/include/class_am_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/class_am_generate.php	2014-02-12 17:=
42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/class_am_generate.php	2014-02-13 19:=
00:40 UTC (rev 710)
@@ -118,7 +118,7 @@
     global $cn;
     $msg=3D'';
     if ( isNumber($p_array['p_year']) =3D=3D 0 || $p_array['p_year'] < 1=
900 || $p_array['p_year']>2100) $msg=3D"Ann=C3=A9e invalide\n";
-    if ( isDate($p_array['p_date']) =3D=3D null) $msg.=3D"Date invalide =
";
+    if ( isDate($p_array['p_date']) =3D=3D null) $msg.=3D_("Date invalid=
e ");
     if ( $msg !=3D '')
       {
 		echo alert($msg);
@@ -154,14 +154,14 @@
 	    $val=3D($val=3D=3D'')?0:$val;
 	    $mat=3Darray('poste'.$idx =3D> $n->account_deb,
 		       'amount'.$idx=3D> $val,
-		       'ld'.$idx =3D>'Dotation =C3=A0 '.$fiche->strAttribut(ATTR_DEF_Q=
UICKCODE),
+		       'ld'.$idx =3D>_('Dotation =C3=A0 ').$fiche->strAttribut(ATTR_DE=
F_QUICKCODE),
 		       'ck'.$idx=3D>1,
 		       'qc_'.$idx=3D>'');
 	    $array+=3D$mat;
 	    $idx++;
 	    $mat=3Darray('poste'.$idx =3D> $n->account_cred,
 		       'amount'.$idx=3D> $val,
-		       'ld'.$idx =3D>'Amortissement '.$fiche->strAttribut(ATTR_DEF_QUI=
CKCODE),
+		       'ld'.$idx =3D>_('Amortissement ').$fiche->strAttribut(ATTR_DEF_=
QUICKCODE),
 		       'qc_'.$idx=3D>'');
 	    $array+=3D$mat;
 	    $idx++;
@@ -211,7 +211,7 @@
 	if ( isset($p_array['p_ck'.$i]))
 	  echo HtmlInput::hidden('p_ck'.$i,'1');
       }
-    echo HtmlInput::submit('correct','Corriger');
+    echo HtmlInput::submit('correct',_('Corriger'));
     echo '</form>';
     echo '</div>';
     return true;

Modified: branches/rel672n/amortis/include/class_pdf_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/class_pdf_card.php	2014-02-12 17:42:=
02 UTC (rev 709)
+++ branches/rel672n/amortis/include/class_pdf_card.php	2014-02-13 19:00:=
40 UTC (rev 710)
@@ -71,36 +71,36 @@
             $this->Ln(12);
=20
             $this->SetFont('DejaVu','',7);
-            $this->Cell(50,7,'Montant');
+            $this->Cell(50,7,_('Montant'));
             $this->Cell(50,7,nbm($row['a_amount']));
 	    $this->ln(4);
=20
-            $this->Cell(50,7,"Ann=C3=A9e d'achat");
+            $this->Cell(50,7,_("Ann=C3=A9e d'achat"));
             $this->Cell(50,7,$row['a_start']);
 	    $this->ln(4);
=20
-            $this->Cell(50,7,"Poste charge");
+            $this->Cell(50,7,_("Poste charge"));
             $this->Cell(50,7,$row['account_deb']);
 	    $deb=3D$this->cn->get_value("select pcm_lib from tmp_pcmn where pcm=
_val=3D$1",
 				      array($row['account_deb']));
             $this->Cell(120,7,$deb);
 	    $this->ln(4);
=20
-            $this->Cell(50,7,"Poste contrepartie");
+            $this->Cell(50,7,_("Poste contrepartie"));
             $this->Cell(50,7,$row['account_cred']);
 	    $cred=3D$this->cn->get_value("select pcm_lib from tmp_pcmn where pc=
m_val=3D$1",
 				      array($row['account_cred']));
             $this->Cell(120,7,$cred);
 	    $this->ln(4);
=20
-            $this->Cell(50,7,"Nbre annuit=C3=A9s");
+            $this->Cell(50,7,_("Nbre annuit=C3=A9s"));
             $this->Cell(50,7,$row['a_nb_year']);
 	    $this->ln(12);
=20
 	    /*
 	     * Now we print for each year=20
 	     */
-	    $col=3Darray('Ann=C3=A9e','Montant','Am. act=C3=A9s','Pi=C3=A8ce','=
n=C2=B0 interne','%');
+	    $col=3Darray(_('Ann=C3=A9e'),_('Montant'),_('Am. act=C3=A9s'),_('Pi=
=C3=A8ce'),_('n=C2=B0 interne'),'%');
 	    foreach ($col as $scol)
 	      {
 		$this->Cell(25,7,$scol,1);
@@ -130,7 +130,7 @@
 	      }// for all year
 	    if ($i < count($array)) $this->AddPage();
         } // for ... all card
-	$this->Output('toutes_les_fiches.pdf','I');
+	$this->Output(_("toutes_les_fiches.pdf"),'I');
     }
 }
 ?>
\ No newline at end of file

Modified: branches/rel672n/amortis/include/material_delete.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/material_delete.inc.php	2014-02-12 1=
7:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/material_delete.inc.php	2014-02-13 1=
9:00:40 UTC (rev 710)
@@ -2,7 +2,7 @@
 $cn->exec_sql('delete from amortissement.amortissement where a_id=3D$1',
 	      array($a_id));
 echo HtmlInput::anchor_close($t);
-echo h2info('Bien =C3=A0 amortir');
-echo '<h2 class=3D"notice">'.'Effac=C3=A9'.'</h2>';
-echo HtmlInput::button('close','Fermer',"onclick=3D\"removeDiv('$t');\""=
);
+echo h2info(_('Bien =C3=A0 amortir'));
+echo '<h2 class=3D"notice">'._('Effac=C3=A9').'</h2>';
+echo HtmlInput::button('close',_('Fermer'),"onclick=3D\"removeDiv('$t');=
\"");
 ?>
\ No newline at end of file

Modified: branches/rel672n/amortis/include/material_modify.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/material_modify.inc.php	2014-02-12 1=
7:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/material_modify.inc.php	2014-02-13 1=
9:00:40 UTC (rev 710)
@@ -37,9 +37,9 @@
 if ( $cn->count() =3D=3D 0 )
   {
     echo HtmlInput::anchor_close($t);
-    echo '<h2 class=3D"info">D=C3=A9tail de mat=C3=A9riel</h2>';
-    echo "<h2 class=3D\"error\"> Bien =C3=A0 amortir effac=C3=A9 </h2>";
-    echo HtmlInput::button('close','Fermer',"onclick=3D\"removeDiv('bxma=
t');refresh_window()\" ");
+    echo '<h2 class=3D"info">'._('D=C3=A9tail de mat=C3=A9riel').'</h2>'=
;
+    echo "<h2 class=3D\"error\">"._('Bien =C3=A0 amortir effac=C3=A9')."=
 </h2>";
+    echo HtmlInput::button('close',_('Fermer'),"onclick=3D\"removeDiv('b=
xmat');refresh_window()\" ");
   }
 else
   {

Modified: branches/rel672n/amortis/include/print_all.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/print_all.inc.php	2014-02-12 17:42:0=
2 UTC (rev 709)
+++ branches/rel672n/amortis/include/print_all.inc.php	2014-02-13 19:00:4=
0 UTC (rev 710)
@@ -37,6 +37,6 @@
 <?php echo HtmlInput::hidden('material','1');?>
 <?php echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
 <?php echo HtmlInput::extension()?>
-<?php echo HtmlInput::submit('csv','Export CSV');?>
+  <?php echo HtmlInput::submit('csv',_('Export CSV'));?>
 </form>
 </div>
\ No newline at end of file

Modified: branches/rel672n/amortis/include/print_fiche.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/print_fiche.inc.php	2014-02-12 17:42=
:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/print_fiche.inc.php	2014-02-13 19:00=
:40 UTC (rev 710)
@@ -41,7 +41,7 @@
 				$p_card->name);
     $p_card->set_function('fill_data');
     $p_card->set_dblclick("fill_ipopcard(this);");
-    $msg=3D"Fiche";
+    $msg=3D_("Fiche");
     if ( isset($_GET['p_card']))
       {
 	/* search the card */
@@ -52,7 +52,7 @@
       }
     echo '<span style=3D"text-align:left;display:block;font-size:2em" id=
=3D"p_card_label"  >'.$msg.'</span>';
     echo "Fiche ".$p_card->input().$p_card->search();
-    echo HtmlInput::submit('search','Accepter');
+    echo HtmlInput::submit('search',_('Accepter'));
     echo '</form>';
=20
     echo '<FORM METHOD=3D"GET" ACTION=3D"extension.raw.php">';
@@ -60,7 +60,7 @@
     echo HtmlInput::hidden('sb',$_REQUEST['sb']);
     echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
     echo dossier::hidden();
-    echo HtmlInput::submit('pdf_all','Toutes les fiches en PDF');
+    echo HtmlInput::submit('pdf_all',_('Toutes les fiches en PDF'));
     echo '</form>';
=20
     if ( isset($_GET['search']))

Modified: branches/rel672n/amortis/include/template/listing_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/listing_histo.php	2014-02-1=
2 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/listing_histo.php	2014-02-1=
3 19:00:40 UTC (rev 710)
@@ -1,5 +1,5 @@
 <div class=3D"content" style=3D"width:80%;margin-left:10%">
-<!-- <h2 class=3D"info">Historique</h2> -->
+   <!-- <h2 class=3D"info"><?php echo_("Historique")?></h2> -->
 <form method=3D"POST">
 <?php
 echo HtmlInput::hidden('sa',$_REQUEST['sa']);
@@ -7,7 +7,7 @@
 echo HtmlInput::hidden('ac',$_REQUEST['ac']);
 echo HtmlInput::hidden('plugin_code',$_REQUEST['plugin_code']);
 echo dossier::hidden();
-echo 'Filtre : '.HtmlInput::filter_table('amortissement_tb','1,2,3,5,6',=
1);
+echo _('Filtre')." : ".HtmlInput::filter_table('amortissement_tb','1,2,3=
,5,6',1);
 ?>
 <table id=3D"amortissement_tb" class=3D"result">
 <tr>
@@ -47,6 +47,6 @@
 ?>
=20
 </table>
-<?php echo HtmlInput::submit('remove','Effacer la s=C3=A9lection','oncli=
ck=3D"confirm(\'Confirmez Effacement ?\')"')?>
+<?php echo HtmlInput::submit('remove',_('Effacer la s=C3=A9lection'),'on=
click=3D"confirm(\'Confirmez Effacement ?\')"')?>
 </form>
 </div>

Modified: branches/rel672n/amortis/include/template/listing_year.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/listing_year.php	2014-02-12=
 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/listing_year.php	2014-02-13=
 19:00:40 UTC (rev 710)
@@ -5,16 +5,16 @@
 </style>
 <table class=3D"result">
 <tr>
-  <th>Code</th>
-  <th>Description</th>
-  <th>Date d'acquisition</th>
-  <th>Ann=C3=A9e d'achat</th>
-  <th style=3D"text-align:right">Montant =C3=A0 l'achat</th>
-  <th style=3D"text-align:right">Nombre amortissement</th>
-  <th style=3D"text-align:right">Montant =C3=A0 amortir</th>
-  <th style=3D"text-align:right">Amortissement</th>
-  <th style=3D"text-align:right">Pourcentage</th>
-  <th style=3D"text-align:right">Reste =C3=A0 amortir</th>
+  <th><?php echo_("Code")?></th>
+  <th><?php echo_("Description")?></th>
+  <th><?php echo_("Date d'acquisition")?></th>
+  <th><?php echo_("Ann=C3=A9e d'achat")?></th>
+  <th style=3D"text-align:right"><?php echo_("Montant =C3=A0 l'achat")?>=
</th>
+  <th style=3D"text-align:right"><?php echo_("Nombre amortissement")?></=
th>
+  <th style=3D"text-align:right"><?php echo_("Montant =C3=A0 amortir")?>=
</th>
+  <th style=3D"text-align:right"><?php echo_("Amortissement")?></th>
+  <th style=3D"text-align:right"><?php echo_("Pourcentage")?></th>
+  <th style=3D"text-align:right"><?php echo_("Reste =C3=A0 amortir")?></=
th>
 </tr>
 <?php=20
 $tot_amort=3D0;$tot_net=3D0;bcscale(2);
@@ -58,7 +58,7 @@
 <table class=3D"result" style=3D"width:50%;margin-left:25%">
 <tr>
 <?php=20
-echo td("Acquisition de l'ann=C3=A9e");
+  echo td(_("Acquisition de l'ann=C3=A9e"));
    $tot=3D$cn->get_value(" select coalesce(sum(a_amount),0) from amortis=
sement.amortissement where a_start=3D$1",
 			array($year));
 echo td(nbm($tot),"align=3D\"right\"");
@@ -66,13 +66,13 @@
 </tr>
 <tr>
 <?php=20
-echo td("Amortissement ");
+echo td(_("Amortissement"));
 echo td(nbm($tot_amort),"align=3D\"right\"");
 ?>
 </tr>
 <tr>
 <?php=20
-echo td("Valeur net ");
+echo td(_("Valeur net "));
 echo td(nbm($tot_net),"align=3D\"right\"");
=20
 ?>

Modified: branches/rel672n/amortis/include/template/material_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_add.php	2014-02-12=
 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_add.php	2014-02-13=
 19:00:40 UTC (rev 710)
@@ -1,37 +1,37 @@
 <h2 class=3D"info">Ajout de mat=C3=A9riel</h2>
 <form method=3D"POST" onsubmit=3D"save_new_material(this);return false;"=
>
-<span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  >Nouveau mat=C3=A9riel</span>
+   <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p=
_card_label"  ><?php echo_("Nouveau mat=C3=A9riel")?></span>
 <table>
 <tr>
-	<td>Fiche</td>
+   <td><?php echo_("Fiche")?></td>
 	<td><?php echo $p_card->input()?><?php echo $p_card->search()?></td>
 </tr>
 <tr>
-	<td>Date d'acquisition</td>
+   <td><?php echo_("Date d'acquisition")?></td>
 	<td><?php echo $p_date->input()?></td>
 </tr>
=20
 <tr>
-	<td>Montant =C3=A0 amortir</td>
+   <td><?php echo_("Montant =C3=A0 amortir")?></td>
 	<td><?php echo $p_amount->input()?></td>
 </tr>
=20
 <tr>
-	<td>Ann=C3=A9e comptable d'achat</td>
+   <td><?php echo_("Ann=C3=A9e comptable d'achat")?></td>
 	<td> <?php echo $p_year->input();?></td>
 </tr>
 <tr>
-	<td>Poste de charge dotations amortissement (d=C3=A9bit)</td>
+	<td><?php echo_("Poste de charge dotations amortissement (d=C3=A9bit)")=
?></td>
 	<td><?php echo $p_deb->input()?></td>
 	<td><?php echo $deb_span->input()?></td>
 </tr>
 <tr>
-	<td>Poste amortissement en contrepartie</td>
+	<td><?php echo_("Poste amortissement en contrepartie")?></td>
 	<td><?php echo $p_cred->input();?></td>
 	<td><?php echo $cred_span->input();?></td>
 </tr>
 <tr>
-	<td>Nombre d'ann=C3=A9es amortissement</td>
+	<td><?php echo_("Nombre d'ann=C3=A9es amortissement")?></td>
 	<td><?php echo $p_number->input()?></td>
 </tr>
 <tr>
@@ -48,8 +48,8 @@
 </tr>
 </table>
 <?php=20
-	echo HtmlInput::button('close','Annuler',"onclick=3D\"removeDiv('$t')\"=
");
-	echo HtmlInput::submit('sauver','Sauver',"onclick=3D\"return confirm('V=
ous confirmez ?')\" ");
+	echo HtmlInput::button('close',_('Annuler'),"onclick=3D\"removeDiv('$t'=
)\"");
+echo HtmlInput::submit('sauver',_('Sauver'),"onclick=3D\"return confirm(=
'Vous confirmez ?')\" ");
 	echo HtmlInput::extension();
 	echo dossier::hidden();
=20

Modified: branches/rel672n/amortis/include/template/material_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_detail.php	2014-02=
-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_detail.php	2014-02=
-13 19:00:40 UTC (rev 710)
@@ -1,43 +1,43 @@
-<h2 class=3D"info">Modification de mat=C3=A9riel</h2>
+<h2 class=3D"info"><?php echo_("Modification de mat=C3=A9riel")?></h2>
 <form onsubmit=3D"save_modify(this);return false">
 <?php echo $p_card?>
 <?php echo $a_id?>
 <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?php echo  $card->strAttribut(ATTR_DEF_NAME)?></span>
 <table>
 <tr>
-	<td>Fiche</td>
+   <td><?php echo_("Fiche")?></td>
 	<td><?php echo HtmlInput::card_detail($card->strAttribut(ATTR_DEF_QUICK=
CODE))?></td>
 </tr>
=20
 <tr>
-	<td>Date Acquisition</td>
+   <td><?php echo_("Date Acquisition")?></td>
 	<td><?php echo $p_date->input()?></td>
 </tr>
 <tr>
-	<td>Montant =C3=A0 amortir</td>
+   <td><?php echo_("Montant =C3=A0 amortir")?></td>
 	<td><?php echo $p_amount->input()?></td>
 </tr>
=20
 <tr>
-	<td>Ann=C3=A9e comptable d'achat</td>
+   <td><?php echo_("Ann=C3=A9e comptable d'achat")?></td>
 	<td> <?php echo $p_year->input();?></td>
 </tr>
 <tr>
-	<td>Poste de charge dotations amortissement (d=C3=A9bit)</td>
+	<td><?php echo_("Poste de charge dotations amortissement (d=C3=A9bit)")=
?></td>
 	<td><?php echo $p_deb->input()?></td>
 	<td><?php echo $deb_span->input()?></td>
 </tr>
 <tr>
-	<td>Poste amortissement en contrepartie</td>
+	<td><?php echo_("Poste amortissement en contrepartie")?></td>
 	<td><?php echo $p_cred->input();?></td>
 	<td><?php echo $cred_span->input();?></td>
 </tr>
 <tr>
-	<td>Nombre d'ann=C3=A9es amortissement (non modifiable)</td>
+	<td><?php echo_("Nombre d'ann=C3=A9es amortissement (non modifiable)")?=
></td>
 	<td><?php echo $p_number->input()?></td>
 </tr>
 <tr>
-	<td>Visible <span class=3D"notice">Y pour oui ou N pour non</span></td>
+	<td><?php echo_("Visible")?> <span class=3D"notice"><?php echo_("Y pour=
 oui ou N pour non")?></span></td>
 	<td><?php echo $p_visible->input();?></td>
 </tr>
 <tr>
@@ -49,17 +49,17 @@
 	<td></td>
 </tr>
 </table>
-<span class=3D"notice"> En changeant le montant =C3=A0 amortir, l'ann=C3=
=A9e ou le nombre d'ann=C3=A9es, les annuit=C3=A9s seront recalcul=C3=A9e=
s et l'historique effac=C3=A9</span>
-<fieldset><legend>Annuit=C3=A9s</legend>
+	<span class=3D"notice"> <?php echo_("En changeant le montant =C3=A0 amo=
rtir, l'ann=C3=A9e ou le nombre d'ann=C3=A9es, les annuit=C3=A9s seront r=
ecalcul=C3=A9es et l'historique effac=C3=A9")?></span>
+   <fieldset><legend><?php echo_("Annuit=C3=A9s")?></legend>
 <table class=3D"result">
-<th>Ann=C3=A9e</th>
-<th>Montant</th>
-<th>Amortissement act=C3=A9</th>
-<th>Pi=C3=A8ce </th>
-<th>n=C2=B0  interne</th>
+   <th><?php echo_("Ann=C3=A9e")?></th>
+   <th><?php echo_("Montant")?></th>
+   <th><?php echo_("Amortissement act=C3=A9")?></th>
+   <th><?php echo_("Pi=C3=A8ce")?> </th>
+   <th><?php echo_("n=C2=B0 interne")?></th>
=20
=20
-<th>Pourcent</th>
+   <th><?php echo_("Pourcent")?></th>
=20
 <?php=20
 bcscale(2);
@@ -118,24 +118,24 @@
 endfor;
 ?>
 </table>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Total =3D <?php echo nbm($annuite)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Amorti =3D <?php echo nbm($done)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Reste =3D <?php echo nbm($p_amount->value-$d=
one)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%"><?php echo_("Total")?> =3D <?php echo nbm($a=
nnuite)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Amorti")?> =3D <?php echo nb=
m($done)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Reste")?> =3D <?php echo nbm=
($p_amount->value-$done)?></span>
=20
 <?php=20
 if ( $annuite !=3D  $p_amount->value)
  {
- 	echo '<h2 class=3D"error">Diff=C3=A9rence entre le montant =C3=A0 amor=
tir et le montant amorti =3D';
+   echo '<h2 class=3D"error">'._("Diff=C3=A9rence entre le montant =C3=A0=
 amortir et le montant amorti =3D");
 	echo nbm($annuite - $p_amount->value);
 	echo '<h2>';
  }
  ?>
 </fieldset>
 <?php=20
-   echo HtmlInput::submit('sauver','Sauver',"onclick=3D\"return confirm(=
'Vous confirmez ?')\" ");
+echo HtmlInput::submit('sauver',_('Sauver'),"onclick=3D\"return confirm(=
'Vous confirmez ?')\" ");
    $rm=3Dsprintf("remove_mat(%d,'%s',%d)",dossier::id(),$_REQUEST['plugi=
n_code'],$value_a_id);
-   echo HtmlInput::button('remove','Effacer',"onclick=3D\"$rm\" ");
-   echo HtmlInput::button('close','Fermer',"onclick=3D\"removeDiv('bxmat=
');refresh_window()\" ");
+echo HtmlInput::button('remove',_('Effacer'),"onclick=3D\"$rm\" ");
+echo HtmlInput::button('close',_('Fermer'),"onclick=3D\"removeDiv('bxmat=
');refresh_window()\" ");
=20
 ?>
 </FORM>

Modified: branches/rel672n/amortis/include/template/material_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_display.php	2014-0=
2-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_display.php	2014-0=
2-13 19:00:40 UTC (rev 710)
@@ -1,51 +1,51 @@
-<h2 class=3D"info">D=C3=A9tail de mat=C3=A9riel</h2>
+<h2 class=3D"info"><?php echo_("D=C3=A9tail de mat=C3=A9riel")?></h2>
 <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?php echo  $card->strAttribut(ATTR_DEF_NAME)?></span>
 <table>
 <tr>
-	<td>Fiche</td>
+   <td><?php echo_("Fiche")?></td>
 	<td><?php echo $card->strAttribut(ATTR_DEF_QUICKCODE)?></td>
 </tr>
=20
 <tr>
-	<td>Date d'acquisition</td>
+   <td><?php echo_("Date d'acquisition")?></td>
 	<td><?php echo $p_date?></td>
 </tr>
=20
 <tr>
-	<td>Montant =C3=A0 amortir</td>
+   <td><?php echo_("Montant =C3=A0 amortir")?></td>
 	<td><?php echo $p_amount?></td>
 </tr>
=20
 <tr>
-	<td>Ann=C3=A9e comptable d'achat</td>
+   <td><?php echo_("Ann=C3=A9e comptable d'achat")?></td>
 	<td> <?php echo $p_year;?></td>
 </tr>
 <tr>
-	<td>Poste de charge dotations amortissement (d=C3=A9bit)</td>
+	<td><?php echo_("Poste de charge dotations amortissement (d=C3=A9bit)")=
?></td>
 	<td><?php echo $p_deb?></td>
 	<td><?php echo $deb_span?></td>
 </tr>
 <tr>
-	<td>Poste amortissement en contrepartie</td>
+	<td><?php echo_("Poste amortissement en contrepartie")?></td>
 	<td><?php echo $p_cred?></td>
 	<td><?php echo $cred_span?></td>
 </tr>
 <tr>
-	<td>Nombre d'ann=C3=A9es amortissement (non modifiable)</td>
+	<td><?php echo_("Nombre d'ann=C3=A9es amortissement (non modifiable)")?=
></td>
 	<td><?php echo $p_number?></td>
 </tr>
 </table>
=20
-<fieldset><legend>Annuit=C3=A9s</legend>
+<fieldset><legend><?php echo_("Annuit=C3=A9s")?></legend>
 <table class=3D"result">
-<th>Ann=C3=A9e</th>
-<th>Montant</th>
-<th style=3D"text-align:right" >Amortissement act=C3=A9</th>
-<th style=3D"text-align:center">Pi=C3=A8ce </th>
-<th>n=C2=B0  interne</th>
+   <th><?php echo_("Ann=C3=A9e")?></th>
+   <th><?php echo_("Montant")?></th>
+   <th style=3D"text-align:right" ><?php echo_("Amortissement act=C3=A9"=
)?></th>
+   <th style=3D"text-align:center"><?php echo_("Pi=C3=A8ce")?> </th>
+   <th><?php echo_("n=C2=B0 interne")?></th>
=20
=20
-<th>Pourcent</th>
+   <th><?php echo_("Pourcent")?></th>
=20
 <?php=20
 bcscale(2);
@@ -92,19 +92,19 @@
 endfor;
 ?>
 </table>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Total =3D <?php echo nbm($annuite)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Amorti =3D <?php echo nbm($done)?></span>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%">Reste =3D <?php echo nbm($p_amount-$done)?><=
/span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%"><?php echo_("Total")?> =3D <?php echo nbm($a=
nnuite)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Amorti")?> =3D <?php echo nb=
m($done)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Reste")?> =3D <?php echo nbm=
($p_amount-$done)?></span>
=20
 <?php=20
 if ( $annuite !=3D  $p_amount)
  {
- 	echo '<h2 class=3D"error">Diff=C3=A9rence entre le montant =C3=A0 amor=
tir et le montant amorti =3D';
+   echo '<h2 class=3D"error">'._("Diff=C3=A9rence entre le montant =C3=A0=
 amortir et le montant amorti =3D");
 	echo nbm($annuite - $p_amount);
 	echo '<h2>';
  }
  ?>
 </fieldset>
-<?php echo "Date ".date ('d.m.Y');?>
+<?php echo _("Date ").date ('d.m.Y');?>
 <?php echo HtmlInput::print_window()?>
=20

Modified: branches/rel672n/amortis/include/template/material_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_listing.php	2014-0=
2-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/material_listing.php	2014-0=
2-13 19:00:40 UTC (rev 710)
@@ -3,16 +3,16 @@
=20
 <table id=3D"list_amortissement" class=3D"sortable" style=3D"width:80%;m=
argin-left:10%">
 <tr>
-<th>Quickcode</th>
+   <th><?php echo_("Quickcode")?></th>
 <th class=3D" sorttable_sorted">
 	Nom
 <span id=3D"sorttable_sortfwdind">&nbsp;&nbsp;&#x25BE;</span>
 </th>
-<th>Date acquisition</th>
-<th>Ann=C3=A9e achat</th>
-<th style=3D"text-align:right">Montant Initial</th>
-<th style=3D"text-align:right">Montant Amorti</th>
-<th style=3D"text-align:right">Montant =C3=A0 amortir</th>
+<th><?php echo_("Date acquisition")?></th>
+<th><?php echo_("Ann=C3=A9e achat")?></th>
+<th style=3D"text-align:right"><?php echo_("Montant Initial")?></th>
+<th style=3D"text-align:right"><?php echo_("Montant Amorti")?></th>
+<th style=3D"text-align:right"><?php echo_("Montant =C3=A0 amortir")?></=
th>
=20
 </tr>
=20

Modified: branches/rel672n/amortis/include/template/util_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/util_generate.php	2014-02-1=
2 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/include/template/util_generate.php	2014-02-1=
3 19:00:40 UTC (rev 710)
@@ -32,15 +32,15 @@
=20
 <table>
 <tr>
-<td>Ann=C3=A9e</td>
+   <td><?php echo_("Ann=C3=A9e")?></td>
 <td><?php echo $year->input();?></td>
 </tr>
 <tr>
-<td>Journal dans lequel l'=C3=A9criture sera pass=C3=A9e</td>
+<td><?php echo _("Journal dans lequel l'=C3=A9criture sera pass=C3=A9e")=
?></td>
 <td><?php echo $sel_ledger->input()?></td>
 </tr>
 <tr>
-<td>Date de l'op=C3=A9ration</td>
+<td><?php echo _("Date de l'op=C3=A9ration")?></td>
 <td><?php echo $p_date->input()?></td>
 </tr>
 <?php if ( isset ($f_periode)) : ?>
@@ -54,18 +54,18 @@
 </tr>
 <?php endif; ?>
 <tr>
-<td>Pi=C3=A8ce</td>
+<td><?php echo_("Pi=C3=A8ce")?></td>
 <td><?php echo $pj->input()?></td>
 </tr>
 </table>
=20
-Cochez ce qu'il faut amortir
+ <?php echo_("Cochez ce qu'il faut amortir")?>
 <table class=3D"result">
 <tr>
-	<th>Selection</th>
-	<th>Quick Code</th>
-	<th>Nom</th>
-	<th>Description</th>
+   <th><?php echo_("Selection")?></th>
+   <th><?php echo_("Quick Code")?></th>
+   <th><?php echo_("Nom")?></th>
+   <th><?php echo_("Description")?></th>
 </tr>
 <?php=20
 /*
@@ -95,7 +95,7 @@
 endfor;
 ?>
 </table>
-<?php echo HtmlInput::submit('generate',"G=C3=A9n=C3=A9rer l'=C3=A9critu=
re");?>
+<?php echo HtmlInput::submit('generate',_("G=C3=A9n=C3=A9rer l'=C3=A9cri=
ture"));?>
 </form>
-<?php echo HtmlInput::button('check_all','S=C3=A9lectionner tout',' oncl=
ick=3D"select_checkbox(\'gen_amort\')"');?>
-<?php echo HtmlInput::button('check_none','Tout D=C3=A9s=C3=A9lectionner=
 ',' onclick=3D"unselect_checkbox(\'gen_amort\')"');?>
+<?php echo HtmlInput::button('check_all',_('S=C3=A9lectionner tout'),' o=
nclick=3D"select_checkbox(\'gen_amort\')"');?>
+<?php echo HtmlInput::button('check_none',_('Tout D=C3=A9s=C3=A9lectionn=
er'),' onclick=3D"unselect_checkbox(\'gen_amort\')"');?>

Modified: branches/rel672n/amortis/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/index.php	2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/index.php	2014-02-13 19:00:40 UTC (rev 710)
@@ -49,9 +49,9 @@
   }
=20
 $menu=3Darray(
-        array($url.'&sa=3Dcard','Biens amortissables','Liste des biens a=
mortissables',1),
-        array($url.'&sa=3Dreport','Rapport','rapport et  tableaux sur le=
s biens amortissables',2),
-        array($url.'&sa=3Dutil','Utilitaire','G=C3=A9n=C3=A9ration =C3=A9=
criture comptable',3)
+	    array($url.'&sa=3Dcard',_('Biens amortissables'),_('Liste des biens=
 amortissables'),1),
+	    array($url.'&sa=3Dreport',_('Rapport'),_('rapport et  tableaux sur =
les biens amortissables'),2),
+	    array($url.'&sa=3Dutil',_('Utilitaire'),_('G=C3=A9n=C3=A9ration =C3=
=A9criture comptable'),3)
       );
=20
=20

Modified: branches/rel672n/amortis/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/raw.php	2014-02-12 17:42:02 UTC (rev 709)
+++ branches/rel672n/amortis/raw.php	2014-02-13 19:00:40 UTC (rev 710)
@@ -48,7 +48,15 @@
   header('Pragma: public');
   header('Content-type: application/csv');
   header('Content-Disposition: attachment;filename=3D"'.$name.'.csv"',FA=
LSE);
-  print "\"Code\";\"Description\";\"Date acquisition\";\"Ann=C3=A9e Acha=
t\";\"Montant Achat\";\"Nombre annuit=C3=A9s\";\"Montant =C3=A0 amortir\"=
;\"Amortissement\";\"Reste\"\r\n";
+  $header=3Darray(_('Code'),_('Description'),_('Date acquisition'),_('An=
n=C3=A9e achat'),_('Montant Achats'),_('Nombre annuit=C3=A9s'),_('Montant=
 =C3=A0 amortir'),_('Amortissement'));
+  $sep=3D"";
+  foreach ($header as $h)=20
+    {
+      print $sep.'"'.$h.'"';
+      $sep=3D';';
+    }
+  print "\r\n";
+  //  print "\"Code\";\"Description\";\"Date acquisition\";\"Ann=C3=A9e =
Achat\";\"Montant Achat\";\"Nombre annuit=C3=A9s\";\"Montant =C3=A0 amort=
ir\";\"Amortissement\";\"Reste\"\r\n";
   $year=3D$_REQUEST['list_year'];
   $sql=3D"select * from amortissement.amortissement where a_id
          in (select a_id from amortissement.amortissement_detail where a=
d_year=3D$1)";
@@ -89,7 +97,16 @@
     header('Content-Disposition: attachment;filename=3D"'.$name.'.csv"',=
FALSE);
    =20
     $ret=3D$cn->get_array("select * from amortissement.amortissement ord=
er by a_start,a_date");
-    printf ("\"Visible\";\"qcode\";\"Nom\";\"Date acquisition\";\"Ann=C3=
=A9e Achat\";\"Nbre annuit=C3=A9\";\"Poste Charge\";\"Poste amortis\";\"M=
ontant achat\";\"Montant amorti\";\"Montant a amortir\"\r\n");
+    $header=3Darray(_("Visible"),_("qcode"),_("Nom"),_("Date acquisition=
"),_('Ann=C3=A9e Achat'),_("Nbre annuit=C3=A9"),_("Poste Charge"),_("Post=
e amortis"),_("Montant achat"),_("Montant amorti"),_("Montant a amortir")=
);
+    $sep=3D"";
+    foreach ($header as $h)=20
+      {
+	print $sep.'"'.$h.'"';
+	$sep=3D';';
+      }
+  print "\r\n";
+    //    printf ("\"Visible\";\"qcode\";\"Nom\";\"Date acquisition\";\"=
Ann=C3=A9e Achat\";\"Nbre annuit=C3=A9\";\"Poste Charge\";\"Poste amortis=
\";\"Montant achat\";\"Montant amorti\";\"Montant a amortir\"\r\n");
+
     for ($i=3D0;$i<count($ret);$i++)
       {
 	printf('"%s";',$ret[$i]['a_visible']);



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


From MAILER-DAEMON Thu Feb 13 14:50:41 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WE2Iz-00060W-Df
	for mharc-phpcompta-dev@gnu.org; Thu, 13 Feb 2014 14:50:41 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 13 Feb 2014 20:37:36 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.197298.1392321040.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r711 -
	branches/rel672n/backup_noadmin/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Feb 2014 19:50:40 -0000

Author: danydb
Date: 2014-02-13 20:37:36 +0100 (Thu, 13 Feb 2014)
New Revision: 711

Modified:
   branches/rel672n/backup_noadmin/include/template/home.php
Log:
Translation backup

Modified: branches/rel672n/backup_noadmin/include/template/home.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/backup_noadmin/include/template/home.php	2014-02-13 =
19:00:40 UTC (rev 710)
+++ branches/rel672n/backup_noadmin/include/template/home.php	2014-02-13 =
19:37:36 UTC (rev 711)
@@ -1,6 +1,6 @@
-<h2> Backup du dossier courant </h2>
+<h2><?php echo _("Backup du dossier courant")?> </h2>
 <form method=3D"get" ACTION=3D"extension.raw.php">
-Voulez-vous avoir une copie de ce dossier
+   <?php echo _("Voulez-vous avoir une copie de ce dossier")?>
 <?php echo HtmlInput::submit('backup','backup')?>
 <?php echo dossier::hidden()?>
 <?php echo HtmlInput::extension();?>



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


From MAILER-DAEMON Thu Feb 13 15:09:21 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WE2b3-0002ub-G5
	for mharc-phpcompta-dev@gnu.org; Thu, 13 Feb 2014 15:09:21 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Thu, 13 Feb 2014 20:56:17 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.197307.1392322160.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r712 - in branches/rel672n:
	amortis/include/template import_account/include
	import_account/include/template
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Feb 2014 20:09:20 -0000

Author: danydb
Date: 2014-02-13 20:56:17 +0100 (Thu, 13 Feb 2014)
New Revision: 712

Modified:
   branches/rel672n/amortis/include/template/listing_histo.php
   branches/rel672n/amortis/include/template/listing_year.php
   branches/rel672n/amortis/include/template/material_add.php
   branches/rel672n/amortis/include/template/material_detail.php
   branches/rel672n/amortis/include/template/material_display.php
   branches/rel672n/amortis/include/template/material_listing.php
   branches/rel672n/amortis/include/template/util_generate.php
   branches/rel672n/import_account/include/class_impacc_operation.php
   branches/rel672n/import_account/include/class_import_card.php
   branches/rel672n/import_account/include/class_sql_impacc.php
   branches/rel672n/import_account/include/imd_operation.inc.php
   branches/rel672n/import_account/include/imd_parameter.inc.php
   branches/rel672n/import_account/include/template/input_file.php
   branches/rel672n/import_account/include/template/parameter.php
   branches/rel672n/import_account/include/template/parameter_tva_add.php
   branches/rel672n/import_account/include/template/test_file.php
   branches/rel672n/import_account/include/template/test_operation.php
   branches/rel672n/import_account/include/template/upload_operation.php
Log:
Translation correction

Modified: branches/rel672n/amortis/include/template/listing_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/listing_histo.php	2014-02-1=
3 19:37:36 UTC (rev 711)
+++ branches/rel672n/amortis/include/template/listing_histo.php	2014-02-1=
3 19:56:17 UTC (rev 712)
@@ -1,5 +1,5 @@
 <div class=3D"content" style=3D"width:80%;margin-left:10%">
-   <!-- <h2 class=3D"info"><?php echo_("Historique")?></h2> -->
+   <!-- <h2 class=3D"info"><?php echo _("Historique")?></h2> -->
 <form method=3D"POST">
 <?php
 echo HtmlInput::hidden('sa',$_REQUEST['sa']);

Modified: branches/rel672n/amortis/include/template/listing_year.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/listing_year.php	2014-02-13=
 19:37:36 UTC (rev 711)
+++ branches/rel672n/amortis/include/template/listing_year.php	2014-02-13=
 19:56:17 UTC (rev 712)
@@ -5,16 +5,16 @@
 </style>
 <table class=3D"result">
 <tr>
-  <th><?php echo_("Code")?></th>
-  <th><?php echo_("Description")?></th>
-  <th><?php echo_("Date d'acquisition")?></th>
-  <th><?php echo_("Ann=C3=A9e d'achat")?></th>
-  <th style=3D"text-align:right"><?php echo_("Montant =C3=A0 l'achat")?>=
</th>
-  <th style=3D"text-align:right"><?php echo_("Nombre amortissement")?></=
th>
-  <th style=3D"text-align:right"><?php echo_("Montant =C3=A0 amortir")?>=
</th>
-  <th style=3D"text-align:right"><?php echo_("Amortissement")?></th>
-  <th style=3D"text-align:right"><?php echo_("Pourcentage")?></th>
-  <th style=3D"text-align:right"><?php echo_("Reste =C3=A0 amortir")?></=
th>
+  <th><?php echo _("Code")?></th>
+  <th><?php echo _("Description")?></th>
+  <th><?php echo _("Date d'acquisition")?></th>
+  <th><?php echo _("Ann=C3=A9e d'achat")?></th>
+  <th style=3D"text-align:right"><?php echo _("Montant =C3=A0 l'achat")?=
></th>
+  <th style=3D"text-align:right"><?php echo _("Nombre amortissement")?><=
/th>
+  <th style=3D"text-align:right"><?php echo _("Montant =C3=A0 amortir")?=
></th>
+  <th style=3D"text-align:right"><?php echo _("Amortissement")?></th>
+  <th style=3D"text-align:right"><?php echo _("Pourcentage")?></th>
+  <th style=3D"text-align:right"><?php echo _("Reste =C3=A0 amortir")?><=
/th>
 </tr>
 <?php=20
 $tot_amort=3D0;$tot_net=3D0;bcscale(2);

Modified: branches/rel672n/amortis/include/template/material_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_add.php	2014-02-13=
 19:37:36 UTC (rev 711)
+++ branches/rel672n/amortis/include/template/material_add.php	2014-02-13=
 19:56:17 UTC (rev 712)
@@ -1,37 +1,37 @@
 <h2 class=3D"info">Ajout de mat=C3=A9riel</h2>
 <form method=3D"POST" onsubmit=3D"save_new_material(this);return false;"=
>
-   <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p=
_card_label"  ><?php echo_("Nouveau mat=C3=A9riel")?></span>
+   <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p=
_card_label"  ><?php echo _("Nouveau mat=C3=A9riel")?></span>
 <table>
 <tr>
-   <td><?php echo_("Fiche")?></td>
+   <td><?php echo _("Fiche")?></td>
 	<td><?php echo $p_card->input()?><?php echo $p_card->search()?></td>
 </tr>
 <tr>
-   <td><?php echo_("Date d'acquisition")?></td>
+   <td><?php echo _("Date d'acquisition")?></td>
 	<td><?php echo $p_date->input()?></td>
 </tr>
=20
 <tr>
-   <td><?php echo_("Montant =C3=A0 amortir")?></td>
+   <td><?php echo _("Montant =C3=A0 amortir")?></td>
 	<td><?php echo $p_amount->input()?></td>
 </tr>
=20
 <tr>
-   <td><?php echo_("Ann=C3=A9e comptable d'achat")?></td>
+   <td><?php echo _("Ann=C3=A9e comptable d'achat")?></td>
 	<td> <?php echo $p_year->input();?></td>
 </tr>
 <tr>
-	<td><?php echo_("Poste de charge dotations amortissement (d=C3=A9bit)")=
?></td>
+	<td><?php echo _("Poste de charge dotations amortissement (d=C3=A9bit)"=
)?></td>
 	<td><?php echo $p_deb->input()?></td>
 	<td><?php echo $deb_span->input()?></td>
 </tr>
 <tr>
-	<td><?php echo_("Poste amortissement en contrepartie")?></td>
+	<td><?php echo _("Poste amortissement en contrepartie")?></td>
 	<td><?php echo $p_cred->input();?></td>
 	<td><?php echo $cred_span->input();?></td>
 </tr>
 <tr>
-	<td><?php echo_("Nombre d'ann=C3=A9es amortissement")?></td>
+	<td><?php echo _("Nombre d'ann=C3=A9es amortissement")?></td>
 	<td><?php echo $p_number->input()?></td>
 </tr>
 <tr>

Modified: branches/rel672n/amortis/include/template/material_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_detail.php	2014-02=
-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/amortis/include/template/material_detail.php	2014-02=
-13 19:56:17 UTC (rev 712)
@@ -1,43 +1,43 @@
-<h2 class=3D"info"><?php echo_("Modification de mat=C3=A9riel")?></h2>
+<h2 class=3D"info"><?php echo _("Modification de mat=C3=A9riel")?></h2>
 <form onsubmit=3D"save_modify(this);return false">
 <?php echo $p_card?>
 <?php echo $a_id?>
 <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?php echo  $card->strAttribut(ATTR_DEF_NAME)?></span>
 <table>
 <tr>
-   <td><?php echo_("Fiche")?></td>
+   <td><?php echo _("Fiche")?></td>
 	<td><?php echo HtmlInput::card_detail($card->strAttribut(ATTR_DEF_QUICK=
CODE))?></td>
 </tr>
=20
 <tr>
-   <td><?php echo_("Date Acquisition")?></td>
+   <td><?php echo _("Date Acquisition")?></td>
 	<td><?php echo $p_date->input()?></td>
 </tr>
 <tr>
-   <td><?php echo_("Montant =C3=A0 amortir")?></td>
+   <td><?php echo _("Montant =C3=A0 amortir")?></td>
 	<td><?php echo $p_amount->input()?></td>
 </tr>
=20
 <tr>
-   <td><?php echo_("Ann=C3=A9e comptable d'achat")?></td>
+   <td><?php echo _("Ann=C3=A9e comptable d'achat")?></td>
 	<td> <?php echo $p_year->input();?></td>
 </tr>
 <tr>
-	<td><?php echo_("Poste de charge dotations amortissement (d=C3=A9bit)")=
?></td>
+	<td><?php echo _("Poste de charge dotations amortissement (d=C3=A9bit)"=
)?></td>
 	<td><?php echo $p_deb->input()?></td>
 	<td><?php echo $deb_span->input()?></td>
 </tr>
 <tr>
-	<td><?php echo_("Poste amortissement en contrepartie")?></td>
+	<td><?php echo _("Poste amortissement en contrepartie")?></td>
 	<td><?php echo $p_cred->input();?></td>
 	<td><?php echo $cred_span->input();?></td>
 </tr>
 <tr>
-	<td><?php echo_("Nombre d'ann=C3=A9es amortissement (non modifiable)")?=
></td>
+	<td><?php echo _("Nombre d'ann=C3=A9es amortissement (non modifiable)")=
?></td>
 	<td><?php echo $p_number->input()?></td>
 </tr>
 <tr>
-	<td><?php echo_("Visible")?> <span class=3D"notice"><?php echo_("Y pour=
 oui ou N pour non")?></span></td>
+	<td><?php echo _("Visible")?> <span class=3D"notice"><?php echo _("Y po=
ur oui ou N pour non")?></span></td>
 	<td><?php echo $p_visible->input();?></td>
 </tr>
 <tr>
@@ -49,17 +49,17 @@
 	<td></td>
 </tr>
 </table>
-	<span class=3D"notice"> <?php echo_("En changeant le montant =C3=A0 amo=
rtir, l'ann=C3=A9e ou le nombre d'ann=C3=A9es, les annuit=C3=A9s seront r=
ecalcul=C3=A9es et l'historique effac=C3=A9")?></span>
-   <fieldset><legend><?php echo_("Annuit=C3=A9s")?></legend>
+	<span class=3D"notice"> <?php echo _("En changeant le montant =C3=A0 am=
ortir, l'ann=C3=A9e ou le nombre d'ann=C3=A9es, les annuit=C3=A9s seront =
recalcul=C3=A9es et l'historique effac=C3=A9")?></span>
+   <fieldset><legend><?php echo _("Annuit=C3=A9s")?></legend>
 <table class=3D"result">
-   <th><?php echo_("Ann=C3=A9e")?></th>
-   <th><?php echo_("Montant")?></th>
-   <th><?php echo_("Amortissement act=C3=A9")?></th>
-   <th><?php echo_("Pi=C3=A8ce")?> </th>
-   <th><?php echo_("n=C2=B0 interne")?></th>
+   <th><?php echo _("Ann=C3=A9e")?></th>
+   <th><?php echo _("Montant")?></th>
+   <th><?php echo _("Amortissement act=C3=A9")?></th>
+   <th><?php echo _("Pi=C3=A8ce")?> </th>
+   <th><?php echo _("n=C2=B0 interne")?></th>
=20
=20
-   <th><?php echo_("Pourcent")?></th>
+   <th><?php echo _("Pourcent")?></th>
=20
 <?php=20
 bcscale(2);
@@ -118,9 +118,9 @@
 endfor;
 ?>
 </table>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%"><?php echo_("Total")?> =3D <?php echo nbm($a=
nnuite)?></span>
-	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Amorti")?> =3D <?php echo nb=
m($done)?></span>
-	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Reste")?> =3D <?php echo nbm=
($p_amount->value-$done)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%"><?php echo _("Total")?> =3D <?php echo nbm($=
annuite)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo _("Amorti")?> =3D <?php echo n=
bm($done)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo _("Reste")?> =3D <?php echo nb=
m($p_amount->value-$done)?></span>
=20
 <?php=20
 if ( $annuite !=3D  $p_amount->value)

Modified: branches/rel672n/amortis/include/template/material_display.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_display.php	2014-0=
2-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/amortis/include/template/material_display.php	2014-0=
2-13 19:56:17 UTC (rev 712)
@@ -1,51 +1,51 @@
-<h2 class=3D"info"><?php echo_("D=C3=A9tail de mat=C3=A9riel")?></h2>
+<h2 class=3D"info"><?php echo _("D=C3=A9tail de mat=C3=A9riel")?></h2>
 <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  ><?php echo  $card->strAttribut(ATTR_DEF_NAME)?></span>
 <table>
 <tr>
-   <td><?php echo_("Fiche")?></td>
+   <td><?php echo _("Fiche")?></td>
 	<td><?php echo $card->strAttribut(ATTR_DEF_QUICKCODE)?></td>
 </tr>
=20
 <tr>
-   <td><?php echo_("Date d'acquisition")?></td>
+   <td><?php echo _("Date d'acquisition")?></td>
 	<td><?php echo $p_date?></td>
 </tr>
=20
 <tr>
-   <td><?php echo_("Montant =C3=A0 amortir")?></td>
+   <td><?php echo _("Montant =C3=A0 amortir")?></td>
 	<td><?php echo $p_amount?></td>
 </tr>
=20
 <tr>
-   <td><?php echo_("Ann=C3=A9e comptable d'achat")?></td>
+   <td><?php echo _("Ann=C3=A9e comptable d'achat")?></td>
 	<td> <?php echo $p_year;?></td>
 </tr>
 <tr>
-	<td><?php echo_("Poste de charge dotations amortissement (d=C3=A9bit)")=
?></td>
+	<td><?php echo _("Poste de charge dotations amortissement (d=C3=A9bit)"=
)?></td>
 	<td><?php echo $p_deb?></td>
 	<td><?php echo $deb_span?></td>
 </tr>
 <tr>
-	<td><?php echo_("Poste amortissement en contrepartie")?></td>
+	<td><?php echo _("Poste amortissement en contrepartie")?></td>
 	<td><?php echo $p_cred?></td>
 	<td><?php echo $cred_span?></td>
 </tr>
 <tr>
-	<td><?php echo_("Nombre d'ann=C3=A9es amortissement (non modifiable)")?=
></td>
+	<td><?php echo _("Nombre d'ann=C3=A9es amortissement (non modifiable)")=
?></td>
 	<td><?php echo $p_number?></td>
 </tr>
 </table>
=20
-<fieldset><legend><?php echo_("Annuit=C3=A9s")?></legend>
+<fieldset><legend><?php echo _("Annuit=C3=A9s")?></legend>
 <table class=3D"result">
-   <th><?php echo_("Ann=C3=A9e")?></th>
-   <th><?php echo_("Montant")?></th>
-   <th style=3D"text-align:right" ><?php echo_("Amortissement act=C3=A9"=
)?></th>
-   <th style=3D"text-align:center"><?php echo_("Pi=C3=A8ce")?> </th>
-   <th><?php echo_("n=C2=B0 interne")?></th>
+   <th><?php echo _("Ann=C3=A9e")?></th>
+   <th><?php echo _("Montant")?></th>
+   <th style=3D"text-align:right" ><?php echo _("Amortissement act=C3=A9=
")?></th>
+   <th style=3D"text-align:center"><?php echo _("Pi=C3=A8ce")?> </th>
+   <th><?php echo _("n=C2=B0 interne")?></th>
=20
=20
-   <th><?php echo_("Pourcent")?></th>
+   <th><?php echo _("Pourcent")?></th>
=20
 <?php=20
 bcscale(2);
@@ -92,9 +92,9 @@
 endfor;
 ?>
 </table>
-<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%"><?php echo_("Total")?> =3D <?php echo nbm($a=
nnuite)?></span>
-	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Amorti")?> =3D <?php echo nb=
m($done)?></span>
-	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo_("Reste")?> =3D <?php echo nbm=
($p_amount-$done)?></span>
+<span style=3D"font-size:120%;font-weight:bold;font-family:arial;font-st=
yle:italic;margin-right:10%"><?php echo _("Total")?> =3D <?php echo nbm($=
annuite)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo _("Amorti")?> =3D <?php echo n=
bm($done)?></span>
+	  <span style=3D"font-size:120%;font-weight:bold;font-family:arial;font=
-style:italic;margin-right:10%"><?php echo _("Reste")?> =3D <?php echo nb=
m($p_amount-$done)?></span>
=20
 <?php=20
 if ( $annuite !=3D  $p_amount)

Modified: branches/rel672n/amortis/include/template/material_listing.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/material_listing.php	2014-0=
2-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/amortis/include/template/material_listing.php	2014-0=
2-13 19:56:17 UTC (rev 712)
@@ -3,16 +3,16 @@
=20
 <table id=3D"list_amortissement" class=3D"sortable" style=3D"width:80%;m=
argin-left:10%">
 <tr>
-   <th><?php echo_("Quickcode")?></th>
+   <th><?php echo _("Quickcode")?></th>
 <th class=3D" sorttable_sorted">
 	Nom
 <span id=3D"sorttable_sortfwdind">&nbsp;&nbsp;&#x25BE;</span>
 </th>
-<th><?php echo_("Date acquisition")?></th>
-<th><?php echo_("Ann=C3=A9e achat")?></th>
-<th style=3D"text-align:right"><?php echo_("Montant Initial")?></th>
-<th style=3D"text-align:right"><?php echo_("Montant Amorti")?></th>
-<th style=3D"text-align:right"><?php echo_("Montant =C3=A0 amortir")?></=
th>
+<th><?php echo _("Date acquisition")?></th>
+<th><?php echo _("Ann=C3=A9e achat")?></th>
+<th style=3D"text-align:right"><?php echo _("Montant Initial")?></th>
+<th style=3D"text-align:right"><?php echo _("Montant Amorti")?></th>
+<th style=3D"text-align:right"><?php echo _("Montant =C3=A0 amortir")?><=
/th>
=20
 </tr>
=20

Modified: branches/rel672n/amortis/include/template/util_generate.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/amortis/include/template/util_generate.php	2014-02-1=
3 19:37:36 UTC (rev 711)
+++ branches/rel672n/amortis/include/template/util_generate.php	2014-02-1=
3 19:56:17 UTC (rev 712)
@@ -32,7 +32,7 @@
=20
 <table>
 <tr>
-   <td><?php echo_("Ann=C3=A9e")?></td>
+   <td><?php echo _("Ann=C3=A9e")?></td>
 <td><?php echo $year->input();?></td>
 </tr>
 <tr>
@@ -54,18 +54,18 @@
 </tr>
 <?php endif; ?>
 <tr>
-<td><?php echo_("Pi=C3=A8ce")?></td>
+<td><?php echo _("Pi=C3=A8ce")?></td>
 <td><?php echo $pj->input()?></td>
 </tr>
 </table>
=20
- <?php echo_("Cochez ce qu'il faut amortir")?>
+ <?php echo _("Cochez ce qu'il faut amortir")?>
 <table class=3D"result">
 <tr>
-   <th><?php echo_("Selection")?></th>
-   <th><?php echo_("Quick Code")?></th>
-   <th><?php echo_("Nom")?></th>
-   <th><?php echo_("Description")?></th>
+   <th><?php echo _("Selection")?></th>
+   <th><?php echo _("Quick Code")?></th>
+   <th><?php echo _("Nom")?></th>
+   <th><?php echo _("Description")?></th>
 </tr>
 <?php=20
 /*

Modified: branches/rel672n/import_account/include/class_impacc_operation.=
php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/class_impacc_operation.php	20=
14-02-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/class_impacc_operation.php	20=
14-02-13 19:56:17 UTC (rev 712)
@@ -35,7 +35,7 @@
 	{
 		if (trim($_FILES['csv_operation']['name']) =3D=3D '')
 		{
-			alert('Pas de fichier donn=C3=A9');
+		  alert(_('Pas de fichier donn=C3=A9'));
 			return -1;
 		}
 		$this->filename =3D tempnam($_ENV['TMP'], 'upload_');
@@ -58,7 +58,7 @@
 			if (count($row) !=3D 11)
 			{
 				$str_row =3D implode($row, ";");
-				echo "Attention " . h($str_row) . " ne contient pas 11 colonnes";
+				printf (_("Attention %s ne contient pas 11 colonnes"),h($str_row));
 				continue;
 			}
 			$r =3D new impacc_Operation_tmp_Sql();
@@ -77,7 +77,7 @@
 			$r->insert();
 			$this->row_count++;
 		}
-		echo "Nombre de lignes enregistr=C3=A9es : " . $this->row_count;
+		echo _("Nombre de lignes enregistr=C3=A9es")." : " . $this->row_count;
 		$import =3D new impacc_import_sql($this->impid);
 		$import->setp("nbrow", $this->row_count);
 		$import->update();
@@ -110,19 +110,19 @@
 				if ($db > 0)
 				{
 					$operation->setp("code", "N");
-					$operation->setp("message", " Op=C3=A9ration d=C3=A9j=C3=A0 transf=C3=
=A9r=C3=A9e : doublon ");
+					$operation->setp("message", _("Op=C3=A9ration d=C3=A9j=C3=A0 transf=
=C3=A9r=C3=A9e : doublon "));
 					$operation->update();
 					continue;
 				}
 				if (trim($dol) =3D=3D "" || isNumber($dol) =3D=3D 0)
 				{
 					$operation->setp("code", 'N');
-					$msg.=3D" le num=C3=A9ro de ligne pour dolibarr est invalide";
+					$msg.=3D" "._("le num=C3=A9ro de ligne pour dolibarr est invalide")=
;
 				}
 				if (isDate($operation->getp("date")) =3D=3D null)
 				{
 					$operation->setp("code", 'N');
-					$msg.=3D" La date est invalide, format n'est pas JJ.MM.AAAA";
+					$msg.=3D" "._("La date est invalide, format n'est pas JJ.MM.AAAA");
 				}
 				$fiche =3D new Fiche($cn);
 				$fiche->get_by_qcode(trim($operation->getp("qcode")));
@@ -130,7 +130,7 @@
 				if ($fiche->id =3D=3D 0)
 				{
 					$operation->setp("code", 'N');
-					$msg.=3D" Cette fiche n'existe pas";
+					$msg.=3D" "._("Cette fiche n'existe pas");
 				}
 				else
 				{
@@ -143,10 +143,10 @@
 				if (trim($poste) =3D=3D '' || $cn->get_value("select count(*) from t=
mp_pcmn where pcm_val=3D$1", array($poste)) =3D=3D 0)
 				{
 					$operation->setp("code", 'N');
-					$msg.=3D" Cette fiche n'a pas de poste comptable valide";
+					$msg.=3D" "._("Cette fiche n'a pas de poste comptable valide");
 				}
 				$operation->setp("poste", $poste);
-				$a =3D array("rate" =3D> " Taux de TVA", "amount_total" =3D> "Montan=
t total", "number_unit" =3D> 'Nombre d\'unit=C3=A9', "amount_vat" =3D> "M=
ontant TVA");
+				$a =3D array("rate" =3D> _("Taux de TVA"), "amount_total" =3D> _("Mo=
ntant total"), "number_unit" =3D> _("Nombre d'unit=C3=A9"), "amount_vat" =
=3D> _("Montant TVA"));
=20
 				foreach ($a as $key =3D> $value)
 				{
@@ -156,7 +156,7 @@
 					if (trim($v) !=3D "" && isNumber($v) =3D=3D 0)
 					{
 						$operation->setp("code", 'N');
-						$msg.=3D" $value n'est pas un nombre";
+						$msg.=3D_(" $value n'est pas un nombre");
 						continue;
 					}
=20
@@ -169,12 +169,12 @@
 					if (count($tva_id) > 1)
 					{
 						$operation->setp("code", 'N');
-						$msg.=3D" Plusieurs code TVA correspondent =C3=A0 ce taux";
+						$msg.=3D" "._("Plusieurs code TVA correspondent =C3=A0 ce taux");
 					}
 					elseif (empty($tva_id))
 					{
 						$operation->setp("code", 'N');
-						$msg.=3D" Aucun code TVA ne correspond =C3=A0 ce taux";
+						$msg.=3D" "._("Aucun code TVA ne correspond =C3=A0 ce taux");
 					}
 					else
 					{
@@ -188,12 +188,12 @@
 				if ($nb_customer =3D=3D 0)
 				{
 					$operation->setp("code", 'N');
-					$msg.=3D" Aucun client ou fournisseur";
+					$msg.=3D_("Aucun client ou fournisseur");
 				}
 				if ($nb_good =3D=3D 0)
 				{
 					$operation->setp("code", 'N');
-					$msg.=3D" Aucune marchandise ou service";
+					$msg.=3D" "._("Aucune marchandise ou service");
 				}
=20
 				// check if in a opened period
@@ -243,20 +243,20 @@
 			o_message
 			from impacc.operation_tmp where i_id=3D" . $this->impid . " order by =
o_id";
 		echo Html_Table::sql2table($cn, array(
-			array('name' =3D> 'n=C2=B0 ligne',
-				'style' =3D> 'style=3D"text-align:right"'),
-			array('name' =3D> 'Date',
-				'style' =3D> 'text-align:right'),
-			array('name' =3D> 'QuickCode'),
-			array('name' =3D> 'Libell=C3=A9'),
-			array('name' =3D> 'n=C2=B0 pj'),
-			array('name' =3D> 'Montant / unit=C3=A9', 'style' =3D> 'style=3D"text=
-align:right"'),
-			array('name' =3D> 'Montant Total TVA', 'style' =3D> 'style=3D"text-al=
ign:right"'),
-			array('name' =3D> 'Nbre unit=C3=A9s', 'style' =3D> 'style=3D"text-ali=
gn:right"'),
-			array('name' =3D> 'taux TVA', 'style' =3D> 'style=3D"text-align:right=
"'),
-			array('name' =3D> 'Montant total TVAC', 'style' =3D> 'style=3D"text-a=
lign:right"'),
-			array('name' =3D> 'Transfert', 'style' =3D> 'style=3D"text-align:righ=
t"', 'raw' =3D> 1),
-			array('name' =3D> 'Message')
+						      array('name' =3D> _('n=C2=B0 ligne'),
+							    'style' =3D> 'style=3D"text-align:right"'),
+						      array('name' =3D> _('Date'),
+							    'style' =3D> 'text-align:right'),
+						      array('name' =3D> _('QuickCode')),
+						      array('name' =3D>_('Libell=C3=A9')),
+						      array('name' =3D> _('n=C2=B0 Pi=C3=A8ce')),
+						      array('name' =3D> _('Montant / unit=C3=A9'), 'style' =3D> 's=
tyle=3D"text-align:right"'),
+						      array('name' =3D> _('Montant Total TVA'), 'style' =3D> 'styl=
e=3D"text-align:right"'),
+						      array('name' =3D> _('Nbre unit=C3=A9s'), 'style' =3D> 'style=
=3D"text-align:right"'),
+						      array('name' =3D> _('taux TVA'), 'style' =3D> 'style=3D"text=
-align:right"'),
+						      array('name' =3D> _('Montant total TVAC'), 'style' =3D> 'sty=
le=3D"text-align:right"'),
+						      array('name' =3D> _('Transfert'), 'style' =3D> 'style=3D"tex=
t-align:right"', 'raw' =3D> 1),
+						      array('name' =3D> _('Message'))
 				)
 				, $sql, 'style=3D"width:100%" class=3D"result"'
 		);
@@ -281,7 +281,7 @@
 				$oth_side =3D 'c';
 				break;
 			default:
-				die('Erreur ce type journal n\' est pas encore support=C3=A9');
+			  die(_("Erreur ce type journal n' est pas encore support=C3=A9"));
 		}
 		/**
 		 * Loop in table operation_tmp, get all the record to transfer
@@ -480,13 +480,13 @@
 		from impacc.operation_tmp as otmp join impacc.operation_transfer as ot=
 on (ot.o_id =3D otmp.o_id) join jrnx on (jrnx.j_id =3D ot.j_id)
 		and i_id=3D$1  ) order by jr_date ";
 		$arow=3D$cn->get_array($sql,array($this->impid));
-		echo h2("Op=C3=A9rations sauv=C3=A9es",'info');
+		echo h2(_("Op=C3=A9rations sauv=C3=A9es"),'info');
 		echo '<table class=3D"result">';
 		echo '<tr>';
-		echo th("Date");
-		echo th("Libell=C3=A9");
-		echo th("Pi=C3=A8ce");
-		echo th("N=C2=B0 op=C3=A9ration");
+		echo th(_("Date"));
+		echo th(_("Libell=C3=A9"));
+		echo th(_("Pi=C3=A8ce"));
+		echo th(_("N=C2=B0 op=C3=A9ration"));
 		echo '</tr>';
 		for ($i=3D0;$i<count($arow);$i++)
 		{

Modified: branches/rel672n/import_account/include/class_import_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/class_import_card.php	2014-02=
-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/class_import_card.php	2014-02=
-13 19:56:17 UTC (rev 712)
@@ -142,22 +142,22 @@
=20
 		if ($valid_col =3D=3D 0)
 		{
-			alert("Aucune colonne n'est d=C3=A9finie");
+		  alert(_("Aucune colonne n'est d=C3=A9finie"));
 			return -1;
 		}
 		if ($valid_name =3D=3D 0)
 		{
-			alert("Les fiches doivent avoir au minimum un nom");
+		  alert(_("Les fiches doivent avoir au minimum un nom"));
 			return -1;
 		}
 		if ($duplicate !=3D 0)
 		{
-			alert('Vous avez d=C3=A9fini plusieurs fois la m=C3=AAme colonne');
+		  alert(_('Vous avez d=C3=A9fini plusieurs fois la m=C3=AAme colonne')=
);
 			return -1;
 		}
 		if ($valid_qcode =3D=3D 0)
 		{
-			alert("Vous devez donner la colonne quick_code");
+		  alert(_("Vous devez donner la colonne quick_code"));
 			return 1;
 		}
 		/*
@@ -239,7 +239,7 @@
 		$name =3D $cn->get_value('select fd_label from fiche_def where fd_id=3D=
$1', array($rfichedef));
 		$cn->get_value('select comptaproc.fiche_attribut_synchro($1)', array($=
rfichedef));
 		echo '<span class=3D"notice">';
-		echo $row_count . ' fiches sont ins=C3=A9r=C3=A9es dans la cat=C3=A9go=
rie ' . $name;
+		echo $row_count . " "._('fiches sont ins=C3=A9r=C3=A9es dans la cat=C3=
=A9gorie').' ' . $name;
 		echo '</span>';
 		return 0;
 	}

Modified: branches/rel672n/import_account/include/class_sql_impacc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/class_sql_impacc.php	2014-02-=
13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/class_sql_impacc.php	2014-02-=
13 19:56:17 UTC (rev 712)
@@ -33,7 +33,7 @@
 			return $this->$idx;
 		}
 		else
-			throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur a=
ttribut inexistant '.$p_string);
+		  throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . _('Erreu=
r attribut inexistant')." ".$p_string);
 	}
=20
 	public function setp($p_string, $p_value)
@@ -44,7 +44,7 @@
 			$this->$idx =3D $p_value;
 		}
 		else
-			throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . 'Erreur a=
ttribut inexistant '.$p_string);
+		  throw new Exception(__FILE__ . ":" . __LINE__ . $p_string . _('Erreu=
r attribut inexistant')." ".$p_string);
 	}
=20
 	public function insert()

Modified: branches/rel672n/import_account/include/imd_operation.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/imd_operation.inc.php	2014-02=
-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/imd_operation.inc.php	2014-02=
-13 19:56:17 UTC (rev 712)
@@ -52,7 +52,7 @@
 	$io->result();
 	echo '<div style=3D"margin-left:20%">';
 	echo '<form method=3D"POST">';
-	echo "<p class=3D\"notice\">Les op=C3=A9rations qui ne sont pas marqu=C3=
=A9es comme correctes ne seront pas transf=C3=A8r=C3=A9es </p>";
+	echo "<p class=3D\"notice\">"._("Les op=C3=A9rations qui ne sont pas ma=
rqu=C3=A9es comme correctes ne seront pas transf=C3=A8r=C3=A9es")." </p>"=
;
 	echo HtmlInput::hidden("impid",$io->impid);
 	$l=3Dnew ISelect("p_jrn");
 	$l->value=3D$cn->make_array("select jrn_def_id, jrn_def_name ||'  ['||j=
rn_def_type||']' from jrn_def
@@ -61,7 +61,7 @@
 		order by jrn_def_name");
 	echo "Vers le journal ".$l->input();
 	echo '<p>';
-	echo HtmlInput::submit("transfer","Transfert des op=C3=A9rations");
+	echo HtmlInput::submit("transfer",_("Transfert des op=C3=A9rations"));
 	echo '</p>';
 	echo "</FORM>";
 	echo '</div>';

Modified: branches/rel672n/import_account/include/imd_parameter.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/imd_parameter.inc.php	2014-02=
-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/imd_parameter.inc.php	2014-02=
-13 19:56:17 UTC (rev 712)
@@ -35,10 +35,10 @@
 		if (isNumber($pt_rate) =3D=3D 0)
 			throw new Exception("le taux n'est pas un nombre");
 		if ($pt_rate < 0 || $pt_rate > 100)
-			throw new Exception("le taux est invalide");
+		  throw new Exception(_("le taux est invalide"));
 		$tva =3D new Acc_Tva($cn, $tva_id);
 		if ($tva->load() =3D=3D -1)
-			throw new Exception('Cette tva est invalide');
+		  throw new Exception(_('Cette tva est invalide'));
 		$sql =3D "insert into impacc.parameter_tva(tva_id,pt_rate) values ($1,=
$2)";
 		$cn->exec_sql($sql, array($_POST['tva_id'], $_POST['pt_rate']));
 	}
@@ -60,12 +60,12 @@
 				$pt_rate =3D ${'rate' . $aparm[$i]['pt_id']};
 				$tva_id =3D ${'tva_' . $aparm[$i]['pt_id']};
 				if (isNumber($pt_rate) =3D=3D 0)
-					throw new Exception("le taux n'est pas un nombre");
+				  throw new Exception(_("le taux n'est pas un nombre"));
 				if ($pt_rate < 0 || $pt_rate > 100)
-					throw new Exception("le taux est invalide");
+				  throw new Exception(_("le taux est invalide"));
 				$tva =3D new Acc_Tva($cn, $tva_id);
 				if ($tva->load() =3D=3D -1)
-					throw new Exception('Cette tva est invalide');
+				  throw new Exception(_('Cette tva est invalide'));
 				$sql =3D "update impacc.parameter_tva set tva_id =3D $1, pt_rate =3D=
 $2 where pt_id=3D$3";
 				$cn->exec_sql($sql, array($tva_id, $pt_rate,$aparm[$i]['pt_id']));
 			}
@@ -83,7 +83,7 @@
 require 'template/parameter_tva_add.php';
 echo '<form method=3D"POST">';
 require 'template/parameter.php';
-echo HtmlInput::submit("mod", "Modification");
+echo HtmlInput::submit("mod",_( "Modification"));
=20
 echo '</form>';
 ?>

Modified: branches/rel672n/import_account/include/template/input_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/template/input_file.php	2014-=
02-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/template/input_file.php	2014-=
02-13 19:56:17 UTC (rev 712)
@@ -4,30 +4,30 @@
 ?>
 </h2>
=20
-<p>Pour importer des donn=C3=A9es, c'est-=C3=A0-dire transformer des fic=
hiers CSV (Valeur s=C3=A9par=C3=A9 par des virgules) en des fiches. Vous =
devez choisir, un fichier et donner une cat=C3=A9gorie de fiche existante=
. Ensuite, il suffit d'indiquer quelles colonnes correspondent =C3=A0 que=
lle attribut.=20
+<p><?php echo _("Pour importer des donn=C3=A9es, c'est-=C3=A0-dire trans=
former des fichiers CSV (Valeur s=C3=A9par=C3=A9 par des virgules) en des=
 fiches. Vous devez choisir, un fichier et donner une cat=C3=A9gorie de f=
iche existante. Ensuite, il suffit d'indiquer quelles colonnes correspond=
ent =C3=A0 quelle attribut.");?>
 </p>
 <p>
-   Par d=C3=A9faut, correspond =C3=A0 un export CSV depuis Calc (OpenOff=
ice.org ou libreoffice);
+ <?php echo _("Par d=C3=A9faut, correspond =C3=A0 un export CSV depuis C=
alc (OpenOffice.org ou libreoffice)")?>;
 </p>
 <form method=3D"POST" enctype=3D"multipart/form-data">
 <?php echo $hidden?>
 <table>
 <tr>
-<td>D=C3=A9limiteur </td><TD> <?php echo $delimiter->input()?></td>
+   <td><?php echo _("D=C3=A9limiteur");?> </td><TD> <?php echo $delimite=
r->input()?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><TD> <?php echo $file->input()?></td>
+   <td><?php echo _("Fichier =C3=A0 charger")?></td><TD> <?php echo $fil=
e->input()?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><TD> <?php echo $fd->input();?></td>
+   <td><?php echo _("Cat=C3=A9gorie de fiche")?></td><TD> <?php echo $fd=
->input();?></td>
 </tr>
 <tr>
-<td>Encodage unicode</td><TD> <?php echo $encodage->input()?></td>
+   <td><?php echo _("Encodage unicode")?></td><TD> <?php echo $encodage-=
>input()?></td>
 </tr>
 <tr>
-<td>  Texte entour=C3=A9 du signe </td><TD><input type=3D"text" name=3D"=
rsurround" value=3D'"' size=3D"1"></td>
+   <td><?php echo _("Texte entour=C3=A9 du signe")?> </td><TD><input typ=
e=3D"text" name=3D"rsurround" value=3D'"' size=3D"1"></td>
 </tr>
 </table>
-<?php echo HtmlInput::submit('test_import','Valider');?>
+   <?php echo HtmlInput::submit('test_import',_('Valider'));?>
=20
 </form>

Modified: branches/rel672n/import_account/include/template/parameter.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/template/parameter.php	2014-0=
2-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/template/parameter.php	2014-0=
2-13 19:56:17 UTC (rev 712)
@@ -1,15 +1,15 @@
=20
 <?php=20
 	$bt=3Dnew IButton("but_tva_add");
-	$bt->label=3D"Ajout d'une correspondance";
+$bt->label=3D_("Ajout d'une correspondance");
 	$bt->javascript=3D" $('dtvaadd').show()";
 	echo $bt->input();
 ?>
=20
 <table class=3D"result" style=3D"width:60%;margin-left:20%">
 	<tr>
-		<th>Fiche TVA</th>
-		<th>Taux correspondant <?php echo HtmlInput::infobulle(50)?></th>
+	  <th><?php echo _("Fiche TVA")?></th>
+	  <th><?php echo _("Taux correspondant")?> <?php echo HtmlInput::infobu=
lle(50)?></th>
 	</tr>
 	<?php
 	for ($i =3D 0; $i < count($atva); $i++):

Modified: branches/rel672n/import_account/include/template/parameter_tva_=
add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/template/parameter_tva_add.ph=
p	2014-02-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/template/parameter_tva_add.ph=
p	2014-02-13 19:56:17 UTC (rev 712)
@@ -27,7 +27,7 @@
  */
 ?>
 <div id=3D"dtvaadd" class=3D"inner_box" style=3D"display:none">
-	<h2 class=3D"info">Ajout d'un taux de tva</h2>
+   <h2 class=3D"info"><?php echo _("Ajout d'un taux de tva")?></h2>
 	<form method=3D"POST">
=20
 		<table>
@@ -49,10 +49,10 @@
 				</td>
 			</tr>
 		</table>
-		<?php echo  HtmlInput::submit("ftvaadd", "Ajout");?>
+   <?php echo  HtmlInput::submit("ftvaadd", _("Ajout"));?>
 		<?php=20
 		$bt =3D new IButton("but_tva_close");
-		$bt->label =3D "Fermer";
+$bt->label =3D _("Fermer");
 		$bt->javascript =3D " $('dtvaadd').hide()";
 		echo $bt->input();
 		?>

Modified: branches/rel672n/import_account/include/template/test_file.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/template/test_file.php	2014-0=
2-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/template/test_file.php	2014-0=
2-13 19:56:17 UTC (rev 712)
@@ -5,27 +5,28 @@
 ?>
 </h2>
=20
-<p>Pour importer des donn=C3=A9es, c'est-=C3=A0-dire transformer des fic=
hiers CSV (Valeur s=C3=A9par=C3=A9 par des virgules) en des fiches. Vous =
devez choisir, un fichier et donner une cat=C3=A9gorie de fiche existante=
. Ensuite, il suffit d'indiquer quelles colonnes correspondent =C3=A0 que=
lle attribut.=20
+<p>
+ <?php echo _("Pour importer des donn=C3=A9es, c'est-=C3=A0-dire transfo=
rmer des fichiers CSV (Valeur s=C3=A9par=C3=A9 par des virgules) en des f=
iches. Vous devez choisir, un fichier et donner une cat=C3=A9gorie de fic=
he existante. Ensuite, il suffit d'indiquer quelles colonnes corresponden=
t =C3=A0 quelle attribut."); ?>
 </p>
=20
 <form method=3D"POST" >
 <?php echo $hidden?>
 <table>
 <tr>
-<td>D=C3=A9limiteur </td>
+   <td><?php echo _("D=C3=A9limiteur")?> </td>
 <td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
+   <td><?php echo _("Fichier =C3=A0 charger")?></td><td> <?php echo $_FI=
LES['csv_file']['name']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
+   <td><?php echo _("Cat=C3=A9gorie de fiche")?></td><td> <?php echo $fi=
le_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <?php echo $encoding?></td>
+   <td><?php echo _("Encodage")?> </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
+   <td><?php echo _("Texte entour=C3=A9 par")?></td><td> <?php echo $_PO=
ST['rsurround'];?></td>
 </tr>
 </table>
 <?php=20
@@ -35,7 +36,7 @@
 }
 echo HtmlInput::hidden('filename',$filename);
=20
- echo HtmlInput::submit('record_import','Valider');
+echo HtmlInput::submit('record_import',_('Valider'));
 ?>
 <input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
@@ -77,7 +78,7 @@
=20
 $sql=3Dsprintf('select ad_id,ad_text from jnt_fic_attr join attr_def usi=
ng(ad_id) where fd_id=3D%d order by ad_text ',$_POST['rfichedef']);
 $header->value=3D$cn->make_array($sql);
-$header->value[]=3Darray('value'=3D>-1,'label'=3D>'-- Non Utilis=C3=A9 -=
-');
+$header->value[]=3Darray('value'=3D>-1,'label'=3D>'-- '._('Non Utilis=C3=
=A9').' --');
 $header->selected=3D-1;
 echo th('Num=C3=A9ro de ligne');
 for ($i=3D0;$i<$max;$i++)

Modified: branches/rel672n/import_account/include/template/test_operation=
.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/template/test_operation.php	2=
014-02-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/template/test_operation.php	2=
014-02-13 19:56:17 UTC (rev 712)
@@ -5,27 +5,28 @@
 ?>
 </h2>
=20
-<p>Pour importer des donn=C3=A9es, c'est-=C3=A0-dire transformer des fic=
hiers CSV (Valeur s=C3=A9par=C3=A9 par des virgules) en des fiches. Vous =
devez choisir, un fichier et donner une cat=C3=A9gorie de fiche existante=
. Ensuite, il suffit d'indiquer quelles colonnes correspondent =C3=A0 que=
lle attribut.=20
+<p>
+ <?php echo _("Pour importer des donn=C3=A9es, c'est-=C3=A0-dire transfo=
rmer des fichiers CSV (Valeur s=C3=A9par=C3=A9 par des virgules) en des f=
iches. Vous devez choisir, un fichier et donner une cat=C3=A9gorie de fic=
he existante. Ensuite, il suffit d'indiquer quelles colonnes corresponden=
t =C3=A0 quelle attribut")?>
 </p>
=20
 <form method=3D"POST" >
 <?php echo $hidden?>
 <table>
 <tr>
-<td>D=C3=A9limiteur </td>
+   <td><?php echo _("D=C3=A9limiteur")?> </td>
 <td> <?php echo $_POST['rdelimiter']?></td>
 </tr>
 <tr>
-<td>Fichier =C3=A0 charger</td><td> <?php echo $_FILES['csv_file']['name=
']?></td>
+   <td><?php echo _("Fichier =C3=A0 charger")?></td><td> <?php echo $_FI=
LES['csv_file']['name']?></td>
 </tr>
 <tr>
-<td>Cat=C3=A9gorie de fiche</td><td> <?php echo $file_cat;?></td>
+   <td><?php echo _("Cat=C3=A9gorie de fiche")?></td><td> <?php echo $fi=
le_cat;?></td>
 </tr>
 <tr>
-<td>Encodage </td><td> <?php echo $encoding?></td>
+   <td><?php echo _("Encodage")?> </td><td> <?php echo $encoding?></td>
 </tr>
 <tr>
-<td>Texte entour=C3=A9 par</td><td> <?php echo $_POST['rsurround'];?></t=
d>
+   <td><?php echo _("Texte entour=C3=A9 par")?></td><td> <?php echo $_PO=
ST['rsurround'];?></td>
 </tr>
 </table>
 <?php=20
@@ -35,7 +36,7 @@
 }
 echo HtmlInput::hidden('filename',$filename);
=20
- echo HtmlInput::submit('record_import','Valider');
+echo HtmlInput::submit('record_import',_('Valider'));
 ?>
 <input type=3D"hidden" name=3D"rsurround" value=3D'<?php echo $_POST['rs=
urround']?>'>
=20
@@ -77,7 +78,7 @@
=20
 $sql=3Dsprintf('select ad_id,ad_text from jnt_fic_attr join attr_def usi=
ng(ad_id) where fd_id=3D%d order by ad_text ',$_POST['rfichedef']);
 $header->value=3D$cn->make_array($sql);
-$header->value[]=3Darray('value'=3D>-1,'label'=3D>'-- Non Utilis=C3=A9 -=
-');
+$header->value[]=3Darray('value'=3D>-1,'label'=3D>'--'._('Non Utilis=C3=A9=
').' --');
 $header->selected=3D-1;
 echo th('Num=C3=A9ro de ligne');
 for ($i=3D0;$i<$max;$i++)

Modified: branches/rel672n/import_account/include/template/upload_operati=
on.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/rel672n/import_account/include/template/upload_operation.php=
	2014-02-13 19:37:36 UTC (rev 711)
+++ branches/rel672n/import_account/include/template/upload_operation.php=
	2014-02-13 19:56:17 UTC (rev 712)
@@ -37,9 +37,9 @@
 <table>
 <tr>
 <tr>
-	<td>Fichier =C3=A0 charger</td><TD> <?php $file =3D new IFile('csv_oper=
ation');echo $file->input()?></td>
+   <td><?php echo _("Fichier =C3=A0 charger")?></td><TD> <?php $file =3D=
 new IFile('csv_operation');echo $file->input()?></td>
 </tr>
 </table>
-<?php echo HtmlInput::submit('upload','Valider');?>
+ <?php echo HtmlInput::submit('upload',_('Valider'));?>
=20
 </form>
\ No newline at end of file



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


From MAILER-DAEMON Sat Feb 15 11:44:05 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WEiLV-0007lx-Ay
	for mharc-phpcompta-dev@gnu.org; Sat, 15 Feb 2014 11:44:05 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat, 15 Feb 2014 17:30:59 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.199140.1392482644.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r713 - in trunk/tools: . include
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Feb 2014 16:44:03 -0000

Author: danydb
Date: 2014-02-15 17:30:58 +0100 (Sat, 15 Feb 2014)
New Revision: 713

Added:
   trunk/tools/include/export_operation.inc.php
Modified:
   trunk/tools/index.php
   trunk/tools/raw.php
Log:
Task #985 - R?\195?\169cup?\195?\169ration des donn?\195?\169es comptable=
s sous format .csv
0000985: R?\195?\169cup?\195?\169ration des donn?\195?\169es comptables s=
ous format .csv

Colonne suppl?\195?\169mentaire : code journal, lettrage, quickcode

Added: trunk/tools/include/export_operation.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/include/export_operation.inc.php	                        =
(rev 0)
+++ trunk/tools/include/export_operation.inc.php	2014-02-15 16:30:58 UTC =
(rev 713)
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   NOALYSS is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published b=
y
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   NOALYSS is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with NOALYSS; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
+*/
+
+// Copyright Author Dany De Bontridder danydb@aevalys.eu
+?>
+<form method=3D"GET" action=3D"extension.raw.php" onsubmit=3D"return che=
ck_form()">
+    <?php
+    echo HtmlInput::get_to_hidden(array('gDossier','sa','ac','plugin_cod=
e'));
+    echo HtmlInput::hidden("act","export_operation");
+    $date_from=3Dnew IDate('p_from');
+    $date_from->id=3D'p_start_date_id';
+    $date_to=3Dnew IDate('p_to');
+    $date_to->id=3D"p_end_date_id";
+    ?>
+    <?php echo _("Date d=C3=A9but")?>  <?php echo $date_from->input()?>
+    <?php echo _("Date fin")?>  <?php echo $date_to->input()?>
+    <p>
+    <?php
+    echo HtmlInput::submit("act_sb",_("Export CSV"));
+    ?>
+    </p>
+</form>
+<script>
+  =20
+    function check_form()
+    {
+       if ($('p_start_date_id').value =3D=3D "" || ! check_date ($('p_st=
art_date_id').value)) {
+            alert('Date incorrect');
+            $('p_start_date_id').style.borderColor =3D "red";
+            return false;
+        }
+        if ($('p_end_date_id').value =3D=3D "" || ! check_date($('p_end_=
date_id').value)) {
+            alert('Date incorrect');
+            $('p_end_date_id').style.borderColor =3D "red";
+            return false;
+        }
+      =20
+        return true;
+    }
+</script>   =20
\ No newline at end of file

Modified: trunk/tools/index.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/index.php	2014-02-13 19:56:17 UTC (rev 712)
+++ trunk/tools/index.php	2014-02-15 16:30:58 UTC (rev 713)
@@ -40,7 +40,8 @@
 $array=3Darray (
          array($url.'&sa=3Dop',_('Op=C3=A9ration'),_('Changer poste comp=
table ou fiche'),1),
          array($url.'&sa=3Dpj',_('Pi=C3=A8ce'),_('R=C3=A9num=C3=A9roter =
des pi=C3=A8ces justificative'),2),
-         array($url.'&sa=3Dexe',_('Exercice'),_('Ajouter des ann=C3=A9es=
 comptables'),3)
+         array($url.'&sa=3Dexe',_('Exercice'),_('Ajouter des ann=C3=A9es=
 comptables'),3),
+         array($url.'&sa=3Dexp',_('Export'),_('Exporter les op=C3=A9rati=
ons'),4)
        );
=20
 $sa=3D(isset($_REQUEST['sa']))?$_REQUEST['sa']:"";
@@ -56,6 +57,9 @@
   case 'exe':
 	  $def=3D3;
 	  break;
+  case 'exp':
+      $def=3D4;
+      break;
   }
=20
 $cn=3Dnew Database(dossier::id());
@@ -86,4 +90,10 @@
 	  require_once 'include/tools_exercice.inc.php';
 	  exit();
   }
+  /** export */
+  if ($def =3D=3D 4 )
+  {
+      require_once 'include/export_operation.inc.php';
+      exit();
+  }
 ?>

Modified: trunk/tools/raw.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tools/raw.php	2014-02-13 19:56:17 UTC (rev 712)
+++ trunk/tools/raw.php	2014-02-15 16:30:58 UTC (rev 713)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,30 +16,88 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-130=
7  USA
-*/
+ */
 /* $Revision$ */
=20
 // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr
=20
-/*!\file
+/* !\file
  * \brief raw file for PDF ewa
  */
-  //require_once('amortis_constant.php');
+//require_once('amortis_constant.php');
=20
-extract ($_REQUEST);
+$act =3D HtmlInput::default_value_get("act", null);
=20
-/* export all cards in PDF */
-/* EXAMPLE
-if ( isset($_REQUEST['pdf_all']))
-  {
-    require_once('include/class_pdf_card.php');
-    global $cn;
-    $a=3Dnew Pdf_Card($cn);
-    $a->setDossierInfo(dossier::id());
-    $a->AliasNbPages('{nb}');
-    $a->AddPage();
-    $a->export();
-    exit();
-  }
-*/
+/**
+ * export operation in CSV
+ */
+if ($act =3D=3D 'export_operation')
+{
+    // -- parameter
+    $p_from =3D HtmlInput::default_value_get("p_from", null);
+    $p_to =3D HtmlInput::default_value_get("p_to", null);
+   =20
+    // -- check date
+    if ( $p_from=3D=3Dnull || isDate($p_from)=3D=3Dnull || $p_to =3D=3D =
null || isDate($p_to) =3D=3D null) {
+        die (_('Date invalide'));
+    }
+    // Security : filter by ledger
+    $ledger=3D$g_user->get_ledger_sql('ALL',3);
+  =20
+    // SQL stmt
+    $sql =3D "
+          select to_char(j_date,'DD.MM.YYYY') as str_date,
+                jrn_def_code,
+                jr_internal,
+                jr_pj_number,
+                j_poste,
+                j_qcode,
+                case when coalesce(j_text,'')=3D'' then pcm_lib else j_t=
ext end as text,
+                j_montant,=20
+                case when j_debit=3D't' then 'D' else 'C' end as dc,
+                comptaproc.get_letter_jnt(j_id) AS lettrage
+               =20
+            from jrnx
+            join jrn on (j_grpt=3Djr_grpt_id)
+            join tmp_pcmn on j_poste=3Dpcm_val
+            join jrn_def on jrn_def_id=3Djr_def_id
+            where=20
+            j_date between to_date($1,'DD.MM.YYYY') and to_date($2,'DD.M=
M.YYYY')
+            and $ledger order by j_date
+            ";
+   =20
+    $ret =3D $cn->exec_sql($sql, array($p_from, $p_to));
+    $file_name=3D'export_operation-'.date('ymd').'.csv';
+    header('Pragma: public');
+    header('Content-type: application/csv');
+    header('Content-Disposition: attachment;filename=3D"'.$file_name.'"'=
, FALSE);
+    $nb=3DDatabase::num_row($ret);
+    printf('"%s";',_("Date DMY"));
+    printf('"%s";',_("Journal"));
+    printf('"%s";',_("n=C2=B0 interne"));
+    printf('"%s";',_("piece"));
+    printf('"%s";',_("poste"));
+    printf('"%s";',_("Code"));
+    printf('"%s";',_("texte"));
+    printf('"%s";',_("montant"));
+    printf('"%s";',_("DC"));
+    printf('"%s"',_("lettrage"));
+    printf ("\r\n");
+   =20
+    for ($i=3D0;$i < $nb;$i++)
+    {
+        $row=3DDatabase::fetch_array($ret,$i);
+        printf('"%s";',$row['str_date']);
+        printf('"%s";',$row['jrn_def_code']);
+        printf('"%s";',$row['jr_internal']);
+        printf('"%s";',$row['jr_pj_number']);
+        printf('"%s";',$row['j_poste']);
+        printf('"%s";',$row['j_qcode']);
+        printf('"%s";',$row['text']);
+        printf('%s;',nb($row['j_montant']));
+        printf('"%s";',$row['dc']);
+        printf('"%s"',$row['lettrage']);
+        printf ("\r\n");
+    }
+}
 ?>



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


From MAILER-DAEMON Mon Feb 17 14:54:49 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WFUHB-0002oG-BQ
	for mharc-phpcompta-dev@gnu.org; Mon, 17 Feb 2014 14:54:49 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Mon, 17 Feb 2014 20:41:39 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.203780.1392666888.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r714 - tag
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Feb 2014 19:54:48 -0000

Author: danydb
Date: 2014-02-17 20:41:39 +0100 (Mon, 17 Feb 2014)
New Revision: 714

Added:
   tag/rel673/
Log:
Release 2014-02-15
new plugin : transform=20
Improve plugin tools


Copied: tag/rel673 (from rev 713, trunk)



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


From MAILER-DAEMON Fri Feb 28 20:54:08 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WJZ7w-0006vY-76
	for mharc-phpcompta-dev@gnu.org; Fri, 28 Feb 2014 20:54:08 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Mar 2014 02:40:42 +0100 (CET)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 91.121.80.190
Message-ID: <mailman.219111.1393638847.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r715 - in trunk: amortis amortis/include
	amortis/include/template importbank
	importbank/include/template rapport_avance tva
X-BeenThere: phpcompta-dev@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: phpcompta-dev@nongnu.org
List-Id: <phpcompta-dev.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/phpcompta-dev>
List-Post: <mailto:phpcompta-dev@nongnu.org>
List-Help: <mailto:phpcompta-dev-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/phpcompta-dev>,
	<mailto:phpcompta-dev-request@nongnu.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Mar 2014 01:54:06 -0000

Author: danydb
Date: 2014-03-01 02:40:41 +0100 (Sat, 01 Mar 2014)
New Revision: 715

Modified:
   trunk/amortis/amortize_javascript.js
   trunk/amortis/include/class_am_card.php
   trunk/amortis/include/material_modify.inc.php
   trunk/amortis/include/template/listing_histo.php
   trunk/amortis/include/template/material_add.php
   trunk/amortis/include/template/material_detail.php
   trunk/importbank/bank_js.js
   trunk/importbank/include/template/detail_item.php
   trunk/rapport_avance/ajax_include_follow.php
   trunk/rapport_avance/ajax_include_follow_save.php
   trunk/rapport_avance/ajax_listing_detail_modify.php
   trunk/rapport_avance/ajax_listing_modify.php
   trunk/rapport_avance/ajax_listing_remove_modele.php
   trunk/rapport_avance/ajax_parameter_send_mail.php
   trunk/rapport_avance/ajax_send_mail.php
   trunk/tva/js_scripts.js
Log:
Adapt CSS3

Modified: trunk/amortis/amortize_javascript.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/amortize_javascript.js	2014-02-17 19:41:39 UTC (rev 714=
)
+++ trunk/amortis/amortize_javascript.js	2014-03-01 01:40:41 UTC (rev 715=
)
@@ -28,7 +28,7 @@
      {
             sx=3Ddocument.body.scrollTop+120;
      }
-    var str_style=3D"top:"+sx+";width:60%;height:70%";
+    var str_style=3D"top:"+sx+"px;width:60%;height:70%";
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20
@@ -61,7 +61,7 @@
      {
             sx=3Ddocument.body.scrollTop+120;
      }
-    var str_style=3D"top:"+sx+";width:60%;height:auto";
+    var str_style=3D"top:"+sx+"px;width:60%;height:auto";
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20

Modified: trunk/amortis/include/class_am_card.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/class_am_card.php	2014-02-17 19:41:39 UTC (rev =
714)
+++ trunk/amortis/include/class_am_card.php	2014-03-01 01:40:41 UTC (rev =
715)
@@ -53,7 +53,7 @@
   public function add_card()
   {
     $add=3Dnew IButton('add_card');
-    $add->label=3D"Ajout d'un bien =C3=A0 amortir";
+    $add->label=3D_("Ajout d'un bien =C3=A0 amortir");
     $add->javascript=3Dsprintf("add_material(%d,'%s','bxmat')",
 			     dossier::id(),
 			     $_REQUEST['plugin_code']

Modified: trunk/amortis/include/material_modify.inc.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/material_modify.inc.php	2014-02-17 19:41:39 UTC=
 (rev 714)
+++ trunk/amortis/include/material_modify.inc.php	2014-03-01 01:40:41 UTC=
 (rev 715)
@@ -37,7 +37,7 @@
 if ( $cn->count() =3D=3D 0 )
   {
     echo HtmlInput::anchor_close($t);
-    echo '<h2 class=3D"info">D=C3=A9tail de mat=C3=A9riel</h2>';
+    echo '<h2 class=3D"title">D=C3=A9tail de mat=C3=A9riel</h2>';
     echo "<h2 class=3D\"error\"> Bien =C3=A0 amortir effac=C3=A9 </h2>";
     echo HtmlInput::button('close','Fermer',"onclick=3D\"removeDiv('bxma=
t');refresh_window()\" ");
   }

Modified: trunk/amortis/include/template/listing_histo.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/listing_histo.php	2014-02-17 19:41:39 =
UTC (rev 714)
+++ trunk/amortis/include/template/listing_histo.php	2014-03-01 01:40:41 =
UTC (rev 715)
@@ -22,7 +22,8 @@
 <?php
=20
 for ($i=3D0;$i<count($array);$i++) :
-	echo '<tr>';
+        $class=3D($i%2=3D=3D0)?"odd":"even";
+	echo '<tr class=3D"'.$class.'">';
 	echo td($array[$i]['quick_code']);
 	echo td($array[$i]['vw_name']);
 	echo td(nbm($array[$i]['h_amount']), 'align=3D"right"');

Modified: trunk/amortis/include/template/material_add.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_add.php	2014-02-17 19:41:39 U=
TC (rev 714)
+++ trunk/amortis/include/template/material_add.php	2014-03-01 01:40:41 U=
TC (rev 715)
@@ -1,4 +1,4 @@
-<h2 class=3D"info">Ajout de mat=C3=A9riel</h2>
+<h2 class=3D"title">Ajout de mat=C3=A9riel</h2>
 <form method=3D"POST" onsubmit=3D"save_new_material(this);return false;"=
>
 <span style=3D"text-align:center;display:block;font-size:2em" id=3D"p_ca=
rd_label"  >Nouveau mat=C3=A9riel</span>
 <table>

Modified: trunk/amortis/include/template/material_detail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/amortis/include/template/material_detail.php	2014-02-17 19:41:3=
9 UTC (rev 714)
+++ trunk/amortis/include/template/material_detail.php	2014-03-01 01:40:4=
1 UTC (rev 715)
@@ -1,4 +1,4 @@
-<h2 class=3D"info">Modification de mat=C3=A9riel</h2>
+<h2 class=3D"title">Modification de mat=C3=A9riel</h2>
 <form onsubmit=3D"save_modify(this);return false">
 <?php echo $p_card?>
 <?php echo $a_id?>
@@ -125,17 +125,15 @@
 <?php=20
 if ( $annuite !=3D  $p_amount->value)
  {
- 	echo '<h2 class=3D"error">Diff=C3=A9rence entre le montant =C3=A0 amor=
tir et le montant amorti =3D';
-	echo nbm($annuite - $p_amount->value);
-	echo '<h2>';
+ 	printf ('<h2 class=3D"error">'._("Diff=C3=A9rence entre le montant =C3=
=A0 amortir et le montant amorti =3D %d'".'</h2>'),nbm($annuite - $p_amou=
nt->value));
  }
  ?>
 </fieldset>
 <?php=20
-   echo HtmlInput::submit('sauver','Sauver',"onclick=3D\"return confirm(=
'Vous confirmez ?')\" ");
+   echo HtmlInput::submit('sauver',_('Sauver'),"onclick=3D\"return confi=
rm('Vous confirmez ?')\" ");
    $rm=3Dsprintf("remove_mat(%d,'%s',%d)",dossier::id(),$_REQUEST['plugi=
n_code'],$value_a_id);
-   echo HtmlInput::button('remove','Effacer',"onclick=3D\"$rm\" ");
-   echo HtmlInput::button('close','Fermer',"onclick=3D\"removeDiv('bxmat=
');refresh_window()\" ");
+   echo HtmlInput::button('remove',_('Effacer'),"onclick=3D\"$rm\" ");
+   echo HtmlInput::button('close',_('Fermer'),"onclick=3D\"removeDiv('bx=
mat');refresh_window()\" ");
=20
 ?>
 </FORM>

Modified: trunk/importbank/bank_js.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/bank_js.js	2014-02-17 19:41:39 UTC (rev 714)
+++ trunk/importbank/bank_js.js	2014-03-01 01:40:41 UTC (rev 715)
@@ -14,17 +14,10 @@
     {
 	removeDiv(target);
     }
-    var sx=3D0;
+    var sx=3Dcalcy(120);
     var height=3D0;
-    if ( window.scrollY)
-    {
-        sx=3Dwindow.scrollY+height;
-    }
-     else
-     {
-            sx=3Ddocument.body.scrollTop+height;
-     }
-    var str_style=3D"top:"+sx+";margin-left:10%;";
+   =20
+    var str_style=3D"top:"+sx+"px;margin-left:10%;";
=20
     var div=3D{id:target, cssclass:'inner_box',style:str_style,html:load=
ing(),drag:1};
=20

Modified: trunk/importbank/include/template/detail_item.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/importbank/include/template/detail_item.php	2014-02-17 19:41:39=
 UTC (rev 714)
+++ trunk/importbank/include/template/detail_item.php	2014-03-01 01:40:41=
 UTC (rev 715)
@@ -2,7 +2,7 @@
 <?php echo HtmlInput::anchor_close($ctl)?>
=20
 <?php
-echo h2info('D=C3=A9tail op=C3=A9ration');
+echo h2('D=C3=A9tail op=C3=A9ration','class=3D"title"');
 	if ($bi->id=3D=3D'')
 	{
 		echo h2('Op=C3=A9ration effac=C3=A9e','class=3D"notice"');

Modified: trunk/rapport_avance/ajax_include_follow.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_include_follow.php	2014-02-17 19:41:39 UTC =
(rev 714)
+++ trunk/rapport_avance/ajax_include_follow.php	2014-03-01 01:40:41 UTC =
(rev 715)
@@ -40,7 +40,6 @@
 require_once 'include/template/include_follow.php';
=20
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: trunk/rapport_avance/ajax_include_follow_save.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_include_follow_save.php	2014-02-17 19:41:39=
 UTC (rev 714)
+++ trunk/rapport_avance/ajax_include_follow_save.php	2014-03-01 01:40:41=
 UTC (rev 715)
@@ -15,7 +15,6 @@
 echo '</ol>';
 echo HtmlInput::button_close('include_follow_save_result');
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: trunk/rapport_avance/ajax_listing_detail_modify.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_listing_detail_modify.php	2014-02-17 19:41:=
39 UTC (rev 714)
+++ trunk/rapport_avance/ajax_listing_detail_modify.php	2014-03-01 01:40:=
41 UTC (rev 715)
@@ -74,7 +74,6 @@
     echo '</p>';
     echo '</form>';
     $response =3D ob_get_clean();
-    ob_end_clean();
  } else {
      $response=3D'invalide id';
  }

Modified: trunk/rapport_avance/ajax_listing_modify.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_listing_modify.php	2014-02-17 19:41:39 UTC =
(rev 714)
+++ trunk/rapport_avance/ajax_listing_modify.php	2014-03-01 01:40:41 UTC =
(rev 715)
@@ -17,7 +17,6 @@
 echo '</p>';
 echo '</form>';
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: trunk/rapport_avance/ajax_listing_remove_modele.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_listing_remove_modele.php	2014-02-17 19:41:=
39 UTC (rev 714)
+++ trunk/rapport_avance/ajax_listing_remove_modele.php	2014-03-01 01:40:=
41 UTC (rev 715)
@@ -7,7 +7,6 @@
 $file=3Dnew IFile('listing_mod');
 echo $file->input();
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: trunk/rapport_avance/ajax_parameter_send_mail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_parameter_send_mail.php	2014-02-17 19:41:39=
 UTC (rev 714)
+++ trunk/rapport_avance/ajax_parameter_send_mail.php	2014-03-01 01:40:41=
 UTC (rev 715)
@@ -29,7 +29,6 @@
    =20
 }
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: trunk/rapport_avance/ajax_send_mail.php
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/rapport_avance/ajax_send_mail.php	2014-02-17 19:41:39 UTC (rev =
714)
+++ trunk/rapport_avance/ajax_send_mail.php	2014-03-01 01:40:41 UTC (rev =
715)
@@ -16,7 +16,6 @@
 echo '</ol>';
 echo HtmlInput::button_close('parameter_send_mail_result');
 $response =3D ob_get_clean();
-ob_end_clean();
 $html =3D escape_xml($response);
 header('Content-type: text/xml; charset=3DUTF-8');
 echo <<<EOF

Modified: trunk/tva/js_scripts.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tva/js_scripts.js	2014-02-17 19:41:39 UTC (rev 714)
+++ trunk/tva/js_scripts.js	2014-03-01 01:40:41 UTC (rev 715)
@@ -125,7 +125,7 @@
 			sx=3Ddocument.body.scrollTop+120;
 		}
=20
-		var div_style=3D"top:"+sx+";width:60%;heigth:80%";
+		var div_style=3D"top:"+sx+"px;";
 		removeDiv("paramadd_id");
 		add_div({
 			"id":'paramadd_id',



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


