alxarafe / alixar

Dolibarr/Modules/Resource.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      */
     public function __construct($db)
     {
-        global $langs, $conf;   // $langs may be used by the tpl files.
+        global $langs, $conf; // $langs may be used by the tpl files.
 
         $this->db = $db;
 

Dolibarr/Modules/Ticket.php

Spacing +2 added lines, -2 removed lines

@@ -438,9 +438,9 @@
             array("sql" => "insert into " . $this->db->prefix() . "c_type_contact(rowid, element, source, code, libelle, active ) values (110122, 'ticket',  'external', 'SUPPORTCLI', 'Contact client suivi incident', 1);", "ignoreerror" => 1),
             array("sql" => "insert into " . $this->db->prefix() . "c_type_contact(rowid, element, source, code, libelle, active ) values (110123, 'ticket',  'external', 'CONTRIBUTOR', 'Intervenant', 1);", "ignoreerror" => 1),
             // remove old settings
-            "DELETE FROM " . $this->db->prefix() . "document_model WHERE nom = 'TICKET_ADDON_PDF_ODT_PATH' AND type = 'ticket' AND entity = " . ((int)$conf->entity),
+            "DELETE FROM " . $this->db->prefix() . "document_model WHERE nom = 'TICKET_ADDON_PDF_ODT_PATH' AND type = 'ticket' AND entity = " . ((int) $conf->entity),
             // activate default odt templates
-            array("sql" => "INSERT INTO " . $this->db->prefix() . "document_model (nom, type, libelle, entity, description) VALUES('generic_ticket_odt','ticket','ODT templates'," . ((int)$conf->entity) . ",'TICKET_ADDON_PDF_ODT_PATH');", "ignoreerror" => 1),
+            array("sql" => "INSERT INTO " . $this->db->prefix() . "document_model (nom, type, libelle, entity, description) VALUES('generic_ticket_odt','ticket','ODT templates'," . ((int) $conf->entity) . ",'TICKET_ADDON_PDF_ODT_PATH');", "ignoreerror" => 1),
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/Stock.php

Spacing +8 added lines, -8 removed lines

@@ -226,7 +226,7 @@ 
             'e.phone' => 'Text', 'e.fax' => 'Text', 'e.statut' => 'Text', 'pe.rowid' => 'List:entrepot:ref:rowid:stock', 'pe.ref' => 'Text'
         );
         $this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon
-        $this->export_aggregate_array[$r] = array();    // TODO Not used yet
+        $this->export_aggregate_array[$r] = array(); // TODO Not used yet
         $keyforselect = 'warehouse';
         $keyforelement = 'warehouse';
         $keyforaliasextra = 'extra';
@@ -273,7 +273,7 @@ 
             'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product',
             'ps.reel' => 'stock',
             'p.seuil_stock_alerte' => 'product', 'p.barcode' => 'product', 'bt.libelle' => 'product',
-        );  // We define here only fields that use another icon that the one defined into export_icon
+        ); // We define here only fields that use another icon that the one defined into export_icon
         if (isModEnabled('barcode')) {
             $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
         }
@@ -332,7 +332,7 @@ 
                 'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product',
                 'pb.rowid' => 'batch', 'pb.batch' => 'batch', 'pb.qty' => 'batch',
                 'pl.eatby' => 'batch', 'pl.sellby' => 'batch'
-            );  // We define here only fields that use another icon that the one defined into export_icon
+            ); // We define here only fields that use another icon that the one defined into export_icon
             if (isModEnabled('barcode')) {
                 $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product'));
             }
@@ -382,7 +382,7 @@ 
             'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse',
             'p.rowid' => "product", 'p.ref' => "product", 'p.fk_product_type' => "product", 'p.label' => "product", 'p.description' => "product", 'p.note' => "product",
             'p.price' => "product", 'p.tva_tx' => 'product', 'p.tosell' => "product", 'p.tobuy' => "product", 'p.duration' => "product", 'p.datec' => 'product', 'p.tms' => 'product'
