diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 1ef9953a6d9ce69d7b8a3fbd29e2056997db254a..9ab3a1967f131201fde79e51068bd922f7c47d65 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1755,7 +1755,7 @@ if ($action == 'create')
if ($action != 'editdate' && ! empty($object->brouillon))
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate&id=' . $object->id . '">' . img_edit($langs->trans('SetDate'), 1) . '</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if (! empty($object->brouillon) && $action == 'editdate') {
print '<form name="editdate" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
@@ -1781,7 +1781,7 @@ if ($action == 'create')
if ($action != 'editecheance' && ! empty($object->brouillon))
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editecheance&id=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if (! empty($object->brouillon) && $action == 'editecheance') {
print '<form name="editecheance" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
@@ -1809,7 +1809,7 @@ if ($action == 'create')
if ($action != 'editconditions' && ! empty($object->brouillon))
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetConditions'), 1) . '</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if ($action == 'editconditions') {
$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
} else {
@@ -1822,7 +1822,7 @@ if ($action == 'create')
$langs->load('deliveries');
print '<tr><td>';
print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer);
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer, 'day');
print '</td>';
print '</tr>';
@@ -1837,7 +1837,7 @@ if ($action == 'create')
if ($action != 'editavailability' && ! empty($object->brouillon))
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editavailability&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1) . '</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if ($action == 'editavailability') {
$form->form_availability($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->availability_id, 'availability_id', 1);
} else {
@@ -1856,7 +1856,7 @@ if ($action == 'create')
if ($action != 'editshippingmethod' && $user->rights->propal->creer)
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'),1).'</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if ($action == 'editshippingmethod') {
$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
} else {
@@ -1874,7 +1874,7 @@ if ($action == 'create')
if ($action != 'editdemandreason' && ! empty($object->brouillon))
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdemandreason&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1) . '</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if ($action == 'editdemandreason') {
$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'demand_reason_id', 1);
} else {
@@ -1892,7 +1892,7 @@ if ($action == 'create')
if ($action != 'editmode' && ! empty($object->brouillon))
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMode'), 1) . '</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if ($action == 'editmode') {
$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id');
} else {
@@ -1912,7 +1912,7 @@ if ($action == 'create')
if ($action != 'classify')
print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?action=classify&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if ($action == 'classify') {
$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
} else {
@@ -1941,7 +1941,7 @@ if ($action == 'create')
// Outstanding Bill
print '<tr><td>';
print $langs->trans('OutstandingBill');
- print '</td><td align=right colspan=3>';
+ print '</td><td align="right" colspan="5">';
print price($soc->get_OutstandingBill()) . ' / ';
print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
print '</td>';
@@ -1958,7 +1958,7 @@ if ($action == 'create')
if ($action != 'editbankaccount' && $user->rights->propal->creer)
print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
print '</tr></table>';
- print '</td><td colspan="3">';
+ print '</td><td colspan="5">';
if ($action == 'editbankaccount') {
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
} else {
@@ -1979,7 +1979,7 @@ if ($action == 'create')
else print ' ';
print '</td></tr></table>';
print '</td>';
- print '<td colspan="3">';
+ print '<td colspan="5">';
if ($action != 'editincoterm')
{
print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
@@ -1992,16 +1992,20 @@ if ($action == 'create')
}
// Other attributes
- $cols = 3;
+ $cols = 5;
include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
// Amount HT
- print '<tr><td height="10" width="25%">' . $langs->trans('AmountHT') . '</td>';
+ print '<tr><td height="10">' . $langs->trans('AmountHT') . '</td>';
print '<td class="nowrap" colspan="2">' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
// Margin Infos
- if (! empty($conf->margin->enabled)) {
- print '<td valign="top" width="50%" rowspan="4">';
+ if (! empty($conf->margin->enabled))
+ {
+ $rowspan=4;
+ if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) $rowspan++;
+ if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) $rowspan++;
+ print '<td valign="top" width="50%" colspan="3" rowspan="'.$rowspan.'">';
$formmargin->displayMarginInfos($object);
print '</td>';
}
@@ -2017,7 +2021,7 @@ if ($action == 'create')
{
print '<tr><td height="10">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
print '<td class="nowrap" colspan="2">' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
- print '<td></td></tr>';
+ print '</tr>';
}
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) // Localtax2
{
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 505f6bce8e57ddd3cdfaf8a5d0454d07a7cac2a8..c82d651a01d12066e4617ff18ca99286c51ae6c2 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -180,6 +180,7 @@ YouCanCompleteRef=If you want to complete the ref with some information (to use
OpenedProjectsByThirdparties=Opened projects by thirdparties
OpportunityTotalAmount=Opportunities total amount
OpportunityPonderatedAmount=Opportunities weighted amount
+OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability (depending on status of opportunity)
OppStatusPROSP=Prospection
OppStatusQUAL=Qualification
OppStatusPROPO=Proposal
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4695403aeff18dc338f9dfca65e70fc57bb4c8a1..e983a16f3f91c5a08894828b2f3945f2a4f873b5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -572,8 +572,9 @@ td.showDragHandle {
}
#id-right { /* This must stay id-right and not be replaced with echo $right */
width: 100%;
+ padding-bottom: 10px;
<?php if (GETPOST("optioncss") != 'print') { ?>
- padding-left: 224px;
+ padding-left: 229px;
padding-top: 12px;
<?php } ?>
}
@@ -626,7 +627,7 @@ td.showDragHandle {
div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px;
- margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'4')); ?>px;
+ margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'16':'4')); ?>px;
<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
margin-bottom: 15px;
}
@@ -837,14 +838,19 @@ li.tmenu, li.tmenusel {
font-weight: normal;
}
li.tmenusel, li.tmenu:hover {
+/*
background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important;
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0) 100%) !important;
background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
background: rgb(<?php echo $colorbackhmenu1 ?>);
+*/
/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */
}
+li.tmenusel, li.tmenu:hover {
+ opacity: .50; /* show only a slight shadow */
+}
.tmenuend .tmenuleft { width: 0px; }
/* .tmenuend { display: none; } */
div.tmenuleft
@@ -2256,7 +2262,6 @@ div.liste_titre_bydiv {
border-collapse: collapse;
display: table;
padding: 2px 0px 2px 0;
- box-shadow: 2px 2px 4px #CCC;
width: calc(100% - 1px); /* 1px more, i don't know why */
}
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
@@ -2723,10 +2728,10 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
table.dp {
width: 180px;
background-color: #FFFFFF;
- border-top: solid 2px #f4f4f4;
+ /*border-top: solid 2px #f4f4f4;
border-<?php print $left; ?>: solid 2px #f4f4f4;
border-<?php print $right; ?>: solid 1px #222222;
- border-bottom: solid 1px #222222;
+ border-bottom: solid 1px #222222; */
padding: 0px;
border-spacing: 0px;
border-collapse: collapse;
@@ -2735,7 +2740,7 @@ table.dp {
/* Barre titre */
.dpHead,.tpHead,.tpHour td:Hover .tpHead{
font-weight:bold;
- background-color:#b3c5cc;
+ background-color: #888;
color:white;
font-size:11px;
cursor:auto;
@@ -2743,7 +2748,7 @@ table.dp {
/* Barre navigation */
.dpButtons,.tpButtons {
text-align:center;
- background-color:#617389;
+ background-color: #888;
color:#FFFFFF;
font-weight:bold;
cursor:pointer;
@@ -2778,7 +2783,7 @@ table.dp {
padding:0px;
font-size:9px;
border-width:0px;
- color:#0B63A2;
+ color: #eee;
vertical-align:middle;
cursor: pointer;
}