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

Merge pull request #8599 from grandoc/new_branch_15_04_2018

Browse Source 
fix typo
This commit is contained in:
Laurent Destailleur 2018-04-15 11:22:56 +02:00 committed by GitHub
commit 9a018cba1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/commonobject.class.php
View File

@ -5,7 +5,7 @@
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr> * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2010-2015 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr> * Copyright (C) 2012-2013 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2011-2014 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> * Copyright (C) 2012-2015 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr> * Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
@ -717,7 +717,7 @@ abstract class CommonObject
} }
else else
{ {
// On recherche id type_contact // We look for id type_contact
$sql = "SELECT tc.rowid"; $sql = "SELECT tc.rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc"; $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'"; $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
@ -741,7 +741,7 @@ abstract class CommonObject
$datecreate = dol_now(); $datecreate = dol_now();
// Socpeople must have already been added by some a trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error // Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
$TListeContacts=$this->liste_contact(-1, $source); $TListeContacts=$this->liste_contact(-1, $source);
$already_added=false; $already_added=false;
if(!empty($TListeContacts)) { if(!empty($TListeContacts)) {
@ -757,7 +757,7 @@ abstract class CommonObject
$this->db->begin(); $this->db->begin();
// Insertion dans la base // Insert into database
$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) "; $sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ; $sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
@ -832,7 +832,7 @@ abstract class CommonObject
*/ */
function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0) function update_contact($rowid, $statut, $type_contact_id=0, $fk_socpeople=0)
{ {
// Insertion dans la base // Insert into database
$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set"; $sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
$sql.= " statut = ".$statut; $sql.= " statut = ".$statut;
if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'"; if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
@ -5022,7 +5022,7 @@ abstract class CommonObject
* @param array $val Array of properties for field to show * @param array $val Array of properties for field to show
* @param string $key Key of attribute * @param string $key Key of attribute
* @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value) * @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
* @param string $moreparam To add more parametes on html input tag * @param string $moreparam To add more parameters on html input tag
* @param string $keysuffix Prefix string to add into name and id of field (can be used to avoid duplicate names) * @param string $keysuffix Prefix string to add into name and id of field (can be used to avoid duplicate names)
* @param string $keyprefix Suffix string to add into name and id of field (can be used to avoid duplicate names) * @param string $keyprefix Suffix string to add into name and id of field (can be used to avoid duplicate names)
* @param string|int $showsize Value for css to define size. May also be a numeric. * @param string|int $showsize Value for css to define size. May also be a numeric.
@ -5076,7 +5076,7 @@ abstract class CommonObject
else return ''; else return '';
} }
// Use in priorit showsize from parameters, then $val['css'] then autodefine // Use in priority showsize from parameters, then $val['css'] then autodefine
if (empty($showsize) && ! empty($val['css'])) if (empty($showsize) && ! empty($val['css']))
{ {
$showsize = $val['css']; $showsize = $val['css'];