diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 1aa1dc6bee7..74f9e8234ad 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -30,6 +30,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; $langs->load("companies"); diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 5b42fdb6825..e351b68df76 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -684,6 +684,7 @@ else { $num = $db->num_rows($resql); + print '
'; print ''; $param="&id=".$object->id; @@ -760,6 +761,7 @@ else $i++; } print "
"; + print "
"; } else { diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 367d37b8404..2e809fa6c3b 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1171,6 +1171,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint= if (get_class($filterobj) == 'Societe') $out.=''; $out.="\n"; + + $out.='
'; $out.=''; $out.=''; if ($donetodo) @@ -1201,7 +1203,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint= $out.=''; } $out.=''; - $out.=''; + $out.=''; $out.=''; $out.='
'; $out.=$formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1, 0, 0, 1); @@ -1373,7 +1375,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint= $i++; } $out.="
\n"; - //$out.="
\n"; + $out.="
\n"; } $out.=''; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 666b72d0940..e4709facd9b 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -1441,7 +1441,7 @@ else if ($id || $ref) print '
'; print '
'; - print ''; + print '
'; // Linked documents if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled)) @@ -1681,7 +1681,10 @@ else if ($id || $ref) /* * Lines of products */ - print '
'; + print '
'; + + print '
'; + print '
'; print ''; if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { @@ -1955,10 +1958,9 @@ else if ($id || $ref) } // TODO Show also lines ordered but not delivered - - print "
\n"; + print '
'; } diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php index f6e48b8d7fa..0480196ccf9 100644 --- a/htdocs/projet/graph_opportunities.inc.php +++ b/htdocs/projet/graph_opportunities.inc.php @@ -78,7 +78,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { print ''; $data=array('series'=>$dataseries); - dol_print_graph('stats',400,180,$data,1,'pie',0,'',0,$totaloppnb?0:1); + dol_print_graph('stats',360,180,$data,1,'pie',0,'',0,$totaloppnb?0:1); print ''; } //if ($totalinprocess != $total)