diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py index e481f60cfbf..2f9aa2dac49 100644 --- a/addons/base_module_doc_rst/__openerp__.py +++ b/addons/base_module_doc_rst/__openerp__.py @@ -35,7 +35,12 @@ This module generates the Technical Guides of selected modules in Restructured T 'website': 'http://www.openerp.com', 'depends': ['base'], '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': [], 'installable': True, 'certificate': '001288481437217734509', diff --git a/addons/base_module_doc_rst/wizard/tech_rst_guide.py b/addons/base_module_doc_rst/wizard/tech_rst_guide.py index 845e8b1c012..c98100e5238 100644 --- a/addons/base_module_doc_rst/wizard/tech_rst_guide.py +++ b/addons/base_module_doc_rst/wizard/tech_rst_guide.py @@ -470,8 +470,8 @@ class wizard_tech_guide_rst(osv.osv_memory): _defaults ={ 'rst_file' : _generate, - 'name': 'modules_technical_guide_rst.tgz' - } + 'name': 'modules_technical_guide_rst.tgz', + } wizard_tech_guide_rst() diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py index 65b6a3f5ebd..bfb3c497218 100644 --- a/addons/base_module_record/__openerp__.py +++ b/addons/base_module_record/__openerp__.py @@ -47,7 +47,11 @@ Select datetime criteria of recording and objects to be recorded and Record modu 'website': 'http://www.openerp.com', 'depends': ['base'], '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': [], 'installable': True, 'certificate': '0083134865813', diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py index 27ff4902727..e822c68c8fe 100644 --- a/addons/base_module_record/wizard/base_module_record_objects.py +++ b/addons/base_module_record/wizard/base_module_record_objects.py @@ -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'] return { 'name': _('Message'), - 'context': { - 'default_yaml_file': tools.ustr(res['yaml_file']), - }, + 'context': {'default_yaml_file': tools.ustr(res['yaml_file'])}, 'view_type': 'form', 'view_mode': 'form', 'res_model': 'base.module.record.objects', @@ -109,9 +107,9 @@ class base_module_record(osv.osv_memory): 'type': 'ir.actions.act_window', 'target': 'new', } + 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'] - return { 'name': _('Message'), 'context': context, @@ -122,6 +120,7 @@ class base_module_record(osv.osv_memory): 'type': 'ir.actions.act_window', 'target': 'new', } + base_module_record() class base_module_record_objects(osv.osv_memory): @@ -137,10 +136,10 @@ class base_module_record_objects(osv.osv_memory): return { 'name': _('Message'), - 'context': { - 'default_module_filename': tools.ustr(res['module_filename']), - 'default_module_file': tools.ustr(res['module_file']), - }, + 'context': { + 'default_module_filename': tools.ustr(res['module_filename']), + 'default_module_file': tools.ustr(res['module_file']), + }, 'view_type': 'form', 'view_mode': 'form', 'res_model': 'base.module.record.objects', @@ -166,9 +165,9 @@ class base_module_record_objects(osv.osv_memory): 'author': 'OpenERP SA', 'category': 'Vertical Modules/Parametrization', 'website': 'http://www.openerp.com', - 'data_kind': 'update' + 'data_kind': 'update', } base_module_record_objects() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py index 67fb8611c6d..aa6fed3d8d9 100644 --- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py +++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py @@ -54,23 +54,23 @@ class set_filter_fields(osv.osv_memory): field_type = self.browse(cr, uid, ids, context=context)[0].field_id.ttype operator = (field_type=='many2one') and 'in' or '=' return { - 'name': _('Set Filter Values'), - 'context': { - 'field_id':data['field_id'][0], - 'default_field_id': data['field_id'], - 'default_operator': operator, - }, - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'set.filter.value', - 'views': [(resource_id, 'form')], - 'type': 'ir.actions.act_window', - 'target': 'new', - } + 'name': _('Set Filter Values'), + 'context': { + 'field_id':data['field_id'][0], + 'default_field_id': data['field_id'], + 'default_operator': operator, + }, + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'set.filter.value', + 'views': [(resource_id, 'form')], + 'type': 'ir.actions.act_window', + 'target': 'new', + } _columns = { 'field_id': fields.many2one('ir.model.fields', "Filter Field", required=True), - } + } set_filter_fields() @@ -141,8 +141,8 @@ class set_filter_value(osv.osv_memory): } _defaults = { - 'condition': 'and', - } + 'condition': 'and', + } def set_field_operator(self, field_name, field_type, 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) if fields_list: create_dict = { - 'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + tools.ustr(fields_list[2]) + " ", - 'expression':' '.join(map(tools.ustr,fields_list)), - 'report_id': context.get('active_id',False), - 'condition' : form_data['condition'] - } + 'name':model_name + "/" +field_data['field_description'] +" "+ mapping_fields[form_data['operator']] + " " + tools.ustr(fields_list[2]) + " ", + 'expression':' '.join(map(tools.ustr,fields_list)), + 'report_id': context.get('active_id',False), + 'condition' : form_data['condition'] + } self.pool.get('base_report_creator.report.filter').create(cr, uid, create_dict, context) return {'type': 'ir.actions.act_window_close'} set_filter_value() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: