odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]all: imporve string state to status 

bzr revid: mma@tinyerp.com-20121012122419-mtiw3wpxlcbl4y1r
This commit is contained in:
Mayur Maheshwari (OpenERP) 2012-10-12 17:54:19 +05:30
parent 4a66def0ca
commit e1dfd1fadc
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/ir/ir_actions.py
View File

@ -766,7 +766,7 @@ class ir_actions_todo(osv.osv):
'action_id': fields.many2one(
'ir.actions.actions', 'Action', select=True, required=True),
'sequence': fields.integer('Sequence'),
'state': fields.selection(TODO_STATES, string='State', required=True),
'state': fields.selection(TODO_STATES, string='Status', required=True),
'name': fields.char('Name', size=64),
'type': fields.selection(TODO_TYPES, 'Type', required=True,
help="""Manual: Launched manually.

2
openerp/addons/base/ir/ir_translation.py
View File

@ -167,7 +167,7 @@ class ir_translation(osv.osv):
[('to_translate','To Translate'),
('inprogress','Translation in Progress'),
('translated','Translated')],
string="State",
string="Status",
help="Automatically set to let administators find new terms that might need to be translated"),
# aka gettext extracted-comments - we use them to flag openerp-web translation

4
openerp/addons/base/ir/workflow/workflow.py
View File

@ -136,7 +136,7 @@ class wkf_instance(osv.osv):
'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True),
'res_id': fields.integer('Resource ID'),
'res_type': fields.char('Resource Object', size=64),
'state': fields.char('State', size=32),
'state': fields.char('Status', size=32),
}
def _auto_init(self, cr, context=None):
super(wkf_instance, self)._auto_init(cr, context)
@ -159,7 +159,7 @@ class wkf_workitem(osv.osv):
'wkf_id': fields.related('act_id','wkf_id', type='many2one', relation='workflow', string='Workflow'),
'subflow_id': fields.many2one('workflow.instance', 'Subflow', ondelete="cascade", select=True),
'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True),
'state': fields.char('State', size=64, select=True),
'state': fields.char('Status', size=64, select=True),
}
wkf_workitem()

2
openerp/addons/base/ir/workflow/workflow_view.xml
View File

@ -344,7 +344,7 @@
<field name="model">workflow.workitem</field>
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="state" string="State"/>
<field name="state" string="Status"/>
<filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
<field name="wkf_id"/>
<field name="act_id"/>

4
openerp/addons/base/module/module.py
View File

@ -223,7 +223,7 @@ class module(osv.osv):
('to upgrade','To be upgraded'),
('to remove','To be removed'),
('to install','To be installed')
], string='State', readonly=True, select=True),
], string='Status', readonly=True, select=True),
'demo': fields.boolean('Demo Data', readonly=True),
'license': fields.selection([
('GPL-2', 'GPL Version 2'),
@ -671,7 +671,7 @@ class module_dependency(osv.osv):
('to remove','To be removed'),
('to install','To be installed'),
('unknown', 'Unknown'),
], string='State', readonly=True, select=True),
], string='Status', readonly=True, select=True),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
openerp/addons/base/module/wizard/base_language_install.py
View File

@ -31,7 +31,7 @@ class base_language_install(osv.osv_memory):
_columns = {
'lang': fields.selection(tools.scan_languages(),'Language', required=True),
'overwrite': fields.boolean('Overwrite Existing Terms', help="If you check this box, your customized translations will be overwritten and replaced by the official ones."),
'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True),
}
_defaults = {
'state': 'init',

2
openerp/addons/base/module/wizard/base_module_import.py
View File

@ -38,7 +38,7 @@ class base_module_import(osv.osv_memory):
_columns = {
'module_file': fields.binary('Module .ZIP file', required=True),
'state':fields.selection([('init','init'),('done','done')],
'state', readonly=True),
'Status', readonly=True),
'module_name': fields.char('Module Name', size=128),
}

2
openerp/addons/base/module/wizard/base_module_update.py
View File

@ -29,7 +29,7 @@ class base_module_update(osv.osv_memory):
_columns = {
'update': fields.integer('Number of modules updated', readonly=True),
'add': fields.integer('Number of modules added', readonly=True),
'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True),
}
_defaults = {

2
openerp/addons/base/res/res_request.py
View File

@ -73,7 +73,7 @@ class res_request(osv.osv):
'ref_partner_id':fields.many2one('res.partner', 'Partner Ref.', states={'closed':[('readonly',True)]}),
'ref_doc1':fields.reference('Document Ref 1', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
'ref_doc2':fields.reference('Document Ref 2', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
'state': fields.selection([('draft','draft'),('waiting','waiting'),('active','active'),('closed','closed')], 'State', required=True, readonly=True),
'state': fields.selection([('draft','draft'),('waiting','waiting'),('active','active'),('closed','closed')], 'Status', required=True, readonly=True),
'history': fields.one2many('res.request.history','req_id', 'History')
}
_defaults = {