-        );  // We define here only fields that use another icon that the one defined into export_icon
+        ); // We define here only fields that use another icon that the one defined into export_icon
         if (isModEnabled('productbatch')) {
             $this->export_fields_array[$r]['sm.batch'] = 'Batch';
             $this->export_TypeFields_array[$r]['sm.batch'] = 'Text';
@@ -557,10 +557,10 @@ 
         $sql = array();
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'stock' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "','stock'," . ((int)$conf->entity) . ")",
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[2][2]) . "' AND type = 'mouvement' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[2][2]) . "','mouvement'," . ((int)$conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'stock' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "','stock'," . ((int) $conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[2][2]) . "' AND type = 'mouvement' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[2][2]) . "','mouvement'," . ((int) $conf->entity) . ")",
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/Fournisseur.php

Spacing +5 added lines, -5 removed lines

@@ -454,7 +454,7 @@ 
         $this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
         $this->export_sql_end[$r] .= ' AND f.entity IN (' . getEntity('supplier_invoice') . ')';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
-            $this->export_sql_end[$r] .= ' AND sc.fk_user = ' . ((int)$user->id);
+            $this->export_sql_end[$r] .= ' AND sc.fk_user = ' . ((int) $user->id);
         }
 
         // Invoices and payments
@@ -537,7 +537,7 @@ 
         $this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
         $this->export_sql_end[$r] .= ' AND f.entity IN (' . getEntity('supplier_invoice') . ')';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
-            $this->export_sql_end[$r] .= ' AND sc.fk_user = ' . ((int)$user->id);
+            $this->export_sql_end[$r] .= ' AND sc.fk_user = ' . ((int) $user->id);
         }
 
         // Order
@@ -617,7 +617,7 @@ 
         $this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
         $this->export_sql_end[$r] .= ' AND f.entity IN (' . getEntity('supplier_order') . ')';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
-            $this->export_sql_end[$r] .= ' AND sc.fk_user = ' . ((int)$user->id);
+            $this->export_sql_end[$r] .= ' AND sc.fk_user = ' . ((int) $user->id);
         }
 
         //Import Supplier Invoice
@@ -992,8 +992,8 @@ 
         }
 
         $sql_order = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'order_supplier' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "', 'order_supplier', " . ((int)$conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'order_supplier' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "', 'order_supplier', " . ((int) $conf->entity) . ")",
         );
 
         //ODT template for Supplier Invoice

Dolibarr/Modules/Don.php

Spacing +2 added lines, -2 removed lines

@@ -163,8 +163,8 @@
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'donation' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','donation'," . ((int)$conf->entity) . ")",
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'donation' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "','donation'," . ((int) $conf->entity) . ")",
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/Projet.php

Spacing +9 added lines, -9 removed lines

@@ -132,10 +132,10 @@ 
 
         // Boxes
         $this->boxes = array(
-            0 => array('file' => 'box_project.php', 'enabledbydefaulton' => 'Home'),  // open projects
-            1 => array('file' => 'box_project_opportunities.php', 'enabledbydefaulton' => 'Home'),    // open opportunities
+            0 => array('file' => 'box_project.php', 'enabledbydefaulton' => 'Home'), // open projects
+            1 => array('file' => 'box_project_opportunities.php', 'enabledbydefaulton' => 'Home'), // open opportunities
             2 => array('file' => 'box_task.php', 'enabledbydefaulton' => 'Home'),
-            3 => array('file' => 'box_validated_projects.php', 'enabledbydefaulton' => 'Home'),   // task without timespent
+            3 => array('file' => 'box_validated_projects.php', 'enabledbydefaulton' => 'Home'), // task without timespent
             4 => array('file' => 'box_funnel_of_prospection.php', 'enabledbydefaulton' => 'Home'),
         );
         // Cronjobs
@@ -413,12 +413,12 @@ 
         }
 
         $sql = array();
-        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[3][2]) . "' AND type = 'task' AND entity = " . ((int)$conf->entity);
-        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[3][2]) . "','task'," . ((int)$conf->entity) . ")";
-        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'beluga' AND type = 'project' AND entity = " . ((int)$conf->entity);
-        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('beluga','project'," . ((int)$conf->entity) . ")";
-        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'baleine' AND type = 'project' AND entity = " . ((int)$conf->entity);
-        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('baleine','project'," . ((int)$conf->entity) . ")";
+        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[3][2]) . "' AND type = 'task' AND entity = " . ((int) $conf->entity);
+        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[3][2]) . "','task'," . ((int) $conf->entity) . ")";
+        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'beluga' AND type = 'project' AND entity = " . ((int) $conf->entity);
+        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('beluga','project'," . ((int) $conf->entity) . ")";
+        $sql[] = "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'baleine' AND type = 'project' AND entity = " . ((int) $conf->entity);
+        $sql[] = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('baleine','project'," . ((int) $conf->entity) . ")";
 
 
         return $this->_init($sql, $options);

