From 68c455c33413decd89ad2d7fd2c768f463d76a44 Mon Sep 17 00:00:00 2001
From: houssine <houssine.bakkali@gmail.com>
Date: Tue, 27 Mar 2018 23:22:25 +0200
Subject: [PATCH] [IMP] improve report

---
 .../reports/tax_shelter_shares_report.xml     |  9 +++--
 .../tax_shelter_subscription_report.xml       | 36 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/easy_my_coop_taxshelter_report/reports/tax_shelter_shares_report.xml b/easy_my_coop_taxshelter_report/reports/tax_shelter_shares_report.xml
index 7ab09ef..2c2a5b0 100644
--- a/easy_my_coop_taxshelter_report/reports/tax_shelter_shares_report.xml
+++ b/easy_my_coop_taxshelter_report/reports/tax_shelter_shares_report.xml
@@ -74,11 +74,12 @@
 						            	<thead class="invoice_tbody easymy-coop-normal">
 						                    <tr>
 						                        <th>Type</th>
-						                        <th>Capital before subscription</th>
-						                        <th>Capital after subscription</th>
+						                        <th>Capital before</th>
+						                        <th>Capital after</th>
 						                        <th>Tax shelter eligible</th>
 						                        <th>Date</th>
 						                        <th>Amount</th>
+						                        <th>Amount ligible</th>
 						                    </tr>
 						                </thead>
 						                <tbody class="invoice_tbody easymy-coop-normal">
@@ -89,6 +90,7 @@
 						                        <td><span t-field="l.tax_shelter"/></td>
 						                        <td><span t-field="l.transaction_date"/></td>
 						                        <td><span t-field="l.amount_subscribed"/></td>
+						                        <td><span t-field="l.amount_subscribed_eligible"/></td>
 						                    </tr>
 						                    <tr t-foreach="o.subscribed_lines" t-as="l">
 						                        <td><span t-field="l.type"/></td>
@@ -97,6 +99,7 @@
 						                        <td><span t-field="l.tax_shelter"/></td>
 						                        <td><span t-field="l.transaction_date"/></td>
 						                        <td><span t-field="l.amount_subscribed"/></td>
+						                        <td><span t-field="l.amount_subscribed_eligible"/></td>
 						                    </tr>
 						                    <tr t-foreach="o.resold_lines" t-as="l">
 						                        <td><span t-field="l.type"/></td>
@@ -105,6 +108,7 @@
 						                        <td></td>
 						                        <td><span t-field="l.transaction_date"/></td>
 						                        <td><span t-field="l.amount_resold"/></td>
+						                        <td></td>
 						                    </tr>
 						                    <tr t-foreach="o.transfered_lines" t-as="l">
 						                        <td><span t-field="l.type"/></td>
@@ -113,6 +117,7 @@
 						                        <td></td>
 						                        <td><span t-field="l.transaction_date"/></td>
 						                        <td><span t-field="l.amount_transfered"/></td>
+						                        <td></td>
 						                    </tr>
 						                </tbody>
 						            </table>
diff --git a/easy_my_coop_taxshelter_report/reports/tax_shelter_subscription_report.xml b/easy_my_coop_taxshelter_report/reports/tax_shelter_subscription_report.xml
index 54d3649..cd4db14 100644
--- a/easy_my_coop_taxshelter_report/reports/tax_shelter_subscription_report.xml
+++ b/easy_my_coop_taxshelter_report/reports/tax_shelter_subscription_report.xml
@@ -66,7 +66,42 @@
 								<div style="position:relative;top:30px;">	
 									Durant l'année <span t-field="o.declaration_id.fiscal_year"/> vous avez souscrit des parts de la <span t-field="o.company_id.name"/>. pour un montant total de 
 									<span t-field="o.total_amount_subscribed" t-field-options='{"widget": "monetary", "display_currency": "res_company.currency_id"}'/> euros.<br/>
+									Le montant éligible pour le Tax shelter est de <span t-field="o.total_amount_eligible" t-field-options='{"widget": "monetary", "display_currency": "res_company.currency_id"}'/> euros.<br/>
 								</div>
+								<div style="position:relative;top:65px;">
+									<table class="table border-easymy-coop" style="width:90%;align:center;">
+						            	<thead class="invoice_tbody easymy-coop-normal">
+						                    <tr>
+						                        <th>Type</th>
+						                        <th>Capital before</th>
+						                        <th>Capital after</th>
+						                        <th>Tax shelter eligible</th>
+						                        <th>Date</th>
+						                        <th>Amount</th>
+						                        <th>Amount ligible</th>
+						                    </tr>
+						                </thead>
+						                <tbody class="invoice_tbody easymy-coop-normal">
+						                    <tr t-foreach="o.previously_subscribed_lines" t-as="l">
+						                        <td><span t-field="l.type"/></td>
+						                        <td><span t-field="l.capital_before_sub"/></td>
+						                        <td><span t-field="l.capital_after_sub"/></td>
+						                        <td><span t-field="l.tax_shelter"/></td>
+						                        <td><span t-field="l.transaction_date"/></td>
+						                        <td><span t-field="l.amount_subscribed"/></td>
+						                        <td><span t-field="l.amount_subscribed_eligible"/></td>
+						                    </tr>
+						                    <tr t-foreach="o.subscribed_lines" t-as="l">
+						                        <td><span t-field="l.type"/></td>
+						                        <td><span t-field="l.capital_before_sub"/></td>
+						                        <td><span t-field="l.capital_after_sub"/></td>
+						                        <td><span t-field="l.tax_shelter"/></td>
+						                        <td><span t-field="l.transaction_date"/></td>
+						                        <td><span t-field="l.amount_subscribed"/></td>
+						                        <td><span t-field="l.amount_subscribed_eligible"/></td>
+						                    </tr>
+						                </tbody>
+						            </table>
 		<div style="position:relative;top:45px;">	
 		L' Article 145/26, CIR 92 sur les revenus <span t-field="o.declaration_id.fiscal_year"/>, connu aussi comme normative Tax Shelter, donnent droit à une réduction d’impôt à hauteur de 45% du montant de la valeur des parts souscrites depuis <span t-field="o.declaration_id.month_from"/> (et avant <span t-field="o.declaration_id.month_to"/> pour la déclaration des revenus <span t-field="o.declaration_id.name"/>).<br/>
 		<br/>
@@ -107,6 +142,7 @@
 			            </div>
 			        </div>
 		        </div>
+		        </div>
 		    </t>
 		    </template>