diff --git a/addons/account_asset/account_asset_wizard.xml b/addons/account_asset/account_asset_wizard.xml
deleted file mode 100644
index e21a2d86fb5..00000000000
--- a/addons/account_asset/account_asset_wizard.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index 5e3674269d7..e481f60cfbf 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -35,7 +35,7 @@ This module generates the Technical Guides of selected modules in Restructured T
'website': 'http://www.openerp.com',
'depends': ['base'],
'init_xml': [],
- 'update_xml': ['base_module_doc_rst_view.xml', 'base_module_doc_rst_wizard.xml', 'module_report.xml'],
+ 'update_xml': ['wizard/generate_relation_graph_view.xml', 'wizard/tech_guide_rst_view.xml', 'base_module_doc_rst_view.xml', 'module_report.xml'],
'demo_xml': [],
'installable': True,
'certificate': '001288481437217734509',
diff --git a/addons/base_module_doc_rst/base_module_doc_rst_wizard.xml b/addons/base_module_doc_rst/base_module_doc_rst_wizard.xml
deleted file mode 100644
index 338791e29f1..00000000000
--- a/addons/base_module_doc_rst/base_module_doc_rst_wizard.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/addons/base_module_doc_rst/wizard/__init__.py b/addons/base_module_doc_rst/wizard/__init__.py
index c6614aacbc1..b3c66d995c1 100644
--- a/addons/base_module_doc_rst/wizard/__init__.py
+++ b/addons/base_module_doc_rst/wizard/__init__.py
@@ -19,7 +19,7 @@
#
##############################################################################
-import wizard_tech_guide_rst
+import tech_rst_guide
import generate_relation_graph
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph.py b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
index 9f789f0cc7a..5d2b7e9d3ef 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph.py
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
@@ -20,30 +20,22 @@
##############################################################################
import wizard
from osv import osv
+from osv import fields
import pooler
from tools.translate import _
-form_rep = '''
-'''
+class create_graph(osv.osv_memory):
+ _name = "create.relation.graph"
-def _get_graph(self, cr, uid, datas, context=None):
- mod_obj = pooler.get_pool(cr.dbname).get('ir.module.module')
- modules = mod_obj.browse(cr, uid, datas['ids'], context=context)
- for module in modules:
- module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
- if module_data['module_file']:
- mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
- return {'type': 'ir.actions.act_window_close'}
+ def get_graph(self, cr, uid, datas, context=None):
+ mod_obj = pooler.get_pool(cr.dbname).get('ir.module.module')
+ modules = mod_obj.browse(cr, uid, context['ids'], context=context)
+ for module in modules:
+ module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
+ if module_data['module_file']:
+ mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
+ return {'type': 'ir.actions.act_window_close'}
-class create_graph(wizard.interface):
- states = {
- 'init': {
- 'actions': [_get_graph],
- 'result': {'type': 'form', 'arch': form_rep, 'fields': {}, 'state': [('end','Ok')]}
- },
- }
-create_graph('create.relation.graph')
+create_graph()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
new file mode 100644
index 00000000000..29af49e6da9
--- /dev/null
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+ create.relation.graph.form
+ create.relation.graph
+ form
+
+
+
+
+
+
+ Generate Relationship Graph
+ ir.actions.act_window
+ create.relation.graph
+ form
+ form
+
+ {'ids': [active_id], 'id': active_id}
+ new
+
+
+
+
+ Generate Relationship Graph
+ client_action_multi
+
+ action
+ ir.module.module
+
+
+
+
\ No newline at end of file
diff --git a/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml b/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
new file mode 100644
index 00000000000..2d95e828b10
--- /dev/null
+++ b/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+ tech.guide.rst.form
+ tech.guide.rst
+ form
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py b/addons/base_module_doc_rst/wizard/tech_rst_guide.py
similarity index 93%
rename from addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
rename to addons/base_module_doc_rst/wizard/tech_rst_guide.py
index 39933c39a3e..82513fdc892 100644
--- a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
+++ b/addons/base_module_doc_rst/wizard/tech_rst_guide.py
@@ -29,20 +29,7 @@ import wizard
import pooler
import os
import tools
-
-choose_file_form = '''
-
-'''
-
-choose_file_fields = {
- 'rst_file': {'string': 'file', 'type': 'binary', 'required': True, 'readonly': True},
- 'name': {'string': 'filename', 'type': 'char', 'required': True, 'readonly': True},
-}
+from osv import osv,fields
class RstDoc(object):
def __init__(self, module, objects):
@@ -319,13 +306,17 @@ class RstDoc(object):
return s
-class wizard_tech_guide_rst(wizard.interface):
+class wizard_tech_guide_rst(osv.osv_memory):
+ _name = "tech.guide.rst"
+ _columns = {
+ 'rst_file': fields.binary('File',required = True, readonly = True),
+ 'name': fields.char("Filename", size=64, required=True, readonly = True),
+ }
-
- def _generate(self, cr, uid, data, context):
+ def _generate(self, cr, uid, context):
pool = pooler.get_pool(cr.dbname)
module_model = pool.get('ir.module.module')
- module_ids = data['ids']
+ module_ids = context['ids']
module_index = []
@@ -396,10 +387,7 @@ class wizard_tech_guide_rst(wizard.interface):
msg = "Temporary file %s could not be deleted. (%s)" % (tgz_tmp_filename, e)
logger.notifyChannel("warning", netsvc.LOG_WARNING, msg)
- return {
- 'rst_file': base64.encodestring(out),
- 'name': 'modules_technical_guide_rst.tgz'
- }
+ return base64.encodestring(out)
def _get_views(self, cr, uid, module_id, context=None):
pool = pooler.get_pool(cr.dbname)
@@ -488,21 +476,12 @@ class wizard_tech_guide_rst(wizard.interface):
logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
return ""
- states = {
- 'init': {
- 'actions': [_generate],
- 'result': {
- 'type': 'form',
- 'arch': choose_file_form,
- 'fields': choose_file_fields,
- 'state': [
- ('end', 'Close', 'gtk-close'),
- ]
+ _defaults ={
+ 'rst_file' : _generate,
+ 'name': 'modules_technical_guide_rst.tgz'
}
- },
- }
-wizard_tech_guide_rst('tech.guide.rst')
+wizard_tech_guide_rst()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index b2a93258d5d..65b6a3f5ebd 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -47,7 +47,7 @@ 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', 'base_module_record_wizard.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/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml
deleted file mode 100644
index da56814a29f..00000000000
--- a/addons/base_module_record/base_module_record_wizard.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py
index d8554e0cbdb..1058effd1d2 100644
--- a/addons/base_module_record/wizard/base_module_record_data.py
+++ b/addons/base_module_record/wizard/base_module_record_data.py
@@ -20,163 +20,141 @@
#
##############################################################################
-import wizard
-import osv
-import pooler
import time
-info = '''
-'''
+from osv import osv, fields
+import tools
+from tools.translate import _
-intro_start_form = '''
-'''
-
-intro_start_fields = {
- 'check_date': {'string':"Record from Date",'type':'datetime','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')},
- 'objects':{'string': 'Objects', 'type': 'many2many', 'relation': 'ir.model', 'help': 'List of objects to be recorded'},
- 'filter_cond':{'string':'Records only', 'type':'selection','selection':[('created','Created'),('modified','Modified'),('created_modified','Created & Modified')], 'required':True, 'default': lambda *args:'created'},
- 'info_yaml': {'string':'YAML','type':'boolean'}
-}
-
-exp_form = '''
-'''
-
-exp_fields = {
- 'res_text': {'string':"Result",'type':'text', },
-}
-
-def _info_default(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.model')
- list=('ir.ui.view','ir.ui.menu','ir.model','ir.model.fields','ir.model.access',\
- 'res.partner','res.partner.address','res.partner.category','workflow',\
- 'workflow.activity','workflow.transition','ir.actions.server','ir.server.object.lines')
- data['form']['objects']=mod.search(cr,uid,[('model','in',list)])
- cr.execute('select max(create_date) from ir_model_data')
- c=(cr.fetchone())[0].split('.')[0]
- c = time.strptime(c,"%Y-%m-%d %H:%M:%S")
- sec=c.tm_sec + 1
- c=(c[0],c[1],c[2],c[3],c[4],sec,c[6],c[7],c[8])
- data['form']['check_date']=time.strftime("%Y-%m-%d %H:%M:%S",c)
- return data['form']
-
-def _record_objects(self, cr, uid, data, context):
- check_date=data['form']['check_date']
- filter=data['form']['filter_cond']
- pool = pooler.get_pool(cr.dbname)
- user=(pool.get('res.users').browse(cr,uid,uid)).login
- mod = pool.get('ir.module.record')
- mod_obj = pool.get('ir.model')
- mod.recording_data = []
-
- for id in data['form']['objects'][0][2]:
- obj_name=(mod_obj.browse(cr,uid,id)).model
- obj_pool=pool.get(obj_name)
- if filter =='created':
- search_condition =[('create_date','>',check_date)]
- elif filter =='modified':
- search_condition =[('write_date','>',check_date)]
- elif filter =='created_modified':
- search_condition =['|',('create_date','>',check_date),('write_date','>',check_date)]
- if '_log_access' in dir(obj_pool):
- if not (obj_pool._log_access):
- search_condition=[]
- if '_auto' in dir(obj_pool):
- if not obj_pool._auto:
- continue
- elif '_log_access' not in dir(obj_pool):
- search_condition = []
- search_ids=obj_pool.search(cr,uid,search_condition)
- for s_id in search_ids:
- args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
- mod.recording_data.append(('query',args, {}, s_id))
- return {'type': 'ir.actions.act_window_close'}
-
-def _check(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.module.record')
- if len(mod.recording_data):
- if data['form']['info_yaml']:
- return 'save_yaml'
- else:
- return 'info'
- else:
- return 'end'
+class base_module_data(osv.osv_memory):
+ _name = 'base.module.data'
+ _description = "Base Module Data"
+
+ def default_get(self, cr, uid, fields, context=None):
+ mod = self.pool.get('ir.model')
+ res = super(base_module_data, self).default_get(cr, uid, fields, context=context)
-def _create_xml(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.module.record')
- res_xml = mod.generate_xml(cr, uid)
- return { 'res_text': res_xml }
+ list = ('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access',\
+ 'res.partner', 'res.partner.address', 'res.partner.category', 'workflow',\
+ 'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
+ if 'objects' in fields:
+ res.update({'objects': mod.search(cr, uid, [('model', 'in', list)])})
+ cr.execute('select max(create_date) from ir_model_data')
+ c = (cr.fetchone())[0].split('.')[0]
+ c = time.strptime(c, "%Y-%m-%d %H:%M:%S")
+ sec = c.tm_sec!=59 and c.tm_sec + 1
+ c = (c[0], c[1], c[2], c[3], c[4], sec, c[6], c[7], c[8])
+ if 'check_date' in fields:
+ res.update({'check_date': time.strftime("%Y-%m-%d %H:%M:%S",c)})
+ return res
-def _create_yaml(self,cr,uid,data,context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.module.record')
- res_xml = mod.generate_yaml(cr, uid)
- return { 'res_text': res_xml }
-
-class base_module_record_objects(wizard.interface):
- states = {
- 'init': {
- 'actions': [_info_default],
- 'result': {
- 'type':'form',
- 'arch':intro_start_form,
- 'fields': intro_start_fields,
- 'state':[
- ('end', 'Cancel', 'gtk-cancel'),
- ('record', 'Record', 'gtk-ok'),
- ]
- }
- },
- 'record': {
- 'actions': [],
- 'result': {'type':'action','action':_record_objects,'state':'check'}
- },
- 'check': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check}
- },
- 'info': {
- 'actions': [ _create_xml ],
- 'result': {
- 'type':'form',
- 'arch': exp_form,
- 'fields':exp_fields,
- 'state':[
- ('end', 'End', 'gtk-cancel'),
- ]
- },
- },
- 'save_yaml': {
- 'actions': [ _create_yaml ],
- 'result': {
- 'type':'form',
- 'arch': exp_form,
- 'fields':exp_fields,
- 'state':[
- ('end', 'End', 'gtk-cancel'),
- ]
- },
- },
- 'end': {
- 'actions': [],
- 'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','OK')]}
- },
+ _columns = {
+ 'check_date': fields.datetime('Record from Date', required=True),
+ 'objects': fields.many2many('ir.model', 'base_module_record_object_rel', 'objects', 'model_id', 'Objects'),
+ 'filter_cond': fields.selection([('created', 'Created'), ('modified', 'Modified'), ('created_modified', 'Created & Modified')], 'Records only', required=True),
+ 'info_yaml': fields.boolean('YAML'),
}
-base_module_record_objects('base_module_record.module_record_data')
+ _defaults = {
+ 'check_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'filter_cond': 'created',
+ }
+
+ def _create_xml(self, cr, uid, data, context=None):
+ mod = self.pool.get('ir.module.record')
+ res_xml = mod.generate_xml(cr, uid)
+ return {'res_text': res_xml }
+
+ def _create_yaml(self, cr, uid, data, context=None):
+ mod = self.pool.get('ir.module.record')
+ res_xml = mod.generate_yaml(cr, uid)
+ return { 'res_text': res_xml }
+
+ def record_objects(self, cr, uid, ids, context=None):
+ data = self.read(cr, uid, ids, [], context=context)[0]
+ check_date = data['check_date']
+ filter = data['filter_cond']
+ user = (self.pool.get('res.users').browse(cr, uid, uid)).login
+ mod = self.pool.get('ir.module.record')
+ mod_obj = self.pool.get('ir.model')
+ mod.recording_data = []
+ for id in data['objects']:
+ obj_name=(mod_obj.browse(cr, uid, id)).model
+ obj_pool=self.pool.get(obj_name)
+ if filter =='created':
+ search_condition =[('create_date','>',check_date)]
+ elif filter =='modified':
+ search_condition =[('write_date','>',check_date)]
+ elif filter =='created_modified':
+ search_condition =['|',('create_date','>',check_date),('write_date','>',check_date)]
+ if '_log_access' in dir(obj_pool):
+ if not (obj_pool._log_access):
+ search_condition=[]
+ if '_auto' in dir(obj_pool):
+ if not obj_pool._auto:
+ continue
+ search_ids=obj_pool.search(cr,uid,search_condition)
+ for s_id in search_ids:
+ args=(cr.dbname,uid,obj_name,'copy', s_id,{}, context)
+ mod.recording_data.append(('query', args, {}, s_id))
+
+ mod_obj = self.pool.get('ir.model.data')
+ if len(mod.recording_data):
+ if data['info_yaml']:
+ res=self._create_yaml(cr, uid, data, context)
+ model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'module_create_xml_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': {
+ 'default_res_text': tools.ustr(res['res_text']),
+ },
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.data',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+ else:
+ res=self._create_xml(cr, uid, data, context)
+ model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'module_create_xml_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': {
+ 'default_res_text': tools.ustr(res['res_text']),
+ },
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.data',
+ 'views': [(resource_id, 'form')],
+ '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,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.objects',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+
+base_module_data()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class base_module_record_data(osv.osv_memory):
+ _name = 'base.module.record.data'
+ _description = "Base Module Record Data"
+
+ _columns = {
+ 'res_text': fields.text('Result'),
+ }
+
+base_module_record_data()
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
new file mode 100644
index 00000000000..94e20d98f8b
--- /dev/null
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+ base_module_record_data
+ base.module.data
+ form
+
+
+
+
+
+
+ Export Customizations as Data
+ base.module.data
+ form
+ form
+ new
+
+
+
+
+
+
+
+
+
+ module.create.xml.form
+ base.module.record.data
+ form
+
+
+
+
+
+
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
new file mode 100644
index 00000000000..11cec50bb50
--- /dev/null
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -0,0 +1,148 @@
+
+
+
+
+
+ base_module_record_objects
+ base.module.record
+ form
+
+
+
+
+
+
+ Export Customizations as a Module
+ base.module.record
+ form
+ form
+ new
+
+
+
+
+
+
+
+
+
+
+ module.create.form
+ base.module.record.objects
+ form
+
+
+
+
+
+
+ Module Recording
+ base.module.record.objects
+ form
+ form
+ new
+
+
+
+
+ info.start.form.view
+ base.module.record.objects
+ form
+
+
+
+
+
+
+ module_recording_message
+ base.module.record.objects
+ form
+
+
+
+
+
+
+ yml.save.form
+ base.module.record.objects
+ form
+
+
+
+
+
+
+
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 065e69c171b..4411f7cd40c 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -19,147 +19,166 @@
#
##############################################################################
-import wizard
-import osv
-import pooler
import time
+
import base_module_save
+from osv import osv, fields
+import tools
+from tools.translate import _
-info = '''
-'''
+class base_module_record(osv.osv_memory):
+ _name = 'base.module.record'
+ _description = "Base Module Record"
+
+ def default_get(self, cr, uid, fields, context=None):
+ mod = self.pool.get('ir.model')
+ res = super(base_module_record, self).default_get(cr, uid, fields, context=context)
+
+ list=('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access', \
+ 'res.partner', 'res.partner.address', 'res.partner.category', 'workflow', \
+ 'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
+ if 'objects' in fields:
+ res.update({'objects': mod.search(cr, uid, [('model', 'in', list)])})
+ cr.execute('select max(create_date) from ir_model_data')
+ c=(cr.fetchone())[0].split('.')[0]
+ c = time.strptime(c, "%Y-%m-%d %H:%M:%S")
+ sec=c.tm_sec!=59 and c.tm_sec + 1
+ c=(c[0],c[1],c[2],c[3],c[4],sec,c[6],c[7],c[8])
+ if 'check_date' in fields:
+ res.update({'check_date': time.strftime("%Y-%m-%d %H:%M:%S", c)})
+ return res
-intro_start_form = '''
-'''
-
-intro_start_fields = {
- 'check_date': {'string':"Record from Date",'type':'datetime','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')},
- 'objects':{'string': 'Objects', 'type': 'many2many', 'relation': 'ir.model', 'help': 'List of objects to be recorded'},
- 'filter_cond':{'string':'Records only', 'type':'selection','selection':[('created','Created'),('modified','Modified'),('created_modified','Created & Modified')], 'required':True, 'default': lambda *args:'created'},
- 'info_yaml': {'string':'YAML','type':'boolean'}
-}
-
-def _info_default(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.model')
- list=('ir.ui.view','ir.ui.menu','ir.model','ir.model.fields','ir.model.access',\
- 'res.partner','res.partner.address','res.partner.category','workflow',\
- 'workflow.activity','workflow.transition','ir.actions.server','ir.server.object.lines')
- data['form']['objects']=mod.search(cr,uid,[('model','in',list)])
- cr.execute('select max(create_date) from ir_model_data')
- c=(cr.fetchone())[0].split('.')[0]
- c = time.strptime(c,"%Y-%m-%d %H:%M:%S")
- sec=c.tm_sec!=59 and c.tm_sec + 1
- c=(c[0],c[1],c[2],c[3],c[4],sec,c[6],c[7],c[8])
- data['form']['check_date']=time.strftime("%Y-%m-%d %H:%M:%S",c)
- return data['form']
-
-def _record_objects(self, cr, uid, data, context):
- check_date=data['form']['check_date']
- filter=data['form']['filter_cond']
- pool = pooler.get_pool(cr.dbname)
- user=(pool.get('res.users').browse(cr,uid,uid)).login
- mod = pool.get('ir.module.record')
- mod_obj = pool.get('ir.model')
- mod.recording_data = []
-
- for id in data['form']['objects'][0][2]:
- obj_name=(mod_obj.browse(cr,uid,id)).model
- obj_pool=pool.get(obj_name)
- if filter =='created':
- search_condition =[('create_date','>',check_date)]
- elif filter =='modified':
- search_condition =[('write_date','>',check_date)]
- elif filter =='created_modified':
- search_condition =['|',('create_date','>',check_date),('write_date','>',check_date)]
- if '_log_access' in dir(obj_pool):
- if not (obj_pool._log_access):
- search_condition=[]
- if '_auto' in dir(obj_pool):
- if not obj_pool._auto:
- continue
- search_ids=obj_pool.search(cr,uid,search_condition)
- for s_id in search_ids:
- args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
- mod.recording_data.append(('query',args, {}, s_id))
- return {}
-
-def inter_call(self,cr,uid,data,context):
- res=base_module_save._create_module(self,cr, uid, data, context)
- return res
-
-def _create_yaml(self,cr,uid,data,context):
- res=base_module_save._create_yaml(self,cr, uid, data, context)
- return res
-
-class base_module_record_objects(wizard.interface):
- states = {
- 'init': {
- 'actions': [_info_default],
- 'result': {
- 'type':'form',
- 'arch':intro_start_form,
- 'fields': intro_start_fields,
- 'state':[
- ('end', 'Cancel', 'gtk-cancel'),
- ('record', 'Record', 'gtk-ok'),
- ]
- }
- },
- 'record': {
- 'actions': [],
- 'result': {'type':'action','action':_record_objects,'state':'check'}
- },
- 'check': {
- 'actions': [],
- 'result': {'type':'choice','next_state':base_module_save._check}
- },
- 'info': {
- 'actions': [],
- 'result': {
- 'type':'form',
- 'arch':base_module_save.intro_start_form,
- 'fields':base_module_save.intro_start_fields,
- 'state':[
- ('end', 'Cancel', 'gtk-cancel'),
- ('save', 'Continue', 'gtk-ok'),
- ]
- },
- },
- 'save': {
- 'actions': [inter_call],
- 'result': {
- 'type':'form',
- 'arch':base_module_save.intro_save_form,
- 'fields': base_module_save.intro_save_fields,
- 'state':[('end', 'Close', 'gtk-ok'),]
- },
- },
- 'save_yaml': {
- 'actions': [_create_yaml],
- 'result': {
- 'type':'form',
- 'arch':base_module_save.yaml_save_form,
- 'fields': base_module_save.yaml_save_fields,
- 'state':[
- ('end', 'Close', 'gtk-ok'),
- ]
- }
- },
- 'end': {
- 'actions': [],
- 'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','OK')]}
- },
+ _columns = {
+ 'check_date': fields.datetime('Record from Date', required=True),
+ 'objects': fields.many2many('ir.model', 'base_module_record_object_rel', 'objects', 'model_id', 'Objects'),
+ 'filter_cond': fields.selection([('created', 'Created'), ('modified', 'Modified'), ('created_modified', 'Created & Modified')], 'Records only', required=True),
+ 'info_yaml': fields.boolean('YAML'),
}
-base_module_record_objects('base_module_record.module_record_objects')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ _defaults = {
+ 'check_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'filter_cond': 'created',
+ }
+
+ def record_objects(self, cr, uid, ids, context=None):
+ data = self.read(cr, uid, ids, [], context=context)[0]
+ check_date=data['check_date']
+ filter=data['filter_cond']
+ user=(self.pool.get('res.users').browse(cr,uid,uid)).login
+ mod = self.pool.get('ir.module.record')
+ mod_obj = self.pool.get('ir.model')
+ mod.recording_data = []
+ for id in data['objects']:
+ obj_name=(mod_obj.browse(cr,uid,id)).model
+ obj_pool=self.pool.get(obj_name)
+ if filter =='created':
+ search_condition =[('create_date', '>', check_date)]
+ elif filter =='modified':
+ search_condition =[('write_date', '>', check_date)]
+ elif filter =='created_modified':
+ search_condition =['|',('create_date', '>', check_date), ('write_date', '>', check_date)]
+ if '_log_access' in dir(obj_pool):
+ if not (obj_pool._log_access):
+ search_condition=[]
+ if '_auto' in dir(obj_pool):
+ if not obj_pool._auto:
+ continue
+ search_ids = obj_pool.search(cr,uid,search_condition)
+ for s_id in search_ids:
+ args=(cr.dbname, uid,obj_name, 'copy', s_id,{},context)
+ mod.recording_data.append(('query', args, {}, s_id))
+
+ mod_obj = self.pool.get('ir.model.data')
+ if len(mod.recording_data):
+ if data['info_yaml']:
+ mod = self.pool.get('ir.module.record')
+ res=base_module_save._create_yaml(self, cr, uid, data, context)
+ model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'yml_save_form_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': {
+ 'default_yaml_file': tools.ustr(res['yaml_file']),
+ },
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.objects',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+ else:
+ model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'info_start_form_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,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.objects',
+ 'views': [(resource_id, 'form')],
+ '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,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.objects',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+base_module_record()
+class base_module_record_objects(osv.osv_memory):
+ _name = 'base.module.record.objects'
+ _description = "Base Module Record Objects"
+
+ def inter_call(self,cr,uid,data,context=None):
+ res=base_module_save._create_module(self, cr, uid, data, context)
+ mod_obj = self.pool.get('ir.model.data')
+ model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'module_create_form_view')], context=context)
+ resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+ context.update(res)
+
+ return {
+ 'name': _('Message'),
+ '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',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+
+ _columns = {
+ 'name': fields.char('Module Name', size=64, required=True),
+ 'directory_name': fields.char('Directory Name', size=32, required=True),
+ 'version': fields.char('Version', size=16, required=True),
+ 'author': fields.char('Author', size=64, required=True),
+ 'category': fields.char('Category', size=64, required=True),
+ 'website': fields.char('Documentation URL', size=64, required=True),
+ 'description': fields.text('Full Description', required=True),
+ 'data_kind': fields.selection([('demo', 'Demo Data'), ('update', 'Normal Data')], 'Type of Data', required=True),
+ 'module_file': fields.binary('Module .zip File', filename="module_filename"),
+ 'module_filename': fields.char('Filename', size=64),
+ 'yaml_file': fields.binary('Module .zip File'),
+ }
+ _defaults = {
+ 'author': 'OpenERP SA',
+ 'category': 'Vertical Modules/Parametrization',
+ 'website': 'http://www.openerp.com',
+ 'data_kind': 'update'
+ }
+
+base_module_record_objects()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index b6c094c0a5c..1d54e212a28 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -19,133 +19,39 @@
#
##############################################################################
-import wizard
-import osv
-import pooler
-from tools.translate import _
-
-info = '''
-'''
-
-info_start_form = '''
-'''
-
-info_start_fields = {
- 'info_text': {'string':'Information', 'type':'text', 'readonly':True},
- 'info_status': {'string':'Status','type':'selection', 'selection':[('no','Not Recording'),('record','Recording')], 'readonly':True},
- 'info_yaml': {'string':'YAML','type':'boolean'}
-}
-
-
-
-intro_start_form = '''
-'''
-
-intro_start_fields = {
- 'name': {'string':'Module Name', 'type':'char', 'size':64, 'required':True},
- 'directory_name': {'string':'Directory Name', 'type':'char', 'size':32, 'required':True},
- 'version': {'string':'Version', 'type':'char', 'size':16, 'required':True},
- 'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'OpenERP SA', 'required':True},
- 'category': {'string':'Category', 'type':'char', 'size':64, 'default': lambda *args: 'Vertical Modules/Parametrization', 'required':True},
- 'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://www.openerp.com', 'required':True},
- 'description': {'string':'Full Description', 'type':'text', 'required':True},
- 'data_kind': {'string':'Type of Data', 'type':'selection', 'selection':[('demo','Demo Data'),('update','Normal Data')], 'required':True, 'default': lambda *args:'update'},
-}
-
-intro_save_form = '''
-'''
-
-intro_save_fields = {
- 'module_file': {'string': 'Module .zip File', 'type':'binary', 'readonly':True},
- 'module_filename': {'string': 'Filename', 'type':'char', 'size': 64, 'readonly':True},
-}
-
-yaml_save_form = '''
-'''
-
-yaml_save_fields = {
- 'yaml_file': {'string': 'Module .zip File', 'type':'binary'},
-}
-
import zipfile
import StringIO
import base64
-def _info_default(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.module.record')
- result = {}
- info = "Details of "+str(len(mod.recording_data))+" Operation(s):\n\n"
+import tools
+from tools.translate import _
+from osv import osv, fields
- for line in mod.recording_data:
- result.setdefault(line[0],{})
- result[line[0]].setdefault(line[1][3], {})
- result[line[0]][line[1][3]].setdefault(line[1][3], 0)
- result[line[0]][line[1][3]][line[1][3]]+=1
- for key1,val1 in result.items():
- info+=key1+"\n"
- for key2,val2 in val1.items():
- info+="\t"+key2+"\n"
- for key3,val3 in val2.items():
- info+="\t\t"+key3+" : "+str(val3)+"\n"
- return {'info_text': info, 'info_status':mod.recording and 'record' or 'no'}
-def _create_yaml(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.module.record')
+def _create_yaml(self, cr, uid, data, context=None):
+ mod = self.pool.get('ir.module.record')
try:
res_xml = mod.generate_yaml(cr, uid)
except Exception, e:
- raise wizard.except_wizard(_('Error'),_(str(e)))
+ raise osv.except_osv(_('Error'),_(str(e)))
return {
'yaml_file': base64.encodestring(res_xml),
}
-def _create_module(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.module.record')
+def _create_module(self, cr, uid, ids, context=None):
+ mod = self.pool.get('ir.module.record')
res_xml = mod.generate_xml(cr, uid)
-
- s=StringIO.StringIO()
+ data = self.read(cr, uid, ids, [], context=context)[0]
+ s = StringIO.StringIO()
zip = zipfile.ZipFile(s, 'w')
- dname = data['form']['directory_name']
- data['form']['update_name'] = ''
- data['form']['demo_name'] = ''
- if data['form']['data_kind'] =='demo':
- data['form']['demo_name'] = '"%(directory_name)s_data.xml"' % data['form']
+ dname = data['directory_name']
+ data['update_name'] = ''
+ data['demo_name'] = ''
+ if ['data_kind'] =='demo':
+ data['demo_name'] = '"%(directory_name)s_data.xml"' % data
else:
- data['form']['update_name'] = '"%(directory_name)s_data.xml"' % data['form']
- data['form']['depends'] = ','.join(map(lambda x: '"'+x+'"',mod.depends.keys()))
+ data['update_name'] = '"%(directory_name)s_data.xml"' % data
+ data['depends'] = ','.join(map(lambda x: '"'+x+'"', mod.depends.keys()))
_terp = """{
"name" : "%(name)s",
"version" : "%(version)s",
@@ -158,7 +64,7 @@ def _create_module(self, cr, uid, data, context):
"demo_xml" : [ %(demo_name)s],
"update_xml" : [%(update_name)s],
"installable": True
-} """ % data['form']
+} """ % data
filewrite = {
'__init__.py':'#\n# Generated by the OpenERP module recorder !\n#\n',
'__openerp__.py':_terp,
@@ -174,78 +80,91 @@ def _create_module(self, cr, uid, data, context):
zip.close()
return {
'module_file': base64.encodestring(s.getvalue()),
- 'module_filename': data['form']['directory_name']+'-'+data['form']['version']+'.zip'
+ 'module_filename': data['directory_name']+'-'+data['version']+'.zip'
}
-def _check(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- mod = pool.get('ir.module.record')
- if len(mod.recording_data):
- if data['form']['info_yaml']:
- return 'save_yaml'
- else:
- return 'info'
- else:
- return 'end'
-class base_module_publish(wizard.interface):
- states = {
- 'init': {
- 'actions': [_info_default],
- 'result': {
- 'type':'form',
- 'arch':info_start_form,
- 'fields': info_start_fields,
- 'state':[
- ('end', 'Cancel', 'gtk-cancel'),
- ('check', 'Continue', 'gtk-ok'),
- ]
- }
- },
- 'check': {
- 'actions': [],
- 'result': {'type':'choice','next_state':_check}
- },
- 'info': {
- 'actions': [],
- 'result': {
- 'type':'form',
- 'arch':intro_start_form,
- 'fields': intro_start_fields,
- 'state':[
- ('end', 'Cancel', 'gtk-cancel'),
- ('save', 'Continue', 'gtk-ok'),
- ]
- }
- },
- 'save': {
- 'actions': [_create_module],
- 'result': {
- 'type':'form',
- 'arch':intro_save_form,
- 'fields': intro_save_fields,
- 'state':[
- ('end', 'Close', 'gtk-ok'),
- ]
- }
- },
- 'save_yaml': {
- 'actions': [_create_yaml],
- 'result': {
- 'type':'form',
- 'arch':yaml_save_form,
- 'fields': yaml_save_fields,
- 'state':[
- ('end', 'Close', 'gtk-ok'),
- ]
- }
- },
-
- 'end': {
- 'actions': [],
- 'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','OK')]}
- },
+class base_module_save(osv.osv_memory):
+ _name = 'base.module.save'
+ _description = "Base Module Save"
+
+ def default_get(self, cr, uid, fields, context=None):
+ mod = self.pool.get('ir.module.record')
+ result = {}
+ info = "Details of "+str(len(mod.recording_data))+" Operation(s):\n\n"
+ res = super(base_module_save, self).default_get(cr, uid, fields, context=context)
+ for line in mod.recording_data:
+ result.setdefault(line[0],{})
+ result[line[0]].setdefault(line[1][3], {})
+ result[line[0]][line[1][3]].setdefault(line[1][3], 0)
+ result[line[0]][line[1][3]][line[1][3]]+=1
+ for key1,val1 in result.items():
+ info+=key1+"\n"
+ for key2,val2 in val1.items():
+ info+="\t"+key2+"\n"
+ for key3,val3 in val2.items():
+ info+="\t\t"+key3+" : "+str(val3)+"\n"
+ if 'info_text' in fields:
+ res.update({'info_text': info})
+ if 'info_status' in fields:
+ info_status = mod.recording and 'record' or 'no'
+ res.update({'info_status': info_status})
+ return res
+
+ _columns = {
+ 'info_text': fields.text('Information', readonly=True),
+ 'info_status': fields.selection([('no', 'Not Recording'),('record', 'Recording')], 'Status', readonly=True),
+ 'info_yaml': fields.boolean('YAML'),
}
-base_module_publish('base_module_record.module_save')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+ def record_save(self, cr, uid, ids, context=None):
+ data = self.read(cr, uid, ids, [], context=context)[0]
+ mod = self.pool.get('ir.module.record')
+ mod_obj = self.pool.get('ir.model.data')
+ if len(mod.recording_data):
+ if data['info_yaml']:
+ mod = self.pool.get('ir.module.record')
+ res=_create_yaml(self, cr, uid, data, context)
+ model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'yml_save_form_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': {
+ 'default_yaml_file': tools.ustr(res['yaml_file']),
+ },
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.objects',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+ else:
+ model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'info_start_form_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,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.objects',
+ 'views': [(resource_id, 'form')],
+ '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,
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.module.record.objects',
+ 'views': [(resource_id, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+
+base_module_save()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
new file mode 100644
index 00000000000..86b64220543
--- /dev/null
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+ base_module_save
+ base.module.save
+ form
+
+
+
+
+
+
+ Publish as module
+ base.module.save
+ form
+ form
+ new
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index ef2fe196348..a2929ef5a16 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -2,15 +2,6 @@
-
-
-
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index dd848d453df..d3d2d745183 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -10,6 +10,5 @@
-