Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
0fc4cd489f
3 changed files with 8 additions and 2 deletions
|
|
@ -640,6 +640,11 @@ abstract class CommonObject
|
|||
*/
|
||||
public $output;
|
||||
|
||||
/**
|
||||
* @var array extraparams
|
||||
*/
|
||||
public $extraparams = array();
|
||||
|
||||
/**
|
||||
* @var array List of child tables. To test if we can delete object.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ class FichinterStats extends Stats
|
|||
//$this->where.= " AND c.fk_statut > 0"; // Not draft and not cancelled
|
||||
}
|
||||
if (empty($user->rights->societe->client->voir) && !$this->socid) {
|
||||
$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
|
||||
$this->where .= (!empty($this->where) ? ' AND ' : '')." c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
|
||||
}
|
||||
$this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
|
||||
|
||||
|
|
|
|||
|
|
@ -673,7 +673,7 @@ class Project extends CommonObject
|
|||
$sql = "SELECT rowid, entity, ref, title, description, public, datec, opp_amount, budget_amount,";
|
||||
$sql .= " tms, dateo as date_start, datee as date_end, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
|
||||
$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid,";
|
||||
$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth, max_attendees, date_start_event, date_end_event, location";
|
||||
$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth, max_attendees, date_start_event, date_end_event, location, extraparams";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."projet";
|
||||
if (!empty($id)) {
|
||||
$sql .= " WHERE rowid = ".((int) $id);
|
||||
|
|
@ -736,6 +736,7 @@ class Project extends CommonObject
|
|||
$this->date_end_event = $this->db->jdate($obj->date_end_event);
|
||||
$this->location = $obj->location;
|
||||
$this->email_msgid = $obj->email_msgid;
|
||||
$this->extraparams = !empty($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
|
||||
|
||||
$this->db->free($resql);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue