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

Feature: On renomme MAIN_ENABLE_DEVELOPMENT en MAIN_FEATURES_LEVEL qui permet de grer n niveaux plutot que 2.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-10-03 20:05:29 +00:00
parent d9c1af0d2d
commit 3fa0160a72
10 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/facture.php
View File

@ -234,7 +234,9 @@ while (($file = readdir($handle))!==false)
$classname = "mod_facture_".$file; $classname = "mod_facture_".$file;
$module = new $classname($db); $module = new $classname($db);
if ($module->version == 'development' && ! $conf->global->MAIN_ENABLE_DEVELOPMENT) continue; // Show modules according to features level
if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
$var = !$var; $var = !$var;
print '<tr '.$bc[$var].'><td width="100">'; print '<tr '.$bc[$var].'><td width="100">';

9
htdocs/admin/modules.php
View File

@ -280,12 +280,9 @@ foreach ($orders as $key => $value)
$modName = $filename[$key]; $modName = $filename[$key];
$objMod = $modules[$key]; $objMod = $modules[$key];
// On affiche pas les modules en version 'development' si // Show modules according to features level
// constante MAIN_ENABLE_DEVELOPMENT non définie if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
if ($objMod->version == 'development' && ! $conf->global->MAIN_ENABLE_DEVELOPMENT) if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
{
continue;
}
$const_name = $objMod->const_name; $const_name = $objMod->const_name;

4
htdocs/admin/societe.php
View File

@ -133,7 +133,9 @@ if ($handle)
$modCodeTiers = new $file; $modCodeTiers = new $file;
if ($modCodeTiers->version == 'development' && ! $conf->global->MAIN_ENABLE_DEVELOPMENT) continue; // Show modules according to features level
if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
$var = !$var; $var = !$var;
print "<tr ".$bc[$var].">\n <td width=\"140\">".$modCodeTiers->nom."</td>\n <td>"; print "<tr ".$bc[$var].">\n <td width=\"140\">".$modCodeTiers->nom."</td>\n <td>";

4
htdocs/install/upgrade2.php
View File

@ -334,7 +334,7 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
$res = 0; $res = 0;
for ($i = 0 ; $i < sizeof($row) ; $i++) for ($i = 0 ; $i < sizeof($row) ; $i++)
{ {
if ($conf->MAIN_ENABLE_DEVELOPMENT) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>'; if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' pamount='.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' bamount='.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
// On cherche facture sans lien paiement et du meme montant et pour meme societe. // On cherche facture sans lien paiement et du meme montant et pour meme societe.
$sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f"; $sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";
@ -442,7 +442,7 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
$res = 0; $res = 0;
for ($i = 0 ; $i < sizeof($row) ; $i++) for ($i = 0 ; $i < sizeof($row) ; $i++)
{ {
if ($conf->MAIN_ENABLE_DEVELOPMENT) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>'; if ($conf->global->MAIN_FEATURES_LEVEL == 2) print '* '.$row[$i]['datec'].' paymentid='.$row[$i]['paymentid'].' '.$row[$i]['pamount'].' fk_bank='.$row[$i]['fk_bank'].' '.$row[$i]['bamount'].' socid='.$row[$i]['socid'].'<br>';
// On cherche facture sans lien paiement et du meme montant et pour meme societe. // On cherche facture sans lien paiement et du meme montant et pour meme societe.
$sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f"; $sql=" SELECT distinct f.rowid from ".MAIN_DB_PREFIX."facture as f";

2
htdocs/theme/auguria/auguria.css.php
View File

@ -31,7 +31,7 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (! $conf->global->MAIN_ENABLE_DEVELOPMENT) if (! $conf->global->MAIN_FEATURES_LEVEL)
{ {
//header('Cache-Control: max-age=3600, public, must-revalidate'); //header('Cache-Control: max-age=3600, public, must-revalidate');
} }

2
htdocs/theme/eldy/eldy.css.php
View File

@ -33,7 +33,7 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (! $conf->global->MAIN_ENABLE_DEVELOPMENT) if (! $conf->global->MAIN_FEATURES_LEVEL)
{ {
header('Cache-Control: max-age=3600, public, must-revalidate'); header('Cache-Control: max-age=3600, public, must-revalidate');
} }

2
htdocs/theme/freelug/freelug.css.php
View File

@ -32,7 +32,7 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (! $conf->global->MAIN_ENABLE_DEVELOPMENT) if (! $conf->global->MAIN_FEATURES_LEVEL)
{ {
header('Cache-Control: max-age=3600, public, must-revalidate'); header('Cache-Control: max-age=3600, public, must-revalidate');
} }

2
htdocs/theme/yellow/yellow.css.php
View File

@ -32,7 +32,7 @@ require("../../conf/conf.php");
header('Content-type: text/css'); header('Content-type: text/css');
// Important: Avoid page request by browser and dynamic build at // Important: Avoid page request by browser and dynamic build at
// each Dolibarr page access. // each Dolibarr page access.
if (! $conf->global->MAIN_ENABLE_DEVELOPMENT) if (! $conf->global->MAIN_FEATURES_LEVEL)
{ {
header('Cache-Control: max-age=3600, public, must-revalidate'); header('Cache-Control: max-age=3600, public, must-revalidate');
} }

2
mysql/data/data.sql
View File

@ -65,7 +65,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_EMAI
insert into llx_const (name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','2048','chaine','Max size for file upload (0 means no upload allowed)',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','2048','chaine','Max size for file upload (0 means no upload allowed)',0);
insert into llx_const(name,value,type,visible,note) values('MAIN_ENABLE_DEVELOPMENT','0','yesno',1,'Make development modules visible'); insert into llx_const(name,value,type,visible,note) values('MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development');
insert into llx_const(name,value,type,visible,note) values('MAIN_FASTSEARCH_COMPANY','1','yesno',0,'Show form for quick company search'); insert into llx_const(name,value,type,visible,note) values('MAIN_FASTSEARCH_COMPANY','1','yesno',0,'Show form for quick company search');
insert into llx_const(name,value,type,visible,note) values('MAIN_FASTSEARCH_CONTACT','1','yesno',0,'Show form for quick contact search'); insert into llx_const(name,value,type,visible,note) values('MAIN_FASTSEARCH_CONTACT','1','yesno',0,'Show form for quick contact search');

3
mysql/migration/2.1.0-2.2.0.sql
View File

@ -40,8 +40,9 @@ ALTER TABLE llx_cotisation modify datef date;
ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh);
-- V4.1 update llx_cotisation set datef = ADDDATE(ADDDATE(dateadh, INTERVAL 1 YEAR),INTERVAL -1 DAY); -- V4.1 update llx_cotisation set datef = ADDDATE(ADDDATE(dateadh, INTERVAL 1 YEAR),INTERVAL -1 DAY);
update llx_const set name='MAIN_ENABLE_DEVELOPMENT' where name='MAIN_SHOW_DEVELOPMENT_MODULES';
delete from llx_const where name='MAIN_SHOW_DEVELOPMENT_MODULES'; delete from llx_const where name='MAIN_SHOW_DEVELOPMENT_MODULES';
delete from llx_const where name='MAIN_ENABLE_DEVELOPMENT';
insert into llx_const(name,value,type,visible,note) values('MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development');
update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_FROM'; update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_FROM';