From MAILER-DAEMON Sat Mar 01 16:46:31 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WJrjr-0005l4-IH
	for mharc-phpcompta-dev@gnu.org; Sat, 01 Mar 2014 16:46:31 -0500
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Sat,  1 Mar 2014 22:33: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.219483.1393710390.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r716 - in trunk/invoicing: . 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 Mar 2014 21:46:29 -0000

Author: danydb
Date: 2014-03-01 22:33:03 +0100 (Sat, 01 Mar 2014)
New Revision: 716

Modified:
   trunk/invoicing/include/invoice_send_mail.inc.php
   trunk/invoicing/include/invoicing.inc.php
   trunk/invoicing/index.php
Log:
Bug : use copy instead of email_copy
Bug : cannot send to sender
Bug : exception whenever message empty was not catch

Modified: trunk/invoicing/include/invoice_send_mail.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/invoicing/include/invoice_send_mail.inc.php	2014-03-01 01:40:41=
 UTC (rev 715)
+++ trunk/invoicing/include/invoice_send_mail.inc.php	2014-03-01 21:33:03=
 UTC (rev 716)
@@ -33,7 +33,7 @@
 $from =3D HtmlInput::default_value_get('email_from', 'null');
 $subject =3D HtmlInput::default_value_get('email_subject', 'null');
 $message =3D HtmlInput::default_value_get('email_message', 'null');
