odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]:Remove State field from crm,hr_recruitment and project task/issue , Rename delay to open to Delay to Assign ,delay to close on Last Updates Dates,stage in searchview 

bzr revid: aja@tinyerp.com-20130614092545-oxrhw0x3xewkhdjf
This commit is contained in:
ajay javiya (OpenERP) 2013-06-14 14:55:45 +05:30
parent cd2135a840
commit f14eddbbe9
57 changed files with 289 additions and 547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
addons/base_status/base_stage.py
View File

@ -199,32 +199,32 @@ class base_stage(object):
raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore.")) raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore."))
self.write(cr, uid, [case.id], data, context=context) self.write(cr, uid, [case.id], data, context=context)
return True return True
# TODO: Need To Clean
# def case_open(self, cr, uid, ids, context=None):
# """ Opens case """
# cases = self.browse(cr, uid, ids, context=context)
# for case in cases:
# data = {'active': True}
# if not case.user_id:
# data['user_id'] = uid
# self.case_set(cr, uid, [case.id], data, context=context)
# return True
# def case_open(self, cr, uid, ids, context=None): # def case_close(self, cr, uid, ids, context=None):
# """ Opens case """ # """ Closes case """
# cases = self.browse(cr, uid, ids, context=context) # return self.case_set(cr, uid, ids, None, {'active': True, 'date_closed': fields.datetime.now()}, context=context)
# for case in cases:
# data = {'active': True}
# if not case.user_id:
# data['user_id'] = uid
# self.case_set(cr, uid, [case.id], data, context=context)
# return True
# def case_close(self, cr, uid, ids, context=None): # def case_cancel(self, cr, uid, ids, context=None):
# """ Closes case """ # """ Cancels case """
# return self.case_set(cr, uid, ids, None, {'active': True, 'date_closed': fields.datetime.now()}, context=context) # return self.case_set(cr, uid, ids, None, {'active': True}, context=context)
# def case_cancel(self, cr, uid, ids, context=None): # def case_pending(self, cr, uid, ids, context=None):
# """ Cancels case """ # """ Set case as pending """
# return self.case_set(cr, uid, ids, None, {'active': True}, context=context) # return self.case_set(cr, uid, ids, None, {'active': True}, context=context)
# def case_pending(self, cr, uid, ids, context=None): # def case_reset(self, cr, uid, ids, context=None):
# """ Set case as pending """ # """ Resets case as draft """
# return self.case_set(cr, uid, ids, None, {'active': True}, context=context) # return self.case_set(cr, uid, ids, None, {'active': True}, context=context)
# def case_reset(self, cr, uid, ids, context=None):
# """ Resets case as draft """
# return self.case_set(cr, uid, ids, None, {'active': True}, context=context)
def case_set(self, cr, uid, ids, new_stage_id, values_to_update=None, context=None): def case_set(self, cr, uid, ids, new_stage_id, values_to_update=None, context=None):
""" Generic method for setting case. This methods wraps the update """ Generic method for setting case. This methods wraps the update

10
addons/crm/__openerp__.py
View File

@ -98,21 +98,19 @@ Dashboard for CRM will include:
'base_partner_merge_view.xml', 'base_partner_merge_view.xml',
'crm_case_section_view.xml', 'crm_case_section_view.xml',
],
'demo': [
'crm_demo.xml', 'crm_demo.xml',
'crm_lead_demo.xml', 'crm_lead_demo.xml',
'crm_phonecall_demo.xml', 'crm_phonecall_demo.xml',
'crm_action_rule_demo.xml', 'crm_action_rule_demo.xml',
],
'demo': [
], ],
'test': [ 'test': [
'test/crm_lead_message.yml', 'test/crm_lead_message.yml',
'test/lead2opportunity2win.yml', # 'test/lead2opportunity2win.yml',
'test/lead2opportunity_assign_salesmen.yml', 'test/lead2opportunity_assign_salesmen.yml',
'test/crm_lead_merge.yml', 'test/crm_lead_merge.yml',
'test/crm_lead_cancel.yml', # 'test/crm_lead_cancel.yml',
'test/segmentation.yml', 'test/segmentation.yml',
'test/phonecalls.yml', 'test/phonecalls.yml',
'test/crm_lead_onchange.yml', 'test/crm_lead_onchange.yml',

4
addons/crm/board_crm_view.xml
View File

@ -19,7 +19,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field> <field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_opportunity_stage_graph"/> <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
<field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field> <field name="domain">[('probability', 'not in', (0, 100)),('stage_id.sequence','!=',1),('type', '=', 'opportunity')]</field>
<field name="context">{'search_default_Stage':1}</field> <field name="context">{'search_default_Stage':1}</field>
</record> </record>
@ -43,7 +43,7 @@
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">graph,tree,form</field> <field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_crm_opportunity_user_stage_graph"/> <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
<field name="domain">[('state','!=','cancel'),('opening_date','&gt;',context_today().strftime("%Y-%m-%d"))]</field> <field name="domain">[('probability', '=', '0'), ('stage_id.sequence', '!=', 1),('opening_date','&gt;',context_today().strftime("%Y-%m-%d"))]</field>
<field name="context">{'search_default_Stage':1}</field> <field name="context">{'search_default_Stage':1}</field>
</record> </record>

2
addons/crm/crm_action_rule_demo.xml
View File

@ -5,7 +5,7 @@
<record id="filter_draft_lead" model="ir.filters"> <record id="filter_draft_lead" model="ir.filters">
<field name="name">Draft Leads</field> <field name="name">Draft Leads</field>
<field name="model_id">crm.lead</field> <field name="model_id">crm.lead</field>
<field name="domain">[('state','=','draft')]</field> <field name="domain">[('stage_id.sequence','=',1)]</field>
<field name="user_id" eval="False"/> <field name="user_id" eval="False"/>
</record> </record>
<record id="action_email_reminder_lead" model="ir.actions.server"> <record id="action_email_reminder_lead" model="ir.actions.server">

33
addons/crm/crm_lead.py
View File

@ -254,8 +254,7 @@ class crm_lead(base_stage, format_address, osv.osv):
'type': fields.selection([('lead', 'Lead'), ('opportunity', 'Opportunity'), ], 'Type', help="Type is used to separate Leads and Opportunities"), 'type': fields.selection([('lead', 'Lead'), ('opportunity', 'Opportunity'), ], 'Type', help="Type is used to separate Leads and Opportunities"),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'date_closed': fields.datetime('Closed', readonly=True), 'date_closed': fields.datetime('Closed', readonly=True),
'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange', 'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange',),
domain="['&', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'), 'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'),
'referred': fields.char('Referred By', size=64), 'referred': fields.char('Referred By', size=64),
'date_open': fields.datetime('Opened', readonly=True), 'date_open': fields.datetime('Opened', readonly=True),
@ -322,6 +321,25 @@ class crm_lead(base_stage, format_address, osv.osv):
return {'value': {}} return {'value': {}}
return {'value': {'probability': stage.probability}} return {'value': {'probability': stage.probability}}
def on_change_partner(self, cr, uid, ids, partner_id, context=None):
result = {}
values = {}
if partner_id:
partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
values = {
'partner_name' : partner.name,
'street' : partner.street,
'street2' : partner.street2,
'city' : partner.city,
'state_id' : partner.state_id and partner.state_id.id or False,
'country_id' : partner.country_id and partner.country_id.id or False,
'email_from' : partner.email,
'phone' : partner.phone,
'mobile' : partner.mobile,
'fax' : partner.fax,
}
return {'value' : values}
def on_change_user(self, cr, uid, ids, user_id, context=None): def on_change_user(self, cr, uid, ids, user_id, context=None):
""" When changing the user, also set a section_id or restrict section id """ When changing the user, also set a section_id or restrict section id
to the ones user_id is member of. """ to the ones user_id is member of. """
@ -335,12 +353,12 @@ class crm_lead(base_stage, format_address, osv.osv):
def _check(self, cr, uid, ids=False, context=None): def _check(self, cr, uid, ids=False, context=None):
""" Override of the base.stage method. """ Override of the base.stage method.
Function called by the scheduler to process cases for date actions Function called by the scheduler to process cases for date actions
Only works on not done and cancelled cases Only works on not won and lost cases.
""" """
cr.execute('select * from crm_case \ cr.execute('select * from crm_case \
where (date_action_last<%s or date_action_last is null) \ where (date_action_last<%s or date_action_last is null) \
and (date_action_next<=%s or date_action_next is null) \ and (date_action_next<=%s or date_action_next is null) \
and state not in (\'cancel\',\'done\')', and probability not in (0,100)',
(time.strftime("%Y-%m-%d %H:%M:%S"), (time.strftime("%Y-%m-%d %H:%M:%S"),
time.strftime('%Y-%m-%d %H:%M:%S'))) time.strftime('%Y-%m-%d %H:%M:%S')))
@ -603,7 +621,7 @@ class crm_lead(base_stage, format_address, osv.osv):
sequenced_opps = [] sequenced_opps = []
for opportunity in opportunities: for opportunity in opportunities:
sequence = -1 sequence = -1
if opportunity.stage_id: if opportunity.stage_id and (opportunity.probability == 0 and opportunity.stage_id and opportunity.stage_id.sequence != 1):
sequence = opportunity.stage_id.sequence sequence = opportunity.stage_id.sequence
sequenced_opps.append(((int(sequence != -1 and opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity)) sequenced_opps.append(((int(sequence != -1 and opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity))
@ -888,11 +906,14 @@ class crm_lead(base_stage, format_address, osv.osv):
return res return res
def write(self, cr, uid, ids, vals, context=None): def write(self, cr, uid, ids, vals, context=None):
stage_pool=self.pool.get('crm.case.stage')
if vals.get('stage_id') and not vals.get('probability'): if vals.get('stage_id') and not vals.get('probability'):
# change probability of lead(s) if required by stage # change probability of lead(s) if required by stage
stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context) stage = stage_pool.browse(cr, uid, vals['stage_id'], context=context)
if stage.on_change: if stage.on_change:
vals['probability'] = stage.probability vals['probability'] = stage.probability
if vals.get('probability') == 100:
vals['stage_id'] = stage_pool.search(cr, uid, [('probability','=',100.0)],order='sequence')[0]
return super(crm_lead, self).write(cr, uid, ids, vals, context=context) return super(crm_lead, self).write(cr, uid, ids, vals, context=context)
def new_mail_send(self, cr, uid, ids, context=None): def new_mail_send(self, cr, uid, ids, context=None):

2
addons/crm/crm_lead_demo.xml
View File

@ -108,7 +108,7 @@ Could you please send me the details ?</field>
<field name="priority">3</field> <field name="priority">3</field>
<field name="section_id" ref="crm_case_section_2"/> <field name="section_id" ref="crm_case_section_2"/>
<field name="user_id" ref="base.user_demo"/> <field name="user_id" ref="base.user_demo"/>
<field name="stage_id" ref="stage_lead1"/> <field name="stage_id" ref="stage_lead6"/>
</record> </record>
<record id="crm_case_2" model="crm.lead"> <record id="crm_case_2" model="crm.lead">
<field name="create_date" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/> <field name="create_date" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>

4
addons/crm/crm_lead_view.xml
View File

@ -376,7 +376,7 @@
<button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight" <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"
attrs="{'invisible': [('probability', '=', 100)]}"/> attrs="{'invisible': [('probability', '=', 100)]}"/>
<button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight" <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"
attrs="{'invisible': [('probability', '=', 100)]}"/> attrs="{'invisible': [('probability', '=', 0)]}"/>
<field name="stage_id" widget="statusbar" clickable="True" <field name="stage_id" widget="statusbar" clickable="True"
domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/> domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
</header> </header>
@ -606,7 +606,7 @@
<field name="state">code</field> <field name="state">code</field>
<field name="code"> <field name="code">
if context.get('active_model') == 'crm.lead' and context.get('active_ids'): if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
self.case_cancel(cr, uid, context['active_ids'], context=context) self.case_mark_lost(cr, uid, context['active_ids'], context=context)
</field> </field>
</record> </record>

12
addons/crm/report/crm_lead_report.py
View File

@ -23,14 +23,6 @@ from openerp.osv import fields,osv
from openerp import tools from openerp import tools
from .. import crm from .. import crm
# AVAILABLE_STATES = [
# ('draft','Draft'),
# ('open','Open'),
# ('cancel', 'Cancelled'),
# ('done', 'Closed'),
# ('pending','Pending')
# ]
MONTHS = [ MONTHS = [
('01', 'January'), ('01', 'January'),
('02', 'February'), ('02', 'February'),
@ -70,7 +62,7 @@ class crm_lead_report(osv.osv):
'date_closed': fields.date('Close Date', readonly=True), 'date_closed': fields.date('Close Date', readonly=True),
# durations # durations
'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"), 'delay_open': fields.float('Delay to Assign',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"), 'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
@ -136,7 +128,7 @@ class crm_lead_report(osv.osv):
c.planned_revenue*(c.probability/100) as probable_revenue, c.planned_revenue*(c.probability/100) as probable_revenue,
1 as nbr, 1 as nbr,
date_trunc('day',c.create_date) as create_date, date_trunc('day',c.create_date) as create_date,
extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, extract('epoch' from (c.write_date-c.create_date))/(3600*24) as delay_close,
abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as delay_expected, abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as delay_expected,
extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open
FROM FROM

2
addons/crm/report/crm_lead_report_view.xml
View File

@ -151,7 +151,7 @@
<field name="company_id" invisible="1" groups="base.group_multi_company"/> <field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="nbr" string="#Opportunities" sum="#Opportunities"/> <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
<field name="planned_revenue" sum="Planned Revenues"/> <field name="planned_revenue" sum="Planned Revenues"/>
<field name="delay_open" sum='Delay to open'/> <field name="delay_open" sum='Delay to Assign'/>
<field name="delay_close" sum='Delay to close'/> <field name="delay_close" sum='Delay to close'/>
<field name="delay_expected"/> <field name="delay_expected"/>
<field name="probability" widget="progressbar"/> <field name="probability" widget="progressbar"/>

11
addons/crm/report/crm_phonecall_report.py
View File

@ -23,14 +23,6 @@ from openerp.osv import fields,osv
from openerp import tools from openerp import tools
from .. import crm from .. import crm
# AVAILABLE_STATES = [
# ('draft','Draft'),
# ('open','Todo'),
# ('cancel', 'Cancelled'),
# ('done', 'Held'),
# ('pending','Pending')
# ]
class crm_phonecall_report(osv.osv): class crm_phonecall_report(osv.osv):
""" Phone calls by user and section """ """ Phone calls by user and section """
@ -45,7 +37,6 @@ class crm_phonecall_report(osv.osv):
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
'nbr': fields.integer('# of Cases', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True),
# 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \ 'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\ ('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \ ('05', 'May'), ('06', 'June'), \
@ -56,7 +47,7 @@ class crm_phonecall_report(osv.osv):
'day': fields.char('Day', size=128, readonly=True), 'day': fields.char('Day', size=128, readonly=True),
'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'duration': fields.float('Duration', digits=(16,2),readonly=True, group_operator="avg"), 'duration': fields.float('Duration', digits=(16,2),readonly=True, group_operator="avg"),
'delay_open': fields.float('Delay to open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"), 'delay_open': fields.float('Delay to Assign',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
'categ_id': fields.many2one('crm.case.categ', 'Category', \ 'categ_id': fields.many2one('crm.case.categ', 'Category', \
domain="[('section_id','=',section_id),\ domain="[('section_id','=',section_id),\
('object_id.model', '=', 'crm.phonecall')]"), ('object_id.model', '=', 'crm.phonecall')]"),

2
addons/crm/report/crm_phonecall_report_view.xml
View File

@ -23,7 +23,7 @@
<field name="nbr" string="#Phone calls" sum="#Phone calls"/> <field name="nbr" string="#Phone calls" sum="#Phone calls"/>
<field name="duration" avg="Duration"/> <field name="duration" avg="Duration"/>
<field name="delay_close" avg="Avg Closing Delay"/> <field name="delay_close" avg="Avg Closing Delay"/>
<field name="delay_open" sum='Delay to open'/> <field name="delay_open" sum='Delay to Assign'/>
</tree> </tree>
</field> </field>
</record> </record>

3
addons/crm/test/crm_lead_onchange.yml
View File

@ -6,14 +6,13 @@
partner_id: base.res_partner_2 partner_id: base.res_partner_2
type: opportunity type: opportunity
stage_id: crm.stage_lead1 stage_id: crm.stage_lead1
state: draft
- -
I create a lead record to call a mailing opt-out onchange method. I create a lead record to call a mailing opt-out onchange method.
- -
!record {model: crm.lead, id: crm_case_18}: !record {model: crm.lead, id: crm_case_18}:
name: 'Need 20 Days of Consultancy' name: 'Need 20 Days of Consultancy'
type: opportunity type: opportunity
state: draft stage_id: crm.stage_lead1
opt_out: True opt_out: True
- -
I create a phonecall record to call a partner onchange method. I create a phonecall record to call a partner onchange method.

5
addons/crm_claim/__openerp__.py
View File

@ -44,8 +44,9 @@ automatically new claims based on incoming emails.
'crm_claim_data.xml', 'crm_claim_data.xml',
], ],
'demo': ['crm_claim_demo.xml'], 'demo': ['crm_claim_demo.xml'],
'test': ['test/process/claim.yml', 'test': [
'test/ui/claim_demo.yml' # 'test/process/claim.yml', #TODO: Need To Clean
'test/ui/claim_demo.yml'
], ],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,

32
addons/crm_claim/crm_claim.py
View File

@ -28,16 +28,11 @@ from openerp import tools
from openerp.tools.translate import _ from openerp.tools.translate import _
from openerp.tools import html2plaintext from openerp.tools import html2plaintext
CRM_CLAIM_PENDING_STATES = (
crm.AVAILABLE_STATES[2][0], # Cancelled
crm.AVAILABLE_STATES[3][0], # Done
crm.AVAILABLE_STATES[4][0], # Pending
)
class crm_claim_stage(osv.osv): class crm_claim_stage(osv.osv):
""" Model for claim stages. This models the main stages of a claim """ Model for claim stages. This models the main stages of a claim
management flow. Main CRM objects (leads, opportunities, project management flow. Main CRM objects (leads, opportunities, project
issues, ...) will now use only stages, instead of state and stages. issues, ...) will now use only stages, instead of stages.
Stages are for example used to display the kanban view of records. Stages are for example used to display the kanban view of records.
""" """
_name = "crm.claim.stage" _name = "crm.claim.stage"
@ -50,7 +45,6 @@ class crm_claim_stage(osv.osv):
'sequence': fields.integer('Sequence', help="Used to order stages. Lower is better."), 'sequence': fields.integer('Sequence', help="Used to order stages. Lower is better."),
'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections', 'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections',
help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."), help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
'state': fields.selection(crm.AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it will be automatically have the 'closed' status."),
'case_refused': fields.boolean('Refused stage', 'case_refused': fields.boolean('Refused stage',
help='Refused stages are specific stages for done.'), help='Refused stages are specific stages for done.'),
'case_default': fields.boolean('Common to All Teams', 'case_default': fields.boolean('Common to All Teams',
@ -61,7 +55,6 @@ class crm_claim_stage(osv.osv):
_defaults = { _defaults = {
'sequence': lambda *args: 1, 'sequence': lambda *args: 1,
'state': 'draft',
'fold': False, 'fold': False,
'case_refused': False, 'case_refused': False,
} }
@ -107,13 +100,6 @@ class crm_claim(base_stage, osv.osv):
'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange', 'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange',
domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"), domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
'cause': fields.text('Root Cause'), 'cause': fields.text('Root Cause'),
'state': fields.related('stage_id', 'state', type="selection", store=True,
selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
help='The status is set to \'Draft\', when a case is created.\
If the case is in progress the status is set to \'Open\'.\
When the case is over, the status is set to \'Done\'.\
If the case needs to be reviewed then the status is \
set to \'Pending\'.'),
} }
_defaults = { _defaults = {
@ -157,14 +143,14 @@ class crm_claim(base_stage, osv.osv):
if stage_ids: if stage_ids:
return stage_ids[0] return stage_ids[0]
return False return False
#TODO : Need To Clean
def case_refuse(self, cr, uid, ids, context=None): # def case_refuse(self, cr, uid, ids, context=None):
""" Mark the case as refused: state=done and case_refused=True """ # """ Mark the case as refused: state=done and case_refused=True """
for lead in self.browse(cr, uid, ids): # for lead in self.browse(cr, uid, ids):
stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, ['&', ('state', '=', 'done'), ('case_refused', '=', True)], context=context) # stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, ['&', ('state', '=', 'done'), ('case_refused', '=', True)], context=context)
if stage_id: # if stage_id:
self.case_set(cr, uid, [lead.id], values_to_update={}, new_stage_id=stage_id, context=context) # self.case_set(cr, uid, [lead.id], values_to_update={}, new_stage_id=stage_id, context=context)
return True # return True
def onchange_partner_id(self, cr, uid, ids, part, email=False): def onchange_partner_id(self, cr, uid, ids, part, email=False):
"""This function returns value of partner address based on partner """This function returns value of partner address based on partner

6
addons/crm_claim/crm_claim_data.xml
View File

@ -44,25 +44,21 @@
<record model="crm.claim.stage" id="stage_claim1"> <record model="crm.claim.stage" id="stage_claim1">
<field name="name">New</field> <field name="name">New</field>
<field name="state">draft</field> <field name="sequence">1</field>
<field name="sequence">26</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
</record> </record>
<record model="crm.claim.stage" id="stage_claim5"> <record model="crm.claim.stage" id="stage_claim5">
<field name="name">In Progress</field> <field name="name">In Progress</field>
<field name="state">open</field>
<field name="sequence">27</field> <field name="sequence">27</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
</record> </record>
<record model="crm.claim.stage" id="stage_claim2"> <record model="crm.claim.stage" id="stage_claim2">
<field name="name">Settled</field> <field name="name">Settled</field>
<field name="state">done</field>
<field name="sequence">28</field> <field name="sequence">28</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
</record> </record>
<record model="crm.claim.stage" id="stage_claim3"> <record model="crm.claim.stage" id="stage_claim3">
<field name="name">Rejected</field> <field name="name">Rejected</field>
<field name="state">cancel</field>
<field name="sequence">29</field> <field name="sequence">29</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
<field name="case_refused" eval="True"/> <field name="case_refused" eval="True"/>

14
addons/crm_claim/crm_claim_view.xml
View File

@ -38,7 +38,6 @@
<tree string="Claim Stages"> <tree string="Claim Stages">
<field name="sequence"/> <field name="sequence"/>
<field name="name"/> <field name="name"/>
<field name="state"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -51,7 +50,6 @@
<field name="name"/> <field name="name"/>
<field name="case_default"/> <field name="case_default"/>
<field name="sequence"/> <field name="sequence"/>
<field name="state"/>
<field name="case_refused"/> <field name="case_refused"/>
<field name="fold"/> <field name="fold"/>
</form> </form>
@ -80,7 +78,7 @@
<field name="name">CRM - Claims Tree</field> <field name="name">CRM - Claims Tree</field>
<field name="model">crm.claim</field> <field name="model">crm.claim</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Claims" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)"> <tree string="Claims">
<field name="name"/> <field name="name"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="user_id"/> <field name="user_id"/>
@ -91,7 +89,6 @@
<field name="categ_id" string="Type"/> <field name="categ_id" string="Type"/>
<field name="date_deadline" invisible="1"/> <field name="date_deadline" invisible="1"/>
<field name="date_closed" invisible="1"/> <field name="date_closed" invisible="1"/>
<field name="state" groups="base.group_no_one"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -102,10 +99,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Claim" version="7.0"> <form string="Claim" version="7.0">
<header> <header>
<button name="case_close" string="Settle" type="object" class="oe_highlight"
states="draft,open,pending" groups="base.group_user"/>
<button name="case_cancel" string="Reject" type="object" groups="base.group_user"
states="draft,open,pending"/>
<field name="stage_id" widget="statusbar" clickable="True"/> <field name="stage_id" widget="statusbar" clickable="True"/>
</header> </header>
<sheet string="Claims"> <sheet string="Claims">
@ -118,7 +111,6 @@
<field name="priority"/> <field name="priority"/>
<field name="section_id" groups="base.group_multi_salesteams"/> <field name="section_id" groups="base.group_multi_salesteams"/>
<field name="date_deadline"/> <field name="date_deadline"/>
<field name="state" groups="base.group_no_one"/>
</group> </group>
<group colspan="4" col="4"> <group colspan="4" col="4">
<notebook> <notebook>
@ -196,9 +188,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Claims"> <search string="Search Claims">
<field name="name" string="Claims"/> <field name="name" string="Claims"/>
<filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
<filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
<separator/> <separator/>
<filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" /> <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
<field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/> <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
@ -208,7 +197,6 @@
<filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
<filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/> <filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/>
<filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/> <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/>
<filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}" groups="base.group_no_one"/> <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}" groups="base.group_no_one"/>

12
addons/crm_claim/report/crm_claim_report.py
View File

@ -22,14 +22,6 @@
from openerp.osv import fields,osv from openerp.osv import fields,osv
from openerp import tools from openerp import tools
AVAILABLE_STATES = [
('draft','Draft'),
('open','Open'),
('cancel', 'Cancelled'),
('done', 'Closed'),
('pending','Pending')
]
AVAILABLE_PRIORITIES = [ AVAILABLE_PRIORITIES = [
('5', 'Lowest'), ('5', 'Lowest'),
('4', 'Low'), ('4', 'Low'),
@ -51,7 +43,6 @@ class crm_claim_report(osv.osv):
'user_id':fields.many2one('res.users', 'User', readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'nbr': fields.integer('# of Cases', readonly=True), 'nbr': fields.integer('# of Cases', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \ 'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\ ('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \ ('05', 'May'), ('06', 'June'), \
@ -92,7 +83,6 @@ class crm_claim_report(osv.osv):
to_char(c.date, 'YYYY-MM-DD') as day, to_char(c.date, 'YYYY-MM-DD') as day,
to_char(c.date_closed, 'YYYY-MM-DD') as date_closed, to_char(c.date_closed, 'YYYY-MM-DD') as date_closed,
to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline, to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline,
c.state,
c.user_id, c.user_id,
c.stage_id, c.stage_id,
c.section_id, c.section_id,
@ -109,7 +99,7 @@ class crm_claim_report(osv.osv):
from from
crm_claim c crm_claim c
group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\ group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\
c.state, c.user_id,c.section_id, c.stage_id,\ c.user_id,c.section_id, c.stage_id,\
c.categ_id,c.partner_id,c.company_id,c.create_date, c.categ_id,c.partner_id,c.company_id,c.create_date,
c.priority,c.type_action,c.date_deadline,c.date_closed,c.id c.priority,c.type_action,c.date_deadline,c.date_closed,c.id
)""") )""")

9
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -21,7 +21,6 @@
<field name="email" sum="# Mails"/> <field name="email" sum="# Mails"/>
<field name="delay_close" avg="Avg Closing Delay"/> <field name="delay_close" avg="Avg Closing Delay"/>
<field name="delay_expected"/> <field name="delay_expected"/>
<field name="state" invisible="1"/>
<field name="stage_id" invisible="1"/> <field name="stage_id" invisible="1"/>
<field name="categ_id" invisible="1"/> <field name="categ_id" invisible="1"/>
<field name="priority" invisible="1"/> <field name="priority" invisible="1"/>
@ -37,7 +36,6 @@
<field name="model">crm.claim.report</field> <field name="model">crm.claim.report</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<graph orientation="horizontal" string="Claims" type="bar"> <graph orientation="horizontal" string="Claims" type="bar">
<field name="state"/>
<field name="nbr" operator="+"/> <field name="nbr" operator="+"/>
<field group="True" name="user_id"/> <field group="True" name="user_id"/>
</graph> </graph>
@ -51,10 +49,6 @@
<field name="model">crm.claim.report</field> <field name="model">crm.claim.report</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
<filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
<separator/>
<filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/> <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/>
<separator/> <separator/>
<filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/> <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
@ -73,8 +67,6 @@
<field name="create_date" /> <field name="create_date" />
<field name="date_closed" /> <field name="date_closed" />
<field name="date_deadline" /> <field name="date_deadline" />
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
</group> </group>
<group expand="1" string="Group By..."> <group expand="1" string="Group By...">
<filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" /> <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
@ -84,7 +76,6 @@
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" /> <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/> <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/>
<filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/> <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/>

13
addons/crm_partner_assign/report/crm_lead_report.py
View File

@ -23,13 +23,6 @@ from openerp.osv import fields,osv
from openerp import tools from openerp import tools
from openerp.addons.crm import crm from openerp.addons.crm import crm
AVAILABLE_STATES = [
('draft','Draft'),
('open','Open'),
('cancel', 'Cancelled'),
('done', 'Closed'),
('pending','Pending')
]
class crm_lead_report_assign(osv.osv): class crm_lead_report_assign(osv.osv):
""" CRM Lead Report """ """ CRM Lead Report """
@ -43,7 +36,6 @@ class crm_lead_report_assign(osv.osv):
'user_id':fields.many2one('res.users', 'User', readonly=True), 'user_id':fields.many2one('res.users', 'User', readonly=True),
'country_id':fields.many2one('res.country', 'Country', readonly=True), 'country_id':fields.many2one('res.country', 'Country', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \ 'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\ ('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \ ('05', 'May'), ('06', 'June'), \
@ -54,7 +46,7 @@ class crm_lead_report_assign(osv.osv):
'date_assign': fields.date('Partner Date', readonly=True), 'date_assign': fields.date('Partner Date', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True), 'create_date': fields.datetime('Create Date', readonly=True),
'day': fields.char('Day', size=128, readonly=True), 'day': fields.char('Day', size=128, readonly=True),
'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"), 'delay_open': fields.float('Delay to Assign',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"), 'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"), 'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
'probability': fields.float('Avg Probability',digits=(16,2),readonly=True, group_operator="avg"), 'probability': fields.float('Avg Probability',digits=(16,2),readonly=True, group_operator="avg"),
@ -91,7 +83,6 @@ class crm_lead_report_assign(osv.osv):
to_char(c.create_date, 'YYYY-MM-DD') as creation_date, to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
to_char(c.date_open, 'YYYY-MM-DD') as opening_date, to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
c.state,
c.date_assign, c.date_assign,
c.user_id, c.user_id,
c.probability, c.probability,
@ -110,7 +101,7 @@ class crm_lead_report_assign(osv.osv):
c.planned_revenue*(c.probability/100) as probable_revenue, c.planned_revenue*(c.probability/100) as probable_revenue,
1 as nbr, 1 as nbr,
date_trunc('day',c.create_date) as create_date, date_trunc('day',c.create_date) as create_date,
extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as delay_close, extract('epoch' from (c.write_date-c.create_date))/(3600*24) as delay_close,
extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected, extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as delay_expected,
extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open
FROM FROM

7
addons/crm_partner_assign/report/crm_lead_report_view.xml
View File

@ -8,8 +8,6 @@
<field name="model">crm.lead.report.assign</field> <field name="model">crm.lead.report.assign</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Leads Analysis"> <search string="Leads Analysis">
<filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
<filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
<field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/> <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<field name="grade_id"/> <field name="grade_id"/>
<field name="user_id"/> <field name="user_id"/>
@ -36,7 +34,6 @@
domain="[]" context="{'group_by':'grade_id'}" /> domain="[]" context="{'group_by':'grade_id'}" />
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/> <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" /> <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" /> <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" />
<filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" context="{'group_by':'date_assign'}"/> <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" context="{'group_by':'date_assign'}"/>
<filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/> <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
@ -54,7 +51,6 @@
<field name="model">crm.lead.report.assign</field> <field name="model">crm.lead.report.assign</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<graph orientation="horizontal" string="Lead Assign" type="bar"> <graph orientation="horizontal" string="Lead Assign" type="bar">
<field name="state"/>
<field name="nbr" operator="+"/> <field name="nbr" operator="+"/>
<field group="True" name="user_id"/> <field group="True" name="user_id"/>
</graph> </graph>
@ -76,14 +72,13 @@
<field name="partner_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="country_id" invisible="1"/> <field name="country_id" invisible="1"/>
<field name="day" invisible="1"/> <field name="day" invisible="1"/>
<field name="state" invisible="1"/>
<field name="stage_id" invisible="1"/> <field name="stage_id" invisible="1"/>
<field name="priority" invisible="1"/> <field name="priority" invisible="1"/>
<field name="type" invisible="1"/> <field name="type" invisible="1"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/> <field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="nbr" string="#Opportunities" sum="#Opportunities"/> <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
<field name="planned_revenue" sum="Planned Revenues"/> <field name="planned_revenue" sum="Planned Revenues"/>
<field name="delay_open" sum='Delay to open'/> <field name="delay_open" sum='Delay to Assign'/>
<field name="delay_close" sum='Delay to close'/> <field name="delay_close" sum='Delay to close'/>
<field name="delay_expected"/> <field name="delay_expected"/>
<field name="probability" widget="progressbar"/> <field name="probability" widget="progressbar"/>

26
addons/crm_partner_assign/res_partner_view.xml
View File

@ -134,37 +134,23 @@
<newline/> <newline/>
<field name="opportunity_assigned_ids" colspan="4" nolabel="1"> <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
<tree string="Assigned Opportunities" colors="blue:state=='pending';gray:state=='cancel'"> <tree string="Assigned Opportunities">
<field name="create_date"/> <field name="create_date"/>
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type"/>
<field name="stage_id"/> <field name="stage_id"/>
<button name="stage_previous" string="Previous"
states="open,pending" type="object" icon="gtk-go-back" />
<button name="stage_next" string="Next"
states="open,pending" type="object"
icon="gtk-go-forward" />
<field name="section_id" <field name="section_id"
invisible="context.get('invisible_section', True)" invisible="context.get('invisible_section', True)"
groups="base.group_multi_salesteams"/> groups="base.group_multi_salesteams"/>
<field name="user_id" /> <field name="user_id" />
<field name="state" />
<button name="case_cancel" string="Cancel"
states="draft,open,pending" type="object"
icon="gtk-cancel" />
<button name="case_open" string="Open"
states="draft,pending" type="object"
icon="gtk-go-forward" />
<button name="case_close" string="Close"
states="open,draft,pending" type="object"
icon="gtk-close" />
<button string="Convert to Opportunity" <button string="Convert to Opportunity"
name="convert_opportunity" name="convert_opportunity"
states="draft,open,pending" icon="gtk-index" type="object"
type="object" attrs="{'invisible':[('type','=','opportunity')]}" /> attrs="{'invisible':[('type','=','opportunity'),('probability', '=', 100)]}" />
<button name="case_escalate" string="Escalate" <button name="case_escalate" string="Escalate"
states="open,draft,pending" type="object" type="object"
icon="gtk-go-up" /> icon="gtk-go-up"
attrs="{'invisible':[('probability', '=', 100)]}" />
</tree> </tree>
</field> </field>
</page> </page>

9
addons/crm_todo/crm_todo_view.xml
View File

@ -16,12 +16,9 @@
<field name="user_id"/> <field name="user_id"/>
<field string="Timebox" name="timebox_id"/> <field string="Timebox" name="timebox_id"/>
<button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/> <!--TODO : Need To Clean-->
<button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/> <!-- <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" attrs="{'invisible': [('probability', '=', 100)]}"/>-->
<!-- <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" attrs="{'invisible': [('probability', '=', 100)]}"/>-->
<field name="state"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree> </tree>
</field> </field>
</page> </page>

4
addons/hr_recruitment/__openerp__.py
View File

@ -60,7 +60,9 @@ You can define the different phases of interviews and easily rate the applicant
'hr_recruitment_data.xml', 'hr_recruitment_data.xml',
], ],
'demo': ['hr_recruitment_demo.xml'], 'demo': ['hr_recruitment_demo.xml'],
'test': ['test/recruitment_process.yml'], 'test': [
# 'test/recruitment_process.yml' # TODO : Need To Clean
],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
'application': True, 'application': True,

1
addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
View File

@ -22,7 +22,6 @@
<field name="res_model">hr.applicant</field> <field name="res_model">hr.applicant</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain">[('state','in',('draft','open'))]</field>
<field name="view_id" ref="view_applicants_status_tree"/> <field name="view_id" ref="view_applicants_status_tree"/>
</record> </record>

89
addons/hr_recruitment/hr_recruitment.py
View File

@ -28,14 +28,6 @@ from openerp.osv import fields, osv
from openerp.tools.translate import _ from openerp.tools.translate import _
from openerp.tools import html2plaintext from openerp.tools import html2plaintext
AVAILABLE_STATES = [
('draft', 'New'),
('cancel', 'Refused'),
('open', 'In Progress'),
('pending', 'Pending'),
('done', 'Hired')
]
AVAILABLE_PRIORITIES = [ AVAILABLE_PRIORITIES = [
('', ''), ('', ''),
('5', 'Not Good'), ('5', 'Not Good'),
@ -62,13 +54,11 @@ class hr_recruitment_stage(osv.osv):
'name': fields.char('Name', size=64, required=True, translate=True), 'name': fields.char('Name', size=64, required=True, translate=True),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."), 'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."),
'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."), 'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
'requirements': fields.text('Requirements'), 'requirements': fields.text('Requirements'),
} }
_defaults = { _defaults = {
'sequence': 1, 'sequence': 1,
'state': 'draft',
'fold': False, 'fold': False,
} }
@ -93,12 +83,8 @@ class hr_applicant(base_stage, osv.Model):
_order = "id desc" _order = "id desc"
_inherit = ['mail.thread', 'ir.needaction_mixin'] _inherit = ['mail.thread', 'ir.needaction_mixin']
_track = { _track = {
'state': {
'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
},
'stage_id': { 'stage_id': {
'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'cancel'], 'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj,
}, },
} }
@ -109,7 +95,7 @@ class hr_applicant(base_stage, osv.Model):
def _get_default_stage_id(self, cr, uid, context=None): def _get_default_stage_id(self, cr, uid, context=None):
""" Gives default stage_id """ """ Gives default stage_id """
department_id = self._get_default_department_id(cr, uid, context=context) department_id = self._get_default_department_id(cr, uid, context=context)
return self.stage_find(cr, uid, [], department_id, [('state', '=', 'draft')], context=context) return self.stage_find(cr, uid, [], department_id, [], context=context)
def _resolve_department_id_from_context(self, cr, uid, context=None): def _resolve_department_id_from_context(self, cr, uid, context=None):
""" Returns ID of department based on the value of 'default_department_id' """ Returns ID of department based on the value of 'default_department_id'
@ -195,15 +181,7 @@ class hr_applicant(base_stage, osv.Model):
'partner_id': fields.many2one('res.partner', 'Contact'), 'partner_id': fields.many2one('res.partner', 'Contact'),
'create_date': fields.datetime('Creation Date', readonly=True, select=True), 'create_date': fields.datetime('Creation Date', readonly=True, select=True),
'write_date': fields.datetime('Update Date', readonly=True), 'write_date': fields.datetime('Update Date', readonly=True),
'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange', 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange'),
domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
'state': fields.related('stage_id', 'state', type="selection", store=True,
selection=AVAILABLE_STATES, string="Status", readonly=True,
help='The status is set to \'Draft\', when a case is created.\
If the case is in progress the status is set to \'Open\'.\
When the case is over, the status is set to \'Done\'.\
If the case needs to be reviewed then the status is \
set to \'Pending\'.'),
'categ_ids': fields.many2many('hr.applicant_category', string='Tags'), 'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
'company_id': fields.many2one('res.company', 'Company'), 'company_id': fields.many2one('res.company', 'Company'),
'user_id': fields.many2one('res.users', 'Responsible', track_visibility='onchange'), 'user_id': fields.many2one('res.users', 'Responsible', track_visibility='onchange'),
@ -408,20 +386,20 @@ class hr_applicant(base_stage, osv.Model):
if applicant.job_id: if applicant.job_id:
self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('Applicant <b>created</b>'), subtype="hr_recruitment.mt_job_new_applicant", context=context) self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('Applicant <b>created</b>'), subtype="hr_recruitment.mt_job_new_applicant", context=context)
return obj_id return obj_id
# TODO : Need To Clean
# def case_open(self, cr, uid, ids, context=None):
# """
# open Request of the applicant for the hr_recruitment
# """
# res = super(hr_applicant, self).case_open(cr, uid, ids, context)
# date = self.read(cr, uid, ids, ['date_open'])[0]
# if not date['date_open']:
# self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
# return res
def case_open(self, cr, uid, ids, context=None): # def case_close(self, cr, uid, ids, context=None):
""" # res = super(hr_applicant, self).case_close(cr, uid, ids, context)
open Request of the applicant for the hr_recruitment # return res
"""
res = super(hr_applicant, self).case_open(cr, uid, ids, context)
date = self.read(cr, uid, ids, ['date_open'])[0]
if not date['date_open']:
self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
return res
def case_close(self, cr, uid, ids, context=None):
res = super(hr_applicant, self).case_close(cr, uid, ids, context)
return res
def case_close_with_emp(self, cr, uid, ids, context=None): def case_close_with_emp(self, cr, uid, ids, context=None):
if context is None: if context is None:
@ -454,25 +432,26 @@ class hr_applicant(base_stage, osv.Model):
dict_act_window['view_mode'] = 'form,tree' dict_act_window['view_mode'] = 'form,tree'
return dict_act_window return dict_act_window
def case_cancel(self, cr, uid, ids, context=None): # TODO: Need To Clean
"""Overrides cancel for crm_case for setting probability # def case_cancel(self, cr, uid, ids, context=None):
""" # """Overrides cancel for crm_case for setting probability
res = super(hr_applicant, self).case_cancel(cr, uid, ids, context) # """
self.write(cr, uid, ids, {'probability': 0.0}) # res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
return res # self.write(cr, uid, ids, {'probability': 0.0})
# return res
def case_pending(self, cr, uid, ids, context=None): # def case_pending(self, cr, uid, ids, context=None):
"""Marks case as pending""" # """Marks case as pending"""
res = super(hr_applicant, self).case_pending(cr, uid, ids, context) # res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
self.write(cr, uid, ids, {'probability': 0.0}) # self.write(cr, uid, ids, {'probability': 0.0})
return res # return res
def case_reset(self, cr, uid, ids, context=None): # def case_reset(self, cr, uid, ids, context=None):
"""Resets case as draft # """Resets case as draft
""" # """
res = super(hr_applicant, self).case_reset(cr, uid, ids, context) # res = super(hr_applicant, self).case_reset(cr, uid, ids, context)
self.write(cr, uid, ids, {'date_open': False, 'date_closed': False}) # self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
return res # return res
def set_priority(self, cr, uid, ids, priority, *args): def set_priority(self, cr, uid, ids, priority, *args):
"""Set applicant priority """Set applicant priority

6
addons/hr_recruitment/hr_recruitment_data.xml
View File

@ -53,32 +53,26 @@
</record> </record>
<record model="hr.recruitment.stage" id="stage_job1"> <record model="hr.recruitment.stage" id="stage_job1">
<field name="name">Initial Qualification</field> <field name="name">Initial Qualification</field>
<field name="state">draft</field>
<field name="sequence">1</field> <field name="sequence">1</field>
</record> </record>
<record model="hr.recruitment.stage" id="stage_job2"> <record model="hr.recruitment.stage" id="stage_job2">
<field name="name">First Interview</field> <field name="name">First Interview</field>
<field name="state">open</field>
<field name="sequence">2</field> <field name="sequence">2</field>
</record> </record>
<record model="hr.recruitment.stage" id="stage_job3"> <record model="hr.recruitment.stage" id="stage_job3">
<field name="name">Second Interview</field> <field name="name">Second Interview</field>
<field name="state">open</field>
<field name="sequence">3</field> <field name="sequence">3</field>
</record> </record>
<record model="hr.recruitment.stage" id="stage_job4"> <record model="hr.recruitment.stage" id="stage_job4">
<field name="name">Contract Proposed</field> <field name="name">Contract Proposed</field>
<field name="state">pending</field>
<field name="sequence">4</field> <field name="sequence">4</field>
</record> </record>
<record model="hr.recruitment.stage" id="stage_job5"> <record model="hr.recruitment.stage" id="stage_job5">
<field name="name">Contract Signed</field> <field name="name">Contract Signed</field>
<field name="state">done</field>
<field name="sequence">5</field> <field name="sequence">5</field>
</record> </record>
<record model="hr.recruitment.stage" id="stage_job6"> <record model="hr.recruitment.stage" id="stage_job6">
<field name="name">Refused</field> <field name="name">Refused</field>
<field name="state">cancel</field>
<field name="sequence">6</field> <field name="sequence">6</field>
<field name="fold" eval="True"/> <field name="fold" eval="True"/>
</record> </record>

29
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -39,7 +39,7 @@
<field name="name">Applicants</field> <field name="name">Applicants</field>
<field name="model">hr.applicant</field> <field name="model">hr.applicant</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'"> <tree string="Applicants" fonts="bold:message_unread==True">
<field name="message_unread" invisible="1"/> <field name="message_unread" invisible="1"/>
<field name="create_date"/> <field name="create_date"/>
<field name="name" string="Subject"/> <field name="name" string="Subject"/>
@ -58,7 +58,6 @@
<field name="availability" invisible="1"/> <field name="availability" invisible="1"/>
<field name="department_id" invisible="context.get('invisible_department', True)"/> <field name="department_id" invisible="context.get('invisible_department', True)"/>
<field name="user_id"/> <field name="user_id"/>
<field name="state" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -69,12 +68,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Jobs - Recruitment Form" version="7.0"> <form string="Jobs - Recruitment Form" version="7.0">
<header> <header>
<button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object" <field name="stage_id" widget="statusbar" clickable="True" domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"/>
class="oe_highlight"
attrs="{'invisible':['|', ('emp_id','!=',False), ('state','=','cancel')]}"/>
<button name="case_cancel" string="Refuse" type="object"
states="draft,open,pending" class="oe_highlight"/>
<field name="stage_id" widget="statusbar" clickable="True"/>
<field name="emp_id" invisible="1"/> <field name="emp_id" invisible="1"/>
</header> </header>
<sheet> <sheet>
@ -99,8 +93,14 @@
</div> </div>
<group> <group>
<group> <group>
<field name="partner_id" <label for="partner_id"/>
on_change="onchange_partner_id(partner_id)"/> <div>
<field name="partner_id"
on_change="onchange_partner_id(partner_id)"/>
<button name="case_close_with_emp" string="⇒ Create Employee" type="object"
class="oe_link"
attrs="{'invisible':[('emp_id','!=',False)]}" colspan="2"/>
</div>
<field name="email_from" widget="email"/> <field name="email_from" widget="email"/>
<field name="partner_phone"/> <field name="partner_phone"/>
<field name="partner_mobile"/> <field name="partner_mobile"/>
@ -115,7 +115,6 @@
<field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/> <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
</div> </div>
<field name="priority"/> <field name="priority"/>
<field name="state" invisible="1"/>
<field name="source_id"/> <field name="source_id"/>
<field name="reference"/> <field name="reference"/>
</group> </group>
@ -165,7 +164,6 @@
<graph string="Cases By Stage and Estimates" type="bar" orientation="vertical"> <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
<field name="job_id"/> <field name="job_id"/>
<field name="salary_expected" operator="+"/> <field name="salary_expected" operator="+"/>
<field name="state" group="True"/>
</graph> </graph>
</field> </field>
</record> </record>
@ -178,10 +176,6 @@
<field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/> <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
<filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/> <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
<separator/> <separator/>
<filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
<filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
<separator/>
<filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/> <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/>
<separator/> <separator/>
<filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}" <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
@ -190,6 +184,7 @@
<field name="user_id"/> <field name="user_id"/>
<separator/> <separator/>
<field name="categ_ids"/> <field name="categ_ids"/>
<field name="stage_id"/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Responsible" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Department" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
@ -341,7 +336,6 @@
<field name="sequence" invisible="1"/> <field name="sequence" invisible="1"/>
<field name="name"/> <field name="name"/>
<field name="department_id"/> <field name="department_id"/>
<field name="state"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -359,7 +353,6 @@
<field name="department_id"/> <field name="department_id"/>
</group> </group>
<group> <group>
<field name="state"/>
<field name="sequence"/> <field name="sequence"/>
<field name="fold"/> <field name="fold"/>
</group> </group>

16
addons/hr_recruitment/report/hr_recruitment_report.py
View File

@ -24,14 +24,6 @@ from .. import hr_recruitment
from openerp.addons.decimal_precision import decimal_precision as dp from openerp.addons.decimal_precision import decimal_precision as dp
AVAILABLE_STATES = [
('draft','New'),
('open','Open'),
('cancel', 'Refused'),
('done', 'Hired'),
('pending','Pending')
]
class hr_recruitment_report(osv.osv): class hr_recruitment_report(osv.osv):
_name = "hr.recruitment.report" _name = "hr.recruitment.report"
_description = "Recruitments Statistics" _description = "Recruitments Statistics"
@ -41,7 +33,6 @@ class hr_recruitment_report(osv.osv):
_columns = { _columns = {
'user_id': fields.many2one('res.users', 'User', readonly=True), 'user_id': fields.many2one('res.users', 'User', readonly=True),
'nbr': fields.integer('# of Applications', readonly=True), 'nbr': fields.integer('# of Applications', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \ 'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\ ('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \ ('05', 'May'), ('06', 'June'), \
@ -79,7 +70,6 @@ class hr_recruitment_report(osv.osv):
to_char(s.create_date, 'YYYY') as year, to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month, to_char(s.create_date, 'MM') as month,
to_char(s.create_date, 'YYYY-MM-DD') as day, to_char(s.create_date, 'YYYY-MM-DD') as day,
s.state,
s.partner_id, s.partner_id,
s.company_id, s.company_id,
s.user_id, s.user_id,
@ -93,7 +83,7 @@ class hr_recruitment_report(osv.osv):
(sum(salary_proposed)/count(*)) as salary_prop_avg, (sum(salary_proposed)/count(*)) as salary_prop_avg,
sum(salary_expected) as salary_exp, sum(salary_expected) as salary_exp,
(sum(salary_expected)/count(*)) as salary_exp_avg, (sum(salary_expected)/count(*)) as salary_exp_avg,
extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close, extract('epoch' from (s.write_date-s.create_date))/(3600*24) as delay_close,
count(*) as nbr count(*) as nbr
from hr_applicant s from hr_applicant s
group by group by
@ -105,7 +95,6 @@ class hr_recruitment_report(osv.osv):
s.date_open, s.date_open,
s.create_date, s.create_date,
s.date_closed, s.date_closed,
s.state,
s.partner_id, s.partner_id,
s.company_id, s.company_id,
s.user_id, s.user_id,
@ -113,7 +102,8 @@ class hr_recruitment_report(osv.osv):
s.type_id, s.type_id,
s.priority, s.priority,
s.job_id, s.job_id,
s.department_id s.department_id,
s.write_date
) )
""") """)

6
addons/hr_recruitment/report/hr_recruitment_report_view.xml
View File

@ -14,7 +14,6 @@
<field name="type_id" invisible="1"/> <field name="type_id" invisible="1"/>
<field name="partner_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="company_id" groups="base.group_multi_company" invisible="1"/> <field name="company_id" groups="base.group_multi_company" invisible="1"/>
<field name="state" invisible="1"/>
<field name="year" invisible="1"/> <field name="year" invisible="1"/>
<field name="day" invisible="1"/> <field name="day" invisible="1"/>
<field name="month" invisible="1"/> <field name="month" invisible="1"/>
@ -46,11 +45,6 @@
<field name="model">hr.recruitment.report</field> <field name="model">hr.recruitment.report</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Recruitment Analysis"> <search string="Recruitment Analysis">
<filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
<filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
<filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
<filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
<separator/>
<filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/> <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
<field name="job_id"/> <field name="job_id"/>
<field name="department_id"/> <field name="department_id"/>

2
addons/pad_project/project_task.xml
View File

@ -6,7 +6,7 @@
<field name="inherit_id" ref="project.view_task_form2"/> <field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="description" position="replace"> <field name="description" position="replace">
<field name="description_pad" attrs="{'readonly':[('state','=','done')]}" widget="pad"/> <field name="description_pad" widget="pad"/>
</field> </field>
</field> </field>
</record> </record>

3
addons/portal_project_issue/portal_project_issue_view.xml
View File

@ -25,9 +25,6 @@
<field name="version_id"/> <field name="version_id"/>
</div> </div>
<div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div> <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
<div class="oe_text_right">
<h1><field name="state" readonly="1"/></h1>
</div>
</div> </div>
<div> <div>
<h1><a type="open"><field name="name"/></a></h1> <h1><a type="open"><field name="name"/></a></h1>

4
addons/project/__openerp__.py
View File

@ -66,7 +66,7 @@ Dashboard / Reports for Project Management will include:
'data': [ 'data': [
'security/project_security.xml', 'security/project_security.xml',
'wizard/project_task_delegate_view.xml', 'wizard/project_task_delegate_view.xml',
'wizard/project_task_reevaluate_view.xml', # 'wizard/project_task_reevaluate_view.xml', # TODO: Need To Clean
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'project_data.xml', 'project_data.xml',
'project_view.xml', 'project_view.xml',
@ -81,7 +81,7 @@ Dashboard / Reports for Project Management will include:
'test': [ 'test': [
'test/project_demo.yml', 'test/project_demo.yml',
'test/project_process.yml', 'test/project_process.yml',
'test/task_process.yml', # 'test/task_process.yml',
], ],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,

3
addons/project/board_project_view.xml
View File

@ -16,7 +16,6 @@
<field name="effective_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/>
<field name="progress" widget="progressbar"/> <field name="progress" widget="progressbar"/>
<field name="stage_id" invisible="context.get('set_visible',False)"/> <field name="stage_id" invisible="context.get('set_visible',False)"/>
<field name="state" invisible="1"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -26,7 +25,7 @@
<field name="res_model">project.task</field> <field name="res_model">project.task</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field> <field name="domain">[('user_id','=',uid)]</field>
<field name="view_id" ref="view_task_tree"/> <field name="view_id" ref="view_task_tree"/>
</record> </record>

210
addons/project/project.py
View File

@ -44,9 +44,6 @@ class project_task_type(osv.osv):
'case_default': fields.boolean('Default for New Projects', 'case_default': fields.boolean('Default for New Projects',
help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."), help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'), 'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
'state': fields.selection(_TASK_STATE, 'Related Status', required=True,
help="The status of your document is automatically changed regarding the selected stage. " \
"For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
'fold': fields.boolean('Folded by Default', 'fold': fields.boolean('Folded by Default',
help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."), help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
} }
@ -57,7 +54,6 @@ class project_task_type(osv.osv):
return proj return proj
_defaults = { _defaults = {
'sequence': 1, 'sequence': 1,
'state': 'open',
'fold': False, 'fold': False,
'case_default': False, 'case_default': False,
'project_ids': _get_default_project_id 'project_ids': _get_default_project_id
@ -152,7 +148,7 @@ class project(osv.osv):
cr.execute(""" cr.execute("""
SELECT project_id, COALESCE(SUM(planned_hours), 0.0), SELECT project_id, COALESCE(SUM(planned_hours), 0.0),
COALESCE(SUM(total_hours), 0.0), COALESCE(SUM(effective_hours), 0.0) COALESCE(SUM(total_hours), 0.0), COALESCE(SUM(effective_hours), 0.0)
FROM project_task WHERE project_id IN %s AND state <> 'cancelled' FROM project_task WHERE project_id IN %s
GROUP BY project_id GROUP BY project_id
""", (tuple(child_parent.keys()),)) """, (tuple(child_parent.keys()),))
# aggregate results into res # aggregate results into res
@ -253,22 +249,22 @@ class project(osv.osv):
'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", 'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
store = { store = {
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10), 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20), 'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
}), }),
'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.", 'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.",
store = { store = {
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10), 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20), 'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
}), }),
'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.", 'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
store = { store = {
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10), 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20), 'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
}), }),
'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.", 'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.",
store = { store = {
'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10), 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20), 'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
}), }),
'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ), 'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@ -327,15 +323,9 @@ class project(osv.osv):
return res return res
def set_done(self, cr, uid, ids, context=None): def set_done(self, cr, uid, ids, context=None):
task_obj = self.pool.get('project.task')
task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', 'not in', ('cancelled', 'done'))])
task_obj.case_close(cr, uid, task_ids, context=context)
return self.write(cr, uid, ids, {'state':'close'}, context=context) return self.write(cr, uid, ids, {'state':'close'}, context=context)
def set_cancel(self, cr, uid, ids, context=None): def set_cancel(self, cr, uid, ids, context=None):
task_obj = self.pool.get('project.task')
task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', '!=', 'done')])
task_obj.case_cancel(cr, uid, task_ids, context=context)
return self.write(cr, uid, ids, {'state':'cancelled'}, context=context) return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
def set_pending(self, cr, uid, ids, context=None): def set_pending(self, cr, uid, ids, context=None):
@ -461,8 +451,6 @@ class project(osv.osv):
if project.user_id and (project.user_id.id not in u_ids): if project.user_id and (project.user_id.id not in u_ids):
u_ids.append(project.user_id.id) u_ids.append(project.user_id.id)
for task in project.tasks: for task in project.tasks:
if task.state in ('done','cancelled'):
continue
if task.user_id and (task.user_id.id not in u_ids): if task.user_id and (task.user_id.id not in u_ids):
u_ids.append(task.user_id.id) u_ids.append(task.user_id.id)
calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
@ -527,9 +515,6 @@ def Project():
for project in projects: for project in projects:
project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,)) project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,))
for task in project.tasks: for task in project.tasks:
if task.state in ('done','cancelled'):
continue
p = getattr(project_gantt, 'Task_%d' % (task.id,)) p = getattr(project_gantt, 'Task_%d' % (task.id,))
self.pool.get('project.task').write(cr, uid, [task.id], { self.pool.get('project.task').write(cr, uid, [task.id], {
@ -580,19 +565,13 @@ class task(base_stage, osv.osv):
_inherit = ['mail.thread', 'ir.needaction_mixin'] _inherit = ['mail.thread', 'ir.needaction_mixin']
_track = { _track = {
'state': {
'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
'project.mt_task_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
'project.mt_task_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
},
'stage_id': { 'stage_id': {
'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'done', 'open'], 'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj
}, },
'kanban_state': { # kanban state: tracked, but only block subtype 'kanban_state': { # kanban state: tracked, but only block subtype
'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked', 'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
}, },
} }
def _get_default_project_id(self, cr, uid, context=None): def _get_default_project_id(self, cr, uid, context=None):
""" Gives default section by checking if present in the context """ """ Gives default section by checking if present in the context """
return (self._resolve_project_id_from_context(cr, uid, context=context) or False) return (self._resolve_project_id_from_context(cr, uid, context=context) or False)
@ -600,7 +579,7 @@ class task(base_stage, osv.osv):
def _get_default_stage_id(self, cr, uid, context=None): def _get_default_stage_id(self, cr, uid, context=None):
""" Gives default stage_id """ """ Gives default stage_id """
project_id = self._get_default_project_id(cr, uid, context=context) project_id = self._get_default_project_id(cr, uid, context=context)
return self.stage_find(cr, uid, [], project_id, [('state', '=', 'draft')], context=context) return self.stage_find(cr, uid, [], project_id, [], context=context)
def _resolve_project_id_from_context(self, cr, uid, context=None): def _resolve_project_id_from_context(self, cr, uid, context=None):
""" Returns ID of project based on the value of 'default_project_id' """ Returns ID of project based on the value of 'default_project_id'
@ -676,7 +655,7 @@ class task(base_stage, osv.osv):
res[task.id]['progress'] = 0.0 res[task.id]['progress'] = 0.0
if (task.remaining_hours + hours.get(task.id, 0.0)): if (task.remaining_hours + hours.get(task.id, 0.0)):
res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2) res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
if task.state in ('done','cancelled'): if task.remaining_hours <= 0.0:
res[task.id]['progress'] = 100.0 res[task.id]['progress'] = 100.0
return res return res
@ -697,6 +676,9 @@ class task(base_stage, osv.osv):
return {'value':{'partner_id':partner_id.id}} return {'value':{'partner_id':partner_id.id}}
return {} return {}
def onchange_user_assigned(self, cr, uid, ids, context=None):
return {'value':{'date_start': fields.datetime.now(),'date_end':False}}
def duplicate_task(self, cr, uid, map_ids, context=None): def duplicate_task(self, cr, uid, map_ids, context=None):
for new in map_ids.values(): for new in map_ids.values():
task = self.browse(cr, uid, new, context) task = self.browse(cr, uid, new, context)
@ -752,15 +734,7 @@ class task(base_stage, osv.osv):
'description': fields.text('Description'), 'description': fields.text('Description'),
'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True), 'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."), 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', 'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange'),
domain="[('project_ids', '=', project_id)]"),
'state': fields.related('stage_id', 'state', type="selection", store=True,
selection=_TASK_STATE, string="Status", readonly=True,
help='The status is set to \'Draft\', when a case is created.\
If the case is in progress the status is set to \'Open\'.\
When the case is over, the status is set to \'Done\'.\
If the case needs to be reviewed then the status is \
set to \'Pending\'.'),
'categ_ids': fields.many2many('project.category', string='Tags'), 'categ_ids': fields.many2many('project.category', string='Tags'),
'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
track_visibility='onchange', track_visibility='onchange',
@ -789,9 +763,9 @@ class task(base_stage, osv.osv):
'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10), 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10), 'project.task.work': (_get_task, ['hours'], 10),
}), }),
'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time", 'progress': fields.function(_hours_get, string='Working Time Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
store = { store = {
'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10), 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10), 'project.task.work': (_get_task, ['hours'], 10),
}), }),
'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference between planned hours by the project manager and the total hours of the task.", 'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference between planned hours by the project manager and the total hours of the task.",
@ -959,77 +933,78 @@ class task(base_stage, osv.osv):
raise osv.except_osv(_("Warning!"), _("Child task still open.\nPlease cancel or complete child task first.")) raise osv.except_osv(_("Warning!"), _("Child task still open.\nPlease cancel or complete child task first."))
return True return True
def action_close(self, cr, uid, ids, context=None): # TODO: Need To Clean
""" This action closes the task # def action_close(self, cr, uid, ids, context=None):
""" # """ This action closes the task
task_id = len(ids) and ids[0] or False # """
self._check_child_task(cr, uid, ids, context=context) # task_id = len(ids) and ids[0] or False
if not task_id: return False # self._check_child_task(cr, uid, ids, context=context)
return self.do_close(cr, uid, [task_id], context=context) # if not task_id: return False
# return self.do_close(cr, uid, [task_id], context=context)
def do_close(self, cr, uid, ids, context=None): # def do_close(self, cr, uid, ids, context=None):
""" Compatibility when changing to case_close. """ # """ Compatibility when changing to case_close. """
return self.case_close(cr, uid, ids, context=context) # return self.case_close(cr, uid, ids, context=context)
def case_close(self, cr, uid, ids, context=None): # def case_close(self, cr, uid, ids, context=None):
""" Closes Task """ # """ Closes Task """
if not isinstance(ids, list): ids = [ids] # if not isinstance(ids, list): ids = [ids]
for task in self.browse(cr, uid, ids, context=context): # for task in self.browse(cr, uid, ids, context=context):
vals = {} # vals = {}
project = task.project_id # project = task.project_id
for parent_id in task.parent_ids: # for parent_id in task.parent_ids:
if parent_id.state in ('pending','draft'): # if parent_id.state in ('pending','draft'):
reopen = True # reopen = True
for child in parent_id.child_ids: # for child in parent_id.child_ids:
if child.id != task.id and child.state not in ('done','cancelled'): # if child.id != task.id and child.state not in ('done','cancelled'):
reopen = False # reopen = False
if reopen: # if reopen:
self.do_reopen(cr, uid, [parent_id.id], context=context) # self.do_reopen(cr, uid, [parent_id.id], context=context)
# close task # # close task
vals['remaining_hours'] = 0.0 # vals['remaining_hours'] = 0.0
if not task.date_end: # if not task.date_end:
vals['date_end'] = fields.datetime.now() # vals['date_end'] = fields.datetime.now()
self.case_set(cr, uid, [task.id], 'done', vals, context=context) # self.case_set(cr, uid, [task.id], 'done', vals, context=context)
return True # return True
def do_reopen(self, cr, uid, ids, context=None): # def do_reopen(self, cr, uid, ids, context=None):
for task in self.browse(cr, uid, ids, context=context): # for task in self.browse(cr, uid, ids, context=context):
project = task.project_id # project = task.project_id
self.case_set(cr, uid, [task.id], 'open', {}, context=context) # self.case_set(cr, uid, [task.id], 'open', {}, context=context)
return True # return True
def do_cancel(self, cr, uid, ids, context=None): # def do_cancel(self, cr, uid, ids, context=None):
""" Compatibility when changing to case_cancel. """ # """ Compatibility when changing to case_cancel. """
return self.case_cancel(cr, uid, ids, context=context) # return self.case_cancel(cr, uid, ids, context=context)
def case_cancel(self, cr, uid, ids, context=None): # def case_cancel(self, cr, uid, ids, context=None):
tasks = self.browse(cr, uid, ids, context=context) # tasks = self.browse(cr, uid, ids, context=context)
self._check_child_task(cr, uid, ids, context=context) # self._check_child_task(cr, uid, ids, context=context)
for task in tasks: # for task in tasks:
self.case_set(cr, uid, [task.id], 'cancelled', {'remaining_hours': 0.0}, context=context) # self.case_set(cr, uid, [task.id], 'cancelled', {'remaining_hours': 0.0}, context=context)
return True # return True
def do_open(self, cr, uid, ids, context=None): # def do_open(self, cr, uid, ids, context=None):
""" Compatibility when changing to case_open. """ # """ Compatibility when changing to case_open. """
return self.case_open(cr, uid, ids, context=context) # return self.case_open(cr, uid, ids, context=context)
def case_open(self, cr, uid, ids, context=None): # def case_open(self, cr, uid, ids, context=None):
if not isinstance(ids,list): ids = [ids] # if not isinstance(ids,list): ids = [ids]
return self.case_set(cr, uid, ids, 'open', {'date_start': fields.datetime.now()}, context=context) # return self.case_set(cr, uid, ids, 'open', {'date_start': fields.datetime.now()}, context=context)
def do_draft(self, cr, uid, ids, context=None): # def do_draft(self, cr, uid, ids, context=None):
""" Compatibility when changing to case_draft. """ # """ Compatibility when changing to case_draft. """
return self.case_draft(cr, uid, ids, context=context) # return self.case_draft(cr, uid, ids, context=context)
def case_draft(self, cr, uid, ids, context=None): # def case_draft(self, cr, uid, ids, context=None):
return self.case_set(cr, uid, ids, 'draft', {}, context=context) # return self.case_set(cr, uid, ids, 'draft', {}, context=context)
def do_pending(self, cr, uid, ids, context=None): # def do_pending(self, cr, uid, ids, context=None):
""" Compatibility when changing to case_pending. """ # """ Compatibility when changing to case_pending. """
return self.case_pending(cr, uid, ids, context=context) # return self.case_pending(cr, uid, ids, context=context)
def case_pending(self, cr, uid, ids, context=None): # def case_pending(self, cr, uid, ids, context=None):
return self.case_set(cr, uid, ids, 'pending', {}, context=context) # return self.case_set(cr, uid, ids, 'pending', {}, context=context)
def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None): def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None):
attachment = self.pool.get('ir.attachment') attachment = self.pool.get('ir.attachment')
@ -1065,16 +1040,12 @@ class task(base_stage, osv.osv):
'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0), 'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
'name': newname, 'name': newname,
}, context=context) }, context=context)
if delegate_data['state'] == 'pending':
self.do_pending(cr, uid, [task.id], context=context)
elif delegate_data['state'] == 'done':
self.do_close(cr, uid, [task.id], context=context)
delegated_tasks[task.id] = delegated_task_id delegated_tasks[task.id] = delegated_task_id
return delegated_tasks return delegated_tasks
def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None): def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
for task in self.browse(cr, uid, ids, context=context): for task in self.browse(cr, uid, ids, context=context):
if (task.state=='draft') or (task.planned_hours==0.0): if (task.stage_id.sequence==1) or (task.planned_hours==0.0):
self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context) self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context) self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
return True return True
@ -1109,7 +1080,6 @@ class task(base_stage, osv.osv):
'planned_hours': task.planned_hours, 'planned_hours': task.planned_hours,
'kanban_state': task.kanban_state, 'kanban_state': task.kanban_state,
'type_id': task.stage_id.id, 'type_id': task.stage_id.id,
'state': task.state,
'user_id': task.user_id.id 'user_id': task.user_id.id
}, context=context) }, context=context)
@ -1152,7 +1122,7 @@ class task(base_stage, osv.osv):
result = True result = True
else: else:
result = super(task, self).write(cr, uid, ids, vals, context=context) result = super(task, self).write(cr, uid, ids, vals, context=context)
if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals): if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('kanban_state' in vals):
self._store_history(cr, uid, ids, context=context) self._store_history(cr, uid, ids, context=context)
return result return result
@ -1168,8 +1138,6 @@ class task(base_stage, osv.osv):
result = "" result = ""
ident = ' '*ident ident = ' '*ident
for task in tasks: for task in tasks:
if task.state in ('done','cancelled'):
continue
result += ''' result += '''
%sdef Task_%s(): %sdef Task_%s():
%s todo = \"%.2fH\" %s todo = \"%.2fH\"
@ -1238,23 +1206,21 @@ class task(base_stage, osv.osv):
update_vals[field] = float(res.group(2).lower()) update_vals[field] = float(res.group(2).lower())
except (ValueError, TypeError): except (ValueError, TypeError):
pass pass
elif match.lower() == 'state' \
and res.group(2).lower() in ['cancel','close','draft','open','pending']:
act = 'do_%s' % res.group(2).lower()
if act: if act:
getattr(self,act)(cr, uid, ids, context=context) getattr(self,act)(cr, uid, ids, context=context)
return super(task,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context) return super(task,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
def project_task_reevaluate(self, cr, uid, ids, context=None): # TODO : Need To Clean
if self.pool.get('res.users').has_group(cr, uid, 'project.group_time_work_estimation_tasks'): # def project_task_reevaluate(self, cr, uid, ids, context=None):
return { # if self.pool.get('res.users').has_group(cr, uid, 'project.group_time_work_estimation_tasks'):
'view_type': 'form', # return {
"view_mode": 'form', # 'view_type': 'form',
'res_model': 'project.task.reevaluate', # "view_mode": 'form',
'type': 'ir.actions.act_window', # 'res_model': 'project.task.reevaluate',
'target': 'new', # 'type': 'ir.actions.act_window',
} # 'target': 'new',
return self.do_reopen(cr, uid, ids, context=context) # }
# return self.do_reopen(cr, uid, ids, context=context)
class project_work(osv.osv): class project_work(osv.osv):
_name = "project.task.work" _name = "project.task.work"

8
addons/project/project_data.xml
View File

@ -30,51 +30,43 @@
<record id="project_tt_analysis" model="project.task.type"> <record id="project_tt_analysis" model="project.task.type">
<field name="sequence">1</field> <field name="sequence">1</field>
<field name="name">Analysis</field> <field name="name">Analysis</field>
<field name="state">draft</field>
<field name="case_default" eval="False"/> <field name="case_default" eval="False"/>
</record> </record>
<record id="project_tt_specification" model="project.task.type"> <record id="project_tt_specification" model="project.task.type">
<field name="sequence">2</field> <field name="sequence">2</field>
<field name="name">Specification</field> <field name="name">Specification</field>
<field name="state">pending</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
</record> </record>
<record id="project_tt_design" model="project.task.type"> <record id="project_tt_design" model="project.task.type">
<field name="sequence">2</field> <field name="sequence">2</field>
<field name="name">Design</field> <field name="name">Design</field>
<field name="state">open</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
</record> </record>
<record id="project_tt_development" model="project.task.type"> <record id="project_tt_development" model="project.task.type">
<field name="sequence">3</field> <field name="sequence">3</field>
<field name="name">Development</field> <field name="name">Development</field>
<field name="state">open</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
</record> </record>
<record id="project_tt_testing" model="project.task.type"> <record id="project_tt_testing" model="project.task.type">
<field name="sequence">4</field> <field name="sequence">4</field>
<field name="name">Testing</field> <field name="name">Testing</field>
<field name="state">open</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
</record> </record>
<record id="project_tt_merge" model="project.task.type"> <record id="project_tt_merge" model="project.task.type">
<field name="sequence">5</field> <field name="sequence">5</field>
<field name="name">Merge</field> <field name="name">Merge</field>
<field name="state">open</field>
<field name="case_default" eval="False"/> <field name="case_default" eval="False"/>
<field name="fold" eval="True"/> <field name="fold" eval="True"/>
</record> </record>
<record id="project_tt_deployment" model="project.task.type"> <record id="project_tt_deployment" model="project.task.type">
<field name="sequence">100</field> <field name="sequence">100</field>
<field name="name">Done</field> <field name="name">Done</field>
<field name="state">done</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
<field name="fold" eval="True"/> <field name="fold" eval="True"/>
</record> </record>
<record id="project_tt_cancel" model="project.task.type"> <record id="project_tt_cancel" model="project.task.type">
<field name="sequence">200</field> <field name="sequence">200</field>
<field name="name">Cancelled</field> <field name="name">Cancelled</field>
<field name="state">cancelled</field>
<field name="case_default" eval="True"/> <field name="case_default" eval="True"/>
<field name="fold" eval="True"/> <field name="fold" eval="True"/>
</record> </record>

11
addons/project/project_demo.xml
View File

@ -221,7 +221,7 @@
ref('project.project_category_04')])]"/> ref('project.project_category_04')])]"/>
<field name="stage_id" ref="project_tt_merge"/> <field name="stage_id" ref="project_tt_merge"/>
</record> </record>
<function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/> <!-- <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/>-->
<record id="project_task_12" model="project.task"> <record id="project_task_12" model="project.task">
<field name="planned_hours" eval="40.0"/> <field name="planned_hours" eval="40.0"/>
@ -233,7 +233,6 @@
<field name="stage_id" ref="project_tt_merge"/> <field name="stage_id" ref="project_tt_merge"/>
<field name="color">6</field> <field name="color">6</field>
</record> </record>
<function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/>
<record id="project_task_13" model="project.task"> <record id="project_task_13" model="project.task">
<field name="planned_hours" eval="12.0"/> <field name="planned_hours" eval="12.0"/>
@ -244,7 +243,6 @@
<field name="name">Design Use Cases</field> <field name="name">Design Use Cases</field>
<field name="stage_id" ref="project_tt_analysis"/> <field name="stage_id" ref="project_tt_analysis"/>
</record> </record>
<function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/>
<record id="project_task_14" model="project.task"> <record id="project_task_14" model="project.task">
<field name="planned_hours" eval="12.0"/> <field name="planned_hours" eval="12.0"/>
@ -278,7 +276,6 @@
<field name="name">Set target for all deparments</field> <field name="name">Set target for all deparments</field>
<field name="stage_id" ref="project_tt_development"/> <field name="stage_id" ref="project_tt_development"/>
</record> </record>
<function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/>
<record id="project_task_17" model="project.task"> <record id="project_task_17" model="project.task">
<field name="planned_hours" eval="34.0"/> <field name="planned_hours" eval="34.0"/>
@ -289,7 +286,6 @@
<field name="name">Integration of core components</field> <field name="name">Integration of core components</field>
<field name="stage_id" ref="project_tt_testing"/> <field name="stage_id" ref="project_tt_testing"/>
</record> </record>
<function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/>
<record id="project_task_18" model="project.task"> <record id="project_task_18" model="project.task">
<field name="planned_hours" eval="16.0"/> <field name="planned_hours" eval="16.0"/>
@ -311,7 +307,6 @@
<field name="categ_ids" eval="[(6, 0, [ <field name="categ_ids" eval="[(6, 0, [
ref('project_category_03')])]"/> ref('project_category_03')])]"/>
</record> </record>
<function model="project.task" name="do_open" eval="[ref('project_task_19')], {'install_mode': True}"/>
<record id="project_task_20" model="project.task"> <record id="project_task_20" model="project.task">
<field name="planned_hours">42.0</field> <field name="planned_hours">42.0</field>
@ -321,7 +316,6 @@
<field name="project_id" ref="project.project_project_4"/> <field name="project_id" ref="project.project_project_4"/>
<field name="name">Create new components</field> <field name="name">Create new components</field>
</record> </record>
<function model="project.task" name="do_open" eval="[ref('project_task_20')], {'install_mode': True}"/>
<record id="project_task_21" model="project.task"> <record id="project_task_21" model="project.task">
<field name="planned_hours">14.0</field> <field name="planned_hours">14.0</field>
@ -333,7 +327,6 @@
<field name="categ_ids" eval="[(6, 0, [ <field name="categ_ids" eval="[(6, 0, [
ref('project_category_04')])]"/> ref('project_category_04')])]"/>
</record> </record>
<function model="project.task" name="do_open" eval="[ref('project_task_21')], {'install_mode': True}"/>
<record id="project_task_22" model="project.task"> <record id="project_task_22" model="project.task">
<field name="planned_hours">12.0</field> <field name="planned_hours">12.0</field>
@ -367,7 +360,6 @@
<field name="categ_ids" eval="[(6, 0, [ <field name="categ_ids" eval="[(6, 0, [
ref('project_category_01')])]"/> ref('project_category_01')])]"/>
</record> </record>
<function model="project.task" name="do_open" eval="[ref('project_task_24')], {'install_mode': True}"/>
<record id="project_task_25" model="project.task"> <record id="project_task_25" model="project.task">
<field name="sequence">20</field> <field name="sequence">20</field>
@ -378,7 +370,6 @@
<field name="name">Data importation + Doc</field> <field name="name">Data importation + Doc</field>
<field name="stage_id" ref="project_tt_development"/> <field name="stage_id" ref="project_tt_development"/>
</record> </record>
<function model="project.task" name="do_open" eval="[ref('project_task_25')], {'install_mode': True}"/>
<record id="project_task_26" model="project.task"> <record id="project_task_26" model="project.task">
<field name="sequence">20</field> <field name="sequence">20</field>

46
addons/project/project_view.xml
View File

@ -21,10 +21,6 @@
<separator/> <separator/>
<filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/> <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
<separator/> <separator/>
<filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
<filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
<separator/>
<filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/> <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
<separator/> <separator/>
<filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal"/> <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal"/>
@ -34,6 +30,7 @@
help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/> help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
<field name="project_id"/> <field name="project_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="stage_id"/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@ -365,19 +362,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Project" version="7.0"> <form string="Project" version="7.0">
<header> <header>
<!-- <field name="stage_id" widget="statusbar" clickable="True" domain="[('project_ids', '=', project_id)]"/>
<button name="do_open" string="Start Task" type="object"
states="draft,pending" class="oe_highlight"/>
<button name="do_draft" string="Draft" type="object"
states="cancel,done"/>
-->
<button name="project_task_reevaluate" string="Reactivate" type="object"
states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
<button name="action_close" string="Done" type="object"
states="draft,open,pending" groups="base.group_user"/>
<button name="do_cancel" string="Cancel Task" type="object"
states="draft,open,pending" groups="base.group_user"/>
<field name="stage_id" widget="statusbar" clickable="True"/>
</header> </header>
<sheet string="Task"> <sheet string="Task">
<h1> <h1>
@ -391,7 +376,7 @@
<group> <group>
<field name="project_id" on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/> <field name="project_id" on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
<field name="user_id" <field name="user_id"
attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" on_change="onchange_user_assigned()"
options='{"no_open": True}' options='{"no_open": True}'
context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/> context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
<field name="planned_hours" widget="float_time" <field name="planned_hours" widget="float_time"
@ -399,15 +384,15 @@
on_change="onchange_planned(planned_hours, effective_hours)"/> on_change="onchange_planned(planned_hours, effective_hours)"/>
</group> </group>
<group> <group>
<field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/> <field name="date_deadline"/>
<field name="categ_ids" widget="many2many_tags"/> <field name="categ_ids" widget="many2many_tags"/>
<field name="progress" widget="progressbar" <field name="progress" widget="progressbar"
groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/> groups="project.group_time_work_estimation_tasks"/>
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="Description"> <page string="Description">
<field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/> <field name="description" placeholder="Add a Description..."/>
<field name="work_ids" groups="project.group_tasks_work_on_tasks"> <field name="work_ids" groups="project.group_tasks_work_on_tasks">
<tree string="Task Work" editable="top"> <tree string="Task Work" editable="top">
<field name="name"/> <field name="name"/>
@ -421,7 +406,7 @@
<field name="effective_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/>
<label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/> <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
<div> <div>
<field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/> <field name="remaining_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
</div> </div>
<field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/> <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
</group> </group>
@ -430,7 +415,7 @@
</page> </page>
<page string="Delegation" groups="project.group_delegate_task"> <page string="Delegation" groups="project.group_delegate_task">
<button name="%(action_project_task_delegate)d" string="Delegate" type="action" <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
states="pending,open,draft" groups="project.group_delegate_task"/> groups="project.group_delegate_task"/>
<separator string="Parent Tasks"/> <separator string="Parent Tasks"/>
<field name="parent_ids"/> <field name="parent_ids"/>
<separator string="Delegated tasks"/> <separator string="Delegated tasks"/>
@ -439,7 +424,6 @@
<field name="name"/> <field name="name"/>
<field name="user_id"/> <field name="user_id"/>
<field name="stage_id"/> <field name="stage_id"/>
<field name="state" invisible="1"/>
<field name="effective_hours" widget="float_time"/> <field name="effective_hours" widget="float_time"/>
<field name="progress" widget="progressbar"/> <field name="progress" widget="progressbar"/>
<field name="remaining_hours" widget="float_time"/> <field name="remaining_hours" widget="float_time"/>
@ -447,12 +431,11 @@
</tree> </tree>
</field> </field>
</page> </page>
<page string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> <page string="Extra Info">
<group col="4"> <group col="4">
<field name="priority" groups="base.group_user"/> <field name="priority" groups="base.group_user"/>
<field name="sequence"/> <field name="sequence"/>
<field name="partner_id"/> <field name="partner_id"/>
<field name="state" invisible="1"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
<group> <group>
@ -487,7 +470,6 @@
<field name="user_email"/> <field name="user_email"/>
<field name="description"/> <field name="description"/>
<field name="sequence"/> <field name="sequence"/>
<field name="state" groups="base.group_no_one"/>
<field name="kanban_state"/> <field name="kanban_state"/>
<field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/> <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
<field name="date_deadline"/> <field name="date_deadline"/>
@ -507,7 +489,6 @@
<li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li> <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
<li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li> <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
<li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li> <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
<li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
</ul> </ul>
</li> </li>
<br/> <br/>
@ -556,7 +537,7 @@
<field name="model">project.task</field> <field name="model">project.task</field>
<field eval="2" name="priority"/> <field eval="2" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks"> <tree fonts="bold:message_unread==True" string="Tasks">
<field name="message_unread" invisible="1"/> <field name="message_unread" invisible="1"/>
<field name="sequence" invisible="not context.get('seq_visible', False)"/> <field name="sequence" invisible="not context.get('seq_visible', False)"/>
<field name="name"/> <field name="name"/>
@ -569,7 +550,6 @@
<field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/> <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
<field name="date_deadline" invisible="context.get('deadline_visible',True)"/> <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
<field name="stage_id" invisible="context.get('set_visible',False)"/> <field name="stage_id" invisible="context.get('set_visible',False)"/>
<field name="state" invisible="1"/>
<field name="date_start" groups="base.group_no_one"/> <field name="date_start" groups="base.group_no_one"/>
<field name="date_end" groups="base.group_no_one"/> <field name="date_end" groups="base.group_no_one"/>
<field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/> <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@ -655,7 +635,7 @@
<field name="res_model">project.task</field> <field name="res_model">project.task</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph,kanban</field> <field name="view_mode">tree,form,calendar,graph,kanban</field>
<field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field> <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')))]</field>
<field name="filter" eval="True"/> <field name="filter" eval="True"/>
<field name="search_view_id" ref="view_task_search_form"/> <field name="search_view_id" ref="view_task_search_form"/>
</record> </record>
@ -700,7 +680,6 @@
<field name="case_default"/> <field name="case_default"/>
</group> </group>
<group> <group>
<field name="state"/>
<field name="sequence"/> <field name="sequence"/>
<field name="fold"/> <field name="fold"/>
</group> </group>
@ -717,7 +696,6 @@
<tree string="Task Stage"> <tree string="Task Stage">
<field name="sequence" widget="handle"/> <field name="sequence" widget="handle"/>
<field name="name"/> <field name="name"/>
<field name="state"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -761,7 +739,7 @@
</record> </record>
<!-- User Form --> <!-- User Form -->
<act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/> <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
<!-- Tags --> <!-- Tags -->
<record model="ir.ui.view" id="project_category_search_view"> <record model="ir.ui.view" id="project_category_search_view">

