Merge lp:~julie-w/unifield-server/US-4484 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5002
Proposed branch: lp:~julie-w/unifield-server/US-4484
Merge into: lp:unifield-server
Diff against target: 153 lines (+59/-59)
2 files modified
bin/addons/account/report/account_general_ledger_landscape.rml (+30/-30)
bin/addons/account/report/account_general_ledger_xls.mako (+29/-29)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4484
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349140@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 'bin/addons/account/report/account_general_ledger_landscape.rml'
2--- bin/addons/account/report/account_general_ledger_landscape.rml 2016-05-26 15:01:18 +0000
3+++ bin/addons/account/report/account_general_ledger_landscape.rml 2018-07-09 08:36:10 +0000
4@@ -329,6 +329,36 @@
5 </blockTable>
6
7 <section>
8+ <para style="terp_default_8">[[ repeatIn(o.get_currencies(), 'ccy') ]]</para>
9+ <blockTable colWidths="40.0,246.0,60.0,110.0,110.0,110.0,110.0" style="Table8_subtotal_ccy">
10+ [[ o.displayed or removeParentNode('blockTable') ]]
11+ <tr>
12+ <td>
13+ <para style="terp_default_9_Right">[[ o.code or '' ]]</para>
14+ </td>
15+ <td>
16+ <para style="terp_default_9_Right">Sub Total</para>
17+ </td>
18+ <td>
19+ <para style="terp_default_9_Right">[[ ccy ]]</para>
20+ </td>
21+ <td>
22+ <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['debit_ccy'], digits=get_digits(dp='Account')) ]]</para>
23+ </td>
24+ <td>
25+ <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['credit_ccy'], digits=get_digits(dp='Account')) ]]</para>
26+ </td>
27+ <td>
28+ <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['debit_ccy'] - o.data[ccy]['credit_ccy'], digits=get_digits(dp='Account')) ]]</para>
29+ </td>
30+ <td>
31+ <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['debit'] - o.data[ccy]['credit'], digits=get_digits(dp='Account')) ]]</para>
32+ </td>
33+ </tr>
34+ </blockTable>
35+ </section>
36+
37+ <section>
38 <para style="terp_default_8">[[ repeatIn(lines(o, initial_balance_mode=True), 'line') ]]</para>
39 <blockTable colWidths="40.0,246.0,60.0,110.0,110.0,110.0,110.0" style="Table9">
40 [[ o.displayed or removeParentNode('blockTable') ]]
41@@ -391,36 +421,6 @@
42 </blockTable>
43 </section>
44
45- <section>
46- <para style="terp_default_8">[[ repeatIn(o.get_currencies(), 'ccy') ]]</para>
47- <blockTable colWidths="40.0,246.0,60.0,110.0,110.0,110.0,110.0" style="Table8_subtotal_ccy">
48- [[ o.displayed or removeParentNode('blockTable') ]]
49- <tr>
50- <td>
51- <para style="terp_default_9_Right">[[ o.code or '' ]]</para>
52- </td>
53- <td>
54- <para style="terp_default_9_Right">Sub Total</para>
55- </td>
56- <td>
57- <para style="terp_default_9_Right">[[ ccy ]]</para>
58- </td>
59- <td>
60- <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['debit_ccy'], digits=get_digits(dp='Account')) ]]</para>
61- </td>
62- <td>
63- <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['credit_ccy'], digits=get_digits(dp='Account')) ]]</para>
64- </td>
65- <td>
66- <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['debit_ccy'] - o.data[ccy]['credit_ccy'], digits=get_digits(dp='Account')) ]]</para>
67- </td>
68- <td>
69- <para style="terp_default_9_Right">[[ formatLang(o.data[ccy]['debit'] - o.data[ccy]['credit'], digits=get_digits(dp='Account')) ]]</para>
70- </td>
71- </tr>
72- </blockTable>
73- </section>
74-
75 </section>
76
77 </story>
78
79=== modified file 'bin/addons/account/report/account_general_ledger_xls.mako'
80--- bin/addons/account/report/account_general_ledger_xls.mako 2016-05-26 15:01:18 +0000
81+++ bin/addons/account/report/account_general_ledger_xls.mako 2018-07-09 08:36:10 +0000
82@@ -294,6 +294,35 @@
83 </Row>
84 % endif
85
86+% if o.displayed:
87+% for ccy in o.get_currencies():
88+## subtotals line
89+<Row>
90+ <Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}">
91+ <Data ss:Type="String">${(o.code or '')|x}</Data>
92+ </Cell>
93+ <Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="2">
94+ <Data ss:Type="String">Sub Total</Data>
95+ </Cell>
96+ <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
97+ <Data ss:Type="String">${(ccy or '')|x}</Data>
98+ </Cell>
99+ <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
100+ <Data ss:Type="Number">${o.data[ccy]['debit_ccy']}</Data>
101+ </Cell>
102+ <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
103+ <Data ss:Type="Number">${o.data[ccy]['credit_ccy']}</Data>
104+ </Cell>
105+ <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
106+ <Data ss:Type="Number">${o.data[ccy]['debit_ccy'] - o.data[ccy]['credit_ccy']}</Data>
107+ </Cell>
108+ <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
109+ <Data ss:Type="Number">${o.data[ccy]['debit'] - o.data[ccy]['credit']}</Data>
110+ </Cell>
111+</Row>
112+% endfor
113+% endif
114+
115 % for line in lines(o, initial_balance_mode=True):
116 <Row>
117 <Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}">
118@@ -352,35 +381,6 @@
119 </Row>
120 % endfor
121
122-% if o.displayed:
123-% for ccy in o.get_currencies():
124-## subtotals line
125-<Row>
126-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}">
127- <Data ss:Type="String">${(o.code or '')|x}</Data>
128-</Cell>
129-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="2">
130- <Data ss:Type="String">Sub Total</Data>
131-</Cell>
132-<Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
133- <Data ss:Type="String">${(ccy or '')|x}</Data>
134-</Cell>
135-<Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
136- <Data ss:Type="Number">${o.data[ccy]['debit_ccy']}</Data>
137-</Cell>
138-<Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
139- <Data ss:Type="Number">${o.data[ccy]['credit_ccy']}</Data>
140-</Cell>
141-<Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
142- <Data ss:Type="Number">${o.data[ccy]['debit_ccy'] - o.data[ccy]['credit_ccy']}</Data>
143-</Cell>
144-<Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
145- <Data ss:Type="Number">${o.data[ccy]['debit'] - o.data[ccy]['credit']}</Data>
146-</Cell>
147-</Row>
148-% endfor
149-% endif
150-
151 % endfor
152 % endfor
153 </Table>

Subscribers

People subscribed via source and target branches