Dolibarr/Modules/KnowledgeManagement.php

Spacing +4 added lines, -4 removed lines

@@ -472,10 +472,10 @@
                 }
 
                 $sql = array_merge($sql, array(
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int)$conf->entity) . ")",
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int)$conf->entity) . ")"
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int) $conf->entity) . ")",
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int) $conf->entity) . ")"
                 ));
             }
         }

Dolibarr/Modules/Partnership.php

Spacing +5 added lines, -5 removed lines

@@ -224,7 +224,7 @@ 
             // Label of tables
             'tablib' => array("PartnershipType"),
             // Request to select fields
-            'tabsql' => array('SELECT f.rowid as rowid, f.code, f.label, f.keyword, f.active FROM ' . MAIN_DB_PREFIX . 'c_partnership_type as f WHERE f.entity = ' . ((int)$conf->entity)),
+            'tabsql' => array('SELECT f.rowid as rowid, f.code, f.label, f.keyword, f.active FROM ' . MAIN_DB_PREFIX . 'c_partnership_type as f WHERE f.entity = ' . ((int) $conf->entity)),
             // Sort order
             'tabsqlsort' => array("label ASC"),
             // List of fields (result of select to show dictionary)
@@ -488,10 +488,10 @@ 
                 }
 
                 $sql = array_merge($sql, array(
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int)$conf->entity) . ")",
-                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int)$conf->entity),
-                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int)$conf->entity) . ")"
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard_" . strtolower($myTmpObjectKey) . "' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard_" . strtolower($myTmpObjectKey) . "','" . strtolower($myTmpObjectKey) . "'," . ((int) $conf->entity) . ")",
+                    "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'generic_" . strtolower($myTmpObjectKey) . "_odt' AND type = '" . strtolower($myTmpObjectKey) . "' AND entity = " . ((int) $conf->entity),
+                    "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('generic_" . strtolower($myTmpObjectKey) . "_odt', '" . strtolower($myTmpObjectKey) . "', " . ((int) $conf->entity) . ")"
                 ));
             }
         }

Dolibarr/Modules/Societe.php

Spacing +3 added lines, -3 removed lines

@@ -207,7 +207,7 @@ 
         $this->rights[$r][0] = 130;
         $this->rights[$r][1] = 'Modify thirdparty information payment';
         $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'thirdparty_paymentinformation_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
         $this->rights[$r][5] = 'write';
 
         // 262 : Restrict access to sales representative
@@ -356,7 +356,7 @@ 
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_incoterms as incoterm ON s.fk_incoterms = incoterm.rowid';
         $this->export_sql_end[$r] .= ' WHERE s.entity IN (' . getEntity('societe') . ')';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
-            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int)$user->id) . ' ';
+            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int) $user->id) . ' ';
             if (getDolGlobalString('SOCIETE_EXPORT_SUBORDINATES_CHILDS')) {
                 $subordinatesids = $user->getAllChildIds();
                 $this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN (' . $this->db->sanitize(implode(',', $subordinatesids)) . ')' : '';
@@ -445,7 +445,7 @@ 
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_typent as t ON s.fk_typent = t.id';
         $this->export_sql_end[$r] .= ' WHERE c.entity IN (' . getEntity('contact') . ')';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
-            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int)$user->id) . ' ';
+            $this->export_sql_end[$r] .= ' AND (sc.fk_user = ' . ((int) $user->id) . ' ';
             if (getDolGlobalString('SOCIETE_EXPORT_SUBORDINATES_CHILDS')) {
                 $subordinatesids = $user->getAllChildIds();
                 $this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN (' . $this->db->sanitize(implode(',', $subordinatesids)) . ')' : '';