Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-some_typo-all-mma into
lp:~openerp-dev/openobject-server/trunk-some_typo.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-some_typo-all-mma/+merge/103220
Hello,
I have improved the typos [server].
Thanks,
mma
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-some_typo-all-mma/+merge/103220
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-server/trunk-some_typo-all-mma into
lp:~openerp-dev/openobject-server/trunk-some_typo.
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2012-04-23 11:23:42 +0000
+++ openerp/addons/base/ir/ir.xml 2012-04-24 06:16:18 +0000
@@ -162,15 +162,15 @@
<label colspan="4" string="Day: %%(day)s"/>
</group>
<group>
- <label colspan="4" string="Day of the year: %%(doy)s"/>
- <label colspan="4" string="Week of the year: %%(woy)s"/>
- <label colspan="4" string="Day of the week (0:Monday): %%(weekday)s"/>
+ <label colspan="4" string="Day of the Year: %%(doy)s"/>
+ <label colspan="4" string="Week of the Year: %%(woy)s"/>
+ <label colspan="4" string="Day of the Week (0:Monday): %%(weekday)s"/>
</group>
<group>
<label colspan="4" string="Hour 00->24: %%(h24)s"/>
<label colspan="4" string="Hour 00->12: %%(h12)s"/>
<label colspan="4" string="Minute: %%(min)s"/>
- <label colspan="4" string="Seconde: %%(sec)s"/>
+ <label colspan="4" string="Second: %%(sec)s"/>
</group>
</group>
</page>
=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py 2012-04-06 08:17:26 +0000
+++ openerp/addons/base/ir/ir_model.py 2012-04-24 06:16:18 +0000
@@ -97,10 +97,10 @@
'field_id': fields.one2many('ir.model.fields', 'model_id', 'Fields', required=True),
'state': fields.selection([('manual','Custom Object'),('base','Base Object')],'Type',readonly=True),
'access_ids': fields.one2many('ir.model.access', 'model_id', 'Access'),
- 'osv_memory': fields.function(_is_osv_memory, string='In-memory model', type='boolean',
+ 'osv_memory': fields.function(_is_osv_memory, string='In-memory Model', type='boolean',
fnct_search=_search_osv_memory,
help="Indicates whether this object model lives in memory only, i.e. is not persisted (osv.osv_memory)"),
- 'modules': fields.function(_in_modules, type='char', size=128, string='In modules', help='List of modules in which the object is defined or inherited'),
+ 'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the object is defined or inherited'),
'view_ids': fields.function(_view_ids, type='one2many', obj='ir.ui.view', string='Views'),
}
@@ -229,14 +229,14 @@
'translate': fields.boolean('Translate', help="Whether values for this field can be translated (enables the translation mechanism for that field)"),
'size': fields.integer('Size'),
'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Type', required=True, readonly=True, select=1),
- 'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On delete', help='On delete property for many2one fields'),
+ 'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On Delete', help='On delete property for many2one fields'),
'domain': fields.char('Domain', size=256, help="The optional domain to restrict possible values for relationship fields, "
"specified as a Python expression defining a list of triplets. "
"For example: [('color','=','red')]"),
'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),
'view_load': fields.boolean('View Auto-Load'),
'selectable': fields.boolean('Selectable'),
- 'modules': fields.function(_in_modules, type='char', size=128, string='In modules', help='List of modules in which the field is defined'),
+ 'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the field is defined'),
'serialization_field_id': fields.many2one('ir.model.fields', 'Serialization Field', domain = "[('ttype','=','serialized')]",
ondelete='cascade', help="If set, this field will be stored in the sparse "
"structure of the serialization field, instead "
=== modified file 'openerp/addons/base/ir/workflow/workflow.py'
--- openerp/addons/base/ir/workflow/workflow.py 2012-03-30 21:51:24 +0000
+++ openerp/addons/base/ir/workflow/workflow.py 2012-04-24 06:16:18 +0000
@@ -109,7 +109,7 @@
_columns = {
'trigger_model': fields.char('Trigger Object', size=128),
'trigger_expr_id': fields.char('Trigger Expression', size=128),
- 'signal': fields.char('Signal (button Name)', size=64,
+ 'signal': fields.char('Signal (Button Name)', size=64,
help="When the operation of transition comes from a button pressed in the client form, "\
"signal tests the name of the pressed button. If signal is NULL, no button is necessary to validate this transition."),
'group_id': fields.many2one('res.groups', 'Group Required',
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