-$copy =3D HtmlInput::default_value_get('email_copy', 'null');
+$copy =3D HtmlInput::default_value_get('email_copy', '-1');
 $pdf =3D HtmlInput::default_value_get('pdf', 'null');
 if ($from =3D=3D "null") {
     die (_("D=C3=A9sol=C3=A9 mais il faut donner l'email de celui qui en=
voie"));
@@ -41,6 +41,11 @@
 if ($subject =3D=3D "null") {
     die (_("Le sujet est obligatoire"));
 }
+
+if ( $message=3D=3D"null")
+{
+    $message=3D$subject;
+}
 $feedback =3D array();
 $dirname =3D tempnam($_ENV['TMP'], 'invoice');
 unlink($dirname);
@@ -97,23 +102,28 @@
         $sendmail->set_from($from);
         $to =3D $dest_mail;
=20
-        if ($copy !=3D 'null')
+        if ($copy !=3D '-1')
         {
             $dest_mail=3D $dest_mail . ',' . $from;
         }
         $sendmail->mailto($dest_mail);
         $sendmail->set_subject($subject);
+       =20
+        if (strlen(trim($message))=3D=3D0) {
+            $message=3D$subject;
+        }
+       =20
         $sendmail->set_message($message);
         $ofile =3D new FileToSend($filetosend);
         $sendmail->add_file($ofile);
-        $sendmail->compose();
         try
         {
+            $sendmail->compose();
             $sendmail->send();
             $feedback[] =3D _('Envoi facture ') . $invoice['jr_pj_name']=
 . _(' destinataire ') . $dest_qcode . " " . $dest_name . " " . $dest_mai=
l;
         } catch (Exception $e)
         {
-            $feedback[] =3D _('Envoi echou=C3=A9') . " $dest_qcode $dest=
_name $dest_mail";
+            $feedback[] =3D _('Envoi echou=C3=A9') ." ".$e->getMessage()=
. " $dest_qcode $dest_name $dest_mail ";
         }
     } else if ($invoice['jr_pj_name'] =3D=3D "" || $invoice['jr_pj'] =3D=
=3D "")
     {

Modified: trunk/invoicing/include/invoicing.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/invoicing/include/invoicing.inc.php	2014-03-01 01:40:41 UTC (re=
v 715)
+++ trunk/invoicing/include/invoicing.inc.php	2014-03-01 21:33:03 UTC (re=
v 716)
@@ -121,7 +121,7 @@
                     <textarea style=3D"vertical-align: top;width:23%;hei=
ght:10%" name=3D"email_message" class=3D"input_text">               </tex=
tarea>
                 </p>
                 <p>
-                    <input type=3D"checkbox" name=3D"copy"> <?php echo _=
("Envoyer copie =C3=A0 l'exp=C3=A9diteur"); ?>
+                    <input type=3D"checkbox" name=3D"email_copy"> <?php =
echo _("Envoyer copie =C3=A0 l'exp=C3=A9diteur"); ?>
                   =20
                 </p>
             </div>

Modified: trunk/invoicing/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/invoicing/index.php	2014-03-01 01:40:41 UTC (rev 715)
+++ trunk/invoicing/index.php	2014-03-01 21:33:03 UTC (rev 716)
@@ -37,8 +37,8 @@
 $version_plugin=3DSVNINFO;
 Extension::check_version(5500);
 require_once 'class_acc_ledger_sold.php';
-require_once 'include/invoicing.inc.php';
 require_once('class_zip_extended.php');
 require_once 'class_sendmail.php';
 require_once 'class_filetosend.php';
+require_once 'include/invoicing.inc.php';
 ?>



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


From MAILER-DAEMON Wed Mar 12 06:54:58 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WNgoM-0006m1-K8
	for mharc-phpcompta-dev@gnu.org; Wed, 12 Mar 2014 06:54:58 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 12 Mar 2014 11:41: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.230452.1394621698.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r717 - trunk/rapport_avance
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 Mar 2014 10:54:57 -0000

Author: danydb
Date: 2014-03-12 11:41:17 +0100 (Wed, 12 Mar 2014)
New Revision: 717

Modified:
   trunk/rapport_avance/index.php
Log:
Bug : correct link to help

Modified: trunk/rapport_avance/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/rapport_avance/index.php	2014-03-01 21:33:03 UTC (rev 716)
+++ trunk/rapport_avance/index.php	2014-03-12 10:41:17 UTC (rev 717)
@@ -57,7 +57,6 @@
 $array =3D array(
 	array($url . '&sa=3Dli', _('Liste'), _('Cr=C3=A9ation, modification, Pa=
ram=C3=A8tre de listes, mailing list'), 0),
 	array($url . '&sa=3Dfo', _('Formulaire'), _('Cr=C3=A9ation, modificatio=
n, Param=C3=A8tre'), 1),
-// 	array($url . '&sa=3Dde', _('G=C3=A9n=C3=A9ration D=C3=A9claration ')=
, _('G=C3=A9n=C3=A9ration D=C3=A9claration '), 2),
  	array($url . '&sa=3Dde', _('G=C3=A9n=C3=A9ration'), _('G=C3=A9n=C3=A9r=
ation D=C3=A9claration / listing'), 2),
 	array($url . '&sa=3Dhi', _('Historique'), _('Historique des d=C3=A9clar=
ations faites'), 3)
 );
@@ -82,7 +81,7 @@
=20
 $cn =3D new Database(dossier::id());
 // show menu
-echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Drapport_avances" tar=
get=3D"_blank">Aide</a>' .
+echo '<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:=
140%" href=3D"http://wiki.phpcompta.eu/doku.php?id=3Drapav:home" target=3D=
"_blank">Aide</a>' .
  '<span style=3D"font-size:0.8em;color:red;display:inline">vers:SVNINFO<=
/span>' .
  '</div>';
=20



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


From MAILER-DAEMON Wed Mar 12 06:57:30 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WNgqo-0000yl-5A
	for mharc-phpcompta-dev@gnu.org; Wed, 12 Mar 2014 06:57:30 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 12 Mar 2014 11:43: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.230455.1394621849.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r718 - 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: Wed, 12 Mar 2014 10:57:28 -0000

Author: danydb
Date: 2014-03-12 11:43:48 +0100 (Wed, 12 Mar 2014)
New Revision: 718

Modified:
   trunk/transform/include/class_transform_client.php
Log:
Bug : remove space from VAT Number

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-03-12 10:41:1=
7 UTC (rev 717)
+++ trunk/transform/include/class_transform_client.php	2014-03-12 10:43:4=
8 UTC (rev 718)
@@ -76,6 +76,7 @@
         $this->c_vatnumber=3Dstr_replace(',','',$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()
     {



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


From MAILER-DAEMON Wed Mar 12 13:01:03 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WNmWd-0001ne-HP
	for mharc-phpcompta-dev@gnu.org; Wed, 12 Mar 2014 13:01:03 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Wed, 12 Mar 2014 17:47:18 +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.230772.1394643663.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r719 - trunk/invoicing/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: Wed, 12 Mar 2014 17:01:02 -0000

Author: danydb
Date: 2014-03-12 17:47:17 +0100 (Wed, 12 Mar 2014)
New Revision: 719

Modified:
   trunk/invoicing/include/invoicing.inc.php
Log:
Improve : add documentation for invoicing

Modified: trunk/invoicing/include/invoicing.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/invoicing/include/invoicing.inc.php	2014-03-12 10:43:48 UTC (re=
v 718)
+++ trunk/invoicing/include/invoicing.inc.php	2014-03-12 16:47:17 UTC (re=
v 719)
@@ -68,6 +68,8 @@
     array('value'=3D>'2','Envoi de la facture sans conversion en PDF')
 )
 ?>
+<div style=3D"float:right"><a class=3D"mtitle" style=3D"font-size:140%" =
href=3D"http://wiki.phpcompta.eu/doku.php?id=3Dfacturation" target=3D"_bl=
ank">Aide</a>
+ </div>
 <form method=3D"GET" id=3D"sel_sale_frm" onsubmit=3D"return verify_invoi=
cing()">
     Ajouter dans le form les valeurs de la recherches
     <?php



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


From MAILER-DAEMON Fri Mar 14 13:10:14 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOVcc-0007kA-Me
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 13:10:14 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 17:56:30 +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.233256.1394817013.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r720 - trunk/invoicing/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, 14 Mar 2014 17:10:13 -0000

Author: danydb
Date: 2014-03-14 17:56:29 +0100 (Fri, 14 Mar 2014)
New Revision: 720

Added:
   trunk/invoicing/include/invoice_send_mail_input.inc.php
   trunk/invoicing/include/invoice_send_mail_route.inc.php
Modified:
   trunk/invoicing/include/invoice_send_mail.inc.php
   trunk/invoicing/include/invoicing.inc.php
Log:
Task #991 - Proposer d'ajouter la facture dans le suivi
Improve : second screen for sending mail + include in suivi

Modified: trunk/invoicing/include/invoice_send_mail.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/invoicing/include/invoice_send_mail.inc.php	2014-03-12 16:47:17=
 UTC (rev 719)
+++ trunk/invoicing/include/invoice_send_mail.inc.php	2014-03-14 16:56:29=
 UTC (rev 720)
@@ -26,25 +26,48 @@
  * @param email_message text=20
  * @param email_copy copy to sender
  * @param pdf convert to pdf
-   @endnote
+  @endnote
  */
 require_once 'class_sendmail.php';
+require_once 'class_follow_up.php';
+global $cn;
=20
-$from =3D HtmlInput::default_value_get('email_from', 'null');
-$subject =3D HtmlInput::default_value_get('email_subject', 'null');
-$message =3D HtmlInput::default_value_get('email_message', 'null');
-$copy =3D HtmlInput::default_value_get('email_copy', '-1');
-$pdf =3D HtmlInput::default_value_get('pdf', 'null');
-if ($from =3D=3D "null") {
-    die (_("D=C3=A9sol=C3=A9 mais il faut donner l'email de celui qui en=
voie"));
+//----- Mail
+$from =3D HtmlInput::default_value_post('email_from', 'null');
+$subject =3D HtmlInput::default_value_post('email_subject', 'null');
+$message =3D HtmlInput::default_value_post('email_message', 'null');
+$copy =3D HtmlInput::default_value_post('email_copy', '-1');
+$pdf =3D HtmlInput::default_value_post('pdf', 'null');
+
+//-- Follow up
+$ag_timestamp =3D HtmlInput::default_value_post('ag_timestamp', date('d.=
m.Y'));
+$ag_title =3D HtmlInput::default_value_post('ag_title', _('Ajout=C3=A9 d=
epuis plugin'));
+$ag_remind_date=3DHtmlInput::default_value_post('ag_remind_date','');
+$ag_dest=3DHtmlInput::default_value_post('ag_dest',1);
+
+if (isDate($ag_timestamp) =3D=3D null)
+    $ag_timestamp =3D date('d.m.Y');
+
+if (trim($ag_title) =3D=3D "")
+    $ag_title =3D _("Ajout=C3=A9 depuis plugin");
+
+if (isDate($ag_remind_date) =3D=3D null) {
+    $ag_remind_date=3Dnull;
 }
-if ($subject =3D=3D "null") {
-    die (_("Le sujet est obligatoire"));
+
+
+if ($from =3D=3D "null")
+{
+    die(_("D=C3=A9sol=C3=A9 mais il faut donner l'email de celui qui env=
oie"));
 }
+if ($subject =3D=3D "null")
+{
+    die(_("Le sujet est obligatoire"));
+}
=20
-if ( $message=3D=3D"null")
+if ($message =3D=3D "null")
 {
-    $message=3D$subject;
+    $message =3D $subject;
 }
 $feedback =3D array();
 $dirname =3D tempnam($_ENV['TMP'], 'invoice');
@@ -104,15 +127,16 @@
=20
         if ($copy !=3D '-1')
         {
-            $dest_mail=3D $dest_mail . ',' . $from;
+            $dest_mail =3D $dest_mail . ',' . $from;
         }
         $sendmail->mailto($dest_mail);
         $sendmail->set_subject($subject);
-       =20
-        if (strlen(trim($message))=3D=3D0) {
-            $message=3D$subject;
+
+        if (strlen(trim($message)) =3D=3D 0)
+        {
+            $message =3D $subject;
         }
-       =20
+
         $sendmail->set_message($message);
         $ofile =3D new FileToSend($filetosend);
         $sendmail->add_file($ofile);
@@ -121,26 +145,45 @@
             $sendmail->compose();
             $sendmail->send();
             $feedback[] =3D _('Envoi facture ') . $invoice['jr_pj_name']=
 . _(' destinataire ') . $dest_qcode . " " . $dest_name . " " . $dest_mai=
l;
+            /**
+             * Save into follow up
+             */
+            $action =3D new Follow_Up($cn);
+            $a_follow['ag_dest'] =3D $ag_dest;
+            $ag_comment =3D  _("Envoi facture") . " " . $invoice['jr_pj_=
name']." "._(' =C3=A0 ').$dest_mail.PHP_EOL.$message;
+            $a_follow['ag_comment']=3D$ag_comment;
+            $a_follow['ag_title']=3D$ag_title;
+            $a_follow['ag_timestamp']=3D$ag_timestamp;
+            $a_follow['ag_remind_date']=3D$ag_remind_date;
+            $a_follow['dt_id']=3DHtmlInput::default_value_post('dt_id',-=
1);
+            $action->fromArray($a_follow);
+
+            $action->f_id_dest =3D $invoice['qs_client'];
+            $action->qcode_dest =3D $dest_qcode;
+            $_POST['nb_item'] =3D 0;
+            $action->save();
+// return $fiche->strAttribut(ATTR_DEF_QUICKCODE) . ' inclus dans Suivi'=
;
         } catch (Exception $e)
         {
-            $feedback[] =3D _('Envoi echou=C3=A9') ." ".$e->getMessage()=
. " $dest_qcode $dest_name $dest_mail ";
+            $feedback[] =3D _('Envoi echou=C3=A9') . " " . $e->getMessag=
e() . " $dest_qcode $dest_name $dest_mail ";
         }
     } else if ($invoice['jr_pj_name'] =3D=3D "" || $invoice['jr_pj'] =3D=
=3D "")
     {
         $feedback[] =3D _('Aucune pi=C3=A8ce =C3=A0 envoyer') . " $dest_=
qcode $dest_name $dest_mail";
-    } else if ($dest_mail =3D=3D "" || $dest_mail =3D=3D NOTFOUND )
+    } else if ($dest_mail =3D=3D "" || $dest_mail =3D=3D NOTFOUND)
     {
         $feedback[] =3D _('Aucune adresse email trouv=C3=A9e') . " $dest=
_qcode $dest_name $dest_mail";
     }
 }
+$cn->commit();
 ?>
 <ol>
-        <?php foreach ($feedback as $line): ?>
+    <?php foreach ($feedback as $line): ?>
=20
         <li>
-        <?php echo $line; ?>
+            <?php echo $line; ?>
         </li>
-<?php endforeach; ?>
+    <?php endforeach; ?>
 </ol>
=20
=20

Added: trunk/invoicing/include/invoice_send_mail_input.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/invoicing/include/invoice_send_mail_input.inc.php	             =
           (rev 0)
+++ trunk/invoicing/include/invoice_send_mail_input.inc.php	2014-03-14 16=
:56:29 UTC (rev 720)
@@ -0,0 +1,168 @@
+<?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
+
+global $g_user;
+
+$titre =3D new IText('ag_title');
+
+// Profile in charged of the action
+$ag_dest =3D new ISelect();
+$ag_dest->name =3D "ag_dest";
+// select profile
+$aAg_dest =3D $cn->make_array("select  p_id as value, " .
+        "p_name as label " .
+        " from profile  "
+        . "where p_id in (select p_granted from "
+            . " user_sec_action_profile where ua_right=3D'W' and p_id=3D=
" . $g_user->get_profile() . ") order by 2");
+$ag_dest->value =3D $aAg_dest;
+
+// -- Date
+$date =3D new IDate();
+$date->name =3D "ag_timestamp";
+$date->value =3D date('d.m.Y');
+
+// -- remind date
+$remind_date =3D new IDate();
+$remind_date->name =3D "ag_remind_date";
+$remind_date->value =3D "";
+
+// -- document
+$category =3D new ISelect('dt_id');
+$category->value =3D $cn->make_array("select dt_id,dt_value from documen=
t_type order by dt_value");
+$category->readOnly =3D false;
+
+//-- description
+$desc =3D new ITextArea();
+$desc->style =3D ' class=3D"itextarea" style=3D"width:80%;margin-left:0p=
x"';
+$desc->name =3D "ag_comment";
+?>
+<form method=3D"POST" id=3D"sel_sale_frm" onsubmit=3D"return verify_invo=
icing()">
+<?php
+echo HtmlInput::request_to_hidden(array('gDossier', 'ac', 'plugin_code',=
'action'));
+echo HtmlInput::request_to_hidden(array('sel_sale'));
+echo HtmlInput::hidden('sa', 'send');
+?>
+
+    <h2 class=3D"note"><?php echo _('Envoi uniquement =C3=A0 ceux ayant =
une adresse email et une facture') ?> </h2>
+    <p>
+        <input type=3D"checkbox" name=3D"pdf"> <?php echo _('Conversion =
en PDF'); ?>
+    </p>
+    <p>
+        <?php echo _('Email envoy=C3=A9 par'); ?> :
+        <input type=3D"text" id=3D"email_from" name=3D"email_from" class=
=3D"input_text">
+        <span class=3D"notice" id=3D"email_from_span"></span>
+    </p>
+
+    <p>
+        <?php echo _('Sujet') ?> :=20
+        <input type=3D"text" id=3D"email_subject" name=3D"email_subject"=
 class=3D"input_text">
+        <span class=3D"notice" id=3D"email_subject_span"></span>
+    </p>
+    <p>
+        <?php echo _('Message') ?> :=20
+        <textarea style=3D"vertical-align: top;width:80rem;height:20rem;=
" name=3D"email_message" class=3D"input_text">               </textarea>
+    </p>
+    <p>
+        <input type=3D"checkbox" name=3D"email_copy"> <?php echo _("Envo=
yer copie =C3=A0 l'exp=C3=A9diteur"); ?>
+
+    </p>
+    <h2 class=3D"note"><?php echo _('Inclure dans le suivi') ?> </h2>
+    <p>
+        <input type=3D"checkbox" name=3D"save_followup"> <?php echo _("S=
auver dans le suivi"); ?>
+    </p>
+    <table>
+        <tr>
+            <td>
+                <label><?php echo _('Date'); ?> :</label>
+            </td>       =20
+            <td>
+                <?php echo $date->input(); ?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label><?php echo _('Date rappel'); ?> :</label>
+            </td>
+            <td>
+                <?php echo $remind_date->input(); ?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label>
+                    <?php echo _('Profil'); ?> :
+                </label>
+            </td>
+            <td>
+
+                <?php echo $ag_dest->input(); ?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label><?php echo _('Titre'); ?> : </label>
+            </td>
+            <td>
+                <?php echo $titre->input(); ?>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label>
+                    <?php echo _('Cat=C3=A9gorie'); ?> :
+                </label>
+            </td>
+            <td>
+                <?php echo $category->input(); ?>
+            </td>
+        </tr>
+    </table>
+
+    <p>
+        <?php
+        echo HtmlInput::submit('choice_sel', _('Ex=C3=A9cuter'));
+        ?>
+    </p>
+</form>
+<script>
+    function verify_invoicing()
+    {
+        if ($('invoice_radio').checked) {
+            if ($('email_from').value.trim() =3D=3D "") {
+                $('email_from').style.border =3D "solid 2px red";
+                $('email_from_span').innerHTML =3D " Obligatoire";
+                return false;
+            } else {
+                $('email_from_span').hide();
+                $('email_from').style.border =3D "";
+            }
+            if ($('email_subject').value.trim() =3D=3D "") {
+                $('email_subject').style.border =3D "solid 2px red";
+                $('email_subject_span').innerHTML =3D " Obligatoire";
+                return false;
+            } else {
+                $('email_subject_pan').hide();
+                $('email_subject').style.border =3D "";
+            }
+        }
+    }
+</script>
+<
\ No newline at end of file

Added: trunk/invoicing/include/invoice_send_mail_route.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/invoicing/include/invoice_send_mail_route.inc.php	             =
           (rev 0)
+++ trunk/invoicing/include/invoice_send_mail_route.inc.php	2014-03-14 16=
:56:29 UTC (rev 720)
@@ -0,0 +1,32 @@
+<?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
+$step=3DHtmlInput::default_value_request("sa",null);
+
+switch ( $step)=20
+{
+    case null:
+        require 'invoice_send_mail_input.inc.php';
+        break;
+    case 'send':
+        require 'invoice_send_mail.inc.php';
+        break;
+}
\ No newline at end of file

Modified: trunk/invoicing/include/invoicing.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/invoicing/include/invoicing.inc.php	2014-03-12 16:47:17 UTC (re=
v 719)
+++ trunk/invoicing/include/invoicing.inc.php	2014-03-14 16:56:29 UTC (re=
v 720)
@@ -21,10 +21,10 @@
 $ledger =3D new Acc_Ledger_Sold_Generate($cn, -1);
 $_GET['ledger_type'] =3D 'VEN';
 //var_dump($_GET);
-$request =3D HtmlInput::default_value_get('action', -2);
+$request =3D HtmlInput::default_value_request('action', -2);
 if ($request <> -2)
 {
-    if (!isset($_GET['sel_sale']))
+    if (!isset($_REQUEST['sel_sale']))
     {
         echo h2("Rien n'a =C3=A9t=C3=A9 choisi", 'class=3D"notice"');
     } else
@@ -41,7 +41,7 @@
                 break;
             case 3:
                 // Envoi facture par email
-                require('invoice_send_mail.inc.php');
+                require('invoice_send_mail_route.inc.php');
                 break;
         }
         exit();
@@ -84,49 +84,22 @@
     <ul style=3D"list-style-type: none">
         <li>
            =20
-            <input type=3D"radio" name=3D"action" value=3D"1"=20
-                   onclick=3D"$('invoice_div').hide();$('send_mail_div')=
.hide();">
+            <input type=3D"radio" name=3D"action" value=3D"1" >
             <?php echo _('T=C3=A9l=C3=A9charger toutes les factures') ?>
         </li>
         <li>
          =20
             <input type=3D"radio" name=3D"action" value=3D"2"=20
-                   onclick=3D"$('invoice_div').show();$('send_mail_div')=
.hide();">
+                   onclick=3D"$('invoice_div').show();">
               <?php echo _('G=C3=A9n=C3=A9rer les factures') ?>
             <div id=3D"invoice_div" style=3D"display:none">
                 <?php echo _('Document =C3=A0 g=C3=A9n=C3=A9rer'); ?> : =
<?php echo $document->input(); ?>
             </div>
         </li>
         <li>
-           =20
-            <input type=3D"radio" name=3D"action" id=3D"invoice_radio" v=
alue=3D"3"=20
-                   onclick=3D"$('invoice_div').hide();$('send_mail_div')=
.show();">
+            <input type=3D"radio" name=3D"action" id=3D"invoice_radio" v=
alue=3D"3">
             <?php echo _('Envoi des factures par email') ?>
-            <div id=3D"send_mail_div" style=3D"display:none">
-                <h2 class=3D"note"><?php echo _('Envoi uniquement =C3=A0=
 ceux ayant une adresse email et une facture')?> </h2>
-                <p>
-                    <input type=3D"checkbox" name=3D"pdf"> <?php echo _(=
'Conversion en PDF'); ?>
-                </p>
-                <p>
-                    <?php echo _('Email envoy=C3=A9 par'); ?> :
-                     <input type=3D"text" id=3D"email_from" name=3D"emai=
l_from" class=3D"input_text">
-                     <span class=3D"notice" id=3D"email_from_span"></spa=
n>
-                </p>
-               =20
-                <p>
-                    <?php echo _('Sujet')?> :=20
-                    <input type=3D"text" id=3D"email_subject" name=3D"em=
ail_subject" class=3D"input_text">
-                    <span class=3D"notice" id=3D"email_subject_span"></s=
pan>
-                </p>
-                <p>
-                    <?php echo _('Message')?> :=20
-                    <textarea style=3D"vertical-align: top;width:23%;hei=
ght:10%" name=3D"email_message" class=3D"input_text">               </tex=
tarea>
-                </p>
-                <p>
-                    <input type=3D"checkbox" name=3D"email_copy"> <?php =
echo _("Envoyer copie =C3=A0 l'exp=C3=A9diteur"); ?>
-                  =20
-                </p>
-            </div>
+          =20
         </li>
     </ul>  =20
     <p>
@@ -135,28 +108,6 @@
         ?>
     </p>
 </form>
-<script>
-    function verify_invoicing()
-    {
-        if ($('invoice_radio').checked) {
-            if ($('email_from').value.trim()=3D=3D"") {
-                $('email_from').style.border=3D"solid 2px red";
-                $('email_from_span').innerHTML=3D" Obligatoire";
-                return false;
-            } else {
-                $('email_from_span').hide();
-                $('email_from').style.border=3D"";
-            }
-            if ($('email_subject').value.trim()=3D=3D"") {
-                $('email_subject').style.border=3D"solid 2px red";
-                $('email_subject_span').innerHTML=3D" Obligatoire";
-                return false;
-            }else {
-                $('email_subject_pan').hide();
-                $('email_subject').style.border=3D"";
-            }
-        }
-    }
-</script>
+
    =20
    =20
\ 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 Mar 14 13:11:13 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOVdZ-0008M4-9L
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 13:11:13 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 17:57:30 +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.233257.1394817072.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r721 - trunk/invoicing/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, 14 Mar 2014 17:11:11 -0000

Author: danydb
Date: 2014-03-14 17:57:29 +0100 (Fri, 14 Mar 2014)
New Revision: 721

Modified:
   trunk/invoicing/include/invoice_send_mail.inc.php
Log:
Task #991 - Proposer d'ajouter la facture dans le suivi
Title in followup is the same as the subject of email if empty

Modified: trunk/invoicing/include/invoice_send_mail.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/invoicing/include/invoice_send_mail.inc.php	2014-03-14 16:56:29=
 UTC (rev 720)
+++ trunk/invoicing/include/invoice_send_mail.inc.php	2014-03-14 16:57:29=
 UTC (rev 721)
@@ -41,7 +41,7 @@
=20
 //-- Follow up
 $ag_timestamp =3D HtmlInput::default_value_post('ag_timestamp', date('d.=
m.Y'));
-$ag_title =3D HtmlInput::default_value_post('ag_title', _('Ajout=C3=A9 d=
epuis plugin'));
+$ag_title =3D HtmlInput::default_value_post('ag_title', $message);
 $ag_remind_date=3DHtmlInput::default_value_post('ag_remind_date','');
 $ag_dest=3DHtmlInput::default_value_post('ag_dest',1);
=20
@@ -49,7 +49,7 @@
     $ag_timestamp =3D date('d.m.Y');
=20
 if (trim($ag_title) =3D=3D "")
-    $ag_title =3D _("Ajout=C3=A9 depuis plugin");
+    $ag_title =3D $message;
=20
 if (isDate($ag_remind_date) =3D=3D null) {
     $ag_remind_date=3Dnull;



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


From MAILER-DAEMON Fri Mar 14 13:24:17 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOVqD-0007bx-1V
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 13:24:17 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 18:10:33 +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.233272.1394817856.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r722 - trunk/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, 14 Mar 2014 17:24:16 -0000

Author: danydb
Date: 2014-03-14 18:10:33 +0100 (Fri, 14 Mar 2014)
New Revision: 722

Modified:
   trunk/rapport_avance/include/class_rapav_listing_compute.php
   trunk/rapport_avance/include/declaration.inc.php
Log:
Task #993 - Etape & explication
Title in followup is the same as the subject of email if empty

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-03-=
14 16:57:29 UTC (rev 721)
+++ trunk/rapport_avance/include/class_rapav_listing_compute.php	2014-03-=
14 17:10:33 UTC (rev 722)
@@ -364,6 +364,18 @@
        =20
     }
     /**
+     * @brief display a button to go to next screen
+     */
+    function propose_next()
+    {
+        echo '<form method=3D"GET" action=3D"do.php" class=3D"noprint" s=
tyle=3D"display:inline">';
+        echo HtmlInput::array_to_hidden(array('ac','gDossier','plugin_co=
de','sa'), $_REQUEST);
+        echo HtmlInput::hidden('lc_id',$this->data->lc_id);
+        echo HtmlInput::submit("generate_document", "Suivant","","smallb=
utton");
+        echo '</form>';
+       =20
+    }
+    /**
      * @brief export to CSV
      */
     function to_csv()

Modified: trunk/rapport_avance/include/declaration.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/declaration.inc.php	2014-03-14 16:57:29 =
UTC (rev 721)
+++ trunk/rapport_avance/include/declaration.inc.php	2014-03-14 17:10:33 =
UTC (rev 722)
@@ -58,7 +58,7 @@
=20
     $ref_csv =3D HtmlInput::array_to_string(array('gDossier', 'plugin_co=
de', 'd_id'), $_REQUEST, 'extension.raw.php?');
     $ref_csv.=3D"&amp;act=3Dexport_decla_csv";
-    echo HtmlInput::button_anchor("Export CSV", $ref_csv, 'export_id',""=
,'small_button');
+    echo HtmlInput::button_anchor("Export CSV", $ref_csv, 'export_id', "=
", 'small_button');
     if ($decl->d_filename !=3D '' && $decl->d_step =3D=3D 0)
         echo $decl->anchor_document();
     exit();
@@ -87,42 +87,58 @@
 /**
  * Generate all the document
  */
-if ( isset($_GET['generate_document']) )
+if (isset($_GET['generate_document']))
 {
-    $listing=3Dnew RAPAV_Listing_Compute();
+    echo '<h1>' . _('Etape') . " 3 /3  </h1>";
+    $listing =3D new RAPAV_Listing_Compute();
     $listing->load($_GET['lc_id']);
-    $listing->generate($_GET['numerotation']);
-   =20
-    if ( GENERATE_PDF =3D=3D 'YES')=20
-        $listing->create_pdf();
-   =20
+    if ($listing->has_template() =3D=3D true)
+    {
+        $listing->generate($_GET['numerotation']);
+
+        if (GENERATE_PDF =3D=3D 'YES')
+            $listing->create_pdf();
+    }
+
     $listing->display(false);
-    $listing->propose_send_mail();
+    if ($listing->has_template())
+    {
+        $listing->propose_send_mail();
+    }
     $listing->propose_include_follow();
-    $listing->propose_download_all();
+    if ($listing->has_template())
+    {
+        $listing->propose_download_all();
+    }
     exit();
 }
 /**
  * Save listing now you can export them to csv and generate file if any
  */
-if ( isset($_POST['save_listing']))
+if (isset($_POST['save_listing']))
 {
-    $listing=3Dnew RAPAV_Listing_Compute();
+    echo '<h1>' . _('Etape') . " 2/3 </h1>";
+    echo h2(_("Exporter en CSV ou passer =C3=A0 l'=C3=A9tape suivante"))=
;
+    $listing =3D new RAPAV_Listing_Compute();
     $listing->load($_POST['lc_id']);
-    if ( isset ($_POST['selected_card']) )
+    if (isset($_POST['selected_card']))
     {
         $listing->keep($_POST['lc_id']);
         $listing->save_selected($_POST['selected_card']);
     }
-   =20
-  =20
+
+
     $listing->display(false);
     /**
      * Propose generate and export CSV
      */
     $listing->propose_CSV();
-    if ($listing->has_template() =3D=3D true) {
+    if ($listing->has_template() =3D=3D true)
+    {
         $listing->propose_generate();
+    } else
+    {
+        $listing->propose_next();
     }
     exit();
 }
@@ -137,13 +153,15 @@
         alert('Date invalide');
     } else
     {
+        echo '<h1>' . _('Etape') . " 1/3 </h1>";
+        echo h2(_('S=C3=A9lectionner les lignes que vous vous voulez con=
server'));
         $listing->data->setp('description', $_GET['p_description']);
         $p_listing =3D new Rapav_Listing($_GET['p_listing']);
         $listing->filter_operation($_GET['p_operation_paid']);
         $listing->compute($p_listing, $_GET['p_start'], $_GET['p_end']);
-        echo '<form class=3D"print" id=3D"'.'select_card_frm'.'" method=3D=
"POST">';
-        echo HtmlInput::hidden('lc_id',$listing->lc_id);
-        $listing->display(true,'select_card_frm');
+        echo '<form class=3D"print" id=3D"' . 'select_card_frm' . '" met=
hod=3D"POST">';
+        echo HtmlInput::hidden('lc_id', $listing->lc_id);
+        $listing->display(true, 'select_card_frm');
         echo HtmlInput::submit('save_listing', 'Sauver la s=C3=A9lection=
');
         echo '</form>';
         exit();
@@ -207,7 +225,7 @@
=20
 <div id=3D"id_rapport_div" style=3D"display: none">
     <form id=3D"declaration_form_id" method=3D"GET" onsubmit=3D"return v=
alidate()">
-        <?php echo $hidden ?>
+                    <?php echo $hidden ?>
         <input type=3D"hidden" name=3D"form" value=3D"rapport">
         <table style=3D"min-width: 40%">
             <tr>
@@ -215,7 +233,7 @@
                     D=C3=A9claration
                 </td>
                 <td>
-                    <?php echo $select->input() ?>
+<?php echo $select->input() ?>
                 </td>
             </tr>
             <tr>
@@ -242,17 +260,17 @@
                     Etape de
                 </td>
                 <td>
-                    <?php echo $istep->input() ?>
+<?php echo $istep->input() ?>
                 </td>
             </tr>
         </table>
         </p>
-        <?php echo HtmlInput::submit('compute', 'G=C3=A9n=C3=A9rer') ?>
+<?php echo HtmlInput::submit('compute', 'G=C3=A9n=C3=A9rer') ?>
     </form>
 </div>
 <div id=3D"id_listing_div" style=3D"display: none">
     <form method=3D"GET" onsubmit=3D"return validate_listing()">
-        <?php echo $hidden ?>
+                    <?php echo $hidden ?>
         <input type=3D"hidden" name=3D"form" value=3D"rapport">
=20
         <table style=3D"min-width: 40%">
@@ -261,7 +279,7 @@
                     D=C3=A9claration
                 </td>
                 <td>
-                    <?php echo $select_listing->input() ?>
+<?php echo $select_listing->input() ?>
                 </td>
             </tr>
             <tr>
@@ -288,12 +306,12 @@
                     Op=C3=A9rations
                 </td>
                 <td>
-                    <?php echo $operation_paid->input(); ?>
+<?php echo $operation_paid->input(); ?>
                 </td>
             </tr>
         </table>
         </p>
-        <?php echo HtmlInput::submit('compute_listing', 'G=C3=A9n=C3=A9r=
er') ?>
+<?php echo HtmlInput::submit('compute_listing', 'G=C3=A9n=C3=A9rer') ?>
     </form>
 </div>
 <script charset=3D"UTF8" lang=3D"javascript">



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


From MAILER-DAEMON Fri Mar 14 13:30:28 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOVwC-0007fa-Jt
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 13:30:28 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 18:16: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.233279.1394818227.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r723 - trunk/rapport_avance/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, 14 Mar 2014 17:30:27 -0000

Author: danydb
Date: 2014-03-14 18:16:44 +0100 (Fri, 14 Mar 2014)
New Revision: 723

Modified:
   trunk/rapport_avance/include/template/include_follow.php
Log:
Task #992 - Permettre d'enregistrer dans Suivi
Let record in Follow up even if there is no generated document

Modified: trunk/rapport_avance/include/template/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/include/template/include_follow.php	2014-03-14 1=
7:10:33 UTC (rev 722)
+++ trunk/rapport_avance/include/template/include_follow.php	2014-03-14 1=
7:16:44 UTC (rev 723)
@@ -47,16 +47,12 @@
                 <?php echo $category->input(); ?>
             </td>
         </tr>
-        <tr>
-            <td>
-                <label>Commentaire</label>
-            </td>
-            <td>
-                <?php echo $desc->input(); ?>
-            </td>
-        </tr>
     </table>
     <p>
+                <label style=3D"vertical-align: top">Commentaire</label>
+    </p>
+                <?php echo $desc->input(); ?>
+    <p>
         <?php
         echo HtmlInput::array_to_hidden(array('gDossier', 'plugin_code',=
 'ac', 'lc_id'), $_REQUEST);
         echo HtmlInput::hidden('act', 'include_follow_save');



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


From MAILER-DAEMON Fri Mar 14 15:05:51 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOXQV-0006uV-9g
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 15:05:51 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 19:52: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.233351.1394823950.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r724 - trunk/invoicing/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, 14 Mar 2014 19:05:49 -0000

Author: danydb
Date: 2014-03-14 19:52:01 +0100 (Fri, 14 Mar 2014)
New Revision: 724

Modified:
   trunk/invoicing/include/invoice_generate.inc.php
Log:
If there is template, exit

Modified: trunk/invoicing/include/invoice_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
--- trunk/invoicing/include/invoice_generate.inc.php	2014-03-14 17:16:44 =
UTC (rev 723)
+++ trunk/invoicing/include/invoice_generate.inc.php	2014-03-14 18:52:01 =
UTC (rev 724)
@@ -48,11 +48,17 @@
         $op_sale =3D $operation->get_quant();
         $generate =3D new Acc_Ledger_Sold_Generate($cn, $op_sale->det->j=
r_def_id);
         $array =3D $generate->convert_to_array($op_sale);
+        $document=3DHtmlInput::default_value_get("document",-1);
+        if ($document <> -1 ){
         ?>
         <li>
             <?php echo $generate->create_document($array, $_GET['documen=
t']); ?>
         </li>
         <?php
+        } else {
+            echo _('Aucun mod=C3=A8le');
+            exit();
+        }
     }
     ?>
 </ol>



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


From MAILER-DAEMON Fri Mar 14 15:10:48 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOXVI-00054Y-JI
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 15:10:48 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 19:57: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.233354.1394824247.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5674 - phpcompta/tags
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, 14 Mar 2014 19:10:46 -0000

Author: danydb
Date: 2014-03-14 19:57:03 +0100 (Fri, 14 Mar 2014)
New Revision: 5674

Added:
   phpcompta/tags/rel672/
Log:
New release


Copied: phpcompta/tags/rel672 (from rev 5673, phpcompta/trunk)



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


From MAILER-DAEMON Fri Mar 14 15:11:33 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOXW1-0005fU-Bm
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 15:11:33 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 19:57:50 +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.233355.1394824293.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r5675 - phpcompta/tags
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, 14 Mar 2014 19:11:32 -0000

Author: danydb
Date: 2014-03-14 19:57:50 +0100 (Fri, 14 Mar 2014)
New Revision: 5675

Removed:
   phpcompta/tags/rel672/
Log:
Error




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


From MAILER-DAEMON Fri Mar 14 15:12:19 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOXWl-00060g-Sm
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 15:12:19 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 19:58: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.233356.1394824339.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r725 - tag/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: Fri, 14 Mar 2014 19:12:18 -0000

Author: danydb
Date: 2014-03-14 19:58:36 +0100 (Fri, 14 Mar 2014)
New Revision: 725

Added:
   tag/rel672/trunk/
Log:
New release for NOALYSS


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



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


From MAILER-DAEMON Fri Mar 14 15:13:20 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WOXXk-0006ie-7i
	for mharc-phpcompta-dev@gnu.org; Fri, 14 Mar 2014 15:13:20 -0400
To: phpcompta-dev@nongnu.org
Content-Type: text/plain; charset=UTF-8
Date: Fri, 14 Mar 2014 19:59:33 +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.233357.1394824399.10747.phpcompta-dev@nongnu.org>
From: phpcompta-dev@nongnu.org
Subject: [Phpcompta-dev] r726 - 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: Fri, 14 Mar 2014 19:13:19 -0000

Author: danydb
Date: 2014-03-14 19:59:33 +0100 (Fri, 14 Mar 2014)
New Revision: 726

Added:
   tag/rel674/
Log:
New release for NOALYSS


Copied: tag/rel674 (from rev 725, trunk)



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


