Merge lp:~cv.clearcorp/openerp-costa-rica/7.0-fix_detail_reports into lp:openerp-costa-rica

Proposed by Carlos Vásquez (ClearCorp) on 2014-05-12
Status: Merged
Merged at revision: 284
Proposed branch: lp:~cv.clearcorp/openerp-costa-rica/7.0-fix_detail_reports
Merge into: lp:openerp-costa-rica
Diff against target: 116 lines (+29/-10)
7 files modified
l10n_cr_account_conciliation_bank_report/report_menus.xml (+5/-2)
l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.xml (+4/-3)
l10n_cr_account_profit_statement_report/__openerp__.py (+6/-3)
l10n_cr_account_profit_statement_report/wizard/l10n_cr_account_profit_statement_wizard_view.xml (+3/-0)
l10n_cr_account_situation_balance_report/wizard/l10n_cr_account_situation_balance_wizard_view.xml (+4/-1)
l10n_cr_account_statement_change_equity_report/wizard/l10n_cr_account_statement_change_equity_wizard_view.xml (+4/-1)
l10n_cr_account_trial_balance_report/wizard/l10n_cr_account_trial_balance_wizard_view.xml (+3/-0)
To merge this branch: bzr merge lp:~cv.clearcorp/openerp-costa-rica/7.0-fix_detail_reports
Reviewer Review Type Date Requested Status
ClearCorp drivers 2014-05-12 Pending
Review via email: mp+219257@code.launchpad.net

Description of the change

[FIX] Fix wizard in some reports. Remove option "Partners" when it is not necessary
[FIX] Fix menus for bank reports

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 'l10n_cr_account_conciliation_bank_report/report_menus.xml'
2--- l10n_cr_account_conciliation_bank_report/report_menus.xml 2014-02-20 21:56:32 +0000
3+++ l10n_cr_account_conciliation_bank_report/report_menus.xml 2014-05-12 19:44:23 +0000
4@@ -1,7 +1,10 @@
5 <?xml version="1.0" encoding="utf-8"?>
6 <openerp>
7 <data>
8- <menuitem id="menu_bank_reports" name="Banks" parent="account.menu_finance_generic_reporting" sequence="43"/>
9- <menuitem action="action_conciliation_bank_report_menu_webkit" id="menu_action_conciliation_bank_report" parent="menu_bank_reports"/>
10+ <menuitem
11+ action="action_conciliation_bank_report_menu_webkit"
12+ id="menu_action_conciliation_bank_report"
13+ parent="account_report_lib.menu_bank_reports"
14+ groups="account.group_account_manager,account.group_account_user" />
15 </data>
16 </openerp>
17
18=== modified file 'l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.xml'
19--- l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.xml 2013-12-09 20:11:46 +0000
20+++ l10n_cr_account_conciliation_bank_report/wizard/l10n_cr_account_conciliation_bank_report_wizard.xml 2014-05-12 19:44:23 +0000
21@@ -62,11 +62,12 @@
22 <field name="date_to" position="attributes">
23 <attribute name="attrs">{'required': [('filter', '=', 'filter_date')]}</attribute>
24 </field>
25-
26+ <group string="Partners" position="attributes">
27+ <attribute name="attrs">{'invisible': True}</attribute>
28+ </group>
29 <group string="Journals" position="attributes">
30 <attribute name="attrs">{'invisible': True, 'required':False}</attribute>
31- </group>
32-
33+ </group>
34 </data>
35 </field>
36 </record>
37
38=== modified file 'l10n_cr_account_profit_statement_report/__openerp__.py'
39--- l10n_cr_account_profit_statement_report/__openerp__.py 2014-02-20 21:56:32 +0000
40+++ l10n_cr_account_profit_statement_report/__openerp__.py 2014-05-12 19:44:23 +0000
41@@ -26,9 +26,12 @@
42 'author': 'CLEARCORP S.A.',
43 'category': 'Finance',
44 'description': """
45-Profit Statement Report:
46-==========================
47-Install the Profit Statement Report
48+Install the Profit Statement Report.
49+=======================================
50+Configuration:
51+-----------------
52+ 1. Configure type account that it will appear in wizard. This configuration is in Accounting -> Account -> Account Types and check
53+ "Include in Profit Statement report" option.
54 """,
55 'website': "http://clearcorp.co.cr",
56 'depends': ['account_report_lib',],
57
58=== modified file 'l10n_cr_account_profit_statement_report/wizard/l10n_cr_account_profit_statement_wizard_view.xml'
59--- l10n_cr_account_profit_statement_report/wizard/l10n_cr_account_profit_statement_wizard_view.xml 2014-01-27 22:38:18 +0000
60+++ l10n_cr_account_profit_statement_report/wizard/l10n_cr_account_profit_statement_wizard_view.xml 2014-05-12 19:44:23 +0000
61@@ -54,6 +54,9 @@
62 <field name="account_base_report" position="after">
63 <field name="base_compare_account" required="True" domain="[('user_type.include_profit_statement_report','=', True),('type','=','view')]"/>
64 </field>
65+ <group string="Partners" position="attributes">
66+ <attribute name="attrs">{'invisible': True}</attribute>
67+ </group>
68 </data>
69 </field>
70 </record>
71
72=== modified file 'l10n_cr_account_situation_balance_report/wizard/l10n_cr_account_situation_balance_wizard_view.xml'
73--- l10n_cr_account_situation_balance_report/wizard/l10n_cr_account_situation_balance_wizard_view.xml 2014-01-27 22:38:18 +0000
74+++ l10n_cr_account_situation_balance_report/wizard/l10n_cr_account_situation_balance_wizard_view.xml 2014-05-12 19:44:23 +0000
75@@ -52,7 +52,10 @@
76 <group string="Accounts" position="attributes">
77 <attribute name="attrs">{'invisible': True}</attribute>
78 </group>
79-
80+
81+ <group string="Partners" position="attributes">
82+ <attribute name="attrs">{'invisible': True}</attribute>
83+ </group>
84 </data>
85 </field>
86 </record>
87
88=== modified file 'l10n_cr_account_statement_change_equity_report/wizard/l10n_cr_account_statement_change_equity_wizard_view.xml'
89--- l10n_cr_account_statement_change_equity_report/wizard/l10n_cr_account_statement_change_equity_wizard_view.xml 2013-12-09 20:11:46 +0000
90+++ l10n_cr_account_statement_change_equity_report/wizard/l10n_cr_account_statement_change_equity_wizard_view.xml 2014-05-12 19:44:23 +0000
91@@ -49,7 +49,10 @@
92 <field name="account_base_report" position="attributes">
93 <attribute name="attrs">{'required':True}</attribute>
94 <attribute name="domain">[('type', '=', 'sum'),('account_type.code','=','STCHEQ')]</attribute>
95- </field>
96+ </field>
97+ <group string="Partners" position="attributes">
98+ <attribute name="attrs">{'invisible': True}</attribute>
99+ </group>
100 </data>
101 </field>
102 </record>
103
104=== modified file 'l10n_cr_account_trial_balance_report/wizard/l10n_cr_account_trial_balance_wizard_view.xml'
105--- l10n_cr_account_trial_balance_report/wizard/l10n_cr_account_trial_balance_wizard_view.xml 2013-12-09 20:11:46 +0000
106+++ l10n_cr_account_trial_balance_report/wizard/l10n_cr_account_trial_balance_wizard_view.xml 2014-05-12 19:44:23 +0000
107@@ -57,6 +57,9 @@
108 <attribute name="domain">[('type', '=', 'sum'),('account_type.code','=','TRIBAL')]</attribute>
109 </field>
110
111+ <group string="Partners" position="attributes">
112+ <attribute name="attrs">{'invisible': True}</attribute>
113+ </group>
114 </data>
115 </field>
116 </record>

Subscribers

People subscribed via source and target branches