From 8912e111a30d83b717f805eac3bc99dd4368524a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 2 Oct 2015 11:21:23 +0200
Subject: [PATCH 1/6] Fix: wrong date format

---
 htdocs/compta/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 8dbd132297e..59ed9afc504 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015 	   Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
@@ -831,7 +831,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
                 $societestatic->code_fournisseur = $obj->code_fournisseur;
 				print $societestatic->getNomUrl(1,'customer',44);
 				print '</td>';
-				print '<td align="right">'.$obj->datelimite.'</td>';
+				print '<td align="right">'.dol_print_date($db->jdate($obj->datelimite),'day').'</td>';
 				if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>';
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.price($obj->am).'</td>';
@@ -932,7 +932,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
                 $societestatic->code_client = $obj->code_client;
                 $societestatic->code_fournisseur = $obj->code_fournisseur;
 				print '<td>'.$societestatic->getNomUrl(1, 'supplier', 44).'</td>';
-				print '<td align="right">'.$obj->date_lim_reglement.'</td>';
+				print '<td align="right">'.dol_print_date($db->jdate($obj->date_lim_reglement),'day').'</td>';
 				if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>';
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.price($obj->am).'</td>';

From 17a5b0a0f4e121704c5f80513c267ef5530f7592 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Oct 2015 11:58:19 +0200
Subject: [PATCH 2/6] Fix css

---
 htdocs/comm/action/index.php    |  6 +++---
 htdocs/product/stats/card.php   |  2 +-
 htdocs/theme/eldy/style.css.php | 28 +++++++++++++++++-----------
 htdocs/theme/md/style.css.php   | 16 ++++++++--------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 58159b59b75..dd2bd1dd9c3 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -949,7 +949,7 @@ if (empty($action) || $action == 'show_month')      // View by month
     $newparam=preg_replace('/viewcal=[0-9]+&?/i','',$newparam);
     $newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam);	// Restore correct parameter
     $newparam.='&viewcal=1';
-    echo '<table width="100%" class="nocellnopadd cal_month">';
+    echo '<table width="100%" class="noborder nocellnopadd cal_month">';
     echo ' <tr class="liste_titre">';
     $i=0;
     while ($i < 7)
@@ -1026,7 +1026,7 @@ elseif ($action == 'show_week') // View by week
     $newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam);
     $newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam);	// Restore correct parameter
     $newparam.='&viewweek=1';
-    echo '<table width="100%" class="nocellnopadd cal_month">';
+    echo '<table width="100%" class="noborder nocellnopadd cal_month">';
     echo ' <tr class="liste_titre">';
     $i=0;
     while ($i < 7)
@@ -1083,7 +1083,7 @@ else    // View by day
 
     $timestamp=dol_mktime(12,0,0,$month,$day,$year);
     $arraytimestamp=dol_getdate($timestamp);
-    echo '<table width="100%" class="nocellnopadd cal_month">';
+    echo '<table width="100%" class="noborder nocellnopadd cal_month">';
     echo ' <tr class="liste_titre">';
     echo '  <td align="center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
     echo " </tr>\n";
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index d8ca1fa15d0..5fe6d5a4be3 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -223,7 +223,7 @@ if (! empty($id) || ! empty($ref))
 
 			// Show graph
 
-			print '<table class="border" width="100%">';
+			print '<table class="noborder" width="100%">';
 			// Label
 			print '<tr class="liste_titre"><td colspan="2">';
 			print $graphfiles[$key]['label'];
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f47da8120c3..3d5ef147e26 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -106,19 +106,20 @@ $colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+r
 $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line pair
 $colorbackbody='255,255,255';
 $colortext='40,40,40';
-$fontsize='13';
+$fontsize='12';
 $fontsizesmaller='11';
 $usegradient=1;
 
-// Eldy colors
+
+// Case of option always editable
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180';    // topmenu (140,160,185)
+//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180';       	// title of arrays TO MATCH ELDY (140,160,185)
+if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230';        // title of arrays TO MATCH BOOTSTRAP
+//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER='';			            // color for links
+
+// Fields not yet editable by default
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-	// Case of option always editable
-	if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180';    // topmenu (140,160,185)
-    //if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180';       	// title of arrays TO MATCH ELDY (140,160,185)
-    if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230';        // title of arrays TO MATCH BOOTSTRAP
-    if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER='';			            // color for links
-
 	// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
 	$conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
@@ -138,6 +139,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
     $conf->global->THEME_ELDY_FONT_SIZE1='12';
     $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
+//var_dump($conf->global->THEME_ELDY_BACKBODY);
 
 // Cas of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
 $colorbackhmenu1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
@@ -1957,17 +1959,21 @@ table.noborder, table.formdoc, div.noborder {
 	border-spacing: 0px;
 
 	border-top-width: 1px;
-	border-top-color: #CCC;
+	border-top-color: #BBB;
 	border-top-style: solid;
 
 	border-right-width: 1px;
-	border-right-color: #CCC;
+	border-right-color: #BBB;
 	border-right-style: solid;
 
 	border-left-width: 1px;
-	border-left-color: #CCC;
+	border-left-color: #BBB;
 	border-left-style: solid;
 
+	border-bottom-width: 1px;
+	border-bottom-color: #BBB;
+	border-bottom-style: solid;
+	
 	margin: 0px 0px 2px 0px;
 
 	-moz-box-shadow: 2px 2px 4px #CCC;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 00f5ced495e..c1c4ffe0edb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -111,15 +111,15 @@ $fontsize='13';
 $fontsizesmaller='11';
 $usegradient=1;
 
-// Eldy colors
+// Case of option always editable
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F'));   // topmenu (140,160,185)
+if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180';       	// title of arrays TO MATCH ELDY (140,160,185)
+//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230';     // title of arrays TO MATCH BOOTSTRAP
+//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER='';			            // color for links
+    
+// Fields not yet editable by default
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-	// Case of option always editable
-	if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F'));   // topmenu (140,160,185)
-    if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180';       	// title of arrays TO MATCH ELDY (140,160,185)
-    //if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230';     // title of arrays TO MATCH BOOTSTRAP
-    if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER='';			            // color for links
-    
 	// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
     // 90A4AE, 607D8B, 455A64, 37474F
     $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
@@ -1848,7 +1848,7 @@ table.noborder, table.formdoc, div.noborder {
 	border-spacing: 0px;
 
 	border-width: 1px;
-	border-color: #CCC;
+	border-color: #BBB;
 	border-style: solid;
 
 	margin: 0px 0px 2px 0px;

From 1ffe8f55cafa965a78a5548c08cfdaf6a9c8802f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Oct 2015 15:37:32 +0200
Subject: [PATCH 3/6] Clean skin code. Prepare to allow more option to choose
 colors.

---
 htdocs/theme/eldy/style.css.php | 62 +++++++++++---------------------
 htdocs/theme/md/style.css.php   | 63 ++++++++++++---------------------
 2 files changed, 43 insertions(+), 82 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3d5ef147e26..28d5e5c078d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -74,36 +74,21 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 $dol_use_jmobile=$conf->dol_use_jmobile;
 
 
-// Define reference colors
-// Example: Light grey: $colred=235;$colgreen=235;$colblue=235;
-// Example: Pink:       $colred=230;$colgreen=210;$colblue=230;
-// Example: Green:      $colred=210;$colgreen=230;$colblue=210;
-// Example: Ocean:      $colred=220;$colgreen=220;$colblue=240;
 //$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
-$colred  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,0,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,0,2)));
-$colgreen=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,2,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,2,2)));
-$colblue =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,4,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,4,2)));
 
 // Colors
-$isred=max(0,(2*$colred-$colgreen-$colblue)/2);        // 0 - 255
-$isgreen=max(0,(2*$colgreen-$colred-$colblue)/2);      // 0 - 255
-$isblue=max(0,(2*$colblue-$colred-$colgreen)/2);       // 0 - 255
-$colorbackhmenu1=($colred-3).','.($colgreen-3).','.($colblue-3);         // topmenu
-$colorbackhmenu2=($colred+5).','.($colgreen+5).','.($colblue+5);
-$colorbackvmenu1=($colred+15).','.($colgreen+16).','.($colblue+17);      // vmenu
-$colorbackvmenu2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5);    // title of array
-$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbackhmenu1='140,150,180';      // topmenu
+$colorbackvmenu1='255,255,255';      // vmenu
+$colorbacktitle1='230,230,230';      // title of array
 $colorbacktabcard1='255,255,255';  // card
-$colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
 $colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line pair
-$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line pair
-$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line pair
+$colorbacklinepair1='250,250,250';    // line pair
+$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepairhover='238,246,252';    // line pair
 $colorbackbody='255,255,255';
 $colortext='40,40,40';
 $fontsize='12';
@@ -121,41 +106,34 @@ if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BAC
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
 	// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
-	$conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
-    $conf->global->THEME_ELDY_VERMENU_BACK2='255,255,255';
-    $conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
-    $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';
-    $conf->global->THEME_ELDY_BACKTABCARD2='210,210,210';     // card
+    $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_BACKBODY='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
     $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
     $conf->global->THEME_ELDY_LINEPAIR1='250,250,250';
     $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
     $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
     $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
+    $conf->global->THEME_ELDY_BACKBODY='255,255,255';
     
     $conf->global->THEME_ELDY_FONT_SIZE1='12';
     $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
 //var_dump($conf->global->THEME_ELDY_BACKBODY);
+//var_dump($user->conf->THEME_ELDY_BACKTITLE1);
 
-// Cas of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
-$colorbackhmenu1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackhmenu2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$conf->global->THEME_ELDY_TOPMENU_BACK2)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
+// Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
+$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
-$colorbackvmenu2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$conf->global->THEME_ELDY_VERMENU_BACK2)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$user->conf->THEME_ELDY_VERMENU_BACK2);
 $colorbacktitle1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1)   ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1)      :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktitle2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE2)   ?$colorbacktitle2:$conf->global->THEME_ELDY_BACKTITLE2)      :(empty($user->conf->THEME_ELDY_BACKTITLE2)?$colorbacktitle2:$user->conf->THEME_ELDY_BACKTITLE2);
 $colorbacktabcard1   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1)  :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabcard2   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD2) ?$colorbacktabcard2:$conf->global->THEME_ELDY_BACKTABCARD2)  :(empty($user->conf->THEME_ELDY_BACKTABCARD2)?$colorbacktabcard2:$user->conf->THEME_ELDY_BACKTABCARD2);
 $colorbacktabactive  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
 $colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1)  ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
 $colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
 $colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
 $colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinepairhover  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER)    ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER)    :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
+$colorbacklinepairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER)    ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER)    :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
 $colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
 $colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
 $fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
@@ -169,14 +147,18 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 }
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
-$colorbackbody=join(',',colorStringToArray($colorbackbody));
 $colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));
-$colorbackhmenu2=join(',',colorStringToArray($colorbackhmenu2));
 $colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));
-$colorbackvmenu2=join(',',colorStringToArray($colorbackvmenu2));
+$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));
 $colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
-$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+$colorbacktabactive=join(',',colorStringToArray($colorbacktabactive));
+$colorbacklineimpair1=join(',',colorStringToArray($colorbacklineimpair1));
+$colorbacklineimpair2=join(',',colorStringToArray($colorbacklineimpair2));
+$colorbacklinepair1=join(',',colorStringToArray($colorbacklinepair1));
+$colorbacklinepair2=join(',',colorStringToArray($colorbacklinepair2));
 if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringToArray($colorbacklinepairhover));
+$colorbackbody=join(',',colorStringToArray($colorbackbody));
+$colortext=join(',',colorStringToArray($colorbackvmenu1));
 
 // Set text color to black or white
 $tmppart=explode(',',$colorbackhmenu1);
@@ -197,8 +179,6 @@ if ($tmpval <= 340) { $colortextbacktab='FFF'; }
 else { $colortextbacktab='111'; }
 
 print '/*'."\n";
-print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n";
-print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n";
 print 'colorbackbody='.$colorbackbody."\n";
 print 'colorbackvmenu1='.$colorbackvmenu1."\n";
 print 'colorbackhmenu1='.$colorbackhmenu1."\n";
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c1c4ffe0edb..37265b852f4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -75,38 +75,23 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
 $dol_use_jmobile=$conf->dol_use_jmobile;
 
 
-// Define reference colors
-// Example: Light grey: $colred=235;$colgreen=235;$colblue=235;
-// Example: Pink:       $colred=230;$colgreen=210;$colblue=230;
-// Example: Green:      $colred=210;$colgreen=230;$colblue=210;
-// Example: Ocean:      $colred=220;$colgreen=220;$colblue=240;
 //$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
-$colred  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,0,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,0,2)));
-$colgreen=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,2,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,2,2)));
-$colblue =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,4,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,4,2)));
 
 // Colors
-$isred=max(0,(2*$colred-$colgreen-$colblue)/2);        // 0 - 255
-$isgreen=max(0,(2*$colgreen-$colred-$colblue)/2);      // 0 - 255
-$isblue=max(0,(2*$colblue-$colred-$colgreen)/2);       // 0 - 255
-$colorbackhmenu1=($colred-3).','.($colgreen-3).','.($colblue-3);         // topmenu
-$colorbackhmenu2=($colred+5).','.($colgreen+5).','.($colblue+5);
-$colorbackvmenu1=($colred+15).','.($colgreen+16).','.($colblue+17);      // vmenu
-$colorbackvmenu2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5);    // title of array
-$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbackhmenu1='140,150,180';      // topmenu
+$colorbackvmenu1='255,255,255';      // vmenu
+$colorbacktitle1='230,230,230';      // title of array
 $colorbacktabcard1='255,255,255';  // card
-$colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15);
-$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15);
+$colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
 $colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3));    // line pair
-$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3));    // line pair
-$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));    // line pair
+$colorbacklinepair1='242,242,242';    // line pair
+$colorbacklinepair2='248,248,248';    // line pair
+$colorbacklinepairhover='238,246,252';    // line pair
 $colorbackbody='255,255,255';
-$colortext='40,40,40';
+$colortext='50,50,130';
 $fontsize='13';
 $fontsizesmaller='11';
 $usegradient=1;
@@ -122,35 +107,29 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
 	// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
     // 90A4AE, 607D8B, 455A64, 37474F
-    $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
 	$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255';    // vmenu
-    $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
-    $conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
     $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
-    $conf->global->THEME_ELDY_BACKTABCARD2='234,234,234';
     $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_BACKBODY='255,255,255';
+    $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
+    $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
     $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
     $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
     $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
-    $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
-    $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
     $conf->global->THEME_ELDY_USE_HOVER=='238,246,252';
+    $conf->global->THEME_ELDY_BACKBODY='255,255,255';
     
     $conf->global->THEME_ELDY_TEXT='50,50,130';
     $conf->global->THEME_ELDY_FONT_SIZE1='13';
     $conf->global->THEME_ELDY_FONT_SIZE2='11';
 }
+//var_dump($conf->global->THEME_ELDY_BACKBODY);
+//var_dump($user->conf->THEME_ELDY_BACKTITLE1);
 
-// Cas of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
+// Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
 $colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackhmenu2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$conf->global->THEME_ELDY_TOPMENU_BACK2)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$user->conf->THEME_ELDY_TOPMENU_BACK2);
 $colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
-$colorbackvmenu2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$conf->global->THEME_ELDY_VERMENU_BACK2)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$user->conf->THEME_ELDY_VERMENU_BACK2);
 $colorbacktitle1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1)   ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1)      :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktitle2     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE2)   ?$colorbacktitle2:$conf->global->THEME_ELDY_BACKTITLE2)      :(empty($user->conf->THEME_ELDY_BACKTITLE2)?$colorbacktitle2:$user->conf->THEME_ELDY_BACKTITLE2);
 $colorbacktabcard1   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1)  :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabcard2   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD2) ?$colorbacktabcard2:$conf->global->THEME_ELDY_BACKTABCARD2)  :(empty($user->conf->THEME_ELDY_BACKTABCARD2)?$colorbacktabcard2:$user->conf->THEME_ELDY_BACKTABCARD2);
 $colorbacktabactive  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
 $colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1)  ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
 $colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
@@ -170,14 +149,18 @@ if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 }
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
-$colorbackbody=join(',',colorStringToArray($colorbackbody));
 $colorbackhmenu1=join(',',colorStringToArray($colorbackhmenu1));
-$colorbackhmenu2=join(',',colorStringToArray($colorbackhmenu2));
 $colorbackvmenu1=join(',',colorStringToArray($colorbackvmenu1));
-$colorbackvmenu2=join(',',colorStringToArray($colorbackvmenu2));
+$colorbacktitle1=join(',',colorStringToArray($colorbacktitle1));
 $colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
-$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
+$colorbacktabactive=join(',',colorStringToArray($colorbacktabactive));
+$colorbacklineimpair1=join(',',colorStringToArray($colorbacklineimpair1));
+$colorbacklineimpair2=join(',',colorStringToArray($colorbacklineimpair2));
+$colorbacklinepair1=join(',',colorStringToArray($colorbacklinepair1));
+$colorbacklinepair2=join(',',colorStringToArray($colorbacklinepair2));
 if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringToArray($colorbacklinepairhover));
+$colorbackbody=join(',',colorStringToArray($colorbackbody));
+$colortext=join(',',colorStringToArray($colorbackvmenu1));
 
 // Set text color to black or white
 $tmppart=explode(',',$colorbackhmenu1);
@@ -199,8 +182,6 @@ else { $colortextbacktab='111'; }
 
 
 print '/*'."\n";
-print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n";
-print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n";
 print 'colorbackbody='.$colorbackbody."\n";
 print 'colorbackvmenu1='.$colorbackvmenu1."\n";
 print 'colorbackhmenu1='.$colorbackhmenu1."\n";

From 43f09dfccf433af495b6480c934e14391604c520 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Oct 2015 16:11:25 +0200
Subject: [PATCH 4/6] Work on theme

---
 htdocs/core/lib/functions.lib.php             |   5 +++--
 htdocs/product/list.php                       |  12 ++++++------
 htdocs/theme/eldy/img/1downarrow.png          | Bin 225 -> 177 bytes
 htdocs/theme/eldy/img/1downarrow_selected.png | Bin 341 -> 205 bytes
 htdocs/theme/eldy/img/1uparrow.png            | Bin 232 -> 179 bytes
 htdocs/theme/eldy/img/1uparrow_selected.png   | Bin 355 -> 192 bytes
 htdocs/theme/eldy/img/filter.png              | Bin 206 -> 237 bytes
 htdocs/theme/eldy/style.css.php               |   3 +++
 htdocs/theme/md/img/1downarrow.png            | Bin 225 -> 177 bytes
 htdocs/theme/md/img/1downarrow_selected.png   | Bin 341 -> 205 bytes
 htdocs/theme/md/img/1uparrow.png              | Bin 232 -> 179 bytes
 htdocs/theme/md/img/1uparrow_selected.png     | Bin 355 -> 192 bytes
 12 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f07ff99c72a..81f14683383 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2810,9 +2810,10 @@ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictois
  *	@param	string	$picto				Icon to use before title (should be a 32x32 transparent png file)
  *	@param	int		$pictoisfullpath	1=Icon name is a full absolute url of image
  *  @param	string	$morehtml			More html to show
+ *  @param  string  $morecss            More css to the table
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='')
+function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title_generic.png', $pictoisfullpath=0, $morehtml='', $morecss='')
 {
 	global $conf,$langs;
 
@@ -2830,7 +2831,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 
 	print "\n";
 	print "<!-- Begin title '".$titre."' -->\n";
-	print '<table width="100%" border="0" class="notopnoleftnoright" style="margin-bottom: 6px;"><tr>';
+	print '<table width="100%" border="0" class="notopnoleftnoright'.($morecss?' '.$morecss:'').'" style="margin-bottom: 6px;"><tr>';
 
 	// Left
 	if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, '', $pictoisfullpath).'</td>';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 77e8373d2a7..de5abca1de4 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -315,13 +315,13 @@ else
     			$titlefield=$langs->trans("SellingPrice");
     		   	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
    				{
-					$titlefields=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
+					$titlefield=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
     			}
-    			print_liste_field_titre($titlefields, $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
+    			print_liste_field_titre($titlefield, $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
     		}
-    		if ($user->rights->fournisseur->lire) print '<td class="liste_titre" align="right">'.$langs->trans("BuyingPriceMinShort").'</td>';
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("DesiredStock").'</td>';
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print '<td class="liste_titre" align="right">'.$langs->trans("PhysicalStock").'</td>';
+    		if ($user->rights->fournisseur->lire) print_liste_field_titre($langs->trans("BuyingPriceMinShort"), '', '', '', '', 'align="right"');
+    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("DesiredStock"), '', '', '', '', 'align="right"');
+    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("PhysicalStock"), '', '', '', '', 'align="right"');
     		print_liste_field_titre($langs->trans("Sell"), $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
             print_liste_field_titre($langs->trans("Buy"), $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder);
             print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
@@ -553,7 +553,7 @@ else
     		$param.=($fourn_id?"&fourn_id=".$fourn_id:"");
     		$param.=($search_categ?"&search_categ=".$search_categ:"");
     		$param.=isset($type)?"&type=".$type:"";
-    		print_barre_liste('', $page, "list.php", $param, $sortfield, $sortorder,'',$num,$nbtotalofrecords);
+    		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', '', '', 'paginationatbottom');
 
     		$db->free($resql);
 
diff --git a/htdocs/theme/eldy/img/1downarrow.png b/htdocs/theme/eldy/img/1downarrow.png
index 1d134ab3e4e52167abaa33369164ffb8fd3bf060..1d8a1164ae05a0abad46da914151060a8f2ebbfc 100644
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD<E3??1C2$m1;Vh%9Dc
z;1&j9Muu5)B!GhKC7!;n?Dx5t_}G==cj-j}g(OQ{BTAg}b8}PkN*J7rQWHy3QxwWG
zOEMJPJ$(bh8~Mb6iex=q978y+Cnp?Wl#=+Te2~rOA)C)t-WhEs1`n7Sw*BJ&di1uy
QDxg9JPgg&ebxsLQ0Nds-IRF3v

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7
zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R
zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsROPZ!4!j_Bl+21Yj)
z@1~FT!pe`u<=osF@8|Rg95}$bY~Me|RmrRy_cfO?T>ablD)mo)5*I^qHHTgA{^DOi
P0~kDA{an^LB{Ts5Q-5JO

diff --git a/htdocs/theme/eldy/img/1downarrow_selected.png b/htdocs/theme/eldy/img/1downarrow_selected.png
index 5caf8ead52d3673720fa0f03631ef47ea04bf86e..17934d7c62e030bdb4c83c7807176aed5fbfa378 100644
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD<E3??1C2$m1;Vh%9Dc
z;1&j9Muu5)B!GhKC7!;n?Dx5t_*g9_yxY1EC?r|p8d2h$pPQSSSHj?2l$uzQnxasi
zS(2gP?&%v4-pD5oRAlMt;uyklJvre3lZ2$iHUIE4KaL+b@S*>qJu~y+$&!sTc|hRx
s^8f8kUoTHIacBu_Q8*;ww1R=b&P8h0yG7ZPfQB%5y85}Sb4q9e0MWZWQ2+n{

literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZddL^zACC){ui6xo&c?uz!xv31r
ziMe_TMy3i`rI~pOMg|6^3Pwg&rsh^gh6>sSh6V=qS3gt$b+VUu`ns}T=jP^@XT2KK
z%MCKQz$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl{~4e$wZ{r~@e`NY{Zb62I;
zwMAzYRL@+}z4>6pl=(oESW?xvY}3?zr-5YcoE1O?K$R1A9BW^_y?W{bph*3^)j+}G
z2{U7JiZ)!heeV9VV|SnKxO}gF*9oBDvuDrJG~WsXEn+MQ@(X5gcy=QV$T9JBaSY+O
zo}6%iNkv6<$&yr-loUyp9Zww`eC9MZavyn;&UkY3rjvyQPE(8wHy<c5TqMQB&?(8(
Up)Wag9#B7nr>mdKI;Vst04aZdD*ylh

diff --git a/htdocs/theme/eldy/img/1uparrow.png b/htdocs/theme/eldy/img/1uparrow.png
index 70ea061dc5e90f4901b94529ef13ffbbc21e640b..331731b750c619c3069b9de40a56637e9d241419 100644
GIT binary patch
delta 164
zcmaFCxS4T+cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e
zWH0gbb!ETL#l*)hRlZ}|aiEZ7iEBiObAE1aYF-J0b5UwyNotBhd1gt5g1e`0KzJjc
zI8c$ir;B3<$Mxid1Kd&)QU<O6jQ_ZcwsFWV<WO!g2vKHa5b5XtDzd=y7*H*Pr>mdK
II;Vst05#Vwt^fc4

delta 217
zcmdnY_=0hQcs(ZvGXn#IO@*%_kV*^i332`Z|Nn#?#~PPys-C%|X6~x;iL;9*%*<`>
zPOobNGJt5qh1=bm54Nw~UOja|?VJ_$^Hu|;Vsnbl-G4T9-)W#mpde5Ls4+UL0H}D;
z@yiuc<^xe;N!78tPy2VB*m3z@QuwCpKpTS?OM?7@862M7NCWZ=JY5_^IIbtBG%&lF
zEPGTd5j^kX^J0$RE<p~t#u<lt5<bjnoG5+h*U684f}9FG%nYu|>>{7{ElmLGW$<+M
Kb6Mw<&;$V7H)R0;

diff --git a/htdocs/theme/eldy/img/1uparrow_selected.png b/htdocs/theme/eldy/img/1uparrow_selected.png
index 36d25a408c544e5edc09ee7abaeca830896bb2fc..d9d8462fe43c5b02530a4a4c219f2a514f4e8536 100644
GIT binary patch
delta 177
zcmaFNbbxV!cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e
zWH0gbb!ETL#l*+T7TCXn3n(O6;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq
z4pgM$>Eal|aXmTV0DIcG`Ihp|Fa85TpjL~b6Gx&OTieXfSA_+*^7K6Xk7U^~L?(;7
Uty|;v0H~3{)78&qol`;+02LxN&Hw-a

delta 341
zcmX@W_?T&ecs(ZvGXn#IO@*%_kkTu0jVN(0N=+=u%+FH@$;?e<C{E1PQ!p}B$STdu
zQ!p|xFjX)zwlXlVGBQ%oHZU|Wa8PK82I^!l@$_|Nzs}9gFDJ6>=bRltA<hDi$YKTt
zt`8v0=(NUU22hYC-O<;Pfnj4m_n$;oAiq8{z$e7@|Ns9Jb{uP5wyApNlA5`z$|ue)
zo-i}FxjVhC4afkZ4Hs^AZ$8+*dVBTM1+{Zl)X!TDl#0zMI(Prs)P1Lc8i9g95unEC
ztOB6oMaM5!OqmZvi6vFX?mq3`bz;Zmd(WOd+Y#wI7icSENswPKgTu2MX?{SSnWu|m
z2*>s0gae!+4|OV8JvF?&qCCU+&IpMG1_e!G=q&!M(a11efSFlY*qB>e+L~Qme3B(Y
Yu@}=l%^LrcKob}|UHx3vIVCg!0B-()1ONa4

diff --git a/htdocs/theme/eldy/img/filter.png b/htdocs/theme/eldy/img/filter.png
index 917715107bde9b14abbe77024e805b1a03d40153..ee34a22c78e0cd31d74739b7cb8a1bda9aa6e608 100644
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^d_c^_!2%@pE-d!}QcOwS?k)`f+xyS#2l6-zJR*x3
z7`TN&n2}-D90{Nxdx@v7EBk#eCSE;pf6mh<fI^Zbt`Q~9`MJ5Nc_j?aMX8A;sVNHO
znI#zt?w-B@;f;LaKt++BE{-7*m)D-z$m^QG;QFxt&k+{44UMw*m`aviHf;P9f0&1D
z!uMI%Jvx|LgYV9n9HZwEkeQ<X-*^_Ym;6!9b&GD^)!kxsKlgbR^OAcD#9Y7X9a7X&
c)8SwLPehZqd3*DTQlKRap00i_>zopr0Ca^+T>t<8

literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!VDx|PJVD7NNEN5gt!7}Mn*;v5fO25aambe
zAQu7}8X6WXSaA68;iE^79y@mI&Ye5$jrD9mIrfquzhJN$Udfh)Hdld6A5Ry@5RU7m
zM-2rV3<O*cUZ2arqrj@^;c@s+L$k(-IV^oH{;Mh$E=Zfrs**6VeC-MwL)UL&#S1Pi
r;-1{jXR&lw^WAw2>vq+CoUK~H7~vtEB6V#~9mon#S3j3^P6<r_TRB0h

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 28d5e5c078d..c9294837f14 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2187,6 +2187,9 @@ div.pagination li.pagination .active {
 div.pagination li.paginationafterarrows {
 	margin-left: 10px;
 }
+.paginationatbottom {
+	margin-top: 9px;
+}
 
 /* Prepare to remove class pair - impair
 .noborder > tbody > tr:nth-child(even) td {
diff --git a/htdocs/theme/md/img/1downarrow.png b/htdocs/theme/md/img/1downarrow.png
index 1d134ab3e4e52167abaa33369164ffb8fd3bf060..1d8a1164ae05a0abad46da914151060a8f2ebbfc 100644
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD<E3??1C2$m1;Vh%9Dc
z;1&j9Muu5)B!GhKC7!;n?Dx5t_}G==cj-j}g(OQ{BTAg}b8}PkN*J7rQWHy3QxwWG
zOEMJPJ$(bh8~Mb6iex=q978y+Cnp?Wl#=+Te2~rOA)C)t-WhEs1`n7Sw*BJ&di1uy
QDxg9JPgg&ebxsLQ0Nds-IRF3v

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7
zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R
zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsROPZ!4!j_Bl+21Yj)
z@1~FT!pe`u<=osF@8|Rg95}$bY~Me|RmrRy_cfO?T>ablD)mo)5*I^qHHTgA{^DOi
P0~kDA{an^LB{Ts5Q-5JO

diff --git a/htdocs/theme/md/img/1downarrow_selected.png b/htdocs/theme/md/img/1downarrow_selected.png
index 5caf8ead52d3673720fa0f03631ef47ea04bf86e..17934d7c62e030bdb4c83c7807176aed5fbfa378 100644
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^AT}EZ3y=)>dE6IBF(rAsyD<E3??1C2$m1;Vh%9Dc
z;1&j9Muu5)B!GhKC7!;n?Dx5t_*g9_yxY1EC?r|p8d2h$pPQSSSHj?2l$uzQnxasi
zS(2gP?&%v4-pD5oRAlMt;uyklJvre3lZ2$iHUIE4KaL+b@S*>qJu~y+$&!sTc|hRx
s^8f8kUoTHIacBu_Q8*;ww1R=b&P8h0yG7ZPfQB%5y85}Sb4q9e0MWZWQ2+n{

literal 341
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZddL^zACC){ui6xo&c?uz!xv31r
ziMe_TMy3i`rI~pOMg|6^3Pwg&rsh^gh6>sSh6V=qS3gt$b+VUu`ns}T=jP^@XT2KK
z%MCKQz$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl{~4e$wZ{r~@e`NY{Zb62I;
zwMAzYRL@+}z4>6pl=(oESW?xvY}3?zr-5YcoE1O?K$R1A9BW^_y?W{bph*3^)j+}G
z2{U7JiZ)!heeV9VV|SnKxO}gF*9oBDvuDrJG~WsXEn+MQ@(X5gcy=QV$T9JBaSY+O
zo}6%iNkv6<$&yr-loUyp9Zww`eC9MZavyn;&UkY3rjvyQPE(8wHy<c5TqMQB&?(8(
Up)Wag9#B7nr>mdKI;Vst04aZdD*ylh

diff --git a/htdocs/theme/md/img/1uparrow.png b/htdocs/theme/md/img/1uparrow.png
index 70ea061dc5e90f4901b94529ef13ffbbc21e640b..331731b750c619c3069b9de40a56637e9d241419 100644
GIT binary patch
delta 164
zcmaFCxS4T+cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e
zWH0gbb!ETL#l*)hRlZ}|aiEZ7iEBiObAE1aYF-J0b5UwyNotBhd1gt5g1e`0KzJjc
zI8c$ir;B3<$Mxid1Kd&)QU<O6jQ_ZcwsFWV<WO!g2vKHa5b5XtDzd=y7*H*Pr>mdK
II;Vst05#Vwt^fc4

delta 217
zcmdnY_=0hQcs(ZvGXn#IO@*%_kV*^i332`Z|Nn#?#~PPys-C%|X6~x;iL;9*%*<`>
zPOobNGJt5qh1=bm54Nw~UOja|?VJ_$^Hu|;Vsnbl-G4T9-)W#mpde5Ls4+UL0H}D;
z@yiuc<^xe;N!78tPy2VB*m3z@QuwCpKpTS?OM?7@862M7NCWZ=JY5_^IIbtBG%&lF
zEPGTd5j^kX^J0$RE<p~t#u<lt5<bjnoG5+h*U684f}9FG%nYu|>>{7{ElmLGW$<+M
Kb6Mw<&;$V7H)R0;

diff --git a/htdocs/theme/md/img/1uparrow_selected.png b/htdocs/theme/md/img/1uparrow_selected.png
index 36d25a408c544e5edc09ee7abaeca830896bb2fc..d9d8462fe43c5b02530a4a4c219f2a514f4e8536 100644
GIT binary patch
delta 177
zcmaFNbbxV!cs&~j3j+f~z|Z5pK#D2J+ueoXe|!I#{XiaPfk$L90|U1(2s1Lwnj--e
zWH0gbb!ETL#l*+T7TCXn3n(O6;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq
z4pgM$>Eal|aXmTV0DIcG`Ihp|Fa85TpjL~b6Gx&OTieXfSA_+*^7K6Xk7U^~L?(;7
Uty|;v0H~3{)78&qol`;+02LxN&Hw-a

delta 341
zcmX@W_?T&ecs(ZvGXn#IO@*%_kkTu0jVN(0N=+=u%+FH@$;?e<C{E1PQ!p}B$STdu
zQ!p|xFjX)zwlXlVGBQ%oHZU|Wa8PK82I^!l@$_|Nzs}9gFDJ6>=bRltA<hDi$YKTt
zt`8v0=(NUU22hYC-O<;Pfnj4m_n$;oAiq8{z$e7@|Ns9Jb{uP5wyApNlA5`z$|ue)
zo-i}FxjVhC4afkZ4Hs^AZ$8+*dVBTM1+{Zl)X!TDl#0zMI(Prs)P1Lc8i9g95unEC
ztOB6oMaM5!OqmZvi6vFX?mq3`bz;Zmd(WOd+Y#wI7icSENswPKgTu2MX?{SSnWu|m
z2*>s0gae!+4|OV8JvF?&qCCU+&IpMG1_e!G=q&!M(a11efSFlY*qB>e+L~Qme3B(Y
Yu@}=l%^LrcKob}|UHx3vIVCg!0B-()1ONa4


From 920803518f353c78d5f2afcc75c50cb697a492cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Oct 2015 16:31:34 +0200
Subject: [PATCH 5/6] Removed not used table

---
 .../mysql/tables/llx_document_generator.sql   | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 htdocs/install/mysql/tables/llx_document_generator.sql

diff --git a/htdocs/install/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql
deleted file mode 100644
index cfbc08f894f..00000000000
--- a/htdocs/install/mysql/tables/llx_document_generator.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- ===================================================================
--- Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
---
--- 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_document_generator
-(
-  rowid           integer UNSIGNED NOT NULL PRIMARY KEY,
-  name            varchar(255) NOT NULL,
-  classfile       varchar(255) NOT NULL,
-  class           varchar(255) NOT NULL
-
-)ENGINE=innodb;

From e444cb57d4b7da09e849625d5a57f75bb090ba15 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Oct 2015 00:35:26 +0200
Subject: [PATCH 6/6] Fix bad print

---
 htdocs/expensereport/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 3094bc1ccfd..c32b6505cb1 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1089,7 +1089,7 @@ if (! empty($conf->global->DEPLACEMENT_TO_CLEAN))
 // Create
 if ($action == 'create')
 {
-	print print load_fiche_titre($langs->trans("NewTrip"));
+	print load_fiche_titre($langs->trans("NewTrip"));
 
 	print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="create">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';