diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2e809fa6c3b18ce9c2d3630194f6fb9fc8090111..0e610df00e8f624f8b1f6ef0aac2ab88bf0e54e1 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -533,8 +533,10 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,'');
print "\n".'<table class="noborder" width=100%>';
- $sql = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status";
+ $sql = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
+ $sql .= ", cls.code as opp_status_code";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
$sql .= " WHERE p.fk_soc = ".$object->id;
$sql .= " ORDER BY p.dateo DESC";
@@ -544,8 +546,14 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
$num = $db->num_rows($result);
print '<tr class="liste_titre">';
- print '<td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Name").'</td><td align="center">'.$langs->trans("DateStart").'</td><td align="center">'.$langs->trans("DateEnd").'</td>';
- print '<td align="right">'.$langs->trans("Status").'</td>';
+ print '<td>'.$langs->trans("Ref").'</td>';
+ print '<td>'.$langs->trans("Name").'</td>';
+ print '<td class="center">'.$langs->trans("DateStart").'</td>';
+ print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+ print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+ print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+ print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+ print '<td class="right">'.$langs->trans("Status").'</td>';
print '</tr>';
if ($num > 0)
@@ -574,9 +582,24 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
// Label
print '<td>'.$obj->title.'</td>';
// Date start
- print '<td align="center">'.dol_print_date($db->jdate($obj->do),"day").'</td>';
+ print '<td class="center">'.dol_print_date($db->jdate($obj->do),"day").'</td>';
// Date end
- print '<td align="center">'.dol_print_date($db->jdate($obj->de),"day").'</td>';
+ print '<td class="center">'.dol_print_date($db->jdate($obj->de),"day").'</td>';
+ // Opp amount
+ print '<td class="right">';
+ if ($obj->opp_status_code)
+ {
+ print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+ }
+ print '</td>';
+ // Opp status
+ print '<td align="center">';
+ if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code);
+ print '</td>';
+ // Opp percent
+ print '<td align="right">';
+ if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
+ print '</td>';
// Status
print '<td align="right">'.$projecttmp->getLibStatut(5).'</td>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 68077621771a7b28f2529421af0f7a5568b34b1e..35f65b75c2aafaa7e9d76a258765c1c7978d416d 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -741,7 +741,7 @@ while ($i < min($num,$limit))
print '</td>';
if (! $i) $totalarray['nbfield']++;
}
- // Amount
+ // Opp Amount
if (! empty($arrayfields['p.opp_amount']['checked']))
{
print '<td align="right">';
@@ -754,6 +754,7 @@ while ($i < min($num,$limit))
if (! $i) $totalarray['nbfield']++;
if (! $i) $totalarray['totaloppfield']=$totalarray['nbfield'];
}
+ // Opp Status
if (! empty($arrayfields['p.fk_opp_status']['checked']))
{
print '<td align="middle">';
@@ -761,6 +762,7 @@ while ($i < min($num,$limit))
print '</td>';
if (! $i) $totalarray['nbfield']++;
}
+ // Opp percent
if (! empty($arrayfields['p.opp_percent']['checked']))
{
print '<td align="right">';
@@ -768,6 +770,7 @@ while ($i < min($num,$limit))
print '</td>';
if (! $i) $totalarray['nbfield']++;
}
+ // Budget
if (! empty($arrayfields['p.budget_amount']['checked']))
{
print '<td align="right">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ffb3e7b83f8ade2da8bf85b59ef831f8cb762174..5ce9e9515c1e5a464469275953ca91de1bdd1d00 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -100,7 +100,6 @@ $usegradienttop=(isset($conf->global->THEME_ELDY_TOPMENU_BACK1)?0:1);
$usegradienttitle=(isset($conf->global->THEME_ELDY_BACKTITLE1)?0:1);
$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
$borderwith=2;
-$noborderline=0;
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@@ -273,7 +272,7 @@ input.select2-input {
}
.select2-choice {
border: none;
- border-bottom: 1px solid #aaa !important;
+ border-bottom: 1px solid #ccc !important;
}
textarea.cke_source:focus
@@ -299,15 +298,19 @@ input {
input, select {
border-bottom: solid 1px rgba(0,0,0,.2);
- padding:4px;
+ padding: 4px;
margin-left:0px;
margin-bottom:1px;
margin-top:1px;
- }
+}
+select {
+ padding: 4px 4px 4px 1px;
+}
textarea {
border-radius: 0;
- border: solid 1px rgba(0,0,0,.3);
- border-top:solid 1px rgba(0,0,0,.3);
+ border-top:solid 1px rgba(0,0,0,.1);
+ border-left:solid 1px rgba(0,0,0,.1);
+ border-right:solid 1px rgba(0,0,0,.1);
border-bottom:solid 1px rgba(0,0,0,.2);
padding:4px;
@@ -476,6 +479,9 @@ th .button {
.valignbottom {
vertical-align: bottom;
}
+.valigntextbottom {
+ vertical-align: text-bottom;
+}
.centpercent {
width: 100%;
}
@@ -919,8 +925,8 @@ div.fiche {
div.fiche {
- margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'20')); ?>px;
- margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'6')); ?>px;
+ margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:($dol_hide_leftmenu?'6':'26')); ?>px;
+ margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'6')); ?>px;
<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?>
<?php if (! empty($conf->dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?>
}
@@ -1477,10 +1483,6 @@ form#login {
-webkit-box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
box-shadow: 0 2px 23px 2px rgba(0, 0, 0, 0.1), 0 2px 6px rgba(60,60,60,0.15);
- /*-moz-box-shadow: 3px 2px 20px #CCC;
- -webkit-box-shadow: 3px 2px 20px #CCC;
- box-shadow: 3px 2px 20px #CCC;*/
-
border-radius: 5px;
/*border-top:solid 1px rgba(180,180,180,.4);
border-left:solid 1px rgba(180,180,180,.4);
@@ -2273,9 +2275,6 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
-<?php if (empty($noborderline)) { ?>
- border: 1px solid #E0E0E0;
-<?php } ?>
border-collapse: collapse !important;
padding: 1px 2px 1px 3px; /* t r b l */
}
@@ -2295,18 +2294,14 @@ div .tdtop {
}
table.border td, div.border div div.tagtd {
-<?php if (empty($noborderline)) { ?>
- padding: 2px 2px 2px 2px;
- border: 1px solid #E0E0E0;
-<?php } elseif ($noborderline == 1) { ?>
- padding: 3px 2px 3px 2px;
- border-bottom: 1px solid #E0E0E0;
-<?php } elseif ($noborderline == 2) { ?>
padding: 3px 2px 3px 2px;
- /* border: 1px solid #E0E0E0; */
-<?php } ?>
border-collapse: collapse;
}
+div.tabBar .fichecenter table.border>tbody>tr>td, div.tabBar .fichecenter div.border div div.tagtd
+{
+ padding-top: 4px;
+ border-bottom: 1px solid #E0E0E0;
+}
td.border, div.tagtable div div.border {
border-top: 1px solid #000000;
@@ -2854,6 +2849,7 @@ span.dashboardlineko {
}
.boxtable {
margin-bottom: 8px !important;
+ border-bottom-width: 0 !important;
}
.tdboxstats {
text-align: center;
@@ -3910,6 +3906,9 @@ div.dataTables_length select {
/* Select2 */
/* ============================================================================== */
+.select2-container .select2-choice {
+ border-bottom: 1px solid #ccc;
+}
.select2-container .select2-choice > .select2-chosen {
margin-right: 23px;
}
@@ -3936,7 +3935,7 @@ div.dataTables_length select {
border-top: none !important;
border-left: none !important;
border-right: none !important;
- border-bottom: 1px solid #aaa;
+ border-bottom: 1px solid #ccc;
}
.select2-drop.select2-drop-above {
box-shadow: none !important;
@@ -4023,6 +4022,15 @@ a span.select2-chosen
.select2-container-multi .select2-choices .select2-search-choice {
margin-bottom: 3px;
}
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+ border-bottom: 1px solid #ccc;
+ border-right: none;
+ border-top: none;
+ border-left: 1px solid #ddd;
+}
+
/* Special case for the select2 add widget */
#addbox .select2-container .select2-choice > .select2-chosen {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 96cb800271954f4ea2ccd9587b5796bf5ee2fccd..b64ce9e3a890573329c373a7842e4f374fa1ebe5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -273,7 +273,7 @@ input.select2-input {
}
.select2-choice {
border: none;
- border-bottom: 1px solid #aaa !important;
+ border-bottom: 1px solid #ccc !important;
}
textarea.cke_source:focus
@@ -296,16 +296,22 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
input, select {
border-bottom: solid 1px rgba(0,0,0,.2);
- padding:4px;
margin-left:0px;
margin-bottom:1px;
margin-top:1px;
- }
+}
+input {
+ padding:4px;
+}
+select {
+ padding:1px;
+}
textarea {
border-radius: 0;
- border: solid 1px rgba(0,0,0,.3);
- border-top:solid 1px rgba(0,0,0,.3);
+ border-top:solid 1px rgba(0,0,0,.1);
+ border-left:solid 1px rgba(0,0,0,.1);
+ border-right:solid 1px rgba(0,0,0,.1);
border-bottom:solid 1px rgba(0,0,0,.2);
background-color: #FFF;
@@ -481,6 +487,9 @@ th .button {
.valignbottom {
vertical-align: bottom;
}
+.valigntextbottom {
+ vertical-align: text-bottom;
+}
.centpercent {
width: 100%;
}
@@ -1512,9 +1521,6 @@ form#login {
-moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
-webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
- /*-moz-box-shadow: 3px 2px 20px #CCC;
- -webkit-box-shadow: 3px 2px 20px #CCC;
- box-shadow: 3px 2px 20px #CCC;*/
border-radius: 4px;
border:solid 1px rgba(80,80,80,.4);
@@ -2184,9 +2190,7 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
-<?php if (empty($noborderline)) { ?>
border: 1px solid #f4f4f4;
-<?php } ?>
border-collapse: collapse !important;
padding: 1px 2px 1px 3px; /* t r b l */
}
@@ -2776,6 +2780,7 @@ span.dashboardlineko {
}
.boxtable {
margin-bottom: 8px !important;
+ border-bottom-width: 0 !important;
}
.tdboxstats {
text-align: center;
@@ -3856,6 +3861,9 @@ div.dataTables_length select {
/* Select2 */
/* ============================================================================== */
+.select2-container .select2-choice {
+ border-bottom: 1px solid #ccc;
+}
.select2-container .select2-choice > .select2-chosen {
margin-right: 23px;
}
@@ -3883,7 +3891,7 @@ div.dataTables_length select {
border-top: none !important;
border-left: none !important;
border-right: none !important;
- border-bottom: 1px solid #aaa;
+ border-bottom: 1px solid #ccc;
}
.select2-drop.select2-drop-above {
box-shadow: none !important;
@@ -3970,6 +3978,16 @@ a span.select2-chosen
.select2-container-multi .select2-choices .select2-search-choice {
margin-bottom: 3px;
}
+.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
+.select2-container-multi.select2-container-active .select2-choices
+{
+ border-bottom: 1px solid #ccc;
+ border-right: none;
+ border-top: none;
+ border-left: 1px solid #ddd;
+}
+
+
/* Special case for the select2 add widget */
#addbox .select2-container .select2-choice > .select2-chosen {