| '.$langs->trans("Status").' | '.$adh->getLib
print "\n";
print '';
-print "\n";
+dol_fiche_end();
if ($errmsg)
@@ -236,7 +234,6 @@ if ($errmsg)
/*
* Barre d'actions
- *
*/
print '';
@@ -253,145 +250,165 @@ print " \n";
-/*
- * Bandeau des cotisations
- *
- */
-
-print ' ';
-
-print '';
-print '';
-
-
-/*
- * Liste des cotisations
- *
- */
-$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,";
-$sql.= " c.rowid as crowid, c.cotisation,";
-$sql.= " c.dateadh,";
-$sql.= " c.datef,";
-$sql.= " c.fk_bank,";
-$sql.= " b.rowid as bid,";
-$sql.= " ba.rowid as baid, ba.label, ba.bank";
-$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;
-
-$result = $db->query($sql);
-if ($result)
-{
- $cotisationstatic=new Cotisation($db);
- $accountstatic=new Account($db);
-
- $num = $db->num_rows($result);
- $i = 0;
-
- print "\n";
-
- print '';
- print '| '.$langs->trans("Ref").' | ';
- print ''.$langs->trans("DateSubscription").' | ';
- print ''.$langs->trans("DateEnd").' | ';
- print ''.$langs->trans("Amount").' | ';
- if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE)
- {
- print ''.$langs->trans("Account").' | ';
- }
- print " \n";
-
- $var=True;
- while ($i < $num)
- {
- $objp = $db->fetch_object($result);
- $var=!$var;
- print "";
- $cotisationstatic->ref=$objp->crowid;
- $cotisationstatic->id=$objp->crowid;
- print '| '.$cotisationstatic->getNomUrl(1).' | ';
- print ''.dol_print_date($db->jdate($objp->dateadh),'day')." | \n";
- print ''.dol_print_date($db->jdate($objp->datef),'day')." | \n";
- print ''.price($objp->cotisation).' | ';
- if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE)
- {
- print '';
- if ($objp->bid)
- {
- $accountstatic->label=$objp->label;
- $accountstatic->id=$objp->baid;
- print $accountstatic->getNomUrl(1);
- }
- else
- {
- print ' ';
- }
- print ' | ';
- }
- print " ";
- $i++;
- }
- print " ";
-}
-else
-{
- dol_print_error($db);
-}
-
-print ' | ';
-
-
// Date fin cotisation
-print "\n";
+print "\n";
print '| '.$langs->trans("SubscriptionEndDate");
print ' | ';
print '';
if ($adh->datefin)
{
- if ($adh->datefin < time())
- {
- print dol_print_date($adh->datefin,'day');
- if ($adh->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie
- }
- else
- {
- print dol_print_date($adh->datefin,'day');
- }
+ if ($adh->datefin < time())
+ {
+ print dol_print_date($adh->datefin,'day');
+ if ($adh->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie
+ }
+ else
+ {
+ print dol_print_date($adh->datefin,'day');
+ }
}
else
{
- print $langs->trans("SubscriptionNotReceived");
- if ($adh->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie
+ print $langs->trans("SubscriptionNotReceived");
+ if ($adh->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie
}
print ' | ';
print ' ';
print ' ';
+print '
';
/*
- * Add new subscription
+ * List of subscriptions
+ */
+if ($action != 'addsubscription')
+{
+ $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,";
+ $sql.= " c.rowid as crowid, c.cotisation,";
+ $sql.= " c.dateadh,";
+ $sql.= " c.datef,";
+ $sql.= " c.fk_bank,";
+ $sql.= " b.rowid as bid,";
+ $sql.= " ba.rowid as baid, ba.label, ba.bank";
+ $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;
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $cotisationstatic=new Cotisation($db);
+ $accountstatic=new Account($db);
+
+ $num = $db->num_rows($result);
+ $i = 0;
+
+ print "\n";
+
+ print '';
+ print '| '.$langs->trans("Ref").' | ';
+ print ''.$langs->trans("DateSubscription").' | ';
+ print ''.$langs->trans("DateEnd").' | ';
+ print ''.$langs->trans("Amount").' | ';
+ if ($conf->banque->enabled)
+ {
+ print ''.$langs->trans("Account").' | ';
+ }
+ print " \n";
+
+ $var=True;
+ while ($i < $num)
+ {
+ $objp = $db->fetch_object($result);
+ $var=!$var;
+ print "";
+ $cotisationstatic->ref=$objp->crowid;
+ $cotisationstatic->id=$objp->crowid;
+ print '| '.$cotisationstatic->getNomUrl(1).' | ';
+ print ''.dol_print_date($db->jdate($objp->dateadh),'day')." | \n";
+ print ''.dol_print_date($db->jdate($objp->datef),'day')." | \n";
+ print ''.price($objp->cotisation).' | ';
+ if ($conf->banque->enabled)
+ {
+ print '';
+ if ($objp->bid)
+ {
+ $accountstatic->label=$objp->label;
+ $accountstatic->id=$objp->baid;
+ print $accountstatic->getNomUrl(1);
+ }
+ else
+ {
+ print ' ';
+ }
+ print ' | ';
+ }
+ print " ";
+ $i++;
+ }
+ print " ";
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+}
+
+
+
+/*
+ * Add new subscription form
*/
if ($action == 'addsubscription' && $user->rights->adherent->cotisation->creer)
{
print '
';
+
+ print_fiche_titre($langs->trans("NewCotisation"));
+
+ $bankdirect=0; // Option to write to bank is on by default
+ $bankviainvoice=0; // Option to write via invoice is on by default
+ $invoiceonly=0;
+ if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && (empty($_POST['paymentsave']) || $_POST["paymentsave"] == 'bankdirect')) $bankdirect=1;
+ if ($conf->banque->enabled && $conf->societe->enabled && $conf->facture->enabled && $adh->fk_soc) $bankviainvoice=1;
+ // TODO A virer
+ $bankviainvoice=0;
+
print "\n\n\n";
+ if ($conf->use_javascript_ajax)
+ {
+ print '';
+ }
+
print ' ';
print '';
print "\n\n\n";
}
-print ' | ';
-print ' ';
-
+//print ' |
';
+//print '';
$db->close();
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 251a17aac35..6f71db226e9 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1143,9 +1143,10 @@ class Adherent extends CommonObject
* \param emetteur_nom Nom emetteur cheque
* \param emetteur_banque Nom banque emetteur cheque
* \param datesubend Date fin adhesion
+ * \param option 'none'=No more action, 'bankdirect'=Add direct bank transaction, 'bankviainvoice'=Add bank transaction via invoice and payment
* \return int rowid de l'entree ajoutee, <0 si erreur
*/
- function cotisation($date, $montant, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0)
+ function cotisation($date, $montant, $accountid=0, $operation='', $label='', $num_chq='', $emetteur_nom='', $emetteur_banque='', $datesubend=0, $option='none')
{
global $conf,$langs,$user;
@@ -1174,7 +1175,6 @@ class Adherent extends CommonObject
$cotisation->note=$label;
$rowid=$cotisation->create($user);
-
if ($rowid > 0)
{
// Update denormalized subscription end date (read database subscription to find values)
@@ -1189,7 +1189,7 @@ class Adherent extends CommonObject
}
// Insertion dans la gestion bancaire si configure pour
- if ($conf->global->ADHERENT_BANK_USE && $accountid)
+ if ($option == 'bankdirect' && $accountid)
{
$acct=new Account($this->db);
$result=$acct->fetch($accountid);
@@ -1229,6 +1229,12 @@ class Adherent extends CommonObject
}
}
+ // Create invoice and payment
+ if ($option == 'bankviainvoice' && $accountid)
+ {
+ // TODO
+ }
+
// Change properties of object (used by triggers)
$this->last_subscription_date=$dateop;
$this->last_subscription_amount=$montant;
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 5eb1d713c39..38049cd4cd3 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -48,91 +48,13 @@ $pagenext = $page + 1;
$msg='';
$date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
-// Desactivation fonctions insertions en banque apres coup
-// Cette fonction me semble pas utile. Si on a fait des adhesions alors que module banque
-// pas actif c'est qu'on voulait pas d'insertion en banque.
-// si on active apres coup, on va pas modifier toutes les adhesions pour avoir une ecriture
-// en banque mais on va mettre le solde banque direct a la valeur apres toutes les adh�sions.
-$allowinsertbankafter=0;
-
if (! $user->rights->adherent->cotisation->lire)
- accessforbidden();
+accessforbidden();
/*
-* Actions
-*/
-
-// Insertion de la cotisation dans le compte banquaire
-if ($allowinsertbankafter && $_POST["action"] == '2bank' && $_POST["rowid"] !='')
-{
- if ($conf->global->ADHERENT_BANK_USE)
- {
- if (! $_POST["accountid"])
- {
- $msg='