';
print '';
print '| '.$langs->trans("MembersTypes").' | ';
print ''.$langs->trans("MembersStatusToValid").' | ';
-print ''.$langs->trans("MenuMembersNotUpToDate").' | ';
-print ''.$langs->trans("MenuMembersUpToDate").' | ';
+print ''.$langs->trans("OutOfDate").' | ';
+print ''.$langs->trans("UpToDate").' | ';
print ''.$langs->trans("MembersStatusResiliated").' | ';
print "
\n";
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 92e495ad93b..b8cfb64a39f 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -395,6 +395,8 @@ while ($i < min($num, $limit)) {
$subscription->ref = $obj->crowid;
$subscription->id = $obj->crowid;
+ $subscription->dateh = $db->jdate($obj->dateadh);
+ $subscription->datef = $db->jdate($obj->datef);
$adherent->lastname = $obj->lastname;
$adherent->firstname = $obj->firstname;
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 42da694b2e6..ec6ab640125 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -243,7 +243,6 @@ clearstatcache();
print '
';
print '';
print '| '.$langs->trans("Language").' | | ';
-print ' ';
print ' |
|---|
';
// Default language
@@ -251,14 +250,12 @@ print '| '.$langs->trans("DefaultLangua
print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
print '';
print ' | ';
-print ' | ';
print '
';
// Multilingual GUI
print '| '.$langs->trans("EnableMultilangInterface").' | ';
print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0);
print ' | ';
-print ' | ';
print '
';
print '
'."\n";
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index e7b7e2cd59b..d7e0962239b 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -512,7 +512,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
$moreforfilter .= $langs->trans('Keyword').': ';
$moreforfilter .= '';
$moreforfilter .= '';
- $moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+ $moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth200', 1);
$moreforfilter .= '
';
if (!empty($conf->global->MAIN_FEATURES_LEVEL))
{
@@ -521,17 +521,17 @@ if ($mode == 'common' || $mode == 'commonkanban')
if ($conf->global->MAIN_FEATURES_LEVEL > 0) $array_version['experimental'] = $langs->trans("Experimental");
if ($conf->global->MAIN_FEATURES_LEVEL > 1) $array_version['development'] = $langs->trans("Development");
$moreforfilter .= '';
- $moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+ $moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '
';
}
$moreforfilter .= '';
- $moreforfilter .= $langs->trans('Status').': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+ $moreforfilter .= $langs->trans('Status').': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '
';
$moreforfilter .= ' ';
$moreforfilter .= '';
$moreforfilter .= '';
$moreforfilter .= ' ';
- $moreforfilter .= '';
+ $moreforfilter .= '';
$moreforfilter .= '
';
$moreforfilter .= '';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index b94d5b940c7..49e10d23af1 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -209,12 +209,9 @@ if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
-//print ''.$langs->trans("TranslationDesc")."
\n";
-//print "
\n";
-
$current_language_code = $langs->defaultlang;
$s = picto_from_langcode($current_language_code);
-print ''.$form->textwithpicto($langs->trans("CurrentUserLanguage").': '.$s.' '.$current_language_code.'', $langs->trans("TranslationDesc")).'
';
+print $form->textwithpicto(''.$langs->trans("CurrentUserLanguage").': '.$s.' '.$current_language_code.'', $langs->trans("TranslationDesc")).'
';
print '
';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3f6c9d956a5..ade778263e9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3663,6 +3663,9 @@ class Commande extends CommonOrder
if (!empty($this->total_ttc)) {
$label .= '
'.$langs->trans('AmountTTC').': '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
}
+ if (!empty($this->date)) {
+ $label .= '
'.$langs->trans('Date').': '.dol_print_date($this->date, 'dayhour');
+ }
if (!empty($this->delivery_date)) {
$label .= '
'.$langs->trans('DeliveryDate').': '.dol_print_date($this->delivery_date, 'dayhour');
}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 55ab524daec..32a79d5c667 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6884,7 +6884,7 @@ abstract class CommonObject
$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
$out .= '| '.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).' | ';
print img_picto('', 'globe-americas', 'class="paddingrightonly"');
- print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+ print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 maxwidth500 widthcentpercentminusx');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
print ' |
';
@@ -1334,9 +1333,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// Email / Web
print '| '.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).' | ';
- print ''.img_picto('', 'object_email').' |
';
+ print ''.img_picto('', 'object_email').' | ';
print '| '.$form->editfieldkey('Web', 'url', '', $object, 0).' | ';
- print ''.img_picto('', 'globe').' |
';
+ print ''.img_picto('', 'globe').' | ';
if (!empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) {
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index c866b187638..364723e2152 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -7,11 +7,13 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
--btncolorbg: #fbfbfb;
--btncolorborderhover: none;
--btncolorborder: #FFF;
+ /* --butactionbg:rgba(150, 110, 162, 0.95); */
+ --butactionbg:rgb(118, 145, 225);
+ --butactionbg:rgba(150, 110, 162, 0.95);
--butactiondeletebg: rgb(234,228,225);
/* tertiary color */
/* --butactionbg:rgb(218, 235, 225); */
/* --butactionbg:rgb(228, 218, 235); */
- --butactionbg:rgb(118, 145, 225);
}
global->THEME_DARKMODEENABLED)) {
--btncolorbg: rgb(26,27,27);
--btncolorborderhover: #ffffff;
--btncolorborder: #2b2c2e;
- --butactionbg:rgb(173,140,79);
+ --butactionbg: rgb(173,140,79);
--butactiondeletebg: rgb(252,84,91);
}\n";
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index af1e6873016..cd59b22f1d7 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -21,8 +21,8 @@
--colorbackbody: rgb();
--colortexttitlenotab: rgb();
--colortexttitlenotab2: rgb();
- --colortexttitle: rgb();
- --colortexttitlelink: rgb();
+ --colortexttitle: rgba(, 0.9);
+ --colortexttitlelink: rgba(, 0.9);
--colortext: rgb();
--colortextlink: rgb();
--colortextbackhmenu: #;
@@ -2610,7 +2610,18 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: ; color: #aaa; text-decoration: none; }
-.helppresent, .helppresent:hover { color: #f3e4ac !important; }
+.helppresent, .helppresent:hover {
+ /* color: #f3e4ac !important; */
+}
+.helppresentcircle {
+ color: var(--butactionbg);
+ margin-left: -7px;
+ display: inline-block;
+ margin-top: -10px;
+ font-size: x-small;
+ vertical-align: super;
+ opacity: 0.95;
+}
.vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
{
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 850c39b6567..572404f3eea 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -65,9 +65,9 @@ $colorbacklinepairhover = '230,237,244'; // line hover
$colorbacklinepairchecked = '230,237,244'; // line checked
$colorbacklinebreak = '248,247,244'; // line break
$colorbackbody = '255,255,255';
-$colortexttitlenotab = '10,120,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
+$colortexttitlenotab = '35,135,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
$colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
-$colortexttitle = '0,0,0';
+$colortexttitle = '40, 40, 60';
$colortexttitlelink = '10, 20, 100';
$colortext = '0,0,0';
$colortextlink = '10, 20, 100';
@@ -110,8 +110,8 @@ $badgeStatus1 = '#bc9526'; // validated
$badgeStatus1b = '#bc9526'; // validated
$badgeStatus2 = '#9c9c26'; // approved
$badgeStatus3 = '#bca52b';
-$badgeStatus4 = '#55a580'; // Color ok
-$badgeStatus4b = '#55a580'; // Color ok
+$badgeStatus4 = '#25a580'; // Color ok
+$badgeStatus4b = '#25a580'; // Color ok
$badgeStatus5 = '#cad2d2';
$badgeStatus6 = '#cad2d2';
$badgeStatus7 = '#baa32b';