diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index b2a25b00ce2..456da29d954 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -294,7 +294,7 @@ if ($action != 'export_csv')
{
// Affiche un Sous-Total par compte comptable
if ($displayed_account != "") {
- print '
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_credit - $sous_total_debit)).' | ';
+ print '
| '.$langs->trans("SubTotal").': | '.price($sous_total_debit).' | '.price($sous_total_credit).' | '.price(price2num($sous_total_credit - $sous_total_debit)).' | ';
print " | \n";
print '
';
}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index b6c7017e408..bf3db0cc65c 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -620,11 +620,12 @@ class FormProjets
* @param int $showallnone Add choice "All" and "None"
* @param int $showpercent Show default probability for status
* @param string $morecss Add more css
+ * @param int $noadmininfo 0=Add admin info, 1=Disable admin info
* @return int|string The HTML select list of element or '' if nothing or -1 if KO
*/
- public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '')
+ public function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '', $noadmininfo = 0)
{
- global $conf, $langs;
+ global $conf, $langs, $user;
$sql = "SELECT rowid, code, label, percent";
$sql .= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
@@ -670,6 +671,7 @@ class FormProjets
$i++;
}
$sellist .= '';
+ if ($user->admin && !$noadmininfo) $sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}
/*else
{
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index adf2309ad07..92cc0f0c79e 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -234,6 +234,7 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unkno
ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
PaymentsNotLinkedToProduct=Payment not linked to any product / service
+OpeningBalance=Opening balance
ShowOpeningBalance=Show opening balance
HideOpeningBalance=Hide opening balance
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 6918e6fd57c..15d1d6d9563 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -558,6 +558,19 @@ if ($action == 'create' && $user->rights->projet->creer)
print ' ';
$htmltext = $langs->trans("ProjectFollowOpportunity");
print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+ print '';
print '
';
}
if (empty($conf->global->PROJECT_HIDE_TASKS))
@@ -632,20 +645,20 @@ if ($action == 'create' && $user->rights->projet->creer)
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
// Opportunity status
- print '| '.$langs->trans("OpportunityStatus").' | ';
+ print '
| '.$langs->trans("OpportunityStatus").' | ';
print '';
print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status);
print ' |
';
// Opportunity probability
- print '| '.$langs->trans("OpportunityProbability").' | ';
+ print '
| '.$langs->trans("OpportunityProbability").' | ';
print ' %';
print '';
print ' | ';
print '
';
// Opportunity amount
- print '| '.$langs->trans("OpportunityAmount").' | ';
+ print '
| '.$langs->trans("OpportunityAmount").' | ';
print ' | ';
print '
';
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index afb154408c5..3e213c3d8e2 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -17,6 +17,7 @@
--colorbacklinepair2: rgb();
--colorbacklinepairhover: rgb();
--colorbacklinepairchecked: rgb();
+ --colorbacklinebreak: rgb();
--colorbackbody: rgb();
--colortexttitlenotab: rgb();
--colortexttitle: rgb();
@@ -3289,7 +3290,7 @@ td.evenodd, tr.nohoverpair td, #trlinefordates td {
.trforbreak td {
font-weight: 500;
border-bottom: 1pt solid black !important;
- /* background-color: # !important; */
+ background-color: var(--colorbacklinebreak) !important; !important;
}
.trforbreak.nobold td a, .trforbreak.nobold span.secondary {
font-weight: normal !important;
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 823b8168b4c..d2a11725ecf 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -65,7 +65,7 @@ $colorbacklinepair1 = '251,251,251'; // line pair
$colorbacklinepair2 = '251,251,251'; // line pair
$colorbacklinepairhover = '230,237,244'; // line hover
$colorbacklinepairchecked = '230,237,244'; // line checked
-$colorbacklinebreak = '233,228,230'; // line break
+$colorbacklinebreak = '253,251,250'; // line break
$colorbackbody = '255,255,255';
$colortexttitlenotab = '0,113,120'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,113,120, violet: 0,50,120
$colortexttitle = '0,0,0';
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index da2df5eb788..36fb265c42a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -242,6 +242,7 @@ print '*/'."\n";
--colorbacklinepair2: rgb();
--colorbacklinepairhover: rgb();
--colorbacklinepairchecked: rgb();
+ --colorbacklinebreak: rgb();
--colorbackbody: rgb();
--colortexttitlenotab: rgb();
--colortexttitle: rgb();
@@ -3284,10 +3285,10 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
}
.impair, .nohover .impair:hover, tr.impair td.nohover
{
- background: #;
+ background: var(--colorbacklineimpair1);
}
#GanttChartDIV {
- background-color: #;
+ background-color: var(--colorbacklineimpair1);
}
.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
@@ -3296,25 +3297,26 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
color: #202020;
}
.pair, .nohover .pair:hover, tr.pair td.nohover {
- background-color: #;
+ background-color: var(--colorbacklinepair1);
}
+
table.dataTable tr.oddeven {
- background-color: # !important;
+ background-color: var(--colorbacklinepair1) !important;
}
/* For no hover style */
td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td, form.nohover, form.nohover:hover {
- background-color: # !important;
- background: # !important;
+ background-color: var(--colorbacklineimpair1) !important; !important;
+ background: var(--colorbacklineimpair1) !important; !important;
}
td.evenodd, tr.nohoverpair td, #trlinefordates td {
- background-color: # !important;
- background: # !important;
+ background-color: var(--colorbacklinepair1) !important; !important;
+ background: var(--colorbacklinepair1) !important; !important;
}
.trforbreak td {
font-weight: bold;
border-bottom: 1pt solid black !important;
- /* background-color: # !important; */
+ background-color: var(--colorbacklinebreak) !important;
}
table.dataTable td {
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 6cdd37fe913..ffad2cc66b5 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -61,7 +61,7 @@ $colorbacklinepair1 = '248,248,248'; // line pair
$colorbacklinepair2 = '246,246,246'; // line pair
$colorbacklinepairhover = '230,237,244'; // line hover
$colorbacklinepairchecked = '230,237,244'; // line checked
-$colorbacklinebreak = '214,218,220';
+$colorbacklinebreak = '250,246,251';
$colorbackbody = '248,248,248';
$colortexttitlenotab = '80,71,5';
$colortexttitle = '20,20,20';