diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 8586c25b3dd..16b73702be0 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -643,6 +643,14 @@ if ($object->fetch($id) >= 0) {
// Ligne des champs de filtres
print '
';
+
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '| ';
+ $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+ print $searchpicto;
+ print ' | ';
+ }
// EMail
print '';
print '';
@@ -679,10 +687,13 @@ if ($object->fetch($id) >= 0) {
print $formmailing->selectDestinariesStatus($search_dest_status, 'search_dest_status', 1);
print ' | ';
// Action column
- print '';
- $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
- print $searchpicto;
- print ' | ';
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '';
+ $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+ print $searchpicto;
+ print ' | ';
+ }
+
print '
';
if ($page) {
@@ -690,6 +701,10 @@ if ($object->fetch($id) >= 0) {
}
print '';
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+ }
print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "mc.email", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Lastname", $_SERVER["PHP_SELF"], "mc.lastname", $param, "", "", $sortfield, $sortorder);
print_liste_field_titre("Firstname", $_SERVER["PHP_SELF"], "mc.firstname", $param, "", "", $sortfield, $sortorder);
@@ -700,7 +715,10 @@ if ($object->fetch($id) >= 0) {
// Date sending
print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, '', 'align="center"', $sortfield, $sortorder);
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "mc.statut", $param, '', 'class="right"', $sortfield, $sortorder);
- print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+ // Action column
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+ }
print '
';
$i = 0;
@@ -722,6 +740,22 @@ if ($object->fetch($id) >= 0) {
print '';
+ // Action column
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print '| ';
+ print '';
+ if ($obj->statut == $object::STATUS_DRAFT) { // Not sent yet
+ if (!empty($user->rights->mailing->creer)) {
+ print ''.img_delete($langs->trans("RemoveRecipient")).'';
+ }
+ }
+ /*if ($obj->statut == -1) // Sent with error
+ {
+ print ''.$langs->trans("Retry").'';
+ }*/
+ print ' | ';
+ }
+
print '';
print img_picto($obj->email, 'email', 'class="paddingright"');
if ($obj->nb > 0) {
@@ -783,19 +817,21 @@ if ($object->fetch($id) >= 0) {
print ' | ';
}
- // Search Icon
- print '';
- print '';
- if ($obj->statut == 0) { // Not sent yet
- if (!empty($user->rights->mailing->creer)) {
- print ''.img_delete($langs->trans("RemoveRecipient")).'';
+ // Action column
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print ' | ';
+ print '';
+ if ($obj->statut == $object::STATUS_DRAFT) { // Not sent yet
+ if (!empty($user->rights->mailing->creer)) {
+ print ''.img_delete($langs->trans("RemoveRecipient")).'';
+ }
}
+ /*if ($obj->statut == -1) // Sent with error
+ {
+ print ''.$langs->trans("Retry").'';
+ }*/
+ print ' | ';
}
- /*if ($obj->statut == -1) // Sent with error
- {
- print ''.$langs->trans("Retry").'';
- }*/
- print '';
print '
';
$i++;