From 57bc27e928052bf6ddee506da78382cde56b9674 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 28 Nov 2004 16:03:12 +0000
Subject: [PATCH] =?UTF-8?q?Trad:=20Quelques=20traductions=20de=20plus=20Qu?=
 =?UTF-8?q?al:=20D=E9but=20de=20mutualisation=20du=20code=20des=20formulai?=
 =?UTF-8?q?res=20d'envoi=20de=20mail.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/fiche.php  | 15 ++++++++-------
 htdocs/comm/propal.php | 26 ++++++++++++++++++--------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index bcbbb538407..f7234c67951 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -267,7 +267,7 @@ if ($_socid > 0)
      *
      */
     $var = true;
-    print '<table class="noborder" width="100%" cellspacing="0" cellpadding="1">';
+    print '<table class="border" width="100%">';
     $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref, p.remise, ".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid";
     $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id";
     $sql .= " AND s.idp = ".$objsoc->id." ORDER BY p.datep DESC";
@@ -290,7 +290,7 @@ if ($_socid > 0)
 	      {
 		print " <b>&gt; 15 jours</b>";
 	      }
-	    print "</td><td align=\"right\">".strftime("%d %B %Y",$objp->dp)."</TD>\n";
+	    print "</td><td align=\"right\">".strftime("%d %B %Y",$objp->dp)."</td>\n";
 	    print '<td align="right" width="120">'.price($objp->price).'</td>';
 	    print '<td width="100" align="center">'.$objp->statut.'</td></tr>';
 	    $var=!$var;
@@ -299,13 +299,14 @@ if ($_socid > 0)
 	$db->free();
       }
     else {
-        print "Erreur ".$db->error()."<br>".$sql;    
+        dolibarr_print_error($db);
     }
+
     /*
      * Commandes
      *
      */
-    print '<table class="border" width="100%" cellspacing="0" cellpadding="1">';
+    print '<table class="border" width="100%">';
     $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.total_ht, p.ref, ".$db->pdate("p.date_commande")." as dp";
     $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as p WHERE p.fk_soc = s.idp ";
     $sql .= " AND s.idp = $objsoc->id ORDER BY p.date_commande DESC";
@@ -364,7 +365,7 @@ if ($_socid > 0)
       $db->free();
       print "</table>";
     } else {
-      print $db->error();
+        dolibarr_print_error($db);
     }
 
     /*
@@ -563,7 +564,7 @@ if ($_socid > 0)
 
 	$db->free();
       } else {
-	print $db->error();
+        dolibarr_print_error($db);
       }
       print "</td></tr></table>";
 
@@ -658,7 +659,7 @@ if ($_socid > 0)
 	}
       else
 	{
-	  print $db->error();
+        dolibarr_print_error($db);
 	}
       print "</td></tr></table>";
       /*
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index d4c17e9261f..874dead560a 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -504,7 +504,7 @@ if ($_GET["propalid"])
 	      print '<td>&nbsp;</td>';
 	      print '<td><input type="text" size="28" name="np_desc"></td>';
 	      print '<td align="center">';
-	      print $html->select_tva("np_tva_tx") . '</td>';
+	      print $html->select_tva("np_tva_tx",$conf->defaulttx) . '</td>';
 	      print '<td align="center"><input type="text" size="3" value="1" name="np_qty"></td>';
 	      print '<td align="center"><input type="text" size="3" value="'.$societe->remise_client.'" name="np_remise"> %</td>';
 	      print '<td align="right"><input type="text" size="6" name="np_price"></td>';
@@ -794,18 +794,28 @@ if ($_GET["propalid"])
 	      print '<input type="hidden" name="max_file_size" value="2000000">';
 
 	      print_titre("Envoyer la propale par mail");
-	      print '<table cellspacing="0" border="1" cellpadding="3">';
-	      print "<tr><td>Destinataire</td>";
-	      print "<td  colspan=\"6\" align=\"right\"><input size=\"50\" name=\"sendto\" value=\"" . ucfirst(strtolower($obj->firstname)) . " " .  ucfirst(strtolower($obj->name)) . " <$obj->email>\"></td></tr>";
+          $form=new Form($db);
+
+	      // Formulaire envoi mail
+	      print '<table class="border" width="100%">';
+
+	      // Destinataire
+	      print "<tr><td width=\"180\">Destinataire</td>";
+	      print "<td colspan=\"6\" align=\"left\"><input size=\"50\" name=\"sendto\" value=\"" . ucfirst(strtolower($obj->firstname)) . " " .  ucfirst(strtolower($obj->name)) . " <$obj->email>\"></td></tr>";
+
+          // CC
 	      print '<tr><td>Copie à</td>';
-	      print '<td colspan="6" align="right"><input size="50" name="sendtocc"></td></tr>';
+	      print '<td colspan="6" align="left"><input size="50" name="sendtocc"></td></tr>';
+
+          // Sender
 	      print "<tr><td>Expediteur</td><td colspan=\"5\">$from_name</td><td>$from_mail</td></tr>";
 	      print "<tr><td>Reply-to</td><td colspan=\"5\">$replytoname</td>";
 	      print "<td>$replytomail</td></tr>";
-	      print "<tr><td valign=\"top\">Joindre un fichier en plus de la propale<br>(conditions générales de ventes ...)</td><td colspan=\"6\"><input type=\"file\" name=\"addedfile\" size=\"40\" maxlength=\"80\"></td></tr>";
-	      print "<tr><td valign=\"top\">Message</td><td colspan=\"6\"><textarea rows=\"5\" cols=\"40\" name=\"message\">$message</textarea></td></tr>";
-	      
+
 	      print "</table>";
+
+          $form->mail_topicmessagefile(0,1,1,$message);
+
 	      print "<input type=\"submit\" value=\"".$langs->trans("Send")."\">";
 	      print "</form>";
 	    }