diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 9f825cdf009..33c1d098b63 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1200,7 +1200,7 @@ if ($action == 'create')
{
print '
';
print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' ';
print ' ';
}
print ''."\n";
@@ -1242,7 +1242,7 @@ if ($action == 'create')
print ''.$langs->trans("Project").' ';
$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, "projectid", 0, 0, 1, 1);
- print ' id).'">'.$langs->trans("AddProject").' ';
+ print ' id).'"> ';
print " ";
}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index bef3d9fd0dc..b451d2f4939 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2191,7 +2191,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
{
if (!in_array('prospectionstatus', $hiddenfields)) print_liste_field_titre("OpportunityStatus", "", "", "", "", '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("OpportunityAmount", "", "", "", "", 'align="right"', $sortfield, $sortorder);
- print_liste_field_titre('OpportunityWeightedAmount', '', '', '', '', 'align="right"', $sortfield, $sortorder);
+ //print_liste_field_titre('OpportunityWeightedAmount', '', '', '', '', 'align="right"', $sortfield, $sortorder);
}
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
@@ -2225,10 +2225,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
print '';
- print '';
+ print ' ';
print $projectstatic->getNomUrl(1, '', 0, '', '-', 0, -1, 'nowraponall');
if (!in_array('projectlabel', $hiddenfields)) print ''.dol_trunc($objp->title, 24).' ';
print ' ';
+
print '';
if ($objp->fk_soc > 0)
{
@@ -2242,7 +2243,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
if (!in_array('prospectionstatus', $hiddenfields)) {
- print ' ';
+ print ' ';
// Because color of prospection status has no meaning yet, it is used if hidden constant is set
if (empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
$oppStatusCode = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
@@ -2269,14 +2270,12 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
}
print ' ';
- if ($objp->opp_amount) print price($objp->opp_amount, 0, '', 1, -1, -1, $conf->currency);
- print ' ';
- print '';
- if ($objp->opp_percent && $objp->opp_amount) {
- $opp_weighted_amount = $objp->opp_percent * $objp->opp_amount / 100;
- print price($opp_weighted_amount, 0, '', 1, -1, -1, $conf->currency);
- $ponderated_opp_amount += price2num($opp_weighted_amount);
- }
+ if ($objp->opp_percent && $objp->opp_amount) {
+ $opp_weighted_amount = $objp->opp_percent * $objp->opp_amount / 100;
+ $alttext = $langs->trans("OpportunityWeightedAmount").' '.price($opp_weighted_amount, 0, '', 1, -1, 0, $conf->currency);
+ $ponderated_opp_amount += price2num($opp_weighted_amount);
+ }
+ if ($objp->opp_amount) print ''.price($objp->opp_amount, 0, '', 1, -1, 0, $conf->currency).' ';
print ' ';
}
@@ -2317,14 +2316,16 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
}
print ' ';
- print ''.$langs->trans("Total")." ";
+ print ''.$langs->trans("Total")." ";
if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
if (!in_array('prospectionstatus', $hiddenfields)) {
print ' ';
}
- print ''.price($total_opp_amount, 0, '', 1, -1, -1, $conf->currency).' ';
- print ''.$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1).' ';
+ print '';
+ //$form->textwithpicto(price($ponderated_opp_amount, 0, '', 1, -1, -1, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc"), 1);
+ print $form->textwithpicto(price($total_opp_amount, 0, '', 1, -1, 0, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc").' : '.price($ponderated_opp_amount, 0, '', 1, -1, 0, $conf->currency));
+ print ' ';
}
if (empty($conf->global->PROJECT_HIDE_TASKS))
{
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 505d2fbed29..3d2e873b5b3 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -65,6 +65,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('doncard', 'globalcard'));
+
/*
* Actions
*/
@@ -409,11 +410,11 @@ if ($action == 'create')
// Country
print ' '.$langs->trans('Country').' ';
- print $form->select_country(GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id);
+ print img_picto('', 'globe-americas', 'class="paddingrightonly"').$form->select_country(GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
print ' ';
- print "".''.$langs->trans("EMail").' ';
+ print "".''.$langs->trans("EMail").' '.img_picto('', 'object_email', 'class="paddingrightonly"').' ';
}
// Payment mode