Odoo Server (MOVED TO GITHUB)

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

  1. trunk-terminology_batch2
  2. Merge into trunk
Proposed by Harry (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-terminology_batch2
Merge into: lp:openobject-server
Diff against target: 21 lines (+2/-2)
1 file modified
openerp/addons/base/res/res_partner.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-terminology_batch2
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+133186@code.launchpad.net

Description of the change

typo

To post a comment you must log in.

Unmerged revisions

4505. By Bharat Devnani (Open ERP)

[MERGE] merged tch's branch lp:~openerp-dev/openobject-server/trunk-terminology_batch2-contacts-tch

4504. By Bharat Devnani (Open ERP)

[MERGE] merged vba's branch lp:~openerp-dev/openobject-server/trunk-terminology_batch2-terminology_batch2-vba

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-11-06 18:15:02 +0000
+++ openerp/addons/base/res/res_partner.py 2012-11-07 05:27:20 +0000
@@ -126,7 +126,7 @@
126 'parent_id': fields.many2one('res.partner.category', 'Parent Category', select=True, ondelete='cascade'),126 'parent_id': fields.many2one('res.partner.category', 'Parent Category', select=True, ondelete='cascade'),
127 'complete_name': fields.function(_name_get_fnc, type="char", string='Full Name'),127 'complete_name': fields.function(_name_get_fnc, type="char", string='Full Name'),
128 'child_ids': fields.one2many('res.partner.category', 'parent_id', 'Child Categories'),128 'child_ids': fields.one2many('res.partner.category', 'parent_id', 'Child Categories'),
129 'active': fields.boolean('Active', help="The active field allows you to hide the category without removing it."),129 'active': fields.boolean('Active', help="Uncheck if you want to hide the category without removing it."),
130 'parent_left': fields.integer('Left parent', select=True),130 'parent_left': fields.integer('Left parent', select=True),
131 'parent_right': fields.integer('Right parent', select=True),131 'parent_right': fields.integer('Right parent', select=True),
132 'partner_ids': fields.many2many('res.partner', id1='category_id', id2='partner_id', string='Partners'),132 'partner_ids': fields.many2many('res.partner', id1='category_id', id2='partner_id', string='Partners'),
@@ -188,7 +188,7 @@
188 'title': fields.many2one('res.partner.title', 'Title'),188 'title': fields.many2one('res.partner.title', 'Title'),
189 'parent_id': fields.many2one('res.partner', 'Related Company'),189 'parent_id': fields.many2one('res.partner', 'Related Company'),
190 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),190 'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
191 'ref': fields.char('Reference', size=64, select=1),191 'ref': fields.char('Reference', size=64, select=1, help="Partner's Reference."),
192 'lang': fields.selection(_lang_get, 'Language',192 'lang': fields.selection(_lang_get, 'Language',
193 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."),193 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."),
194 'tz': fields.selection(_tz_get, 'Timezone', size=64,194 'tz': fields.selection(_tz_get, 'Timezone', size=64,