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
1=== modified file 'l10n_ve_presupuesto/report/budget_support.rml'
2--- l10n_ve_presupuesto/report/budget_support.rml 2017-07-19 20:05:13 +0000
3+++ l10n_ve_presupuesto/report/budget_support.rml 2018-05-03 15:37:51 +0000
4@@ -343,6 +343,17 @@
5 <para style="sub_titulo" alignment="right">[[ formatLang(c[1], digits=2, grouping=True) or '0.00' ]]</para>
6 </td>
7 </tr>
8+ <tr>
9+ <td>
10+ <para style="sub_titulo" alignment="right">*** Total importe Bs.S</para>
11+ </td>
12+ <td>
13+ <para style="sub_titulo" alignment="right">[[ formatLang(c[1]/1000, digits=2, grouping=True) or '0.00' ]]</para>
14+ </td>
15+ <td>
16+ <para style="sub_titulo" alignment="right">[[ formatLang(c[1]/1000, digits=2, grouping=True) or '0.00' ]]</para>
17+ </td>
18+ </tr>
19 </blockTable>
20
21 </section>
22
23=== modified file 'sisb_purchase_management/report/compra.rml'
24--- sisb_purchase_management/report/compra.rml 2016-10-04 15:35:50 +0000
25+++ sisb_purchase_management/report/compra.rml 2018-05-03 15:37:51 +0000
26@@ -681,10 +681,28 @@
27 </para>
28 </td>
29 <td>
30- <para style="estilo3">Total :</para>
31- </td>
32- <td>
33- <para style="estilo3" alignment="RIGHT">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') ) or '0' ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
34+ <para style="estilo3">Total Bs:</para>
35+ </td>
36+ <td>
37+ <para style="estilo3" alignment="RIGHT">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') ) or '0' ]] [[ o.pricelist_id.currency_id. ]]</para>
38+ </td>
39+ </tr>
40+ <tr>
41+ <td>
42+ <para style="estilo3">
43+ <font color="white" />
44+ </para>
45+ </td>
46+ <td>
47+ <para style="estilo3">
48+ <font color="white" />
49+ </para>
50+ </td>
51+ <td>
52+ <para style="estilo3">*** Total Bs.S:</para>
53+ </td>
54+ <td>
55+ <para style="estilo3" alignment="RIGHT">[[ formatLang(o.amount_total/1000, digits=get_digits(dp='Purchase Price') ) or '0' ]] [[ o.pricelist_id.currency_id. ]]</para>
56 </td>
57 </tr>
58 </blockTable>
59@@ -749,7 +767,7 @@
60 </td>
61 <td>
62 <para style="estilo6">Aprobación</para>
63- <para style="estilo6">Gerente General</para>
64+ <para style="estilo6">Presidente</para>
65 </td>
66 </tr>
67 <tr>
68@@ -831,7 +849,7 @@
69 <para style="estilo2" alignment="JUSTIFY">Firma y Sello</para>
70 </td>
71 <td>
72- <para style="estilo2" alignment="JUSTIFY">Gerente General</para>
73+ <para style="estilo2" alignment="JUSTIFY">Presidente</para>
74 <spacer length="0.2cm"/>
75 <para style="estilo2" alignment="JUSTIFY">Empresa</para>
76 <spacer length="0.2cm"/>
77
78=== modified file 'sisb_ventas/report/invoice.rml'
79--- sisb_ventas/report/invoice.rml 2018-02-07 18:28:48 +0000
80+++ sisb_ventas/report/invoice.rml 2018-05-03 15:37:51 +0000
81@@ -56,10 +56,10 @@
82 <blockTopPadding value="0.2" />
83 </blockTableStyle>
84 <paraStyle name="normal_dir" fontName="Helvetica" fontSize="8"/>
85- <paraStyle name="normal" fontName="Helvetica" fontSize="9"/>
86- <paraStyle name="lines" fontName="Helvetica" fontSize="9"/>
87+ <paraStyle name="normal" fontName="Helvetica" fontSize="7"/>
88+ <paraStyle name="lines" fontName="Helvetica" fontSize="7"/>
89 <paraStyle name="bold_dir" fontName="Helvetica-Bold" fontSize="8"/>
90- <paraStyle name="bold" fontName="Helvetica-Bold" fontSize="9"/>
91+ <paraStyle name="bold" fontName="Helvetica-Bold" fontSize="7"/>
92 <blockTableStyle id="firmas">
93 <blockAlignment value="LEFT"/>
94 <blockValign value="TOP"/>
95@@ -248,6 +248,12 @@
96 <td><para style="bold" alignment="right">Total a Pagar:</para></td>
97 <td><para style="bold" alignment="right">[[ formatLang(o.amount_total, dp='Account') ]]</para></td>
98 </tr>
99+ <tr>
100+ <td><para style="bold"></para></td>
101+ <td><para style="bold"></para></td>
102+ <td><para style="bold" alignment="right">*** Bs.S:</para></td>
103+ <td><para style="bold" alignment="right">[[ formatLang(o.amount_total/1000, dp='Account') ]]</para></td>
104+ </tr>
105 </blockTable>
106 <section>
107 <blockTable colWidths="20cm" style="table1">

Subscribers

People subscribed via source and target branches