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

[IMP] cleaning sales team stuff 

bzr revid: fp@tinyerp.com-20121216155843-kl2mgr3ecyi85mw1
This commit is contained in:
Fabien Pinckaers 2012-12-16 16:58:43 +01:00
parent 9a191f7f17
commit b4d72207b2
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/crm/crm.py
View File

@ -78,9 +78,9 @@ class crm_case_stage(osv.osv):
'state': fields.selection(AVAILABLE_STATES, 'Related Status', required=True,
help="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 is automatically closed."),
'case_default': fields.boolean('Common to All Teams',
'case_default': fields.boolean('Default to New Sales Team',
help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
'fold': fields.boolean('Hide in Views when Empty',
'fold': fields.boolean('Fold 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."),
'type': fields.selection([ ('lead','Lead'),
('opportunity', 'Opportunity'),
@ -194,14 +194,12 @@ class crm_case_categ(osv.osv):
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
'object_id': fields.many2one('ir.model', 'Object Name'),
}
def _find_object_id(self, cr, uid, context=None):
"""Finds id for case object"""
context = context or {}
object_id = context.get('object_id', False)
ids = self.pool.get('ir.model').search(cr, uid, ['|',('id', '=', object_id),('model', '=', context.get('object_name', False))])
return ids and ids[0] or False
_defaults = {
'object_id' : _find_object_id
}

5
addons/crm/crm_lead.py
View File

@ -121,7 +121,9 @@ class crm_lead(base_stage, format_address, osv.osv):
section_id = self._resolve_section_id_from_context(cr, uid, context=context)
if section_id:
search_domain += ['|', ('section_ids', '=', section_id)]
search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
search_domain += [('id', 'in', ids)]
else:
search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
# retrieve type from the context (if set: choose 'type' or 'both')
type = self._resolve_type_from_context(cr, uid, context=context)
if type:
@ -135,7 +137,6 @@ class crm_lead(base_stage, format_address, osv.osv):
fold = {}
for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
fold[stage.id] = stage.fold or False
return result, fold
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):

5
addons/crm/crm_view.xml
View File

@ -26,9 +26,6 @@
<menuitem id="base.next_id_64" name="Sales"
parent="base.menu_reporting" sequence="1"/>
<menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="81"/>
<!-- crm.case.channel -->
<record id="crm_case_channel_view_tree" model="ir.ui.view">
<field name="name">crm.case.channel.tree</field>
@ -173,7 +170,7 @@
<menuitem action="crm_case_section_act"
id="menu_crm_case_section_act" sequence="15"
parent="base.menu_sales_configuration_misc" groups="base.group_no_one"/>
parent="base.menu_base_config" groups="base.group_sale_manager"/>
<!-- CRM Stage Tree View -->

1
addons/sale/edi/sale_order_action_data.xml
View File

@ -11,7 +11,6 @@
<field name="search_view_id" ref="email_template.view_email_template_search"/>
<field name="context" eval="{'search_default_model_id': ref('sale.model_sale_order')}"/>
</record>
<menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/>
</data>
<!-- Mail template is done in a NOUPDATE block

2
addons/sale_journal/sale_journal_view.xml
View File

@ -42,7 +42,7 @@
</record>
<menuitem id="menu_definition_journal_invoice_type" sequence="15"
parent="base.menu_sales_configuration_misc" action="action_definition_journal_invoice_type"/>
parent="base.menu_base_config" action="action_definition_journal_invoice_type"/>
<!-- Inherit sales order form view -->