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

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Juanjo Menent 2016-05-06 22:13:03 +02:00
commit f73c8310fb
5 changed files with 64 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/listactions.php
View File

@ -309,7 +309,7 @@ if ($resql)
print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("ActionsOwnedBy"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
print_liste_field_titre("");
print "</tr>\n";
@ -432,7 +432,7 @@ if ($resql)
print '</td>';
// Status/Percent
print '<td align="right" class="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>';
print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>';
print '<td></td>';

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

@ -17,15 +17,14 @@
*/
/**
* \file class/advtargetemailing.class.php
* \ingroup advtargetemailing
* \file comm/mailing/class/advtargetemailing.class.php
* \ingroup mailing
* \brief This file is an example CRUD class file (Create/Read/Update/Delete)
*/
/**
* Put your class' description here
* Class to manage advanced emailing target selector
*/
class AdvanceTargetingMailing extends CommonObject
{
@ -293,7 +292,7 @@ class AdvanceTargetingMailing extends CommonObject
* @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK
*/
function update($user=0, $notrigger=0)
function update($user, $notrigger=0)
{
global $conf, $langs;
$error=0;
@ -737,9 +736,9 @@ class AdvanceTargetingMailing extends CommonObject
*
* @param string $column_to_test column to test
* @param string $criteria Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value,
* and use ! for except this value.
* and use ! for except this value.
* For exemple jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
* @return int <0 if KO, >0 if OK
* @return string Sql to use for the where condition
*/
public function transformToSQL($column_to_test,$criteria) {
$return_sql_criteria = '(';

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

@ -17,8 +17,9 @@
*/
/**
* \file advtargetemailing/class/html.formadvtragetemaling.class.php
* \brief Fichier de la classe des fonctions predefinie de composants html advtargetemaling
* \file comm/mailing/class/html.formadvtragetemaling.class.php
* \ingroup mailing
* \brief Fichier de la classe des fonctions predefinie de composants html advtargetemaling
*/
/**

1
htdocs/core/class/fiscalyear.class.php
View File

@ -39,6 +39,7 @@ class Fiscalyear extends CommonObject
var $label;
var $date_start;
var $date_end;
var $datec;
var $statut; // 0=open, 1=closed
var $entity;

67
htdocs/websites/class/website.class.php
View File

@ -54,16 +54,37 @@ class Website extends CommonObject
public $lines = array();
/**
* @var int
*/
public $entity;
/**
* @var string
*/
public $ref;
/**
* @var string
*/
public $description;
/**
* @var int
*/
public $status;
public $date_creation = '';
public $date_modification = '';
/**
* @var mixed
*/
public $date_creation;
/**
* @var mixed
*/
public $date_modification;
/**
* @var mixed
*/
public $tms = '';
public $fk_default_home;
/**
* @var integer
*/
public $fk_default_home;
public $records;
/**
@ -625,20 +646,36 @@ class WebsiteLine
*/
public $id;
/**
* @var mixed Sample line property 1
* @var int
*/
public $entity;
public $ref;
public $description;
public $status;
public $fk_default_home;
public $date_creation = '';
public $date_modification = '';
public $tms = '';
/**
* @var mixed Sample line property 2
* @var string
*/
public $ref;
/**
* @var string
*/
public $description;
/**
* @var int
*/
public $status;
/**
* @var int
*/
public $fk_default_home;
/**
* @var mixed
*/
public $date_creation;
/**
* @var mixed
*/
public $date_modification;
/**
* @var mixed
*/
public $tms = '';
}