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

Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018

Browse Source
This commit is contained in:
Philippe GRAND 2018-08-23 11:13:54 +02:00
commit 9e900e583d
12 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/accountancy/class/accountancysystem.class.php
View File

@ -28,7 +28,7 @@
*/ */
class AccountancySystem class AccountancySystem
{ {
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
@ -43,7 +43,7 @@ class AccountancySystem
var $pcg_type; var $pcg_type;
var $pcg_subtype; var $pcg_subtype;
/** /**
* @var string proper name for given parameter * @var string proper name for given parameter
*/ */
public $label; public $label;

13
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -44,6 +44,7 @@ class AccountingAccount extends CommonObject
* @var int * @var int
*/ */
public $ismultientitymanaged = 1; public $ismultientitymanaged = 1;
/** /**
* 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user
* @var integer * @var integer
@ -51,9 +52,9 @@ class AccountingAccount extends CommonObject
public $restrictiononfksoc = 1; public $restrictiononfksoc = 1;
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
@ -80,9 +81,9 @@ class AccountingAccount extends CommonObject
var $account_category; var $account_category;
/** /**
* @var string proper name for given parameter * @var string proper name for given parameter
*/ */
public $label; public $label;
var $fk_user_author; var $fk_user_author;
var $fk_user_modif; var $fk_user_modif;

6
htdocs/adherents/class/adherentstats.class.php
View File

@ -33,9 +33,9 @@ include_once DOL_DOCUMENT_ROOT . '/adherents/class/subscription.class.php';
class AdherentStats extends Stats class AdherentStats extends Stats
{ {
/** /**
* @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; public $table_element;
var $socid; var $socid;
var $userid; var $userid;

12
htdocs/bookmarks/class/bookmark.class.php
View File

@ -31,9 +31,9 @@ class Bookmark extends CommonObject
public $element='bookmark'; public $element='bookmark';
/** /**
* @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='bookmark'; public $table_element='bookmark';
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
public $picto = 'bookmark'; public $picto = 'bookmark';
@ -44,9 +44,9 @@ class Bookmark extends CommonObject
public $db; public $db;
/** /**
* @var int ID * @var int ID
*/ */
public $id; public $id;
var $fk_user; var $fk_user;
var $datec; var $datec;

6
htdocs/comm/action/class/actioncomm.class.php
View File

@ -37,9 +37,9 @@ class ActionComm extends CommonObject
public $element='action'; public $element='action';
/** /**
* @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 = 'actioncomm'; public $table_element = 'actioncomm';
public $table_rowid = 'id'; public $table_rowid = 'id';
public $picto='action'; public $picto='action';

12
htdocs/comm/action/class/cactioncomm.class.php
View File

@ -29,9 +29,9 @@
class CActionComm class CActionComm
{ {
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
@ -39,9 +39,9 @@ class CActionComm
public $db; public $db;
/** /**
* @var int ID * @var int ID
*/ */
public $id; public $id;
var $code; var $code;
var $type; var $type;

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

@ -29,9 +29,9 @@
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)

6
htdocs/compta/deplacement/class/deplacementstats.class.php
View File

@ -31,9 +31,9 @@ include_once DOL_DOCUMENT_ROOT . '/compta/deplacement/class/deplacement.class.ph
class DeplacementStats extends Stats class DeplacementStats extends Stats
{ {
/** /**
* @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; public $table_element;
var $socid; var $socid;
var $userid; var $userid;

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

@ -71,7 +71,7 @@ abstract class CommonObject
/** /**
* @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 public $table_element;
/** /**
* @var * @var

6
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -44,9 +44,9 @@ class FactureFournisseur extends CommonInvoice
public $element='invoice_supplier'; public $element='invoice_supplier';
/** /**
* @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='facture_fourn'; public $table_element='facture_fourn';
public $table_element_line='facture_fourn_det'; public $table_element_line='facture_fourn_det';
public $fk_element='fk_facture_fourn'; public $fk_element='fk_facture_fourn';

26
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -43,21 +43,21 @@ class ProductFournisseur extends Product
public $db; public $db;
/** /**
* @var string Error code (or message) * @var string Error code (or message)
*/ */
public $error=''; public $error='';
var $product_fourn_price_id; // id of ligne product-supplier var $product_fourn_price_id; // id of ligne product-supplier
/** /**
* @var int ID * @var int ID
*/ */
public $id; public $id;
/** /**
* @deprecated * @deprecated
* @see ref_supplier * @see ref_supplier
*/ */
var $fourn_ref; var $fourn_ref;
var $delivery_time_days; var $delivery_time_days;
var $ref_supplier; // ref supplier (can be set by get_buyprice) var $ref_supplier; // ref supplier (can be set by get_buyprice)
@ -89,9 +89,9 @@ class ProductFournisseur extends Product
var $fourn_multicurrency_unitprice; var $fourn_multicurrency_unitprice;
/** /**
* Constructor * Constructor
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function __construct($db) function __construct($db)
{ {

8
htdocs/livraison/class/livraison.class.php
View File

@ -3,8 +3,8 @@
* Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2006-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be> * Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2011-2012 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -1062,7 +1062,7 @@ class Livraison extends CommonObject
*/ */
class LivraisonLigne extends CommonObjectLine class LivraisonLigne extends CommonObjectLine
{ {
/** /**
* @var DoliDB Database handler. * @var DoliDB Database handler.
*/ */
public $db; public $db;
@ -1075,7 +1075,7 @@ class LivraisonLigne extends CommonObjectLine
var $fk_product; var $fk_product;
var $origin_id; var $origin_id;
/** /**
* @var string proper name for given parameter * @var string proper name for given parameter
*/ */
public $label; public $label;