Merge lp:~vauxoo/account-financial-report/7.0-account_financial_report-rev-2232-kty into lp:~vauxoo/account-financial-report/vxafr

Proposed by Katherine Zaoral (Vauxoo) on 2014-09-19
Status: Merged
Merged at revision: 100
Proposed branch: lp:~vauxoo/account-financial-report/7.0-account_financial_report-rev-2232-kty
Merge into: lp:~vauxoo/account-financial-report/vxafr
Diff against target: 109 lines (+59/-0)
4 files modified
account_financial_report/report/balance_full_4_cols_analytic_ledger.rml (+52/-0)
account_financial_report/report/parser.py (+2/-0)
account_financial_report/view/wizard.xml (+1/-0)
account_financial_report/wizard/wizard.py (+4/-0)
To merge this branch: bzr merge lp:~vauxoo/account-financial-report/7.0-account_financial_report-rev-2232-kty
Reviewer Review Type Date Requested Status
Katherine Zaoral (Vauxoo) Approve on 2014-09-22
Review via email: mp+235325@code.launchpad.net

Description of the change

[MERGE] the account analytics lines are printed in the analytic ledger report of 4 columns.

To post a comment you must log in.
103. By Katherine Zaoral (Vauxoo) on 2014-09-19

[IMP] remove garbage data and only print the data that matters in the account
analytic lines. Also the amounts columns were fixed.

104. By Katherine Zaoral (Vauxoo) on 2014-09-19

[ADD] add new boolean field in the afr wizard model that will be use to set if
print or not print the analytic lines.

105. By Katherine Zaoral (Vauxoo) on 2014-09-19

[ADD] add new wizard booelan field that will determinate if the analytic lines
will be printed or no in the afr report.

106. By Katherine Zaoral (Vauxoo) on 2014-09-19

[CC] rename string of the field.

107. By Katherine Zaoral (Vauxoo) on 2014-09-19

[FIX] remove debug flag for AAL lines. No needed anymore.

108. By Katherine Zaoral (Vauxoo) on 2014-09-19

[ADD] modify the rml report to print or not the analytic account taking into
account the wizard parameter.

109. By Katherine Zaoral (Vauxoo) on 2014-09-19

[CC] remove spacer of the rml to better printing the report data lines.

some changes were made. waiting for runbot

runbot is green. I will proceed with the merge.

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/report/balance_full_4_cols_analytic_ledger.rml'
2--- account_financial_report/report/balance_full_4_cols_analytic_ledger.rml 2013-08-01 19:48:16 +0000
3+++ account_financial_report/report/balance_full_4_cols_analytic_ledger.rml 2014-09-22 14:31:50 +0000
4@@ -286,6 +286,58 @@
5 </td>
6 </tr>
7 </blockTable>
8+
9+ <section>
10+ <!-- TODO: add analytic lines here -->
11+ <para>[[ repeatIn([z for z in m['aml_brw'].analytic_lines if data['form']['print_analytic_lines']], 'y') ]]</para>
12+ <blockTable colWidths="2.25cm,2.0cm,7.75cm,2.5cm,4.0cm,2.5cm,2.5cm,2.5cm" style="BODY_LINE" repeatRows="1">
13+ <tr>
14+ <td>
15+ <para style="TITLES_NEW">
16+ </para>
17+ </td>
18+ <td>
19+ <para style="TITLES_NEW">
20+ </para>
21+ </td>
22+ <td>
23+ <para style="TITLES_NEW">
24+ <font>[[ y.name ]] [[ y.ref and (' - Ref %s'%y.ref) or '' ]] </font>
25+ </para>
26+ </td>
27+ <td>
28+ <para style="TITLES_NEW">
29+ <font>[[ y.percentage ]]</font>
30+ </para>
31+<!--
32+ <para style="TITLES_NEW">
33+ <font>[[ y['journal'] ]]</font>
34+ </para>
35+-->
36+ </td>
37+ <td>
38+ <para style="TITLES_NEW">
39+ </para>
40+ </td>
41+ <td>
42+ <para style="TITLE_LEFT_ALIGN">
43+ <font>[[ a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Courier"}) or removeParentNode('font') ]]</font>
44+ <font>[[ (a['total']==True) and y.amount &lt; 0.0 and formatLang(y.amount * -1, digits=2, grouping=True) or '']]</font>
45+ </para>
46+ </td>
47+ <td>
48+ <para style="TITLE_LEFT_ALIGN">
49+ <font>[[ a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Courier"}) or removeParentNode('font') ]]</font>
50+ <font>[[ (a['total']==True) and y.amount &gt;= 0.0 and formatLang(y.amount, digits=2, grouping=True) or '']]</font>
51+ </para>
52+ </td>
53+ <td>
54+ <para style="TITLE_LEFT_ALIGN">
55+ </para>
56+ </td>
57+ </tr>
58+ </blockTable>
59+ </section>
60 </section>
61 <spacer length="2.5mm"/>
62 </section>
63
64=== modified file 'account_financial_report/report/parser.py'
65--- account_financial_report/report/parser.py 2014-09-16 13:14:01 +0000
66+++ account_financial_report/report/parser.py 2014-09-22 14:31:50 +0000
67@@ -294,6 +294,7 @@
68 def _get_analytic_ledger(self, account, ctx=None):
69 ctx = ctx or {}
70 res = []
71+ aml_obj = self.pool.get('account.move.line')
72 if account['type'] in ('other', 'liquidity', 'receivable', 'payable'):
73 #~ TODO: CUANDO EL PERIODO ESTE VACIO LLENARLO CON LOS PERIODOS DEL EJERCICIO
74 #~ FISCAL, SIN LOS PERIODOS ESPECIALES
75@@ -338,6 +339,7 @@
76 'aa_id': det['aa_id'],
77 'cuenta': det['cuenta'],
78 'id': det['id'],
79+ 'aml_brw': aml_obj.browse(self.cr, self.uid, det['id'], context=ctx),
80 'date': det['date'],
81 'journal': det['diario'],
82 'title': u'\t\t{date:<15}\t\t{periodo:<12}\t\t{partner:<150}\t\t{asiento:<20}'.format(**det),
83
84=== modified file 'account_financial_report/view/wizard.xml'
85--- account_financial_report/view/wizard.xml 2014-08-08 17:25:45 +0000
86+++ account_financial_report/view/wizard.xml 2014-09-22 14:31:50 +0000
87@@ -48,6 +48,7 @@
88 <field name="partner_balance"
89 attrs="{'readonly':['|',('columns','!=','four'),('inf_type','!=','BS')],}"
90 />
91+ <field name="print_analytic_lines" attrs="{'readonly':[('analytic_ledger', '=', False)]}"/>
92 </group>
93 </group>
94 <group>
95
96=== modified file 'account_financial_report/wizard/wizard.py'
97--- account_financial_report/wizard/wizard.py 2014-08-13 03:08:15 +0000
98+++ account_financial_report/wizard/wizard.py 2014-09-22 14:31:50 +0000
99@@ -81,6 +81,10 @@
100 'Line Details',
101 help='Only applies in the way of the end balance multicurrency'
102 ' report is show.'),
103+ 'print_analytic_lines': fields.boolean('With Analytic Lines',
104+ help="If this checkbox is active will print the analytic lines in"
105+ " the analytic ledger four columns report. This option only"
106+ " applies when the analytic ledger is selected.")
107 }
108
109 _defaults = {

Subscribers

People subscribed via source and target branches

to all changes: