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

Fix: Remove warnings

Browse Source
This commit is contained in:
Laurent Destailleur 2009-01-19 23:46:46 +00:00
parent 99c6787b95
commit 6646901072
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -782,7 +782,7 @@ class DolibarrModules
$r_type = $this->rights[$key][2]; $r_type = $this->rights[$key][2];
$r_def = $this->rights[$key][3]; $r_def = $this->rights[$key][3];
$r_perms = $this->rights[$key][4]; $r_perms = $this->rights[$key][4];
$r_subperms = $this->rights[$key][5]; $r_subperms = isset($this->rights[$key][5])?$this->rights[$key][5]:'';
$r_modul = $this->rights_class; $r_modul = $this->rights_class;
if (empty($r_type)) $r_type='w'; if (empty($r_type)) $r_type='w';

14
htdocs/install/inc.php
View File

@ -64,7 +64,6 @@ else
$includeconferror=''; $includeconferror='';
$conffile = "../conf/conf.php"; $conffile = "../conf/conf.php";
$charset="UTF-8"; // If not output format found in any conf file
if (! defined('DONOTLOADCONF') && file_exists($conffile)) if (! defined('DONOTLOADCONF') && file_exists($conffile))
{ {
$result=include_once($conffile); // Load conf file $result=include_once($conffile); // Load conf file
@ -115,7 +114,7 @@ if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_m
define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:'')); define('MAIN_DB_PREFIX',(isset($dolibarr_main_db_prefix)?$dolibarr_main_db_prefix:''));
define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:'')); define('DOL_DATA_ROOT',(isset($dolibarr_main_data_root)?$dolibarr_main_data_root:''));
if (empty($conf->character_set_client)) $conf->character_set_client=$charset; if (empty($conf->character_set_client)) $conf->character_set_client="UTF-8";
if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci'; if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation='latin1_swedish_ci';
if (empty($conf->db->user)) $conf->db->user=''; if (empty($conf->db->user)) $conf->db->user='';
@ -149,8 +148,10 @@ if (! defined('SYSLOG_FILE')) // To avoid warning on systems with constant alrea
else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log'); else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log');
else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log'); else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log');
} }
define('SYSLOG_FILE_NO_ERROR',1); if (! defined('SYSLOG_FILE_NO_ERROR'))
{
define('SYSLOG_FILE_NO_ERROR',1);
}
// Forcage du parametrage PHP magic_quotes_gpc et nettoyage des parametres // Forcage du parametrage PHP magic_quotes_gpc et nettoyage des parametres
// (Sinon il faudrait a chaque POST, conditionner // (Sinon il faudrait a chaque POST, conditionner
@ -209,7 +210,7 @@ function conf($dolibarr_main_document_root)
$conf->db->user = trim($dolibarr_main_db_user); $conf->db->user = trim($dolibarr_main_db_user);
$conf->db->pass = trim($dolibarr_main_db_pass); $conf->db->pass = trim($dolibarr_main_db_pass);
if (empty($character_set_client)) $character_set_client=$charset; if (empty($character_set_client)) $character_set_client="UTF-8";
$conf->character_set_client=strtoupper($character_set_client); $conf->character_set_client=strtoupper($character_set_client);
if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1'; if (empty($dolibarr_main_db_charset)) $dolibarr_main_db_charset='latin1';
$conf->db->character_set=$dolibarr_main_db_charset; $conf->db->character_set=$dolibarr_main_db_charset;
@ -226,7 +227,10 @@ function conf($dolibarr_main_document_root)
else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log'); else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log');
else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log'); else if (@is_writable("/")) define('SYSLOG_FILE','/dolibarr_install.log');
} }
if (! defined('SYSLOG_FILE_NO_ERROR'))
{
define('SYSLOG_FILE_NO_ERROR',1); define('SYSLOG_FILE_NO_ERROR',1);
}
return 1; return 1;
} }

15
htdocs/install/upgrade2.php
View File

@ -966,7 +966,7 @@ function migrate_price_facture($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationInvoice')."</b><br>\n"; print '<b>'.$langs->trans('MigrationInvoice')."</b><br>\n";
// Liste des lignes facture non a jour // Liste des lignes facture non a jour
$sql = "SELECT fd.rowid, fd.qty, fd.subprice, fd.remise_percent, fd.tva_taux, fd.total_ttc,"; $sql = "SELECT fd.rowid, fd.qty, fd.subprice, fd.remise_percent, fd.tva_taux, fd.total_ttc, fd.info_bits,";
$sql.= " f.rowid as facid, f.remise_percent as remise_percent_global, f.total_ttc as total_ttc_f"; $sql.= " f.rowid as facid, f.remise_percent as remise_percent_global, f.total_ttc as total_ttc_f";
$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f"; $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE fd.fk_facture = f.rowid"; $sql.= " WHERE fd.fk_facture = f.rowid";
@ -990,6 +990,7 @@ function migrate_price_facture($db,$langs,$conf)
$remise_percent = $obj->remise_percent; $remise_percent = $obj->remise_percent;
$remise_percent_global = $obj->remise_percent_global; $remise_percent_global = $obj->remise_percent_global;
$total_ttc_f = $obj->total_ttc_f; $total_ttc_f = $obj->total_ttc_f;
$info_bits = $obj->info_bits;
// On met a jour les 3 nouveaux champs // On met a jour les 3 nouveaux champs
$facligne= new FactureLigne($db); $facligne= new FactureLigne($db);
@ -1075,7 +1076,7 @@ function migrate_price_propal($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationProposal')."</b><br>\n"; print '<b>'.$langs->trans('MigrationProposal')."</b><br>\n";
// Liste des lignes propal non a jour // Liste des lignes propal non a jour
$sql = "SELECT pd.rowid, pd.qty, pd.subprice, pd.remise_percent, pd.tva_tx as tva_taux, "; $sql = "SELECT pd.rowid, pd.qty, pd.subprice, pd.remise_percent, pd.tva_tx as tva_taux, pd.info_bits,";
$sql.= " p.rowid as propalid, p.remise_percent as remise_percent_global"; $sql.= " p.rowid as propalid, p.remise_percent as remise_percent_global";
$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p"; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd, ".MAIN_DB_PREFIX."propal as p";
$sql.= " WHERE pd.fk_propal = p.rowid"; $sql.= " WHERE pd.fk_propal = p.rowid";
@ -1097,6 +1098,7 @@ function migrate_price_propal($db,$langs,$conf)
$txtva = $obj->tva_taux; $txtva = $obj->tva_taux;
$remise_percent = $obj->remise_percent; $remise_percent = $obj->remise_percent;
$remise_percent_global = $obj->remise_percent_global; $remise_percent_global = $obj->remise_percent_global;
$info_bits = $obj->info_bits;
// On met a jour les 3 nouveaux champs // On met a jour les 3 nouveaux champs
$propalligne= new PropaleLigne($db); $propalligne= new PropaleLigne($db);
@ -1179,7 +1181,7 @@ function migrate_price_contrat($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationContract')."</b><br>\n"; print '<b>'.$langs->trans('MigrationContract')."</b><br>\n";
// Liste des lignes contrat non a jour // Liste des lignes contrat non a jour
$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as tva_taux, "; $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as tva_taux, cd.info_bits,";
$sql.= " c.rowid as contratid"; $sql.= " c.rowid as contratid";
$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
$sql.= " WHERE cd.fk_contrat = c.rowid"; $sql.= " WHERE cd.fk_contrat = c.rowid";
@ -1201,6 +1203,7 @@ function migrate_price_contrat($db,$langs,$conf)
$txtva = $obj->tva_taux; $txtva = $obj->tva_taux;
$remise_percent = $obj->remise_percent; $remise_percent = $obj->remise_percent;
$remise_percent_global = $obj->remise_percent_global; $remise_percent_global = $obj->remise_percent_global;
$info_bits = $obj->info_bits;
// On met a jour les 3 nouveaux champs // On met a jour les 3 nouveaux champs
$contratligne= new ContratLigne($db); $contratligne= new ContratLigne($db);
@ -1283,7 +1286,7 @@ function migrate_price_commande($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationOrder')."</b><br>\n"; print '<b>'.$langs->trans('MigrationOrder')."</b><br>\n";
// Liste des lignes commande non a jour // Liste des lignes commande non a jour
$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as tva_taux, "; $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as tva_taux, cd.info_bits,";
$sql.= " c.rowid as commandeid, c.remise_percent as remise_percent_global"; $sql.= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c"; $sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."commande as c";
$sql.= " WHERE cd.fk_commande = c.rowid"; $sql.= " WHERE cd.fk_commande = c.rowid";
@ -1305,6 +1308,7 @@ function migrate_price_commande($db,$langs,$conf)
$txtva = $obj->tva_taux; $txtva = $obj->tva_taux;
$remise_percent = $obj->remise_percent; $remise_percent = $obj->remise_percent;
$remise_percent_global = $obj->remise_percent_global; $remise_percent_global = $obj->remise_percent_global;
$info_bits = $obj->info_bits;
// On met a jour les 3 nouveaux champs // On met a jour les 3 nouveaux champs
$commandeligne= new CommandeLigne($db); $commandeligne= new CommandeLigne($db);
@ -1393,7 +1397,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
print '<b>'.$langs->trans('MigrationSupplierOrder')."</b><br>\n"; print '<b>'.$langs->trans('MigrationSupplierOrder')."</b><br>\n";
// Liste des lignes commande non a jour // Liste des lignes commande non a jour
$sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as tva_taux, "; $sql = "SELECT cd.rowid, cd.qty, cd.subprice, cd.remise_percent, cd.tva_tx as tva_taux, cd.info_bits,";
$sql.= " c.rowid as commandeid, c.remise_percent as remise_percent_global"; $sql.= " c.rowid as commandeid, c.remise_percent as remise_percent_global";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd, ".MAIN_DB_PREFIX."commande_fournisseur as c";
$sql.= " WHERE cd.fk_commande = c.rowid"; $sql.= " WHERE cd.fk_commande = c.rowid";
@ -1415,6 +1419,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
$txtva = $obj->tva_taux; $txtva = $obj->tva_taux;
$remise_percent = $obj->remise_percent; $remise_percent = $obj->remise_percent;
$remise_percent_global = $obj->remise_percent_global; $remise_percent_global = $obj->remise_percent_global;
$info_bits = $obj->info_bits;
// On met a jour les 3 nouveaux champs // On met a jour les 3 nouveaux champs
$commandeligne= new CommandeFournisseurLigne($db); $commandeligne= new CommandeFournisseurLigne($db);