diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 0d4ac30323d..548e6eb50a6 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -35,6 +35,11 @@ class account_invoice_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), 'product_qty':fields.float('Qty', readonly=True), + 'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True), + 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')],readonly=True), + 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position',readonly=True), + 'currency_id': fields.many2one('res.currency', 'Currency', readonly=True), + 'journal_id': fields.many2one('account.journal', 'Journal',readonly=True), 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Salesman', readonly=True), @@ -69,6 +74,11 @@ class account_invoice_report(osv.osv): l.product_id as product_id, sum(l.quantity * u.factor) as product_qty, s.partner_id as partner_id, + s.payment_term as payment_term, + s.period_id as period_id, + s.currency_id as currency_id, + s.journal_id as journal_id, + s.fiscal_position as fiscal_position, s.user_id as user_id, s.company_id as company_id, sum(l.quantity*l.price_unit) as price_total, @@ -82,9 +92,19 @@ class account_invoice_report(osv.osv): account_invoice s on (s.id=l.invoice_id) left join product_uom u on (u.id=l.uos_id) group by - s.type,s.date_invoice, s.partner_id, l.product_id, - l.uos_id, s.user_id, s.state, - s.company_id + s.type, + s.date_invoice, + s.partner_id, + l.product_id, + l.uos_id, + s.user_id, + s.state, + s.company_id, + s.payment_term, + s.period_id, + s.fiscal_position, + s.currency_id, + s.journal_id ) """) account_invoice_report() diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 2d4779f2fc7..02cdeebf1a5 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -21,6 +21,11 @@ + + + + + @@ -93,12 +98,18 @@ + + + + + + diff --git a/addons/board_hr/board_hr_view.xml b/addons/board_hr/board_hr_view.xml index 2a587c03a23..b2c105691fe 100644 --- a/addons/board_hr/board_hr_view.xml +++ b/addons/board_hr/board_hr_view.xml @@ -43,13 +43,14 @@ - - Leaves by Type + + Remaining Leaves by User ir.actions.act_window - hr.holidays.by.type + hr.holidays.remaining.leaves.user form graph,tree - + [('user_id','=',uid)] + board.hr.form @@ -60,12 +61,12 @@ - - + + - - + + diff --git a/addons/board_project/__terp__.py b/addons/board_project/__terp__.py index b6ab4ba25b7..f934c7d3bc5 100644 --- a/addons/board_project/__terp__.py +++ b/addons/board_project/__terp__.py @@ -38,9 +38,10 @@ This module implements a dashboard for project member that includes: 'project_planning', 'hr_timesheet_sheet', 'project_issue', - 'resource' + 'resource', + 'scrum' ], - 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml'], + 'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml','board_project_issue_view.xml','board_scrum_view.xml'], 'demo_xml': ['board_project_demo.xml'], 'installable': True, 'active': False, diff --git a/addons/board_project/board_project_issue_view.xml b/addons/board_project/board_project_issue_view.xml new file mode 100644 index 00000000000..074adceef80 --- /dev/null +++ b/addons/board_project/board_project_issue_view.xml @@ -0,0 +1,45 @@ + + + + + + Project issues + project.issue + form + tree,form + [('create_date', '>=', time.strftime('%Y-%m-%d 00:00:00')),('create_date', '<=', time.strftime('%Y-%m-%d 23:59:59'))] + + + + + board.project.issue.form + board.board + form + +
+ + + + + + + + +
+ + + + + Project Issue Dashboard + board.board + form + form + menu + + + + + diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml index fc79b0f9304..700f65e6dec 100644 --- a/addons/board_project/board_project_view.xml +++ b/addons/board_project/board_project_view.xml @@ -47,6 +47,14 @@ [('user_id','=',uid),('state','=','open')] + + My Pending Tasks + project.task + form + tree,form + [('user_id','=',uid),('state','=','pending')] + + My Task's Deadlines project.task @@ -91,13 +99,12 @@
- - - - + + + - - + +
diff --git a/addons/board_project/board_scrum_view.xml b/addons/board_project/board_scrum_view.xml new file mode 100644 index 00000000000..b07e565563d --- /dev/null +++ b/addons/board_project/board_scrum_view.xml @@ -0,0 +1,38 @@ + + + + + Sprints List + scrum.sprint + form + tree,form + + + + board.project.form + board.board + form + +
+ + + + + +
+ + + + Project Dashboard + board.board + form + form + menu + + + + + diff --git a/addons/board_purchase/__init__.py b/addons/board_purchase/__init__.py new file mode 100644 index 00000000000..3c3121d954a --- /dev/null +++ b/addons/board_purchase/__init__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/board_purchase/__terp__.py b/addons/board_purchase/__terp__.py new file mode 100644 index 00000000000..f5ada7cfe46 --- /dev/null +++ b/addons/board_purchase/__terp__.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + + +{ + 'name': 'Board for Purchase Management', + 'version': '1.0', + 'category': 'Board/Purchase', + 'description': """ +This module implements a dashboard for purcgase management that includes: + * Current Purchase Orders + * Draft Purchase Orders + * Graph for quantity and amount per month + """, + 'author': 'Tiny', + 'depends': [ 'purchase','board', + ], + 'update_xml': ['board_purchase_view.xml'], + 'demo_xml': [], + 'installable': True, + 'active': False, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/board_purchase/board_purchase_view.xml new file mode 100644 index 00000000000..d1ac01b9e7f --- /dev/null +++ b/addons/board_purchase/board_purchase_view.xml @@ -0,0 +1,57 @@ + + + + + + + + + Quotation Request + ir.actions.act_window + purchase.order + form + [('state','in',('wait','confirmed'))] + tree,form + + + + + board.purchase.form + board.board + form + +
+ + + + + + + + + + +
+ + + + + Purchase Dashboard + board.board + form + form + menu + + + + + + \ No newline at end of file diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py index 5652d32b9d5..4bae007f281 100644 --- a/addons/hr_holidays/report/hr_holidays_report.py +++ b/addons/hr_holidays/report/hr_holidays_report.py @@ -71,29 +71,31 @@ class hr_holidays_report(osv.osv): """) hr_holidays_report() -class hr_holidays_by_type(osv.osv): - _name = "hr.holidays.by.type" +class hr_holidays_remaining_leaves_user(osv.osv): + _name = "hr.holidays.remaining.leaves.user" _description = "Total holidays by type" _auto = False _columns = { - 'name': fields.char('Leave Type',size=64), - 'no_of_leaves' : fields.integer('Total leaves'), + 'name': fields.char('Employee',size=64), + 'no_of_leaves' : fields.integer('Remaining leaves'), + 'user_id':fields.many2one('res.users','User'), } def init(self, cr): - tools.drop_view_if_exists(cr, 'hr_holidays_by_type') + tools.drop_view_if_exists(cr, 'hr_holidays_remaining_leaves_user') cr.execute(""" - create or replace view hr_holidays_by_type as ( + create or replace view hr_holidays_remaining_leaves_user as ( select - min(hhl.id) as id, - hhs.name as name, - sum(hhl.number_of_days) * -1 as no_of_leaves + min(hrs.id) as id, + rr.name as name, + sum(hrs.number_of_days) as no_of_leaves, + hrs.user_id from - hr_holidays as hhl,hr_holidays_status as hhs + hr_holidays as hrs, hr_employee as hre, resource_resource as rr where - hhs.id = hhl.holiday_status_id and number_of_days < 0 + hrs.employee_id = hre.id and hre.resource_id = rr.id group by - hhs.name,hhl.holiday_status_id + rr.name,hrs.user_id ) """) -hr_holidays_by_type() +hr_holidays_remaining_leaves_user() diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml index 86b41fea921..1ec3ed71a83 100644 --- a/addons/hr_holidays/report/hr_holidays_report_view.xml +++ b/addons/hr_holidays/report/hr_holidays_report_view.xml @@ -90,9 +90,9 @@ - - hr.holidays.by.type.tree - hr.holidays.by.type + + hr.holidays.remaining.leaves.user.tree + hr.holidays.remaining.leaves.user tree @@ -102,9 +102,9 @@ - - hr.holidays.by.type.graph - hr.holidays.by.type + + hr.holidays.remaining.leaves.user.graph + hr.holidays.remaining.leaves.user graph diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml index 934fa57ee9c..c7200ace05b 100644 --- a/addons/project/project_wizard.xml +++ b/addons/project/project_wizard.xml @@ -1,7 +1,7 @@ - + + + project.vs.remaining.hour.tree + project.vs.remaining.hours + tree + + + + + + + + + + + project.vs.remaining.hour.graph + project.vs.remaining.hours + graph + + + + + + + + + + + Project and remaining hours + project.vs.remaining.hours + form + graph,tree + + + + + task.by.days.tree + task.by.days + tree + + + + + + + + + + + task.by.days.graph + task.by.days + graph + + + + + + + + + + + Task By Days + task.by.days + form + graph,tree + + + + + + task.by.days.vs.planned.hours.tree + task.by.days.vs.planned.hours + tree + + + + + + + + + + task.by.days.vs.planned.hours.graph + task.by.days.vs.planned.hours + graph + + + + + + + + + + Task By Days vs Planned Hours + task.by.days.vs.planned.hours + form + graph,tree + + diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index ef1e002ae78..3f3c97fc5e0 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -35,7 +35,7 @@ class project_issue_report(osv.osv): c.priority as priority, c.project_id as project_id, c.type_id as type_id, - count(*) as nbr, + count(*) as nbr, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from project_issue c @@ -49,4 +49,5 @@ class project_issue_report(osv.osv): project_issue_report() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 2f7886670c2..52b6f336d58 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -117,5 +117,7 @@ + + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 653238748b9..c7247256bfc 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -157,13 +157,13 @@ - + - - + + @@ -176,10 +176,10 @@ purchase.order form [('state','=','draft')] - tree,form - + tree,form + - @@ -216,7 +216,7 @@ - + @@ -289,7 +289,7 @@ name="Product purchases" res_model="purchase.order.line" src_model="product.product"/> -