Fix: Choix du module de generation du model du bon de dons ne fonctionnait pas.
This commit is contained in:
parent
48a765b42d
commit
e1b4682db6
@ -35,7 +35,7 @@ if (!$user->admin)
|
|||||||
accessforbidden();
|
accessforbidden();
|
||||||
|
|
||||||
|
|
||||||
$dons_addon_var = FACTURE_ADDON;
|
$dons_addon_var = DON_ADDON;
|
||||||
|
|
||||||
|
|
||||||
$typeconst=array('yesno','texte','chaine');
|
$typeconst=array('yesno','texte','chaine');
|
||||||
@ -43,13 +43,16 @@ $typeconst=array('yesno','texte','chaine');
|
|||||||
|
|
||||||
if ($_GET["action"] == 'set')
|
if ($_GET["action"] == 'set')
|
||||||
{
|
{
|
||||||
if (dolibarr_set_const($db, "FACTURE_ADDON",$_GET["value"]))
|
if (dolibarr_set_const($db, "DON_ADDON",$_GET["value"]))
|
||||||
$facture_addon_var = $_GET["value"];
|
$don_addon_var = $_GET["value"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Affiche page
|
||||||
|
*/
|
||||||
|
|
||||||
$dir = "../compta/dons/formulaire";
|
$dir = "../includes/modules/dons/";
|
||||||
|
|
||||||
|
|
||||||
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
|
llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration');
|
||||||
@ -78,15 +81,17 @@ $handle=opendir($dir);
|
|||||||
$var=True;
|
$var=True;
|
||||||
while (($file = readdir($handle))!==false)
|
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\">';
|
print '<tr '.$bc[$var].'><td width=\"100\">';
|
||||||
echo "$file";
|
echo "$file";
|
||||||
print '</td><td> </td><td align="center">';
|
print '</td><td> </td><td align="center">';
|
||||||
|
|
||||||
if ($facture_addon_var_pdf == "$name")
|
if ($dons_addon_var == "$name")
|
||||||
{
|
{
|
||||||
print img_tick();
|
print img_tick();
|
||||||
print '</td><td align="center">';
|
print '</td><td align="center">';
|
||||||
|
|||||||
@ -184,7 +184,7 @@ $handle=opendir($dir);
|
|||||||
$var=True;
|
$var=True;
|
||||||
while (($file = readdir($handle))!==false)
|
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;
|
$var = !$var;
|
||||||
$name = substr($file, 4, strlen($file) -16);
|
$name = substr($file, 4, strlen($file) -16);
|
||||||
|
|||||||
@ -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', '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 ('PROPALE_ADDON_PDF', 'azur','chaine',0);
|
||||||
insert into llx_const (name, value, type, visible) values ('COMMANDE_ADDON', 'mod_commande_ivoire','chaine',0);
|
insert into llx_const (name, value, type, visible) values ('COMMANDE_ADDON', 'mod_commande_ivoire','chaine',0);
|
||||||
|
|||||||
@ -804,7 +804,9 @@ create table llx_paiementcharge
|
|||||||
)type=innodb;
|
)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 'ADHERENT%';
|
||||||
update llx_const set visible=0 where name like 'PROPALE_ADDON%';
|
update llx_const set visible=0 where name like 'PROPALE_ADDON%';
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user