From b213e0fb0980594b7c89a2d44600dc3bac233661 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 10 Jan 2008 19:24:16 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Le=20chp=20date=20fin=20adh=E9sion=20n'?= =?UTF-8?q?=E9tait=20pas=20mis=20a=20jour=20par=20la=20fiche=20adh=E9sion?= =?UTF-8?q?=20en=20=E9dition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/adherents/adherent.class.php | 4 ++-- htdocs/adherents/cotisation.class.php | 1 + htdocs/adherents/fiche_subscription.php | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php index bf1071908a0..ce225360c3a 100644 --- a/htdocs/adherents/adherent.class.php +++ b/htdocs/adherents/adherent.class.php @@ -465,7 +465,7 @@ class Adherent extends CommonObject } /** - \brief Fonction qui met e jour l'adherent (sauf mot de passe) + \brief Fonction qui met a jour l'adherent (sauf mot de passe) \param user Utilisateur qui realise la mise a jour \param notrigger 1=desactive le trigger UPDATE (quand appele par creation) \param nosyncuser Do not synchronize linked user @@ -731,7 +731,7 @@ class Adherent extends CommonObject * \param nosyncuser Do not synchronize linked user * \return string If OK return clear password, 0 if no change, < 0 if error */ - function password($user, $password='', $isencrypted=0, $notrigger=0, $nosyncuser=0) + function setPassword($user, $password='', $isencrypted=0, $notrigger=0, $nosyncuser=0) { global $conf, $langs; diff --git a/htdocs/adherents/cotisation.class.php b/htdocs/adherents/cotisation.class.php index d32ddba8e66..fe428813243 100644 --- a/htdocs/adherents/cotisation.class.php +++ b/htdocs/adherents/cotisation.class.php @@ -158,6 +158,7 @@ class Cotisation extends CommonObject $sql .= " note=".($this->note ? "'".addslashes($this->note)."'" : 'null').","; $sql .= " cotisation = '".price2num($this->amount)."',"; $sql .= " dateadh='".$this->db->idate($this->dateh)."',"; + $sql .= " datef='".$this->db->idate($this->datef)."',"; $sql .= " datec='".$this->db->idate($this->datec)."'"; $sql .= " WHERE rowid = ".$this->id; diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index ab407485173..18a377f55d8 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2007-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -91,7 +91,9 @@ if ($user->rights->adherent->cotisation->creer && $_REQUEST["action"] == 'update { // Modifie valeures $subscription->dateh=dolibarr_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']); + $subscription->datef=dolibarr_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']); $subscription->amount=$_POST["amount"]; + //print 'datef='.$subscription->datef.' '.$_POST['datesubendday']; $result=$subscription->update($user); if ($result >= 0 && ! sizeof($subscription->errors))