Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-partner_reference_terms-ypa into lp:openobject-server

  1. trunk-partner_reference_terms-ypa
  2. Merge into trunk
Proposed by Richard Mathot (Odoo, formerly OpenERP)
Status: Merged
Merged at revision: 5181
Proposed branch: lp:~openerp-dev/openobject-server/trunk-partner_reference_terms-ypa
Merge into: lp:openobject-server
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/addons/base/res/res_partner.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-partner_reference_terms-ypa
Reviewer Review Type Date Requested Status
Richard Mathot (Odoo, formerly OpenERP) (community) Approve
Review via email: mp+215622@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openobject-server/trunk-partner_reference_terms-ypa updated
5124. By Richard Mathot (Odoo, formerly OpenERP)

[MERGE] Sync with trunk

Revision history for this message
Richard Mathot (Odoo, formerly OpenERP) (rim-openerp) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_partner.py'
2--- openerp/addons/base/res/res_partner.py 2014-04-04 15:58:58 +0000
3+++ openerp/addons/base/res/res_partner.py 2014-04-14 09:11:58 +0000
4@@ -234,7 +234,7 @@
5 'title': fields.many2one('res.partner.title', 'Title'),
6 'parent_id': fields.many2one('res.partner', 'Related Company', select=True),
7 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts', domain=[('active','=',True)]), # force "active_test" domain to bypass _search() override
8- 'ref': fields.char('Reference', size=64, select=1),
9+ 'ref': fields.char('Contact Reference', size=64, select=1),
10 'lang': fields.selection(_lang_get, 'Language',
11 help="If the selected language is loaded in the system, all documents related to this contact will be printed in this language. If not, it will be English."),
12 'tz': fields.selection(_tz_get, 'Timezone', size=64,