Compare commits

..

No commits in common. "2ecbac159a8b51448ea9c3290135ea2ed5b94aed" and "f93bb57906616cc652b5faad0f4270777fe9f36a" have entirely different histories.

3 changed files with 5 additions and 19 deletions

View File

@ -23,9 +23,8 @@ $form->runIf('save', function () use ($plugin) {
$plugin->setConfigProperty('objet_1', trim(f('objet_1')));
$plugin->setConfigProperty('objet_2', trim(f('objet_2')));;
$plugin->setConfigProperty('logo', (bool)f('logo'));
$plugin->setConfigProperty('footer', f('footer'));
$plugin->setConfigProperty('validate_cp', (bool)f('validate_cp'));
$plugin->setConfigProperty('unique_client_name', (bool)f('unique_client_name'));
@ -39,4 +38,4 @@ $tpl->assign('ok', qg('ok') !== null);
$tpl->assign('conf', $plugin->getConfig());
$tpl->assign('patterns', \Paheko\Plugin\Facturation\PATTERNS_LIST);
$tpl->display(PLUGIN_ROOT . '/templates/config.tpl');
$tpl->display(PLUGIN_ROOT . '/templates/config.tpl');

View File

@ -61,17 +61,17 @@ if ($f->type_facture != CERFA)
$doc = 'Facture n° '. $f->numero;
$txtemis = $doc . " - Émise le " . $emission;
$txtdest = "Adressée à :";
break;
break;
case DEVIS:
$doc = 'Devis n° '. $f->numero;
$txtemis = $doc . " - Émis le " . $emission;
$txtdest = "Adressé à :";
break;
break;
case COTIS:
$doc = 'Reçu de cotisation n° '. $f->numero;
$txtemis = $doc . " - Émis le " . $emission;
$txtdest = "Adressé à :";
break;
break;
}
// utiliser l'adresse configurée dans le plugin sinon celle de l'asso sinon rien !
@ -93,10 +93,6 @@ if ($f->type_facture != CERFA)
$adresse = "";
}
$logo='';
if ($plugin->getConfig('logo')) {
$logo = '<img id="logo" src="' . $config->fileURL('logo') . '" />';
}
$asso =
// 'Émis par :<br><br>'.
'<b>'.$config->get('org_name')."</b><br>".
@ -271,13 +267,6 @@ EOF;
width: 40%;
vertical-align: top;
}
.adressage td#logo {
width: 20%;
vertical-align: top;
}
.adressage img#logo {
height : 3cm;
}
.contenuTexte {
padding: 0 6mm;
@ -329,7 +318,6 @@ EOF;
<table class="adressage">
<tr>
<td id="logo">$logo</td>
<td>$asso</td>
<td>$receveur</td>
</tr>

View File

@ -52,7 +52,6 @@
<fieldset>
<legend>Factures</legend>
<dl>
{input type="checkbox" name="logo" value="1" source=$conf label="Imprimer le logo de l'association"}
{input type="textarea" class="full-width" rows="10" name="footer" source=$conf label="Pied de document — informations légales" required=true}
</dl>
</fieldset>