← Back to branch summary

~luc-demeyer/openobject-addons/7.0-account_financial_report_webkit-fixes

« back to all changes in this revision

Viewing changes to account_financial_report/wizard/account_report_wizard.xml

  • Committer: Gabriela (Vauxoo)
  • Date: 2012-01-20 23:53:06 UTC
  • mfrom: (5.1.2 miguel-bug-918857)
  • Revision ID: gabrielaquilarque97@gmail.com-20120120235306-jwp7ck633wj32lz7
https://launchpad.net/bugs/918857

[MERGE] Merge from lp:~vauxoo/account-financial-report/miguel-bug-918857.

Show diffs side-by-side

added added

removed removed

Lines of Context:
account_financial_report/wizard/account_report_wizard.xml
22
22
                        <separator string="Period" colspan="4"/>
23
23
                        <field name="fiscalyear"/>
24
24
                        <newline/>
25
 
                        <field name="state" required="True"/>
 
25
                        <field name="filter" required="True"/>
26
26
                        <newline/>
27
27
 
28
 
                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
29
 
                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
 
28
                        <group attrs="{'invisible':[('filter','=','none')]}" colspan="4">
 
29
                            <group attrs="{'invisible':[('filter','=','byperiod')]}" colspan="4">
30
30
                                <separator string="Date Filter" colspan="4"/>
31
31
                                <field name="date_from"/>
32
32
                                <field name="date_to"/>
33
33
                            </group>
34
 
                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
 
34
                            <group attrs="{'invisible':[('filter','=','bydate')]}" colspan="4">
35
35
                                <separator string="Filter on Periods" colspan="4"/>
36
36
                                <field name="periods" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',fiscalyear)]"/>
37
37
                            </group>
87
87
                        <separator string="Period" colspan="4"/>
88
88
                        <field name="fiscalyear"/>
89
89
                        <newline/>
90
 
                        <field name="state" required="True"/>
 
90
                        <field name="filter" required="True"/>
91
91
                        <newline/>
92
 
                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
93
 
                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
 
92
                        <group attrs="{'invisible':[('filter','=','none')]}" colspan="4">
 
93
                            <group attrs="{'invisible':[('filter','=','byperiod')]}" colspan="4">
94
94
                                <separator string="Date Filter" colspan="4"/>
95
95
                                <field name="date_from"/>
96
96
                                <field name="date_to"/>
97
97
                            </group>
98
 
                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
 
98
                            <group attrs="{'invisible':[('filter','=','bydate')]}" colspan="4">
99
99
                                <separator string="Filter on Periods" colspan="4"/>
100
100
                                <field name="periods" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',fiscalyear)]"/>
101
101
                            </group>
149
149
                        <separator string="Period" colspan="4"/>
150
150
                        <field name="fiscalyear"/>
151
151
                        <newline/>
152
 
                        <field name="state" required="True"/>
 
152
                        <field name="filter" required="True"/>
153
153
                        <newline/>
154
 
                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
155
 
                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
 
154
                        <group attrs="{'invisible':[('filter','=','none')]}" colspan="4">
 
155
                            <group attrs="{'invisible':[('filter','=','byperiod')]}" colspan="4">
156
156
                                <separator string="Date Filter" colspan="4"/>
157
157
                                <field name="date_from"/>
158
158
                                <field name="date_to"/>
159
159
                            </group>
160
 
                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
 
160
                            <group attrs="{'invisible':[('filter','=','bydate')]}" colspan="4">
161
161
                                <separator string="Filter on Periods" colspan="4"/>
162
162
                                <field name="periods" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',fiscalyear)]"/>
163
163
                            </group>