Merge pull request #733 from Som-Energia/NEW_flux_solar_modifications…

…_to_pdf Modificació de la posició d'elements informatius del flux solar a la factura en pdf
Som-Energia · Oct 15, 2024 · ba70e13 · ba70e13
2 parents 88bb0e7 + a247f6e
commit ba70e13
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/giscedata_facturacio_comer_som/report/components/invoice_details_td/invoice_details_td.css b/giscedata_facturacio_comer_som/report/components/invoice_details_td/invoice_details_td.css
@@ -55,6 +55,10 @@
     border-bottom: 1.8px solid black;
 }
 
+.head_row {
+    border-top: 1.8px solid black;
+}
+
 .td_first {
     background-color: #7a7a7a;
     color: white;

diff --git a/giscedata_facturacio_comer_som/report/components/invoice_details_td/invoice_details_td.mako b/giscedata_facturacio_comer_som/report/components/invoice_details_td/invoice_details_td.mako
@@ -40,8 +40,8 @@
     <%include file="/giscedata_facturacio_comer_som/report/components/invoice_details_td_generation/invoice_details_td_generation.mako" args="id=id.generation" />
     <%include file="/giscedata_facturacio_comer_som/report/components/invoice_details_td_inductive/invoice_details_td_inductive.mako" args="id=id.inductive" />
     <%include file="/giscedata_facturacio_comer_som/report/components/invoice_details_td_capacitive/invoice_details_td_capacitive.mako" args="id=id.capacitive" />
-    <%include file="/giscedata_facturacio_comer_som/report/components/invoice_details_td_flux_solar/invoice_details_td_flux_solar.mako" args="fs=id.flux_solar" />
     <%include file="/giscedata_facturacio_comer_som/report/components/invoice_details_td_other_concepts/invoice_details_td_other_concepts.mako" args="id=id.other_concepts" />
+    <%include file="/giscedata_facturacio_comer_som/report/components/invoice_details_td_flux_solar/invoice_details_td_flux_solar.mako" args="fs=id.flux_solar" />
     <tr class="total_factura_row">
         <td class="total_factura_text" colspan="${len(id.showing_periods)+2}">${_(u"TOTAL FACTURA")}</td>
         <td class="subtotal">${_(u"%s €") % formatLang(id.amount_total)}</td>

diff --git a/...er_som/report/components/invoice_details_td_flux_solar/invoice_details_td_flux_solar.mako b/...er_som/report/components/invoice_details_td_flux_solar/invoice_details_td_flux_solar.mako
@@ -3,7 +3,7 @@
 <%
 import locale
 %>
-    <tr class="tr_bold last_row">
+    <tr class="tr_bold head_row">
         <td class="td_first concepte_td">${_(u"Flux Solar")}</td>
         <td class="detall_td" colspan="${fs.number_of_columns}">${_(u"Descompte per Flux Solar")}</td>
         <td class="subtotal">${_(u"%s €") % formatLang(fs.subtotal)}</td>

diff --git a/giscedata_facturacio_comer_som/report/components/invoice_summary_td/invoice_summary_td.mako b/giscedata_facturacio_comer_som/report/components/invoice_summary_td/invoice_summary_td.mako
@@ -27,15 +27,15 @@
     % if invs.total_boe17_2021 != 0:
         <tr><td>${_(u"Descompte sobre els càrrecs (RDL 17/2021)")}</td><td class="e">${"%s &euro;" % formatLang(invs.total_boe17_2021)}</td></tr>
     % endif
-    % if invs.has_flux_solar_discount:
-        <tr><td>${_(u"Descompte per Flux Solar")}</td><td class="e">${"%s &euro;" % formatLang(invs.flux_solar_discount)}</td></tr>
-    % endif
     % if (invs.total_altres + invs.total_bosocial) != 0:
         <tr><td>${_(u"Altres conceptes")}</td><td class="e">${"%s &euro;" % formatLang(invs.total_altres + invs.total_bosocial)}</td></tr>
     % endif
     % for n, v in invs.impostos.items():
         <tr><td>${n}</td><td class="e">${"%s &euro;" % formatLang(v)}</td></tr>
     % endfor
+    % if invs.has_flux_solar_discount:
+        <tr><td>${_(u"Descompte per Flux Solar")}</td><td class="e">${"%s &euro;" % formatLang(invs.flux_solar_discount)}</td></tr>
+    % endif
     % if invs.donatiu > 0:
         <tr><td>${_(u"Donatiu voluntari (0,01 &euro;/kWh) (exempt d'IVA)")}</td><td class="e">${"%s &euro;" % formatLang(invs.donatiu)}</td></tr>
     % endif