Tejas Tank (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability-hr_report_changes-tta into
lp:~openerp-dev/openobject-addons/trunk-usability.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-hr_report_changes-tta/+merge/74590
Hello,
All changed are applied.
HR timesheet analysis : menu removed and renamed the title.
Thanks,
TTA @ OPENERP . COM
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability-hr_report_changes-tta/+merge/74590
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability.
=== modified file 'hr_timesheet_sheet/__openerp__.py'
--- hr_timesheet_sheet/__openerp__.py 2011-03-18 14:06:18 +0000
+++ hr_timesheet_sheet/__openerp__.py 2011-09-08 12:49:34 +0000
@@ -56,8 +56,7 @@
'hr_timesheet_sheet_view.xml',
'hr_timesheet_workflow.xml',
'process/hr_timesheet_sheet_process.xml',
- 'board_hr_timesheet_view.xml',
- 'report/hr_timesheet_report_view.xml',
+ 'board_hr_timesheet_view.xml',
'report/timesheet_report_view.xml',
'wizard/hr_timesheet_current_view.xml',
'hr_timesheet_sheet_data.xml'
=== modified file 'hr_timesheet_sheet/report/__init__.py'
--- hr_timesheet_sheet/report/__init__.py 2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/report/__init__.py 2011-09-08 12:49:34 +0000
@@ -20,6 +20,5 @@
##############################################################################
import timesheet_report
-import hr_timesheet_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== removed file 'hr_timesheet_sheet/report/hr_timesheet_report.py'
--- hr_timesheet_sheet/report/hr_timesheet_report.py 2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report.py 1970-01-01 00:00:00 +0000
@@ -1,82 +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 tools
-from osv import fields,osv
-from decimal_precision import decimal_precision as dp
-
-
-class hr_timesheet_report(osv.osv):
- _name = "hr.timesheet.report"
- _description = "Timesheet"
- _auto = False
- _columns = {
- 'year': fields.char('Year',size=64,required=False, readonly=True),
- 'day': fields.char('Day', size=128, readonly=True),
- 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
- ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
- ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
- 'date': fields.date('Date', readonly=True),
- 'name': fields.char('Description', size=64,readonly=True),
- 'product_id' : fields.many2one('product.product', 'Product',readonly=True),
- 'journal_id' : fields.many2one('account.analytic.journal', 'Journal',readonly=True),
- 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
- 'user_id': fields.many2one('res.users', 'User',readonly=True),
- 'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
- 'company_id': fields.many2one('res.company', 'Company',readonly=True),
- 'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
- 'quantity': fields.float('Quantity',readonly=True),
- }
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'hr_timesheet_report')
- cr.execute("""
- create or replace view hr_timesheet_report as (
- select
- min(t.id) as id,
- l.date as date,
- to_char(l.date, 'YYYY-MM-DD') as day,
- to_char(l.date,'YYYY') as year,
- to_char(l.date,'MM') as month,
- sum(l.amount) as cost,
- sum(l.unit_amount) as quantity,
- l.account_id as account_id,
- l.journal_id as journal_id,
- l.product_id as product_id,
- l.general_account_id as general_account_id,
- l.user_id as user_id,
- l.company_id as company_id,
- l.currency_id as currency_id
- from
- hr_analytic_timesheet as t
- left join account_analytic_line as l ON (t.line_id=l.id)
- group by
- l.date,
- l.account_id,
- l.product_id,
- l.general_account_id,
- l.journal_id,
- l.user_id,
- l.company_id,
- l.currency_id
- )
- """)
-hr_timesheet_report()
=== removed file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml 2011-08-06 00:21:04 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml 1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
- <record id="view_hr_timesheet_report_graph" model="ir.ui.view">
- <field name="name">hr.timesheet.report.graph</field>
- <field name="model">hr.timesheet.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Timesheet" type="bar">
- <field name="user_id" />
- <field name="quantity" operator = "+"/>
- </graph>
- </field>
- </record>
- <record id="view_hr_timesheet_report_tree" model="ir.ui.view">
- <field name="name">hr.timesheet.report.tree</field>
- <field name="model">hr.timesheet.report</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Timesheet Analysis">
- <field name="year" invisible="1"/>
- <field name="month" invisible="1"/>
- <field name="date" invisible="1"/>
- <field name="day" invisible="1"/>
- <field name="user_id" invisible="1"/>
- <field name="company_id" invisible="1"/>
- <field name="journal_id" invisible="1"/>
- <field name="product_id" invisible="1"/>
- <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
- <field name="general_account_id" invisible="1"/>
-
- <field name="quantity" sum="Hours"/>
- <field name="cost" sum="Total Cost"/>
- </tree>
- </field>
- </record>
- <record id="view_hr_timesheet_report_search" model="ir.ui.view">
- <field name="name">hr.timesheet.report.search</field>
- <field name="model">hr.timesheet.report</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Timesheet">
- <group col="10" colspan="12">
- <filter icon="terp-go-year" string=" Year "
- name="year"
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
- help="Timesheet in current year"/>
- <filter icon="terp-go-month" string=" Month "
- name="month"
- domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
- help="Timesheet in current month"/>
- <filter icon="terp-go-month"
- string=" Month-1 "
- domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
- help="Timesheet of last month"/>
- <separator orientation="vertical"/>
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="user_id"/>
- </group>
- <newline/>
- <group expand="0" string="Extended Filters..." groups="base.group_extended">
- <field name="general_account_id"/>
- <field name="product_id"/>
- <field name="journal_id"/>
- <separator orientation="vertical"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <newline/>
- <field name="date" />
- </group>
- <newline/>
- <group expand="1" string="Group By...">
- <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
- <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
- <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
- <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
- <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
- <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
- <separator orientation="vertical"/>
- <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
- <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
- <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
- </group>
-
- </search>
- </field>
- </record>
-
- <record id="action_hr_timesheet_report_stat_all" model="ir.actions.act_window">
- <field name="name">Timesheet Analysis</field>
- <field name="res_model">hr.timesheet.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
- <field name="help">This report performs analysis on timesheets created by your human resources in the system. It allows you to have a full overview of entries done by your employees. You can group them by specific selection criteria thanks to the search tool.</field>
- </record>
- <menuitem
- action="action_hr_timesheet_report_stat_all"
- id="menu_hr_timesheet_report_all"
- parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="0"/>
- </data>
-</openerp>
=== modified file 'hr_timesheet_sheet/report/timesheet_report_view.xml'
--- hr_timesheet_sheet/report/timesheet_report_view.xml 2011-08-06 00:21:04 +0000
+++ hr_timesheet_sheet/report/timesheet_report_view.xml 2011-09-08 12:49:34 +0000
@@ -113,7 +113,7 @@
</record>
<record id="action_timesheet_report_stat_all" model="ir.actions.act_window">
- <field name="name">Timesheet Sheet Analysis</field>
+ <field name="name">Timesheet Analysis</field>
<field name="res_model">timesheet.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
=== modified file 'hr_timesheet_sheet/security/ir.model.access.csv'
--- hr_timesheet_sheet/security/ir.model.access.csv 2011-07-11 11:23:29 +0000
+++ hr_timesheet_sheet/security/ir.model.access.csv 2011-09-08 12:49:34 +0000
@@ -3,7 +3,6 @@
"access_hr_timesheet_sheet_sheet_system_employee","hr_timesheet_sheet.sheet.system.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,0
"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,1,1,0
"access_timesheet_report","timesheet.report","model_timesheet_report","base.group_hr_manager",1,1,1,1
_______________________________________________
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
