odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Improved Search view 

bzr revid: hda@tinyerp.com-20091030122228-0vdv9szgufkxo5xw
This commit is contained in:
HDA (OpenERP) 2009-10-30 17:52:28 +05:30
parent 15ed75c0af
commit 37980696dd
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
addons/hr_timesheet/hr_timesheet_view.xml
View File

@ -41,6 +41,25 @@
</form>
</field>
</record>
<record id="hr_timesheet_line_search" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.search</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet">
<group col='8' colspan='4'>
<filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
<filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
<separator orientation="vertical"/>
<field name="user_id" select="1" widget="selection"/>
<field name="account_id" select="1" widget="selection"/>
<field name="date" select="1"/>
</group>
</search>
</field>
</record>
<menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours" />
<record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
@ -50,6 +69,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem action="act_hr_timesheet_line_me_all_form" id="menu_act_hr_timesheet_line_me_all_form" parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"/>
@ -60,7 +80,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('date', '=',time.strftime('%Y-%m-%d'))]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem action="act_hr_timesheet_line_evry1_today_form_my" id="menu_act_hr_timesheet_line_evry1_today_form_my" parent="menu_act_hr_timesheet_line_me_all_form" groups="base.group_extended_menu"/>
@ -71,6 +92,7 @@
<field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem
action="act_hr_timesheet_line_evry1_all_form"
@ -85,7 +107,8 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('date', '=', time.strftime('%Y-%m-%d'))]</field>
<field name="filter" eval="True"/>
<field name="filter" eval="True"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form" groups="base.group_extended_menu"/>

4
addons/purchase/purchase.py
View File

@ -192,7 +192,9 @@ class purchase_order(osv.osv):
store={
'purchase.order.line': (_get_order, None, 10),
}, multi="sums"),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position')
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
'create_uid': fields.many2one('res.users', 'Responsible'),
}
_defaults = {
'date_order': lambda *a: time.strftime('%Y-%m-%d'),

7
addons/purchase/purchase_view.xml
View File

@ -114,7 +114,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Purchase Order">
<group col='8' colspan='4'>
<group col='10' colspan='4'>
<filter icon="terp-purchase" string="Quotations" domain="[('state','=','draft')]" separator="1"/>
<filter icon="terp-purchase" string="Unapproved" domain="[('state','in',('wait','confirmed'))]" separator="1"/>
<separator orientation="vertical"/>
@ -122,6 +122,11 @@
<separator orientation="vertical"/>
<field name="name" select="1"/>
<field name="partner_id" select="1"/>
<field name="product_id" select="1"/>
<field name="create_uid" select="1" widget="selection">
<filter icon="terp-purchase" domain="[('create_uid','=',uid)]" help="My Purchase Orders"/>
<filter icon="terp-purchase" domain="[('create_uid','child_of',[uid])]" help="My Departments Purchase Orders"/>
</field>
</group>
</search>
</field>