Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-signature-jsh into lp:openobject-server

  1. trunk-signature-jsh
  2. Merge into trunk
Proposed by Jaysinh Shukla(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-signature-jsh
Merge into: lp:openobject-server
Diff against target: 27 lines (+3/-3)
2 files modified
openerp/addons/base/base_data.xml (+2/-2)
openerp/addons/base/res/res_users.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-signature-jsh
Reviewer Review Type Date Requested Status
Thibault Delavallée (OpenERP) (community) technical Needs Fixing
Review via email: mp+215864@code.launchpad.net

Description of the change

Modified 'signature' field of 'res.users' from 'text' to 'html' to allow user to make signature with 'html' tags. This change also bringed changes to 'mail' module of Addons.

To post a comment you must log in.
Revision history for this message
Thibault Delavallée (OpenERP) (tde-openerp) wrote :

Please update administrator signature in base_data.xml (put into span).

review: Needs Fixing (technical)
Reply
lp:~openerp-dev/openobject-server/trunk-signature-jsh updated
5183. By Amit Vora(OpenERP)

[IMP] merge with main branch

5184. By Amit Vora(OpenERP)

[MRG] merge with main branch

5185. By Amit Vora(OpenERP)

[IMP] kept signature in span tag inside base_data.xml

5186. By Mehul Mehta(OpenERP)

[Merge] Merged with lp:openobject-server

5187. By Mehul Mehta(OpenERP)

[IMP] improved a signature in base_data file

5188. By Sunil Sharma(OpenERP)

[mrg]:lp:openobject-server

5189. By Dharmraj Zala(OpenERP)

[MERGE] with trunk

Unmerged revisions

5189. By Dharmraj Zala(OpenERP)

[MERGE] with trunk

5188. By Sunil Sharma(OpenERP)

[mrg]:lp:openobject-server

5187. By Mehul Mehta(OpenERP)

[IMP] improved a signature in base_data file

5186. By Mehul Mehta(OpenERP)

[Merge] Merged with lp:openobject-server

5185. By Amit Vora(OpenERP)

[IMP] kept signature in span tag inside base_data.xml

5184. By Amit Vora(OpenERP)

[MRG] merge with main branch

5183. By Amit Vora(OpenERP)

[IMP] merge with main branch

5182. By Jaysinh Shukla(OpenERP)

[IMP] res_users: Changed 'signature' field to 'html' from 'text'

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/base_data.xml'
2--- openerp/addons/base/base_data.xml 2014-04-14 12:33:21 +0000
3+++ openerp/addons/base/base_data.xml 2014-05-16 09:57:31 +0000
4@@ -66,8 +66,8 @@
5 <field name="partner_id" ref="base.partner_root"/>
6 <field name="company_id" ref="main_company"/>
7 <field name="company_ids" eval="[(4, ref('main_company'))]"/>
8- <field name="signature">--
9-Administrator</field>
10+ <field name="signature"><![CDATA[<span>--<br/>
11+Administrator</span>]]></field>
12 </record>
13
14 <record id="main_partner" model="res.partner">
15
16=== modified file 'openerp/addons/base/res/res_users.py'
17--- openerp/addons/base/res/res_users.py 2014-05-12 08:05:23 +0000
18+++ openerp/addons/base/res/res_users.py 2014-05-16 09:57:31 +0000
19@@ -172,7 +172,7 @@
20 help="Specify a value only when creating a user or if you're "\
21 "changing the user's password, otherwise leave empty. After "\
22 "a change of password, the user has to login again."),
23- 'signature': fields.text('Signature'),
24+ 'signature': fields.html('Signature'),
25 'active': fields.boolean('Active'),
26 'action_id': fields.many2one('ir.actions.actions', 'Home Action', help="If specified, this action will be opened at log on for this user, in addition to the standard menu."),
27 'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),