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

Merge pull request #4380 from aspangaro/3.9-p4

Browse Source 
Fix: Donation some problems with french article
This commit is contained in:
Laurent Destailleur 2016-01-10 11:46:12 +01:00
commit 70ffcfea33
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/modules/dons/html_cerfafr.html
View File

@ -201,7 +201,7 @@
<table width="100%"> <table width="100%">
<tr align="center"> <tr align="center">
<td> <td>
__AMOUNT__ <b> euros</b> <b>__AMOUNT__ euros</b>
</td> </td>
</tr> </tr>
</table> </table>
@ -215,7 +215,9 @@
Le bénéficiaire certifie sur l’honneur que les dons et versements qu’il reçoit ouvrent droit à la réduction d'impôt prévue à l’article (3) :<br> Le bénéficiaire certifie sur l’honneur que les dons et versements qu’il reçoit ouvrent droit à la réduction d'impôt prévue à l’article (3) :<br>
<table width="100%"> <table width="100%">
<tr align="center"> <tr align="center">
__CodeDon__ <td width="33%">__ARTICLE200__</td>
<td width="33%">__ARTICLE238__</td>
<td width="33%">__ARTICLE885__</td>
</tr> </tr>
</table> </table>
<hr> <hr>

4
htdocs/core/modules/dons/html_cerfafr.modules.php
View File

@ -146,6 +146,7 @@ class html_cerfafr extends ModeleDon
$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>'; $ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
} }
/*
if (empty($don->societe)) if (empty($don->societe))
{ {
$CodeDon = '<td width="33%"><input type="checkbox" disabled="true" checked="checked" > 200 du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 238 bis du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 885-0 V bis A du CGI</td>'; $CodeDon = '<td width="33%"><input type="checkbox" disabled="true" checked="checked" > 200 du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 238 bis du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 885-0 V bis A du CGI</td>';
@ -154,6 +155,7 @@ class html_cerfafr extends ModeleDon
{ {
$CodeDon = '<td width="33%"><input type="checkbox" disabled="true" > 200 du CGI</td><td width="33%"><input type="checkbox" disabled="true" checked="checked" > 238 bis du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 885-0 V bis A du CGI</td>'; $CodeDon = '<td width="33%"><input type="checkbox" disabled="true" > 200 du CGI</td><td width="33%"><input type="checkbox" disabled="true" checked="checked" > 238 bis du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 885-0 V bis A du CGI</td>';
} }
*/
// Define contents // Define contents
$donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html"; $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html";
@ -186,7 +188,7 @@ class html_cerfafr extends ModeleDon
$form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form); $form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form);
$form = str_replace('__DonationDatePayment__',$outputlangs->trans("DonationDatePayment"),$form); $form = str_replace('__DonationDatePayment__',$outputlangs->trans("DonationDatePayment"),$form);
$form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form); $form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form);
$form = str_replace('__CodeDon__',$CodeDon,$form); // $form = str_replace('__CodeDon__',$CodeDon,$form);
$form = str_replace('__Name__',$outputlangs->trans("Name"),$form); $form = str_replace('__Name__',$outputlangs->trans("Name"),$form);
$form = str_replace('__Address__',$outputlangs->trans("Address"),$form); $form = str_replace('__Address__',$outputlangs->trans("Address"),$form);
$form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form); $form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form);