Ajay Chauhan(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-10clicks_accounting_report-cha into
lp:openobject-addons.
Requested reviews:
Divyesh Makwana(OpenERP) (mdi-openerp)
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10clicks_accounting_report-cha/+merge/133061
Hello,
I have changed the code to solve 'Accounting Reports' related issues of '10
first clicks accounting'.
Thanks,
Ajay Chauhan
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10clicks_accounting_report-cha/+merge/133061
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-10clicks_accounting_report-cha.
=== modified file 'account/wizard/account_financial_report_view.xml'
--- account/wizard/account_financial_report_view.xml 2012-08-08 10:59:07 +0000
+++ account/wizard/account_financial_report_view.xml 2012-11-08 06:14:19 +0000
@@ -14,15 +14,19 @@
</xpath>
<xpath expr="//notebook/page[@string='Filters']" position="after">
<page string="Comparison" attrs="{'invisible': [('enable_filter','=',False)]}">
- <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
- <field name="fiscalyear_id_cmp"/><newline/>
- <field name="filter_cmp"/>
- <separator string="Dates" colspan="4"/>
- <field name="date_from_cmp" attrs="{'readonly':[('filter_cmp', '!=', 'filter_date')], 'required':[('filter_cmp', '=', 'filter_date')]}" colspan="4"/>
- <field name="date_to_cmp" attrs="{'readonly':[('filter_cmp', '!=', 'filter_date')], 'required':[('filter_cmp', '=', 'filter_date')]}" colspan="4"/>
- <separator string="Periods" colspan="4"/>
- <field name="period_from_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'readonly':[('filter_cmp','!=','filter_period')], 'required':[('filter_cmp', '=', 'filter_period')]}" colspan="4"/>
- <field name="period_to_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'readonly':[('filter_cmp','!=','filter_period')], 'required':[('filter_cmp', '=', 'filter_period')]}" colspan="4"/>
+ <group>
+ <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
+ <field name="fiscalyear_id_cmp"/><newline/>
+ <field name="filter_cmp"/>
+ </group>
+ <group string="Dates" attrs="{'invisible':[('filter_cmp', '!=', 'filter_date')]}">
+ <field name="date_from_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+ <field name="date_to_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+ </group>
+ <group string="Periods" attrs="{'invisible':[('filter_cmp', '!=', 'filter_period')]}">
+ <field name="period_from_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'required':[('filter_cmp', '=', 'filter_period')]}"/>
+ <field name="period_to_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'required':[('filter_cmp', '=', 'filter_period')]}"/>
+ </group>
</page>
</xpath>
<xpath expr="//notebook/page[@string='Journals']" position="replace">
=== modified file 'account/wizard/account_report_account_balance_view.xml'
--- account/wizard/account_report_account_balance_view.xml 2012-08-08 10:59:07 +0000
+++ account/wizard/account_report_account_balance_view.xml 2012-11-08 06:14:19 +0000
@@ -9,8 +9,7 @@
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<data>
- <xpath expr="//field[@name='journal_ids']" position="replace">
- <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
+ <xpath expr="//notebook/page[@string='Journals']" position="replace">
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="display_account"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
