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

Merge pull request #803 from FHenry/3.3

Browse Source 
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
This commit is contained in:
Laurent Destailleur 2013-04-05 13:49:11 -07:00
commit bbb0854517
13 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/fiche.php
View File

@ -427,7 +427,7 @@ if ($action == 'create')
$(".fulldaystartmin").attr("disabled","disabled").val("00");
$(".fulldayendhour").attr("disabled","disabled").val("23");
$(".fulldayendmin").attr("disabled","disabled").val("59");
$("#p2").attr("disabled","disabled").val("");
$("#p2").removeAttr("disabled");
}
}
setdatefields();

2
htdocs/comm/mailing/index.php
View File

@ -176,7 +176,7 @@ if ($result)
print "<tr $bc[$var]>";
print '<td nowrap="nowrap"><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>';
print '<td>'.dol_trunc($obj->titre,38).'</td>';
print '<td align="center">'.dol_print_date($obj->date_creat,'day').'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>';
print '<td align="center">'.($obj->nbemail?$obj->nbemail:"0").'</td>';
$mailstatic=new Mailing($db);
print '<td align="right">'.$mailstatic->LibStatut($obj->statut,5).'</td>';

3
htdocs/core/modules/mailings/contacts1.modules.php
View File

@ -88,9 +88,10 @@ class mailing_contacts1 extends MailingTargets
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
global $conf;

3
htdocs/core/modules/mailings/contacts2.modules.php
View File

@ -151,9 +151,10 @@ class mailing_contacts2 extends MailingTargets
/**
* Return here number of distinct emails returned by your selector.
*
* @param string $sql Requete sql de comptage
* @return int
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
global $conf;

3
htdocs/core/modules/mailings/contacts3.modules.php
View File

@ -157,9 +157,10 @@ class mailing_contacts3 extends MailingTargets
/**
* Return here number of distinct emails returned by your selector.
*
* @param string $sql Requete sql de comptage
* @return int Number of recipients
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
global $conf;

3
htdocs/core/modules/mailings/example.modules.php
View File

@ -100,9 +100,10 @@ class mailing_example extends MailingTargets
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
// CHANGE THIS: Optionnal

16
htdocs/core/modules/mailings/fraise.modules.php
View File

@ -82,13 +82,15 @@ class mailing_fraise extends MailingTargets
}
/*
* \brief Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
* \return int
*/
function getNbOfRecipients()
/**
* Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int Nb of recipients
*/
function getNbOfRecipients($sql='')
{
$sql = "SELECT count(distinct(a.email)) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";

3
htdocs/core/modules/mailings/framboise.modules.php
View File

@ -143,9 +143,10 @@ class mailing_framboise extends MailingTargets
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int Nb of recipients
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
global $conf;

16
htdocs/core/modules/mailings/pomme.modules.php
View File

@ -77,13 +77,15 @@ class mailing_pomme extends MailingTargets
}
/*
* \brief Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
* \return int
*/
function getNbOfRecipients()
/**
* Return here number of distinct emails returned by your selector.
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int Number of recipients
*/
function getNbOfRecipients($sql='')
{
global $conf;

3
htdocs/core/modules/mailings/thirdparties.modules.php
View File

@ -153,9 +153,10 @@ class mailing_thirdparties extends MailingTargets
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int Nb of recipients
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
global $conf;

2
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
View File

@ -179,7 +179,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
* @param string $option Option
* @return int Number of recipients
*/
function getNbOfRecipients($filter=1,$option='')
function getNbOfRecipients($sql,$filter=1,$option='')
{
$now=dol_now();

3
htdocs/core/modules/mailings/xinputfile.modules.php
View File

@ -73,9 +73,10 @@ class mailing_xinputfile extends MailingTargets
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int '' means NA
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
return '';
}

3
htdocs/core/modules/mailings/xinputuser.modules.php
View File

@ -73,9 +73,10 @@ class mailing_xinputuser extends MailingTargets
* For example if this selector is used to extract 500 different
* emails from a text file, this function must return 500.
*
* @param string $sql Requete sql de comptage
* @return int '' means NA
*/
function getNbOfRecipients()
function getNbOfRecipients($sql='')
{
return '';
}