lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/class/hookmanager.class.php
This commit is contained in:
Laurent Destailleur 2013-06-12 22:17:15 +02:00
commit 93c71d00f7
4 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/comm/mailing/cibles.php
View File

@ -220,8 +220,10 @@ if ($object->fetch($id) >= 0)
$var=!$var; $var=!$var;
$allowaddtarget=($object->statut == 0 || $object->statut == 1);
// Show email selectors // 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):''),''); 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; $var = !$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
if ($object->statut == 0) if ($allowaddtarget)
{ {
print '<form name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">'; print '<form name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -326,7 +328,7 @@ if ($object->fetch($id) >= 0)
print '</td>'; print '</td>';
print '<td align="right">'; print '<td align="right">';
if ($object->statut == 0) if ($allowaddtarget)
{ {
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
} }
@ -337,7 +339,7 @@ if ($object->fetch($id) >= 0)
} }
print '</td>'; print '</td>';
if ($object->statut == 0) print '</form>'; if ($allowaddtarget) print '</form>';
print "</tr>\n"; print "</tr>\n";
} }
@ -349,13 +351,6 @@ if ($object->fetch($id) >= 0)
} }
// List of selected targets // List of selected targets
print "\n<!-- Liste destinataires selectionnes -->\n";
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
$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 = "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 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.fk_mailing=".$object->id; $sql .= " WHERE mc.fk_mailing=".$object->id;
@ -375,10 +370,26 @@ if ($object->fetch($id) >= 0)
if ($search_firstname) $param.= "&amp;search_firstname=".urlencode($search_firstname); if ($search_firstname) $param.= "&amp;search_firstname=".urlencode($search_firstname);
if ($search_email) $param.= "&amp;search_email=".urlencode($search_email); if ($search_email) $param.= "&amp;search_email=".urlencode($search_email);
$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">'; print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
$cleartext='<br></div><div>'.$langs->trans("ToClearAllRecipientsClickHere").': '.'<input type="submit" name="clearlist" class="button" value="'.$langs->trans("TargetsReset").'">';
print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,''); print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');
print '</form>';
print "\n<!-- Liste destinataires selectionnes -->\n";
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
if ($page) $param.= "&amp;page=".$page; if ($page) $param.= "&amp;page=".$page;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -510,6 +521,8 @@ if ($object->fetch($id) >= 0)
} }
print "</table><br>"; print "</table><br>";
print '</form>';
$db->free($resql); $db->free($resql);
} }
else else
@ -517,7 +530,6 @@ if ($object->fetch($id) >= 0)
dol_print_error($db); dol_print_error($db);
} }
print '</form>';
print "\n<!-- Fin liste destinataires selectionnes -->\n"; print "\n<!-- Fin liste destinataires selectionnes -->\n";
} }

8
htdocs/core/class/hookmanager.class.php
View File

@ -144,7 +144,7 @@ class HookManager
foreach($modules as $module => $actionclassinstance) 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."<br>\n"; //print "Before hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."<br>\n";
//print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action; //print 'class='.get_class($actionclassinstance).' method='.$method.' action='.$action;
// jump to next class if method does not exists // jump to next class if method does not exists
if (! method_exists($actionclassinstance,$method)) continue; if (! method_exists($actionclassinstance,$method)) continue;
@ -188,10 +188,10 @@ class HookManager
if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result; 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."<br>\n"; //print "After hook ".get_class($actionclassinstance)." method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction."<br>\n";
unset($actionclassinstance->results);
unset($actionclassinstance->resprints);
} }
} }
} }

2
htdocs/product/fiche.php
View File

@ -732,7 +732,7 @@ else
{ {
print '<tr><td>'.$langs->trans("Nature").'</td><td>'; print '<tr><td>'.$langs->trans("Nature").'</td><td>';
$statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); $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 '</td></tr>'; print '</td></tr>';
} }

9
htdocs/theme/bureau2crea/style.css.php
View File

@ -1102,13 +1102,12 @@ div.tabs a.tab:hover {
text-align: <?php print $left; ?>; text-align: <?php print $left; ?>;
} }
div.tabBar {
color: #234046;
margin: 0px 0px 10px 0px;
background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x;
}
*/ */
div.tabBar {
margin: 0px 0px 10px 0px;
}
div.tabsAction { div.tabsAction {
margin: 20px 0em 1px 0em; margin: 20px 0em 1px 0em;
padding: 0em 0em; padding: 0em 0em;