Merge lp:~openerp-community/ocb-server/trunk-bugfix-1053511 into lp:ocb-server/6.1

Proposed by Laurent Chane on 2014-07-04
Status: Merged
Merged at revision: 4331
Proposed branch: lp:~openerp-community/ocb-server/trunk-bugfix-1053511
Merge into: lp:ocb-server/6.1
Diff against target: 50 lines (+4/-5)
3 files modified
openerp/addons/base/ir/ir.xml (+1/-1)
openerp/addons/base/ir/ir_model.py (+2/-3)
openerp/osv/orm.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-community/ocb-server/trunk-bugfix-1053511
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza code review Approve on 2015-02-17
Stefan Rijnhart (Opener) 2014-07-04 Approve on 2015-02-17
Review via email: mp+225604@code.launchpad.net

Description of the change

[FIX] Removes the limit of 64 characters from additional text fields added via the interface

https://bugs.launchpad.net/openobject-server/+bug/1053511

This change is the same as done in:
http://bazaar.launchpad.net/~openerp-dev/openobject-server/7.0-opw-582876-cbi/revision/4908

To post a comment you must log in.
Marco Di Francesco (marco-difra) wrote :

I am out of the office from Thu 03/07/2014 until Mon 21/07/2014.

I will respond to your message when I return.

Note: This is an automated response to your message "[Openerp-community]
[Merge] lp:~openerp-community/ocb-server/trunk-bugfix-1053511 into
lp:ocb-server/6.1" sent on 04/07/2014 8.34.23.

This is the only notification you will receive while this person is away.

+1. Verbatim backport, the code of which still seems present in 8.0

review: Approve
Pedro Manuel Baeza (pedro.baeza) wrote :

LGMT

review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/ir/ir.xml'
2--- openerp/addons/base/ir/ir.xml 2013-09-10 14:15:41 +0000
3+++ openerp/addons/base/ir/ir.xml 2014-07-04 06:33:58 +0000
4@@ -1140,7 +1140,7 @@
5 'readonly': [('ttype','not in', ['many2one','one2many','many2many'])]}"/>
6 <field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
7 <field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
8- <field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
9+ <field name="size" attrs="{'invisible': [('ttype','not in',['char','text','reference'])]}"/>
10 <field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
11 <field name="serialization_field_id" attrs="{'readonly': [('state','=','base')]}" domain = "[('ttype','=','serialized'), ('model_id', '=', model_id)]"/>
12 </group>
13
14=== modified file 'openerp/addons/base/ir/ir_model.py'
15--- openerp/addons/base/ir/ir_model.py 2012-03-23 09:55:11 +0000
16+++ openerp/addons/base/ir/ir_model.py 2014-07-04 06:33:58 +0000
17@@ -233,7 +233,6 @@
18 'state': lambda self,cr,uid,ctx={}: (ctx and ctx.get('manual',False)) and 'manual' or 'base',
19 'on_delete': 'set null',
20 'select_level': '0',
21- 'size': 64,
22 'field_description': '',
23 'selectable': 1,
24 }
25@@ -263,10 +262,10 @@
26 return True
27
28 def _size_gt_zero_msg(self, cr, user, ids, context=None):
29- return _('Size of the field can never be less than 1 !')
30+ return _('Size of the field can never be less than 0 !')
31
32 _sql_constraints = [
33- ('size_gt_zero', 'CHECK (size>0)',_size_gt_zero_msg ),
34+ ('size_gt_zero', 'CHECK (size>=0)',_size_gt_zero_msg ),
35 ]
36
37 def unlink(self, cr, user, ids, context=None):
38
39=== modified file 'openerp/osv/orm.py'
40--- openerp/osv/orm.py 2013-09-10 14:15:41 +0000
41+++ openerp/osv/orm.py 2014-07-04 06:33:58 +0000
42@@ -1014,7 +1014,7 @@
43 'required': bool(field['required']),
44 'readonly': bool(field['readonly']),
45 'domain': eval(field['domain']) if field['domain'] else None,
46- 'size': field['size'],
47+ 'size': field['size'] or None,
48 'ondelete': field['on_delete'],
49 'translate': (field['translate']),
50 'manual': True,

Subscribers

People subscribed via source and target branches

to status/vote changes: