trimtrailing
This commit is contained in:
parent
50d50c2e10
commit
1182f29864
@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
|
|||||||
*/
|
*/
|
||||||
class AccountancyCategory // extends CommonObject
|
class AccountancyCategory // extends CommonObject
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var DoliDB Database handler.
|
* @var DoliDB Database handler.
|
||||||
*/
|
*/
|
||||||
public $db;
|
public $db;
|
||||||
|
|||||||
@ -28,10 +28,10 @@
|
|||||||
*/
|
*/
|
||||||
class AdvanceTargetingMailing extends CommonObject
|
class AdvanceTargetingMailing extends CommonObject
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var DoliDB Database handler.
|
* @var DoliDB Database handler.
|
||||||
*/
|
*/
|
||||||
public $db;
|
public $db;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string Error code (or message)
|
* @var string Error code (or message)
|
||||||
|
|||||||
@ -716,5 +716,3 @@ class PaymentSocialContribution extends CommonObject
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,21 @@
|
|||||||
<?php
|
<?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
|
* Class to manage comment
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Events class
|
* Events class
|
||||||
*/
|
*/
|
||||||
class Events // extends CommonObject
|
class Events // extends CommonObject
|
||||||
{
|
{
|
||||||
@ -49,7 +49,7 @@ class Events // extends CommonObject
|
|||||||
*/
|
*/
|
||||||
public $id;
|
public $id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var DoliDB Database handler.
|
* @var DoliDB Database handler.
|
||||||
*/
|
*/
|
||||||
public $db;
|
public $db;
|
||||||
|
|||||||
@ -34,9 +34,9 @@ class Menubase
|
|||||||
public $db;
|
public $db;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string Error code (or message)
|
* @var string Error code (or message)
|
||||||
*/
|
*/
|
||||||
public $error;
|
public $error;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string[] Error codes (or messages)
|
* @var string[] Error codes (or messages)
|
||||||
@ -696,4 +696,3 @@ class Menubase
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -76,7 +76,7 @@ class PaymentDonation extends CommonObject
|
|||||||
* Use this->amounts to have list of lines for the payment
|
* Use this->amounts to have list of lines for the payment
|
||||||
*
|
*
|
||||||
* @param User $user User making 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
|
* @return int <0 if KO, id of payment if OK
|
||||||
*/
|
*/
|
||||||
function create($user, $notrigger=false)
|
function create($user, $notrigger=false)
|
||||||
|
|||||||
@ -63,15 +63,15 @@ class ExpeditionLineBatch extends CommonObject
|
|||||||
function fetchFromStock($id_stockdluo)
|
function fetchFromStock($id_stockdluo)
|
||||||
{
|
{
|
||||||
$sql = "SELECT";
|
$sql = "SELECT";
|
||||||
$sql.= " pb.batch,";
|
$sql.= " pb.batch,";
|
||||||
$sql.= " pl.sellby,";
|
$sql.= " pl.sellby,";
|
||||||
$sql.= " pl.eatby,";
|
$sql.= " pl.eatby,";
|
||||||
$sql.= " ps.fk_entrepot";
|
$sql.= " ps.fk_entrepot";
|
||||||
|
|
||||||
$sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
|
$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.= " 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.= ' 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);
|
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
|
||||||
$resql=$this->db->query($sql);
|
$resql=$this->db->query($sql);
|
||||||
|
|||||||
@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
|
|||||||
*/
|
*/
|
||||||
class CommandeFournisseurDispatch extends CommonObject
|
class CommandeFournisseurDispatch extends CommonObject
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @var DoliDB Database handler.
|
* @var DoliDB Database handler.
|
||||||
*/
|
*/
|
||||||
public $db;
|
public $db;
|
||||||
|
|||||||
@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* \file htdocs/loan/class/loanschedule.class.php
|
* \file htdocs/loan/class/loanschedule.class.php
|
||||||
* \ingroup facture
|
* \ingroup loan
|
||||||
* \brief File of class to manage schedule of loans
|
* \brief File of class to manage schedule of loans
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
|
||||||
@ -547,4 +547,3 @@ class LoanSchedule extends CommonObject
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -47,7 +47,7 @@ class Task extends CommonObject
|
|||||||
|
|
||||||
var $fk_task_parent;
|
var $fk_task_parent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string proper name for given parameter
|
* @var string proper name for given parameter
|
||||||
*/
|
*/
|
||||||
public $label;
|
public $label;
|
||||||
|
|||||||
@ -38,24 +38,24 @@ class Ticketlogs// extends CommonObject
|
|||||||
public $db;
|
public $db;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string Error code (or message)
|
* @var string Error code (or message)
|
||||||
*/
|
*/
|
||||||
public $error;
|
public $error;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string[] Error codes (or messages)
|
* @var string[] Error codes (or messages)
|
||||||
*/
|
*/
|
||||||
public $errors = array();
|
public $errors = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string ID to identify managed object
|
* @var string ID to identify managed object
|
||||||
*/
|
*/
|
||||||
public $element = 'ticketlogs';
|
public $element = 'ticketlogs';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string 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 $table_element = 'ticketlogs'; //!< Name of table without prefix where object is stored
|
||||||
|
|
||||||
public $id;
|
public $id;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user