Skip to content

Commit

Permalink
Merge pull request #9430 from grandoc/new_branch_07_09_2018
Browse files Browse the repository at this point in the history 
New branch 07 09 2018
  • Loading branch information
@eldy
eldy committed Sep 7, 2018
2 parents aa562c9 + 035b2be commit 86cf289
Show file tree
Hide file tree
Showing 34 changed files with 92 additions and 108 deletions.
4 changes: 2 additions & 2 deletions htdocs/adherents/admin/adherent.php
View file
Expand Up @@ -33,8 +33,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';

$langs->load("admin");
$langs->load("members");
// Load translation files required by the page
$langs->loadLangs(array("admin","members"));

if (! $user->admin) accessforbidden();

Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/admin/adherent_emails.php
View file
Expand Up @@ -33,8 +33,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';

$langs->load("admin");
$langs->load("members");
// Load translation files required by the page
$langs->loadLangs(array("admin","members"));

if (! $user->admin) accessforbidden();

Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/admin/adherent_extrafields.php
View file
Expand Up @@ -28,8 +28,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

$langs->load("members");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("admin","members"));

$extrafields = new ExtraFields($db);
$form = new Form($db);
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/admin/adherent_type_extrafields.php
View file
Expand Up @@ -31,8 +31,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

$langs->load("members");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("admin","members"));

$extrafields = new ExtraFields($db);
$form = new Form($db);
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/admin/website.php
View file
Expand Up @@ -31,8 +31,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

$langs->load("members");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("admin","members"));

$action=GETPOST('action', 'alpha');

Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/agenda.php
View file
Expand Up @@ -33,8 +33,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

$langs->load("companies");
$langs->load("members");
// Load translation files required by the page
$langs->loadLangs(array("companies","members"));

$id = GETPOST('id','int')?GETPOST('id','int'):GETPOST('rowid','int');

Expand Down
6 changes: 3 additions & 3 deletions htdocs/adherents/document.php
View file
Expand Up @@ -33,9 +33,9 @@
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

$langs->load("members");
$langs->load("companies");
$langs->load('other');
// Load translation files required by the page
$langs->loadLangs(array("companies","members","other"));


$id=GETPOST('id','int');
$action=GETPOST('action','alpha');
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/index.php
View file
Expand Up @@ -29,8 +29,8 @@
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';

$langs->load("companies");
$langs->load("members");
// Load translation files required by the page
$langs->loadLangs(array("companies","members"));

// Security check
$result=restrictedArea($user,'adherent');
Expand Down
6 changes: 2 additions & 4 deletions htdocs/adherents/ldap.php
View file
Expand Up @@ -29,10 +29,8 @@
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

$langs->load("companies");
$langs->load("members");
$langs->load("ldap");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("companies","members","ldap","admin"));

$rowid = GETPOST('id','int');
$action = GETPOST('action','aZ09');
Expand Down
5 changes: 2 additions & 3 deletions htdocs/adherents/note.php
View file
Expand Up @@ -28,9 +28,8 @@
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

$langs->load("companies");
$langs->load("members");
$langs->load("bills");
// Load translation files required by the page
$langs->loadLangs(array("companies","members","bills"));

$action=GETPOST('action','alpha');
$id=GETPOST('id','int');
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/stats/byproperties.php
View file
Expand Up @@ -44,8 +44,8 @@
$startyear=$year-2;
$endyear=$year;

$langs->load("members");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("companies","members"));


