alxarafe / alixar

htdocs/core/modules/modExternalSite.class.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 
         // Menus
         //------
-        $r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 
         $this->menu[$r] = array(
             'fk_menu' => 0,

htdocs/core/modules/modEventOrganization.class.php

Spacing +40 added lines, -40 removed lines

@@ -119,7 +119,7 @@ 
         // A condition to hide module
         $this->hidden = false;
         // List of module class names as string that must be enabled if this module is enabled. Example: array('always'=>array('modModuleToEnable1','modModuleToEnable2'), 'FR'=>array('modModuleToEnableFR'...))
-        $this->depends = array('modProjet','modCategorie');
+        $this->depends = array('modProjet', 'modCategorie');
         $this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
         $this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
 
@@ -232,82 +232,82 @@ 
         /* END MODULEBUILDER TOPMENU */
         /* BEGIN MODULEBUILDER LEFTMENU CONFERENCEORBOOTH*/
         $this->menu[$r++] = array(
-            '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
-            'type' => 'left',                           // This is a Left menu entry
+            '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
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'EventOrganizationMenuLeft',
             'prefix' => img_picto('', 'eventorganization', 'class="paddingright pictofixedwidth"'),
             'mainmenu' => 'project',
             'leftmenu' => 'eventorganization',
             'url' => '',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => '$conf->eventorganization->enabled',  // 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.
-            'perms' => '$user->rights->eventorganization->read',                            // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => '$conf->eventorganization->enabled', // 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.
+            'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            '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
-            'type' => 'left',                           // This is a Left menu entry
+            '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
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'List',
             'url' => '/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
-            'langs' => 'eventorganization@eventorganization',           // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => '$conf->eventorganization->enabled',  // 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.
-            'perms' => '$user->rights->eventorganization->read',                            // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => '$conf->eventorganization->enabled', // 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.
+            'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            '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
-            'type' => 'left',                           // This is a Left menu entry
+            '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
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'New',
             'url' => '/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
-            'langs' => 'eventorganization@eventorganization',           // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => '$conf->eventorganization->enabled',  // 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.
-            'perms' => '$user->rights->eventorganization->write',                           // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => '$conf->eventorganization->enabled', // 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.
+            'perms' => '$user->rights->eventorganization->write', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            '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
-            'type' => 'left',                           // This is a Left menu entry
+            '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
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'ConferenceOrBooth',
             'prefix' => img_picto('', 'conferenceorbooth', 'class="paddingright pictofixedwidth"'),
             'mainmenu' => 'project',
             'leftmenu' => 'eventorganizationconforbooth',
             'url' => '',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => '$conf->eventorganization->enabled',  // 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.
-            'perms' => '$user->rights->eventorganization->read',                            // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => '$conf->eventorganization->enabled', // 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.
+            'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            '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
-            'type' => 'left',                           // This is a Left menu entry
+            '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
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'List',
             'url' => '/eventorganization/conferenceorbooth_list.php?mainmenu=project',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => '$conf->eventorganization->enabled',  // 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.
-            'perms' => '$user->rights->eventorganization->read',                            // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => '$conf->eventorganization->enabled', // 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.
+            'perms' => '$user->rights->eventorganization->read', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         $this->menu[$r++] = array(
-            '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
-            'type' => 'left',                           // This is a Left menu entry
+            '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
+            'type' => 'left', // This is a Left menu entry
             'titre' => 'New',
             'url' => '/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create',
-            'langs' => 'eventorganization',         // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+            'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
             'position' => 1000 + $r,
-            'enabled' => '$conf->eventorganization->enabled',  // 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.
-            'perms' => '$user->rights->eventorganization->write',                           // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+            'enabled' => '$conf->eventorganization->enabled', // 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.
+            'perms' => '$user->rights->eventorganization->write', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
             'target' => '',
-            'user' => 2,                                // 0=Menu for internal users, 1=external users, 2=both
+            'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
         );
         /* END MODULEBUILDER LEFTMENU CONFERENCEORBOOTH */
 
@@ -325,8 +325,8 @@ 
         $keyforelement = 'conferenceorboothattendee';
         include DOL_DOCUMENT_ROOT . '/core/commonfieldsinexport.inc.php';
         $this->export_entities_array[$r]['t.fk_invoice'] = 'invoice';
-        unset($this->export_fields_array[$r]['t.fk_project']);  // Remove field so we can add it at end just after
-        unset($this->export_fields_array[$r]['t.fk_soc']);  // Remove field so we can add it at end just after
+        unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
+        unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
         $this->export_fields_array[$r]['t.fk_invoice'] = 'InvoiceId';
         $this->export_fields_array[$r]['t.fk_project'] = 'ProjectId';
         $this->export_fields_array[$r]['p.ref'] = 'ProjectRef';
@@ -342,7 +342,7 @@ 
         //unset($this->export_fields_array[$r]['t.fieldtoremove']);
         $keyforselect = 'conferenceorboothattendee';
         $keyforaliasextra = 'extra';
-        $keyforelement = 'conferenceorboothattendee';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforelement = 'conferenceorboothattendee'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
         //$this->export_dependencies_array[$r] = array('aaaline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
         //$this->export_special_array[$r] = array('t.field'=>'...');

htdocs/core/modules/modAgenda.class.php

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,7 @@ 
         $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
         $this->requiredby = array(); // List of module ids to disable if this one is disabled
         $this->conflictwith = array(); // List of module class names as string this module is in conflict with
-        $this->langfiles = array("companies","project");
+        $this->langfiles = array("companies", "project");
         $this->phpmin = array(7, 0); // Minimum version of PHP required by module
 
         // Module parts
@@ -435,7 +435,7 @@ 
         $this->export_code[$r] = $this->rights_class . '_' . $r;
         $this->export_label[$r] = "ExportDataset_event1";
         $this->export_permission[$r] = array(array("agenda", "export"));
-        $this->export_fields_array[$r] = array('ac.id' => "IdAgenda", 'ac.ref_ext' => "ExternalRef",'ac.ref' => "Ref", 'ac.datec' => "DateCreation", 'ac.datep' => "DateActionBegin",
+        $this->export_fields_array[$r] = array('ac.id' => "IdAgenda", 'ac.ref_ext' => "ExternalRef", 'ac.ref' => "Ref", 'ac.datec' => "DateCreation", 'ac.datep' => "DateActionBegin",
             'ac.datep2' => "DateActionEnd", 'ac.location' => 'Location', 'ac.label' => "Title", 'ac.note' => "Note", 'ac.percent' => "Percentage", 'ac.durationp' => "Duration",
             'ac.fk_user_author' => 'CreatedById', 'ac.fk_user_action' => 'ActionsOwnedBy', 'ac.fk_user_mod' => 'ModifiedBy', 'ac.transparency' => "Transparency", 'ac.priority' => "Priority", 'ac.fk_element' => "ElementID", 'ac.elementtype' => "ElementType",
             'cac.libelle' => "ActionType", 'cac.code' => "Code",
@@ -453,7 +453,7 @@ 
         }
         $this->export_TypeFields_array[$r] = array('ac.ref_ext' => "Text", 'ac.ref' => "Text", 'ac.datec' => "Date", 'ac.datep' => "Date",
             'ac.datep2' => "Date", 'ac.location' => 'Text', 'ac.label' => "Text", 'ac.note' => "Text", 'ac.percent' => "Numeric",
-            'ac.durationp' => "Duree",'ac.fk_user_author' => 'Numeric', 'ac.fk_user_action' => 'Numeric', 'ac.fk_user_mod' => 'Numeric', 'ac.transparency' => "Numeric", 'ac.priority' => "Numeric", 'ac.fk_element' => "Numeric", 'ac.elementtype' => "Text",
+            'ac.durationp' => "Duree", 'ac.fk_user_author' => 'Numeric', 'ac.fk_user_action' => 'Numeric', 'ac.fk_user_mod' => 'Numeric', 'ac.transparency' => "Numeric", 'ac.priority' => "Numeric", 'ac.fk_element' => "Numeric", 'ac.elementtype' => "Text",
             'cac.libelle' => "List:c_actioncomm:libelle:libelle", 'cac.code' => "Text",
             's.nom' => 'Text', 's.address' => 'Text', 's.zip' => 'Text', 's.town' => 'Text',
             'co.code' => 'Text', 's.phone' => 'Text', 's.siren' => 'Text', 's.siret' => 'Text', 's.ape' => 'Text', 's.idprof4' => 'Text', 's.idprof5' => 'Text', 's.idprof6' => 'Text',
@@ -462,7 +462,7 @@ 
 
         );
         $this->export_entities_array[$r] = array('ac.id' => "action", 'ac.ref_ext' => "action", 'ac.ref' => "action", 'ac.datec' => "action", 'ac.datep' => "action",
-            'ac.datep2' => "action", 'ac.location' => 'action', 'ac.label' => "action", 'ac.note' => "action", 'ac.percent' => "action", 'ac.durationp' => "action",'ac.fk_user_author' => 'user', 'ac.fk_user_action' => 'user', 'ac.fk_user_mod' => 'user', 'ac.transparency' => "action", 'ac.priority' => "action", 'ac.fk_element' => "action", 'ac.elementtype' => "action",
+            'ac.datep2' => "action", 'ac.location' => 'action', 'ac.label' => "action", 'ac.note' => "action", 'ac.percent' => "action", 'ac.durationp' => "action", 'ac.fk_user_author' => 'user', 'ac.fk_user_action' => 'user', 'ac.fk_user_mod' => 'user', 'ac.transparency' => "action", 'ac.priority' => "action", 'ac.fk_element' => "action", 'ac.elementtype' => "action",
             's.rowid' => "company", 's.nom' => 'company', 's.address' => 'company', 's.zip' => 'company', 's.town' => 'company',
             'co.code' => 'company', 's.phone' => 'company', 's.siren' => 'company', 's.siret' => 'company', 's.ape' => 'company', 's.idprof4' => 'company', 's.idprof5' => 'company', 's.idprof6' => 'company',
             's.code_compta' => 'company', 's.code_compta_fournisseur' => 'company', 's.tva_intra' => 'company',
@@ -581,9 +581,9 @@ 
         );
 
         // Import Event Extra Fields
-        $keyforselect = 'actioncomm';  // @phan-suppress-current-line PhanPluginRedundantAssignment
-        $keyforelement = 'action';  // @phan-suppress-current-line PhanPluginRedundantAssignment
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforselect = 'actioncomm'; // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforelement = 'action'; // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
     }
 }

htdocs/core/modules/modCollab.class.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
         $r++;*/
 
         // Main menu entries
-        $r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
         $this->menu[$r] = array(
             'fk_menu' => '0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
             'type' => 'top', // This is a Left menu entry

htdocs/core/modules/modPaypal.class.php

Spacing +2 added lines, -2 removed lines

@@ -104,12 +104,12 @@
 
         // Permissions
         $this->rights = array(); // Permission array used by this module
-        $r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 
 
         // Main menu entries
         $this->menu = array(); // List of menus to add
-        $r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
         /*$this->menu[$r]=array(
             'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',           // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
             'mainmenu'=>'billing',

htdocs/core/modules/modPaybox.class.php

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 
         // Permissions
         $this->rights = array(); // Permission array used by this module
-        $r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 
         // Add here list of permission defined by an id, a label, a boolean and two constant strings.
         // Example:
@@ -117,7 +117,7 @@ 
 
         // Main menu entries
         $this->menu = array(); // List of menus to add
-        $r = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
 
         // Add here entries to declare new menus
         // Example to declare the Top Menu entry:

htdocs/core/modules/modMultiCurrency.class.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
 
         $multicurrency = new MultiCurrency($this->db);
 
-        if (! $multicurrency->checkCodeAlreadyExists($conf->currency)) {
+        if (!$multicurrency->checkCodeAlreadyExists($conf->currency)) {
             $langs->loadCacheCurrencies('');
 
             $multicurrency->code = $conf->currency;

htdocs/core/modules/oauth/google_oauthcallback.php

Spacing +1 added lines, -1 removed lines

@@ -322,7 +322,7 @@
                     $storage->clearToken('Google');
 
                     $tmpuser = new User($db);
-                    $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1);    // Load user. Can load with email_oauth2.
+                    $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2.
 
                     if ($res > 0) {
                         $username = $tmpuser->login;

htdocs/core/modules/modCategorie.class.php

Spacing +8 added lines, -8 removed lines

@@ -237,7 +237,7 @@ 
 
         $keyforselect = 'societe';
         $keyforelement = 'company';
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -283,9 +283,9 @@ 
             't.libelle' => 'company', 'pl.code' => 'company', 'st.code' => 'company'
         ); // We define here only fields that use another picto
 
-        $keyforselect = 'societe';  // @phan-suppress-current-line PhanPluginRedundantAssignment
-        $keyforelement = 'company';  // @phan-suppress-current-line PhanPluginRedundantAssignment
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforselect = 'societe'; // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforelement = 'company'; // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -314,7 +314,7 @@ 
 
         $keyforselect = 'adherent';
         $keyforelement = 'member';
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -369,7 +369,7 @@ 
 
         $keyforselect = 'socpeople';
         $keyforelement = 'contact';
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -399,7 +399,7 @@ 
 
         $keyforselect = 'projet';
         $keyforelement = 'project';
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
@@ -425,7 +425,7 @@ 
 
         $keyforselect = 'user';
         $keyforelement = 'user';
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';