diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index dfb84f5a01d..90c01d54725 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -220,8 +220,10 @@ if ($object->fetch($id) >= 0) $var=!$var; + $allowaddtarget=($object->statut == 0 || $object->statut == 1); + // Show email selectors - if ($object->statut == 0 && $user->rights->mailing->creer) + if ($allowaddtarget && $user->rights->mailing->creer) { print_fiche_titre($langs->trans("ToAddRecipientsChooseHere"),($user->admin?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"),1):''),''); @@ -291,7 +293,7 @@ if ($object->fetch($id) >= 0) $var = !$var; print ''; - if ($object->statut == 0) + if ($allowaddtarget) { print '
'; print ''; @@ -326,7 +328,7 @@ if ($object->fetch($id) >= 0) print ''; print ''; - if ($object->statut == 0) + if ($allowaddtarget) { print ''; } @@ -337,7 +339,7 @@ if ($object->fetch($id) >= 0) } print ''; - if ($object->statut == 0) print '
'; + if ($allowaddtarget) print ''; print "\n"; } @@ -349,13 +351,6 @@ if ($object->fetch($id) >= 0) } // List of selected targets - print "\n\n"; - print '
'; - print ''; - print ''; - print ''; - print ''; - $sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.source_url, mc.source_id, mc.source_type"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql .= " WHERE mc.fk_mailing=".$object->id; @@ -375,10 +370,26 @@ if ($object->fetch($id) >= 0) if ($search_firstname) $param.= "&search_firstname=".urlencode($search_firstname); if ($search_email) $param.= "&search_email=".urlencode($search_email); - $cleartext='
'.$langs->trans("ToClearAllRecipientsClickHere").': '.''; + print ''; + print ''; + print ''; + print ''; + print ''; + + $cleartext='
'.$langs->trans("ToClearAllRecipientsClickHere").': '.''; print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,''); + print ''; + + print "\n\n"; + print '
'; + print ''; + print ''; + print ''; + print ''; + + if ($page) $param.= "&page=".$page; print ''; print ''; @@ -510,6 +521,8 @@ if ($object->fetch($id) >= 0) } print "

"; + print '
'; + $db->free($resql); } else @@ -517,7 +530,6 @@ if ($object->fetch($id) >= 0) dol_print_error($db); } - print ''; print "\n\n"; } diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 9b9bf62edc1..773bd512d70 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -144,7 +144,7 @@ class HookManager foreach($modules as $module => $actionclassinstance) { //print "Before hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n"; - + //print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action; // jump to next class if method does not exists if (! method_exists($actionclassinstance,$method)) continue; @@ -188,10 +188,10 @@ class HookManager if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result; } - $actionclassinstance->results=''; - $actionclassinstance->resprints=''; - //print "After hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."
\n"; + + unset($actionclassinstance->results); + unset($actionclassinstance->resprints); } } } diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index fa1f0fa5621..8971b93a3df 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -732,7 +732,7 @@ else { print ''.$langs->trans("Nature").''; $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); - print $form->selectarray('finished',$statutarray,GETPOST('finished')); + print $form->selectarray('finished',$statutarray,GETPOST('finished'),1); print ''; } diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 812f4488e17..132b1c3e12b 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -1102,13 +1102,12 @@ div.tabs a.tab:hover { text-align: ; } -div.tabBar { - color: #234046; - margin: 0px 0px 10px 0px; - background: #dee7ec url() repeat-x; -} */ +div.tabBar { + margin: 0px 0px 10px 0px; +} + div.tabsAction { margin: 20px 0em 1px 0em; padding: 0em 0em;