diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 54779432a3b..001f6132e95 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -162,7 +162,8 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele if ($conf->use_javascript_ajax) { - print ''; + print '
'; + print '
'; print ''; print ''; print '
'.$langs->trans("Statistics").'
'; @@ -199,6 +200,7 @@ if ($conf->use_javascript_ajax) print $SommeA+$SommeB+$SommeC+$SommeD; print '
'; + print ''; } print '
'; @@ -234,6 +236,7 @@ if ($result) } } +print '
'; print ''; print ''; print ''; @@ -261,7 +264,8 @@ print ""; print '"; print ""; print "\n"; -print "
'.$langs->trans("Subscriptions").'".$numb."'.price($tot)."".price(price2num($numb>0?($tot/$numb):0,'MT'))."

\n"; +print "
"; +print "
\n"; print '
'; @@ -283,6 +287,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { + print '
'; print ''; print ''; print ''; @@ -319,7 +324,8 @@ if ($resql) $i++; } } - print "
'.$langs->trans("LastMembersModified",$max).'

"; + print "
"; + print "
"; } else { @@ -344,6 +350,7 @@ $sql.= $db->plimit($max, 0); $resql=$db->query($sql); if ($resql) { + print '
'; print ''; print ''; print ''; @@ -379,7 +386,8 @@ if ($resql) $i++; } } - print "
'.$langs->trans("LastSubscriptionsModified",$max).'

"; + print "
"; + print "
"; } else { @@ -388,6 +396,7 @@ else // Summary of members by type +print '
'; print ''; print ''; print ''; @@ -416,7 +425,7 @@ print ''; print "
'.$langs->trans("MembersTypes").''.$SommeD.' '.$staticmember->LibSta print '
\n"; - +print "
"; print '
'; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index b9c1eb1f1fb..b91d204e6c4 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -1147,6 +1147,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks= $arrayidtypeofcontact=array(); + print '
'; print ''; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; @@ -1346,6 +1347,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks= } print "
"; + print '
'; if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) { diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 91d642bef7e..487dc6d54f5 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -818,6 +818,8 @@ Websites=Web sites Events=Events EMailTemplates=Emails templates FileNotShared=File not shared to exernal public +Project=Project +Projects=Projects # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index f9eb6c00477..1a46cfef5f8 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -3,8 +3,6 @@ RefProject=Ref. project ProjectRef=Project ref. ProjectId=Project Id ProjectLabel=Project label -Project=Project -Projects=Projects ProjectsArea=Projects Area ProjectStatus=Project status SharedProject=Everybody diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 8f2ef96a4f5..3e29bf4e041 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -134,6 +134,8 @@ while ($objp = $db->fetch_object($result)) $prodser[$objp->fk_product_type][$status]=$objp->total; } + +print '
'; print ''; print ''; if (! empty($conf->product->enabled)) @@ -188,11 +190,13 @@ print '
'.$langs->trans("Statistics").'
'.$langs->trans("Total").''; print ''; print ''; print ''; print '
'.$langs->trans("Categories").'
'; @@ -246,6 +250,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS print $total; print '
'; + print ''; } print '
'; @@ -281,6 +286,7 @@ if ($result) if (isset($_GET["type"]) && $_GET["type"] == 0) $transRecordedType = $langs->trans("LastRecordedProducts",$max); if (isset($_GET["type"]) && $_GET["type"] == 1) $transRecordedType = $langs->trans("LastRecordedServices",$max); + print '
'; print ''; $colnb=5; @@ -355,6 +361,7 @@ if ($result) $db->free($result); print "
"; + print '
'; print '
'; } } diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php index 10bec155ded..60b0ffa0809 100644 --- a/htdocs/projet/graph_opportunities.inc.php +++ b/htdocs/projet/graph_opportunities.inc.php @@ -1,4 +1,4 @@ -global->PROJECT_USE_OPPORTUNITIES)) { $sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount"; @@ -48,7 +48,8 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $db->free($resql); $ponderated_opp_amount = $ponderated_opp_amount / 100; - + + print '
'; print ''; print ''."\n"; $var=true; @@ -67,7 +68,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) $dataseries[]=array('label'=>$labelstatus,'data'=>(isset($valsamount[$status])?(float) $valsamount[$status]:0)); if (! $conf->use_javascript_ajax) { - + print ''; print ''; print ''; @@ -88,7 +89,10 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) //print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')'; print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1); print ''; - print "
'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'
'.$labelstatus.''.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).''.price(price2num($ponderated_opp_amount,'MT'), 0, '', 1, -1, -1, $conf->currency).'

"; + print "
"; + print "
"; + + print "
"; } else { diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 2188d4bd6a4..58f4a70ea4b 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -159,6 +159,7 @@ print_projecttasks_array($db, $form, $socid, $projectsListId, 0, 0, $listofoppst print '
'; +print '
'; print ''; print ''; print_liste_field_titre("OpenedProjectsByThirdparties",$_SERVER["PHP_SELF"],"s.nom","","",'',$sortfield,$sortorder); @@ -213,6 +214,7 @@ else dol_print_error($db); } print "
"; +print '
'; if (! empty($conf->global->PROJECT_SHOW_PROJECT_LIST_ON_PROJECT_AREA)) {