@@ -1682,7 +1682,7 @@ |
||
1682 | 1682 | |
1683 | 1683 | $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs); |
1684 | 1684 | |
1685 | - $mode = 'target'; |
|
1685 | + $mode = 'target'; |
|
1686 | 1686 | $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object); |
1687 | 1687 | |
1688 | 1688 | // Show recipient |
@@ -210,7 +210,7 @@ |
||
210 | 210 | $maxfilesizearray = getMaxFileSizeArray(); |
211 | 211 | $maxmin = $maxfilesizearray['maxmin']; |
212 | 212 | if ($maxmin > 0) { |
213 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
213 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
214 | 214 | } |
215 | 215 | $texte .= ' <input type="file" name="uploadfile">'; |
216 | 216 | $texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -198,7 +198,7 @@ |
||
198 | 198 | $maxfilesizearray = getMaxFileSizeArray(); |
199 | 199 | $maxmin = $maxfilesizearray['maxmin']; |
200 | 200 | if ($maxmin > 0) { |
201 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
201 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
202 | 202 | } |
203 | 203 | $texte .= ' <input type="file" name="uploadfile">'; |
204 | 204 | $texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | public $sql; |
75 | 75 | |
76 | 76 | |
77 | - public $evenunsubscribe = 0; // Set this to 1 if you want to flag you also want to include email in target that has opt-out. |
|
77 | + public $evenunsubscribe = 0; // Set this to 1 if you want to flag you also want to include email in target that has opt-out. |
|
78 | 78 | |
79 | 79 | |
80 | 80 | /** |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | $part1 = $reg[1]; |
345 | 345 | |
346 | 346 | //$modName = ucfirst($reg[1]); |
347 | - $modName = 'mailing_' . $reg[1]; // name of selector submodule |
|
347 | + $modName = 'mailing_' . $reg[1]; // name of selector submodule |
|
348 | 348 | //print "file=$file modName=$modName"; exit; |
349 | 349 | if (in_array($modName, $modules)) { |
350 | 350 | $langs->load("errors"); |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | $num = $this->db->num_rows($resql); |
235 | 235 | |
236 | 236 | if (empty($conf->partnership->enabled)) { |
237 | - $num = 0; // Force empty list if category module is not enabled |
|
237 | + $num = 0; // Force empty list if category module is not enabled |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | if ($num) { |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | // filter_status_thirdparties |
260 | 260 | include_once DOL_DOCUMENT_ROOT . '/partnership/class/partnership.class.php'; |
261 | 261 | $tmppartnership = new Partnership($this->db); |
262 | - $dummy = $tmppartnership->getLibStatut(0); // We call this only to have $tmppartnership->labelStatus loaded |
|
262 | + $dummy = $tmppartnership->getLibStatut(0); // We call this only to have $tmppartnership->labelStatus loaded |
|
263 | 263 | |
264 | 264 | $s .= $form->selectarray('filter_status_partnership', $tmppartnership->labelStatus, GETPOST('filter_status_partnership'), $langs->trans("Status")); |
265 | 265 |
@@ -115,7 +115,7 @@ |
||
115 | 115 | $maxfilesizearray = getMaxFileSizeArray(); |
116 | 116 | $maxmin = $maxfilesizearray['maxmin']; |
117 | 117 | if ($maxmin > 0) { |
118 | - $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
118 | + $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
119 | 119 | } |
120 | 120 | $s .= '<input type="file" name="username" class="flat">'; |
121 | 121 | return $s; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function formFilter() |
121 | 121 | { |
122 | - global $conf,$langs; |
|
122 | + global $conf, $langs; |
|
123 | 123 | |
124 | 124 | // Load translation files required by the page |
125 | 125 | $langs->loadLangs(array("commercial", "companies", "suppliers", "categories")); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb"; |
131 | 131 | $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as sp"; |
132 | 132 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
133 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
133 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
134 | 134 | $sql .= " AND sp.statut = 1"; |
135 | 135 | $sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')"; |
136 | 136 | $sql .= " GROUP BY sp.poste"; |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $sql .= " " . MAIN_DB_PREFIX . "categorie as c,"; |
166 | 166 | $sql .= " " . MAIN_DB_PREFIX . "categorie_contact as cs"; |
167 | 167 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
168 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
168 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
169 | 169 | $sql .= " AND sp.statut = 1"; |
170 | 170 | $sql .= " AND cs.fk_categorie = c.rowid"; |
171 | 171 | $sql .= " AND cs.fk_socpeople = sp.rowid"; |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | $sql .= " " . MAIN_DB_PREFIX . "categorie as c,"; |
240 | 240 | $sql .= " " . MAIN_DB_PREFIX . "categorie_societe as cs"; |
241 | 241 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
242 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
242 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
243 | 243 | $sql .= " AND sp.statut = 1"; |
244 | 244 | $sql .= " AND cs.fk_categorie = c.rowid"; |
245 | 245 | $sql .= " AND cs.fk_soc = sp.fk_soc"; |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | $sql .= " " . MAIN_DB_PREFIX . "categorie as c,"; |
277 | 277 | $sql .= " " . MAIN_DB_PREFIX . "categorie_fournisseur as cs"; |
278 | 278 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
279 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
279 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
280 | 280 | $sql .= " AND sp.statut = 1"; |
281 | 281 | $sql .= " AND cs.fk_categorie = c.rowid"; |
282 | 282 | $sql .= " AND cs.fk_soc = sp.fk_soc"; |
@@ -436,7 +436,7 @@ discard block |
||
436 | 436 | |
437 | 437 | // Filter on job position |
438 | 438 | $key = $filter_jobposition; |
439 | - if (!empty($key) && $key != 'all' && $key != '-1') { |
|
439 | + if (!empty($key) && $key != 'all' && $key != '-1') { |
|
440 | 440 | $sql .= " AND sp.poste = '" . $this->db->escape($key) . "'"; |
441 | 441 | } |
442 | 442 |
@@ -100,7 +100,7 @@ |
||
100 | 100 | if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg)) { |
101 | 101 | $moduleid = $reg[1]; |
102 | 102 | if ($moduleid == 'csv') { |
103 | - continue; // This may happen if on old file export_csv.modules.php was not correctly deleted |
|
103 | + continue; // This may happen if on old file export_csv.modules.php was not correctly deleted |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | // Loading Class |
@@ -167,7 +167,7 @@ |
||
167 | 167 | $maxfilesizearray = getMaxFileSizeArray(); |
168 | 168 | $maxmin = $maxfilesizearray['maxmin']; |
169 | 169 | if ($maxmin > 0) { |
170 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
170 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
171 | 171 | } |
172 | 172 | $texte .= ' <input type="file" name="uploadfile">'; |
173 | 173 | $texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |