diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 0f01be87a26..913e43e5982 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -1,38 +1,27 @@ - - Receivable Accounts - report.account.receivable + + + Company Analysis + account.entries.report + form + tree,graph + {'group_by':['user_type'], 'group_by_no_leaf':1} + + [('year','=',time.strftime('%Y'))] + + + + Treasury + account.account form graph,tree - [('type','=','receivable')] + [('type','=','liquidity')] + {'default_type': 'liquidity'} + - - Income Accounts - report.account.receivable - form - graph,tree - [('type','=','income')] - - - Company Analysis - account.entries.report - form - tree,graph - {'group_by':['user_type'], 'group_by_no_leaf':1} - - [('year','=',time.strftime('%Y'))] - - - Treasury - account.account - form - graph,tree - [('type','=','liquidity')] - {'default_type': 'liquidity'} - - + board.account.form board.board @@ -45,7 +34,7 @@ - + @@ -53,7 +42,7 @@ - Accounting Dashboard + Accounting board.board form form @@ -61,8 +50,12 @@ - - + diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index e07cc98e5e2..b092b3a2f8c 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -168,11 +168,6 @@ msgstr "" msgid "All Analytic Entries" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard -msgid "Invoices Created Within Past 15 Days" -msgstr "" - #. module: account #: field:accounting.report,label_filter:0 msgid "Column Label" @@ -626,18 +621,6 @@ msgstr "" msgid "To reconcile the entries company should be the same for all entries" msgstr "" -#. module: account -#: view:account.account:0 -#: selection:account.aged.trial.balance,result_selection:0 -#: selection:account.common.partner.report,result_selection:0 -#: selection:account.partner.balance,result_selection:0 -#: selection:account.partner.ledger,result_selection:0 -#: code:addons/account/report/account_partner_balance.py:297 -#: model:ir.actions.act_window,name:account.action_aged_receivable -#, python-format -msgid "Receivable Accounts" -msgstr "" - #. module: account #: constraint:account.move.line:0 msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal." @@ -1557,11 +1540,6 @@ msgstr "" msgid "Responsible" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all -msgid "Sales by Account Type" -msgstr "" - #. module: account #: view:account.invoice.refund:0 msgid "Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice." @@ -2544,13 +2522,6 @@ msgstr "" msgid "Configure Your Chart of Accounts" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all -#: view:report.account.sales:0 -#: view:report.account_type.sales:0 -msgid "Sales by Account" -msgstr "" - #. module: account #: view:account.use.model:0 msgid "This wizard will create recurring accounting entries" @@ -5908,11 +5879,6 @@ msgstr "" msgid "Supplier Refund" msgstr "" -#. module: account -#: model:ir.ui.menu,name:account.menu_dashboard_acc -msgid "Dashboard" -msgstr "" - #. module: account #: field:account.bank.statement,move_line_ids:0 msgid "Entry lines" @@ -6411,11 +6377,6 @@ msgid "You can specify year, month and date in the name of the model using the f "e.g. My model on %(date)s" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_aged_income -msgid "Income Accounts" -msgstr "" - #. module: account #: help:report.invoice.created,origin:0 msgid "Reference of the document that generated this invoice report." diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py index e54c08d2291..e9b698d562b 100644 --- a/addons/board/__openerp__.py +++ b/addons/board/__openerp__.py @@ -39,6 +39,7 @@ The user can also publish notes. 'board_view.xml', 'board_data_admin.xml', 'board_data_home.xml', + 'board_mydashboard_view.xml' ], 'demo_xml': [ 'board_demo.xml' diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/board_mydashboard_view.xml new file mode 100644 index 00000000000..7a517c36ed7 --- /dev/null +++ b/addons/board/board_mydashboard_view.xml @@ -0,0 +1,45 @@ + + + + + + My Dashboard + board.board + form + +
+ + + + +
+ + + + + + My Dashboard + board.board + form + form + menu + + + This is your personal dashboard. + To customize it, go to any view in OpenERP, fill in the desired search filter, + and click on 'Add to Dashboard' in the search options. + The view will appear as an element in your dashboard. + <p> + You can drag and drop the elements to get your preferred dashboard layout. + Click on the cross (in the upper right corner) to remove an element. + + + + + + + diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 768c0147020..1b8148fe43b 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -1,111 +1,21 @@ - - - Opportunities - crm.lead - tree - - - - - - - - - - - - + - My Open Opportunities + My Opportunities crm.lead - form - tree,form - [('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')] - {'default_user_id': uid, 'default_type': 'opportunity'} - - - tree - - - - - - form - - + [('user_id','=',uid),('type', '=', 'opportunity'),('state','not in',('cancel','done'))] + - - crm.lead.report.graph - crm.lead.report - graph - - - - - - - - - Planned Revenue By Stage - crm.lead.report - form - graph,tree,form - - [('user_id','=',uid), ('type', '=', 'opportunity'), ('state','in',('draft','open','done','pending')), '!', '&', ('state', '=', 'done'), ('date_closed','>=',datetime.date.today().strftime('%Y-%m-01'))] - {'search_default_Stage':1} - - - - Sales Dashboard Form - board.board - form - -
- - - - - - - - -
- - - - CRM - board.board - form - form - menu - - - - - - Opportunities By Categories - Graph - crm.lead.report - graph - - - - - - - - - Opportunities By Categories - crm.lead.report - form - graph,tree,form - - [('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')] - {'search_default_Category':1} + + New Leads + crm.lead + tree + [('user_id','=',uid),('state','=','draft'),('type','=','lead')] + @@ -119,6 +29,7 @@ + Opportunities By Stage crm.lead.report @@ -129,28 +40,41 @@ {'search_default_Stage':1} + Opportunities By Stage Per User - Graph crm.lead.report graph - + + + Planned Revenue By User and Stage crm.lead.report form graph,tree,form - [('state','!=','cancel')] + [('state','!=','cancel'),('opening_date','>',datetime.date.today().strftime("%Y-%m-%d"))] {'search_default_Stage':1} + + Meetings + crm.meeting + calendar,tree,form,gantt + + {"calendar_default_user_id":uid} + [('state','=','open'),('date','>',datetime.date.today().strftime("%Y-%m-%d %H:%M:%S"))] + + + CRM - Statistical Dashboard Form board.board @@ -159,29 +83,33 @@
- - + + + +
+ - CRM Manager + CRM board.board form form menu - diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index 635a74052e9..38e4a16ad85 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -12,10 +12,13 @@ + - @@ -25,71 +28,18 @@ - Document Dashboard + Knowledge board.board form form - + + - - - - - - - - board.document.manager.form1 - board.board - form - -
- - - - - - - - - - - -
- - - - - - Statistics by User - board.board - form - form - - - - diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py index 34b61f01c01..7b09f131178 100644 --- a/addons/document/report/document_report.py +++ b/addons/document/report/document_report.py @@ -64,41 +64,8 @@ class report_document_user(osv.osv): group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname ) """) -report_document_user() - -class report_files_partner(osv.osv): - _name = "report.files.partner" - _description = "Files details by Partners" - _auto = False - _columns = { - 'name': fields.char('Year',size=64,required=False, readonly=True), - 'file_size': fields.integer('File Size', readonly=True), - 'nbr':fields.integer('# of Files', readonly=True), - 'partner':fields.char('Partner',size=64,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), - } - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_files_partner') - cr.execute(""" - CREATE VIEW report_files_partner as ( - SELECT min(f.id) AS id, - COUNT(*) AS nbr, - to_char(date_trunc('month', f.create_date),'YYYY') AS name, - to_char(date_trunc('month', f.create_date),'MM') AS month, - SUM(f.file_size) AS file_size, - p.name AS partner - - FROM ir_attachment f - LEFT JOIN res_partner p ON (f.partner_id=p.id) - WHERE f.datas_fname IS NOT NULL - GROUP BY p.name, date_trunc('month', f.create_date) - ) - """) -report_files_partner() - class report_document_file(osv.osv): _name = "report.document.file" _description = "Files details by Directory" @@ -122,37 +89,5 @@ class report_document_file(osv.osv): ) """) -report_document_file() - -class report_document_wall(osv.osv): - _name = "report.document.wall" - _description = "Users that did not inserted documents since one month" - _auto = False - _columns = { - 'name': fields.date('Month', readonly=True), - 'user_id':fields.many2one('res.users', 'Owner',readonly=True), - 'user':fields.char('User',size=64,readonly=True), - 'month': fields.char('Month', size=24,readonly=True), - 'last':fields.datetime('Last Posted Time', readonly=True), - } - - def init(self, cr): - tools.drop_view_if_exists(cr, 'report_document_wall') - cr.execute(""" - create or replace view report_document_wall as ( - select max(f.id) as id, - to_char(min(f.create_date),'YYYY-MM-DD HH24:MI:SS') as last, - f.user_id as user_id, f.user_id as user, - to_char(f.create_date,'Month') as month - from ir_attachment f - where f.create_date in ( - select max(i.create_date) - from ir_attachment i - inner join res_users u on (i.user_id=u.id) - group by i.user_id) group by f.user_id,f.create_date - having (CURRENT_DATE - to_date(to_char(f.create_date,'YYYY-MM-DD'),'YYYY-MM-DD')) > 30 - ) - """) -report_document_wall() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index e6e1847cd56..72167d84751 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -55,8 +55,6 @@ - All Users files @@ -67,74 +65,20 @@ - - - - report.document.wall.form - report.document.wall - form - -
- - - - - -
- - - report.document.wall.tree - report.document.wall - tree - - - - - - - - - - - Wall of Shame - report.document.wall - form - tree,form - - - - - - - - report.document.resource.graph - report.document.user - graph - - - - - - - - - - - - + report.document.user.graph report.document.file graph - + - + - + report.document.user.tree report.document.file tree @@ -145,6 +89,7 @@ + File Size by Month report.document.file @@ -153,20 +98,15 @@ tree - - - + report.file.month.graph report.document.user graph - + - - - @@ -184,6 +124,26 @@ + + report.file.user.graph + report.document.user + graph + + + + + + + + + + Files by User + report.document.user + + form + tree + + Files by Month report.document.user @@ -192,79 +152,5 @@ tree - - - - - report.document.user.graph - report.document.user - graph - - - - - - - - - - Files By Users - report.document.user - - form - tree - - - - - - - view.files.partner.graph - report.files.partner - graph - - - - - - - - - - - view.files.partner.tree - report.files.partner - tree - - - - - - - - - - - - view.files.partner.form - report.files.partner - form - - - - - - - - - - - - Files Per Partner - report.files.partner - - form - tree - - - + + diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv index 36f0aa86dff..a82b9acd838 100644 --- a/addons/document/security/ir.model.access.csv +++ b/addons/document/security/ir.model.access.csv @@ -15,11 +15,6 @@ access_res_partner_group_user,res.partner user,base.model_res_partner,base.group access_document_directory_dctx_all,document.directory.dctx all,model_document_directory_dctx,,1,0,0,0 access_document_directory_dctx_group_document_manager,document.directory.dctx document manager,model_document_directory_dctx,base.group_system,1,1,1,1 access_report_document_user_group_document_manager,report.document.user document manager,model_report_document_user,base.group_system,1,0,0,0 -access_report_files_partner_group_document_manager,report.files.partner document manager,model_report_files_partner,base.group_system,1,0,0,0 access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0 -access_report_document_wall_group_document_manager,report.document.wall document manager,model_report_document_wall,base.group_system,1,0,0,0 -access_report_document_wall_group_system,report.document.wall group system,model_report_document_wall,base.group_system,1,0,0,0 -access_report_files_partner_group_document,report.files.partner document manager,model_report_files_partner,base.group_document_user,1,0,0,0 access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0 -access_report_document_wall_group_document,report.document.wall document manager,model_report_document_wall,base.group_document_user,1,0,0,0 access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0 diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 6bdea66e45e..a00b4b20f04 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -1,8 +1,7 @@ - - + Registration Event report report.event.registration @@ -26,13 +25,23 @@ - - Next Events - ir.actions.act_window - event.event - form - tree,form - + + Next Events + ir.actions.act_window + event.event + form + tree,form + [('state','not in',('cancel','done'))] + + + + New Registration + ir.actions.act_window + event.registration + form + tree,form + [('state','=','draft')] + board.associations.manager.form @@ -42,13 +51,11 @@
- + + - +
@@ -56,20 +63,17 @@ - Event Dashboard + Events board.board form form - - + diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index d7fb8b0e91a..1135b55034a 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -48,7 +48,7 @@ You can manage: 'process/hr_process.xml', 'hr_installer.xml', 'hr_data.xml', - 'hr_board.xml', + 'board_hr_view.xml', 'res_config_view.xml', ], 'demo_xml': [ diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml new file mode 100644 index 00000000000..6c40edd8d1e --- /dev/null +++ b/addons/hr/board_hr_view.xml @@ -0,0 +1,36 @@ + + + + + + board.hr.form + board.board + form + +
+ + + + +
+ + + + + Human Resources + board.board + form + form + menu + + + + + + diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml deleted file mode 100644 index 22687d27c69..00000000000 --- a/addons/hr/hr_board.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - board.hr.form - board.board - form - -
- - - - -
- - - - Human Resources Dashboard - board.board - form - form - menu - - - - - - - - - - board.hr.manager.form - board.board - form - -
- - - - -
- - - - HR Manager Dashboard - board.board - form - form - menu - - - - - diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index b04780b980a..42effb62e6e 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -408,12 +408,6 @@ msgstr "" msgid "Working Address" msgstr "" -#. module: hr -#: model:ir.actions.act_window,name:hr.open_board_hr_manager -#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager -msgid "HR Manager Dashboard" -msgstr "" - #. module: hr #: field:hr.department,child_ids:0 msgid "Child Departments" diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml index f25c669a973..7ed11beb98c 100644 --- a/addons/hr_evaluation/board_hr_evaluation_view.xml +++ b/addons/hr_evaluation/board_hr_evaluation_view.xml @@ -1,6 +1,7 @@ + Interview Requests hr.evaluation.interview @@ -16,9 +17,9 @@ form - - - + + + diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index cbf8b322b36..2a1d302e094 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -56,7 +56,6 @@ re-invoice your customer's expenses if your work by project. 'security/ir_rule.xml', 'report/hr_expense_report_view.xml', 'board_hr_expense_view.xml', - 'board_hr_expense_manager_view.xml', 'hr_expense_installer_view.xml', ], 'demo_xml': [ diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml deleted file mode 100644 index 0f09c9a3290..00000000000 --- a/addons/hr_expense/board_hr_expense_manager_view.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - All Employee Expenses - hr.expense.expense - form - [('state','in',('confirm', 'accepted'))] - - - - - board.hr.manager.expense.form - board.board - - form - - - - - - - - diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index e60f53d7d1e..09809e488ba 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -65,7 +65,6 @@ Note that: 'wizard/hr_holidays_summary_department_view.xml', 'wizard/hr_holidays_summary_employees_view.xml', 'board_hr_holidays_view.xml', - 'board_hr_manager_holidays_view.xml', ], 'demo_xml': ['hr_holidays_demo.xml',], 'test': ['test/test_hr_holiday.yml', diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml index 178602725ae..eb3b671af6b 100644 --- a/addons/hr_holidays/board_hr_holidays_view.xml +++ b/addons/hr_holidays/board_hr_holidays_view.xml @@ -1,6 +1,7 @@ + My Leaves hr.holidays.status @@ -10,6 +11,7 @@ {} [] + board.hr.holidays.leave.month.form board.board @@ -17,9 +19,10 @@ - + + diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml deleted file mode 100644 index dfb4924c631..00000000000 --- a/addons/hr_holidays/board_hr_manager_holidays_view.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - Leaves to Approve - ir.actions.act_window - hr.holidays - form - tree,form - [('state','in',('confirm', 'validate', 'validate1'))] - - - - - board.hr.holidays.manager.form - board.board - - form - - - - - - - - - diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 4342fb145e5..edfff777c3e 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -249,7 +249,6 @@ - diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index eeb4e7b5e27..3763f5ac568 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -540,11 +540,6 @@ msgstr "" msgid "Active" msgstr "" -#. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board -msgid "Leaves To Validate" -msgstr "" - #. module: hr_holidays #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml index e9054416eea..468d3a8d66e 100644 --- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml +++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml @@ -30,13 +30,14 @@ board.hr.applicants.status.form board.board - + form - - - + + + + diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py index 7e11fdad723..65b8905fca0 100644 --- a/addons/hr_timesheet_invoice/__openerp__.py +++ b/addons/hr_timesheet_invoice/__openerp__.py @@ -45,7 +45,6 @@ reports, etc.""", 'wizard/hr_timesheet_analytic_profit_view.xml', 'wizard/hr_timesheet_invoice_create_view.xml', 'wizard/hr_timesheet_invoice_create_final_view.xml', - 'board_hr_timesheet_invoice.xml', ], 'demo': [ 'hr_timesheet_invoice_demo.xml', diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml deleted file mode 100644 index 7327ca66f63..00000000000 --- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - Costs to invoice - report.account.analytic.line.to.invoice - form - graph,tree - - - - - - - - - timesheet.uninvoiced.line.tree - report.timesheet.line - tree - - - - - - - - - - - - - Uninvoice lines with billing rate - report.timesheet.line - form - form,tree - [('invoice_id','=',False)] - - - - - board.hr.timesheet.uninvoiced.form - board.board - form - - - - - - - - - - diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot index ca1fd1105fd..768c4be3dac 100644 --- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot +++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot @@ -243,11 +243,6 @@ msgstr "" msgid "Deadline" msgstr "" -#. module: hr_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account -msgid "Accounts to invoice" -msgstr "" - #. module: hr_timesheet_invoice #: field:report.analytic.account.close,partner_id:0 msgid "Partner" @@ -285,7 +280,6 @@ msgstr "" #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice msgid "Costs to invoice" msgstr "" @@ -907,11 +901,6 @@ msgstr "" msgid "Product" msgstr "" -#. module: hr_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line -msgid "Uninvoice lines with billing rate" -msgstr "" - #. module: hr_timesheet_invoice #: report:account.analytic.profit:0 msgid "%" diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml index 74530b81859..2b165334739 100644 --- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml +++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml @@ -2,30 +2,18 @@ - - Timesheets - ir.actions.act_window - hr_timesheet_sheet.sheet - form - graph,tree - - - - hr.timesheet.sheet.tree.simplified.board + + hr.timesheet.sheet.sheet.graph hr_timesheet_sheet.sheet - tree + graph - - - - + - - - - + + + My Total Attendances By Week hr_timesheet_sheet.sheet @@ -34,6 +22,7 @@ [('user_id','=',uid)] + board.hr.timesheet.sheet.form board.board @@ -45,5 +34,6 @@ + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 3ed1b943ced..8188d1a80cf 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -2,18 +2,6 @@ - - hr.timesheet.sheet.graph - hr_timesheet_sheet.sheet - graph - - - - - - - - hr.timesheet.account.form hr_timesheet_sheet.sheet.account @@ -341,17 +329,6 @@ - - hr.timesheet.sheet.sheet.graph - hr_timesheet_sheet.sheet - graph - - - - - - - hr.timesheet.day.tree diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot index 0eeae3beea5..ae27ef19b88 100644 --- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot +++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot @@ -272,7 +272,6 @@ msgstr "" #: view:hr_timesheet_sheet.sheet:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form -#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form #: view:res.company:0 msgid "Timesheets" diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 39413a80bed..a77c19a0750 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -61,7 +61,6 @@ The main features are: 'mail_thread_view.xml', 'mail_group_view.xml', 'res_partner_view.xml', - 'report/mail_message_report_view.xml', 'security/mail_security.xml', 'security/ir.model.access.csv', 'mail_data.xml', diff --git a/addons/mail/report/__init__.py b/addons/mail/report/__init__.py index 7ec4e7cd2c2..c380a63e8d3 100644 --- a/addons/mail/report/__init__.py +++ b/addons/mail/report/__init__.py @@ -19,7 +19,6 @@ # ############################################################################## -import mail_message_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mail/report/mail_message_report.py b/addons/mail/report/mail_message_report.py deleted file mode 100644 index 7955ea87909..00000000000 --- a/addons/mail/report/mail_message_report.py +++ /dev/null @@ -1,66 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2009-today OpenERP SA () -# -# 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 -# -############################################################################## - -from osv import fields, osv -import time -import tools - -class mail_message_report(osv.osv): - #CSV:: access_res_log_report all,res.log.report,model_res_log_report,,1,0,0,0 - """ Log Report """ - _name = "mail.message.report" - _auto = False - _description = "Mail Message Report" - _columns = { - 'name': fields.char('Year', size=64, required=False, 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), - 'day': fields.char('Day', size=128, readonly=True), - 'creation_date': fields.date('Creation Date', readonly=True), - 'res_model': fields.char('Object', size=128), - 'nbr': fields.integer('# of Entries', readonly=True) - } - - def init(self, cr): - """ - Log Report - @param cr: the current row, from the database cursor - """ - tools.drop_view_if_exists(cr,'mail_message_report') - cr.execute(""" - CREATE OR REPLACE VIEW mail_message_report AS ( - SELECT - l.id as id, - 1 as nbr, - to_char(l.create_date, 'YYYY') as name, - to_char(l.create_date, 'MM') as month, - to_char(l.create_date, 'YYYY-MM-DD') as day, - to_char(l.create_date, 'YYYY-MM-DD') as creation_date, - l.model as res_model, - date_trunc('day',l.create_date) as create_date - FROM - mail_message l - )""") - diff --git a/addons/mail/report/mail_message_report_view.xml b/addons/mail/report/mail_message_report_view.xml deleted file mode 100644 index ecb26b78d1d..00000000000 --- a/addons/mail/report/mail_message_report_view.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - Latest Activities - mail.message - form - tree,form - - - - - mail.message.report.select - mail.message.report - search - - - - - - - - - - - - - - - - - - - - - - mail.message.report.tree - mail.message.report - tree - - - - - - - - - - - - - - - board.mail.message.report.graph - mail.message.report - graph - - - - - - - - - Monthly Activity per Document - mail.message.report - form - graph,tree - [('create_date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))] - {'group_by':['res_model'],'group_by_no_leaf':1} - - - - - - board.weekly.mail.message.report.graph - mail.message.report - graph - - - - - - - - - Weekly Global Activity - mail.message.report - form - graph,tree - [('create_date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))] - {'group_by':['day'],'group_by_no_leaf':1} - - - - - diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv index 3cfd4e88f3d..011e8b27dc5 100644 --- a/addons/mail/security/ir.model.access.csv +++ b/addons/mail/security/ir.model.access.csv @@ -5,4 +5,3 @@ access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0 access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1 access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1 -access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0 diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml index 9dd5d1afb0e..0ac0c02540f 100644 --- a/addons/mrp/board_manufacturing_view.xml +++ b/addons/mrp/board_manufacturing_view.xml @@ -21,19 +21,18 @@ - Production Dashboard + Manufacturing board.board form form - - + diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index 2c53fc2a28a..2c38b2e56c1 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -54,7 +54,6 @@ Dashboard for project members that includes: "res_partner_view.xml", "report/project_report_view.xml", "board_project_view.xml", - 'board_project_manager_view.xml', 'report/project_cumulative.xml', 'res_config_view.xml', ], diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml deleted file mode 100644 index d9340eefb3a..00000000000 --- a/addons/project/board_project_manager_view.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index df35534659d..09a7fe57bab 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -2,14 +2,48 @@ - + + project.vs.remaining.hour.tree + project.vs.hours + tree + + + + + + + + + + + project.vs.remaining.hour.graph + project.vs.hours + graph + + + + + + + + + + + Remaining Hours Per Project + project.vs.hours + form + graph,tree + [('user_id','=',uid),('state','not in',('cancel','done'))] + + + project.task.tree project.task tree - + @@ -23,50 +57,12 @@ - - project.task.delegated.tree - project.task - tree - - - - - - - - - - - - - - - - - My Open Tasks + My Tasks project.task form tree,form - [('user_id','=',uid),('state','=','open')] - - - - - My Delegated Tasks - project.task - form - tree,form - [('parent_ids.user_id','=',uid),('state', 'in', ('draft','open','pending'))] - - - - - My Task's Deadlines - project.task - form - tree,form - [('user_id','=',uid),('state','=','open'),('date_deadline','<>',False)] + [('user_id','=',uid),('state','not in',('cancel','done'))] @@ -78,11 +74,10 @@
- - + - +
@@ -90,7 +85,7 @@ - Project Dashboard + Project board.board form form @@ -98,19 +93,10 @@ - - - + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 240176f7941..659e5bd0651 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -156,118 +156,5 @@ - - - project.vs.remaining.hour.tree - project.vs.hours - tree - - - - - - - - - - - project.vs.remaining.hour.graph - project.vs.hours - graph - - - - - - - - - - - Remaining Hours Per Project - project.vs.hours - form - graph,tree - [('user_id','=',uid),('state','=','open')] - - - - - - tree - - - - - - - graph - - - - - - 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 - [('day','<=',time.strftime('%Y-%m-%d')),('day','>=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))] - - - - - - project.vs.planned.total.hour.tree - project.vs.hours - tree - - - - - - - - - - - project.vs.planned.total.hour.graph - project.vs.hours - graph - - - - - - - - - diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index 495a1efe3c1..cedcd85d4fc 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -2,89 +2,7 @@ - - Project issues - project.issue - form - tree,form - [('state','in',['draft','open'])] - - - - - Project issues - project.issue - form - tree,form - [('state','=','pending')] - - - - - Project Issue - project.issue.report - form - graph - [] - - - - - project.issue.report.graph - project.issue.report - graph - - - - - - - - - - - Project Issue - project.issue.report - form - graph - [] - - - - - board.project.issue.form - board.board - form - -
- - - - - - - - - - -
- - - - - Project Issue Dashboard - board.board - form - form - menu - - - - - - + Project Issue Board Tree project.issue tree @@ -105,6 +23,7 @@ + My Project Issues project.issue @@ -113,40 +32,17 @@ [('state','not in',('cancel','done')),('user_id','=',uid)] - - my.open.project.issue.graph - project.issue.report - graph - - - - - - - - - My Open Project issues - project.issue.report - form - graph,tree,form, - [('state','=','open'),('user_id','=',uid)] - {'default_user_id': uid} - - - + + board.my.project.issue.form.inherit board.board form - - - - - + + - diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml index f7b5d0a3736..c76defe468f 100644 --- a/addons/purchase/board_purchase_view.xml +++ b/addons/purchase/board_purchase_view.xml @@ -2,11 +2,6 @@ - - Request for Quotations ir.actions.act_window @@ -16,14 +11,6 @@ [('state','=','draft')] {'quotation_only': True} - - Purchase Order Waiting Approval - ir.actions.act_window - purchase.order - form - tree,form - [('date_order','>',time.strftime('%Y-01-01 00:00:00')),('date_order','<',time.strftime('%Y-12-31 23:59:59')), ('state','in',('wait','confirmed'))] - purchase.order.monthly.categ.tree @@ -69,19 +56,6 @@ [('state','in',('approved','except_picking','except_invoice','done'))] - - - tree - - - - - - graph - - - - board.purchase.form @@ -102,19 +76,19 @@ - Purchase Dashboard + Purchases board.board form form menu - + + diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index b0d14ba2971..c989beba2d4 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -1,7 +1,7 @@ - + My Quotations sale.order @@ -15,7 +15,6 @@ turnover.by.month.tree account.invoice.report tree - @@ -27,16 +26,16 @@ turnover.by.month.graph account.invoice.report - graph - - - - + + + + + Monthly Turnover account.invoice.report @@ -45,17 +44,6 @@ [('year','ilike',time.strftime('%Y')),('user_id','=',uid)] {'group_by_no_leaf':1,'group_by':['month']} - - - - - graph - - - - - tree - @@ -75,6 +63,7 @@ + Sales board.board @@ -82,37 +71,12 @@ form - - - - - - board.sales.manager.form - board.board - form - -
- - - - - - - - - - - -
- - - - Sales Manager - board.board - form - form - - + + diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 4b3647a5ac2..e5111ca8d5e 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -131,130 +131,5 @@ - - - sales.by.partner.graph - sale.report - graph - - - - - - - - - - Sales per Customer in last 90 days - sale.report - form - graph,tree - [('state','=','done'),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] - - {'search_default_Customer':1} - - - - sales.by.salesman.graph - sale.report - graph - - - - - - - - - - Sales by Salesman in last 90 days - sale.report - form - graph,tree - [('state','in',('manual','progress','done')),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] - - {'search_default_User':1} - - - - sold.product.total.price.graph - sale.report - graph - - - - - - - - - - Sales by Product's Category in last 90 days - sale.report - form - graph,tree - [('state','in',('manual','progress','done')),('date','>',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))] - - {'search_default_Category':1} - - - - view.sales.by.month.tree - sale.report - tree - - - - - - - - - - - - - - - - - - - - - Sales by Month - sale.report - form - tree,graph - [('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))] - {'search_default_order_month':1,'group_by_no_leaf':0,'group_by':['month', 'product_id']} - - - - - sale.top.quotations.tree - sale.order - tree - - - - - - - - - - - - - - Quotations - sale.order - form - tree,form - [('state','=','draft')] - - - diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 9fab20c9643..1c416287e84 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -1,6 +1,20 @@ + + + report.stock.move.graph + report.stock.move + graph + + + + + + + + + Incoming Shipments stock.move @@ -27,7 +41,7 @@ form graph,tree [('type','=','in'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))] - + {'search_default_in':1} @@ -36,7 +50,7 @@ form graph,tree [('type','=','out'),('day','<=', time.strftime('%Y-%m-%d')),('day','>',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))] - + {'search_default_out':1} @@ -61,16 +75,18 @@ - Warehouse Dashboard + Warehouse board.board form form - - - + diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index dc457bc4ea8..7fbecedd00b 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -49,17 +49,7 @@ - - report.stock.move.graph - report.stock.move - graph - - - - - - - + report.stock.move.search report.stock.move