lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: bugs reported by scrutinizer

Browse Source
This commit is contained in:
Laurent Destailleur 2014-11-17 15:09:52 +01:00
parent 05059da9e8
commit 31f987706c
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/accountancy/class/bookkeeping.class.php
View File

@ -31,6 +31,7 @@ class BookKeeping
{ {
var $db; var $db;
var $error; var $error;
var $errors;
var $id; var $id;
var $doc_date; var $doc_date;

7
htdocs/core/class/extrafields.class.php
View File

@ -535,8 +535,7 @@ class ExtraFields
$array_name_label=array(); $array_name_label=array();
// For avoid conflicts with external modules // For avoid conflicts with external modules
if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
return $array_name_label;
$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable"; $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable";
$sql.= " FROM ".MAIN_DB_PREFIX."extrafields"; $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
@ -569,13 +568,13 @@ class ExtraFields
$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable; $this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
} }
} }
return $array_name_label;
} }
else else
{ {
print dol_print_error($this->db); print dol_print_error($this->db);
} }
return $array_name_label;
} }

10
htdocs/install/mysql/migration/repair.sql
View File

@ -204,3 +204,13 @@ UPDATE llx_projet_task_time set task_datehour = task_date where task_datehour IS
-- GRANT ALL ON *.* TO 'myuser'@'%'; -- GRANT ALL ON *.* TO 'myuser'@'%';
-- flush privileges; -- flush privileges;
-- Fix type of product 2 does not exists
update llx_propaldet set product_type = 1 where product_type = 2;
update llx_commandedet set product_type = 1 where product_type = 2;
update llx_facturedet set product_type = 1 where product_type = 2;
--update llx_propaldet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;
--update llx_commandedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;
--update llx_facturedet as d set d.product_type = 1 where d.fk_product = 22 and d.product_type = 0;