unifield-wm

Merge lp:~unifield-team/unifield-wm/us-734 into lp:unifield-wm

  1. us-734
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2687
Proposed branch: lp:~unifield-team/unifield-wm/us-734
Merge into: lp:unifield-wm
Diff against target: 64 lines (+8/-8)
1 file modified
register_accounting/report/liquidity_position_pdf.rml (+8/-8)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-734
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+278701@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'register_accounting/report/liquidity_position_pdf.rml'
2--- register_accounting/report/liquidity_position_pdf.rml 2015-11-17 09:45:23 +0000
3+++ register_accounting/report/liquidity_position_pdf.rml 2015-11-26 13:28:54 +0000
4@@ -3,15 +3,15 @@
5 <docinit>
6 <color id="CMYK_YELLOW" CMYK="rgb(255,255,153)"/>
7 </docinit>
8- <template pageSize="(595.0,842.0)" title="liquidity_position" author="Medecins Sans Frontieres" allowSplitting="20">
9+ <template pageSize="(842.0,595.0)" title="liquidity_position" author="Medecins Sans Frontieres" allowSplitting="20">
10 <pageTemplate id="first">
11- <frame id="first" x1="42.0" y1="42.0" width="539" height="756" />
12+ <frame id="first" x1="42.0" y1="42.0" width="756" height="539" />
13 <pageGraphics>
14 <fill color="blue"/>
15 <image x="18mm" y="270mm" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
16 <setFont name="Helvetica" size="8"/>
17 <fill color="black"/>
18- <drawString x="285" y="10.0">Page <pageNumber /></drawString>
19+ <drawString x="20.0" y="10.0">Page : <pageNumber /></drawString>
20 </pageGraphics>
21 </pageTemplate>
22 </template>
23@@ -50,12 +50,12 @@
24 [[ repeatIn(getRegistersByType(), 'reg_type') ]]
25 <condPageBreak height="9cm"/>
26
27- <blockTable htmlSpans="1" style="table_header" colWidths="180mm">
28+ <blockTable htmlSpans="1" style="table_header" colWidths="256mm">
29 <tr>
30 <td><para style="center"><b>[[ reg_type.title() ]]</b></para></td>
31 </tr>
32 </blockTable>
33- <blockTable htmlSpans="1" style="table_header" colWidths="18mm,18mm,14mm,22mm,22mm,22mm,10mm,22mm,22mm,10mm">
34+ <blockTable htmlSpans="1" style="table_header" colWidths="36mm,36mm,14mm,30mm,30mm,30mm,10mm,30mm,30mm,10mm">
35 <tr>
36 <td><para style="text">Instance</para></td>
37 <td><para style="text">Journal Code - Journal Name</para></td>
38@@ -85,7 +85,7 @@
39
40 <section>
41 [[ repeatIn(getReg()[reg_type]['currency_amounts'], 'cur') ]]
42- <blockTable htmlSpans="1" style="table" colWidths="72mm,22mm,22mm,10mm,22mm,22mm,10mm">
43+ <blockTable htmlSpans="1" style="table" colWidths="116mm,30mm,30mm,10mm,30mm,30mm,10mm">
44 <tr>
45 <td><para style="right">Subtotal [[ str(cur) ]]</para></td>
46 <td><para style="right">[[ formatLang(getReg()[reg_type]['currency_amounts'][cur]['amount_calculated'], digits=2, grouping=True) or '0.00' ]]</para></td>
47@@ -98,7 +98,7 @@
48 </blockTable>
49 </section>
50
51- <blockTable htmlSpans="1" style="table_header" colWidths="126mm,22mm,22mm,10mm">
52+ <blockTable htmlSpans="1" style="table_header" colWidths="186mm,30mm,30mm,10mm">
53 <tr>
54 <td><para style="right"><b>Total [[ reg_type ]]</b></para></td>
55 <td><para style="right">[[ formatLang(getReg()[reg_type]['func_amount_calculated'], digits=2, grouping=True) or '0.00' ]]</para></td>
56@@ -109,7 +109,7 @@
57 <spacer length="24"/>
58 </section>
59
60- <blockTable htmlSpans="1" style="table_header" colWidths="126mm,22mm,22mm,10mm">
61+ <blockTable htmlSpans="1" style="table_header" colWidths="186mm,30mm,30mm,10mm">
62 <tr>
63 <td><para style="right"><b>Grand Total:</b></para></td>
64 <td><para style="right">[[ formatLang(getTotalReg(), digits=2, grouping=True) or '0.00' ]]</para></td>

Subscribers

People subscribed via source and target branches