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

[IMP]code improvement and other minor changes 

bzr revid: sgo@tinyerp.com-20120913062928-hvqnp116y49yrl4d
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-09-13 11:59:28 +05:30
parent b6e298534c
commit 8ca3f76711
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/data/account_data.xml
View File

@ -560,11 +560,7 @@
<field name="name">Invoice</field>
<field name="object">account.invoice</field>
</record>
<record id="mail.analytic_subtype_new" model="mail.message.subtype">
<field name="name">new</field>
<field name="res_model">account.analytic.account</field>
<field name="default" eval="False"/>
</record>
<record id="mail.invoice_subtype_new" model="mail.message.subtype">
<field name="name">new</field>
<field name="res_model">account.invoice</field>

3
addons/analytic/__openerp__.py
View File

@ -38,7 +38,8 @@ that have no counterpart in the general financial accounts.
'security/analytic_security.xml',
'security/ir.model.access.csv',
'analytic_sequence.xml',
'analytic_view.xml'
'analytic_view.xml',
'analytic_data.xml'
],
'demo': [],
'installable': True,

10
addons/analytic/analytic_data.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="mail.analytic_subtype_new" model="mail.message.subtype">
<field name="name">new</field>
<field name="res_model">account.analytic.account</field>
<field name="default" eval="False"/>
</record>
</data>
</openerp>

11
addons/base_status/base_stage.py
View File

@ -367,21 +367,24 @@ class base_stage(object):
subtype_obj = self.pool.get('mail.message.subtype')
irmodel_obj = self.pool.get('ir.model.data')
subtype_id = subtype_obj.search(cr,uid,[('res_model','=',self._name),('name','=',name)])
ir_ids = irmodel_obj.search(cr,uid,[('model','=','mail.message.subtype'),('res_id','=',subtype_id)])
ir_ids = irmodel_obj.search(cr,uid,[('model','=','mail.message.subtype'),('res_id','in',subtype_id)])
xml_id = False
ir_model_browse = irmodel_obj.browse(cr,uid,ir_ids)
return ir_model_browse.name
if ir_model_browse:
xml_id = ir_model_browse[0].name
return xml_id
def case_close_send_note(self, cr, uid, ids, context=None):
for id in ids:
msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
xml_id = self.find_xml_id(cr, uid, ids, name="closed", context)
xml_id = self.find_xml_id(cr, uid, ids, name="closed", context=context)
self.message_post(cr, uid, [id], body=msg, subtype_xml_id=xml_id, context=context)
return True
def case_cancel_send_note(self, cr, uid, ids, context=None):
for id in ids:
msg = _('%s has been <b>cancelled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
xml_id = self.find_xml_id(cr, uid, ids, name="cancelled", context)
xml_id = self.find_xml_id(cr, uid, ids, name="cancelled", context=context)
self.message_post(cr, uid, [id], body=msg, subtype_xml_id=xml_id, context=context)
return True

5
addons/crm/crm_lead_data.xml
View File

@ -174,5 +174,10 @@
<field name="res_model">crm.lead</field>
<field name="default" eval="False"/>
</record>
<record id="mail.crm_subtype_cancelled" model="mail.message.subtype">
<field name="name">cancelled</field>
<field name="res_model">crm.lead</field>
<field name="default" eval="False"/>
</record>
</data>
</openerp>