Account - Financial Report

Merge lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh into lp:~account-report-core-editor/account-financial-report/7.0

  1. 7.0-add-reference-field-mdh
  2. Merge into 7.0
Proposed by Matthieu Dietrich @ camptocamp
Status: Merged
Merged at revision: 88
Proposed branch: lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh
Merge into: lp:~account-report-core-editor/account-financial-report/7.0
Diff against target: 273 lines (+53/-31)
4 files modified
account_financial_report_webkit/report/templates/account_report_general_ledger.mako (+17/-7)
account_financial_report_webkit/report/templates/account_report_partners_ledger.mako (+14/-6)
account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html (+11/-9)
account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html (+11/-9)
To merge this branch: bzr merge lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Frederic Clementi - Camptocamp functional Approve
Leonardo Pistone code review Approve
Review via email: mp+214897@code.launchpad.net

Commit message

[FIX] total lines in open invoices now correctly aligned
[IMP] reference field added to general & partner ledger

Description of the change

The last addition of the reference field to the "Open Invoices" report created a shift to the left for total lines; it's now corrected ,and I also added the field to General & Partner ledgers (requirement from one of our customers).

To post a comment you must log in.
Revision history for this message
Leonardo Pistone (lepistone) wrote :

ok thanks

review: Approve (code review)
lp:~camptocamp/account-financial-report/7.0-add-reference-field-mdh updated
87. By Matthieu Dietrich @ camptocamp

[FIX] realign header

Revision history for this message
Frederic Clementi - Camptocamp (frederic-clementi) :
review: Approve (functional)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_financial_report_webkit/report/templates/account_report_general_ledger.mako'
2--- account_financial_report_webkit/report/templates/account_report_general_ledger.mako 2013-11-21 15:55:29 +0000
3+++ account_financial_report_webkit/report/templates/account_report_general_ledger.mako 2014-04-11 08:57:03 +0000
4@@ -23,7 +23,11 @@
5 initial_balance_text = {'initial_balance': _('Computed'), 'opening_balance': _('Opening Entries'), False: _('No')}
6 %>
7
8- <div class="act_as_table data_table">
9+ %if amount_currency(data):
10+ <div class="act_as_table data_table" style="width: 1205px;">
11+ %else:
12+ <div class="act_as_table data_table" style="width: 1100px;">
13+ %endif
14 <div class="act_as_row labels">
15 <div class="act_as_cell">${_('Chart of Account')}</div>
16 <div class="act_as_cell">${_('Fiscal Year')}</div>
17@@ -82,7 +86,7 @@
18 cumul_balance_curr = 0.0
19 %>
20 <div class="act_as_table list_table" style="margin-top: 10px;">
21-
22+
23 <div class="act_as_caption account_title">
24 ${account.code} - ${account.name}
25 </div>
26@@ -93,15 +97,17 @@
27 ## period
28 <div class="act_as_cell" style="width: 50px;">${_('Period')}</div>
29 ## move
30- <div class="act_as_cell" style="width: 60px;">${_('Entry')}</div>
31+ <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
32 ## journal
33 <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
34 ## account code
35 <div class="act_as_cell" style="width: 65px;">${_('Account')}</div>
36 ## partner
37- <div class="act_as_cell" style="width: 120px;">${_('Partner')}</div>
38+ <div class="act_as_cell" style="width: 140px;">${_('Partner')}</div>
39+ ## move reference
40+ <div class="act_as_cell" style="width: 140px;">${_('Reference')}</div>
41 ## label
42- <div class="act_as_cell" style="width: 200px;">${_('Label')}</div>
43+ <div class="act_as_cell" style="width: 160px;">${_('Label')}</div>
44 ## counterpart
45 <div class="act_as_cell" style="width: 100px;">${_('Counter part')}</div>
46 ## debit
47@@ -140,6 +146,8 @@
48 <div class="act_as_cell"></div>
49 ## partner
50 <div class="act_as_cell"></div>
51+ ## move reference
52+ <div class="act_as_cell"></div>
53 ## label
54 <div class="act_as_cell">${_('Initial Balance')}</div>
55 ## counterpart
56@@ -184,6 +192,8 @@
57 <div class="act_as_cell">${account.code}</div>
58 ## partner
59 <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
60+ ## move reference
61+ <div class="act_as_cell">${line.get('lref') or ''}</div>
62 ## label
63 <div class="act_as_cell">${label}</div>
64 ## counterpart
65@@ -206,8 +216,8 @@
66 <div class="act_as_table list_table">
67 <div class="act_as_row labels" style="font-weight: bold;">
68 ## date
69- <div class="act_as_cell first_column" style="width: 350px;">${account.code} - ${account.name}</div>
70- <div class="act_as_cell" style="width: 365px;">${_("Cumulated Balance on Account")}</div>
71+ <div class="act_as_cell first_column" style="width: 615px;">${account.code} - ${account.name}</div>
72+ <div class="act_as_cell" style="width: 260px;">${_("Cumulated Balance on Account")}</div>
73 ## debit
74 <div class="act_as_cell amount" style="width: 75px;">${ formatLang(cumul_debit) | amount }</div>
75 ## credit
76
77=== modified file 'account_financial_report_webkit/report/templates/account_report_partners_ledger.mako'
78--- account_financial_report_webkit/report/templates/account_report_partners_ledger.mako 2013-11-21 15:55:29 +0000
79+++ account_financial_report_webkit/report/templates/account_report_partners_ledger.mako 2014-04-11 08:57:03 +0000
80@@ -67,7 +67,7 @@
81 <div class="act_as_cell">${ initial_balance_text[initial_balance_mode] }</div>
82 </div>
83 </div>
84-
85+
86 %for account in objects:
87 %if account.ledger_lines or account.init_balance:
88 <%
89@@ -102,13 +102,15 @@
90 ## period
91 <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
92 ## move
93- <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
94+ <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
95 ## journal
96 <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
97 ## partner
98- <div class="act_as_cell" style="width: 60px;">${_('Partner')}</div>
99+ <div class="act_as_cell" style="width: 100px;">${_('Partner')}</div>
100+ ## move reference
101+ <div class="act_as_cell" style="width: 60px;">${_('Reference')}</div>
102 ## label
103- <div class="act_as_cell" style="width: 310px;">${_('Label')}</div>
104+ <div class="act_as_cell" style="width: 280px;">${_('Label')}</div>
105 ## reconcile
106 <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
107 ## debit
108@@ -150,6 +152,8 @@
109 <div class="act_as_cell"></div>
110 ## partner
111 <div class="act_as_cell"></div>
112+ ## move reference
113+ <div class="act_as_cell"></div>
114 ## label
115 <div class="act_as_cell" >${_('Initial Balance')}</div>
116 ## reconcile
117@@ -191,6 +195,8 @@
118 <div class="act_as_cell">${line.get('jcode') or ''}</div>
119 ## partner
120 <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
121+ ## move reference
122+ <div class="act_as_cell">${line.get('lref') or ''}</div>
123 ## label
124 <div class="act_as_cell">${label}</div>
125 ## reconcile
126@@ -221,6 +227,8 @@
127 <div class="act_as_cell"></div>
128 ## partner
129 <div class="act_as_cell"></div>
130+ ## move reference
131+ <div class="act_as_cell"></div>
132 ## label
133 <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
134 ## reconcile
135@@ -254,9 +262,9 @@
136
137 <div class="act_as_table list_table" style="margin-top:5px;">
138 <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
139- <div class="act_as_cell first_column" style="width: 320px;">${account.code} - ${account.name}</div>
140+ <div class="act_as_cell first_column" style="width: 450px;">${account.code} - ${account.name}</div>
141 ## label
142- <div class="act_as_cell" style="width: 390px;">${_("Cumulated Balance on Account")}</div>
143+ <div class="act_as_cell" style="width: 360px;">${_("Cumulated Balance on Account")}</div>
144 ## debit
145 <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
146 ## credit
147
148=== modified file 'account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html'
149--- account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html 2014-02-05 11:53:47 +0000
150+++ account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html 2014-04-11 08:57:03 +0000
151@@ -10,8 +10,8 @@
152 %for partner_name, p_id, p_ref, p_name in account.partners_order:
153 <div class="account_title bg" style="width: 1080px; margin-top:
154 20px; font-size: 12px;">${account.code} - ${account.name} -- ${partner_name or _('No Partner')} </div>
155-
156-
157+
158+
159
160 %for curr, grouped_lines in account.grouped_ledger_lines.get(p_id, []):
161 <%
162@@ -21,7 +21,7 @@
163 cumul_balance_curr = 0.0
164
165 part_cumul_balance = 0.0
166- part_cumul_balance_curr = 0.0
167+ part_cumul_balance_curr = 0.0
168 %>
169 <div class="act_as_table list_table" style="margin-top: 5px;">
170 <div class="act_as_caption account_title">
171@@ -34,13 +34,13 @@
172 ## period
173 <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
174 ## move
175- <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
176+ <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
177 ## journal
178- <div class="act_as_cell" style="width: 50px;">${_('Journal')}</div>
179+ <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
180 ## move reference
181- <div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div>
182+ <div class="act_as_cell" style="width: 100px;">${_('Reference')}</div>
183 ## label
184- <div class="act_as_cell" style="width: 200px;">${_('Label')}</div>
185+ <div class="act_as_cell" style="width: 180px;">${_('Label')}</div>
186 ## reconcile
187 <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
188 ## maturity
189@@ -115,6 +115,8 @@
190 <div class="act_as_cell"></div>
191 ## journal
192 <div class="act_as_cell"></div>
193+ ## move reference
194+ <div class="act_as_cell"></div>
195 ## label
196 <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
197 ## reconcile
198@@ -148,9 +150,9 @@
199 %endfor
200 <div class="act_as_table list_table" style="margin-top:5px;">
201 <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
202- <div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div>
203+ <div class="act_as_cell first_column" style="width: 450px;">${account.code} - ${account.name}</div>
204 ## label
205- <div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div>
206+ <div class="act_as_cell" style="width: 320px;">${_("Cumulated Balance on Account")}</div>
207 ## debit
208 <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
209 ## credit
210
211=== modified file 'account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html'
212--- account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html 2014-02-05 11:53:47 +0000
213+++ account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html 2014-04-11 08:57:03 +0000
214@@ -9,7 +9,7 @@
215 %>
216
217 <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div>
218-
219+
220 %for partner_name, p_id, p_ref, p_name in account.partners_order:
221 <%
222 total_debit = 0.0
223@@ -18,7 +18,7 @@
224 cumul_balance_curr = 0.0
225
226 part_cumul_balance = 0.0
227- part_cumul_balance_curr = 0.0
228+ part_cumul_balance_curr = 0.0
229 %>
230 <div class="act_as_table list_table" style="margin-top: 5px;">
231 <div class="act_as_caption account_title">
232@@ -31,15 +31,15 @@
233 ## period
234 <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
235 ## move
236- <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
237+ <div class="act_as_cell" style="width: 100px;">${_('Entry')}</div>
238 ## journal
239- <div class="act_as_cell" style="width: 50px;">${_('Journal')}</div>
240+ <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
241 ## partner
242- <div class="act_as_cell" style="width: 60px;">${_('Partner')}</div>
243+ <div class="act_as_cell" style="width: 120px;">${_('Partner')}</div>
244 ## move reference
245- <div class="act_as_cell" style="width: 75px;">${_('Ref.')}</div>
246+ <div class="act_as_cell" style="width: 100px;">${_('Reference')}</div>
247 ## label
248- <div class="act_as_cell" style="width: 255px;">${_('Label')}</div>
249+ <div class="act_as_cell" style="width: 180px;">${_('Label')}</div>
250 ## reconcile
251 <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
252 ## maturity
253@@ -122,6 +122,8 @@
254 <div class="act_as_cell"></div>
255 ## partner
256 <div class="act_as_cell"></div>
257+ ## move reference
258+ <div class="act_as_cell"></div>
259 ## label
260 <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
261 ## reconcile
262@@ -156,9 +158,9 @@
263 %endfor
264 <div class="act_as_table list_table" style="margin-top:5px;">
265 <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
266- <div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div>
267+ <div class="act_as_cell first_column" style="width: 520px;">${account.code} - ${account.name}</div>
268 ## label
269- <div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div>
270+ <div class="act_as_cell" style="width: 320px;">${_("Cumulated Balance on Account")}</div>
271 ## debit
272 <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
273 ## credit

Subscribers

People subscribed via source and target branches

to status/vote changes: