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

Merge pull request #820 from FHenry/3.3

Browse Source 
Fix bug with multicompany (SYSLOG_FILE on wrong entity)
This commit is contained in:
Regis Houssin 2013-04-10 06:20:06 -07:00
commit eb78de1981
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/syslog.php
View File

@ -98,14 +98,14 @@ if ($action == 'set')
if ($_POST[$option['constant']]) if ($_POST[$option['constant']])
{ {
dolibarr_del_const($db, $option['constant'], 0); dolibarr_del_const($db, $option['constant'], 0);
dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine'); dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine',0, '', 0);
} }
} }
} }
} }
} }
dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine'); dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine',0,'',0);
if (! $error) if (! $error)
{ {

3
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -927,3 +927,6 @@ UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='
ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur;
UPDATE llx_const set name='PRODUIT_MULTI_PRICES' where name='PRODUIT_MUTLI_PRICES'; UPDATE llx_const set name='PRODUIT_MULTI_PRICES' where name='PRODUIT_MUTLI_PRICES';
DELETE FROM llx_const WHERE entity<>0 AND name IN ('SYSLOG_HANDLERS','SYSLOG_LEVEL');
UPDATE llx_const SET entity=0 WHERE name = 'SYSLOG_FILE';