Merge pull request #9309 from frederic34/trimtrailing2

last trimtrailing
This commit is contained in:
Laurent Destailleur 2018-08-29 17:57:05 +02:00 committed by GitHub
commit 86d8513138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 78 additions and 57 deletions

View File

@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
*/
class AccountancyCategory // extends CommonObject
{
/**
/**
* @var DoliDB Database handler.
*/
public $db;

View File

@ -80,14 +80,22 @@ class AccountingAccount extends CommonObject
var $account_parent;
var $account_category;
/**
* @var string proper name for given parameter
*/
public $label;
/**
* @var string Label of account
*/
public $label;
var $fk_user_author;
var $fk_user_modif;
var $active; // duplicate with status
/**
* @var int ID
*/
public $fk_user_author;
/**
* @var int ID
*/
public $fk_user_modif;
var $active; // duplicate with status
var $status;
@ -422,7 +430,7 @@ class AccountingAccount extends CommonObject
* @param string $moretitle Add more text to title tooltip
* @param int $notooltip 1=Disable tooltip
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @return string String with URL
* @return string String with URL
*/
function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle='',$notooltip=0, $save_lastsearch_value=-1)
{

View File

@ -28,30 +28,30 @@
*/
class AdvanceTargetingMailing extends CommonObject
{
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var DoliDB Database handler.
*/
public $db;
/**
* @var string Error code (or message)
*/
public $error='';
public $error='';
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
/**
* @var string ID to identify managed object
*/
public $element='advtargetemailing';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='advtargetemailing';
public $table_element='advtargetemailing';
/**
* @var int ID

View File

@ -716,5 +716,3 @@ class PaymentSocialContribution extends CommonObject
return $result;
}
}

View File

@ -1,4 +1,21 @@
<?php
/*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* or see http://www.gnu.org/
*/
/**
* Class to manage comment
*/

View File

@ -30,7 +30,7 @@
/**
* Events class
* Events class
*/
class Events // extends CommonObject
{
@ -49,7 +49,7 @@ class Events // extends CommonObject
*/
public $id;
/**
/**
* @var DoliDB Database handler.
*/
public $db;

View File

@ -34,14 +34,14 @@ class Menubase
public $db;
/**
* @var string Error code (or message)
*/
public $error;
* @var string Error code (or message)
*/
public $error;
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
* @var string[] Error codes (or messages)
*/
public $errors = array();
public $id;
@ -696,4 +696,3 @@ class Menubase
}
}

View File

@ -76,7 +76,7 @@ class PaymentDonation extends CommonObject
* Use this->amounts to have list of lines for the payment
*
* @param User $user User making payment
* @param bool $notrigger false=launch triggers after, true=disable triggers
* @param bool $notrigger false=launch triggers after, true=disable triggers
* @return int <0 if KO, id of payment if OK
*/
function create($user, $notrigger=false)

View File

@ -63,15 +63,15 @@ class ExpeditionLineBatch extends CommonObject
function fetchFromStock($id_stockdluo)
{
$sql = "SELECT";
$sql.= " pb.batch,";
$sql.= " pl.sellby,";
$sql.= " pl.eatby,";
$sql.= " ps.fk_entrepot";
$sql.= " pb.batch,";
$sql.= " pl.sellby,";
$sql.= " pl.eatby,";
$sql.= " ps.fk_entrepot";
$sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
$sql.= " JOIN ".MAIN_DB_PREFIX."product_stock as ps on pb.fk_product_stock=ps.rowid";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."product_lot as pl on pl.batch = pb.batch AND pl.fk_product = ps.fk_product";
$sql.= " WHERE pb.rowid = ".(int) $id_stockdluo;
$sql.= " WHERE pb.rowid = ".(int) $id_stockdluo;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql=$this->db->query($sql);

View File

@ -34,12 +34,12 @@ class PaymentExpenseReport extends CommonObject
* @var string ID to identify managed object
*/
public $element='payment_expensereport';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element='payment_expensereport';
public $table_element='payment_expensereport';
public $picto = 'payment';
var $rowid;

View File

@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
*/
class CommandeFournisseurDispatch extends CommonObject
{
/**
/**
* @var DoliDB Database handler.
*/
public $db;

View File

@ -17,8 +17,8 @@
/**
* \file htdocs/loan/class/loanschedule.class.php
* \ingroup loan
* \brief File of class to manage schedule of loans
* \ingroup loan
* \brief File of class to manage schedule of loans
*/
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@ -547,4 +547,3 @@ class LoanSchedule extends CommonObject
return $result;
}
}

View File

@ -45,10 +45,10 @@ class Task extends CommonObject
public $picto = 'task';
protected $childtables=array('projet_task_time'); // To test if we can delete object
var $fk_task_parent;
public $fk_task_parent;
/**
* @var string proper name for given parameter
/**
* @var string Label of task
*/
public $label;

View File

@ -38,24 +38,24 @@ class Ticketlogs// extends CommonObject
public $db;
/**
* @var string Error code (or message)
*/
public $error;
* @var string Error code (or message)
*/
public $error;
/**
* @var string[] Error codes (or messages)
*/
public $errors = array();
* @var string[] Error codes (or messages)
*/
public $errors = array();
/**
* @var string ID to identify managed object
*/
public $element = 'ticketlogs';
* @var string ID to identify managed object
*/
public $element = 'ticketlogs';
/**
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored
public $id;