diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 56e75a3c036..cb0117d1975 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -151,3 +151,33 @@ "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1 +"access_account_invoice","account.invoice","model_account_invoice","project.group_project_finance_user",1,1,0,0 +"access_account_bank_statement","account.bank.statement","model_account_bank_statement","project.group_project_finance_user",1,1,0,0 +"access_account_move_line","account.move.line","model_account_move_line","project.group_project_finance_user",1,1,0,0 +"access_account_move","account.move","model_account_move","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_line","account.analytic.line","model_account_analytic_line","project.group_project_finance_user",1,1,0,0 +"access_account_move_line","account.move.line","model_account_move_line","project.group_project_finance_user",1,1,0,0 +"access_account_subscription","account.subscription","model_account_subscription","project.group_project_finance_user",1,1,0,0 +"access_account_period","account.period","model_account_period","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","project.group_project_finance_user",1,1,0,0 +"access_account_invoice_report","account.invoice.report","model_account_invoice_report","project.group_project_finance_user",1,1,0,0 +"access_account_entries_report","account.entries.report","model_account_entries_report","project.group_project_finance_user",1,1,0,0 +"access_analytic_entries_report","analytic.entries.report","model_analytic_entries_report","project.group_project_finance_user",1,1,0,0 +"access_account_journal_view","account.journal.view","model_account_journal_view","project.group_project_finance_user",1,1,0,0 +"access_account_account_type","account.account.type","model_account_account_type","project.group_project_finance_user",1,1,0,0 +"access_account_tax_code","account.tax.code","model_account_tax_code","project.group_project_finance_user",1,1,0,0 +"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","project.group_project_finance_user",1,1,0,0 +"access_account_account","account.account","model_account_account","project.group_project_finance_user",1,1,0,0 +"access_account_journal","account.journal","model_account_journal","project.group_project_finance_user",1,1,0,0 +"access_account_tax","account.tax","model_account_tax","project.group_project_finance_user",1,1,0,0 +"access_account_fiscal_position","account.fiscal.position","model_account_fiscal_position","project.group_project_finance_user",1,1,0,0 +"access_account_chart_template","account.chart.template","model_account_chart_template","project.group_project_finance_user",1,1,0,0 +"access_account_account_template","account.account.template","model_account_account_template","project.group_project_finance_user",1,1,0,0 +"access_account_tax_template","account.tax.template","model_account_tax_template","project.group_project_finance_user",1,1,0,0 +"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","project.group_project_finance_user",1,1,0,0 +"access_account_fiscal_position_template","account.fiscal.position.template","model_account_fiscal_position_template","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","project.group_project_finance_user",1,1,0,0 +"access_account_model","account.model","model_account_model","project.group_project_finance_user",1,1,0,0 +"access_account_payment_term","account.payment.term","model_account_payment_term","project.group_project_finance_user",1,1,0,0 +"access_res_currency","res.currency","base.model_res_currency","project.group_project_finance_user",1,1,0,0 +"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_finance_user",1,1,0,0 diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv index 4db9c88f766..819950b3193 100644 --- a/addons/account_analytic_analysis/security/ir.model.access.csv +++ b/addons/account_analytic_analysis/security/ir.model.access.csv @@ -1,5 +1,5 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0 -access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0 -access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0 -access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0 +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +"access_account_analytic_analysis_summary_user","account_analytic_analysis.summary.user","model_account_analytic_analysis_summary_user","account.group_account_manager",1,0,0,0 +"access_account_analytic_analysis_summary_month","account_analytic_analysis.summary.month","model_account_analytic_analysis_summary_month","account.group_account_manager",1,0,0,0 +"access_account_analytic_account_user","account.analytic.account.user","model_account_analytic_account","base.group_user",1,0,0,0 +"access_account_analytic_account_system","account.analytic.account.system","model_account_analytic_account","base.group_system",1,0,0,0 diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 44d09bec6cd..5bdceddec92 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -77,7 +77,7 @@ Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features. - + diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv index 40ac84200ef..2c38f7096b9 100644 --- a/addons/hr_timesheet/security/ir.model.access.csv +++ b/addons/hr_timesheet/security/ir.model.access.csv @@ -6,3 +6,4 @@ "access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1 "access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1 "access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1 +"access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","project.group_project_finance_user",1,0,0,0 diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv index c647fec62cf..6778e8eeb94 100644 --- a/addons/hr_timesheet_invoice/security/ir.model.access.csv +++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv @@ -14,3 +14,4 @@ "access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1 "access_account_invoice_tax_hr_manager","account.invoice.tax.hr.manager","account.model_account_invoice_tax","base.group_hr_manager",1,1,1,1 "access_report_timesheet_line_employee","report.timesheet.line.employee","model_report_timesheet_line","base.group_hr_user",1,1,1,1 +"access_hr_timesheet_invoice_factor","hr_timesheet_invoice.factor","model_hr_timesheet_invoice_factor","project.group_project_finance_user",1,1,0,0 diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index 676a77938e2..735e5d950ab 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","hr.group_hr_manager",1,0,0,0 +"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,0,0,0 "access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1 "access_hr_timesheet_sheet_sheet_system_user","hr_timesheet_sheet.sheet.system.user","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,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 @@ -8,3 +8,4 @@ "access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",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,0,0,0 +"access_model_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0 diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index 99e4c000a6b..f4d8b32e569 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -92,11 +92,7 @@ class report_project_task_user(osv.osv): (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24) as delay_endings_days FROM project_task t -<<<<<<< TREE - group by -======= GROUP BY ->>>>>>> MERGE-SOURCE t.id, remaining_hours, t.effective_hours, diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index b409a98bc52..82257b557f2 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -36,3 +36,8 @@ "access_account_analytic_account_project_financial_user","account.analytic.account.project.financial.user","analytic.model_account_analytic_account","group_project_finance_user",1,0,0,0 "access_project_task_type_project_financial_user","project.task.type.project.financial.user","model_project_task_type","group_project_finance_user",1,0,0,0 "access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0 +"access_project_project","project.project","model_project_project","group_project_finance_user",1,0,0,0 +"access_project_task","project.task","model_project_task","group_project_finance_user",1,0,0,0 +"access_account_analytic_line","account.analytic.line","account.model_account_analytic_line","group_project_finance_user",1,0,0,0 +"access_report_project_task_user","report.project.task.user","model_report_project_task_user","group_project_finance_user",1,0,0,0 +"access_project_task_type","project.task.type","model_project_task_type","group_project_finance_user",1,0,0,0 diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv index 0986ea1570f..cd79da5eda5 100644 --- a/addons/project_gtd/security/ir.model.access.csv +++ b/addons/project_gtd/security/ir.model.access.csv @@ -8,4 +8,6 @@ "access_project_gtd_context_system","project.gtd.context system","model_project_gtd_context","base.group_system",1,1,1,1 "access_project_gtd_timebox_system","project.gtd.timebox system","model_project_gtd_timebox","base.group_system",1,1,1,1 "access_project_gtd_context_finacial_user","project.gtd.context.financial.user","model_project_gtd_context","project.group_project_finance_user",1,0,0,0 -"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0 \ No newline at end of file +"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0 +"access_project_gtd_context","project.gtd.context","model_project_gtd_context","project.group_project_finance_user",1,0,0,0 +"access_project_gtd_timebox","project.gtd.timebox","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 958a5faae49..63f34bdce31 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -105,33 +105,7 @@ class project_issue_report(osv.osv): (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email FROM project_issue c -<<<<<<< TREE - where c.categ_id in (select res_id from ir_model_data where name='bug_categ') - group by - to_char(c.create_date, 'YYYY'), - to_char(c.create_date, 'MM'), - to_char(c.create_date, 'YYYY-MM-DD'), - c.state, - to_char(c.date_open, 'YYYY-MM-DD'), - to_char(c.date_closed, 'YYYY-mm-dd'), - c.user_id, - c.section_id, - c.categ_id, - c.stage_id, - c.company_id, - c.priority, - c.working_hours_open, - c.working_hours_close, - c.project_id, - to_char(c.date_closed, 'YYYY-MM-DD'), - c.type_id, - c.working_hours_open, - c.working_hours_close, - date_trunc('day',c.create_date), - c.assigned_to, - c.partner_id, - c.canal_id, - c.task_id + WHERE c.categ_id IN (select res_id from ir_model_data WHERE model = 'crm.case.categ' and name='bug_categ') )""") project_issue_report() diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index 5e82efa761e..c4315743630 100755 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -22,3 +22,8 @@ "access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1 "access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0 "access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0 +"access_project_issue","project.issue","model_project_issue","project.group_project_finance_user",1,0,0,0 +"access_project_issue_report","project.issue.report","model_project_issue_report","project.group_project_finance_user",1,0,0,0 +"access_project_issue_version","project.issue.version","model_project_issue_version","project.group_project_finance_user",1,0,0,0 +"access_crm_case_categ","crm.case.categ","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0 +"access_resource_calendar","resource.calendar","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv index 25bcbe03ccd..c684fc0c911 100644 --- a/addons/project_issue_sheet/security/ir.model.access.csv +++ b/addons/project_issue_sheet/security/ir.model.access.csv @@ -20,3 +20,4 @@ "access_account_fiscalyear_project_user","account.fiscalyear.project.user","account.model_account_fiscalyear","project.group_project_user",1,1,1,0 "access_hr_timesheet_invoice_factor_project_user","hr_timesheet_invoice.factor.project.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_user",1,1,1,0 "access_account_invoice_project_user","account.invoice.project.user","account.model_account_invoice","project.group_project_user",1,1,1,0 +"access_hr_analytic_timesheet","hr.analytic.timesheet","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0 diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv index ecb10470af2..23b0da1a99e 100644 --- a/addons/project_long_term/security/ir.model.access.csv +++ b/addons/project_long_term/security/ir.model.access.csv @@ -14,3 +14,8 @@ "access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0 "access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0 "access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1 +"access_resource_resource","resource.resource","model_resource_resource","project.group_project_finance_user",1,0,0,0 +"access_project_phase","project.phase","model_project_phase","project.group_project_finance_user",1,0,0,0 +"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_finance_user",1,0,0,0 +"access_resource_calendar","resource.calendar","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0 +"access_resource_calendar_leaves","resource.calendar.leaves","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv index e31ffd860cb..594ba33f459 100644 --- a/addons/project_messages/security/ir.model.access.csv +++ b/addons/project_messages/security/ir.model.access.csv @@ -3,3 +3,4 @@ "access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1 "access_project_messages_financial_user","project.messages.financial.user","model_project_messages","project.group_project_finance_user",1,0,0,0 "access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0 +"access_project_messages","project.messages","model_project_messages","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv index 2c6c92db8ff..053237c6c3b 100644 --- a/addons/project_planning/security/ir.model.access.csv +++ b/addons/project_planning/security/ir.model.access.csv @@ -12,4 +12,5 @@ "access_report_account_analytic_planning_financial_user","report_account_analytic.planning.financial.user","model_report_account_analytic_planning","project.group_project_finance_user",1,0,0,0 "access_report_account_analytic_planning_stat_financial_user","report_account_analytic.planning.stat.financial.user","model_report_account_analytic_planning_stat","project.group_project_finance_user",1,0,0,0 "access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1 -"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0 \ No newline at end of file +"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0 +"access_report_account_analytic_planning","report_account_analytic.planning","model_report_account_analytic_planning","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv index eb83fb8d117..6d713f89d40 100644 --- a/addons/project_scrum/security/ir.model.access.csv +++ b/addons/project_scrum/security/ir.model.access.csv @@ -13,3 +13,6 @@ "access_project_scrum_backlog_financial_user","project_scrum.product.backlog.financial.user","model_project_scrum_product_backlog","project.group_project_finance_user",1,0,0,0 "access_project_scrum_sprint_financial_user","project_scrum.sprint.financial.user","model_project_scrum_sprint","project.group_project_finance_user",1,0,0,0 "access_scrum_meeting_financial_user","project_scrum.meeting.financial.user","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0 +"access_scrum_product_backlog","project.scrum.product.backlog","model_project_scrum_product_backlog","project.group_project_finance_user",1,0,0,0 +"access_scrum_sprint","project.scrum.sprint","model_project_scrum_sprint","project.group_project_finance_user",1,0,0,0 +"access_scrum_meeting","project.scrum.meeting","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0 diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv index c3e10338ebc..3bc7efae8c5 100644 --- a/addons/project_timesheet/security/ir.model.access.csv +++ b/addons/project_timesheet/security/ir.model.access.csv @@ -6,4 +6,4 @@ "access_hr_timesheet_sheet_sheet_system","hr.timesheet.sheet.sheet.system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,1,1,1 "access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0 "access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0 - +"access_hr_analytic_timesheet","hr.analytic.timesheet","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_finance_user",1,1,0,0