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

Fix: Choix du module de generation du model du bon de dons ne fonctionnait pas.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-12-07 01:06:53 +00:00
parent 48a765b42d
commit e1b4682db6
4 changed files with 60 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/admin/dons.php
View File

@ -35,7 +35,7 @@ if (!$user->admin)
accessforbidden();
$dons_addon_var = FACTURE_ADDON;
$dons_addon_var = DON_ADDON;
$typeconst=array('yesno','texte','chaine');
@ -43,13 +43,16 @@ $typeconst=array('yesno','texte','chaine');
if ($_GET["action"] == 'set')
{
if (dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"]))
$facture_addon_var = $_GET["value"];
if (dolibarr_set_const($db, "DON_ADDON",$_GET["value"]))
$don_addon_var = $_GET["value"];
}
/*
* Affiche page
*/
$dir = "../compta/dons/formulaire";
$dir = "../includes/modules/dons/";
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
@ -78,27 +81,29 @@ $handle=opendir($dir);
$var=True;
while (($file = readdir($handle))!==false)
{
if (substr($file, strlen($file) -4) == '.php')
if (eregi('\.modules\.php$',$file))
{
$var = !$var;
$var = !$var;
$name = substr($file, 0, strlen($file) -12);
$classname = substr($file, 0, strlen($file) -12);
print '<tr '.$bc[$var].'><td width=\"100\">';
echo "$file";
print '</td><td>&nbsp;</td><td align="center">';
print '<tr '.$bc[$var].'><td width=\"100\">';
echo "$file";
print '</td><td>&nbsp;</td><td align="center">';
if ($facture_addon_var_pdf == "$name")
{
print img_tick();
print '</td><td align="center">';
print '&nbsp;';
}
else
{
print '&nbsp;';
print '</td><td align="center">';
print '<a href="dons.php?action=setform&value='.$name.'">'.$langs->trans("Activate").'</a>';
}
print "</td></tr>\n";
if ($dons_addon_var == "$name")
{
print img_tick();
print '</td><td align="center">';
print '&nbsp;';
}
else
{
print '&nbsp;';
print '</td><td align="center">';
print '<a href="dons.php?action=setform&value='.$name.'">'.$langs->trans("Activate").'</a>';
}
print "</td></tr>\n";
}
}

58
htdocs/admin/facture.php
View File

@ -184,36 +184,36 @@ $handle=opendir($dir);
$var=True;
while (($file = readdir($handle))!==false)
{
if (substr($file, strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_')
if (eregi('\.modules\.php$',$file) && substr($file,0,4) == 'pdf_')
{
$var = !$var;
$name = substr($file, 4, strlen($file) -16);
$classname = substr($file, 0, strlen($file) -12);
print '<tr '.$bc[$var].'><td width="100">';
echo "$name";
print "</td><td>\n";
require_once($dir.$file);
$obj = new $classname($db);
print $obj->description;
print '</td><td align="center">';
if ($facture_addon_var_pdf == "$name")
{
print '&nbsp;';
print '</td><td align="center">';
print img_tick();
}
else
{
print '&nbsp;';
print '</td><td align="center">';
print '<a href="facture.php?action=setpdf&amp;value='.$name.'">'.$langs->trans("Default").'</a>';
}
print "</td></tr>\n";
$var = !$var;
$name = substr($file, 4, strlen($file) -16);
$classname = substr($file, 0, strlen($file) -12);
print '<tr '.$bc[$var].'><td width="100">';
echo "$name";
print "</td><td>\n";
require_once($dir.$file);
$obj = new $classname($db);
print $obj->description;
print '</td><td align="center">';
if ($facture_addon_var_pdf == "$name")
{
print '&nbsp;';
print '</td><td align="center">';
print img_tick();
}
else
{
print '&nbsp;';
print '</td><td align="center">';
print '<a href="facture.php?action=setpdf&amp;value='.$name.'">'.$langs->trans("Default").'</a>';
}
print "</td></tr>\n";
}
}
closedir($handle);

2
mysql/data/data.sql
View File

@ -162,7 +162,7 @@ insert into llx_const (name, value, type) values ('OSC_CATALOG_URL','http://osc.
--
--
--
insert into llx_const (name, value, type, visible) values ('DON_ADDON', 'html_cerfafr','chaine',1);
insert into llx_const (name, value, type, visible) values ('DON_ADDON', 'html_cerfafr','chaine',0);
insert into llx_const (name, value, type, visible) values ('PROPALE_ADDON', 'mod_propale_marbre','chaine',0);
insert into llx_const (name, value, type, visible) values ('PROPALE_ADDON_PDF', 'azur','chaine',0);
insert into llx_const (name, value, type, visible) values ('COMMANDE_ADDON', 'mod_commande_ivoire','chaine',0);

4
mysql/migration/1.1.0-2.0.0.sql
View File

@ -804,7 +804,9 @@ create table llx_paiementcharge
)type=innodb;
update llx_const set visible=0 where name like 'DONS_FORM';
delete from llx_const where name like 'DONS_%';
insert into llx_const (name, value, type, visible) values ('DON_ADDON','html_cerfafr','chaine',0);
update llx_const set visible=0 where name like 'ADHERENT%';
update llx_const set visible=0 where name like 'PROPALE_ADDON%';