/*
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/stats/geo.php
View file
Expand Up @@ -45,8 +45,8 @@
$startyear=$year-2;
$endyear=$year;

$langs->load("members");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("companies","members"));


/*
Expand Down
4 changes: 2 additions & 2 deletions htdocs/adherents/stats/index.php
View file
Expand Up @@ -46,8 +46,8 @@
$startyear=$year-2;
$endyear=$year;

$langs->load("members");
$langs->load("companies");
// Load translation files required by the page
$langs->loadLangs(array("companies","members"));


/*
Expand Down
6 changes: 2 additions & 4 deletions htdocs/adherents/subscription/card.php
View file
Expand Up @@ -29,10 +29,8 @@
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
}

$langs->load("companies");
$langs->load("bills");
$langs->load("members");
$langs->load("users");
// Load translation files required by the page
$langs->loadLangs(array("companies","members","bills","users"));

$adh = new Adherent($db);
$object = new Subscription($db);
Expand Down
6 changes: 2 additions & 4 deletions htdocs/adherents/subscription/info.php
View file
Expand Up @@ -28,10 +28,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';

$langs->load("companies");
$langs->load("bills");
$langs->load("members");
$langs->load("users");
// Load translation files required by the page
$langs->loadLangs(array("companies","members","bills","users"));

if (!$user->rights->adherent->lire)
accessforbidden();
Expand Down
5 changes: 2 additions & 3 deletions htdocs/adherents/type_ldap.php
View file
Expand Up @@ -29,9 +29,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';

$langs->load("members");
$langs->load("admin");
$langs->load("ldap");
// Load translation files required by the page
$langs->loadLangs(array("admin","members","ldap"));

$id = GETPOST('rowid', 'int');
$action = GETPOST('action','alpha');
Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/menus/edit.php
View file
Expand Up @@ -28,9 +28,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';


$langs->load("admin");
$langs->load('other');
// Load translation files required by the page
$langs->loadLangs(array("other","admin"));

if (! $user->admin) accessforbidden();

Expand Down
4 changes: 2 additions & 2 deletions htdocs/admin/menus/index.php
View file
Expand Up @@ -27,8 +27,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';

$langs->load("other");
$langs->load("admin");
// Load translation files required by the page
$langs->loadLangs(array("other","admin"));

if (! $user->admin) accessforbidden();

Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/menus/other.php
View file
Expand Up @@ -24,9 +24,8 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';

$langs->load("users");
$langs->load("admin");
$langs->load("other");
// Load translation files required by the page
$langs->loadLangs(array("user","other","admin"));

if (! $user->admin) accessforbidden();

Expand Down
8 changes: 3 additions & 5 deletions htdocs/admin/system/about.php
View file
Expand Up @@ -28,10 +28,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

$langs->load("admin");
$langs->load("help");
$langs->load("members");
$langs->load("other");
// Load translation files required by the page
$langs->loadLangs(array("help","members","other","admin"));

$action=GETPOST('action','alpha');

Expand Down Expand Up @@ -196,7 +194,7 @@
{
print '<br>';
print '<br>';

if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
{
print $langs->trans("TitleExampleForMajorRelease").':<br>';
Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/system/browser.php
View file
Expand Up @@ -26,9 +26,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

$langs->load("admin");
$langs->load("install");
$langs->load("other");
// Load translation files required by the page
$langs->loadLangs(array("install","other","admin"));

if (! $user->admin)
accessforbidden();
Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/system/constall.php
View file
Expand Up @@ -24,9 +24,8 @@

require '../../main.inc.php';

$langs->load("admin");
$langs->load("user");
$langs->load("install");
// Load translation files required by the page
$langs->loadLangs(array("install","user","admin"));


if (!$user->admin)
Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/system/dolibarr.php
View file
Expand Up @@ -29,9 +29,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

$langs->load("admin");
$langs->load("install");
$langs->load("other");
// Load translation files required by the page
$langs->loadLangs(array("install","other","admin"));

$action=GETPOST('action','alpha');

Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/system/modules.php
View file
Expand Up @@ -25,9 +25,8 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

$langs->load("admin");
$langs->load("install");
$langs->load("other");
// Load translation files required by the page
$langs->loadLangs(array("install","other","admin"));

if (! $user->admin)
accessforbidden();
Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/system/perf.php
View file
Expand Up @@ -26,9 +26,8 @@
require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

$langs->load("admin");
$langs->load("install");
$langs->load("other");
// Load translation files required by the page
$langs->loadLangs(array("install","other","admin"));

if (! $user->admin)
accessforbidden();
Expand Down
8 changes: 4 additions & 4 deletions htdocs/asset/class/asset.class.php
View file
Expand Up @@ -109,16 +109,16 @@ class Asset extends CommonObject
public $entity;

/**
* @var string Asset label
*/
public $label;
* @var string Asset label
*/
public $label;

public $amount;

/**
* @var int Thirdparty ID
*/
public $fk_soc;
public $fk_soc;

/**
* @var string description
Expand Down
18 changes: 9 additions & 9 deletions htdocs/bookmarks/class/bookmark.class.php
View file
Expand Up @@ -29,9 +29,9 @@
class Bookmark extends CommonObject
{
/**
* @var string ID to identify managed object
*/
public $element='bookmark';
* @var string ID to identify managed object
*/
public $element='bookmark';

/**
* @var string Name of table without prefix where object is stored
Expand All @@ -41,9 +41,9 @@ class Bookmark extends CommonObject
public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bookmark';
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'bookmark';

/**
* @var DoliDB Database handler.
Expand All @@ -56,9 +56,9 @@ class Bookmark extends CommonObject
public $id;

/**
* @var int User ID
*/
public $fk_user;
* @var int User ID
*/
public $fk_user;

public $datec;
public $url;
Expand Down
8 changes: 4 additions & 4 deletions htdocs/comm/action/class/actioncomm.class.php
View file
Expand Up @@ -47,9 +47,9 @@ class ActionComm extends CommonObject
public $table_rowid = 'id';

/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='action';
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto='action';

/**
* 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
Expand All @@ -67,7 +67,7 @@ class ActionComm extends CommonObject
* Id of the event
* @var int
*/
public $id;
public $id;

/**
* Id of the event. Use $id as possible
Expand Down
6 changes: 3 additions & 3 deletions htdocs/comm/action/class/cactioncomm.class.php
View file
Expand Up @@ -56,9 +56,9 @@ class CActionComm
public $color;

/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto;
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/
public $picto;

public $type_actions=array();

Expand Down

0 comments on commit 86cf289

Please sign in to comment.