diff options
| author | mga@tinyerp.com <> | 2008-09-10 18:25:55 +0530 |
|---|---|---|
| committer | mga@tinyerp.com <> | 2008-09-10 18:25:55 +0530 |
| commit | badbd0ca6db1f0b66de4e97f2730f5331a8b9c9d (patch) | |
| tree | b72ead1f84d2905b2da971e45d9e615a765ff396 | |
| parent | ff3f4804da0f4e08551d15b34a718cd480cbc285 (diff) | |
Change the type for the sms/emailtext fields
bzr revid: mga@tinyerp.com-20080910125555-e7iue38hr67zo6ob
| -rwxr-xr-x | bin/addons/base/ir/ir.xml | 3 | ||||
| -rwxr-xr-x | bin/addons/base/ir/ir_actions.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index fd1b8abee5f..9b27c6821e9 100755 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -1107,7 +1107,8 @@ <page string="Email / SMS" attrs="{'invisible':[('state','=','python'),('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','client_action'), ('state','=','other')]}"> <separator colspan="4" string="Email Configuration"/> <field name="address" domain="[('model_id','=',model_id)]"/> - <field name="message" select="2" colspan="4" widget="html_tag"/> + <field name="sms" colspan="4" attrs="{'readonly':[('state','=','python'), ('state','=','email'), ('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','client_action'), ('state','=','other')]}"/> + <field name="message" select="2" colspan="4" attrs="{'readonly':[('state','=','python'), ('state','=','dummy'),('state','=','trigger'), ('state','=','object_create'), ('state','=','object_write'), ('state','=','sms'), ('state','=','client_action'), ('state','=','other')]}" /> <newline/> <label colspan="4" string="Access all the fields related to the current object easily just by defining name of the attribute, i.e. [[partner_id.name]] for Invoice Object"/> </page> diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py index 86cbc80bdb2..f6cffc3944a 100755 --- a/bin/addons/base/ir/ir_actions.py +++ b/bin/addons/base/ir/ir_actions.py @@ -377,8 +377,8 @@ class actions_server(osv.osv): 'trigger_name': fields.char('Trigger Name', size=128), 'trigger_obj_id': fields.reference('Trigger On', selection=model_get, size=128), 'message': fields.text('Message', translate=True), - 'address': fields.many2one('ir.model.fields', 'Email From / SMS'), - 'sms': fields.text('SMS', size=160, translate=True), + 'address': fields.many2one('ir.model.fields', 'Email / Mobile'), + 'sms': fields.char('SMS', size=160, translate=True), 'child_ids': fields.one2many('ir.actions.actions', 'parent_id', 'Others Actions'), 'usage': fields.char('Action Usage', size=32), 'type': fields.char('Report Type', size=32, required=True), |