diff options
| author | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-19 14:56:25 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-19 14:56:25 +0530 |
| commit | 92922b8dee716e67883d61aaa2f0e9dfec94ef6f (patch) | |
| tree | bf5ffd3fb3f754968b56466a9c3c6a298a90894a /addons | |
| parent | c3c3e539f887780650f726937cab333c4e5490a7 (diff) | |
[REM]: crm: Removed case log and history objects + Unused view of cases
bzr revid: rpa@tinyerp.com-20100519092625-ueo5u2qai12uus8v
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/crm/crm.py | 56 | ||||
| -rw-r--r-- | addons/crm/crm_view.xml | 311 | ||||
| -rw-r--r-- | addons/crm/security/ir.model.access.csv | 6 | ||||
| -rw-r--r-- | addons/crm/wizard/crm_forward_to_partner.py | 1 | ||||
| -rw-r--r-- | addons/crm/wizard/crm_lead_to_opportunity.py | 1 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_demo.xml | 2 |
6 files changed, 2 insertions, 375 deletions
diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 46ef999604a..80b06bf7aba 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -508,62 +508,6 @@ def _links_get(self, cr, uid, context=None): res = obj.read(cr, uid, ids, ['object', 'name'], context) return [(r['object'], r['name']) for r in res] - -class crm_case_log(osv.osv): - """ Case Communication History """ - _name = "crm.case.log" - _description = "Case Communication History" - - _order = "id desc" - _columns = { - 'name': fields.char('Status', size=64), - 'date': fields.datetime('Date'), - 'section_id': fields.many2one('crm.case.section', 'Sales Team'), - 'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), - 'model_id': fields.many2one('ir.model', "Model"), - 'res_id': fields.integer('Resource ID'), - } - - _defaults = { - 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), - } - -crm_case_log() - -class crm_case_history(osv.osv): - """Case history""" - - _name = "crm.case.history" - _description = "Case history" - _order = "id desc" - _inherits = {'crm.case.log': "log_id"} - - def _note_get(self, cursor, user, ids, name, arg, context=None): - """ Gives case History Description - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of case History’s IDs - @param context: A standard dictionary for contextual values - """ - res = {} - for hist in self.browse(cursor, user, ids, context or {}): - res[hist.id] = (hist.email_from or '/') + ' (' + str(hist.date) + ')\n' - res[hist.id] += (hist.description or '') - return res - - _columns = { - 'description': fields.text('Description'), - 'note': fields.function(_note_get, method=True, string="Description", type="text"), - 'email_to': fields.char('Email To', size=84), - 'email_from' : fields.char('Email From', size=84), - 'log_id': fields.many2one('crm.case.log','Log',ondelete='cascade'), - 'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True), - } - -crm_case_history() - - class users(osv.osv): _inherit = 'res.users' _description = "Users" diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 1d7a357e992..6e03295aa23 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -232,318 +232,7 @@ </field> </record> -<!--Case History Tree View --> - <record id="crm_case_history_tree-view" model="ir.ui.view"> - <field name="name">crm.case.history.tree</field> - <field name="model">crm.case.history</field> - <field name="type">tree</field> - <field name="arch" type="xml"> - <tree string="Case History"> - <field name="date"/> - <field name="name"/> - <field name="user_id"/> - <!-- - <field name="som"/> - <field name="canal_id"/> - --> - </tree> - </field> - </record> - -<!-- Case Calendar View --> - - <record id="crm_case_calendar-view" model="ir.ui.view"> - <field name="name">crm.case.calendar</field> - <field name="model">mailgate.thread</field> - <field name="type">calendar</field> - <field name="arch" type="xml"> - <calendar color="user_id" date_start="create_date" - date_stop="date_deadline" day_length="12" - string="Cases"> - <field name="name" /> - <field name="partner_id" /> - <field name="state" /> - </calendar> - </field> - </record> - -<!-- Case Tree View --> - - <record id="crm_case_tree-view" model="ir.ui.view"> - <field name="name">crm.case.tree</field> - <field name="model">mailgate.thread</field> - <field name="type">tree</field> - <field name="arch" type="xml"> - <tree colors="red:date_deadline<current_date and state=='open';black:state in ('draft', 'cancel','done','pending')" string="Cases"> - <field name="id"/> - <field name="section_id"/> - <field name="create_date"/> - <field name="date_deadline"/> - <field name="name"/> - <field name="partner_id"/> - <field name="user_id"/> - <field name="state"/> - <button name="case_close" - states="open,draft,pending" string="Close" - type="object" icon="gtk-close" /> - <button name="case_open" states="draft,pending" - string="Open" type="object" icon="gtk-go-forward" /> - <button name="case_cancel" - states="draft,open,pending" string="Cancel" - type="object" icon="gtk-cancel" /> - <button name="case_pending" states="draft,open" - string="Pending" type="object" - icon="gtk-media-pause" /> - <button name="case_escalate" - states="open,draft,pending" string="Escalate" - groups="base.group_extended" - type="object" icon="gtk-go-up" /> - <button name="case_reset" states="done,cancel" - string="Reset to Draft" type="object" - icon="gtk-convert" /> - </tree> - </field> - </record> - -<!-- Case Form View --> - - <record id="crm_case-view" model="ir.ui.view"> - <field name="name">crm.case.form</field> - <field name="model">mailgate.thread</field> - <field name="type">form</field> - <field name="priority" eval="1"/> - <field name="arch" type="xml"> - <form string="Cases"> - <field colspan="4" name="name" select="1"/> - <field colspan="2" name="section_id" widget="selection"/> - <field name="create_date" select="1"/> - <field name="date_deadline"/> - <newline /> - <notebook colspan="4"> - <page string="General"> - <group col="8" colspan="4"> - <field colspan="4" name="partner_id" - on_change="onchange_partner_id(partner_id, email_from)" - select="1" /> - <field colspan="3" - name="partner_address_id" - on_change="onchange_partner_address_id(partner_address_id, email_from)" - /> - <newline /> - <field colspan="3" name="email_from" - /> - <button name="remind_partner" - states="open,pending" - string="Send Reminder" type="object" - icon="gtk-go-forward" /> - <field name="user_id" select="1" /> - <button name="remind_user" - states="open,pending" - string="Send Reminder" type="object" - icon="gtk-go-forward" /> - </group> - <separator colspan="4" string="Description"/> - <field name="description" colspan="4" nolabel="1"/> - <separator colspan="4"/> - <group col="8" colspan="4"> - <field name="state" select="1"/> - <button name="case_close" - states="open,draft,pending" - string="Close" type="object" - icon="gtk-close" /> - <button name="case_open" - states="draft,pending" string="Open" - type="object" icon="gtk-go-forward" /> - <button name="case_cancel" - states="draft,open,pending" - string="Cancel" type="object" - icon="gtk-cancel" /> - <button name="case_pending" - states="draft,open" string="Pending" - type="object" icon="gtk-media-pause" /> - <button name="case_escalate" - states="open,draft,pending" - string="Escalate" type="object" - groups="base.group_extended" - icon="gtk-go-up" /> - <button name="case_reset" - states="done,cancel" - string="Reset to Draft" type="object" - icon="gtk-convert" /> - </group> - </page> - <page string="History" groups="base.group_extended"> - <field name="id" select="1"/> - <field name="active"/> - <separator colspan="4" string="Dates"/> - <field name="create_date"/> - <field colspan="4" name="log_ids" nolabel="1"> - <form string="Actions"> - <separator colspan="4" string="Action Information"/> - <field colspan="4" name="name"/> - <field name="date"/> - <field name="user_id"/> - </form> - </field> - </page> - <page string="Emails" groups="base.group_extended"> - <group colspan="4"> - <field colspan="4" name="email_cc" string="CC"/> - </group> - <field name="message_ids" colspan="4" nolabel="1" mode="form,tree"> - <form string="Communication history"> - <group col="6" colspan="4"> - <field name="date"/> - <field name="email_to"/> - <field name="email_from"/> - </group> - <newline/> - <field name="description" colspan="4" nolabel="1"/> - <button colspan="4" - string="Reply to Last Email" - name="%(action_crm_send_mail)d" - context="{'mail':'reply', 'model': 'crm.case'}" - icon="gtk-undo" type="action" /> - </form> - <tree string="Communication history"> - <field name="description"/> - <field name="email_to"/> - <field name="date"/> - </tree> - </field> - <button colspan="4" string="Send New Email" - name="%(action_crm_send_mail)d" - context="{'mail':'new', 'model': 'crm.case'}" - icon="gtk-go-forward" type="action" /> - </page> - </notebook> - </form> - </field> - </record> - -<!-- Case Search View --> - - - <record id="view_crm_case_filter" model="ir.ui.view"> - <field name="name">crm.case.select</field> - <field name="model">mailgate.thread</field> - <field name="type">search</field> - <field name="arch" type="xml"> - <search string="Search Case"> - <group col='6' colspan='4'> - <filter icon="terp-partner" string="My Cases" - domain="[('user_id','=',uid)]" separator="1" - default="1" help="Cases Related to Current User" /> - <field name="state" select="1"> - <filter icon="gtk-new" - domain="[('state','in',('draft', 'open'))]" - help="Current Cases" /> - <filter icon="gtk-yes" - domain="[('state','=','open')]" help="Open Cases" /> - <filter icon="gtk-media-pause" - domain="[('state','=','pending')]" - help="Pending Cases" /> - </field> - <separator orientation="vertical" /> - <field name="name" select='1' /> - <field name="user_id" select="1" - widget="selection" /> - </group> - <field name="section_id" - default="context.get('section_id', False)" select="1" - widget="selection"/> - </search> - </field> - </record> - - <record id="crm_case_categ0-act" model="ir.actions.act_window"> - <field name="name">Cases</field> - <field name="res_model">mailgate.thread</field> - <field name="view_type">form</field> - <field name="view_id" ref="crm_case_tree-view"/> - <field name="search_view_id" ref="view_crm_case_filter"/> - </record> - - <record id="crm_case_categ0-act_open" model="ir.actions.act_window"> - <field name="name">Open Cases</field> - <field name="res_model">mailgate.thread</field> - <field name="view_type">form</field> - <field name="domain"> - [('state','<>','done'),('state','<>','cancel'),('state','<>','pending')] - </field> - <field name="search_view_id" ref="view_crm_case_filter"/> - </record> - - <record id="crm_case_section_open_act" model="ir.actions.act_window"> - <field name="name">Cases</field> - <field name="res_model">mailgate.thread</field> - <field name="domain">[('section_id','child_of',[active_id])]</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form,calendar</field> - </record> - <record id="ir_open_section_case" model="ir.values"> - <field eval="'tree_but_open'" name="key2"/> - <field eval="'crm.case.section'" name="model"/> - <field name="name">Open Cases</field> - <field eval="'ir.actions.act_window,%d'%crm_case_section_open_act" name="value"/> - <field eval="True" name="object"/> - </record> - -<!--Case History Form View --> - - <record id="crm_case_history-view" model="ir.ui.view"> - <field name="name">crm.case.history.form</field> - <field name="model">crm.case.history</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="Cases"> - <separator colspan="4" string="Case Description"/> - <field colspan="4" name="name" select="1"/> - <field name="date" select="1"/> - <field name="user_id" select="1"/> - <field name="model_id"/> - <field name="res_id"/> - <field name="som"/> - <field name="canal_id"/> - <field colspan="4" name="description"/> - </form> - </field> - </record> - -<!--Case History Search View --> - - <record id="crm_case_history_search" model="ir.ui.view"> - <field name="name">crm.case.history.select</field> - <field name="model">crm.case.history</field> - <field name="type">search</field> - <field name="arch" type="xml"> - <search string="Search Histories"> - <filter icon="terp-crm" string="My Histories" - domain="[('user_id','=',uid)]" - help="My Histories" /> - <separator orientation="vertical"/> - <group col="6" colspan="2"> - <field name="date" select="1"/> - <field name="user_id" select="1" widget="selection"/> - <field name="section_id" - default="context.get('section_id', False)" - select="1" widget="selection"/> - </group> - </search> - </field> - </record> - -<!--Case History Action --> - - <record id="crm_case_history-act" model="ir.actions.act_window"> - <field name="name">Histories</field> - <field name="res_model">crm.case.history</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" ref="crm_case_history_tree-view"/> - <field name="search_view_id" ref="crm_case_history_search"/> - </record> <!-- Segmentation line Tree View --> diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index f78044ea38e..1f90f74f281 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -6,12 +6,8 @@ "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1 "access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1 -"access_crm_case_log","crm.case.log","model_crm_case_log","crm.group_crm_user",1,1,1,1 -"access_crm_case_history","crm.case.history","model_crm_case_history","crm.group_crm_user",1,1,1,1 -"o","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1 +"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1 "access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1 -"access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1 -"access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0 diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py index 98d5392faa3..153f136cfb2 100644 --- a/addons/crm/wizard/crm_forward_to_partner.py +++ b/addons/crm/wizard/crm_forward_to_partner.py @@ -176,7 +176,6 @@ class crm_lead_forward_to_partner(osv.osv_memory): this = self.browse(cr, uid, ids[0], context=context) - hist_obj = self.pool.get('crm.case.history') smtp_pool = self.pool.get('email.smtpclient') case_pool = self.pool.get(model) case = case_pool.browse(cr, uid, res_id, context=context) diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index f4cecbe508f..12edf5edc6d 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -57,7 +57,6 @@ class crm_lead2opportunity(osv.osv_memory): lead_obj = self.pool.get('crm.lead') data_obj = self.pool.get('ir.model.data') - history_obj = self.pool.get('crm.case.history') model_obj = self.pool.get('ir.model') # Get Opportunity views diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml index 7c7764a2e37..ed031672360 100644 --- a/addons/project_issue/project_issue_demo.xml +++ b/addons/project_issue/project_issue_demo.xml @@ -22,7 +22,7 @@ <field eval=""Bug in Accounts module"" name="name"/> <field eval=""agr@agrolait.com"" name="email_from"/> </record> - <record id="crm_case_log_takecorrectiveactions0" model="crm.case.log"> + <record id="crm_case_log_takecorrectiveactions0" model="mailgate.message"> <field eval="time.strftime('%Y-%m-08')" name="date"/> <field name="case_id" ref="crm_case_buginaccountsmodule0"/> <field name="som" ref="base.som_normal"/> |
