pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr_timesheet_sheet: Improve search view of timesheet

Browse Source 
[REM] hr_timesheet_sheet: Remove open department wise timesheet with different state (Available with search view)

bzr revid: mra@tinyerp.com-20100422131109-b713uv4ttv1oeada
This commit is contained in:
mra (Open ERP)
2010-04-22 18:41:09 +05:30
parent a721928a84
commit 5275dc2413
3 changed files with 5 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+3 -3
View File
@@ -181,10 +181,10 @@
<field name="arch" type="xml">
<search string="Search Timesheet">
<group col="10" colspan="4">
<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My" />
<filter icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" />
<separator orientation="vertical"/>
<filter icon="terp-crm" string="In Progress" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
<filter icon="terp-crm" string="To Validate" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
<filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
<filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
<separator orientation="vertical"/>
<field name="user_id" select="1" widget="selection"/>
<field name="date_from"/>
addons/hr_timesheet_sheet/wizard/__init__.py
+2 -3
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,12 +15,11 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import wizard_timesheet_current
import wizard_timesheet_department
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/hr_timesheet_sheet/wizard/wizard_timesheet_department.py
-114
View File
@@ -1,114 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import wizard
import netsvc
import time
import pooler
from osv import osv
class wiz_timesheet_open(wizard.interface):
def _open_timesheet(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
dep_ids = pool.get('hr.department').search(cr, uid, [('manager_id','=',uid)])
user_ids = {}
for dep in pool.get('hr.department').browse(cr, uid, dep_ids, context):
for user in dep.member_ids:
user_ids[user.id] = 1
value = {
'domain': "[('user_id', 'in', "+str(user_ids.keys())+")]",
'name': 'Timesheets',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'hr_timesheet_sheet.sheet',
'view_id': False,
'type': 'ir.actions.act_window'
}
return value
states = {
'init' : {
'actions' : [],
'result' : {'type':'action', 'action':_open_timesheet, 'state':'end'}
}
}
wiz_timesheet_open('hr_timesheet_sheet.department.open')
class wiz_timesheet_confirm_open(wizard.interface):
def _open_timesheet(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
dep_ids = pool.get('hr.department').search(cr, uid, [('manager_id','=',uid)])
user_ids = {}
for dep in pool.get('hr.department').browse(cr, uid, dep_ids, context):
for user in dep.member_ids:
user_ids[user.id] = 1
value = {
'domain': "[('user_id', 'in', "+str(user_ids.keys())+"),('state','=','draft')]",
'name': 'Timesheets',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'hr_timesheet_sheet.sheet',
'view_id': False,
'type': 'ir.actions.act_window'
}
return value
states = {
'init' : {
'actions' : [],
'result' : {'type':'action', 'action':_open_timesheet, 'state':'end'}
}
}
wiz_timesheet_confirm_open('hr_timesheet_sheet.department.confirm.open')
class wiz_timesheet_validate_open(wizard.interface):
def _open_timesheet(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
dep_ids = pool.get('hr.department').search(cr, uid, [('manager_id','=',uid)])
user_ids = {}
for dep in pool.get('hr.department').browse(cr, uid, dep_ids, context):
for user in dep.member_ids:
user_ids[user.id] = 1
value = {
'domain': "[('user_id', 'in', "+str(user_ids.keys())+"),('state','=','confirm')]",
'name': 'Timesheets',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'hr_timesheet_sheet.sheet',
'view_id': False,
'type': 'ir.actions.act_window'
}
return value
states = {
'init' : {
'actions' : [],
'result' : {'type':'action', 'action':_open_timesheet, 'state':'end'}
}
}
wiz_timesheet_validate_open('hr_timesheet_sheet.department.validate.open')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: