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

Mutualize some code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-08 23:50:52 +00:00
parent 5d1572a146
commit aec5e4ab52
7 changed files with 468 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

544
htdocs/adherents/card_subscriptions.php
View File

@ -165,93 +165,93 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
$langs->load("banks"); $langs->load("banks");
$result=$adh->fetch($rowid); $result=$adh->fetch($rowid);
$result=$adht->fetch($adh->typeid); $result=$adht->fetch($adh->typeid);
// Subscription informations // Subscription informations
$datecotisation=0; $datecotisation=0;
$datesubend=0; $datesubend=0;
if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"]) if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"])
{ {
$datecotisation=dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); $datecotisation=dol_mktime(0, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
} }
if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"]) if ($_POST["endyear"] && $_POST["endmonth"] && $_POST["endday"])
{ {
$datesubend=dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); $datesubend=dol_mktime(0, 0, 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
} }
$cotisation=$_POST["cotisation"]; // Amount of subscription $cotisation=$_POST["cotisation"]; // Amount of subscription
$label=$_POST["label"]; $label=$_POST["label"];
if (! $datecotisation) if (! $datecotisation)
{ {
$error++; $error++;
$errmsg=$langs->trans("BadDateFormat"); $errmsg=$langs->trans("BadDateFormat");
$action='addsubscription'; $action='addsubscription';
} }
if (! $datesubend) if (! $datesubend)
{ {
$datesubend=dol_time_plus_duree(dol_time_plus_duree($datecotisation,$defaultdelay,$defaultdelayunit),-1,'d'); $datesubend=dol_time_plus_duree(dol_time_plus_duree($datecotisation,$defaultdelay,$defaultdelayunit),-1,'d');
} }
// Payment informations // Payment informations
$accountid=$_POST["accountid"]; $accountid=$_POST["accountid"];
$operation=$_POST["operation"]; // Payment mode $operation=$_POST["operation"]; // Payment mode
$num_chq=$_POST["num_chq"]; $num_chq=$_POST["num_chq"];
$emetteur_nom=$_POST["chqemetteur"]; $emetteur_nom=$_POST["chqemetteur"];
$emetteur_banque=$_POST["chqbank"]; $emetteur_banque=$_POST["chqbank"];
$option=$_POST["paymentsave"]; $option=$_POST["paymentsave"];
if (empty($option)) $option='none'; if (empty($option)) $option='none';
// Check if a payment is mandatory or not // Check if a payment is mandatory or not
if (! $error && $adht->cotisation) // Type adherent soumis a cotisation if (! $error && $adht->cotisation) // Type adherent soumis a cotisation
{ {
if (! is_numeric($_POST["cotisation"])) if (! is_numeric($_POST["cotisation"]))
{ {
// If field is '' or not a numeric value // If field is '' or not a numeric value
$errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")); $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount"));
$error++; $error++;
$action='addsubscription'; $action='addsubscription';
} }
else else
{ {
if ($conf->banque->enabled && $_POST["paymentsave"] != 'none') if ($conf->banque->enabled && $_POST["paymentsave"] != 'none')
{ {
if ($_POST["cotisation"]) if ($_POST["cotisation"])
{ {
if (! $_POST["label"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")); if (! $_POST["label"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
if (! $_POST["operation"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")); if (! $_POST["operation"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode"));
if (! $_POST["accountid"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("FinancialAccount")); if (! $_POST["accountid"]) $errmsg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("FinancialAccount"));
} }
else else
{ {
if ($_POST["accountid"]) $errmsg=$langs->trans("ErrorDoNotProvideAccountsIfNullAmount"); if ($_POST["accountid"]) $errmsg=$langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
} }
if ($errmsg) $action='addsubscription'; if ($errmsg) $action='addsubscription';
} }
} }
} }
if (! $error && $action=='cotisation') if (! $error && $action=='cotisation')
{ {
$db->begin(); $db->begin();
$crowid=$adh->cotisation($datecotisation, $cotisation, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend, $option); $crowid=$adh->cotisation($datecotisation, $cotisation, $accountid, $operation, $label, $num_chq, $emetteur_nom, $emetteur_banque, $datesubend, $option);
if ($crowid <= 0) if ($crowid <= 0)
{ {
$error++; $error++;
$errmsg=$adh->error; $errmsg=$adh->error;
} }
if (! $error) if (! $error)
{ {
if ($option == 'bankviainvoice' || $option == 'invoiceonly') if ($option == 'bankviainvoice' || $option == 'invoiceonly')
{ {
// If option choosed, we create invoice // If option choosed, we create invoice
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/paymentterm.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/paymentterm.class.php");
$invoice=new Facture($db); $invoice=new Facture($db);
$customer=new Societe($db); $customer=new Societe($db);
$result=$customer->fetch($adh->fk_soc); $result=$customer->fetch($adh->fk_soc);
if ($result <= 0) if ($result <= 0)
@ -265,13 +265,13 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
$invoice->cond_reglement_id=$customer->cond_reglement_id; $invoice->cond_reglement_id=$customer->cond_reglement_id;
if (empty($invoice->cond_reglement_id)) if (empty($invoice->cond_reglement_id))
{ {
$paymenttermstatic=new PaymentTerm($db); $paymenttermstatic=new PaymentTerm($db);
$invoice->cond_reglement_id=$paymenttermstatic->getDefaultId(); $invoice->cond_reglement_id=$paymenttermstatic->getDefaultId();
if (empty($invoice->cond_reglement_id)) if (empty($invoice->cond_reglement_id))
{ {
$error++; $error++;
$errmsg='ErrorNoPaymentTermRECEPFound'; $errmsg='ErrorNoPaymentTermRECEPFound';
} }
} }
$invoice->socid=$adh->fk_soc; $invoice->socid=$adh->fk_soc;
$invoice->date=$datecotisation; $invoice->date=$datecotisation;
@ -294,32 +294,60 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
$error++; $error++;
} }
// Validate invoice
$result=$invoice->validate($user); $result=$invoice->validate($user);
if ($option == 'bankviainvoice') if ($option == 'bankviainvoice')
{ {
// Now we add payment // Now we add payment
// TODO require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.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->num_paiement = $num_chq;
$paiement->note = $label;
} if (! $error)
} {
} $paiement_id = $paiement->create($user);
if (! $paiement_id > 0)
{
$errmsg=$paiement->error;
$error++;
}
}
if (! $error) if (! $error)
{ {
$db->commit(); $result=$paiement->addLinkInvoiceBank($user,'(SubscriptionPayment)',$accountid,$emetteur_nom,$emetteur_banque);
} if (! $result > 0)
else {
{ $errmsg=$paiement->error;
$db->rollback(); $error++;
$errmsg=$adh->error; }
$action = 'addsubscription'; }
} }
}
}
// Send email if (! $error)
if (! $error) {
{ $db->commit();
}
else
{
$db->rollback();
$action = 'addsubscription';
}
// Send email
if (! $error)
{
// Send confirmation Email // Send confirmation Email
if ($adh->email && $_POST["sendmail"]) if ($adh->email && $_POST["sendmail"])
{ {
@ -335,8 +363,8 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio
$_POST["operation"]=''; $_POST["operation"]='';
$_POST["label"]=''; $_POST["label"]='';
$_POST["num_chq"]=''; $_POST["num_chq"]='';
} }
} }
} }
@ -464,10 +492,10 @@ if ($rowid)
if ($_GET['action'] == 'editlogin') if ($_GET['action'] == 'editlogin')
{ {
/*$include=array(); /*$include=array();
if (empty($user->rights->user->user->creer)) // If can edit only itself user, we can link to itself only if (empty($user->rights->user->user->creer)) // If can edit only itself user, we can link to itself only
{ {
$include=array($adh->user_id,$user->id); $include=array($adh->user_id,$user->id);
}*/ }*/
print $html->form_users($_SERVER['PHP_SELF'].'?rowid='.$adh->id,$adh->user_id,'userid',''); print $html->form_users($_SERVER['PHP_SELF'].'?rowid='.$adh->id,$adh->user_id,'userid','');
} }
else else
@ -488,12 +516,12 @@ if ($rowid)
if ($errmsg) if ($errmsg)
{ {
if (preg_match('/^Error/i',$errmsg)) if (preg_match('/^Error/i',$errmsg))
{ {
$langs->load("errors"); $langs->load("errors");
$errmsg=$langs->trans($errmsg); $errmsg=$langs->trans($errmsg);
} }
print '<div class="error">'.$errmsg.'</div>'."\n"; print '<div class="error">'.$errmsg.'</div>'."\n";
} }
@ -504,18 +532,18 @@ if ($rowid)
// Lien nouvelle cotisation si non brouillon et non resilie // Lien nouvelle cotisation si non brouillon et non resilie
if ($user->rights->adherent->cotisation->creer) if ($user->rights->adherent->cotisation->creer)
{ {
if ($action != 'addsubscription') if ($action != 'addsubscription')
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($adh->statut > 0) print "<a class=\"butAction\" href=\"card_subscriptions.php?rowid=$rowid&action=addsubscription\">".$langs->trans("AddSubscription")."</a>"; if ($adh->statut > 0) print "<a class=\"butAction\" href=\"card_subscriptions.php?rowid=$rowid&action=addsubscription\">".$langs->trans("AddSubscription")."</a>";
else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a>'; else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("AddSubscription").'</a>';
print "<br>\n"; print "<br>\n";
print '</div>'; print '</div>';
print '<br>'; print '<br>';
} }
} }
@ -539,60 +567,60 @@ if ($rowid)
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$cotisationstatic=new Cotisation($db); $cotisationstatic=new Cotisation($db);
$accountstatic=new Account($db); $accountstatic=new Account($db);
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">\n"; print "<table class=\"noborder\" width=\"100%\">\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Ref").'</td>'; print '<td>'.$langs->trans("Ref").'</td>';
print '<td align="center">'.$langs->trans("DateSubscription").'</td>'; print '<td align="center">'.$langs->trans("DateSubscription").'</td>';
print '<td align="center">'.$langs->trans("DateEnd").'</td>'; print '<td align="center">'.$langs->trans("DateEnd").'</td>';
print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>';
if ($conf->banque->enabled) if ($conf->banque->enabled)
{ {
print '<td align="right">'.$langs->trans("Account").'</td>'; print '<td align="right">'.$langs->trans("Account").'</td>';
} }
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
$cotisationstatic->ref=$objp->crowid; $cotisationstatic->ref=$objp->crowid;
$cotisationstatic->id=$objp->crowid; $cotisationstatic->id=$objp->crowid;
print '<td>'.$cotisationstatic->getNomUrl(1).'</td>'; print '<td>'.$cotisationstatic->getNomUrl(1).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($objp->dateadh),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($objp->dateadh),'day')."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($objp->datef),'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($objp->datef),'day')."</td>\n";
print '<td align="right">'.price($objp->cotisation).'</td>'; print '<td align="right">'.price($objp->cotisation).'</td>';
if ($conf->banque->enabled) if ($conf->banque->enabled)
{ {
print '<td align="right">'; print '<td align="right">';
if ($objp->bid) if ($objp->bid)
{ {
$accountstatic->label=$objp->label; $accountstatic->label=$objp->label;
$accountstatic->id=$objp->baid; $accountstatic->id=$objp->baid;
print $accountstatic->getNomUrl(1); print $accountstatic->getNomUrl(1);
} }
else else
{ {
print '&nbsp;'; print '&nbsp;';
} }
print '</td>'; print '</td>';
} }
print "</tr>"; print "</tr>";
$i++; $i++;
} }
print "</table>"; print "</table>";
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
} }
} }
@ -603,9 +631,9 @@ if ($rowid)
*/ */
if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer) if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
{ {
print '<br>'; print '<br>';
print_fiche_titre($langs->trans("NewCotisation")); print_fiche_titre($langs->trans("NewCotisation"));
$bankdirect=0; // Option to write to bank is on by default $bankdirect=0; // Option to write to bank is on by default
$bankviainvoice=0; // Option to write via invoice is on by default $bankviainvoice=0; // Option to write via invoice is on by default
@ -615,10 +643,10 @@ if ($rowid)
// TODO A virer // TODO A virer
//$bankviainvoice=0; //$bankviainvoice=0;
print "\n\n<!-- Form add subscription -->\n"; print "\n\n<!-- Form add subscription -->\n";
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
print "\n".'<script type="text/javascript" language="javascript">'; print "\n".'<script type="text/javascript" language="javascript">';
print 'jQuery(document).ready(function () { print 'jQuery(document).ready(function () {
jQuery(".bankswitchclass").'.($bankdirect||$bankviainvoice?'show()':'hide()').'; jQuery(".bankswitchclass").'.($bankdirect||$bankviainvoice?'show()':'hide()').';
@ -635,66 +663,66 @@ if ($rowid)
jQuery(".bankswitchclass").show(); jQuery(".bankswitchclass").show();
}); });
});'; });';
print '</script>'."\n"; print '</script>'."\n";
} }
print '<form name="cotisation" method="post" action="'.$_SERVER["PHP_SELF"].'">'; print '<form name="cotisation" method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
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 "<table class=\"border\" width=\"100%\">\n"; print "<table class=\"border\" width=\"100%\">\n";
$today=mktime(); $today=mktime();
$datefrom=0; $datefrom=0;
$dateto=0; $dateto=0;
// Date start subscription // Date start subscription
print '<tr><td width="30%" class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>'; print '<tr><td width="30%" class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
if ($_POST["reday"]) if ($_POST["reday"])
{ {
$datefrom=dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]); $datefrom=dol_mktime(0,0,0,$_POST["remonth"],$_POST["reday"],$_POST["reyear"]);
} }
if (! $datefrom) if (! $datefrom)
{ {
if ($adh->datefin > 0) if ($adh->datefin > 0)
{ {
$datefrom=dol_time_plus_duree($adh->datefin,1,'d'); $datefrom=dol_time_plus_duree($adh->datefin,1,'d');
} }
else else
{ {
$datefrom=mktime(); $datefrom=mktime();
} }
} }
$html->select_date($datefrom,'','','','',"cotisation"); $html->select_date($datefrom,'','','','',"cotisation");
print "</td></tr>"; print "</td></tr>";
// Date end subscription // Date end subscription
if ($_POST["endday"]) if ($_POST["endday"])
{ {
$dateto=dol_mktime(0,0,0,$_POST["endmonth"],$_POST["endday"],$_POST["endyear"]); $dateto=dol_mktime(0,0,0,$_POST["endmonth"],$_POST["endday"],$_POST["endyear"]);
} }
if (! $dateto) if (! $dateto)
{ {
//$dateto=dol_time_plus_duree(dol_time_plus_duree($datefrom,$defaultdelay,$defaultdelayunit),-1,'d'); //$dateto=dol_time_plus_duree(dol_time_plus_duree($datefrom,$defaultdelay,$defaultdelayunit),-1,'d');
$dateto=-1; // By default, no date is suggested $dateto=-1; // By default, no date is suggested
} }
print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>'; print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
$html->select_date($dateto,'end','','','',"cotisation"); $html->select_date($dateto,'end','','','',"cotisation");
print "</td></tr>"; print "</td></tr>";
if ($adht->cotisation) if ($adht->cotisation)
{ {
// Amount // Amount
print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.$_POST["cotisation"].'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.$_POST["cotisation"].'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
// Label // Label
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>'; print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
print '<td><input name="label" type="text" size="32" value="'.$langs->trans("Subscription").' '; print '<td><input name="label" type="text" size="32" value="'.$langs->trans("Subscription").' ';
print dol_print_date(($datefrom?$datefrom:time()),"%Y").'" ></td></tr>'; print dol_print_date(($datefrom?$datefrom:time()),"%Y").'" ></td></tr>';
// Bank account transaction // Bank account transaction
if ($conf->banque->enabled || $conf->facture->enabled) if ($conf->banque->enabled || $conf->facture->enabled)
{ {
$company=new Societe($db); $company=new Societe($db);
if ($adh->fk_soc) if ($adh->fk_soc)
{ {
@ -734,43 +762,43 @@ if ($rowid)
} }
print '</td></tr>'; print '</td></tr>';
// Bank account // Bank account
print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>'; print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
$html->select_comptes($_POST["accountid"],'accountid',0,'',1); $html->select_comptes($_POST["accountid"],'accountid',0,'',1);
print "</td></tr>\n"; print "</td></tr>\n";
// Payment mode // Payment mode
print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>'; 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');
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr class="bankswitchclass"><td>'.$langs->trans('Numero'); print '<tr class="bankswitchclass"><td>'.$langs->trans('Numero');
print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>'; print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
print '</td>'; print '</td>';
print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(empty($_POST['num_chq'])?'':$_POST['num_chq']).'"></td></tr>'; print '<td><input id="fieldnum_chq" name="num_chq" type="text" size="8" value="'.(empty($_POST['num_chq'])?'':$_POST['num_chq']).'"></td></tr>';
print '<tr class="bankswitchclass"><td>'.$langs->trans('CheckTransmitter'); print '<tr class="bankswitchclass"><td>'.$langs->trans('CheckTransmitter');
print ' <em>('.$langs->trans("ChequeMaker").')</em>'; print ' <em>('.$langs->trans("ChequeMaker").')</em>';
print '</td>'; print '</td>';
print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(empty($_POST['chqemetteur'])?$facture->client->nom:$_POST['chqemetteur']).'"></td></tr>'; print '<td><input id="fieldchqemetteur" name="chqemetteur" size="32" type="text" value="'.(empty($_POST['chqemetteur'])?$facture->client->nom:$_POST['chqemetteur']).'"></td></tr>';
print '<tr class="bankswitchclass"><td>'.$langs->trans('Bank'); print '<tr class="bankswitchclass"><td>'.$langs->trans('Bank');
print ' <em>('.$langs->trans("ChequeBank").')</em>'; print ' <em>('.$langs->trans("ChequeBank").')</em>';
print '</td>'; print '</td>';
print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(empty($_POST['chqbank'])?'':$_POST['chqbank']).'"></td></tr>'; print '<td><input id="chqbank" name="chqbank" size="32" type="text" value="'.(empty($_POST['chqbank'])?'':$_POST['chqbank']).'"></td></tr>';
} }
} }
print '<tr><td colspan="2">&nbsp;</td>'; print '<tr><td colspan="2">&nbsp;</td>';
print '<tr><td width="30%">'.$langs->trans("SendAcknowledgementByMail").'</td>'; print '<tr><td width="30%">'.$langs->trans("SendAcknowledgementByMail").'</td>';
print '<td>'; print '<td>';
if (! $adh->email) if (! $adh->email)
{ {
print $langs->trans("NoEMail"); print $langs->trans("NoEMail");
} }
else else
{ {
$adht = new AdherentType($db); $adht = new AdherentType($db);
$adht->fetch($adh->typeid); $adht->fetch($adh->typeid);
@ -787,21 +815,21 @@ if ($rowid)
$helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>'; $helpcontent.='<b>'.$langs->trans("Content").'</b>:<br>';
$helpcontent.=dol_htmlentitiesbr($texttosend)."\n"; $helpcontent.=dol_htmlentitiesbr($texttosend)."\n";
print $html->textwithpicto($tmp,$helpcontent,1,'help'); print $html->textwithpicto($tmp,$helpcontent,1,'help');
} }
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print '<br>'; print '<br>';
print '<center>'; print '<center>';
print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">'; print '<input type="submit" class="button" name="add" value="'.$langs->trans("AddSubscription").'">';
print ' &nbsp; &nbsp; '; print ' &nbsp; &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</center>'; print '</center>';
print '</form>'; print '</form>';
print "\n<!-- End form subscription -->\n\n"; print "\n<!-- End form subscription -->\n\n";
} }
//print '</td></tr>'; //print '</td></tr>';

8
htdocs/compta/bank/class/account.class.php
View File

@ -168,7 +168,7 @@ class Account extends CommonObject
while ($i < $num) while ($i < $num)
{ {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
// Anciens liens (pour compatibilit<EFBFBD>) // Anciens liens (pour compatibilite)
$lines[$i][0] = $obj->url; $lines[$i][0] = $obj->url;
$lines[$i][1] = $obj->url_id; $lines[$i][1] = $obj->url_id;
$lines[$i][2] = $obj->label; $lines[$i][2] = $obj->label;
@ -525,9 +525,9 @@ class Account extends CommonObject
/** /**
* \brief Charge un compte en memoire depuis la base * Load a bank account into memory from database
* \param id Id du compte a recuperer * @param id Id du compte a recuperer
* \param ref Ref du compte a recuperer * @param ref Ref du compte a recuperer
*/ */
function fetch($id,$ref='') function fetch($id,$ref='')
{ {

105
htdocs/compta/paiement.php
View File

@ -29,8 +29,8 @@
require('../main.inc.php'); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
include_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
include_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'); require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
$langs->load('companies'); $langs->load('companies');
$langs->load('bills'); $langs->load('bills');
@ -47,6 +47,14 @@ $amounts=array();
$amountsresttopay=array(); $amountsresttopay=array();
$addwarning=0; $addwarning=0;
// Security check
if ($user->societe_id > 0)
{
$socid = $user->societe_id;
}
/* /*
* Action add_paiement et confirm_paiement * Action add_paiement et confirm_paiement
*/ */
@ -130,10 +138,9 @@ if ($_POST['action'] == 'add_paiement')
*/ */
if ($_POST['action'] == 'confirm_paiement' && $_POST['confirm'] == 'yes') if ($_POST['action'] == 'confirm_paiement' && $_POST['confirm'] == 'yes')
{ {
$datepaye = dol_mktime(12, 0 , 0, $error=0;
$_POST['remonth'],
$_POST['reday'], $datepaye = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$_POST['reyear']);
if (! $error) if (! $error)
{ {
@ -147,70 +154,27 @@ if ($_POST['action'] == 'confirm_paiement' && $_POST['confirm'] == 'yes')
$paiement->num_paiement = $_POST['num_paiement']; $paiement->num_paiement = $_POST['num_paiement'];
$paiement->note = $_POST['comment']; $paiement->note = $_POST['comment'];
$paiement_id = $paiement->create($user); if (! $error)
if ($paiement_id > 0)
{ {
if ($conf->banque->enabled) $paiement_id = $paiement->create($user);
{ if (! $paiement_id > 0)
// Insert payment into llx_bank {
$label = "(CustomerInvoicePayment)"; $errmsg=$paiement->error;
$acc = new Account($db, $_POST['accountid']); $error++;
}
$bank_line_id = $acc->addline($paiement->datepaye,
$paiement->paiementid, // Payment mode id or code ("CHQ or VIR for example")
$label,
$totalpaiement,
$paiement->num_paiement,
'',
$user,
$_POST['chqemetteur'],
$_POST['chqbank']);
// Mise a jour fk_bank dans llx_paiement.
// On connait ainsi le paiement qui a genere l'ecriture bancaire
if ($bank_line_id > 0)
{
$result=$paiement->update_fk_bank($bank_line_id);
if ($result <= 0) dol_print_error($db);
// Add link in bank_url between payment and bank transaction
$result=$acc->add_url_line($bank_line_id,
$paiement_id,
DOL_URL_ROOT.'/compta/paiement/fiche.php?id=',
'(paiement)',
'payment');
if ($result <= 0) dol_print_error($db);
// Add link in bank_url between invoice and bank transaction (for each invoice concerned by payment)
$linkaddedforthirdparty=array();
foreach ($paiement->amounts as $key => $value)
{
$fac = new Facture($db);
$fac->fetch($key);
$fac->fetch_thirdparty();
if (! in_array($fac->client->id,$linkaddedforthirdparty)) // Not yet done for this thirdparty
{
$result=$acc->add_url_line($bank_line_id,
$fac->client->id,
DOL_URL_ROOT.'/compta/fiche.php?socid=',
$fac->client->nom,
'company');
if ($result <= 0) dol_print_error($db);
$linkaddedforthirdparty[$fac->client->id]=$fac->client->id; // Mark as done for this thirdparty
}
}
}
else
{
$error++;
}
}
}
else
{
$error++;
} }
if ($error == 0) if (! $error)
{
$result=$paiement->addLinkInvoiceBank($user,'(CustomerInvoicePayment)',$_POST['accountid'],$_POST['chqemetteur'],$_POST['chqbank']);
if (! $result > 0)
{
$errmsg=$paiement->error;
$error++;
}
}
if (! $error)
{ {
$db->commit(); $db->commit();
$loc = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$paiement_id; $loc = DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$paiement_id;
@ -224,13 +188,6 @@ if ($_POST['action'] == 'confirm_paiement' && $_POST['confirm'] == 'yes')
} }
} }
// Security check
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
}
/* /*
* View * View

187
htdocs/compta/paiement/class/paiement.class.php
View File

@ -116,9 +116,10 @@ class Paiement
} }
/** /**
* \brief Create payment in database * Create payment of invoices into database.
* \param user object user * Use this->amounts to have list of invoices for the payment
* \return int id of created payment, < 0 if error * @param user object user
* @return int id of created payment, < 0 if error
*/ */
function create($user) function create($user)
{ {
@ -138,64 +139,69 @@ class Paiement
} }
$this->total = price2num($this->total); $this->total = price2num($this->total);
// Check parameters
if ($this->total == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement
$this->db->begin(); $this->db->begin();
if ($this->total <> 0) // On accepte les montants negatifs pour les rejets de prelevement $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)";
$sql.= " VALUES ('".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$this->total."', ".$this->paiementid.", '".$this->num_paiement."', '".addslashes($this->note)."', ".$user->id.")";
dol_syslog("Paiement::Create insert paiement sql=".$sql);
$resql = $this->db->query($sql);
if ($resql)
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (datec, datep, amount, fk_paiement, num_paiement, note, fk_user_creat)"; $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'paiement');
$sql.= " VALUES ('".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', '".$this->total."', ".$this->paiementid.", '".$this->num_paiement."', '".addslashes($this->note)."', ".$user->id.")";
dol_syslog("Paiement::Create insert paiement sql=".$sql); // Insere liens montants / factures
$resql = $this->db->query($sql); foreach ($this->amounts as $key => $amount)
if ($resql)
{ {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'paiement'); $facid = $key;
if (is_numeric($amount) && $amount <> 0)
// Insere liens montants / factures
foreach ($this->amounts as $key => $amount)
{ {
$facid = $key; $amount = price2num($amount);
if (is_numeric($amount) && $amount <> 0) $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount)';
{ $sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\')';
$amount = price2num($amount);
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount)';
$sql .= ' VALUES ('.$facid.', '. $this->id.', \''.$amount.'\')';
dol_syslog("Paiement::Create Amount line '.$key.' insert paiement_facture sql=".$sql); dol_syslog("Paiement::Create Amount line '.$key.' insert paiement_facture sql=".$sql);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if (! $resql) if (! $resql)
{
$this->error=$this->db->lasterror();
dol_syslog('Paiement::Create insert paiement_facture error='.$this->error, LOG_ERR);
$error++;
}
}
else
{ {
dol_syslog('Paiement::Create Amount line '.$key.' not a number. We discard it.'); $this->error=$this->db->lasterror();
dol_syslog('Paiement::Create insert paiement_facture error='.$this->error, LOG_ERR);
$error++;
} }
} }
else
if (! $error)
{ {
// Appel des triggers dol_syslog('Paiement::Create Amount line '.$key.' not a number. We discard it.');
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('PAYMENT_CUSTOMER_CREATE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
} }
} }
else
if (! $error)
{ {
$this->error=$this->db->error(); // Appel des triggers
dol_syslog('Paiement::Create insert paiement error='.$this->error, LOG_ERR); include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
$error++; $interface=new Interfaces($this->db);
$result=$interface->run_triggers('PAYMENT_CUSTOMER_CREATE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers
} }
} }
else
{
$this->error=$this->db->error();
dol_syslog('Paiement::Create insert paiement error='.$this->error, LOG_ERR);
$error++;
}
if ($this->total <> 0 && ! $error) // On accepte les montants negatifs // If option to add link to bank account is on
if (! $error) // On accepte les montants negatifs
{ {
$this->db->commit(); $this->db->commit();
return $this->id; return $this->id;
@ -293,6 +299,99 @@ class Paiement
} }
} }
/**
* A record into bank for payment with links between this bank record and invoices of payment.
* All payment properties must have been set first like after a call to create().
* @param user Object of user making payment
* @param label Label to use in bank record
* @param accountid Id of bank account to do link with
* @param emetteur_nom Name of transmitter
* @param emetteur_banque Name of bank
* @return int <0 if KO, >0 if OK
*/
function addLinkInvoiceBank($user,$label,$accountid,$emetteur_nom,$emetteur_banque)
{
global $conf;
$error=0;
if ($conf->banque->enabled)
{
require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
$acc = new Account($this->db);
$acc->fetch($accountid);
// Insert payment into llx_bank
$bank_line_id = $acc->addline($this->datepaye,
$this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
$label,
$this->total,
$this->num_paiement,
'',
$user,
$emetteur_nom,
$emetteur_banque);
// Mise a jour fk_bank dans llx_paiement.
// On connait ainsi le paiement qui a genere l'ecriture bancaire
if ($bank_line_id > 0)
{
$result=$this->update_fk_bank($bank_line_id);
if ($result <= 0)
{
$error++;
dol_print_error($this->db);
}
// Add link 'payment' in bank_url between payment and bank transaction
$result=$acc->add_url_line($bank_line_id,
$this->id,
DOL_URL_ROOT.'/compta/paiement/fiche.php?id=',
'(paiement)',
'payment');
if ($result <= 0)
{
$error++;
dol_print_error($this->db);
}
// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
$linkaddedforthirdparty=array();
foreach ($this->amounts as $key => $value)
{
$fac = new Facture($this->db);
$fac->fetch($key);
$fac->fetch_thirdparty(); // This should be always same third party but we loop in case of.
if (! in_array($fac->client->id,$linkaddedforthirdparty)) // Not yet done for this thirdparty
{
$result=$acc->add_url_line($bank_line_id,
$fac->client->id,
DOL_URL_ROOT.'/compta/fiche.php?socid=',
$fac->client->nom,
'company');
if ($result <= 0) dol_print_error($this->db);
$linkaddedforthirdparty[$fac->client->id]=$fac->client->id; // Mark as done for this thirdparty
}
}
}
else
{
$this->error=$acc->error;
$error++;
}
}
if (! $error)
{
return 1;
}
else
{
return -1;
}
}
/** /**
* \brief Mise a jour du lien entre le paiement et la ligne generee dans llx_bank * \brief Mise a jour du lien entre le paiement et la ligne generee dans llx_bank
* \param id_bank Id compte bancaire * \param id_bank Id compte bancaire
@ -301,6 +400,8 @@ class Paiement
{ {
$sql = 'UPDATE llx_paiement set fk_bank = '.$id_bank; $sql = 'UPDATE llx_paiement set fk_bank = '.$id_bank;
$sql.= ' WHERE rowid = '.$this->id; $sql.= ' WHERE rowid = '.$this->id;
dol_syslog('Paiement::update_fk_bank sql='.$sql);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {

2
htdocs/core/class/commonobject.class.php
View File

@ -542,7 +542,7 @@ class CommonObject
if (!$this->isnolinkedbythird && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc"; if (!$this->isnolinkedbythird && !$user->rights->societe->client->voir) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
$sql.= " WHERE te.".$fieldid." < '".addslashes($this->ref)."'"; $sql.= " WHERE te.".$fieldid." < '".addslashes($this->ref)."'";
if (!$this->isnolinkedbythird && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id; if (!$this->isnolinkedbythird && !$user->rights->societe->client->voir) $sql.= " AND sc.fk_user = " .$user->id;
if (isset($filter)) $sql.=" AND ".$filter; if (! empty($filter)) $sql.=" AND ".$filter;
if ($this->ismultientitymanaged == 2 || ($this->element != 'societe' && !$this->isnolinkedbythird && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity if ($this->ismultientitymanaged == 2 || ($this->element != 'societe' && !$this->isnolinkedbythird && !$user->rights->societe->client->voir)) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
if ($this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN (0,'.$conf->entity.')'; if ($this->ismultientitymanaged == 1) $sql.= ' AND te.entity IN (0,'.$conf->entity.')';

2
htdocs/langs/en_US/members.lang
View File

@ -159,4 +159,4 @@ LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with busin
DocForAllMembersCards=Generate business cards for all members (Format for output actually setup : <b>%s</b>) DocForAllMembersCards=Generate business cards for all members (Format for output actually setup : <b>%s</b>)
DocForOneMemberCards=Generate business cards for a particular member (Format for output actually setup: <b>%s</b>) DocForOneMemberCards=Generate business cards for a particular member (Format for output actually setup: <b>%s</b>)
DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b>) DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b>)
SubscriptionPayment=Subscription payment

1
htdocs/langs/fr_FR/members.lang
View File

@ -159,3 +159,4 @@ LinkToGeneratedPagesDesc=Cet écran vous permet de générer des planches de car
DocForAllMembersCards=Génération de cartes pour tous les adhérents (Format de planche actuellement configuré: <b>%s</b>) DocForAllMembersCards=Génération de cartes pour tous les adhérents (Format de planche actuellement configuré: <b>%s</b>)
DocForOneMemberCards=Génération de cartes pour un adhérent particulier (Format de planche actuellement configuré: <b>%s</b>) DocForOneMemberCards=Génération de cartes pour un adhérent particulier (Format de planche actuellement configuré: <b>%s</b>)
DocForLabels=Génération d'étiquette d'adresses (Format de planche actuellement configuré: <b>%s</b>) DocForLabels=Génération d'étiquette d'adresses (Format de planche actuellement configuré: <b>%s</b>)
SubscriptionPayment=Paiement cotisation