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

[IMP] base_module_doc_rst, base_module_record, base_report_creator: code spacing cleanup 

bzr revid: rco@openerp.com-20120209091203-ni85eanpc005t2c0
This commit is contained in:
Raphael Collet 2012-02-09 10:12:03 +01:00
parent d672ded286
commit e188087e93
5 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/base_module_doc_rst/__openerp__.py
View File

@ -35,7 +35,12 @@ This module generates the Technical Guides of selected modules in Restructured T
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'depends': ['base'], 'depends': ['base'],
'init_xml': [], 'init_xml': [],
'update_xml': ['wizard/generate_relation_graph_view.xml', 'wizard/tech_guide_rst_view.xml', 'base_module_doc_rst_view.xml', 'module_report.xml'], 'update_xml': [
'base_module_doc_rst_view.xml',
'wizard/generate_relation_graph_view.xml',
'wizard/tech_guide_rst_view.xml',
'module_report.xml',
],
'demo_xml': [], 'demo_xml': [],
'installable': True, 'installable': True,
'certificate': '001288481437217734509', 'certificate': '001288481437217734509',

4
addons/base_module_doc_rst/wizard/tech_rst_guide.py
View File

@ -470,8 +470,8 @@ class wizard_tech_guide_rst(osv.osv_memory):
_defaults ={ _defaults ={
'rst_file' : _generate, 'rst_file' : _generate,
'name': 'modules_technical_guide_rst.tgz' 'name': 'modules_technical_guide_rst.tgz',
} }
wizard_tech_guide_rst() wizard_tech_guide_rst()

6
addons/base_module_record/__openerp__.py
View File

@ -47,7 +47,11 @@ Select datetime criteria of recording and objects to be recorded and Record modu
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'depends': ['base'], 'depends': ['base'],
'init_xml': [], 'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'wizard/base_module_record_object_view.xml', 'wizard/base_module_record_data_view.xml',], 'update_xml': [
'security/ir.model.access.csv',
'wizard/base_module_record_object_view.xml',
'wizard/base_module_record_data_view.xml',
],
'demo_xml': [], 'demo_xml': [],
'installable': True, 'installable': True,
'certificate': '0083134865813', 'certificate': '0083134865813',

19
addons/base_module_record/wizard/base_module_record_objects.py
View File

@ -86,9 +86,7 @@ class base_module_record(osv.osv_memory):
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
return { return {
'name': _('Message'), 'name': _('Message'),
'context': { 'context': {'default_yaml_file': tools.ustr(res['yaml_file'])},
'default_yaml_file': tools.ustr(res['yaml_file']),
},
'view_type': 'form', 'view_type': 'form',
'view_mode': 'form', 'view_mode': 'form',
'res_model': 'base.module.record.objects', 'res_model': 'base.module.record.objects',
@ -109,9 +107,9 @@ class base_module_record(osv.osv_memory):
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'target': 'new', 'target': 'new',
} }
model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'module_recording_message_view')], context=context) model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'module_recording_message_view')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
return { return {
'name': _('Message'), 'name': _('Message'),
'context': context, 'context': context,
@ -122,6 +120,7 @@ class base_module_record(osv.osv_memory):
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'target': 'new', 'target': 'new',
} }
base_module_record() base_module_record()
class base_module_record_objects(osv.osv_memory): class base_module_record_objects(osv.osv_memory):
@ -137,10 +136,10 @@ class base_module_record_objects(osv.osv_memory):
return { return {
'name': _('Message'), 'name': _('Message'),
'context': { 'context': {
'default_module_filename': tools.ustr(res['module_filename']), 'default_module_filename': tools.ustr(res['module_filename']),
'default_module_file': tools.ustr(res['module_file']), 'default_module_file': tools.ustr(res['module_file']),
}, },
'view_type': 'form', 'view_type': 'form',
'view_mode': 'form', 'view_mode': 'form',
'res_model': 'base.module.record.objects', 'res_model': 'base.module.record.objects',
@ -166,9 +165,9 @@ class base_module_record_objects(osv.osv_memory):
'author': 'OpenERP SA', 'author': 'OpenERP SA',
'category': 'Vertical Modules/Parametrization', 'category': 'Vertical Modules/Parametrization',
'website': 'http://www.openerp.com', 'website': 'http://www.openerp.com',
'data_kind': 'update' 'data_kind': 'update',
} }
base_module_record_objects() base_module_record_objects()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

44
addons/base_report_creator/wizard/wiz_set_filter_fields.py
View File

@ -54,23 +54,23 @@ class set_filter_fields(osv.osv_memory):
field_type = self.browse(cr, uid, ids, context=context)[0].field_id.ttype field_type = self.browse(cr, uid, ids, context=context)[0].field_id.ttype
operator = (field_type=='many2one') and 'in' or '=' operator = (field_type=='many2one') and 'in' or '='
return { return {
'name': _('Set Filter Values'), 'name': _('Set Filter Values'),
'context': { 'context': {
'field_id':data['field_id'][0], 'field_id':data['field_id'][0],
'default_field_id': data['field_id'], 'default_field_id': data['field_id'],
'default_operator': operator, 'default_operator': operator,
}, },
'view_type': 'form', 'view_type': 'form',
'view_mode': 'form', 'view_mode': 'form',
'res_model': 'set.filter.value', 'res_model': 'set.filter.value',
'views': [(resource_id, 'form')], 'views': [(resource_id, 'form')],
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'target': 'new', 'target': 'new',
} }
_columns = { _columns = {
'field_id': fields.many2one('ir.model.fields', "Filter Field", required=True), 'field_id': fields.many2one('ir.model.fields', "Filter Field", required=True),
} }
set_filter_fields() set_filter_fields()
@ -141,8 +141,8 @@ class set_filter_value(osv.osv_memory):
} }
_defaults = { _defaults = {
'condition': 'and', 'condition': 'and',
} }
def set_field_operator(self, field_name, field_type, search_operator, search_value): def set_field_operator(self, field_name, field_type, search_operator, search_value):
field_search = [field_name,search_operator,search_value] field_search = [field_name,search_operator,search_value]
@ -218,13 +218,13 @@ class set_filter_value(osv.osv_memory):
fields_list = self.set_field_operator(table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data) fields_list = self.set_field_operator(table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data)
if fields_list: if fields_list:
create_dict = { create_dict = {
'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + tools.ustr(fields_list[2]) + " ", 'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + tools.ustr(fields_list[2]) + " ",
'expression':' '.join(map(tools.ustr,fields_list)), 'expression':' '.join(map(tools.ustr,fields_list)),
'report_id': context.get('active_id',False), 'report_id': context.get('active_id',False),
'condition' : form_data['condition'] 'condition' : form_data['condition']
} }
self.pool.get('base_report_creator.report.filter').create(cr, uid, create_dict, context) self.pool.get('base_report_creator.report.filter').create(cr, uid, create_dict, context)
return {'type': 'ir.actions.act_window_close'} return {'type': 'ir.actions.act_window_close'}
set_filter_value() set_filter_value()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: