Account - Financial Report

Merge lp:~vauxoo/account-financial-report/luiseev-gen-acc-balance-2-4cln into lp:~vauxoo/account-financial-report/trunk

  1. luiseev-gen-acc-balance-2-4cln
  2. Merge into trunk
Proposed by Luis Escobar V. (Vauxoo)
Status: Merged
Merged at revision: 7
Proposed branch: lp:~vauxoo/account-financial-report/luiseev-gen-acc-balance-2-4cln
Merge into: lp:~vauxoo/account-financial-report/trunk
Diff against target: 146 lines (+44/-10)
8 files modified
account_financial_report/__openerp__.py (+1/-0)
account_financial_report/report/account_balance_2_cols.py (+2/-1)
account_financial_report/report/account_balance_4_cols.py (+2/-1)
account_financial_report/report/balance_full_2_cols.rml (+5/-1)
account_financial_report/report/balance_full_4_cols.rml (+9/-5)
account_financial_report/view/account_view.xml (+23/-0)
account_financial_report/wizard/wizard_account_balance_2_report.py (+1/-1)
account_financial_report/wizard/wizard_account_balance_4_report.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/account-financial-report/luiseev-gen-acc-balance-2-4cln
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+92375@code.launchpad.net

Description of the change

[IMP] Added parent_id in search view.
[FIX] Added 'Libro Mayor Legal' in General Account Balance Four Columns.
[FIX] Optimized Credit and Balance column in General Account Balance Four Columns.
[FIX] Added 'Diario Legal' in General Account Balance two Columns.

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Merge Ejecutado exitosamente.

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/__openerp__.py'
2--- account_financial_report/__openerp__.py 2012-01-02 20:45:52 +0000
3+++ account_financial_report/__openerp__.py 2012-02-09 21:36:21 +0000
4@@ -38,6 +38,7 @@
5 "update_xml" : [
6 "wizard/wizard_report_report.xml" ,
7 "wizard/account_report_wizard.xml" ,
8+ "view/account_view.xml",
9 ] ,
10 "active": False ,
11 "installable": True
12
13=== modified file 'account_financial_report/report/account_balance_2_cols.py'
14--- account_financial_report/report/account_balance_2_cols.py 2012-01-20 23:34:50 +0000
15+++ account_financial_report/report/account_balance_2_cols.py 2012-02-09 21:36:21 +0000
16@@ -79,7 +79,8 @@
17 inf_type = {
18 'bgen' : ' Balance General',
19 'bcom' : ' Balance de Comprobacion',
20- 'edogp': 'Estado de Ganancias y Perdidas'
21+ 'edogp': 'Estado de Ganancias y Perdidas',
22+ 'bdl' : 'Diario Legal'
23 }
24 return inf_type[form['inf_type']]
25
26
27=== modified file 'account_financial_report/report/account_balance_4_cols.py'
28--- account_financial_report/report/account_balance_4_cols.py 2012-01-20 23:34:50 +0000
29+++ account_financial_report/report/account_balance_4_cols.py 2012-02-09 21:36:21 +0000
30@@ -79,7 +79,8 @@
31 inf_type = {
32 'bgen' : ' Balance General',
33 'bcom' : ' Balance de Comprobacion',
34- 'edogp': 'Estado de Ganancias y Perdidas'
35+ 'edogp': 'Estado de Ganancias y Perdidas',
36+ 'bml': 'Libro Mayor Legal'
37 }
38 return inf_type[form['inf_type']]
39
40
41=== modified file 'account_financial_report/report/balance_full_2_cols.rml'
42--- account_financial_report/report/balance_full_2_cols.rml 2012-01-20 23:34:50 +0000
43+++ account_financial_report/report/balance_full_2_cols.rml 2012-02-09 21:36:21 +0000
44@@ -16,7 +16,11 @@
45 </tr>
46 <tr>
47 <td><para style="TOP_TITLE"></para></td>
48- <td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]][[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']]</para></td>
49+ <td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]]</para></td>
50+ </tr>
51+ <tr>
52+ <td><para style="TOP_TITLE"></para></td>
53+ <td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']]</para></td>
54 </tr>
55 <tr>
56 <td><para style="TOP_TITLE"></para></td>
57
58=== modified file 'account_financial_report/report/balance_full_4_cols.rml'
59--- account_financial_report/report/balance_full_4_cols.rml 2012-01-20 23:34:50 +0000
60+++ account_financial_report/report/balance_full_4_cols.rml 2012-02-09 21:36:21 +0000
61@@ -22,7 +22,11 @@
62 </tr>
63 <tr>
64 <td><para style="TOP_TITLE"></para></td>
65- <td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]][[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']]</para></td>
66+ <td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]]</para></td>
67+ </tr>
68+ <tr>
69+ <td><para style="TOP_TITLE"></para></td>
70+ <td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']]</para></td>
71 </tr>
72 <tr>
73 <td><para style="TOP_TITLE"></para></td>
74@@ -65,14 +69,14 @@
75 <paraStyle
76 name="TITLE_LEFT_ALIGN"
77 fontName="Helvetica-Bold"
78- fontSize="8.0"
79+ fontSize="6.0"
80 leading="10"
81 alignment="RIGHT"
82 spaceBefore="0.0"
83 spaceAfter="0.0"/>
84- <paraStyle name="TOP_TITLE" fontName="Helvetica-Bold" fontSize="9" leftIndent="0.0" alignment="LEFT"/>
85- <paraStyle name="TITLES" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
86- <paraStyle name="TITLE_CENTER" fontName="Helvetica-Bold" fontSize="9" leading="10" leftIndent="0.0" alignment="CENTER"/>
87+ <paraStyle name="TOP_TITLE" fontName="Helvetica-Bold" fontSize="7" leftIndent="0.0" alignment="LEFT"/>
88+ <paraStyle name="TITLES" fontName="Helvetica-Bold" fontSize="6.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
89+ <paraStyle name="TITLE_CENTER" fontName="Helvetica-Bold" fontSize="7" leading="10" leftIndent="0.0" alignment="CENTER"/>
90 <paraStyle name="TITLE_CENTER_NAME" fontName="Helvetica-Bold" fontSize="12" leading="13" leftIndent="0.0" alignment="CENTER"/>
91 <paraStyle name="TITLE" alignment="CENTER" fontName="Helvetica" fontSize="18.0" leading="20" spaceBefore="-3.0" textColor="black"/>
92 </stylesheet>
93
94=== added directory 'account_financial_report/view'
95=== added file 'account_financial_report/view/account_view.xml'
96--- account_financial_report/view/account_view.xml 1970-01-01 00:00:00 +0000
97+++ account_financial_report/view/account_view.xml 2012-02-09 21:36:21 +0000
98@@ -0,0 +1,23 @@
99+<?xml version="1.0" encoding="utf-8"?>
100+<openerp>
101+ <data>
102+ <!--
103+ =====================================================
104+ Vista para agregar ala vista en lista de la lista de
105+ cuentas contables el campo padre.
106+ =====================================================
107+ -->
108+ <record id="view_account_search_padre" model="ir.ui.view">
109+ <field name="name">account.account.search.padre</field>
110+ <field name="model">account.account</field>
111+ <field name="type">search</field>
112+ <field name="inherit_id" ref="account.view_account_search"/>
113+ <field name="arch" type="xml">
114+ <xpath expr="/search/group/field[@name='code']" position="after">
115+ <field name="parent_id"/>
116+ </xpath>
117+ </field>
118+ </record>
119+
120+ </data>
121+</openerp>
122
123=== modified file 'account_financial_report/wizard/wizard_account_balance_2_report.py'
124--- account_financial_report/wizard/wizard_account_balance_2_report.py 2012-01-20 23:34:50 +0000
125+++ account_financial_report/wizard/wizard_account_balance_2_report.py 2012-02-09 21:36:21 +0000
126@@ -45,7 +45,7 @@
127 'date_to': fields.date('End date'),
128 'tot_check': fields.boolean('Show Total'),
129 'lab_str': fields.char('Description', size= 128),
130- 'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas')],'Tipo Informe',required=True),
131+ 'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas'),('bdl','Diario Legal')],'Tipo Informe',required=True),
132 #~ 'type_report': fields.selection([('un_col','Una Columna'),('dos_col','Dos Columnas'),('cuatro_col','Cuatro Columnas')],'Tipo Informe',required=True),
133 }
134
135
136=== modified file 'account_financial_report/wizard/wizard_account_balance_4_report.py'
137--- account_financial_report/wizard/wizard_account_balance_4_report.py 2012-01-20 23:34:50 +0000
138+++ account_financial_report/wizard/wizard_account_balance_4_report.py 2012-02-09 21:36:21 +0000
139@@ -45,7 +45,7 @@
140 'date_to': fields.date('End date'),
141 'tot_check': fields.boolean('Show Total'),
142 'lab_str': fields.char('Description', size= 128),
143- 'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas')],'Tipo Informe',required=True),
144+ 'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas'),('bml','Libro Mayor Legal')],'Tipo Informe',required=True),
145 #~ 'type_report': fields.selection([('un_col','Una Columna'),('dos_col','Dos Columnas'),('cuatro_col','Cuatro Columnas')],'Tipo Informe',required=True),
146 }
147

Subscribers

People subscribed via source and target branches

to all changes: