| ';
+ print "global->FACTURE_TVAOPTION)?"":" checked")."> ".$langs->trans("VATIsUsed")." | ";
print '';
print "";
print " | ";
@@ -997,7 +998,8 @@ else
print "\n";
- print "| global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")." | ";
+ print ' | ';
+ print "global->FACTURE_TVAOPTION)?" checked":"")."> ".$langs->trans("VATIsNotUsed")." | ";
print '';
print "";
print "| ".$langs->trans("VATIsNotUsedDesc")." | ";
@@ -1017,12 +1019,13 @@ else
print '
';
print '';
print '';
- print '| '.$langs->transcountry("LocalTax1Management",$mysoc->country_code).' | '.$langs->trans("Description").' | ';
+ print ''.$langs->transcountry("LocalTax1Management",$mysoc->country_code).' | '.$langs->trans("Description").' | ';
print ' | ';
print " \n";
- print "| global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)." | ";
+ print " | ";
+ print "global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on")?" checked":"")."> ".$langs->transcountry("LocalTax1IsUsed",$mysoc->country_code)." | ";
print '';
print "";
print "| ".$langs->transcountry("LocalTax1IsUsedDesc",$mysoc->country_code)." | ";
@@ -1050,7 +1053,8 @@ else
print "\n";
- print "| global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)." | ";
+ print ' | ';
+ print "global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off")?" checked":"")."> ".$langs->transcountry("LocalTax1IsNotUsed",$mysoc->country_code)." | ";
print '';
print "";
print " | ";
@@ -1067,12 +1071,13 @@ else
print '
';
print '';
print '';
- print '| '.$langs->transcountry("LocalTax2Management",$mysoc->country_code).' | '.$langs->trans("Description").' | ';
+ print ''.$langs->transcountry("LocalTax2Management",$mysoc->country_code).' | '.$langs->trans("Description").' | ';
print ' | ';
print " \n";
- print "| global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)." | ";
+ print " | ";
+ print "global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on")?" checked":"")."> ".$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code)." | ";
print '';
print "";
print " | ";
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index a44ee8577ed..be2c66dc652 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -64,15 +64,9 @@ if (! empty($conf->accounting->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
}
-$langs->load('bills');
-$langs->load('companies');
-$langs->load('compta');
-$langs->load('products');
-$langs->load('banks');
-$langs->load('main');
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (! empty($conf->margin->enabled))
- $langs->load('margins');
+$langs->loadLangs(array('bills','companies','compta','products','banks','main'));
+if (! empty($conf->incoterm->enabled)) $langs->load('incoterm');
+if (! empty($conf->margin->enabled)) $langs->load('margins');
$projectid = (GETPOST('projectid','int') ? GETPOST('projectid', 'int') : 0);
@@ -4410,11 +4404,9 @@ else if ($id > 0 || ! empty($ref))
} else {
print '';
}
-
- print '';
}
+ print '';
}
- print '
';
// Select mail models is same action as presend
if (GETPOST('modelselected','alpha')) {
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 16e24b2b7b0..8daee472e9e 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -550,7 +550,7 @@ if ($object->id > 0)
*/
print "\n\n";
- // Add a withdraw request
+ // Add a transfer request
if ($object->statut > Facture::STATUS_DRAFT && $object->paye == 0 && $num == 0)
{
if ($resteapayer > 0)
@@ -588,7 +588,7 @@ if ($object->id > 0)
print "
\n";
- print $langs->trans("DoStandingOrdersBeforePayments").'
';
+ print ''.$langs->trans("DoStandingOrdersBeforePayments").'
';
/*
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 0b3a17b0671..c90bc11675c 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -578,7 +578,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
}
else
{
- $default='ffffff';
+ $default='f0f0f0';
if ($conf->theme == 'md') $default='ffffff';
print '';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index caa055811dd..148ef1ba50f 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -37,7 +37,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
// Colors
$colorbackhmenu1='80,90,120'; // topmenu
-$colorbackvmenu1='255,255,255'; // vmenu
+$colorbackvmenu1='248,248,248'; // vmenu
$colortopbordertitle1='120,120,120'; // top border of title
$colorbacktitle1='230,230,233'; // title of tables,list
$colorbacktabcard1='255,255,255'; // card
@@ -261,7 +261,10 @@ a:hover { text-decoration: underline; color: rgb()
a.commonlink { color: rgb() !important; text-decoration: none; }
th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
- background-color: #FFF;
+ background-color: #FFF;
+}
+select.vmenusearchselectcombo {
+ background-color: unset;
}
input.select2-input {
@@ -1161,7 +1164,7 @@ div.fiche {
div.fiche {
- margin-: dol_optimize_smallscreen)?'22':'6')); ?>px;
+ margin-: dol_optimize_smallscreen)?'23':'6')); ?>px;
margin-: dol_optimize_smallscreen)?'25':'6')); ?>px;
dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 926316d1c54..44195d88e74 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -119,7 +119,6 @@ if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTL
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{
// 90A4AE, 607D8B, 455A64, 37474F
- $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
$conf->global->THEME_ELDY_TEXT='0,0,0';
@@ -127,7 +126,6 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_FONT_SIZE2='11';
}
-
// 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);
@@ -266,6 +264,9 @@ a.commonlink { color: rgb() !important; text-decor
input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
background-color: #FDFDFD;
}
+select.vmenusearchselectcombo {
+ background-color: unset;
+}
textarea:focus, button:focus {
/* v6 box-shadow: 0 0 4px #8091BF; */
@@ -1074,7 +1075,7 @@ td.showDragHandle {
display: none;
- background: #FFF;
+ background: rgb();
border-right: 1px solid rgba(0,0,0,0.2);
box-shadow: 3px 0 6px -2px #eee;
bottom: 0;
@@ -1161,7 +1162,7 @@ div.login_block {
}
#id-left {
z-index: 91;
- background: #FFF;
+ background: rgb();
border-right: 1px solid rgba(0,0,0,0.3);
browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
top: 50px ! important;
@@ -1838,7 +1839,7 @@ div.login_block {
z-index: 10;
text-align: center;
vertical-align: middle;
- background: #FFF;
+ background: rgb();
width: 228px;
height: 43px;
@@ -3052,7 +3053,7 @@ div .tdtop {
}
span.boxstatstext {
line-height: 18px;
- opacity: 0.7;
+ /* opacity: 0.7; */ /* a bug if browser make z-index infintie when opacity is set so we disable it */
}
span.boxstatsindicator {
font-size: 110%;
| | | | |