alxarafe / alixar

Dolibarr/Modules/Workstation.php

Spacing +4 added lines, -4 removed lines

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

Dolibarr/Modules/Commande.php

Spacing +2 added lines, -2 removed lines

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

Dolibarr/Modules/SupplierProposal.php

Spacing +2 added lines, -2 removed lines

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

Dolibarr/Modules/Product.php

Spacing +2 added lines, -2 removed lines

@@ -309,7 +309,7 @@ 
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
         $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
         if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int)$conf->entity);
+            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
         }
         if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
             $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN ' . MAIN_DB_PREFIX . 'categorie as cat ON cp.fk_categorie = cat.rowid';
@@ -464,7 +464,7 @@ 
             $this->export_sql_start[$r] = 'SELECT DISTINCT ';
             $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
             if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-                $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int)$conf->entity);
+                $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
             }
             $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_extrafields as extra ON p.rowid = extra.fk_object,';
             $this->export_sql_end[$r] .= ' ' . MAIN_DB_PREFIX . 'product_association as pa, ' . MAIN_DB_PREFIX . 'product as p2';

Dolibarr/Modules/HRM.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
 
         // Array to add new pages in new tabs
         $this->tabs = array();
-        $this->tabs[] = array('data' => 'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user');                   // To add a new tab identified by code tabname1
+        $this->tabs[] = array('data' => 'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1
         //$this->tabs[] = array('data'=>'job:+tabname1:Poste:mylangfile@hrm:1:/hrm/poste_list.php?fk_job=__ID__');                      // To add a new tab identified by code tabname1
         // Example:
         // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@hrm:$user->rights->hrm->read:/hrm/mynewtab1.php?id=__ID__');                   // To add a new tab identified by code tabname1
@@ -303,8 +303,8 @@ 
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard' AND type='evaluation' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard','evaluation'," . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard' AND type='evaluation' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard','evaluation'," . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/Prelevement.php

Spacing +2 added lines, -2 removed lines

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

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