From be1493c0092770c554d7b64e75c4bcdb736bb916 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 26 Feb 2011 02:17:29 +0000
Subject: [PATCH] New: Autofill check sender if type is cheque

---
 htdocs/adherents/card_subscriptions.php | 26 ++++++++++++++++++-------
 htdocs/adherents/fiche.php              | 15 +++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index d602b4f86ef..d19fccc87f1 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -329,13 +329,14 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
                 {
                     require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
                     require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
+                    require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
                     // Creation de la ligne paiement
                     $amounts[$invoice->id] = price2num($cotisation);
                     $paiement = new Paiement($db);
                     $paiement->datepaye     = $datecotisation;
                     $paiement->amounts      = $amounts;
-                    $paiement->paiementid   = $operation;
+                    $paiement->paiementid   = dol_getIdFromCode($db,$operation,'paiement');
                     $paiement->num_paiement = $num_chq;
                     $paiement->note         = $label;
 
@@ -442,12 +443,12 @@ if ($rowid)
     print $html->showrefnav($adh,'rowid');
     print '</td></tr>';
 
-    // Nom
-    print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$adh->nom.'&nbsp;</td>';
+    // Name
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$adh->lastname.'&nbsp;</td>';
     print '</tr>';
 
-    // Prenom
-    print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$adh->prenom.'&nbsp;</td>';
+    // Firstname
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$adh->firstname.'&nbsp;</td>';
     print '</tr>';
 
     // Login
@@ -679,7 +680,8 @@ if ($rowid)
         {
             print "\n".'<script type="text/javascript" language="javascript">';
             print 'jQuery(document).ready(function () {
-                        jQuery(".bankswitchclass").'.($bankdirect||$bankviainvoice?'show()':'hide()').';
+                        jQuery(".bankswitchclass").'.($bankdirect||$bankviainvoice||in_array(GETPOST('paymentsave'),array('bankdirect','bankviainvoice'))?'show()':'hide()').';
+                        jQuery(".bankswitchclass2").'.($bankdirect||$bankviainvoice||in_array(GETPOST('paymentsave'),array('bankdirect','bankviainvoice'))?'show()':'hide()').';
                         jQuery("#none").click(function() {
                             jQuery(".bankswitchclass").hide();
                             jQuery(".bankswitchclass2").hide();
@@ -696,6 +698,14 @@ if ($rowid)
                             jQuery(".bankswitchclass").hide();
                             jQuery(".bankswitchclass2").show();
                         });
+                        jQuery("#selectoperation").change(function() {
+                            code=jQuery("#selectoperation option:selected").val();
+                            if (code == \'CHQ\')
+                            {
+                                jQuery(\'#fieldchqemetteur\').val(jQuery(\'#memberlabel\').val());
+                                jQuery(\'#fieldchqemetteur\').val(jQuery(\'#memberlabel\').val());
+                            }
+                        });
                         ';
             if (GETPOST('paymentsave')) print 'jQuery("#'.GETPOST('paymentsave').'").attr(\'checked\',true);';
     	    print '});';
@@ -706,6 +716,8 @@ if ($rowid)
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         print '<input type="hidden" name="action" value="cotisation">';
         print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+        print '<input type="hidden" name="memberlabel" id="memberlabel" value="'.dol_escape_htmltag($adh->getFullName()).'">';
+        print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($company->name).'">';
         print "<table class=\"border\" width=\"100%\">\n";
 
         $today=mktime();
@@ -804,7 +816,7 @@ if ($rowid)
 
                 // Payment mode
                 print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-                $html->select_types_paiements($_POST["operation"],'operation');
+                $html->select_types_paiements($_POST["operation"],'operation','',2);
                 print "</td></tr>\n";
 
                 print '<tr class="bankswitchclass2"><td>'.$langs->trans('Numero');
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index a662d4241d6..7fe6e2b4885 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -157,12 +157,12 @@ if ($_POST["action"] == 'confirm_create_user' && $_POST["confirm"] == 'yes' && $
 		if ($result < 0)
 		{
 			$langs->load("errors");
-			$msg=$langs->trans($nuser->error);
+			$errmsg=$langs->trans($nuser->error);
 		}
 	}
 	else
 	{
-		$msg=$adh->error;
+		$errmsg=$adh->error;
 	}
 }
 
@@ -178,12 +178,13 @@ if ($_POST["action"] == 'confirm_create_thirdparty' && $_POST["confirm"] == 'yes
 		if ($result < 0)
 		{
 			$langs->load("errors");
-			$msg=$langs->trans($company->error);
+			$errmsg=$langs->trans($company->error);
+			$errmsgs=$company->errors;
 		}
 	}
 	else
 	{
-		$msg=$adh->error;
+		$errmsg=$adh->error;
 	}
 }
 
@@ -471,7 +472,7 @@ if ($user->rights->adherent->supprimer && $_REQUEST["action"] == 'confirm_delete
     }
     else
     {
-    	$mesg=$adh->error;
+    	$errmesg=$adh->error;
     }
 }
 
@@ -613,8 +614,8 @@ if ($action == 'create')
 
     print_fiche_titre($langs->trans("NewMember"));
 
-    if ($errmsg) print '<div class="error">'.$errmsg.'</div>';
-    if ($mesg) print '<div class="ok">'.$mesg.'</div>';
+    dol_htmloutput_errors($errmsg,$errmsgs);
+    dol_htmloutput_mesg($mesg,$mesgs);
 
     if ($conf->use_javascript_ajax)
     {