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

Merge

Browse Source 
bzr revid: sbh@tinyerp.com-20100305140834-at863fvsjbxjrk9v
This commit is contained in:
sbh (Open ERP)
2010-03-05 19:38:34 +05:30
parent 877085a68e f8f53fe790
commit db1b9ffd55
29 changed files with 520 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/board_hr/__terp__.py
+1 -1
View File
@@ -31,7 +31,7 @@ This module implements a dashboard for human resource management that includes:
* My Expenses
""",
'author': 'Tiny',
'depends': [ 'crm_project','board','hr_expense','hr_timesheet_sheet','hr_holidays'
'depends': [ 'project_issue','board','hr_expense','hr_timesheet_sheet','hr_holidays'
],
'update_xml': ['board_hr_view.xml'],
'demo_xml': [],
addons/board_project/__terp__.py
+1 -1
View File
@@ -40,7 +40,7 @@ This module implements a dashboard for project member that includes:
'report_analytic_line',
'report_task',
'hr_timesheet_sheet',
'crm_project',
'project_issue',
'resource'
],
'update_xml': ['board_project_view.xml', 'board_project_manager_view.xml'],
addons/board_project/board_project_view.xml
+2 -2
View File
@@ -80,7 +80,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('resource_type','=','user')]</field>
<field name="view_id" ref="resource.view_project_member_tree"/>
<field name="view_id" ref="resource.resource_resource_tree"/>
</record>
<record id="board_project_form" model="ir.ui.view">
@@ -92,7 +92,7 @@
<hpaned>
<child1>
<action colspan="4" height="220" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
<action colspan="4" name="%(crm_project.crm_case_categ_act0)d" string="Issues"/>
<action colspan="4" name="%(project_issue.project_issue_categ_act0)d" string="Issues"/>
</child1>
<child2>
addons/crm_project/crm_feature_menu.xml
-38
View File
@@ -1,38 +0,0 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
######################## Future Request (menu) ###########################
<record model="ir.actions.act_window" id="action_crm_case_future">
<field name="name">Future Requests</field>
<field name="res_model">crm.project.bug</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_tree_view"/>
<field name="domain" eval="[('categ_id','=',ref('feature_request_categ'))]"/>
<field name="search_view_id" ref="view_crm_case_bugs_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_future_tree_view0">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view"/>
<field name="act_window_id" ref="action_crm_case_future"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_future_calendar_view0">
<field name="sequence" eval="2"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="crm_case_calendar_view"/>
<field name="act_window_id" ref="action_crm_case_future"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_future_form_view0">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view"/>
<field name="act_window_id" ref="action_crm_case_future"/>
</record>
<menuitem name="Feature Requests" id="menu_crm_case_future_request" parent="project.menu_project_management" action="action_crm_case_future"/>
</data>
</openerp>
addons/crm_project/crm_report_project_bug_view.xml
-96
View File
@@ -1,96 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--
Project Bug
-->
<record id="view_crm_project_bug_tree" model="ir.ui.view">
<field name="name">crm.project.bug.report.tree</field>
<field name="model">crm.project.bug.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Project Bug">
<field name="name" />
<field name="month"/>
<field name="nbr" string="#Project Bug"/>
<field name="amount_revenue"/>
<field name="probability"/>
<field name="amount_revenue_prob"/>
<field name="delay_close"/>
<field name="state" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="stage_id" invisible="1"/>
<field name="categ_id" invisible="1"/>
</tree>
</field>
</record>
<record id="view_crm_project_bug_form" model="ir.ui.view">
<field name="name">crm.project.bug.report.form</field>
<field name="model">crm.project.bug.report</field>
<field name="inherit_id" ref="crm.view_crm_case_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="nbr" position="after">
<field name="delay_close"/>
<field name="amount_revenue"/>
<field name="amount_costs"/>
<field name="amount_revenue_prob"/>
<field name="probability"/>
</field>
</field>
</record>
<record id="view_crm_project_bug_graph" model="ir.ui.view">
<field name="name">crm.project.bug.report.graph</field>
<field name="model">crm.project.bug.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph orientation="horizontal" string="Project Bug" type="bar">
<field name="state"/>
<field name="nbr" operator="+"/>
<field group="True" name="user_id"/>
</graph>
</field>
</record>
<record id="view_crm_project_bug_filter" model="ir.ui.view">
<field name="name">crm.project.bug.report.select</field>
<field name="model">crm.project.bug.report</field>
<field name="inherit_id" ref="crm.view_crm_case_filter"/>
<field name="type">search</field>
<field name="arch" type="xml">
<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
</xpath>
</field>
</record>
<record id="action_report_crm_project_bug" model="ir.actions.act_window">
<field name="name">Project Bug</field>
<field name="res_model">crm.project.bug.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_crm_project_bug_graph"/>
<field name="search_view_id" ref="view_crm_project_bug_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_report_project_bug_tree">
<field name="sequence" eval="2"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_crm_project_bug_tree"/>
<field name="act_window_id" ref="action_report_crm_project_bug"/>
</record>
<record model="ir.actions.act_window.view" id="action_report_project_bug_graph">
<field name="sequence" eval="1"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_crm_project_bug_graph"/>
<field name="act_window_id" ref="action_report_crm_project_bug"/>
</record>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
<menuitem action="action_report_crm_project_bug" id="menu_crm_project_bug_user_tree" parent="base.menu_project_report"/>
</data>
</openerp>
addons/crm_project/security/crm_project_security.xml
-18
View File
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record model="ir.rule.group" id="crm_project_bug_rule_group">
<field name="name">crm.project.bug.rule.group</field>
<field name="model_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_project_bug_rule" model="ir.rule">
<field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
<field name="rule_group" ref="crm_project_bug_rule_group"/>
</record>
</data>
</openerp>
addons/crm_project/security/ir.model.access.csv
-3
View File
@@ -1,3 +0,0 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_crm_project_bug","crm.project.bug","model_crm_project_bug","crm.group_crm_manager",1,1,1,1
"access_report_crm_project_bug","report.crm.project.bug","model_report_crm_project_bug","crm.group_crm_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_crm_project_bug crm.project.bug model_crm_project_bug crm.group_crm_manager 1 1 1 1
3 access_report_crm_project_bug report.crm.project.bug model_report_crm_project_bug crm.group_crm_manager 1 0 0 0
addons/hr_evaluation/hr_evaluation.py
+128 -24
View File
@@ -22,6 +22,8 @@
import time
from osv import fields, osv
from mx import DateTime as dt
import tools
from tools.translate import _
class hr_evaluation_plan(osv.osv):
_name = "hr_evaluation.plan"
@@ -76,9 +78,9 @@ class hr_employee(osv.osv):
_inherit="hr.employee"
_columns = {
'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation",readonly=True),
'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation"),
}
def onchange_evaluation_plan_id(self,cr,uid,ids,evaluation_plan_id,context={}):
evaluation_date = self.browse(cr, uid, ids)[0].evaluation_date or ''
evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
@@ -91,21 +93,6 @@ class hr_employee(osv.osv):
return {'value': {'evaluation_date':evaluation_date}}
hr_employee()
class hr_evaluation_interview(osv.osv):
_name = "hr.evaluation.interview"
_inherit = "survey.request"
def default_get(self, cr, uid, fields, context={}):
data = super(hr_evaluation_interview, self).default_get(cr, uid, fields, context)
if context.has_key('phase_id'):
data['survey_id'] =self.pool.get('hr_evaluation.plan.phase').browse(cr, uid, context['phase_id']).survey_id.id
return data
_columns = {
'user_to_review_id': fields.many2one('hr.employee', 'Employee'),
}
hr_evaluation_interview()
class hr_evaluation(osv.osv):
_name = "hr_evaluation.evaluation"
_description = "Employee Evaluation"
@@ -124,11 +111,7 @@ class hr_evaluation(osv.osv):
('3','Exceeds expectations'),
('4','Significantly exceeds expectations'),
], "Overall Rating", help="This is the overall rating on that summarize the evaluation"),
'survey_request_ids': fields.many2many('hr.evaluation.interview',
'hr_evaluation_evaluation_requests',
'evaluation_id',
'survey_id',
'Appraisal Forms'),
'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
'state': fields.selection([
('draft','Draft'),
@@ -137,19 +120,80 @@ class hr_evaluation(osv.osv):
('done','Done'),
('cancel','Cancelled'),
], 'State', required=True,readonly=True),
'date_close': fields.date('Ending Date')
'date_close': fields.date('Ending Date'),
'progress' : fields.float("Progress"),
}
_defaults = {
'date' : lambda *a: time.strftime('%Y-%m-%d'),
'date' : lambda *a: (dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d'),
'state' : lambda *a: 'draft',
}
def onchange_employee_id(self,cr,uid,ids,employee_id,context={}):
employee_obj=self.pool.get('hr.employee')
evaluation_plan_id=''
if employee_id:
for employee in employee_obj.browse(cr,uid,[employee_id]):
if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
evaluation_plan_id=employee.evaluation_plan_id.id
employee_ids=employee_obj.search(cr,uid,[('parent_id','=',employee.id)])
return {'value': {'plan_id':evaluation_plan_id}}
def button_plan_in_progress(self,cr, uid, ids, context):
employee_obj = self.pool.get('hr.employee')
hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
survey_request_obj = self.pool.get('survey.request')
curr_employee=self.browse(cr,uid, ids)[0].employee_id
child_employees=employee_obj.browse(cr,uid, employee_obj.search(cr,uid,[('parent_id','=',curr_employee.id)]))
manager_employee=curr_employee.parent_id
for evaluation in self.browse(cr,uid,ids):
if evaluation and evaluation.plan_id:
apprai_id = []
for phase in evaluation.plan_id.phase_ids:
if phase.action == "bottom-up":
for child in child_employees:
if child.user_id:
user = child.user_id.id
id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id ,'user_id' : user,'survey_id' : phase.survey_id.id, 'user_to_review_id' : child.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
if not phase.wait:
hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
apprai_id.append(id)
elif phase.action == "top-down":
if manager_employee:
user = False
if manager_employee.user_id:
user = manager_employee.user_id.id
id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id,'user_id': user ,'survey_id' : phase.survey_id.id, 'user_to_review_id' :manager_employee.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
if not phase.wait:
hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
apprai_id.append(id)
elif phase.action == "self":
if curr_employee:
user = False
if curr_employee.user_id:
user = curr_employee.user_id.id
id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id,'user_id' : user, 'survey_id' : phase.survey_id.id, 'user_to_review_id' :curr_employee.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
if not phase.wait:
hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
apprai_id.append(id)
elif phase.action == "final":
if manager_employee:
user = False
if manager_employee.user_id:
user = manager_employee.user_id.id
id = hr_eval_inter_obj.create(cr, uid, {'evaluation_id':evaluation.id,'user_id' : user, 'survey_id' : phase.survey_id.id, 'user_to_review_id' :manager_employee.id, 'date_deadline' :(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d')})
if not phase.wait:
hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [id], context)
apprai_id.append(id)
self.write(cr, uid, evaluation.id, {'survey_request_ids':[[6, 0, apprai_id]]})
self.write(cr,uid,ids,{'state':'wait'})
return True
def button_final_validation(self,cr, uid, ids, context):
self.write(cr,uid,ids,{'state':'progress'})
request_obj = self.pool.get('hr.evaluation.interview')
for id in self.browse(cr, uid ,ids):
if len(id.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', id.id),('state', '=', 'done')])):
raise osv.except_osv(_('Warning !'),_("You cannot change state, because some appraisal in waiting answer or draft state"))
return True
def button_done(self,cr, uid, ids, context):
@@ -162,3 +206,63 @@ class hr_evaluation(osv.osv):
hr_evaluation()
class survey_request(osv.osv):
_inherit="survey.request"
_columns = {
'is_evaluation':fields.boolean('Is Evaluation?'),
}
survey_request()
class hr_evaluation_interview(osv.osv):
_name='hr.evaluation.interview'
_inherits={'survey.request':'request_id'}
_description='Evaluation Interview'
_columns = {
'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade'),
'user_to_review_id': fields.many2one('hr.employee', 'Employee'),
'evaluation_id' : fields.many2one('hr_evaluation.evaluation', 'Evaluation'),
}
_defaults = {
'is_evaluation': lambda *a: True,
}
def survey_req_waiting_answer(self, cr, uid, ids, context):
self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
# for id in self.browse(cr, uid, ids):
# if id.user_id and id.user_id.address_id and id.user_id.address_id and id.user_id.address_id.email:
# msg = " Hello %s, \n\n We are inviting you for %s survey. \n\n Thanks," %(id.user_id.name, id.survey_id.title)
# tools.email_send(tools.config['email_from'], [id.user_id.address_id.email],\
# 'Invite to fill up Survey', msg)
return True
def survey_req_done(self, cr, uid, ids, context):
self.write(cr, uid, ids, { 'state' : 'done'})
hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
for id in self.browse(cr, uid, ids):
flag = False
wating_id = 0
tot_done_req = 0
records = self.pool.get("hr_evaluation.evaluation").browse(cr, uid, [id.evaluation_id.id])[0].survey_request_ids
for child in records:
if child.state == "draft" :
wating_id = child.id
continue
if child.state != "done":
flag = True
else :
tot_done_req += 1
if not flag and wating_id:
self.survey_req_waiting_answer(cr, uid, [wating_id], context)
hr_eval_obj.write(cr, uid, [id.evaluation_id.id], {'progress' :tot_done_req * 100 / len(records)})
return True
def survey_req_draft(self, cr, uid, ids, arg):
self.write(cr, uid, ids, { 'state' : 'draft'})
return True
def survey_req_cancel(self, cr, uid, ids, context):
self.write(cr, uid, ids, { 'state' : 'cancel'})
return True
hr_evaluation_interview()
addons/hr_evaluation/hr_evaluation_data.xml
+30 -30
View File
@@ -1499,15 +1499,15 @@ Once the form had been filled, the employee send it to his supervisor.
</data>
<data noupdate="1">
<record id="survey_request_1" model="survey.request">
<field name="state">waiting_answer</field>
<field name="survey_id" ref="hr_evaluation.survey_2"/>
<field name="user_id" ref="base.user_root"/>
<field name="email">fp@tinyerp.com</field>
<field name="date_deadline">2010-02-21</field>
</record>
</data>
<!-- <data noupdate="1">-->
<!-- <record id="survey_request_1" model="survey.request">-->
<!-- <field name="state">waiting_answer</field>-->
<!-- <field name="survey_id" ref="hr_evaluation.survey_2"/>-->
<!-- <field name="user_id" ref="base.user_root"/>-->
<!-- <field name="email">fp@tinyerp.com</field>-->
<!-- <field name="date_deadline">2010-02-21</field>-->
<!-- </record>-->
<!-- </data>-->
<data noupdate="1">
<record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
<field eval="1" name="active"/>
@@ -1578,27 +1578,27 @@ Once the form had been filled, the employee send it to his supervisor.
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_interview_1" model="hr.evaluation.interview">
<field name="state">waiting_answer</field>
<field name="survey_id" ref="hr_evaluation.survey_2"/>
<field name="user_id" ref="base.user_root"/>
<field name="email">fp@tinyerp.com</field>
<field name="date_deadline">2010-02-21</field>
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">
<field name="rating">0</field>
<field name="employee_id" ref="hr.employee1"/>
<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
<field name="state">draft</field>
<field eval="[(6,0,[ref('hr_evaluation_interview_1')])]" name="survey_request_ids"/>
<field name="date">2010-01-21</field>
<field name="phase_id" ref="hr_evaluation_plan_phase_sendtomanagers0"/>
<field name="manager_id" ref="base.user_root"/>
</record>
</data>
<!-- <data noupdate="1">-->
<!-- <record id="hr_evaluation_interview_1" model="survey.request">-->
<!-- <field name="state">waiting_answer</field>-->
<!-- <field name="survey_id" ref="hr_evaluation.survey_2"/>-->
<!-- <field name="user_id" ref="base.user_root"/>-->
<!-- <field name="email">fp@tinyerp.com</field>-->
<!-- <field name="date_deadline">2010-02-21</field>-->
<!-- </record>-->
<!-- </data>-->
<!-- <data noupdate="1">-->
<!-- <record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">-->
<!-- <field name="rating">0</field>-->
<!-- <field name="employee_id" ref="hr.employee1"/>-->
<!-- <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>-->
<!-- <field name="state">draft</field>-->
<!-- <field eval="[(6,0,[ref('hr_evaluation_interview_1')])]" name="survey_request_ids"/>-->
<!-- <field name="date">2010-01-21</field>-->
<!-- <field name="phase_id" ref="hr_evaluation_plan_phase_sendtomanagers0"/>-->
<!-- <field name="manager_id" ref="base.user_root"/>-->
<!-- </record>-->
<!-- </data>-->
</openerp>
addons/hr_evaluation/hr_evaluation_view.xml
+64 -19
View File
@@ -44,7 +44,7 @@
<menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
<!--menuitem name="HR Responsible" parent="menu_eval_hr" id="menu_resp_hr"/-->
<menuitem
name="Evaluation Plan" parent="menu_eval_hr"
name="Periodic Evaluations" parent="hr.menu_hr_configuration"
id="menu_open_view_hr_evaluation_plan_tree"
action="open_view_hr_evaluation_plan_tree"/>
@@ -63,7 +63,7 @@
<group col="4" colspan="4">
<separator string="Action to Perform" colspan="4"/>
<field name="action"/>
<field name="survey_id" widget="selection"/>
<field name="survey_id"/>
</group>
<group col="4" colspan="4">
<group col="4" colspan="2">
@@ -93,7 +93,7 @@
<field name="sequence"/>
<field name="name"/>
<field name="action"/>
<field name="survey_id" widget="selection"/>
<field name="survey_id"/>
<field name="wait"/>
</tree>
</field>
@@ -121,9 +121,10 @@
<form string="Evaluation">
<group col="4" colspan="3">
<separator string="Evaluation Data" colspan="4"/>
<field name="employee_id"/>
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
<field name="plan_id"/>
<field name="date"/>
<field name="progress" widget="progressbar"/>
</group>
<group col="2" colspan="1">
<separator string="Ending Summary" colspan="2"/>
@@ -173,36 +174,57 @@
<tree string="Evaluation">
<!--field name="create_date"/-->
<field name="employee_id"/>
<!-- field name="progress"/ -->
<field name="plan_id"/>
<field name="rating"/>
<field name="date"/>
<field name="progress" widget="progressbar"/>
<field name="state"/>
</tree>
</field>
</record>
<record id="hr_evaluation.evaluation_search" model="ir.ui.view">
<field name="name">hr_evaluation.evaluation_search</field>
<field name="model">hr_evaluation.evaluation</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Evaluation">
<group col='10' colspan='4'>
<filter icon="terp-hr" string="Draft" domain="[('state','=','draft')]"/>
<filter icon="terp-crm" string="Plan In progress" domain="[('state','=','wait')]"/>
<filter icon="terp-mrp" string="Final Validation" domain="[('state','=','progress')]"/>
<filter icon="terp-stock" string="Done" domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="employee_id" widget="selection" select="1"/>
<field name="plan_id" widget="selection" select="1"/>
<field name="rating"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
<field name="res_model">hr_evaluation.evaluation</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
</record>
<menuitem
name="Evaluation" parent="menu_eval_hr"
id="menu_open_view_hr_evaluation_tree"
action="open_view_hr_evaluation_tree"/>
<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
<field name="name">hr_evaluation.interview.form</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Survey Request">
<form string="Interview Evaluation">
<group col="4" colspan="4">
<field name="survey_id" widget="selection" colspan="3"/>
<field name="survey_id" colspan="3"/>
<group colspan="1">
<button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
<button name="%(survey.survey_browse_response)d" string="Print Interview" type="action"
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
</group>
@@ -215,39 +237,62 @@
</group>
<newline/>
<separator string="State" colspan="4"/>
<group colspan="4" col="5">
<field name="state"/>
<button name="survey_req_waiting_answer" string="Set to Watting Answer" states="cancel,done" type="object" icon="gtk-new"/>
<group colspan="4" col="6">
<field name="state"/>
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
<button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
<button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
<button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_hr_evaluation_interview_tree">
<field name="name">hr_evaluation.interview.tree</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Evaluation Plan Phase">
<tree string="Interview Evaluation">
<field name="date_deadline"/>
<field name="survey_id" widget="selection"/>
<field name="survey_id"/>
<field name="user_to_review_id"/>
<field name="response" readonly="1" invisible="True"/>
<button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
<button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="waiting_answer,done,cancel"
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','!=',True),('survey_id','!=',True)]}" />
<field name="state" />
icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
<field name="state"/>
</tree>
</field>
</record>
<record id="view_hr_evaluation_interview_search" model="ir.ui.view">
<field name="name">view_hr_evaluation_interview_search</field>
<field name="model">hr.evaluation.interview</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Evaluation">
<group col='10' colspan='4'>
<filter icon="terp-crm" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
<filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
<separator orientation="vertical"/>
<field name="survey_id" widget="selection" select="1"/>
<field name="email" select="1"/>
<field name="user_id" select="1" widget="selection" default="1">
<filter string="MY" icon="terp-partner" domain="[('user_id','=',uid)]"/>
</field>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_hr_evaluation_interview_tree">
<field name="res_model">hr.evaluation.interview</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('is_evaluation' ,'=', True)]</field>
<field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
</record>
<menuitem
addons/crm_project/__init__.py → addons/project_issue/__init__.py
+1 -1
View File
@@ -21,7 +21,7 @@
##############################################################################
import crm_project_bug
import project_issue
import report
import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/crm_project/__terp__.py → addons/project_issue/__terp__.py
+10 -10
View File
@@ -22,28 +22,28 @@
{
'name': 'Bug Reporting in Project Management',
'name': 'Issue Management in Project Management',
'version': '1.0',
'category': 'Generic Modules/CRM & SRM',
'description': """
This module provide Store the project bugs with cases
This module provide Issues/Bugs Management in Project
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['crm','project'],
'init_xml': [
'crm_bugs_data.xml'
'project_issue_data.xml'
],
'update_xml': [
'crm_bug_wizard.xml',
'crm_bugs_view.xml',
'crm_bugs_menu.xml',
'crm_feature_menu.xml',
'crm_report_project_bug_view.xml',
'security/crm_project_security.xml',
'project_issue_wizard.xml',
'project_issue_view.xml',
'project_issue_menu.xml',
'project_feature_menu.xml',
'report/project_issue_report_view.xml',
'security/project_issue_security.xml',
'security/ir.model.access.csv',
],
'demo_xml': ['crm_bugs_demo.xml'],
'demo_xml': ['project_issue_demo.xml'],
'installable': True,
'active': False,
}
addons/project_issue/project_feature_menu.xml
+38
View File
@@ -0,0 +1,38 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
######################## Future Request (menu) ###########################
<record model="ir.actions.act_window" id="action_project_feature">
<field name="name">Future Requests</field>
<field name="res_model">project.issue</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="project_issue_tree_view"/>
<field name="domain" eval="[('categ_id','=',ref('feature_request_categ'))]"/>
<field name="search_view_id" ref="view_project_issue_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_project_feature_tree_view0">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="project_issue_tree_view"/>
<field name="act_window_id" ref="action_project_feature"/>
</record>
<record model="ir.actions.act_window.view" id="action_project_feature_calendar_view0">
<field name="sequence" eval="2"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="project_issue_calendar_view"/>
<field name="act_window_id" ref="action_project_feature"/>
</record>
<record model="ir.actions.act_window.view" id="action_project_feature_form_view0">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="project_issue_form_view"/>
<field name="act_window_id" ref="action_project_feature"/>
</record>
<menuitem name="Feature Requests" id="menu_project_issue_future_request" parent="project.menu_project_management" action="action_project_feature"/>
</data>
</openerp>
addons/crm_project/crm_project_bug.py → addons/project_issue/project_issue.py
+8 -10
View File
@@ -22,8 +22,6 @@
import time
import re
import os
import mx.DateTime
import base64
from tools.translate import _
@@ -35,9 +33,9 @@ from osv.orm import except_orm
from crm import crm
class crm_project_bug(osv.osv):
_name = "crm.project.bug"
_description = "Project Bug Cases"
class project_issue(osv.osv):
_name = "project.issue"
_description = "Project Issue"
_order = "priority, id desc"
_inherit = 'crm.case'
_columns = {
@@ -54,12 +52,12 @@ class crm_project_bug(osv.osv):
"to be created with a factor for each level from 0 (Very dissatisfied) to 10 (Extremely satisfied)."),
'categ_id': fields.many2one('crm.case.categ','Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'crm.project.bug')]"),
'type_id': fields.many2one('crm.case.resource.type', 'Bug Type', domain="[('object_id.model', '=', 'project.issue')]"),
'partner_name': fields.char("Employee's Name", size=64),
'partner_mobile': fields.char('Mobile', size=32),
'partner_phone': fields.char('Phone', size=32),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'crm.project.bug')]"),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
'project_id':fields.many2one('project.project', 'Project'),
'duration': fields.float('Duration'),
'probability': fields.float('Probability (%)'),
@@ -74,7 +72,7 @@ class crm_project_bug(osv.osv):
def _convert(self, cr, uid, ids, xml_id, context=None):
data_obj = self.pool.get('ir.model.data')
id2 = data_obj._get_id(cr, uid, 'crm_project', xml_id)
id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
categ_id = False
if id2:
categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
@@ -97,11 +95,11 @@ class crm_project_bug(osv.osv):
return {'value':{'probability':stage.probability}}
_defaults = {
'project_id':_get_project,
'project_id':_get_project,
'probability':lambda *a:0.0,
'planned_cost':lambda *a:0.0,
'planned_revenue':lambda *a:0.0,
}
crm_project_bug()
project_issue()
addons/crm_project/crm_bugs_data.xml → addons/project_issue/project_issue_data.xml
+10 -10
View File
@@ -9,12 +9,12 @@
<record model="crm.case.categ" id="bug_categ">
<field name="name">Bugs</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<record model="crm.case.categ" id="feature_request_categ">
<field name="name">Feature Requests</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<!--
@@ -24,12 +24,12 @@
<record model="crm.case.resource.type" id="type1">
<field name="name">Version 4.2</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<record model="crm.case.resource.type" id="type2">
<field name="name">Version 4.4</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<!--
@@ -40,32 +40,32 @@
<record model="crm.case.stage" id="stage1">
<field name="name">Accepted as Bug</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage2">
<field name="name">Fixed</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage3">
<field name="name">Won't fix</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage4">
<field name="name">Invalid</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage5">
<field name="name">Awaiting Response</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage6">
<field name="name">Works For Me</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
<field name="object_id" search="[('model','=','project.issue')]" model="ir.model"/>
</record>
</data>
</openerp>
addons/crm_project/crm_bugs_demo.xml → addons/project_issue/project_issue_demo.xml
+17 -17
View File
@@ -4,8 +4,8 @@
<!--
((((((((((( Demo Cases )))))))))))
-->
<!--For Bug Tracking-->
<record id="crm_case_buginaccountsmodule0" model="crm.project.bug">
<!--For Issue Tracking-->
<record id="crm_case_buginaccountsmodule0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_8"/>
<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -30,7 +30,7 @@
<field model="res.partner.canal" name="canal_id" search="[('name','=','website')]"/>
</record>
<record id="crm_case_programnotgivingproperoutput0" model="crm.project.bug">
<record id="crm_case_programnotgivingproperoutput0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_tang"/>
<field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/>
<field name="type_id" ref="type2"/>
@@ -47,7 +47,7 @@
<field name="project_id" ref="project.project_project_22"/>
</record>
<record id="crm_case_outputincorrect0" model="crm.project.bug">
<record id="crm_case_outputincorrect0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_9"/>
<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -64,7 +64,7 @@
<field eval="&quot;Output incorrect&quot;" name="name"/>
</record>
<record id="crm_case_problemloadingpage0" model="crm.project.bug">
<record id="crm_case_problemloadingpage0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_13"/>
<field eval="time.strftime('%Y-%m-20 15:25:05')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -81,7 +81,7 @@
<field eval="&quot;Problem loading page&quot;" name="name"/>
</record>
<record id="crm_case_pagenotfound0" model="crm.project.bug">
<record id="crm_case_pagenotfound0" model="project.issue">
<field eval="time.strftime('%Y-%m-22 18:15:00')" name="date"/>
<field name="type_id" ref="type1"/>
<field eval="&quot;3&quot;" name="priority"/>
@@ -97,7 +97,7 @@
<field eval="&quot;Page not Found&quot;" name="name"/>
</record>
<record id="crm_case_programmingerror0" model="crm.project.bug">
<record id="crm_case_programmingerror0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_10"/>
<field eval="time.strftime('%Y-%m-24 09:45:00')" name="date"/>
<field name="type_id" ref="type2"/>
@@ -114,7 +114,7 @@
<field eval="&quot;Programming Error&quot;" name="name"/>
</record>
<record id="crm_case_logicalerrorinprogram0" model="crm.project.bug">
<record id="crm_case_logicalerrorinprogram0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_6"/>
<field eval="time.strftime('%Y-%m-26 11:10:00')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -131,7 +131,7 @@
<field eval="&quot;Logical Error in Program&quot;" name="name"/>
</record>
<record id="crm_case_constrainterror0" model="crm.project.bug">
<record id="crm_case_constrainterror0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_6"/>
<field eval="time.strftime('%Y-%m-25 13:35:00')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -148,7 +148,7 @@
<field eval="&quot;Constraint Error&quot;" name="name"/>
</record>
<record id="crm_case_errorinprogram0" model="crm.project.bug">
<record id="crm_case_errorinprogram0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_10"/>
<field eval="time.strftime('%Y-%m-28 15:40:00')" name="date"/>
<field name="type_id" ref="type2"/>
@@ -164,7 +164,7 @@
<field eval="&quot;Error in Program&quot;" name="name"/>
</record>
<record id="crm_case_patcheserrorinprogram0" model="crm.project.bug">
<record id="crm_case_patcheserrorinprogram0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_9"/>
<field eval="time.strftime('%Y-%m-28 16:30:00')" name="date"/>
<field name="type_id" ref="type2"/>
@@ -181,7 +181,7 @@
<field eval="&quot;Patches Error in Program&quot;" name="name"/>
</record>
<record id="crm_case_newfeaturestobeadded0" model="crm.project.bug">
<record id="crm_case_newfeaturestobeadded0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_wong"/>
<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -198,7 +198,7 @@
<field eval="&quot;New Features To Be Added&quot;" name="name"/>
</record>
<record id="crm_case_addmenustothemodule0" model="crm.project.bug">
<record id="crm_case_addmenustothemodule0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_1"/>
<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
<field name="type_id" ref="type2"/>
@@ -216,7 +216,7 @@
<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
</record>
<record id="crm_case_includeattendancesheetinproject0" model="crm.project.bug">
<record id="crm_case_includeattendancesheetinproject0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_2"/>
<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -234,7 +234,7 @@
<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
</record>
<record id="crm_case_createnewobject0" model="crm.project.bug">
<record id="crm_case_createnewobject0" model="project.issue">
<field model="res.partner.canal" name="canal_id" search="[('name','=','phone')]"/>
<field name="partner_address_id" ref="base.res_partner_address_6"/>
<field name="som" ref="base.som_happy"/>
@@ -253,7 +253,7 @@
<field eval="&quot;Create new object&quot;" name="name"/>
</record>
<record id="crm_case_improvereportsinhrms0" model="crm.project.bug">
<record id="crm_case_improvereportsinhrms0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_15"/>
<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
<field name="type_id" ref="type1"/>
@@ -270,7 +270,7 @@
<field eval="&quot;Improve Reports in HRMS&quot;" name="name"/>
</record>
<record id="crm_case_improvereportsinpms0" model="crm.project.bug">
<record id="crm_case_improvereportsinpms0" model="project.issue">
<field name="partner_address_id" ref="base.res_partner_address_15"/>
<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
<field name="type_id" ref="type1"/>
addons/crm_project/crm_bugs_menu.xml → addons/project_issue/project_issue_menu.xml
+12 -12
View File
@@ -3,39 +3,39 @@
<data noupdate="1">
######################## BUG TRACKING (menu) ###########################
######################## ISSUE TRACKING (menu) ###########################
<!--
ALL BUGS
-->
<record model="ir.actions.act_window" id="crm_case_categ_act0">
<record model="ir.actions.act_window" id="project_issue_categ_act0">
<field name="name">Issues</field>
<field name="res_model">crm.project.bug</field>
<field name="res_model">project.issue</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_tree_view"/>
<field name="view_id" ref="project_issue_tree_view"/>
<field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
<field name="search_view_id" ref="view_crm_case_bugs_filter"/>
<field name="search_view_id" ref="view_project_issue_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view"/>
<field name="act_window_id" ref="crm_case_categ_act0"/>
<field name="view_id" ref="project_issue_tree_view"/>
<field name="act_window_id" ref="project_issue_categ_act0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view0">
<field name="sequence" eval="2"/>
<field name="view_mode">calendar</field>
<field name="view_id" ref="crm_case_calendar_view"/>
<field name="act_window_id" ref="crm_case_categ_act0"/>
<field name="view_id" ref="project_issue_calendar_view"/>
<field name="act_window_id" ref="project_issue_categ_act0"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view0">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view"/>
<field name="act_window_id" ref="crm_case_categ_act0"/>
<field name="view_id" ref="project_issue_form_view"/>
<field name="act_window_id" ref="project_issue_categ_act0"/>
</record>
<!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
<menuitem name="Issues" id="menu_crm_case_bug_track" parent="project.menu_project_management" action="crm_case_categ_act0"/>
<menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management" action="project_issue_categ_act0"/>
</data>
</openerp>
addons/crm_project/crm_bugs_view.xml → addons/project_issue/project_issue_view.xml
+29 -30
View File
@@ -1,48 +1,47 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- <menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/> -->
# ------------------------------------------------------
# Bug Categories
# Issue Categories
# ------------------------------------------------------
<record id="crm_bug_categ_action" model="ir.actions.act_window">
<field name="name">Bug Categories</field>
<record id="project_issue_categ_action" model="ir.actions.act_window">
<field name="name">Issue Categories</field>
<field name="res_model">crm.case.categ</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.project.bug')]</field>
<field name="context">{'object_id':'crm.project.bug'}</field>
<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
<field name="context">{'object_id':'project.issue'}</field>
</record>
# ------------------------------------------------------
# Stage
# ------------------------------------------------------
<record id="crm_bug_stage_act" model="ir.actions.act_window">
<field name="name">Bug Stages</field>
<record id="project_issue_stage_act" model="ir.actions.act_window">
<field name="name">Issue Stages</field>
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm.crm_case_stage_tree"/>
<field name="domain">[('object_id.model', '=', 'crm.project.bug')]</field>
<field name="context">{'object_id':'crm.project.bug'}</field>
<field name="domain">[('object_id.model', '=', 'project.issue')]</field>
<field name="context">{'object_id':'project.issue'}</field>
</record>
<menuitem action="crm_bug_stage_act" id="menu_crm_bug_stage_act" parent="crm.menu_crm_case_stage"/>
<menuitem action="project_issue_stage_act" id="menu_project_issue_stage_act" parent="crm.menu_crm_case_stage"/>
<record model="ir.ui.view" id="crm_case_form_view">
<field name="name">CRM - Bug Tracker Form</field>
<field name="model">crm.project.bug</field>
<record model="ir.ui.view" id="project_issue_form_view">
<field name="name">Project Issue Tracker Form</field>
<field name="model">project.issue</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Bug Tracker Form">
<form string="Issue Tracker Form">
<group colspan="4" col="6">
<field name="name" string="Title" colspan="2"/>
<field name="project_id" required="True"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.project.bug')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
<group col="3" colspan="2">
<field name="task_id"/>
<button string="Convert To Task"
name="%(wizard_crm_bug_task_set)d"
name="%(wizard_project_issue_task_set)d"
icon="gtk-index" type="action"
attrs="{'invisible':[('task_id','!=',False)]}" />
</group>
@@ -73,7 +72,7 @@
<field name="user_id" />
<label string="Resolution: " align="1.0"/>
<group colspan="1" col="3">
<field name="stage_id" select="1" nolabel="1" on_change="onchange_stage_id(stage_id)" domain="[('object_id.model', '=', 'crm.project.bug')]"/>
<field name="stage_id" select="1" nolabel="1" on_change="onchange_stage_id(stage_id)" domain="[('object_id.model', '=', 'project.issue')]"/>
<button icon="gtk-go-back" string="" name="stage_previous" type="object"/>
<button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
</group>
@@ -147,12 +146,12 @@
</form>
</field>
</record>
<record model="ir.ui.view" id="crm_case_tree_view">
<field name="name">CRM - Bug Tracker Tree</field>
<field name="model">crm.project.bug</field>
<record model="ir.ui.view" id="project_issue_tree_view">
<field name="name">Proejct Issue Tracker Tree</field>
<field name="model">project.issue</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Bugs Tree" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<tree string="Issue Tracker Tree" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
<field name="id"/>
<field name="name" string="Title"/>
<field name="partner_id"/>
@@ -177,12 +176,12 @@
</field>
</record>
<record id="view_crm_case_bugs_filter" model="ir.ui.view">
<field name="name">CRM - Bug Tracker Search</field>
<field name="model">crm.project.bug</field>
<record id="view_project_issue_filter" model="ir.ui.view">
<field name="name">Project Issue Tracker Search</field>
<field name="model">project.issue</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Bugs">
<search string="Issue Tracker Search">
<group col="3" colspan="1">
<filter icon="gtk-home" string=" Today "
separator="1"
@@ -217,13 +216,13 @@
</field>
</record>
<record model="ir.ui.view" id="crm_case_calendar_view">
<field name="name">CRM - Bug Tracker Calendar</field>
<field name="model">crm.project.bug</field>
<record model="ir.ui.view" id="project_issue_calendar_view">
<field name="name">Project Issue Tracker Calendar</field>
<field name="model">project.issue</field>
<field name="type">calendar</field>
<field name="priority" eval="2"/>
<field name="arch" type="xml">
<calendar string="Bugs" date_start="date" color="user_id" date_delay="duration">
<calendar string="Issues" date_start="date" color="user_id" date_delay="duration">
<field name="name"/>
<field name="partner_id"/>
</calendar>
addons/crm_project/crm_bug_wizard.xml → addons/project_issue/project_issue_wizard.xml
+3 -3
View File
@@ -2,10 +2,10 @@
<openerp>
<data>
<wizard
id="wizard_crm_bug_task_set"
id="wizard_project_issue_task_set"
keyword="client_action_multi"
model="crm.bug"
name="crm.bug.task_set"
model="project.issue"
name="project.issue.task_set"
multi="True"
string="Convert To Task"/>
</data>
addons/crm_project/report/__init__.py → addons/project_issue/report/__init__.py
+2 -1
View File
@@ -18,7 +18,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import crm_report_project_bug
import project_issue_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/crm_project/report/crm_report_project_bug.py → addons/project_issue/report/project_issue_report.py
+12 -11
View File
@@ -1,14 +1,13 @@
from osv import fields,osv
import tools
class crm_project_bug_report(osv.osv):
_name = "crm.project.bug.report"
_description = "Project Bug by user and section"
class project_issue_report(osv.osv):
_name = "project.issue.report"
_auto = False
_inherit = "crm.case.report"
_columns = {
'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.project.bug')]"),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'crm.project.bug')]"),
'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),
'probability': fields.float('Avg. Probability', readonly=True),
'amount_revenue': fields.float('Est.Revenue', readonly=True),
'amount_costs': fields.float('Est.Cost', readonly=True),
@@ -16,9 +15,9 @@ class crm_project_bug_report(osv.osv):
'delay_close': fields.char('Delay to close', size=20, readonly=True),
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'crm_project_bug_report')
tools.drop_view_if_exists(cr, 'project_issue_report')
cr.execute("""
create or replace view crm_project_bug_report as (
create or replace view project_issue_report as (
select
min(c.id) as id,
to_char(c.create_date, 'YYYY') as name,
@@ -31,14 +30,16 @@ class crm_project_bug_report(osv.osv):
count(*) as nbr,
sum(planned_revenue) as amount_revenue,
sum(planned_cost) as amount_costs,
sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
sum(planned_revenue*probability/100)::decimal(16,2) as amount_revenue_prob,
avg(probability)::decimal(16,2) as probability,
to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
from
crm_project_bug c
project_issue c
group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.categ_id,c.stage_id
)""")
crm_project_bug_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
project_issue_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/project_issue/report/project_issue_report_view.xml
+78
View File
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--
Project Bug
-->
<record id="view_project_issue_report_tree" model="ir.ui.view">
<field name="name">project.issue.report.tree</field>
<field name="model">project.issue.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Project Issue">
<field name="name" />
<field name="month"/>
<field name="nbr" string="#Project Issue"/>
<field name="amount_revenue"/>
<field name="probability"/>
<field name="amount_revenue_prob" widget="progress"/>
<field name="delay_close"/>
<field name="state" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="stage_id" invisible="1"/>
<field name="categ_id" invisible="1"/>
</tree>
</field>
</record>
<record id="view_project_issue_report_graph" model="ir.ui.view">
<field name="name">project.issue.report.graph</field>
<field name="model">project.issue.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph orientation="horizontal" string="Project Issue" type="bar">
<field name="state"/>
<field name="nbr" operator="+"/>
<field group="True" name="user_id"/>
</graph>
</field>
</record>
<record id="view_project_issue_report_filter" model="ir.ui.view">
<field name="name">project.issue.report.select</field>
<field name="model">project.issue.report</field>
<field name="inherit_id" ref="crm.view_crm_case_filter"/>
<field name="type">search</field>
<field name="arch" type="xml">
<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]' position='after'>
<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
</xpath>
</field>
</record>
<record id="action_project_issue_report" model="ir.actions.act_window">
<field name="name">Project Issue Report</field>
<field name="res_model">project.issue.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_project_issue_report_tree"/>
<field name="search_view_id" ref="view_project_issue_report_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_project_issue_report_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_project_issue_report_tree"/>
<field name="act_window_id" ref="action_project_issue_report"/>
</record>
<record model="ir.actions.act_window.view" id="action_project_issue_report_graph">
<field name="sequence" eval="2"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_project_issue_report_graph"/>
<field name="act_window_id" ref="action_project_issue_report"/>
</record>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
<menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report"/>
</data>
</openerp>
addons/project_issue/security/ir.model.access.csv
+3
View File
@@ -0,0 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_issue","project.issue","model_project_issue","crm.group_crm_manager",1,1,1,1
"access_project_issue_report","project.issue.report","model_project_issue_report","crm.group_crm_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_project_issue project.issue model_project_issue crm.group_crm_manager 1 1 1 1
3 access_project_issue_report project.issue.report model_project_issue_report crm.group_crm_manager 1 0 0 0
addons/project_issue/security/project_issue_security.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record model="ir.rule.group" id="project_issue_rule_group">
<field name="name">project.issue.rule.group</field>
<field name="model_id" search="[('model','=','project.issue')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="project_issue_rule" model="ir.rule">
<field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
<field name="rule_group" ref="project_issue_rule_group"/>
</record>
</data>
</openerp>
addons/crm_project/wizard/__init__.py → addons/project_issue/wizard/__init__.py
+1 -1
View File
@@ -21,5 +21,5 @@
##############################################################################
import crm_bug_wizard
import project_issue_wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/crm_project/wizard/crm_bug_wizard.py → addons/project_issue/wizard/project_issue_wizard.py
+5 -5
View File
@@ -27,15 +27,15 @@ import ir
import pooler
from tools.translate import _
class bug2task(wizard.interface):
class issue2task(wizard.interface):
def _check_state(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
case_obj = pool.get('crm.project.bug')
case_obj = pool.get('project.issue')
for case in case_obj.browse(cr, uid, data['ids']):
if case.state != 'open':
raise wizard.except_wizard(_('Warning !'),
_('Bugs or Feature Requests should be in \'Open\' state before converting into Task.'))
_('Issues or Feature Requests should be in \'Open\' state before converting into Task.'))
return {}
def _makeTask(self, cr, uid, data, context):
@@ -52,7 +52,7 @@ class bug2task(wizard.interface):
if id3:
id3 = data_obj.browse(cr, uid, id3, context=context).res_id
bug_case_obj = pool.get('crm.project.bug')
bug_case_obj = pool.get('project.issue')
task_obj = pool.get('project.task')
for bug in bug_case_obj.browse(cr, uid, data['ids']):
new_task_id = task_obj.create(cr, uid, {
@@ -94,5 +94,5 @@ class bug2task(wizard.interface):
}
}
bug2task('crm.bug.task_set')
issue2task('project.issue.task_set')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/project_long_term/__terp__.py
+1 -1
View File
@@ -32,7 +32,7 @@
"init_xml" : [],
"demo_xml" : ["project_demo.xml"],
"update_xml": [
'security/ir.model.access.csv',
#"security/ir.model.access.csv",
"project_wizard.xml" ,
"project_view.xml",
"project_phase_workflow.xml"
addons/survey/survey.py
+13 -3
View File
@@ -704,6 +704,8 @@ class survey_question_wiz(osv.osv_memory):
if sur_name_read['page'] == "next" or sur_name_rec['page_no'] == - 1 :
if len(p_id) > sur_name_rec['page_no'] + 1 :
if ((context.has_key('active') and not context['active']) or not context.has_key('active')) and not sur_name_rec['page_no'] + 1:
if sur_rec['state'] != "open" :
raise osv.except_osv(_('Warning !'),_("You can not give answer because of survey is not open for answer"))
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s' % (uid,survey_id))
res = cr.fetchone()[0]
@@ -1093,7 +1095,11 @@ class survey_question_wiz(osv.osv_memory):
sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
survey_obj.write(cr, uid, sur_name_read['survey_id'], {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
if context.has_key('cur_id'):
self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
if context.has_key('request') and context['request']:
self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
self.pool.get(context['object']).survey_req_done(cr, uid, [int(context['cur_id'])], context)
else:
self.pool.get(context['object']).write(cr, uid, [int(context['cur_id'])], {'response' : response_id})
for key,val in sur_name_read['store_ans'].items():
for field in vals:
@@ -1640,18 +1646,22 @@ class survey_request(osv.osv):
'date_deadline' : fields.date("Deadline date"),
'user_id' : fields.many2one("res.users", "User"),
'email' : fields.char("E-mail", size=64),
'survey_id' : fields.many2one("survey", "Survey", required=1),
'survey_id' : fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
'response' : fields.many2one('survey.response', 'Answer'),
'state' : fields.selection([('draft','Draft'),('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
}
_defaults = {
'state' : lambda * a: 'waiting_answer',
'state' : lambda * a: 'draft',
'date_deadline' : lambda * a : (now() + RelativeDateTime(months=+1)).strftime("%Y-%m-%d %H:%M:%S")
}
def survey_req_waiting_answer(self, cr, uid, ids, arg):
self.write(cr, uid, ids, { 'state' : 'waiting_answer'})
return True
def survey_req_draft(self, cr, uid, ids, arg):
self.write(cr, uid, ids, { 'state' : 'draft'})
return True
def survey_req_done(self, cr, uid, ids, arg):
self.write(cr, uid, ids, { 'state' : 'done'})
return True
addons/survey/survey_view.xml
+33 -10
View File
@@ -1014,15 +1014,16 @@
<field name="model">survey.request</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Survey Request">
<form string="Survey Request">
<field name="date_deadline"/>
<field name="survey_id" widget="selection"/>
<field name="survey_id"/>
<field name="user_id" on_change="on_change_user(user_id)"/>
<field name="email"/>
<field name="response"/>
<group colspan="4" col="5">
<field name="state"/>
<button name="survey_req_waiting_answer" string="Set to Watting Answer" states="cancel,done" type="object" icon="gtk-new"/>
<!-- <field name="email"/>-->
<field name="response" readonly="1"/>
<group colspan="4" col="6">
<field name="state"/>
<button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
<button name="survey_req_waiting_answer" string="Watting Answer" states="draft" type="object" icon="gtk-new"/>
<button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
<button name="survey_req_cancel" string="Cancelled" states="waiting_answer" type="object" icon="gtk-cancel"/>
</group>
@@ -1035,21 +1036,43 @@
<field name="model">survey.request</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Survey Request">
<tree string="Evaluation Plan Phase">
<field name="date_deadline"/>
<field name="survey_id" widget="selection"/>
<field name="email" />
<field name="user_id"/>
<field name="survey_id"/>
<field name="response" />
<field name="state" />
</tree>
</field>
</record>
<record id="survey_request_search" model="ir.ui.view">
<field name="name">survey_request_search</field>
<field name="model">survey.request</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Survey">
<group col='10' colspan='4'>
<filter icon="terp-crm" string="Unanswered" domain="[('state','=','waiting_answer')]"/>
<filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
<separator orientation="vertical"/>
<field name="survey_id" widget="selection" select="1"/>
<field name="email" select="1"/>
<field name="user_id" select="1" widget="selection" default="1">
<filter string="MY" icon="terp-partner" domain="[('user_id','=',uid)]"/>
</field>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_survey_request_tree">
<field name="name">Survey Request</field>
<field name="res_model">survey.request</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="survey_request_tree"></field>
<field name="search_view_id" ref="survey_request_search"/>
</record>
<menuitem name="Survey Requests" id="menu_survey_type_form1"