Sistema Integral Simón Bolívar

Merge lp:~inddiana/sisb/mostrar_bolivar_soberano_030518 into lp:sisb

  1. mostrar_bolivar_soberano_030518
  2. Merge into sisb
Proposed by [SISB] Aryrosa Fuentes
Status: Merged
Merged at revision: 991
Proposed branch: lp:~inddiana/sisb/mostrar_bolivar_soberano_030518
Merge into: lp:sisb
Diff against target: 107 lines (+44/-9)
3 files modified
l10n_ve_presupuesto/report/budget_support.rml (+11/-0)
sisb_purchase_management/report/compra.rml (+24/-6)
sisb_ventas/report/invoice.rml (+9/-3)
To merge this branch: bzr merge lp:~inddiana/sisb/mostrar_bolivar_soberano_030518
Reviewer Review Type Date Requested Status
Juan Lugo Pending
Review via email: mp+345046@code.launchpad.net

Commit message

[MOD] Ajustes en reportes para mostrar totales expresados en bolivares soberanos.

To post a comment you must log in.
lp:~inddiana/sisb/mostrar_bolivar_soberano_030518 updated
991. By [SISB] Aryrosa Fuentes

[MOD] Ajustes en reportes para mostrar totales expresados en bolivares soberanos.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ve_presupuesto/report/budget_support.rml'
--- l10n_ve_presupuesto/report/budget_support.rml 2017-07-19 20:05:13 +0000
+++ l10n_ve_presupuesto/report/budget_support.rml 2018-05-03 15:37:51 +0000
@@ -343,6 +343,17 @@
343 <para style="sub_titulo" alignment="right">[[ formatLang(c[1], digits=2, grouping=True) or '0.00' ]]</para>343 <para style="sub_titulo" alignment="right">[[ formatLang(c[1], digits=2, grouping=True) or '0.00' ]]</para>
344 </td>344 </td>
345 </tr>345 </tr>
346 <tr>
347 <td>
348 <para style="sub_titulo" alignment="right">*** Total importe Bs.S</para>
349 </td>
350 <td>
351 <para style="sub_titulo" alignment="right">[[ formatLang(c[1]/1000, digits=2, grouping=True) or '0.00' ]]</para>
352 </td>
353 <td>
354 <para style="sub_titulo" alignment="right">[[ formatLang(c[1]/1000, digits=2, grouping=True) or '0.00' ]]</para>
355 </td>
356 </tr>
346 </blockTable>357 </blockTable>
347 358
348 </section>359 </section>
349360
=== modified file 'sisb_purchase_management/report/compra.rml'
--- sisb_purchase_management/report/compra.rml 2016-10-04 15:35:50 +0000
+++ sisb_purchase_management/report/compra.rml 2018-05-03 15:37:51 +0000
@@ -681,10 +681,28 @@
681 </para>681 </para>
682 </td>682 </td>
683 <td>683 <td>
684 <para style="estilo3">Total :</para>684 <para style="estilo3">Total Bs:</para>
685 </td>685 </td>
686 <td>686 <td>
687 <para style="estilo3" alignment="RIGHT">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') ) or '0' ]] [[ o.pricelist_id.currency_id. symbol ]]</para>687 <para style="estilo3" alignment="RIGHT">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') ) or '0' ]] [[ o.pricelist_id.currency_id. ]]</para>
688 </td>
689 </tr>
690 <tr>
691 <td>
692 <para style="estilo3">
693 <font color="white" />
694 </para>
695 </td>
696 <td>
697 <para style="estilo3">
698 <font color="white" />
699 </para>
700 </td>
701 <td>
702 <para style="estilo3">*** Total Bs.S:</para>
703 </td>
704 <td>
705 <para style="estilo3" alignment="RIGHT">[[ formatLang(o.amount_total/1000, digits=get_digits(dp='Purchase Price') ) or '0' ]] [[ o.pricelist_id.currency_id. ]]</para>
688 </td>706 </td>
689 </tr>707 </tr>
690 </blockTable>708 </blockTable>
@@ -749,7 +767,7 @@
749 </td>767 </td>
750 <td>768 <td>
751 <para style="estilo6">Aprobación</para>769 <para style="estilo6">Aprobación</para>
752 <para style="estilo6">Gerente General</para>770 <para style="estilo6">Presidente</para>
753 </td>771 </td>
754 </tr>772 </tr>
755 <tr>773 <tr>
@@ -831,7 +849,7 @@
831 <para style="estilo2" alignment="JUSTIFY">Firma y Sello</para>849 <para style="estilo2" alignment="JUSTIFY">Firma y Sello</para>
832 </td>850 </td>
833 <td>851 <td>
834 <para style="estilo2" alignment="JUSTIFY">Gerente General</para>852 <para style="estilo2" alignment="JUSTIFY">Presidente</para>
835 <spacer length="0.2cm"/>853 <spacer length="0.2cm"/>
836 <para style="estilo2" alignment="JUSTIFY">Empresa</para>854 <para style="estilo2" alignment="JUSTIFY">Empresa</para>
837 <spacer length="0.2cm"/>855 <spacer length="0.2cm"/>
838856
=== modified file 'sisb_ventas/report/invoice.rml'
--- sisb_ventas/report/invoice.rml 2018-02-07 18:28:48 +0000
+++ sisb_ventas/report/invoice.rml 2018-05-03 15:37:51 +0000
@@ -56,10 +56,10 @@
56 <blockTopPadding value="0.2" />56 <blockTopPadding value="0.2" />
57 </blockTableStyle>57 </blockTableStyle>
58 <paraStyle name="normal_dir" fontName="Helvetica" fontSize="8"/>58 <paraStyle name="normal_dir" fontName="Helvetica" fontSize="8"/>
59 <paraStyle name="normal" fontName="Helvetica" fontSize="9"/>59 <paraStyle name="normal" fontName="Helvetica" fontSize="7"/>
60 <paraStyle name="lines" fontName="Helvetica" fontSize="9"/>60 <paraStyle name="lines" fontName="Helvetica" fontSize="7"/>
61 <paraStyle name="bold_dir" fontName="Helvetica-Bold" fontSize="8"/>61 <paraStyle name="bold_dir" fontName="Helvetica-Bold" fontSize="8"/>
62 <paraStyle name="bold" fontName="Helvetica-Bold" fontSize="9"/>62 <paraStyle name="bold" fontName="Helvetica-Bold" fontSize="7"/>
63 <blockTableStyle id="firmas">63 <blockTableStyle id="firmas">
64 <blockAlignment value="LEFT"/>64 <blockAlignment value="LEFT"/>
65 <blockValign value="TOP"/>65 <blockValign value="TOP"/>
@@ -248,6 +248,12 @@
248 <td><para style="bold" alignment="right">Total a Pagar:</para></td>248 <td><para style="bold" alignment="right">Total a Pagar:</para></td>
249 <td><para style="bold" alignment="right">[[ formatLang(o.amount_total, dp='Account') ]]</para></td>249 <td><para style="bold" alignment="right">[[ formatLang(o.amount_total, dp='Account') ]]</para></td>
250 </tr>250 </tr>
251 <tr>
252 <td><para style="bold"></para></td>
253 <td><para style="bold"></para></td>
254 <td><para style="bold" alignment="right">*** Bs.S:</para></td>
255 <td><para style="bold" alignment="right">[[ formatLang(o.amount_total/1000, dp='Account') ]]</para></td>
256 </tr>
251 </blockTable>257 </blockTable>
252 <section>258 <section>
253 <blockTable colWidths="20cm" style="table1">259 <blockTable colWidths="20cm" style="table1">

Subscribers

People subscribed via source and target branches