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

Fix reposition

Browse Source
This commit is contained in:
Laurent Destailleur 2021-07-31 17:28:43 +02:00
parent 7eb8232b75
commit b67487b2ca
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/core/modules/mailings/contacts1.modules.php
View File

@ -140,8 +140,8 @@ class mailing_contacts1 extends MailingTargets
$sql .= " ORDER BY sp.poste"; $sql .= " ORDER BY sp.poste";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
$s .= $langs->trans("PostOrFunction").': '; $s .= $langs->trans("PostOrFunction").' ';
$s .= '<select name="filter_jobposition" class="flat" placeholder="'.dol_escape_htmltag($langs->trans("PostOrFunction")).'">'; $s .= '<select name="filter_jobposition" class="flat marginrightonly" placeholder="'.dol_escape_htmltag($langs->trans("PostOrFunction")).'">';
$s .= '<option value="all">&nbsp;</option>'; $s .= '<option value="all">&nbsp;</option>';
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -163,7 +163,7 @@ class mailing_contacts1 extends MailingTargets
$s .= ' '; $s .= ' ';
// Filter on contact category // Filter on contact category
$s .= $langs->trans("ContactCategoriesShort").': '; $s .= $langs->trans("ContactCategoriesShort").' ';
$sql = "SELECT c.label, count(distinct(sp.email)) AS nb"; $sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
$sql .= " FROM "; $sql .= " FROM ";
$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,"; $sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@ -179,7 +179,7 @@ class mailing_contacts1 extends MailingTargets
$sql .= " ORDER BY c.label"; $sql .= " ORDER BY c.label";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
$s .= '<select name="filter_category" class="flat">'; $s .= '<select name="filter_category" class="flat marginrightonly">';
$s .= '<option value="all">&nbsp;</option>'; $s .= '<option value="all">&nbsp;</option>';
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -201,8 +201,8 @@ class mailing_contacts1 extends MailingTargets
$s .= '<br>'; $s .= '<br>';
// Add prospect of a particular level // Add prospect of a particular level
$s .= $langs->trans("NatureOfThirdParty").': '; $s .= $langs->trans("NatureOfThirdParty").' ';
$s .= '<select name="filter" class="flat">'; $s .= '<select name="filter" class="flat marginrightonly">';
$sql = "SELECT code, label"; $sql = "SELECT code, label";
$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel"; $sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
$sql .= " WHERE active > 0"; $sql .= " WHERE active > 0";
@ -238,7 +238,7 @@ class mailing_contacts1 extends MailingTargets
$s .= ' '; $s .= ' ';
// Filter on thirdparty category // Filter on thirdparty category
$s .= $langs->trans("CustomersProspectsCategoriesShort").': '; $s .= $langs->trans("CustomersProspectsCategoriesShort").' ';
$sql = "SELECT c.label, count(distinct(sp.email)) AS nb"; $sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
$sql .= " FROM "; $sql .= " FROM ";
$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,"; $sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@ -254,7 +254,7 @@ class mailing_contacts1 extends MailingTargets
$sql .= " ORDER BY c.label"; $sql .= " ORDER BY c.label";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
$s .= '<select name="filter_category_customer" class="flat">'; $s .= '<select name="filter_category_customer" class="flat marginrightonly maxwidth200">';
$s .= '<option value="all">&nbsp;</option>'; $s .= '<option value="all">&nbsp;</option>';
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
@ -276,7 +276,7 @@ class mailing_contacts1 extends MailingTargets
$s .= ' '; $s .= ' ';
// Filter on thirdparty category // Filter on thirdparty category
$s .= $langs->trans("SuppliersCategoriesShort").': '; $s .= $langs->trans("SuppliersCategoriesShort").' ';
$sql = "SELECT c.label, count(distinct(sp.email)) AS nb"; $sql = "SELECT c.label, count(distinct(sp.email)) AS nb";
$sql .= " FROM "; $sql .= " FROM ";
$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,"; $sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
@ -292,7 +292,7 @@ class mailing_contacts1 extends MailingTargets
$sql .= " ORDER BY c.label"; $sql .= " ORDER BY c.label";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
$s .= '<select name="filter_category_supplier" class="flat">'; $s .= '<select name="filter_category_supplier" class="flat marginrightonly maxwidth200">';
$s .= '<option value="all">&nbsp;</option>'; $s .= '<option value="all">&nbsp;</option>';
if ($resql) { if ($resql) {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);

12
htdocs/core/modules/mailings/pomme.modules.php
View File

@ -20,13 +20,13 @@
/** /**
* \file htdocs/core/modules/mailings/pomme.modules.php * \file htdocs/core/modules/mailings/pomme.modules.php
* \ingroup mailing * \ingroup mailing
* \brief File of class to offer a selector of emailing targets with Rule 'Pomme'. * \brief File of class to offer a selector of emailing targets of users.
*/ */
include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php'; include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
/** /**
* Class to offer a selector of emailing targets with Rule 'Peche'. * Class to offer a selector of emailing targets with Rule 'Pomme'.
*/ */
class mailing_pomme extends MailingTargets class mailing_pomme extends MailingTargets
{ {
@ -119,16 +119,16 @@ class mailing_pomme extends MailingTargets
$langs->load("users"); $langs->load("users");
$s = ''; $s = '';
$s .= $langs->trans("Status").': '; $s .= $langs->trans("Status").' ';
$s .= '<select name="filter" class="flat">'; $s .= '<select name="filter" class="flat marginrightonly">';
$s .= '<option value="-1">&nbsp;</option>'; $s .= '<option value="-1">&nbsp;</option>';
$s .= '<option value="1">'.$langs->trans("Enabled").'</option>'; $s .= '<option value="1">'.$langs->trans("Enabled").'</option>';
$s .= '<option value="0">'.$langs->trans("Disabled").'</option>'; $s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
$s .= '</select>'; $s .= '</select>';
$s .= ' '; $s .= ' ';
$s .= $langs->trans("Employee").': '; $s .= $langs->trans("Employee").' ';
$s .= '<select name="filteremployee" class="flat">'; $s .= '<select name="filteremployee" class="flat marginrightonly">';
$s .= '<option value="-1">&nbsp;</option>'; $s .= '<option value="-1">&nbsp;</option>';
$s .= '<option value="1">'.$langs->trans("Yes").'</option>'; $s .= '<option value="1">'.$langs->trans("Yes").'</option>';
$s .= '<option value="0">'.$langs->trans("No").'</option>'; $s .= '<option value="0">'.$langs->trans("No").'</option>';

8
htdocs/core/modules/mailings/thirdparties.modules.php
View File

@ -226,8 +226,8 @@ class mailing_thirdparties extends MailingTargets
$langs->load("companies"); $langs->load("companies");
$s = $langs->trans("Categories").': '; $s = $langs->trans("Categories").' ';
$s .= '<select name="filter" class="flat">'; $s .= '<select name="filter" class="flat marginrightonly">';
// Show categories // Show categories
$sql = "SELECT rowid, label, type, visible"; $sql = "SELECT rowid, label, type, visible";
@ -276,7 +276,7 @@ class mailing_thirdparties extends MailingTargets
$s .= '</select> '; $s .= '</select> ';
$s .= $langs->trans('ProspectCustomer'); $s .= $langs->trans('ProspectCustomer');
$s .= ': <select name="filter_client" class="flat">'; $s .= ' <select name="filter_client" class="flat marginrightonly">';
$s .= '<option value="-1">&nbsp;</option>'; $s .= '<option value="-1">&nbsp;</option>';
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) { if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
$s .= '<option value="2">'.$langs->trans('Prospect').'</option>'; $s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
@ -292,7 +292,7 @@ class mailing_thirdparties extends MailingTargets
$s .= '</select> '; $s .= '</select> ';
$s .= $langs->trans("Status"); $s .= $langs->trans("Status");
$s .= ': <select name="filter_status" class="flat">'; $s .= ' <select name="filter_status" class="flat marginrightonly">';
$s .= '<option value="-1">&nbsp;</option>'; $s .= '<option value="-1">&nbsp;</option>';
$s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>'; $s .= '<option value="1" selected>'.$langs->trans("Enabled").'</option>';
$s .= '<option value="0">'.$langs->trans("Disabled").'</option>'; $s .= '<option value="0">'.$langs->trans("Disabled").'</option>';