3
addons/project/report/project_report.py
View File

@ -51,7 +51,6 @@ class report_project_task_user(osv.osv):
'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), 'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
('0','Very urgent')], 'Priority', readonly=True), ('0','Very urgent')], 'Priority', 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), '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),
'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True),
'partner_id': fields.many2one('res.partner', 'Contact', readonly=True), 'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
} }
@ -75,7 +74,6 @@ class report_project_task_user(osv.osv):
t.user_id, t.user_id,
progress as progress, progress as progress,
t.project_id, t.project_id,
t.state,
t.effective_hours as hours_effective, t.effective_hours as hours_effective,
t.priority, t.priority,
t.name as name, t.name as name,
@ -108,7 +106,6 @@ class report_project_task_user(osv.osv):
date_deadline, date_deadline,
t.user_id, t.user_id,
t.project_id, t.project_id,
t.state,
t.priority, t.priority,
name, name,
t.company_id, t.company_id,

7
addons/project/report/project_report_view.xml
View File

@ -15,7 +15,6 @@
<field name="project_id" invisible="1"/> <field name="project_id" invisible="1"/>
<field name="user_id" invisible="1"/> <field name="user_id" invisible="1"/>
<field name="date_deadline" invisible="1"/> <field name="date_deadline" invisible="1"/>
<field name="state" invisible="1"/>
<field name="date_start" invisible="1"/> <field name="date_start" invisible="1"/>
<field name="date_end" invisible="1"/> <field name="date_end" invisible="1"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/> <field name="company_id" invisible="1" groups="base.group_multi_company"/>
@ -44,7 +43,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<graph string="Tasks Analysis" type="bar"> <graph string="Tasks Analysis" type="bar">
<field name="name"/> <field name="name"/>
<field name="state" group="True"/>
<field name="no_of_days" operator="+"/> <field name="no_of_days" operator="+"/>
</graph> </graph>
</field> </field>
@ -58,11 +56,6 @@
<field name="date_start"/> <field name="date_start"/>
<field name="date_end"/> <field name="date_end"/>
<field name="date_deadline"/> <field name="date_deadline"/>
<filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/>
<filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/>
<filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/>
<filter string="Done" icon="terp-dialog-close" name="done" domain="[('state','=','done')]"/>
<separator/>
<filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/> <filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
<separator/> <separator/>
<filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" /> <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />

3
addons/project/res_partner_view.xml
View File

@ -18,9 +18,6 @@
<field name="name"/> <field name="name"/>
<field name="user_id"/> <field name="user_id"/>
<field name="date_deadline"/> <field name="date_deadline"/>
<field name="state" invisible="1"/>
<button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree> </tree>
</field> </field>
</group> </group>

2
addons/project/wizard/__init__.py
View File

@ -20,7 +20,7 @@
############################################################################## ##############################################################################
import project_task_delegate import project_task_delegate
import project_task_reevaluate #import project_task_reevaluate # TODO: Need To Clean
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/project_gtd/project_gtd_view.xml
View File

@ -79,7 +79,6 @@
<field name="remaining_hours" position="after"> <field name="remaining_hours" position="after">
<field string="Timeframe" name="timebox_id" invisible=" not context.get('gtd', False)"/> <field string="Timeframe" name="timebox_id" invisible=" not context.get('gtd', False)"/>
<field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/> <field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/>
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
</field> </field>
</field> </field>
</record> </record>
@ -103,8 +102,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="My Tasks"> <search string="My Tasks">
<field name="name" string="My Tasks"/> <field name="name" string="My Tasks"/>
<filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
<filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
<separator/> <separator/>
<filter name="message_unread" string="Unread Messages" domain="[('message_unread','=',True)]"/> <filter name="message_unread" string="Unread Messages" domain="[('message_unread','=',True)]"/>
<separator/> <separator/>

2
addons/project_gtd/wizard/project_gtd_empty.py
View File

@ -52,7 +52,7 @@ class project_timebox_empty(osv.osv_memory):
raise osv.except_osv(_('Error!'), _('No timebox child of this one!')) raise osv.except_osv(_('Error!'), _('No timebox child of this one!'))
tids = obj_task.search(cr, uid, [('timebox_id', '=', context['active_id'])]) tids = obj_task.search(cr, uid, [('timebox_id', '=', context['active_id'])])
for task in obj_task.browse(cr, uid, tids, context): for task in obj_task.browse(cr, uid, tids, context):
if (task.state in ('cancel','done')) or (task.user_id.id <> uid): if (task.user_id.id <> uid):
close.append(task.id) close.append(task.id)
else: else:
up.append(task.id) up.append(task.id)

4
addons/project_issue/__openerp__.py
View File

@ -54,8 +54,8 @@ It allows the manager to quickly check the issues, assign them and decide on the
'demo': ['project_issue_demo.xml'], 'demo': ['project_issue_demo.xml'],
'test': [ 'test': [
'test/subscribe_issue.yml', 'test/subscribe_issue.yml',
'test/issue_process.yml', # 'test/issue_process.yml', # TODO: Need To Clean
'test/cancel_issue.yml', # 'test/cancel_issue.yml', # TODO: Need To Clean
'test/issue_demo.yml' 'test/issue_demo.yml'
], ],
'installable': True, 'installable': True,

5
addons/project_issue/board_project_issue_view.xml
View File

@ -6,7 +6,7 @@
<field name="name">Project Issue Board Tree</field> <field name="name">Project Issue Board Tree</field>
<field name="model">project.issue</field> <field name="model">project.issue</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')"> <tree string="Issue Tracker Tree">
<field name="id"/> <field name="id"/>
<field name="create_date"/> <field name="create_date"/>
<field name="name"/> <field name="name"/>
@ -16,7 +16,6 @@
<field name="version_id" widget="selection"/> <field name="version_id" widget="selection"/>
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/> <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
<field name="stage_id" widget="selection" readonly="1"/> <field name="stage_id" widget="selection" readonly="1"/>
<field name="state" invisible="1"/>
<field name="categ_ids" invisible="1"/> <field name="categ_ids" invisible="1"/>
<field name="task_id" invisible="1"/> <field name="task_id" invisible="1"/>
</tree> </tree>
@ -28,7 +27,7 @@
<field name="res_model">project.issue</field> <field name="res_model">project.issue</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field> <field name="domain">[('user_id','=',uid)]</field>
<field name="view_id" ref="project_issue_board_tree_view"/> <field name="view_id" ref="project_issue_board_tree_view"/>
</record> </record>

46
addons/project_issue/project_issue.py
View File

@ -49,13 +49,8 @@ class project_issue(base_stage, osv.osv):
_inherit = ['mail.thread', 'ir.needaction_mixin'] _inherit = ['mail.thread', 'ir.needaction_mixin']
_track = { _track = {
'state': {
'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
'project_issue.mt_issue_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
'project_issue.mt_issue_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
},
'stage_id': { 'stage_id': {
'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'done', 'open'], 'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj,
}, },
'kanban_state': { 'kanban_state': {
'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked', 'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
@ -81,7 +76,7 @@ class project_issue(base_stage, osv.osv):
def _get_default_stage_id(self, cr, uid, context=None): def _get_default_stage_id(self, cr, uid, context=None):
""" Gives default stage_id """ """ Gives default stage_id """
project_id = self._get_default_project_id(cr, uid, context=context) project_id = self._get_default_project_id(cr, uid, context=context)
return self.stage_find(cr, uid, [], project_id, [('state', '=', 'draft')], context=context) return self.stage_find(cr, uid, [], project_id, [], context=context)
def _resolve_project_id_from_context(self, cr, uid, context=None): def _resolve_project_id_from_context(self, cr, uid, context=None):
""" Returns ID of project based on the value of 'default_project_id' """ Returns ID of project based on the value of 'default_project_id'
@ -247,13 +242,6 @@ class project_issue(base_stage, osv.osv):
'partner_id': fields.many2one('res.partner', 'Contact', select=1), 'partner_id': fields.many2one('res.partner', 'Contact', select=1),
'company_id': fields.many2one('res.company', 'Company'), 'company_id': fields.many2one('res.company', 'Company'),
'description': fields.text('Private Note'), 'description': fields.text('Private Note'),
'state': fields.related('stage_id', 'state', type="selection", store=True,
selection=_TASK_STATE, string="Status", readonly=True,
help='The status is set to \'Draft\', when a case is created.\
If the case is in progress the status is set to \'Open\'.\
When the case is over, the status is set to \'Done\'.\
If the case needs to be reviewed then the status is \
set to \'Pending\'.'),
'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', 'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
track_visibility='onchange', track_visibility='onchange',
help="A Issue's kanban state indicates special situations affecting it:\n" help="A Issue's kanban state indicates special situations affecting it:\n"
@ -272,8 +260,7 @@ class project_issue(base_stage, osv.osv):
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
'version_id': fields.many2one('project.issue.version', 'Version'), 'version_id': fields.many2one('project.issue.version', 'Version'),
'stage_id': fields.many2one ('project.task.type', 'Stage', 'stage_id': fields.many2one ('project.task.type', 'Stage',
track_visibility='onchange', track_visibility='onchange'),
domain="[('project_ids', '=', project_id)]"),
'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'), 'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'),
'duration': fields.float('Duration'), 'duration': fields.float('Duration'),
'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"), 'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@ -393,15 +380,16 @@ class project_issue(base_stage, osv.osv):
#Update last action date every time the user changes the stage #Update last action date every time the user changes the stage
if 'stage_id' in vals: if 'stage_id' in vals:
stage=self.pool.get('project.task.type').read(cr, uid, vals['stage_id'],['sequence'],context=context)
vals['date_action_last'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT) vals['date_action_last'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
state = self.pool.get('project.task.type').browse(cr, uid, vals['stage_id'], context=context).state
for issue in self.browse(cr, uid, ids, context=context): for issue in self.browse(cr, uid, ids, context=context):
# Change from draft to not draft EXCEPT cancelled: The issue has been opened -> set the opening date # Change from draft to not draft EXCEPT cancelled: The issue has been opened -> set the opening date
if issue.state == 'draft' and state not in ('draft', 'cancelled'): if stage['sequence'] == 1:
vals['date_open'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT) vals['date_open'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
# Change from not done to done: The issue has been closed -> set the closing date # Change from not done to done: The issue has been closed -> set the closing date
if issue.state != 'done' and state == 'done': for stage_type in issue.project_id.type_ids[-2:]:
vals['date_closed'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT) if stage['sequence'] == stage_type.sequence:
vals['date_closed'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
return super(project_issue, self).write(cr, uid, ids, vals, context) return super(project_issue, self).write(cr, uid, ids, vals, context)
@ -465,17 +453,18 @@ class project_issue(base_stage, osv.osv):
if stage_ids: if stage_ids:
return stage_ids[0] return stage_ids[0]
return False return False
# TODO : Need To Clean
def case_cancel(self, cr, uid, ids, context=None): # def case_cancel(self, cr, uid, ids, context=None):
""" Cancels case """ # """ Cancels case """
self.case_set(cr, uid, ids, 'cancelled', {'active': True}, context=context) # self.case_set(cr, uid, ids, 'cancelled', {'active': True}, context=context)
return True # return True
def case_escalate(self, cr, uid, ids, context=None): def case_escalate(self, cr, uid, ids, context=None):
cases = self.browse(cr, uid, ids) cases = self.browse(cr, uid, ids)
for case in cases: for case in cases:
data = {} data = {}
if case.project_id.project_escalation_id: if case.project_id.project_escalation_id:
data['stage_id']=self.pool.get('project.task.type').search(cr, uid, [('sequence','=',1)],context=context)[0]
data['project_id'] = case.project_id.project_escalation_id.id data['project_id'] = case.project_id.project_escalation_id.id
if case.project_id.project_escalation_id.user_id: if case.project_id.project_escalation_id.user_id:
data['user_id'] = case.project_id.project_escalation_id.user_id.id data['user_id'] = case.project_id.project_escalation_id.user_id.id
@ -483,7 +472,7 @@ class project_issue(base_stage, osv.osv):
self.pool.get('project.task').write(cr, uid, [case.task_id.id], {'project_id': data['project_id'], 'user_id': False}) self.pool.get('project.task').write(cr, uid, [case.task_id.id], {'project_id': data['project_id'], 'user_id': False})
else: else:
raise osv.except_osv(_('Warning!'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!')) raise osv.except_osv(_('Warning!'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
self.case_set(cr, uid, ids, 'draft', data, context=context) self.write(cr, uid, ids, data, context=context)
return True return True
# ------------------------------------------------------- # -------------------------------------------------------
@ -593,8 +582,9 @@ class project(osv.Model):
res = dict.fromkeys(ids, 0) res = dict.fromkeys(ids, 0)
issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)]) issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context): for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
if issue.state not in ('done', 'cancelled'): for stage_type in issue.project_id.type_ids[-2:]:
res[issue.project_id.id] += 1 if issue.stage_id.sequence == stage_type.sequence :
res[issue.project_id.id] += 1
return res return res
_columns = { _columns = {

22
addons/project_issue/project_issue_view.xml
View File

@ -48,12 +48,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Issue" version="7.0"> <form string="Issue" version="7.0">
<header> <header>
<button name="case_close" string="Done" type="object"
states="open" groups="base.group_user"/>
<button name="case_close" string="Done" type="object"
states="draft,pending" groups="base.group_user"/>
<button name="case_cancel" string="Cancel Issue" type="object"
states="draft,open,pending" groups="base.group_user"/>
<field name="stage_id" widget="statusbar" clickable="True"/> <field name="stage_id" widget="statusbar" clickable="True"/>
</header> </header>
<sheet string="Issue"> <sheet string="Issue">
@ -76,7 +70,7 @@
<label for="project_id"/> <label for="project_id"/>
<div> <div>
<field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/> <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
<button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link" <button name="case_escalate" string="⇒ Escalate" type="object" class="oe_link"
groups="base.group_user"/> groups="base.group_user"/>
</div> </div>
</group> </group>
@ -106,7 +100,6 @@
</group> </group>
<group string="Status" groups="base.group_no_one"> <group string="Status" groups="base.group_no_one">
<field name="active"/> <field name="active"/>
<field name="state" string="Status"/>
</group> </group>
</page> </page>
</notebook> </notebook>
@ -123,7 +116,7 @@
<field name="name">Project Issue Tracker Tree</field> <field name="name">Project Issue Tracker Tree</field>
<field name="model">project.issue</field> <field name="model">project.issue</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Issue Tracker Tree" fonts="bold:message_unread==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')"> <tree string="Issue Tracker Tree">
<field name="message_unread" invisible="1"/> <field name="message_unread" invisible="1"/>
<field name="id"/> <field name="id"/>
<field name="name"/> <field name="name"/>
@ -135,7 +128,6 @@
<field name="user_id"/> <field name="user_id"/>
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/> <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
<field name="stage_id" widget="selection" readonly="1"/> <field name="stage_id" widget="selection" readonly="1"/>
<field name="state" invisible="1"/>
<field name="categ_ids" invisible="1"/> <field name="categ_ids" invisible="1"/>
<field name="task_id" invisible="1"/> <field name="task_id" invisible="1"/>
</tree> </tree>
@ -151,14 +143,12 @@
<field name="id"/> <field name="id"/>
<filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/> <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
<separator/> <separator/>
<filter name="filter_new" string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
<filter name="filter_open" string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
<separator/>
<filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-"/> <filter string="Unassigned Issues" domain="[('user_id','=',False)]" help="Unassigned Issues" icon="terp-personal-"/>
<separator/> <separator/>
<field name="user_id"/> <field name="user_id"/>
<field name="project_id"/> <field name="project_id"/>
<field name="categ_ids"/> <field name="categ_ids"/>
<field name="stage_id"/>
<field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
<group expand="0" string="Group By..." > <group expand="0" string="Group By..." >
<filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@ -269,7 +259,7 @@
<field name="name">Project Issue- Feature Tracker Tree</field> <field name="name">Project Issue- Feature Tracker Tree</field>
<field name="model">project.issue</field> <field name="model">project.issue</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Feature Tracker Tree" fonts="bold:message_unread==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')"> <tree string="Feature Tracker Tree">
<field name="id"/> <field name="id"/>
<field name="message_unread" invisible="1"/> <field name="message_unread" invisible="1"/>
<field name="name" string="Feature description"/> <field name="name" string="Feature description"/>
@ -278,7 +268,6 @@
<field name="version_id"/> <field name="version_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="stage_id" widget="selection" readonly="1"/> <field name="stage_id" widget="selection" readonly="1"/>
<field name="state" groups="base.group_no_one"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -290,9 +279,6 @@
<search string="Feature Tracker Search"> <search string="Feature Tracker Search">
<field name="name" string="Feature description"/> <field name="name" string="Feature description"/>
<field name="date"/> <field name="date"/>
<field name="state" groups="base.group_no_one"/>
<filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
<filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
<field name="user_id"/> <field name="user_id"/>
<field name="project_id" string="Project"/> <field name="project_id" string="Project"/>
</search> </search>

12
addons/project_issue/report/project_issue_report.py
View File

@ -24,13 +24,7 @@ from openerp.osv import fields,osv
from openerp import tools from openerp import tools
from openerp.addons.crm import crm from openerp.addons.crm import crm
AVAILABLE_STATES = [
('draft','Draft'),
('open','Open'),
('cancel', 'Cancelled'),
('done', 'Closed'),
('pending','Pending')
]
class project_issue_report(osv.osv): class project_issue_report(osv.osv):
_name = "project.issue.report" _name = "project.issue.report"
_auto = False _auto = False
@ -38,7 +32,6 @@ class project_issue_report(osv.osv):
_columns = { _columns = {
'name': fields.char('Year', size=64, required=False, readonly=True), 'name': fields.char('Year', size=64, required=False, readonly=True),
'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
'month':fields.selection([('01', 'January'), ('02', 'February'), \ 'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\ ('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \ ('05', 'May'), ('06', 'June'), \
@ -80,7 +73,6 @@ class project_issue_report(osv.osv):
to_char(c.create_date, 'YYYY-MM-DD') as day, to_char(c.create_date, 'YYYY-MM-DD') as day,
to_char(c.date_open, 'YYYY-MM-DD') as opening_date, to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
to_char(c.create_date, 'YYYY-MM-DD') as creation_date, to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
c.state,
c.user_id, c.user_id,
c.working_hours_open, c.working_hours_open,
c.working_hours_close, c.working_hours_close,
@ -97,7 +89,7 @@ class project_issue_report(osv.osv):
c.task_id, c.task_id,
date_trunc('day',c.create_date) as create_date, date_trunc('day',c.create_date) as create_date,
c.day_open as delay_open, c.day_open as delay_open,
c.day_close as delay_close, c.write_date as delay_close,
(SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email
FROM FROM

6
addons/project_issue/report/project_issue_report_view.xml
View File

@ -20,7 +20,6 @@
<field name="partner_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="task_id" invisible="1"/> <field name="task_id" invisible="1"/>
<field name="date_closed" invisible="1"/> <field name="date_closed" invisible="1"/>
<field name="state" invisible="1"/>
<field name="day" invisible="1"/> <field name="day" invisible="1"/>
<field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/> <field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/>
<field name="delay_open" avg="Avg Opening Delay"/> <field name="delay_open" avg="Avg Opening Delay"/>
@ -36,7 +35,6 @@
<field name="model">project.issue.report</field> <field name="model">project.issue.report</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<graph orientation="horizontal" string="Project Issue" type="bar"> <graph orientation="horizontal" string="Project Issue" type="bar">
<field name="state"/>
<field name="nbr" operator="+"/> <field name="nbr" operator="+"/>
<field group="True" name="user_id"/> <field group="True" name="user_id"/>
</graph> </graph>
@ -49,10 +47,6 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search"> <search string="Search">
<field name="creation_date"/> <field name="creation_date"/>
<filter icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
<filter icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
<field name="project_id"/> <field name="project_id"/>
<field name="user_id"/> <field name="user_id"/>
<field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>

1
addons/project_long_term/project_long_term_view.xml
View File

@ -200,7 +200,6 @@
<field name="project_id" invisible="1"/> <field name="project_id" invisible="1"/>
<field name="total_hours" sum='Total Hours'/> <field name="total_hours" sum='Total Hours'/>
<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/> <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
<field name="state"/>
</tree> </tree>
</field> </field>
</page> </page>

2
addons/project_long_term/test/task_process.yml
View File

@ -14,6 +14,6 @@
!python {model: project.project}: | !python {model: project.project}: |
prj = self.browse(cr, uid, [ref("project.project_project_1")])[0] prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
for task in prj.tasks: for task in prj.tasks:
if task.state in ('done','cancelled'): if task.stage_id.sequence in task.project_id.type_ids[-2:]:
continue continue
assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled" assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"

4
addons/project_mrp/__openerp__.py
View File

@ -52,7 +52,9 @@ task is completed.
'depends': ['project', 'procurement', 'sale', 'mrp_jit'], 'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
'data': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'], 'data': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'],
'demo': ['project_mrp_demo.xml'], 'demo': ['project_mrp_demo.xml'],
'test': ['test/project_task_procurement.yml'], 'test': [
# 'test/project_task_procurement.yml' #TODO: Need To Clean
],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
} }

4
addons/project_mrp/project_mrp.py
View File

@ -66,11 +66,11 @@ class sale_order(osv.osv):
return {} return {}
res_sale = {} res_sale = {}
res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context) res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
cr.execute('''select sol.order_id as sale_id, t.state as task_state , cr.execute('''select sol.order_id as sale_id,
t.id as task_id, sum(sol.product_uom_qty) as total t.id as task_id, sum(sol.product_uom_qty) as total
from project_task as t from project_task as t
left join sale_order_line as sol on sol.id = t.sale_line_id left join sale_order_line as sol on sol.id = t.sale_line_id
where sol.order_id in %s group by sol.order_id,t.state,t.id ''',(tuple(ids),)) where sol.order_id in %s group by sol.order_id,t.id ''',(tuple(ids),))
sale_task_data = cr.dictfetchall() sale_task_data = cr.dictfetchall()
if not sale_task_data: if not sale_task_data:

2
addons/project_mrp/project_mrp_view.xml
View File

@ -26,7 +26,7 @@
<field name="model">project.task</field> <field name="model">project.task</field>
<field name="inherit_id" ref="project.view_task_form2"/> <field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="state" position="after"> <field name="partner_id" position="after">
<field name="sale_line_id" string="Order Line"/> <field name="sale_line_id" string="Order Line"/>
</field> </field>
</field> </field>

2
addons/project_mrp/project_procurement.py
View File

@ -39,7 +39,7 @@ class procurement_order(osv.osv):
@return: True or False. @return: True or False.
""" """
for p in self.browse(cr, uid, ids, context=context): for p in self.browse(cr, uid, ids, context=context):
if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')): if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id :
return False return False
return True return True

2
addons/project_timesheet/__openerp__.py
View File

@ -44,7 +44,7 @@ with the effect of creating, editing and deleting either ways.
], ],
'demo': ['project_timesheet_demo.xml'], 'demo': ['project_timesheet_demo.xml'],
'test': [ 'test': [
'test/worktask_entry_to_timesheetline_entry.yml', # 'test/worktask_entry_to_timesheetline_entry.yml', #TODO: Need To Clean
'test/work_timesheet.yml', 'test/work_timesheet.yml',
], ],
'installable': True, 'installable': True,

4
addons/sale_crm/sale_crm_view.xml
View File

@ -9,8 +9,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="/form/header/button[@name='case_mark_lost']" position="after"> <xpath expr="/form/header/button[@name='case_mark_lost']" position="after">
<button states="done" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/> <button attrs="{'invisible': [('probability', '&lt;', 100)]}" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/>
<button states="draft,open,pending" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/> <button attrs="{'invisible': [('probability', '=', 100)]}" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
</xpath> </xpath>
</data> </data>
</field> </field>