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

[MERGE]: merging from the trunk addons 

bzr revid: mga@tinyerp.com-20100826191251-z1h0j5tt00le2e7x
This commit is contained in:
Mantavya Gajjar 2010-08-27 00:42:51 +05:30
parent ec9f8f6cd2 7f53a6c8d5
commit 85ec26a64c
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/base_action_rule/base_action_rule.py
View File

@ -181,10 +181,12 @@ the rule to mark CC(mail to any other person defined in actions)."),
for action_rule in self.browse(cr, uid, ids, context=context):
model = action_rule.model_id.model
obj_pool = self.pool.get(model)
obj_pool.__setattr__('create', self._create(obj_pool.create, model, context=context))
obj_pool.__setattr__('write', self._write(obj_pool.write, model, context=context))
return True
if not hasattr(obj_pool, 'base_action_ruled'):
obj_pool.create = self._create(obj_pool.create, model, context=context)
obj_pool.write = self._write(obj_pool.write, model, context=context)
obj_pool.base_action_ruled = True
return True
def create(self, cr, uid, vals, context=None):
res_id = super(base_action_rule, self).create(cr, uid, vals, context)
self._register_hook(cr, uid, [res_id], context=context)

2
addons/crm/crm_lead.py
View File

@ -344,7 +344,7 @@ class crm_lead(crm_case, osv.osv):
if isinstance(ids, (str, int, long)):
ids = [ids]
if msg.get('priority'):
if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
vals['priority'] = msg.get('priority')
maps = {

8
addons/project_issue/board_project_issue_view.xml
View File

@ -7,7 +7,7 @@
<field name="res_model">project.issue</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','in',['draft','open'])]</field>
<field name="domain">[('state','in',['draft','open'])]</field>
<field name="view_id" ref="project_issue.project_issue_tree_view"/>
</record>
@ -16,7 +16,7 @@
<field name="res_model">project.issue</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
<field name="domain">[('state','=','pending')]</field>
<field name="view_id" ref="project_issue.project_issue_tree_view"/>
</record>
@ -25,7 +25,7 @@
<field name="res_model">project.issue.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="domain">[]</field>
<field name="view_id" ref="project_issue.view_project_issue_report_graph"/>
</record>
@ -47,7 +47,7 @@
<field name="res_model">project.issue.report</field>
<field name="view_type">form</field>
<field name="view_mode">graph</field>
<field name="domain">[('user_id','=',uid)]</field>
<field name="domain">[]</field>
<field name="view_id" ref="view_project_issue_graph_stage"/>
</record>