lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Corrections diverses

Browse Source
This commit is contained in:
Laurent Destailleur 2006-11-26 21:17:26 +00:00
parent 3fc367054f
commit c52561dd85
2 changed files with 64 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/adherents/adherent.class.php
View File

@ -790,12 +790,11 @@ class Adherent
$acct=new Account($this->db,$accountid); $acct=new Account($this->db,$accountid);
$dateop=strftime("%Y%m%d",time()); $dateop=strftime("%Y%m%d",time());
$amount=$cotisation;
$insertid=$acct->addline($dateop, $operation, $label, $amount, $num_chq, '', $user); $insertid=$acct->addline($dateop, $operation, $label, $montant, $num_chq, '', $user);
if ($insertid > 0) if ($insertid > 0)
{ {
$inserturlid=$acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/fiche.php?rowid=', $adh->getFullname(), 'member'); $inserturlid=$acct->add_url_line($insertid, $this->id, DOL_URL_ROOT.'/adherents/fiche.php?rowid=', $this->getFullname(), 'member');
if ($inserturlid > 0) if ($inserturlid > 0)
{ {
// Met a jour la table cotisation // Met a jour la table cotisation

83
htdocs/adherents/fiche.php
View File

@ -73,7 +73,7 @@ if ($_POST["action"] == 'cotisation')
$reday=$_POST["reday"]; $reday=$_POST["reday"];
$remonth=$_POST["remonth"]; $remonth=$_POST["remonth"];
$reyear=$_POST["reyear"]; $reyear=$_POST["reyear"];
$datecotisation=@mktime(12, 0 , 0, $remonth, $reday, $reyear); $datecotisation=@mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$cotisation=$_POST["cotisation"]; $cotisation=$_POST["cotisation"];
$accountid=$_POST["accountid"]; $accountid=$_POST["accountid"];
@ -88,12 +88,19 @@ if ($_POST["action"] == 'cotisation')
$action=''; $action='';
} }
if (! $cotisation > 0) if (! $_POST["cotisation"] > 0)
{ {
$errmsg=$langs->trans("ErrorFieldRequired",$langs->trans("Amount")); $errmsg=$langs->trans("ErrorFieldRequired",$langs->trans("Amount"));
$action=''; $action='';
} }
if ($conf->global->ADHERENT_BANK_USE)
{
if (! $_POST["accountid"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->trans("FinancialAccount"));
if (! $_POST["operation"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->trans("PaymentMode"));
if (! $_POST["label"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->trans("Label"));
if ($errmsg) $action='';
}
if ($action) if ($action)
{ {
$db->begin(); $db->begin();
@ -109,6 +116,12 @@ if ($_POST["action"] == 'cotisation')
{ {
$adh->send_an_email($adh->email,$conf->global->ADHERENT_MAIL_COTIS,$conf->global->ADHERENT_MAIL_COTIS_SUBJECT); $adh->send_an_email($adh->email,$conf->global->ADHERENT_MAIL_COTIS,$conf->global->ADHERENT_MAIL_COTIS_SUBJECT);
} }
$_POST["cotisation"]='';
$_POST["accountid"]='';
$_POST["operation"]='';
$_POST["label"]='';
$_POST["num_chq"]='';
} }
else else
{ {
@ -616,7 +629,8 @@ if ($action == 'create')
// Type // Type
print '<tr><td>'.$langs->trans("MemberType").'*</td><td>'; print '<tr><td>'.$langs->trans("MemberType").'*</td><td>';
$listetype=$adht->liste_array(); $listetype=$adht->liste_array();
if (sizeof($listetype)) { if (sizeof($listetype))
{
$htmls->select_array("type", $listetype, $typeid); $htmls->select_array("type", $listetype, $typeid);
} else { } else {
print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>'; print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
@ -664,7 +678,8 @@ if ($action == 'create')
// Url photo // Url photo
print '<tr><td>Url photo</td><td><input type="text" name="photo" size="40"></td></tr>'; print '<tr><td>Url photo</td><td><input type="text" name="photo" size="40"></td></tr>';
foreach($adho->attribute_label as $key=>$value){ foreach($adho->attribute_label as $key=>$value)
{
print "<tr><td>$value</td><td><input type=\"text\" name=\"options_$key\" size=\"40\"></td></tr>\n"; print "<tr><td>$value</td><td><input type=\"text\" name=\"options_$key\" size=\"40\"></td></tr>\n";
} }
@ -961,7 +976,7 @@ if ($rowid && $action != 'edit')
print '<table border=0 width="100%">'; print '<table border=0 width="100%">';
print '<tr>'; print '<tr>';
print '<td valign="top">'; print '<td valign="top" width="50%">';
/* /*
@ -969,14 +984,20 @@ if ($rowid && $action != 'edit')
* *
*/ */
$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,"; $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,";
$sql.= " c.rowid as crowid, c.cotisation, ".$db->pdate("c.dateadh")." as dateadh"; $sql.= " c.rowid as crowid, c.cotisation, ".$db->pdate("c.dateadh")." as dateadh, c.fk_bank,";
$sql.= " ba.rowid as baid, ba.label, ba.bank";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."cotisation as c";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
$sql.= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid; $sql.= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid;
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $cotisationstatic=new Cotisation($db);
$accountstatic=new Account($db);
$num = $db->num_rows($result);
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">\n"; print "<table class=\"noborder\" width=\"100%\">\n";
@ -984,7 +1005,11 @@ if ($rowid && $action != 'edit')
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td>'; print '<td>'.$langs->trans("Ref").'</td>';
print '<td>'.$langs->trans("DateSubscription").'</td>'; print '<td>'.$langs->trans("DateSubscription").'</td>';
print "<td align=\"right\">".$langs->trans("Amount")."</td>\n"; print '<td align="right">'.$langs->trans("Amount").'</td>';
if ($conf->global->ADHERENT_BANK_USE)
{
print '<td align="right">'.$langs->trans("Account").'</td>';
}
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
@ -993,12 +1018,26 @@ if ($rowid && $action != 'edit')
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
$cotisation=new Cotisation($db); $cotisationstatic->ref=$objp->crowid;
$cotisation->ref=$objp->crowid; $cotisationstatic->id=$objp->crowid;
$cotisation->id=$objp->crowid; print '<td>'.$cotisationstatic->getNomUrl(1).'</td>';
print '<td>'.$cotisation->getNomUrl(1).'</td>';
print "<td>".dolibarr_print_date($objp->dateadh)."</td>\n"; print "<td>".dolibarr_print_date($objp->dateadh)."</td>\n";
print '<td align="right">'.price($objp->cotisation).'</td>'; print '<td align="right">'.price($objp->cotisation).'</td>';
if ($conf->global->ADHERENT_BANK_USE)
{
print '<td align="right">';
if ($objp->fk_bank)
{
$accountstatic->label=$objp->label;
$accountstatic->id=$objp->baid;
print $accountstatic->getNomUrl(1);
}
else
{
print '&nbsp;';
}
print '</td>';
}
print "</tr>"; print "</tr>";
$i++; $i++;
} }
@ -1009,7 +1048,7 @@ if ($rowid && $action != 'edit')
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print '</td><td>'; print '</td><td valign="top">';
/* /*
@ -1018,14 +1057,15 @@ if ($rowid && $action != 'edit')
if ($user->rights->adherent->cotisation->creer) if ($user->rights->adherent->cotisation->creer)
{ {
print "\n\n<!-- Form add subscription -->\n"; print "\n\n<!-- Form add subscription -->\n";
print '<form name="cotisation" method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form name="cotisation" method="post" action="'.$_SERVER["PHP_SELF"].'">';
print "<table class=\"border\" width=\"100%\">\n"; print "<table class=\"border\" width=\"100%\">\n";
print '<tr><td width="15%">'.$langs->trans("SubscriptionEndDate"); print '<tr><td>'.$langs->trans("SubscriptionEndDate");
print '<input type="hidden" name="action" value="cotisation">'; print '<input type="hidden" name="action" value="cotisation">';
print '<input type="hidden" name="rowid" value="'.$rowid.'">'; print '<input type="hidden" name="rowid" value="'.$rowid.'">';
print '</td>'; print '</td>';
print '<td width="35%">'; print '<td>';
if ($adh->datefin) if ($adh->datefin)
{ {
if ($adh->datefin < time()) if ($adh->datefin < time())
@ -1049,7 +1089,7 @@ if ($rowid && $action != 'edit')
print '<tr><td>'.$langs->trans("DateSubscription").'</td><td>'; print '<tr><td>'.$langs->trans("DateSubscription").'</td><td>';
if ($adh->datefin > 0) if ($adh->datefin > 0)
{ {
$html->select_date($adh->datefin + (3600*24),'','','','',"cotisation"); $html->select_date(dolibarr_time_plus_duree($adh->datefin,1,'d'),'','','','',"cotisation");
} }
else else
{ {
@ -1058,20 +1098,20 @@ if ($rowid && $action != 'edit')
print "</td></tr>"; print "</td></tr>";
print '<tr><td>'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<tr><td>'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.$_POST["cotisation"].'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
if ($conf->global->ADHERENT_BANK_USE) if ($conf->global->ADHERENT_BANK_USE)
{ {
print '<tr><td>'.$langs->trans("PaymentMode").'</td><td>'; print '<tr><td>'.$langs->trans("PaymentMode").'</td><td>';
$html->select_types_paiements('','operation'); $html->select_types_paiements($_POST["operation"],'operation');
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td>'.$langs->trans("FinancialAccount").'</td><td>'; print '<tr><td>'.$langs->trans("FinancialAccount").'</td><td>';
$html->select_comptes('','accountid'); $html->select_comptes($_POST["accountid"],'accountid',0,'',1);
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td>'.$langs->trans("Numero").'</td><td>'; print '<tr><td>'.$langs->trans("Numero").'</td><td>';
print '<input name="num_chq" type="text" size="8">'; print '<input name="num_chq" type="text" size="8" value="'.$_POST["num_chq"].'">';
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td>'.$langs->trans("Label").'</td>'; print '<tr><td>'.$langs->trans("Label").'</td>';
@ -1083,6 +1123,7 @@ if ($rowid && $action != 'edit')
print '</table>'; print '</table>';
print '</form>'; print '</form>';
print "\n<!-- End form subscription -->\n\n"; print "\n<!-- End form subscription -->\n\n";
} }