Test Failed
Push — main ( c8394f...8477f1 )
by Rafael
66:21
created
public/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
         $this->db = $db;
91 91
         $this->name = "cornas";
92 92
         $this->description = $langs->trans('SuppliersCommandModel');
93
-        $this->update_main_doc_field = 1;       // Save the name of generated file as the main doc when generating a doc with this template
93
+        $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
94 94
 
95 95
         // Page size for A4 format
96 96
         $this->type = 'pdf';
Please login to merge, or discard this patch.
public/htdocs/core/modules/modFacture.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -689,7 +689,7 @@
 block discarded – undo
689 689
         $keyforaliasextra = 'extra';
690 690
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
691 691
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
692
-        $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
692
+        $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
693 693
         if (!empty($user) && !$user->hasRight('societe', 'client', 'voir')) {
694 694
             $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
695 695
         }
Please login to merge, or discard this patch.
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@
 block discarded – undo
174 174
         $maxfilesizearray = getMaxFileSizeArray();
175 175
         $maxmin = $maxfilesizearray['maxmin'];
176 176
         if ($maxmin > 0) {
177
-            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
177
+            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
178 178
         }
179 179
         $texte .= ' <input type="file" name="uploadfile">';
180 180
         $texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
Please login to merge, or discard this patch.
public/htdocs/core/modules/modExpedition.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
      */
46 46
     public function __construct($db)
