Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/core/db/mysqli.class.php

@@ -69,7 +69,7 @@ class DoliDBMysqli extends DoliDB
 
         //print "Name DB: $host,$user,$pass,$name<br>";
 
-        if (! function_exists("mysqli_connect"))
+        if (! class_exists('mysqli'))
         {
             $this->connected = false;
             $this->ok = false;

htdocs/core/lib/usergroups.lib.php

@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2015	    Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
  *
  * 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
@@ -93,6 +94,15 @@ function user_prepare_head($object)
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
 
+	if (! empty($conf->hrm->enabled) && $user->rights->hrm->employee->read)
+    {
+		// Bank
+    	$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
+    	$head[$h][1] = $langs->trans("Bank");
+    	$head[$h][2] = 'bank';
+    	$h++;
+	}
+
     //Info on users is visible only by internal user
     if (empty($user->societe_id))
     {

htdocs/install/mysql/migration/3.8.0-3.9.0.sql

@@ -207,7 +207,24 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   status            smallint DEFAULT 1
 ) ENGINE=InnoDB;
 
-
+CREATE TABLE IF NOT EXISTS llx_user_rib (
+  rowid          integer AUTO_INCREMENT PRIMARY KEY,
+  fk_user        integer      NOT NULL,
+  entity         integer DEFAULT 1 NOT NULL,	-- multi company id
+  datec          datetime,
+  tms            timestamp,
+  label          varchar(30),
+  bank           varchar(255),  -- bank name
+  code_banque    varchar(128),  -- bank code
+  code_guichet   varchar(6),    -- desk code
+  number         varchar(255),  -- account number
+  cle_rib        varchar(5),    -- key of bank account
+  bic            varchar(11),   -- 11 according to ISO 9362
+  iban_prefix    varchar(34),	-- full iban. 34 according to ISO 13616
+  domiciliation  varchar(255),
+  proprio        varchar(60),
+  owner_address  varchar(255)
+)ENGINE=innodb;
 
 ALTER TABLE llx_projet_task_time ADD COLUMN invoice_id integer DEFAULT NULL;
 ALTER TABLE llx_projet_task_time ADD COLUMN invoice_line_id integer DEFAULT NULL;

htdocs/install/mysql/tables/llx_user_rib.sql

@@ -0,0 +1,37 @@
+-- =============================================================================
+-- Copyright (C) 2015     Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+--
+-- 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/>.
+--
+-- =============================================================================
+
+create table llx_user_rib
+(
+  rowid          integer AUTO_INCREMENT PRIMARY KEY,
+  fk_user        integer      NOT NULL,
+  entity         integer DEFAULT 1 NOT NULL,	-- multi company id
+  datec          datetime,
+  tms            timestamp,
+  label          varchar(30),
+  bank           varchar(255),  -- bank name
+  code_banque    varchar(128),  -- bank code
+  code_guichet   varchar(6),    -- desk code
+  number         varchar(255),  -- account number
+  cle_rib        varchar(5),    -- key of bank account
+  bic            varchar(11),   -- 11 according to ISO 9362
+  iban_prefix    varchar(34),	-- full iban. 34 according to ISO 13616
+  domiciliation  varchar(255),
+  proprio        varchar(60),
+  owner_address  varchar(255)
+)ENGINE=innodb;

htdocs/theme/md/graph-color.php

@@ -17,8 +17,8 @@
  */
 
 /**
- *	\file       htdocs/theme/eldy/graph-color.php
- *	\brief      File to declare colors to use to build graphics with theme Eldy
+ *	\file       htdocs/theme/md/graph-color.php
+ *	\brief      File to declare colors to use to build graphics with theme Material Design
  *  \ingroup    core
  *
  *  To include file, do this:

htdocs/theme/md/img/menus/README.md

@@ -1,12 +0,0 @@
-
-Tutorial to create a new image for menu:
-
-1) First find an image.
-2) With Gimp, open image and check there is a alpha channel. If not add one.
-3) Convert image into back and white (Menu Image - Mode - Grey levels).
-4) Use the degrade tool with option:
-* Erase color
-* Opacity: 50 +/-
-* Offset: 0
-* Shape: Linear
-Il est possible aussi d'augmenter la transparence globale depuis le calque.