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

[MERGE, FIX] MERGE ADDONS 1, fix create user with a sales teams is member of the sales team

Browse Source 
bzr revid: tfr@openerp.com-20110218095419-8ukt8gmq4s4zbal9
This commit is contained in:
Thibault Francois
2011-02-18 10:54:19 +01:00
parent 5eb533a415 43a975174e
commit 8ef765cee4
8 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm.py
+48 -37
View File
@@ -49,7 +49,7 @@ class crm_case(object):
def _find_lost_stage(self, cr, uid, type, section_id):
return self._find_percent_stage(cr, uid, 0.0, type, section_id)
def _find_won_stage(self, cr, uid, type, section_id):
return self._find_percent_stage(cr, uid, 100.0, type, section_id)
@@ -60,14 +60,14 @@ class crm_case(object):
stage_pool = self.pool.get('crm.case.stage')
if section_id :
ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type), ("section_ids", 'in', [section_id])])
else :
else :
ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type)])
if ids:
return ids[0]
return False
def _find_first_stage(self, cr, uid, type, section_id):
"""
return the first stage that has a sequence number equal or higher than sequence
@@ -75,9 +75,9 @@ class crm_case(object):
stage_pool = self.pool.get('crm.case.stage')
if section_id :
ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type), ("section_ids", 'in', [section_id])])
else :
else :
ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type)])
if ids:
stages = stage_pool.browse(cr, uid, ids)
stage_min = stages[0]
@@ -85,9 +85,9 @@ class crm_case(object):
if stage_min.sequence > stage.sequence:
stage_min = stage
return stage_min.id
else :
else :
return False
def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
""" @param self: The object pointer
@@ -95,7 +95,7 @@ class crm_case(object):
@param uid: the current user’s ID for security checks,
@param ids: List of stage’s IDs
@stage_id: change state id on run time """
if not stage_id:
return {'value':{}}
@@ -151,19 +151,19 @@ class crm_case(object):
default = {}
default.update({
'message_ids': [],
'message_ids': [],
})
if hasattr(self, '_columns'):
if self._columns.get('date_closed'):
default.update({
'date_closed': False,
'date_closed': False,
})
if self._columns.get('date_open'):
default.update({
'date_open': False
})
return super(osv.osv, self).copy(cr, uid, id, default, context=context)
def _get_default_email(self, cr, uid, context=None):
"""Gives default email address for current user
@param self: The object pointer
@@ -214,7 +214,7 @@ class crm_case(object):
return next_stage
else :
return self._find_next_stage(cr, uid, stage_list, index + 1, current_seq, stage_pool)
def stage_change(self, cr, uid, ids, context=None, order='sequence'):
if context is None:
context = {}
@@ -226,12 +226,12 @@ class crm_case(object):
for case in self.browse(cr, uid, ids, context=context):
next_stage = False
value = {}
if case.section_id.id :
if case.section_id.id :
domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
else :
domain = [('type', '=', stage_type)]
stages = stage_pool.search(cr, uid, domain, order=order)
current_seq = case.stage_id.sequence
index = -1
@@ -239,18 +239,18 @@ class crm_case(object):
index = stages.index(case.stage_id.id)
next_stage = self._find_next_stage(cr, uid, stages, index, current_seq, stage_pool, context=context)
if next_stage:
next_stage_id = next_stage.id
value.update({'stage_id': next_stage.id})
if next_stage.on_change:
value.update({'probability': next_stage.probability})
self.write(cr, uid, [case.id], value, context=context)
return next_stage_id #FIXME should return a list of all id
def stage_next(self, cr, uid, ids, context=None):
"""This function computes next stage for case from its current stage
using available stage for that case type
@@ -259,9 +259,9 @@ class crm_case(object):
@param uid: the current user’s ID for security checks,
@param ids: List of case IDs
@param context: A standard dictionary for contextual values"""
return self.stage_change(cr, uid, ids, context=context, order='sequence')
def stage_previous(self, cr, uid, ids, context=None):
"""This function computes previous stage for case from its current stage
using available stage for that case type
@@ -283,7 +283,7 @@ class crm_case(object):
"""
if not part:
return {'value': {'partner_address_id': False,
'email_from': False,
'email_from': False,
'phone': False
}}
addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
@@ -303,7 +303,10 @@ class crm_case(object):
if not add:
return {'value': {'email_from': False}}
address = self.pool.get('res.partner.address').browse(cr, uid, add)
return {'value': {'email_from': address.email, 'phone': address.phone}}
if address.email:
return {'value': {'email_from': address.email, 'phone': address.phone}}
else:
return {'value': {'phone': address.phone}}
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
mailgate_pool = self.pool.get('mailgate.thread')
@@ -321,7 +324,7 @@ class crm_case(object):
@param ids: List of case Ids
@param *args: Tuple Value for additional Params
"""
cases = self.browse(cr, uid, ids)
self._history(cr, uid, cases, _('Open'))
for case in cases:
@@ -329,9 +332,9 @@ class crm_case(object):
if not case.user_id:
data['user_id'] = uid
self.write(cr, uid, case.id, data)
self._action(cr, uid, cases, 'open')
self._action(cr, uid, cases, 'open')
return True
def case_close(self, cr, uid, ids, *args):
@@ -483,7 +486,7 @@ class crm_case(object):
tools.email_send(
src,
[dest],
subject,
subject,
body,
reply_to=case.section_id.reply_to,
openobject_id=str(case.id),
@@ -550,9 +553,9 @@ class crm_case_stage(osv.osv):
_description = "Stage of case"
_rec_name = 'name'
_order = "sequence"
def _get_type_value(self, cr, user, context):
return [('lead','Lead'),('opportunity','Opportunity')]
@@ -566,8 +569,8 @@ class crm_case_stage(osv.osv):
'requirements': fields.text('Requirements'),
'type': fields.selection(_get_type_value, 'Type'),
}
def _find_stage_type(self, cr, uid, context=None):
"""Finds type of stage according to object.
@param self: The object pointer
@@ -612,7 +615,7 @@ class crm_case_section(osv.osv):
'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
'resource_calendar_id': fields.many2one('resource.calendar', "Working Time"),
'note': fields.text('Description'),
'working_hours': fields.float('Working Hours', digits=(16,2 )),
'working_hours': fields.float('Working Hours', digits=(16,2 )),
'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
}
@@ -708,7 +711,7 @@ class crm_case_stage(osv.osv):
_columns = {
'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
}
crm_case_stage()
@@ -742,6 +745,14 @@ class users(osv.osv):
_columns = {
'context_section_id': fields.many2one('crm.case.section', 'Sales Team'),
}
def create(self, cr, uid, vals, context=None):
res = super(users, self).create(cr, uid, vals, context=context)
section_obj=self.pool.get('crm.case.section')
if vals.get('context_section_id', False):
section_obj.write(cr, uid, [vals['context_section_id']], {'member_ids':[(4, res)]}, context)
return res
users()
addons/crm/crm_meeting_view.xml
+1 -1
View File
@@ -59,7 +59,7 @@
<field name="section_id" widget="selection"
groups="base.group_extended"/>
</group><group col="2" colspan="2">
<separator colspan="2" string="Contacts"/>
<separator colspan="2" string="Contact"/>
<field name="partner_id" string="Partner"
on_change="onchange_partner_id(partner_id)" />
<field name="partner_address_id"
addons/crm/wizard/crm_add_note_view.xml
+1 -1
View File
@@ -30,7 +30,7 @@
<separator string="" colspan="6"/>
<group colspan="6" col="4" >
<field name="state" />
<button string="_Cancel" icon="gtk-cancel" special="cancel" />
<button string="_Cancel" icon="gtk-close" special="cancel" />
<button name="action_add" type="object" string="_Add" icon="gtk-ok" />
</group>
</form>
addons/l10n_ch/wizard/create_dta.py
-1
View File
@@ -374,7 +374,6 @@ def _create_dta(obj, cr, uid, data, context=None):
raise osv.except_osv(_('Error'),
_('No IBAN for the company bank account.'))
dta_line_obj = pool.get('account.dta.line')
res_partner_bank_obj = pool.get('res.partner.bank')
seq = 1
addons/mrp/mrp.py
+1 -2
View File
@@ -672,7 +672,6 @@ class mrp_production(osv.osv):
stock_mov_obj = self.pool.get('stock.move')
production = self.browse(cr, uid, production_id, context=context)
final_product_todo = []
produced_qty = 0
if production_mode == 'consume_produce':
@@ -714,7 +713,7 @@ class mrp_production(osv.osv):
if production_mode == 'consume_produce':
# To produce remaining qty of final product
vals = {'state':'confirmed'}
#vals = {'state':'confirmed'}
#final_product_todo = [x.id for x in production.move_created_ids]
#stock_mov_obj.write(cr, uid, final_product_todo, vals)
#stock_mov_obj.action_confirm(cr, uid, final_product_todo, context)
addons/project/wizard/project_task_close.py
+9 -3
View File
@@ -22,7 +22,7 @@
from osv import fields, osv
import tools
from tools.translate import _
import re
class project_task_close(osv.osv_memory):
"""
Close Task
@@ -99,8 +99,14 @@ class project_task_close(osv.osv_memory):
}
to_adr = []
header = (project.warn_header or '') % val
footer = (project.warn_footer or '') % val
header = footer = ''
try:
header_str = (project.warn_header or '')
footer_str = (project.warn_footer or '')
header = (re.sub(r'\%\W*\(', '%(', header_str)) % val
footer = (re.sub(r'\%\W*\(', '%(', footer_str)) % val
except:
raise osv.except_osv(_('Error'), _("Invlaid automatic variables used in project header or foooter."))
body = u'%s\n%s\n%s\n\n-- \n%s' % (header, task.description, footer, signature)
if data.manager_warn and data.manager_email:
to_adr.append(data.manager_email)
addons/project/wizard/project_task_delegate.py
+4 -4
View File
@@ -53,17 +53,17 @@ class project_task_delegate(osv.osv_memory):
if 'name' in fields:
if task_name.startswith(_('CHECK: ')):
newname = str(task_name).replace(_('CHECK: '), '')
newname = tools.ustr(task_name).replace(_('CHECK: '), '')
else:
newname = task_name or ''
newname = tools.ustr(task_name or '')
res.update({'name': newname})
if 'planned_hours' in fields:
res.update({'planned_hours': task.remaining_hours or 0.0})
if 'prefix' in fields:
if task_name.startswith(_('CHECK: ')):
newname = str(task_name).replace(_('CHECK: '), '')
newname = tools.ustr(task_name).replace(_('CHECK: '), '')
else:
newname = task_name or ''
newname = tools.ustr(task_name or '')
prefix = _('CHECK: ') + newname
res.update({'prefix': prefix})
if 'new_task_description' in fields:
addons/project_planning/project_planning_demo.xml
+2 -2
View File
@@ -7,8 +7,8 @@
<record id="project_plannning_1" model="report_account_analytic.planning">
<field name="name">Project_Planning</field>
<field name="business_days">20</field>
<field name="date_from" eval="time.strftime('%Y-%m-01 10:00:00')"/>
<field name="date_to" eval="time.strftime('%Y-%m-28 15:00:00')"/>
<field name="date_from" eval="time.strftime('%Y-%m-01')"/>
<field name="date_to" eval="time.strftime('%Y-%m-28')"/>
<field name="state">open</field>
<field name="user_id" ref="project.res_users_project_manager"/>
</record>