alxarafe / alixar

public/htdocs/contact/document.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 }
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
-$permissiontoadd = $user->hasRight('societe', 'contact', 'creer');  // Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

public/htdocs/contact/class/contact.class.php

Indentation +14 added lines, -14 removed lines

@@ -754,8 +754,8 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Return DN string complete in the LDAP directory for the object
      *
@@ -767,7 +767,7 @@ 
      */
     public function _load_ldap_dn($info, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         $dn = '';
         if ($mode == 0) {
@@ -781,8 +781,8 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Initialize info table (LDAP attributes table)
      *
@@ -790,7 +790,7 @@ 
      */
     public function _load_ldap_info()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $info = array();
@@ -891,7 +891,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update field alert birthday
      *
@@ -902,7 +902,7 @@ 
      */
     public function update_perso($id, $user = null, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
         $result = false;
 
@@ -1186,7 +1186,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load number of elements the contact is used as a link for
      *  ref_facturation
@@ -1198,7 +1198,7 @@ 
      */
     public function load_ref_elements()
     {
-		// phpcs:enable
+        // phpcs:enable
         // Count the elements for which it is contact
         $sql = "SELECT tc.element, count(ec.rowid) as nb";
         $sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec, " . MAIN_DB_PREFIX . "c_type_contact as tc";
@@ -1582,7 +1582,7 @@ 
         return $this->LibStatut($this->statut, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the label of a given status
      *
@@ -1592,7 +1592,7 @@ 
      */
     public function LibStatut($status, $mode)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $labelStatus = array(
@@ -1620,7 +1620,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return translated label of Public or Private
      *
@@ -1629,7 +1629,7 @@ 
      */
     public function LibPubPriv($status)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
         if ($status == '1') {
             return $langs->trans('ContactPrivate');

Spacing +5 added lines, -5 removed lines

@@ -215,8 +215,8 @@ 
     /**
      * @var int Thirdparty ID
      */
-    public $socid;      // both socid and fk_soc are used
-    public $fk_soc;     // both socid and fk_soc are used
+    public $socid; // both socid and fk_soc are used
+    public $fk_soc; // both socid and fk_soc are used
 
     /**
      * @var string Thirdparty name
@@ -1067,8 +1067,8 @@ 
                 $this->country_code = $obj->country_id ? $obj->country_code : '';
                 $this->country      = $obj->country_id ? ($langs->trans('Country' . $obj->country_code) != 'Country' . $obj->country_code ? $langs->transnoentities('Country' . $obj->country_code) : $obj->country) : '';
 
-                $this->fk_soc       = $obj->fk_soc;     // Both fk_soc and socid are used
-                $this->socid        = $obj->fk_soc;     // Both fk_soc and socid are used
+                $this->fk_soc       = $obj->fk_soc; // Both fk_soc and socid are used
+                $this->socid        = $obj->fk_soc; // Both fk_soc and socid are used
                 $this->socname      = $obj->socname;
                 $this->poste        = $obj->poste;
                 $this->statut       = $obj->statut;
@@ -1876,7 +1876,7 @@ 
         $error = 0;
 
         if (!isset($this->roles)) {
-            return 0;   // Avoid to loose roles when property not set
+            return 0; // Avoid to loose roles when property not set
         }
 
         $this->db->begin();

public/htdocs/contact/perso.php

Spacing +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
         $maxfilesizearray = getMaxFileSizeArray();
         $maxmin = $maxfilesizearray['maxmin'];
         if ($maxmin > 0) {
-            print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+            print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
         }
         print '<input type="file" class="flat" name="photo" id="photoinput">';
         print '</td></tr>';

public/htdocs/asset/admin/setup.php

Spacing +1 added lines, -1 removed lines

@@ -548,7 +548,7 @@
                     $accountsystem->fetch(getDolGlobalInt('CHARTOFACCOUNTS'));
                     $sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
                     $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-                    $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')';      // Always limit to current entity. No sharing in accountancy.
+                    $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy.
                     $sql .= ' LIMIT 50000'; // just as a sanity check
                     $resql = $db->query($sql);
                     if ($resql) {

public/htdocs/asset/card.php

Spacing +1 added lines, -1 removed lines

@@ -337,7 +337,7 @@
     print '<table class="border centpercent tableforfield">' . "\n";
 
     // Common attributes
-    $keyforbreak = 'date_acquisition';    // We change column just before this field
+    $keyforbreak = 'date_acquisition'; // We change column just before this field
     //unset($object->fields['fk_project']);             // Hide field already shown in banner
     //unset($object->fields['fk_soc']);                 // Hide field already shown in banner
     include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';

public/htdocs/asset/model/list.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-    reset($object->fields);                 // Reset is required to avoid key() to return null.
+    reset($object->fields); // Reset is required to avoid key() to return null.
     $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {

public/htdocs/asset/list.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 $contextpage    = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'assetlist'; // To manage different context of search
 $backtopage     = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss      = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$mode           = GETPOST('mode', 'alpha');  // mode view (kanban or common)
+$mode           = GETPOST('mode', 'alpha'); // mode view (kanban or common)
 $id             = GETPOSTINT('id');
 
 // Load variable for pagination
@@ -73,7 +73,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-    reset($object->fields);                 // Reset is required to avoid key() to return null.
+    reset($object->fields); // Reset is required to avoid key() to return null.
     $sortfield = "t." . key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {

public/htdocs/asset/class/assetmodel.class.php

Indentation +2 added lines, -2 removed lines

@@ -1438,7 +1438,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the status
      *
@@ -1448,7 +1448,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
             global $langs;
             //$langs->load("assets");

public/htdocs/asset/class/assetdepreciationoptions.class.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
             'table' => 'asset_depreciation_options_economic',
             'fields' => array(
                 'depreciation_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDepreciationType', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDepreciationTypeLinear', '1' => 'AssetDepreciationOptionDepreciationTypeDegressive', '2' => 'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate' => '1',),
-                'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1','enabled_field' => 'economic:depreciation_type:1'),
+                'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1', 'enabled_field' => 'economic:depreciation_type:1'),
                 'duration' => array('type' => 'integer', 'label' => 'AssetDepreciationOptionDuration', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
                 'duration_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDurationType', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDurationTypeAnnual', '1' => 'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate' => '1',),
                 'rate' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionRate', 'enabled' => '1', 'position' => 50, 'visible' => 3, 'default' => '0', 'isameasure' => '1', 'validate' => '1', 'computed' => '$object->asset_depreciation_options->getRate("economic")',),
@@ -96,7 +96,7 @@ 
             'enabled_field' => 'economic:accelerated_depreciation_option:1',
             'fields' => array(
                 'depreciation_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDepreciationType', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDepreciationTypeLinear', '1' => 'AssetDepreciationOptionDepreciationTypeDegressive', '2' => 'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate' => '1',),
-                'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1','enabled_field' => 'accelerated_depreciation:depreciation_type:1'),
+                'degressive_coefficient' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionDegressiveRate', 'enabled' => '1', 'position' => 20, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1', 'enabled_field' => 'accelerated_depreciation:depreciation_type:1'),
                 'duration' => array('type' => 'integer', 'label' => 'AssetDepreciationOptionDuration', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'validate' => '1',),
                 'duration_type' => array('type' => 'smallint', 'label' => 'AssetDepreciationOptionDurationType', 'enabled' => '1', 'position' => 40, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'arrayofkeyval' => array('0' => 'AssetDepreciationOptionDurationTypeAnnual', '1' => 'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate' => '1',),
                 'rate' => array('type' => 'double(24,8)', 'label' => 'AssetDepreciationOptionRate', 'enabled' => '1', 'position' => 50, 'visible' => 3, 'default' => '0', 'isameasure' => '1', 'validate' => '1', 'computed' => '$object->asset_depreciation_options->getRate("accelerated_depreciation")',),