Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-search-account_asset-tpa into
lp:~openerp-dev/openobject-addons/trunk-clean-search.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-account_asset-tpa/+merge/115722
[IMP] Improved search views of account_asset module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-search-account_asset-tpa/+merge/115722
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-clean-search.
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2012-07-18 12:27:30 +0000
+++ account_asset/account_asset_view.xml 2012-07-19 12:50:31 +0000
@@ -65,7 +65,6 @@
<field name="arch" type="xml">
<search string="Search Asset Category">
<field name="name" string="Asset Category"/>
- <separator orientation="vertical"/>
<field name="journal_id"/>
</search>
</field>
@@ -231,17 +230,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Account Asset">
- <group col="10" colspan="12">
- <field name="name" string="Asset"/>
- <separator orientation="vertical"/>
- <field name="purchase_date"/>
- <separator orientation="vertical"/>
- <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
- <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
- <separator orientation="vertical"/>
- <field name="category_id"/>
- <field name="partner_id"/>
- </group>
+ <field name="name" string="Asset"/>
+ <field name="purchase_date"/>
+ <field name="category_id"/>
+ <field name="partner_id"/>
+ <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
+ <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
</search>
</field>
</record>
=== modified file 'account_asset/report/account_asset_report_view.xml'
--- account_asset/report/account_asset_report_view.xml 2012-06-29 12:36:18 +0000
+++ account_asset/report/account_asset_report_view.xml 2012-07-19 12:50:31 +0000
@@ -43,34 +43,24 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Assets Analysis">
- <group col="10" colspan="12">
- <field name="purchase_date"/>
- <field name="depreciation_date"/>
- <separator orientation="vertical"/>
- <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
- <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
- <separator orientation="vertical"/>
- <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines"
- context="{'unposted_value_visible': 0}"/>
- <separator orientation="vertical"/>
- <field name="asset_id"/>
- <field name="asset_category_id"/>
- </group>
- <newline/>
+ <field name="purchase_date"/>
+ <field name="depreciation_date"/>
+ <field name="asset_id"/>
+ <field name="asset_category_id"/>
+ <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Assets in draft state"/>
+ <filter string="Running" icon="terp-check" domain="[('state','=','open')]" help="Assets in running state"/>
+ <separator/>
+ <filter string="Posted" name="posted" icon="terp-camera_test" domain="[('move_check','=',True)]" help="Posted depreciation lines" context="{'unposted_value_visible': 0}"/>
<group expand="0" string="Extended Filters...">
<field name="partner_id"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+ <field name="company_id" groups="base.group_multi_company"/>
</group>
- <newline/>
<group expand="1" string="Group By...">
<filter string="Asset" name="asset" context="{'group_by':'asset_id'}"/>
<filter string="Asset Category" name="asset_category" icon="terp-stock_symbol-selection" context="{'group_by':'asset_category_id'}"/>
- <separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical" />
<filter string="Purchase Date" icon="terp-go-month"
domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/>
- <separator orientation="vertical" />
<filter string="Depreciation Date" icon="terp-go-today"
domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/>
</group>
_______________________________________________
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
