Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/7.0-bug-1190927-avo into lp:openobject-addons/7.0

  1. 7.0-bug-1190927-avo
  2. Merge into 7.0
Proposed by Amit Vora(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-bug-1190927-avo
Merge into: lp:openobject-addons/7.0
Diff against target: 25 lines (+2/-2)
2 files modified
fleet/fleet.py (+1/-1)
hr/hr.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-bug-1190927-avo
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+217193@code.launchpad.net

Description of the change

Hello,

I have improve typo Smal-sized photo to Small-sized photo

Thanks.
avo

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/7.0-bug-1190927-avo updated
10016. By Amit Vora(OpenERP)

[MRG] merge with main branch

Unmerged revisions

10016. By Amit Vora(OpenERP)

[MRG] merge with main branch

10015. By Amit Vora(OpenERP)

[IMP] change typo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'fleet/fleet.py'
2--- fleet/fleet.py 2013-01-04 12:52:34 +0000
3+++ fleet/fleet.py 2014-05-06 09:46:24 +0000
4@@ -193,7 +193,7 @@
5 "resized as a 128x128px image, with aspect ratio preserved. "\
6 "Use this field in form views or some kanban views."),
7 'image_small': fields.function(_get_image, fnct_inv=_set_image,
8- string="Smal-sized photo", type="binary", multi="_get_image",
9+ string="Small-sized photo", type="binary", multi="_get_image",
10 store = {
11 'fleet.vehicle.model.brand': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
12 },
13
14=== modified file 'hr/hr.py'
15--- hr/hr.py 2014-05-05 10:13:13 +0000
16+++ hr/hr.py 2014-05-06 09:46:24 +0000
17@@ -196,7 +196,7 @@
18 "resized as a 128x128px image, with aspect ratio preserved. "\
19 "Use this field in form views or some kanban views."),
20 'image_small': fields.function(_get_image, fnct_inv=_set_image,
21- string="Smal-sized photo", type="binary", multi="_get_image",
22+ string="Small-sized photo", type="binary", multi="_get_image",
23 store = {
24 'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
25 },