';
$moreforfilter.= $langs->trans('MyFilter') . ':
';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 0ed67601846..0f10c730d1f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -400,7 +400,7 @@ if ($resql)
'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
- if ($user->rights->propal->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+ if ($user->rights->propal->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
@@ -417,10 +417,10 @@ if ($resql)
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
- $topicmail="SendSupplierProposalRef";
- $modelmail="supplier_proposal_send";
+ $topicmail="SendProposalRef";
+ $modelmail="proposal_send";
$objecttmp=new Propal($db);
- $trackid='ord'.$object->id;
+ $trackid='pro'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($sall)
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b5780966a0e..c62257f7077 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -433,7 +433,7 @@ if ($resql)
'builddoc'=>$langs->trans("PDFMerge"),
);
if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
- if ($user->rights->commande->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+ if ($user->rights->commande->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete','createbills'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 2adec26bb2b..2676b5a494c 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -573,7 +573,7 @@ if ($resql)
//'presend'=>$langs->trans("SendByMail"),
//'builddoc'=>$langs->trans("PDFMerge"),
);
- //if ($user->rights->bank->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+ //if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 74d1526f68b..7d40b4820d1 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -238,7 +238,7 @@ $arrayofmassactions = array(
// 'presend'=>$langs->trans("SendByMail"),
// 'builddoc'=>$langs->trans("PDFMerge"),
);
-if ($user->rights->banque->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($user->rights->banque->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
@@ -262,6 +262,11 @@ print '
';
print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_bank.png',0,$newcardbutton,'',$limit, 1);
+$topicmail="Information";
+//$modelmail="subscription";
+$objecttmp=new Account($db);
+//$trackid='sub'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($sall)
{
@@ -414,7 +419,7 @@ if (! empty($arrayfields['accountype']['checked'])) print_liste_field_titr
if (! empty($arrayfields['b.number']['checked'])) print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'],$_SERVER["PHP_SELF"],'b.account_number','',$param,'',$sortfield,$sortorder);
if (! empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'],$_SERVER["PHP_SELF"],'b.fk_accountancy_journal','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['b.currency_code']['checked'])) print_liste_field_titre($arrayfields['b.currency_code']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['b.currency_code']['checked'])) print_liste_field_titre($arrayfields['b.currency_code']['label'],$_SERVER["PHP_SELF"],'b.currency_code','',$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['toreconcile']['checked'])) print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 1c32ecf2716..2629fd9e349 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -592,7 +592,7 @@ if ($resql)
}
else
{
- $arrayofmassactions['delete']=$langs->trans("Delete");
+ $arrayofmassactions['predelete']=$langs->trans("Delete");
}
}
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 1f39599e7ac..988a3e2d352 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -365,7 +365,7 @@ if ($resql)
'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
- if ($user->rights->contrat->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+ if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 05fd2b57e12..07120042eae 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -323,7 +323,7 @@ $arrayofmassactions = array(
//'presend'=>$langs->trans("SendByMail"),
//'builddoc'=>$langs->trans("PDFMerge"),
);
-//if ($user->rights->contrat->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+//if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index a9f1e0ecde4..c1a82467e49 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -379,7 +379,7 @@ if ($resql)
'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
- if ($user->rights->expensereport->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+ if ($user->rights->expensereport->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
@@ -489,7 +489,7 @@ if ($resql)
$topicmail="SendExpenseReport";
$modelmail="expensereport";
$objecttmp=new ExpenseReport($db);
- $trackid='int'.$object->id;
+ $trackid='exp'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($sall)
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index baf90355249..89ad3f77c3a 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -285,8 +285,8 @@ if ($resql)
//'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
- if ($user->rights->ficheinter->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
- //if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+ if ($user->rights->ficheinter->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+ if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
// Lines of title fields
@@ -302,6 +302,12 @@ if ($resql)
print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
+ $topicmail="Information";
+ $modelmail="intervention";
+ $objecttmp=new Intervention($db);
+ $trackid='int'.$object->id;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
if ($sall)
{
foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index db947f4011f..36752c0f607 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -660,7 +660,7 @@ if ($resql)
'builddoc'=>$langs->trans("PDFMerge"),
);
//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
- if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+ if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete','createbills'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index bdf9349763b..19c9978ecd0 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -471,7 +471,7 @@ if ($resql)
//'builddoc'=>$langs->trans("PDFMerge"),
);
//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
- if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+ if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete','createbills'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index c5b39a87681..b705d0be450 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -118,7 +118,7 @@ $arrayofmassactions = array(
'presend'=>$langs->trans("SendByMail"),
'builddoc'=>$langs->trans("PDFMerge"),
);
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
+if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
@@ -209,6 +209,12 @@ if ($resql)
print '
';
print '
';
+ $topicmail="Information";
+ $modelmail="product";
+ $objecttmp=new Product($db);
+ $trackid='prod'.$object->id;
+ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
print '
';
// Lignes des champs de filtre
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 1d89bbbdd94..ac1b7370993 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -298,8 +298,8 @@ $arrayofmassactions = array(
//'presend'=>$langs->trans("SendByMail"),
//'builddoc'=>$langs->trans("PDFMerge"),
);
-if ($user->rights->holiday->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
-//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+if ($user->rights->holiday->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
print '