47 47
     {
48
-        global $conf, $user;    // $conf is required by /core/extrafieldsinexport.inc.php
48
+        global $conf, $user; // $conf is required by /core/extrafieldsinexport.inc.php
49 49
 
50 50
         $this->db = $db;
51 51
         $this->numero = 80;
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         $this->export_fields_array[$r] = array(
249 249
             's.rowid' => "IdCompany", 's.nom' => 'ThirdParty', 's.address' => 'Address', 's.zip' => 'Zip', 's.town' => 'Town', 'd.nom' => 'State', 'co.label' => 'Country',
250 250
             'co.code' => 'CountryCode', 's.phone' => 'Phone', 's.siren' => 'ProfId1', 's.siret' => 'ProfId2', 's.ape' => 'ProfId3', 's.idprof4' => 'ProfId4', 's.idprof5' => 'ProfId5',
251
-            's.idprof6' => 'ProfId6', 'c.rowid' => "Id", 'c.ref' => "Ref", 'c.ref_customer' => "RefCustomer", 'c.fk_soc' => "IdCompany", 'c.date_creation' => "DateCreation",  'c.date_valid' => "DateValidation",
251
+            's.idprof6' => 'ProfId6', 'c.rowid' => "Id", 'c.ref' => "Ref", 'c.ref_customer' => "RefCustomer", 'c.fk_soc' => "IdCompany", 'c.date_creation' => "DateCreation", 'c.date_valid' => "DateValidation",
252 252
             'c.date_delivery' => "DateDeliveryPlanned", 'c.tracking_number' => "TrackingNumber", 'c.height' => "Height", 'c.width' => "Width", 'c.size' => "Depth",
253 253
             'c.size_units' => 'SizeUnits', 'c.weight' => "Weight", 'c.weight_units' => "WeightUnits", 'c.fk_statut' => 'Status', 'c.note_public' => "NotePublic",
254 254
             'ed.rowid' => 'LineId', 'cd.description' => 'Description', 'ed.qty' => "Qty", 'p.rowid' => 'ProductId', 'p.ref' => 'ProductRef', 'p.label' => 'ProductLabel',
Please login to merge, or discard this patch.
public/htdocs/core/modules/modEventOrganization.class.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -233,82 +233,82 @@  discard block
 block discarded – undo
233 233
         /* END MODULEBUILDER TOPMENU */
234 234
         /* BEGIN MODULEBUILDER LEFTMENU CONFERENCEORBOOTH*/
235 235
         $this->menu[$r++] = array(
236
-            'fk_menu' => 'fk_mainmenu=project',     // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
237
-            'type' => 'left',                           // This is a Left menu entry
236
+            'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
237
+            'type' => 'left', // This is a Left menu entry
238 238
             'titre' => 'EventOrganizationMenuLeft',
239 239
             'prefix' => img_picto('', 'eventorganization', 'class="paddingright pictofixedwidth"'),
240 240
             'mainmenu' => 'project',
241 241
             'leftmenu' => 'eventorganization',
242 242
             'url' => '',
243
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
243
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
244 244
             'position' => 1000 + $r,
245
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
246
-            'perms' => '$user->hasRight("eventorganization", "read")',                          // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
245
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
246
+            'perms' => '$user->hasRight("eventorganization", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
247 247
             'target' => '',
248
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
248
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
249 249
         );
250 250
         $this->menu[$r++] = array(
251
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',       // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
252
-            'type' => 'left',                           // This is a Left menu entry
251
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
252
+            'type' => 'left', // This is a Left menu entry
253 253
             'titre' => 'New',
254 254
             'url' => '/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
255
-            'langs' => 'eventorganization@eventorganization',           // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
255
+            'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
256 256
             'position' => 1000 + $r,
257
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
258
-            'perms' => '$user->hasRight("eventorganization", "write")',                         // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
257
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
258
+            'perms' => '$user->hasRight("eventorganization", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
259 259
             'target' => '',
260
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
260
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
261 261
         );
262 262
         $this->menu[$r++] = array(
263
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',       // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
264
-            'type' => 'left',                           // This is a Left menu entry
263
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
264
+            'type' => 'left', // This is a Left menu entry
265 265
             'titre' => 'List',
266 266
             'url' => '/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
267
-            'langs' => 'eventorganization@eventorganization',           // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
267
+            'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
268 268
             'position' => 1000 + $r,
269
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
270
-            'perms' => '$user->hasRight("eventorganization", "write")',                         // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
269
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
270
+            'perms' => '$user->hasRight("eventorganization", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
271 271
             'target' => '',
272
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
272
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
273 273
         );
274 274
         $this->menu[$r++] = array(
275
-            'fk_menu' => 'fk_mainmenu=project',     // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
276
-            'type' => 'left',                           // This is a Left menu entry
275
+            'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
276
+            'type' => 'left', // This is a Left menu entry
277 277
             'titre' => 'ConferenceOrBooth',
278 278
             'prefix' => img_picto('', 'conferenceorbooth', 'class="paddingright pictofixedwidth"'),
279 279
             'mainmenu' => 'project',
280 280
             'leftmenu' => 'eventorganizationconforbooth',
281 281
             'url' => '',
282
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
282
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
283 283
             'position' => 1000 + $r,
284
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
285
-            'perms' => '$user->hasRight("eventorganization", "read")',                          // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
284
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
285
+            'perms' => '$user->hasRight("eventorganization", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
286 286
             'target' => '',
287
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
287
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
288 288
         );
289 289
         $this->menu[$r++] = array(
290
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',        // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
291
-            'type' => 'left',                           // This is a Left menu entry
290
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
291
+            'type' => 'left', // This is a Left menu entry
292 292
             'titre' => 'New',
293 293
             'url' => '/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create',
294
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
294
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
295 295
             'position' => 1000 + $r,
296
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
297
-            'perms' => '$user->hasRight("eventorganization", "write")',                         // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
296
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
297
+            'perms' => '$user->hasRight("eventorganization", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
298 298
             'target' => '',
299
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
299
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
300 300
         );
301 301
         $this->menu[$r++] = array(
302
-            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',        // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
303
-            'type' => 'left',                           // This is a Left menu entry
302
+            'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
303
+            'type' => 'left', // This is a Left menu entry
304 304
             'titre' => 'List',
305 305
             'url' => '/eventorganization/conferenceorbooth_list.php?mainmenu=project',
306
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
306
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
307 307
             'position' => 1000 + $r,
308
-            'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
309
-            'perms' => '$user->hasRight("eventorganization", "read")',                          // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
308
+            'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
309
+            'perms' => '$user->hasRight("eventorganization", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
310 310
             'target' => '',
311
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
311
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
312 312
         );
313 313
         /* END MODULEBUILDER LEFTMENU CONFERENCEORBOOTH */
314 314
 
@@ -326,8 +326,8 @@  discard block
 block discarded – undo
326 326
         $keyforelement = 'conferenceorboothattendee';
327 327
         include DOL_DOCUMENT_ROOT . '/core/commonfieldsinexport.inc.php';
328 328
         $this->export_entities_array[$r]['t.fk_invoice'] = 'invoice';
329
-        unset($this->export_fields_array[$r]['t.fk_project']);  // Remove field so we can add it at end just after
330
-        unset($this->export_fields_array[$r]['t.fk_soc']);  // Remove field so we can add it at end just after
329
+        unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
330
+        unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
331 331
         $this->export_fields_array[$r]['t.fk_invoice'] = 'InvoiceId';
332 332
         $this->export_fields_array[$r]['t.fk_project'] = 'ProjectId';
333 333
         $this->export_fields_array[$r]['p.ref'] = 'ProjectRef';
@@ -359,16 +359,16 @@  discard block
 block discarded – undo
359 359
         /* BEGIN MODULEBUILDER EXPORT CONFERENCEORBOOTH */
360 360
         $langs->load("eventorganization");
361 361
         $this->export_code[$r] = $this->rights_class . '_' . $r;
362
-        $this->export_label[$r] = 'ListOfConfOrBoothOfEvent';   // Translation key (used only if key ExportDataset_xxx_z not found)
362
+        $this->export_label[$r] = 'ListOfConfOrBoothOfEvent'; // Translation key (used only if key ExportDataset_xxx_z not found)
363 363
         $this->export_icon[$r] = 'conferenceorbooth';
364 364
         // Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
365 365
         $keyforclass = 'ConferenceOrBooth';
366 366
         $keyforclassfile = '/eventorganization/class/conferenceorbooth.class.php';
367 367
         $keyforelement = 'conferenceorbooth';
368 368
         include DOL_DOCUMENT_ROOT . '/core/commonfieldsinexport.inc.php';
369
-        unset($this->export_fields_array[$r]['t.fk_action']);   // Remove field so we can add it at end just after
370
-        unset($this->export_fields_array[$r]['t.fk_project']);  // Remove field so we can add it at end just after
371
-        unset($this->export_fields_array[$r]['t.fk_soc']);  // Remove field so we can add it at end just after
369
+        unset($this->export_fields_array[$r]['t.fk_action']); // Remove field so we can add it at end just after
370
+        unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
371
+        unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
372 372
         $this->export_fields_array[$r]['t.fk_action'] = 'ConferenceOrBoothFormatID';
373 373
         $this->export_fields_array[$r]['ca.code'] = 'ConferenceOrBoothFormatCode';
374 374
         $this->export_fields_array[$r]['ca.libelle'] = 'ConferenceOrBoothFormatLabel';
Please login to merge, or discard this patch.
public/htdocs/core/modules/modResource.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
      */
44 44
     public function __construct($db)
45 45
     {
46
-        global $langs, $conf;   // $langs may be used by the tpl files.
46
+        global $langs, $conf; // $langs may be used by the tpl files.
47 47
 
48 48
         $this->db = $db;
49 49
 
Please login to merge, or discard this patch.
public/htdocs/core/modules/modApi.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
143 143
 
144 144
         // Add here list of permission defined by an id, a label, a boolean and two constant strings.
145 145
         // Example:
146
-        $this->rights[$r][0] = $this->numero + $r;  // Permission id (must not be already used)
146
+        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
147 147
         $this->rights[$r][1] = 'Generate/modify users API key'; // Permission label
148
-        $this->rights[$r][3] = 0;                   // Permission by default for new user (0/1)
149
-        $this->rights[$r][4] = 'apikey';                // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
150
-        $this->rights[$r][5] = 'generate';              // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
148
+        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
149
+        $this->rights[$r][4] = 'apikey'; // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
150
+        $this->rights[$r][5] = 'generate'; // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
151 151
         $r++;
152 152
 
153 153
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
     {
231 231
         // Remove old constants with entity fields different of 0
232 232
         $sql = array(
233
-            "DELETE FROM " . MAIN_DB_PREFIX . "const WHERE name = " . $this->db->encrypt('MAIN_MODULE_API'),      // API can't be enabled per environment. Why ?
233
+            "DELETE FROM " . MAIN_DB_PREFIX . "const WHERE name = " . $this->db->encrypt('MAIN_MODULE_API'), // API can't be enabled per environment. Why ?
234 234
             "DELETE FROM " . MAIN_DB_PREFIX . "const WHERE name = " . $this->db->encrypt('API_PRODUCTION_MODE')   // Not in production mode by default at activation
235 235
         );
236 236
 
Please login to merge, or discard this patch.
public/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
             return $pass;
176 176
         }
177 177
 
178
-        return $this->getNewGeneratedPassword();    // warning, may generate infinite loop if conditions are not possible
178
+        return $this->getNewGeneratedPassword(); // warning, may generate infinite loop if conditions are not possible
179 179
     }
180 180
 
181 181
     /**
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
     {
190 190
         global $langs;
191 191
 
192
-        $this->initAll();   // For the case this method is called alone
192
+        $this->initAll(); // For the case this method is called alone
193 193
 
194 194
         $password_a = preg_split('//u', $password, 0, PREG_SPLIT_NO_EMPTY);
195 195
         $maj = preg_split('//u', $this->Maj, 0, PREG_SPLIT_NO_EMPTY);
Please login to merge, or discard this patch.
public/htdocs/core/modules/modProduct.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
             'p.duration' => "Duration",
209 209
             'p.finished' => 'Nature',
210 210
             'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC",
211
-            'p.price_min' => "MinPriceHT",'p.price_min_ttc' => "MinPriceTTC",
211
+            'p.price_min' => "MinPriceHT", 'p.price_min_ttc' => "MinPriceTTC",
212 212
             'p.tva_tx' => 'VATRate',
213 213
             'p.datec' => 'DateCreation', 'p.tms' => 'DateModification'
214 214
         );
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
             $this->export_dependencies_array[$r] = array('category' => 'p.rowid');
307 307
         }
308 308
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
309
-        $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
309
+        $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
310 310
         if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
311 311
             $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
312 312
         }
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
             $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid' => "Id", 'p2.ref' => "Ref", 'p2.label' => "Label", 'p2.description' => "Description"));
462 462
             $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid' => "subproduct", 'p2.ref' => "subproduct", 'p2.label' => "subproduct", 'p2.description' => "subproduct"));
463 463
             $this->export_sql_start[$r] = 'SELECT DISTINCT ';
464
-            $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
464
+            $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
465 465
             if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
466 466
                 $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
467 467
             }
Please login to merge, or discard this patch.