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

fix travis

Browse Source
This commit is contained in:
Florian HENRY 2016-04-01 17:09:03 +02:00
parent ae51321040
commit 038b928ea4
3 changed files with 236 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/mailing/class/advtargetemailing.class.php
View File

@ -776,5 +776,3 @@ class AdvanceTargetingMailing extends CommonObject
}
?>

51
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
View File

@ -44,12 +44,11 @@ class FormAdvTargetEmailing extends Form {
/**
* Affiche un champs select contenant une liste
*
* @param int $selected_array à preselectionner
* @param array $selected_array à preselectionner
* @param string $htmlname select field
* @param int $showempty empty field
* @return string select field
*/
function multiselect_prospection_status($selected_array, $htmlname = 'cust_prospect_status') {
function multiselect_prospection_status($selected_array = array(), $htmlname = 'cust_prospect_status') {
global $conf, $langs;
$options_array = array ();
@ -82,7 +81,7 @@ class FormAdvTargetEmailing extends Form {
* Return combo list of activated countries, into language of user
*
* @param string $htmlname of html select object
* @param string $selected or Code or Label of preselected country
* @param array $selected or Code or Label of preselected country
* @return string HTML string with select
*/
function multiselect_country($htmlname = 'country_id', $selected_array=array()) {
@ -139,12 +138,12 @@ class FormAdvTargetEmailing extends Form {
/**
* Return select list for categories (to use in form search selectors)
*
* @param string $selected value
* @param string $htmlname of combo list (example: 'search_sale')
* @param User $user user
* @param unknown $htmlname
* @param array $selected_array
* @param unknown $user
* @return string combo list code
*/
function multiselectselect_salesrepresentatives($htmlname, $selected_array, $user) {
function multiselectselect_salesrepresentatives($htmlname, $selected_array=array(), $user) {
global $conf;
@ -181,12 +180,11 @@ class FormAdvTargetEmailing extends Form {
/**
* Return select list for categories (to use in form search selectors)
*
* @param string $selected value
* @param string $htmlname of combo list (example: 'search_sale')
* @param User $user user
* @param array $selected_array
* @return string combo list code
*/
function multiselectselect_language($htmlname, $selected_array) {
function multiselectselect_language($htmlname='', $selected_array=array()) {
global $conf,$langs;
@ -204,12 +202,13 @@ class FormAdvTargetEmailing extends Form {
}
/**
* Return multiselect list of entities for extrafeild type sellist
* Return multiselect list of entities for extrafeild type sellist
*
* @param string $htmlname select
* @param array $options_array to manage
* @param array $selected_array to manage
* @return string combo list code
* @param unknown $htmlname
* @param array $sqlqueryparam
* @param array $selected_array
*
* @return string HTML combo
*/
function advMultiselectarray_selllist($htmlname, $sqlqueryparam = array(), $selected_array = array()) {
@ -277,7 +276,7 @@ class FormAdvTargetEmailing extends Form {
*
* @param string $selected Title preselected
* @param string $htmlname Name of HTML select combo field
* @return void
* @return string HTML combo
*/
function multiselect_civility($htmlname='civilite_id',$selected_array = array())
{
@ -328,7 +327,7 @@ class FormAdvTargetEmailing extends Form {
* @param array $options_array to manage
* @param array $selected_array to manage
* @param int $showempty show empty
* @return void
* @return string HTML combo
*/
function advMultiselectarray($htmlname, $options_array = array(), $selected_array = array(), $showempty = 0) {
global $conf, $langs;
@ -384,7 +383,7 @@ class FormAdvTargetEmailing extends Form {
*
* @param string $htmlname Name of categorie
* @param array $selected_array value selected
* @return void
* @return string HTML combo
*/
function multiselect_customercategories($htmlname='cust_cat',$selected_array = array())
{
@ -396,7 +395,7 @@ class FormAdvTargetEmailing extends Form {
*
* @param string $htmlname Name of categorie
* @param array $selected_array value selected
* @return void
* @return string HTML combo
*/
function multiselect_contactcategories($htmlname='contact_cat',$selected_array = array())
{
@ -408,7 +407,7 @@ class FormAdvTargetEmailing extends Form {
*
* @param string $htmlname Name of categorie
* @param array $selected_array value selected
* @return void
* @return string HTML combo
*/
public function multiselect_categories($htmlname='',$selected_array = array(), $type=0)
{
@ -417,7 +416,6 @@ class FormAdvTargetEmailing extends Form {
$options_array=array();
$sql = "SELECT rowid, label FROM ".MAIN_DB_PREFIX."categorie";
$sql.= " WHERE type=".$type;
@ -449,7 +447,14 @@ class FormAdvTargetEmailing extends Form {
return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
}
/**
*
* @param string $htmlname
* @param number $selected
* @param number $showempty
*
* @return string HTML combo
*/
public function select_advtargetemailing_template($htmlname='template_id',$selected=0,$showempty=0) {
global $conf, $user, $langs;

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

@ -283,6 +283,7 @@ class mailing_advthirdparties extends MailingTargets
* Can include an URL link on each record provided by selector shown on target page.
*
* @param int $id ID
* @param string $type type
* @return string Url link
*/
function url($id,$type)
@ -299,5 +300,3 @@ class mailing_advthirdparties extends MailingTargets
}
}
?>