';
- $sellist .= ' ';
+ $sellist .= ''.$placeholder.' ';
while ($i < $num) {
$obj = $this->db->fetch_object($resql);
$ref = $obj->ref ? $obj->ref : $obj->rowid;
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index cecf6296735..6f587a67a7f 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -658,7 +658,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
// Opportunity status
print ''.$langs->trans("OpportunityStatus").' ';
print '';
- print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1);
+ print $formproject->selectOpportunityStatus('opp_status', GETPOSTISSET('opp_status') ? GETPOST('opp_status') : $object->opp_status, 1, 0, 0, 0, '', 0, 1);
print ' ';
// Opportunity probability
@@ -1090,14 +1090,14 @@ if ($action == 'create' && $user->rights->projet->creer) {
print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
}*/
if (strcmp($object->opp_amount, '')) {
- print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+ print ''.price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency).' ';
}
print '';
// Opportunity Weighted Amount
print ''.$langs->trans('OpportunityWeightedAmount').' ';
if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) {
- print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+ print ''.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).' ';
}
print ' ';
}
@@ -1117,7 +1117,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
// Budget
print ''.$langs->trans("Budget").' ';
if (strcmp($object->budget_amount, '')) {
- print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+ print ''.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
}
print ' ';
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 48f12e23ec4..d1563cbfab8 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -374,7 +374,7 @@ if ($id > 0 || !empty($ref)) {
// Opportunity Amount
print ''.$langs->trans("OpportunityAmount").' ';
if (strcmp($object->opp_amount, '')) {
- print price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency);
+ print ''.price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency).' ';
}
print ' ';
}
@@ -394,7 +394,7 @@ if ($id > 0 || !empty($ref)) {
// Budget
print ''.$langs->trans("Budget").' ';
if (strcmp($object->budget_amount, '')) {
- print price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency);
+ print ''.price($object->budget_amount, '', $langs, 0, 0, 0, $conf->currency).' ';
}
print ' ';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index e455d6f599f..b5e789ec3f2 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -296,7 +296,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
// Opportunity Amount
print ''.$langs->trans("OpportunityAmount").' ';
if (strcmp($object->opp_amount, '')) {
- print price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print ''.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
}
print ' ';
}
@@ -316,7 +316,7 @@ print '';
// Budget
print ''.$langs->trans("Budget").' ';
if (strcmp($object->budget_amount, '')) {
- print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print ''.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
}
print ' ';
@@ -1020,7 +1020,7 @@ foreach ($listofreferent as $key => $value) {
if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) {
- $selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, !empty($project_field) ? $project_field : 'fk_projet');
+ $selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, empty($project_field) ? 'fk_projet' : $project_field, $langs->trans("SelectElement"));
if ($selectList < 0) {
setEventMessages($formproject->error, $formproject->errors, 'errors');
} elseif ($selectList) {
@@ -1032,9 +1032,10 @@ foreach ($listofreferent as $key => $value) {
$addform .= ' ';
$addform .= ' ';
$addform .= ' ';
- $addform .= ''.$langs->trans("SelectElement").' ';
+ $addform .= '';
$addform .= '';
$addform .= '';
@@ -1043,9 +1044,9 @@ foreach ($listofreferent as $key => $value) {
if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew) {
$addform .= '';
if ($testnew) {
- $addform .= '
'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).' ';
+ $addform .= '
';
} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
- $addform .= '
'.($buttonnew ? $langs->trans($buttonnew) : $langs->trans("Create")).' ';
+ $addform .= '
';
}
$addform .= '
';
}
@@ -1389,7 +1390,7 @@ foreach ($listofreferent as $key => $value) {
if (!$qualifiedfortotal) {
print '';
}
- print price($total_ht_by_line);
+ print ''.price($total_ht_by_line).' ';
if (!$qualifiedfortotal) {
print ' ';
}
@@ -1440,7 +1441,7 @@ foreach ($listofreferent as $key => $value) {
if (!$qualifiedfortotal) {
print '';
}
- print price($total_ttc_by_line);
+ print ''.price($total_ttc_by_line).' ';
if (!$qualifiedfortotal) {
print ' ';
}
@@ -1513,6 +1514,7 @@ foreach ($listofreferent as $key => $value) {
if (in_array($tablename, array('projet_task'))) {
$colspan = 2;
}
+
print '
'.$langs->trans("Number").': '.$i.' ';
if (in_array($tablename, array('projet_task'))) {
print '';
@@ -1551,7 +1553,16 @@ foreach ($listofreferent as $key => $value) {
print ' ';
} else {
if (!is_array($elementarray)) { // error
- print $elementarray;
+ print ''.$elementarray.' ';
+ } else {
+ $colspan = 7;
+ if (in_array($tablename, array('projet_task'))) {
+ $colspan = 5;
+ }
+ if ($tablename == 'fichinter') {
+ $colspan++;
+ }
+ print ''.$langs->trans("None").' ';
}
}
print "
";
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index cff8fb952f8..e8c938d2156 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -626,7 +626,7 @@ if ($id > 0 || !empty($ref)) {
// Budget
print ''.$langs->trans("Budget").' ';
if (strcmp($object->budget_amount, '')) {
- print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print ''.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
}
print ' ';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 9a4fd0a9174..f9f3a2aca43 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -826,7 +826,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
// Budget
print ''.$langs->trans("Budget").' ';
if (strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print ''.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
}
print ' ';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 5048e01735d..4cf5caf97ce 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -25,6 +25,7 @@
* \ingroup salaries
* \brief Page of salaries payments
*/
+
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
@@ -555,7 +556,8 @@ if ($action == 'create') {
$formproject = new FormProjets($db);
print ''.$langs->trans("Project").' ';
- $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+ print img_picto('', 'project', 'class="pictofixedwidth"');
+ print $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 1);
print ' ';
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index b42a6813a30..3071b59a419 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6115,6 +6115,7 @@ span#select2-boxbookmark-container {
box-shadow: none;
-webkit-box-shadow: none !important;
box-shadow: none !important;
+ margin-bottom: 0 !important;
}
span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 0269bba74f2..17ab4d83f28 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -320,7 +320,7 @@ div.pagination li:first-child a.btnTitle {
border: none;
font-size: 12px;
font-weight: 300;
- background-color: #fbfbfb;
+ /* background-color: #fbfbfb; */
}
a.btnTitle.btnTitleSelected {
@@ -371,6 +371,11 @@ div.pagination .btnTitle:hover .btnTitle-label{
display: block;
}
+.paginationafterarrows a.btnTitlePlus, .titre_right a.btnTitlePlus {
+ border: 1px solid var(--colorbackbody);
+}
+
+
/* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */
@media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */
{
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8f5fc141b32..5a419d4a39a 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5943,7 +5943,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
/* To emulate select 2 style */
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
- padding: 2px 5px 1px 5px;
+ padding: 3px 5px 2px 5px;
margin: 0 0 2px 3px;
position: relative;
line-height: 13px;
@@ -5993,6 +5993,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
box-shadow: none;
-webkit-box-shadow: none !important;
box-shadow: none !important;
+ margin-bottom: 0 !important;
}
span.noborderoncategories a, li.noborderoncategories a {
line-height: normal;