alxarafe / alixar

Dolibarr/Code/Societe/Classes/Societe.php

Indentation +66 added lines, -66 removed lines

@@ -1104,7 +1104,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Create a contact/address from thirdparty
      *
@@ -2254,7 +2254,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define third party as a customer
      *
@@ -2265,7 +2265,7 @@ 
     public function set_as_client()
     {
         global $conf;
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::set_as_client is deprecated use setAsCustomer instead", LOG_NOTICE);
         return $this->setAsCustomer();
     }
@@ -2298,7 +2298,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Defines the company as a customer
      *
@@ -2309,7 +2309,7 @@ 
      */
     public function set_remise_client($remise, $note, User $user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         // Parameter cleaning
@@ -2359,7 +2359,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Defines the company as a customer
      *
@@ -2370,7 +2370,7 @@ 
      */
     public function set_remise_supplier($remise, $note, User $user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         // Parameter cleaning
@@ -2420,7 +2420,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Add a discount for third party
      *
@@ -2434,7 +2434,7 @@ 
      */
     public function set_remise_except($remise, User $user, $desc, $vatrate = '', $discount_type = 0, $price_base_type = 'HT')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         // Clean parameters
@@ -2620,7 +2620,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Add link to sales representative
      *
@@ -2630,7 +2630,7 @@ 
      */
     public function add_commercial(User $user, $commid)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
 
         if ($this->id > 0 && $commid > 0) {
@@ -2680,7 +2680,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Add link to sales representative
      *
@@ -2690,7 +2690,7 @@ 
      */
     public function del_commercial(User $user, $commid)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
         $this->context = array('commercial_modified' => $commid);
 
@@ -3075,7 +3075,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the label of a given status
      *
@@ -3085,7 +3085,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
         $langs->load('companies');
 
@@ -3104,7 +3104,7 @@ 
         return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Return list of contacts emails existing for third party
      *
@@ -3113,7 +3113,7 @@ 
      */
     public function thirdparty_and_contact_email_array($addthirdparty = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $contact_emails = $this->contact_property_array('email', 1);
@@ -3129,7 +3129,7 @@ 
         return $contact_emails;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Return list of contacts mobile phone existing for third party
      *
@@ -3137,7 +3137,7 @@ 
      */
     public function thirdparty_and_contact_phone_array()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $contact_phone = $this->contact_property_array('mobile');
@@ -3152,7 +3152,7 @@ 
         return $contact_phone;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of contacts emails or mobile existing for third party
      *
@@ -3162,7 +3162,7 @@ 
      */
     public function contact_property_array($mode = 'email', $hidedisabled = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $contact_property = array();
@@ -3222,7 +3222,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Returns the contact list of this company
      *
@@ -3230,7 +3230,7 @@ 
      */
     public function contact_array()
     {
-		// phpcs:enable
+        // phpcs:enable
         $contacts = array();
 
         $sql = "SELECT rowid, lastname, firstname FROM " . MAIN_DB_PREFIX . "socpeople WHERE fk_soc = " . ((int) $this->id);
@@ -3251,7 +3251,7 @@ 
         return $contacts;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Returns the contact list of this company
      *
@@ -3281,7 +3281,7 @@ 
         return $contacts;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return property of contact from its id
      *
@@ -3291,7 +3291,7 @@ 
      */
     public function contact_get_property($rowid, $mode)
     {
-		// phpcs:enable
+        // phpcs:enable
         $contact_property = '';
 
         if (empty($rowid)) {
@@ -3324,7 +3324,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return bank number property of thirdparty (label or rum)
      *
@@ -3333,7 +3333,7 @@ 
      */
     public function display_rib($mode = 'label')
     {
-		// phpcs:enable
+        // phpcs:enable
 
         $bac = new CompanyBankAccount($this->db);
         // @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -3360,7 +3360,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return Array of RIB
      *
@@ -3368,7 +3368,7 @@ 
      */
     public function get_all_rib()
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "societe_rib WHERE type='ban' AND fk_soc = " . ((int) $this->id);
         $result = $this->db->query($sql);
         if (!$result) {
@@ -3389,7 +3389,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Assigns a customer code from the code control module.
      *  Return value is stored into this->code_client
@@ -3400,7 +3400,7 @@ 
      */
     public function get_codeclient($objsoc = null, $type = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
             $module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
@@ -3422,7 +3422,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Assigns a vendor code from the code control module.
      *  Return value is stored into this->code_fournisseur
@@ -3433,7 +3433,7 @@ 
      */
     public function get_codefournisseur($objsoc = null, $type = 1)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
             $module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
@@ -3454,7 +3454,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Check if a client code is editable based on the parameters of the
      *    code control module.
@@ -3463,7 +3463,7 @@ 
      */
     public function codeclient_modifiable()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
             $module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
@@ -3495,7 +3495,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Check if a vendor code is editable in the code control module configuration
      *
@@ -3503,7 +3503,7 @@ 
      */
     public function codefournisseur_modifiable()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
             $module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
@@ -3535,7 +3535,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Check customer code
      *
@@ -3549,7 +3549,7 @@ 
      */
     public function check_codeclient()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
             $module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
@@ -3576,7 +3576,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Check supplier code
      *
@@ -3590,7 +3590,7 @@ 
      */
     public function check_codefournisseur()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
         if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
             $module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
@@ -3617,7 +3617,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Assigns a accounting code from the accounting code module.
      *      Computed value is stored into this->code_compta or this->code_compta_fournisseur according to $type.
@@ -3628,7 +3628,7 @@ 
      */
     public function get_codecompta($type)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         if (getDolGlobalString('SOCIETE_CODECOMPTA_ADDON')) {
@@ -3776,7 +3776,7 @@ 
         return array();
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns if a profid should be verified to be unique
      *
@@ -3785,7 +3785,7 @@ 
      */
     public function id_prof_verifiable($idprof)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         switch ($idprof) {
@@ -3814,7 +3814,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Verify if a profid exists into database for others thirds
      *
@@ -3825,7 +3825,7 @@ 
      */
     public function id_prof_exists($idprof, $value, $socid = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $field = $idprof;
 
         switch ($idprof) {  // For backward compatibility
@@ -3875,7 +3875,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Check the validity of a professional identifier according to the country of the company (siren, siret, ...)
      *
@@ -3886,7 +3886,7 @@ 
      */
     public function id_prof_check($idprof, $soc)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         // load the library necessary to check the professional identifiers
@@ -3931,7 +3931,7 @@ 
         return $ok;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *   Return an url to check online a professional id or empty string
      *
@@ -3942,7 +3942,7 @@ 
      */
     public function id_prof_url($idprof, $thirdparty)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs, $hookmanager;
 
         $url = '';
@@ -3987,7 +3987,7 @@ 
         return '';
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *   Indicates if the company has projects
      *
@@ -3995,7 +3995,7 @@ 
      */
     public function has_projects()
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "SELECT COUNT(*) as numproj FROM " . MAIN_DB_PREFIX . "projet WHERE fk_soc = " . ((int) $this->id);
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -4086,7 +4086,7 @@ 
         return isInEEC($this);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load the list of provider categories
      *
@@ -4094,7 +4094,7 @@ 
      */
     public function LoadSupplierCateg()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->SupplierCategories = array();
         $sql = "SELECT rowid, label";
         $sql .= " FROM " . MAIN_DB_PREFIX . "categorie";
@@ -4111,7 +4111,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Insert link supplier - category
      *
@@ -4120,7 +4120,7 @@ 
      */
     public function AddFournisseurInCategory($categorie_id)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($categorie_id > 0 && $this->id > 0) {
             $sql = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_fournisseur (fk_categorie, fk_soc) ";
             $sql .= " VALUES (" . ((int) $categorie_id) . ", " . ((int) $this->id) . ")";
@@ -4240,7 +4240,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a third party into database from a member object
      *
@@ -4252,7 +4252,7 @@ 
      */
     public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $user, $langs;
 
         dol_syslog(get_class($this) . "::create_from_member", LOG_DEBUG);
@@ -4619,7 +4619,7 @@ 
         return $this->LibProspLevel($this->fk_prospectlevel);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return label of prospect level
      *
@@ -4628,7 +4628,7 @@ 
      */
     public function LibProspLevel($fk_prospectlevel)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $label = '';
@@ -4655,7 +4655,7 @@ 
         return $this->LibProspCommStatut($this->stcomm_id, $mode, $label, $this->stcomm_picto);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return label of a given status
      *
@@ -4671,7 +4671,7 @@ 
      */
     public function LibProspCommStatut($status, $mode = 0, $label = '', $picto = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $langs->load('customers');
@@ -4914,7 +4914,7 @@ 
         return $this->LibCustProspStatut($this->client);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the label of the customer/prospect status
      *
@@ -4923,7 +4923,7 @@ 
      */
     public function LibCustProspStatut($status)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
         $langs->load('companies');
 

Dolibarr/Code/Projet/Api/Tasks.php

Spacing +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
             if ($search_sale == -2) {
                 $sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
             } elseif ($search_sale > 0) {
-                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int)$search_sale) . ")";
+                $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = " . ((int) $search_sale) . ")";
             }
         }
         // Add sql filters
@@ -498,7 +498,7 @@ 
             }
             if ($field == 'array_options' && is_array($value)) {
                 foreach ($value as $index => $val) {
-                    $this->task->array_options[$index] = $this->_checkValForAPI($field, $val, $this->task);;
+                    $this->task->array_options[$index] = $this->_checkValForAPI($field, $val, $this->task); ;
                 }
                 continue;
             }

Dolibarr/Code/Product/Api/Products.php

Spacing +37 added lines, -37 removed lines

@@ -339,7 +339,7 @@ 
 
         // Select products of given category
         if ($category > 0) {
-            $sql .= " AND c.fk_categorie = " . ((int)$category);
+            $sql .= " AND c.fk_categorie = " . ((int) $category);
             $sql .= " AND c.fk_product = t.rowid";
         }
         if ($mode == 1) {
@@ -418,9 +418,9 @@ 
 
             $obj_ret['data'] = $tmp;
             $obj_ret['pagination'] = array(
-                'total' => (int)$total,
+                'total' => (int) $total,
                 'page' => $page, //count starts from 0
-                'page_count' => ceil((int)$total / $limit),
+                'page_count' => ceil((int) $total / $limit),
                 'limit' => $limit
             );
         }
@@ -999,7 +999,7 @@ 
         if ($result <= 0) {
             throw new RestException(500, "Error updating buy price : " . $this->db->lasterror());
         }
-        return (int)$this->productsupplier->product_fourn_price_id;
+        return (int) $this->productsupplier->product_fourn_price_id;
     }
 
     /**
@@ -1082,15 +1082,15 @@ 
         $sql .= ' WHERE t.entity IN (' . getEntity('product') . ')';
 
         if ($supplier > 0) {
-            $sql .= " AND s.fk_soc = " . ((int)$supplier);
+            $sql .= " AND s.fk_soc = " . ((int) $supplier);
         }
         if ($socid > 0) {   // if external user
-            $sql .= " AND s.fk_soc = " . ((int)$socid);
+            $sql .= " AND s.fk_soc = " . ((int) $socid);
         }
         $sql .= " AND s.fk_product = t.rowid";
         // Select products of given category
         if ($category > 0) {
-            $sql .= " AND c.fk_categorie = " . ((int)$category);
+            $sql .= " AND c.fk_categorie = " . ((int) $category);
             $sql .= " AND c.fk_product = t.rowid";
         }
         if ($mode == 1) {
@@ -1285,7 +1285,7 @@ 
         }
 
         $prodattr = new ProductAttribute($this->db);
-        $result = $prodattr->fetch((int)$id);
+        $result = $prodattr->fetch((int) $id);
 
         if ($result < 0) {
             throw new RestException(404, "Product attribute not found");
@@ -1301,11 +1301,11 @@ 
 
         $sql = "SELECT COUNT(*) as nb FROM " . $this->db->prefix() . "product_attribute_combination2val as pac2v";
         $sql .= " JOIN " . $this->db->prefix() . "product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = " . ((int)$prodattr->id) . " AND pac.entity IN (" . getEntity('product') . ")";
+        $sql .= " WHERE pac2v.fk_prod_attr = " . ((int) $prodattr->id) . " AND pac.entity IN (" . getEntity('product') . ")";
 
         $resql = $this->db->query($sql);
         $obj = $this->db->fetch_object($resql);
-        $prodattr->is_used_by_products = (int)$obj->nb;
+        $prodattr->is_used_by_products = (int) $obj->nb;
 
         return $this->_cleanObjectDatas($prodattr);
     }
@@ -1350,12 +1350,12 @@ 
 
         $sql = "SELECT COUNT(*) as nb FROM " . $this->db->prefix() . "product_attribute_combination2val as pac2v";
         $sql .= " JOIN " . $this->db->prefix() . "product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = " . ((int)$result->rowid) . " AND pac.entity IN (" . getEntity('product') . ")";
+        $sql .= " WHERE pac2v.fk_prod_attr = " . ((int) $result->rowid) . " AND pac.entity IN (" . getEntity('product') . ")";
 
         $resql = $this->db->query($sql);
         $obj = $this->db->fetch_object($resql);
 
-        $attr["is_used_by_products"] = (int)$obj->nb;
+        $attr["is_used_by_products"] = (int) $obj->nb;
 
         return $attr;
     }
@@ -1400,12 +1400,12 @@ 
 
         $sql = "SELECT COUNT(*) as nb FROM " . $this->db->prefix() . "product_attribute_combination2val as pac2v";
         $sql .= " JOIN " . $this->db->prefix() . "product_attribute_combination as pac ON pac2v.fk_prod_combination = pac.rowid";
-        $sql .= " WHERE pac2v.fk_prod_attr = " . ((int)$result->rowid) . " AND pac.entity IN (" . getEntity('product') . ")";
+        $sql .= " WHERE pac2v.fk_prod_attr = " . ((int) $result->rowid) . " AND pac.entity IN (" . getEntity('product') . ")";
 
         $resql = $this->db->query($sql);
         $obj = $this->db->fetch_object($resql);
 
-        $attr["is_used_by_products"] = (int)$obj->nb;
+        $attr["is_used_by_products"] = (int) $obj->nb;
 
         return $attr;
     }
@@ -1463,7 +1463,7 @@ 
 
         $prodattr = new ProductAttribute($this->db);
 
-        $result = $prodattr->fetch((int)$id);
+        $result = $prodattr->fetch((int) $id);
         if ($result == 0) {
             throw new RestException(404, 'Attribute not found');
         } elseif ($result < 0) {
@@ -1484,7 +1484,7 @@ 
         }
 
         if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
-            $result = $prodattr->fetch((int)$id);
+            $result = $prodattr->fetch((int) $id);
             if ($result == 0) {
                 throw new RestException(404, 'Attribute not found');
             } elseif ($result < 0) {
@@ -1514,7 +1514,7 @@ 
         }
 
         $prodattr = new ProductAttribute($this->db);
-        $prodattr->id = (int)$id;
+        $prodattr->id = (int) $id;
         $result = $prodattr->delete(DolibarrApiAccess::$user);
 
         if ($result <= 0) {
@@ -1580,7 +1580,7 @@ 
             throw new RestException(403);
         }
 
-        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM " . $this->db->prefix() . "product_attribute_value WHERE rowid = " . (int)$id . " AND entity IN (" . getEntity('product') . ")";
+        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM " . $this->db->prefix() . "product_attribute_value WHERE rowid = " . (int) $id . " AND entity IN (" . getEntity('product') . ")";
 
         $query = $this->db->query($sql);
 
@@ -1624,7 +1624,7 @@ 
         $ref = trim($ref);
 
         $sql = "SELECT rowid, fk_product_attribute, ref, value FROM " . $this->db->prefix() . "product_attribute_value";
-        $sql .= " WHERE ref LIKE '" . $this->db->escape($ref) . "' AND fk_product_attribute = " . ((int)$id) . " AND entity IN (" . getEntity('product') . ")";
+        $sql .= " WHERE ref LIKE '" . $this->db->escape($ref) . "' AND fk_product_attribute = " . ((int) $id) . " AND entity IN (" . getEntity('product') . ")";
 
         $query = $this->db->query($sql);
 
@@ -1667,7 +1667,7 @@ 
         $ref = trim($ref);
 
         $sql = "SELECT rowid FROM " . $this->db->prefix() . "product_attribute_value";
-        $sql .= " WHERE ref LIKE '" . $this->db->escape($ref) . "' AND fk_product_attribute = " . ((int)$id) . " AND entity IN (" . getEntity('product') . ")";
+        $sql .= " WHERE ref LIKE '" . $this->db->escape($ref) . "' AND fk_product_attribute = " . ((int) $id) . " AND entity IN (" . getEntity('product') . ")";
         $query = $this->db->query($sql);
 
         if (!$query) {
@@ -1709,7 +1709,7 @@ 
 
         $objectval = new ProductAttributeValue($this->db);
 
-        $return = $objectval->fetchAllByProductAttribute((int)$id);
+        $return = $objectval->fetchAllByProductAttribute((int) $id);
 
         if (count($return) == 0) {
             throw new RestException(404, 'Attribute values not found');
@@ -1785,7 +1785,7 @@ 
         }
 
         $objectval = new ProductAttributeValue($this->db);
-        $objectval->fk_product_attribute = ((int)$id);
+        $objectval->fk_product_attribute = ((int) $id);
         $objectval->ref = $ref;
         $objectval->value = $value;
 
@@ -1814,7 +1814,7 @@ 
         }
 
         $objectval = new ProductAttributeValue($this->db);
-        $result = $objectval->fetch((int)$id);
+        $result = $objectval->fetch((int) $id);
 
         if ($result == 0) {
             throw new RestException(404, 'Attribute value not found');
@@ -1836,7 +1836,7 @@ 
         }
 
         if ($objectval->update(DolibarrApiAccess::$user) > 0) {
-            $result = $objectval->fetch((int)$id);
+            $result = $objectval->fetch((int) $id);
             if ($result == 0) {
                 throw new RestException(404, 'Attribute not found');
             } elseif ($result < 0) {
@@ -1866,7 +1866,7 @@ 
         }
 
         $objectval = new ProductAttributeValue($this->db);
-        $objectval->id = (int)$id;
+        $objectval->id = (int) $id;
 
         if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
             return 1;
@@ -1893,16 +1893,16 @@ 
         }
 
         $prodcomb = new ProductCombination($this->db);
-        $combinations = $prodcomb->fetchAllByFkProductParent((int)$id);
+        $combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
 
         foreach ($combinations as $key => $combination) {
             $prodc2vp = new ProductCombination2ValuePair($this->db);
-            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int)$combination->id);
+            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
             $combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
 
             if (!empty($includestock) && DolibarrApiAccess::$user->hasRight('stock', 'lire')) {
                 $productModel = new Product($this->db);
-                $productModel->fetch((int)$combination->fk_product_child);
+                $productModel->fetch((int) $combination->fk_product_child);
                 $productModel->load_stock($includestock);
                 $combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
             }
@@ -1934,11 +1934,11 @@ 
         }
 
         $prodcomb = new ProductCombination($this->db);
-        $combinations = $prodcomb->fetchAllByFkProductParent((int)$this->product->id);
+        $combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
 
         foreach ($combinations as $key => $combination) {
             $prodc2vp = new ProductCombination2ValuePair($this->db);
-            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int)$combination->id);
+            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
             $combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
         }
 
@@ -1985,15 +1985,15 @@ 
         $prodattr = new ProductAttribute($this->db);
         $prodattr_val = new ProductAttributeValue($this->db);
         foreach ($features as $id_attr => $id_value) {
-            if ($prodattr->fetch((int)$id_attr) < 0) {
+            if ($prodattr->fetch((int) $id_attr) < 0) {
                 throw new RestException(400, 'Invalid attribute ID: ' . $id_attr);
             }
-            if ($prodattr_val->fetch((int)$id_value) < 0) {
+            if ($prodattr_val->fetch((int) $id_value) < 0) {
                 throw new RestException(400, 'Invalid attribute value ID: ' . $id_value);
             }
         }
 
-        $result = $this->product->fetch((int)$id);
+        $result = $this->product->fetch((int) $id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
@@ -2042,10 +2042,10 @@ 
         $prodattr = new ProductAttribute($this->db);
         $prodattr_val = new ProductAttributeValue($this->db);
         foreach ($features as $id_attr => $id_value) {
-            if ($prodattr->fetch((int)$id_attr) < 0) {
+            if ($prodattr->fetch((int) $id_attr) < 0) {
                 throw new RestException(404);
             }
-            if ($prodattr_val->fetch((int)$id_value) < 0) {
+            if ($prodattr_val->fetch((int) $id_value) < 0) {
                 throw new RestException(404);
             }
         }
@@ -2089,7 +2089,7 @@ 
         }
 
         $prodcomb = new ProductCombination($this->db);
-        $prodcomb->fetch((int)$id);
+        $prodcomb->fetch((int) $id);
 
         foreach ($request_data as $field => $value) {
             if ($field == 'rowid') {
@@ -2129,7 +2129,7 @@ 
         }
 
         $prodcomb = new ProductCombination($this->db);
-        $prodcomb->id = (int)$id;
+        $prodcomb->id = (int) $id;
         $result = $prodcomb->delete(DolibarrApiAccess::$user);
         if ($result <= 0) {
             throw new RestException(500, "Error deleting variant");

Dolibarr/Code/Core/Classes/CommonInvoice.php

Spacing +40 added lines, -40 removed lines

@@ -99,9 +99,9 @@ 
      */
     public $revenuestamp;
 
-    public $totalpaid;          // duplicate with sumpayed
-    public $totaldeposits;      // duplicate with sumdeposit
-    public $totalcreditnotes;   // duplicate with sumcreditnote
+    public $totalpaid; // duplicate with sumpayed
+    public $totaldeposits; // duplicate with sumdeposit
+    public $totalcreditnotes; // duplicate with sumcreditnote
 
     public $sumpayed;
     public $sumpayed_multicurrency;
@@ -1141,7 +1141,7 @@ 
 
         if ($this->status > self::STATUS_DRAFT && $this->paye == 0) {
             // Get the default payment mode for BAN payment of the third party
-            $bac = new CompanyBankAccount($this->db);   // Table societe_rib
+            $bac = new CompanyBankAccount($this->db); // Table societe_rib
             $result = $bac->fetch(0, '', $this->socid, 1, 'ban');
             if ($result <= 0 || empty($bac->id)) {
                 $this->error = $langs->trans("ThirdpartyHasNoDefaultBanAccount");
@@ -1155,16 +1155,16 @@ 
             $sql .= " FROM " . $this->db->prefix() . "prelevement_demande";
             $sql .= " WHERE rowid = " . ((int) $did);
             if ($type != 'bank-transfer' && $type != 'credit-transfer') {
-                $sql .= " AND fk_facture = " . ((int) $this->id);             // Add a protection to not pay another invoice than current one
+                $sql .= " AND fk_facture = " . ((int) $this->id); // Add a protection to not pay another invoice than current one
             }
             if ($type != 'direct-debit') {
                 if ($sourcetype == 'salary') {
-                    $sql .= " AND fk_salary = " . ((int) $this->id);          // Add a protection to not pay another salary than current one
+                    $sql .= " AND fk_salary = " . ((int) $this->id); // Add a protection to not pay another salary than current one
                 } else {
-                    $sql .= " AND fk_facture_fourn = " . ((int) $this->id);   // Add a protection to not pay another invoice than current one
+                    $sql .= " AND fk_facture_fourn = " . ((int) $this->id); // Add a protection to not pay another invoice than current one
                 }
             }
-            $sql .= " AND traite = 0";  // To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)
+            $sql .= " AND traite = 0"; // To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)
 
             dol_syslog(get_class($this) . "::makeStripeSepaRequest load requests to process", LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -1180,7 +1180,7 @@ 
 
                 if (is_numeric($amount) && $amount != 0) {
                     require_once constant('DOL_DOCUMENT_ROOT') . '/societe/class/companypaymentmode.class.php';
-                    $companypaymentmode = new CompanyPaymentMode($this->db);    // table societe_rib
+                    $companypaymentmode = new CompanyPaymentMode($this->db); // table societe_rib
                     $companypaymentmode->fetch($bac->id);
 
                     $this->stripechargedone = 0;
@@ -1190,7 +1190,7 @@ 
 
                     $currency = $conf->currency;
 
-                    $errorforinvoice = 0;     // We reset the $errorforinvoice at each invoice loop
+                    $errorforinvoice = 0; // We reset the $errorforinvoice at each invoice loop
 
                     $this->fetch_thirdparty();
 
@@ -1209,7 +1209,7 @@ 
                         $amountstripe = $amountstripe * 100;
                     }
 
-                    $fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');     // Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.
+                    $fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'); // Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.
                     if (!($fk_bank_account > 0)) {
                         $error++;
                         $errorforinvoice++;
@@ -1270,7 +1270,7 @@ 
                                 $thirdparty = new Societe($this->db);
                                 $resultthirdparty = $thirdparty->fetch($this->socid);
 
-                                include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';        // This include the include of htdocs/stripe/config.php
+                                include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This include the include of htdocs/stripe/config.php
                                 // So it inits or erases the $stripearrayofkeysbyenv
                                 $stripe = new Stripe($this->db);
 
@@ -1283,26 +1283,26 @@ 
                                 $foundalternativestripeaccount = '';
 
                                 // Force stripe to another value (by default this value is empty)
-                                if (! empty($forcestripe)) {
+                                if (!empty($forcestripe)) {
                                     dol_syslog("makeStripeSepaRequest A dedicated stripe account was forced, so we switch to it.");
 
                                     $tmparray = explode('@', $forcestripe);
-                                    if (! empty($tmparray[1])) {
+                                    if (!empty($tmparray[1])) {
                                         $tmparray2 = explode(':', $tmparray[1]);
-                                        if (! empty($tmparray2[1])) {
+                                        if (!empty($tmparray2[1])) {
                                             $stripearrayofkeysbyenv[$servicestatus]["publishable_key"] = $tmparray2[0];
                                             $stripearrayofkeysbyenv[$servicestatus]["secret_key"] = $tmparray2[1];
 
                                             $stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
                                             \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 
-                                            $foundalternativestripeaccount = $tmparray[0];    // Store the customer id
+                                            $foundalternativestripeaccount = $tmparray[0]; // Store the customer id
 
                                             dol_syslog("makeStripeSepaRequest We use now customer=" . $foundalternativestripeaccount . " publishable_key=" . $stripearrayofkeys['publishable_key'], LOG_DEBUG);
                                         }
                                     }
 
-                                    if (! $foundalternativestripeaccount) {
+                                    if (!$foundalternativestripeaccount) {
                                         $stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;
 
                                         $stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];
@@ -1317,7 +1317,7 @@ 
                                     dol_syslog("makeStripeSepaRequest No dedicated Stripe Account requested, so we use global one, so " . $stripearrayofkeys['publishable_key'], LOG_DEBUG);
                                 }
 
-                                $stripeacc = $stripe->getStripeAccount($service, $this->socid);                             // Get Stripe OAuth connect account if it exists (no network access here)
+                                $stripeacc = $stripe->getStripeAccount($service, $this->socid); // Get Stripe OAuth connect account if it exists (no network access here)
 
                                 if ($foundalternativestripeaccount) {
                                     if (empty($stripeacc)) {                // If the Stripe connect account not set, we use common API usage
@@ -1327,7 +1327,7 @@ 
                                     }
                                 } else {
                                     $customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
-                                    if (empty($customer) && ! empty($stripe->error)) {
+                                    if (empty($customer) && !empty($stripe->error)) {
                                         $this->errors[] = $stripe->error;
                                     }
                                     /*if (!empty($customer) && empty($customer->sources)) {
@@ -1383,7 +1383,7 @@ 
                                                 $charge->failure_message = $stripe->error;
                                                 $charge->failure_declinecode = $stripe->declinecode;
                                                 $stripefailurecode = $stripe->code;
-                                                $stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
+                                                $stripefailuremessage = 'Action required. Contact the support at '; // . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
                                                 $stripefailuredeclinecode = $stripe->declinecode;
                                             } else {
                                                 dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
@@ -1523,18 +1523,18 @@ 
                                     // Insert record of payment (success or error)
                                     $actioncomm = new ActionComm($this->db);
 
-                                    $actioncomm->type_code = 'AC_OTH_AUTO';     // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+                                    $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
                                     $actioncomm->code = 'AC_' . $actioncode;
                                     $actioncomm->label = $description;
                                     $actioncomm->note_private = implode(",\n", $postactionmessages);
                                     $actioncomm->fk_project = $this->fk_project;
                                     $actioncomm->datep = $now;
                                     $actioncomm->datef = $now;
-                                    $actioncomm->percentage = -1;   // Not applicable
+                                    $actioncomm->percentage = -1; // Not applicable
                                     $actioncomm->socid = $thirdparty->id;
                                     $actioncomm->contactid = 0;
-                                    $actioncomm->authorid = $user->id;   // User saving action
-                                    $actioncomm->userownerid = $user->id;   // Owner of action
+                                    $actioncomm->authorid = $user->id; // User saving action
+                                    $actioncomm->userownerid = $user->id; // Owner of action
                                     // Fields when action is a real email (content is already into note)
                                     /*$actioncomm->email_msgid = $object->email_msgid;
                                      $actioncomm->email_from  = $object->email_from;
@@ -1670,10 +1670,10 @@ 
 
         // Add the standard elements to the QR code
         $lines = [
-            'BCD',  // Service Tag (optional)
-            '002',  // Version (optional)
-            '1',    // Character set (optional)
-            'SCT',  // Identification (optional)
+            'BCD', // Service Tag (optional)
+            '002', // Version (optional)
+            '1', // Character set (optional)
+            'SCT', // Identification (optional)
         ];
 
         // Add the bank account information
@@ -1746,10 +1746,10 @@ 
         $s .= pack('C1', 3) . pack('C1', strlen($datestring)) . $datestring;
         $s .= pack('C1', 4) . pack('C1', strlen($pricewithtaxstring)) . $pricewithtaxstring;
         $s .= pack('C1', 5) . pack('C1', strlen($pricetaxstring)) . $pricetaxstring;
-        $s .= '';                   // Hash of xml invoice
-        $s .= '';                   // ecda signature
-        $s .= '';                   // ecda public key
-        $s .= '';                   // ecda signature of public key stamp
+        $s .= ''; // Hash of xml invoice
+        $s .= ''; // ecda signature
+        $s .= ''; // ecda public key
+        $s .= ''; // ecda signature of public key stamp
 
         $s = base64_encode($s);
 
@@ -1816,8 +1816,8 @@ 
             $s .= "S\n";
             $s .= dol_trunc($bankaccount->proprio, 70, 'right', 'UTF-8', 1) . "\n";
             $addresslinearray = explode("\n", $bankaccount->owner_address);
-            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n";     // address line 1
-            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n";     // address line 2
+            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1
+            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2
             /*$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n";
             $s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n";
             $s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";*/
@@ -1825,8 +1825,8 @@ 
             $s .= "S\n";
             $s .= dol_trunc($mysoc->name, 70, 'right', 'UTF-8', 1) . "\n";
             $addresslinearray = explode("\n", $mysoc->address);
-            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n";     // address line 1
-            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n";     // address line 2
+            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1
+            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2
             $s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1) . "\n";
             $s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1) . "\n";
             $s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1) . "\n";
@@ -1846,14 +1846,14 @@ 
         $s .= "S\n";
         $s .= dol_trunc($this->thirdparty->name, 70, 'right', 'UTF-8', 1) . "\n";
         $addresslinearray = explode("\n", $this->thirdparty->address);
-        $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n";     // address line 1
-        $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n";     // address line 2
+        $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1
+        $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2
         $s .= dol_trunc($this->thirdparty->zip, 16, 'right', 'UTF-8', 1) . "\n";
         $s .= dol_trunc($this->thirdparty->town, 35, 'right', 'UTF-8', 1) . "\n";
         $s .= dol_trunc($this->thirdparty->country_code, 2, 'right', 'UTF-8', 1) . "\n";
         // ID of payment
-        $s .= "NON\n";          // NON or QRR
-        $s .= "\n";             // QR Code reference if previous field is QRR
+        $s .= "NON\n"; // NON or QRR
+        $s .= "\n"; // QR Code reference if previous field is QRR
         // Free text
         if ($complementaryinfo) {
             $s .= $complementaryinfo . "\n";

Dolibarr/Core/Base/DolibarrApi.php

Braces +3 added lines, -2 removed lines

@@ -240,8 +240,9 @@
     public static function getModule($moduleName, $className)
     {
         $namespace = static::getModuleNamespace($moduleName, $className);
-        if (!is_dir)
-            dump(['namespace' => $namespace]);
+        if (!is_dir) {
+                    dump(['namespace' => $namespace]);
+        }
 
         return new $namespace();
     }