Merge lp:~openerp.vn/openobject-jasper-reports/6.1 into lp:openobject-jasper-reports/6.1

[Huy Doan]

[Omar (Pexego) (omar7r)]

Merged, I did a small fix in return statement to works in gtk client too.

Thank you

[Omar (Pexego) (omar7r)]

review: Approve

=== modified file 'jasper_reports/__openerp__.py'
--- jasper_reports/__openerp__.py	2012-03-05 19:10:36 +0000
+++ jasper_reports/__openerp__.py	2012-04-30 12:59:17 +0000
@@ -28,7 +28,7 @@
 
 {
     "name" : "Jasper Reports",
-    "version" : "0.1",
+    "version" : "0.1.1",
     "description" : "This module integrates Jasper Reports with OpenERP.",
     "author" : "NaN·tic",
     "website" : "http://www.nan-tic.com",
@@ -39,6 +39,7 @@
         'jasper_demo.xml' 
     ],
     "update_xml" : [
+        'wizard/jasper_create_data_template.xml',
         'jasper_wizard.xml',
         'report_xml_view.xml',
         'security/ir.model.access.csv',

=== modified file 'jasper_reports/jasper_wizard.xml'
--- jasper_reports/jasper_wizard.xml	2009-08-29 22:32:12 +0000
+++ jasper_reports/jasper_wizard.xml	2012-04-30 12:59:17 +0000
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-    <record model="ir.actions.wizard" id="jasper_create_data_template_action">
-        <field name="name">Create Data Template</field>
-        <field name="wiz_name">jasper_create_data_template</field>
-    </record>
     <menuitem parent="base.menu_custom" name="Jasper Reports" id="jasper_reports_menu"/>
-    <menuitem parent="jasper_reports_menu"
-        action="jasper_create_data_template_action" id="jasper_create_data_template_menu"
-        type="wizard"/>
+	<menuitem
+            parent="jasper_reports_menu"
+            action="action_jasper_create_date_template"
+            id="jasper_create_data_template_menu" sequence="1" />        
 </data>
 </openerp>

=== modified file 'jasper_reports/wizard/__init__.py'
--- jasper_reports/wizard/__init__.py	2009-01-03 20:36:32 +0000
+++ jasper_reports/wizard/__init__.py	2012-04-30 12:59:17 +0000
@@ -1,1 +1,1 @@
-import create_data_template
+import jasper_create_data_template

=== removed file 'jasper_reports/wizard/create_data_template.py'
--- jasper_reports/wizard/create_data_template.py	2011-06-13 15:17:43 +0000
+++ jasper_reports/wizard/create_data_template.py	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-# encoding: iso-8859-15
-import wizard
-import pooler
-import base64
-import osv
-from tools.translate import _
-
-view_form_start = """<?xml version="1.0"?>
-    <form string="Create Data Template">
-        <group colspan="2">
-            <field name="model"/>
-            <field name="depth"/>
-        </group>
-    </form>"""
-
-view_fields_start = {
-    'model': { 'string': 'Model', 'type': 'many2one', 'relation': 'ir.model', 'required': True },
-    'depth': { 'string':'Depth', 'type':'integer', 'required': True },
-}
-
-view_form_end = """<?xml version="1.0"?>
-    <form string="Create Data Template">
-        <group colspan="2">
-            <field name="model"/>
-            <field name="data" filename="filename"/>
-            <field name="filename" invisible="1"/>
-        </group>
-    </form>"""
-
-view_fields_end = {
-    'model': { 'string': 'Model', 'type': 'char', 'readonly': True },
-    'data': { 'string': 'XML', 'type': 'binary', 'relation': 'ir.model', 'readonly': True },
-    'filename': { 'string': 'File Name', 'type': 'char' },
-}
-
-class create_data_template(wizard.interface):
-    
-    def _action_start(self, cr, uid, data, context):
-        res = {
-            'depth': 1
-        }
-        return res
-
-    def _action_create_xml(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        form = data['form']
-        values = pool.get('ir.model').read(cr, uid, form['model'], ['name','model'], context)
-        name = values['name']
-        model = values['model']
-
-        
-        xml = pool.get('ir.actions.report.xml').create_xml(cr, uid, model, form['depth'], context)
-
-        return {
-            'model': name,
-            'data': base64.encodestring( xml ),
-            'filename': 'jasper.xml',
-        }
-
-    states = {
-        'init': {
-            'actions': [_action_start],
-            'result': {
-                'type': 'form', 
-                'arch': view_form_start, 
-                'fields': view_fields_start, 
-                'state': [('end','Cancel','gtk-cancel'),('create','Create','gtk-ok')]
-            }
-        },
-        'create': {
-            'actions': [_action_create_xml],
-            'result': {
-                'type': 'form', 
-                'arch': view_form_end, 
-                'fields': view_fields_end, 
-                'state': [('end','Accept','gtk-ok')]
-            }
-        }
-    }
-
-create_data_template('jasper_create_data_template')

=== added file 'jasper_reports/wizard/jasper_create_data_template.py'
--- jasper_reports/wizard/jasper_create_data_template.py	1970-01-01 00:00:00 +0000
+++ jasper_reports/wizard/jasper_create_data_template.py	2012-04-30 12:59:17 +0000
@@ -0,0 +1,33 @@
+import wizard
+import pooler
+import base64
+from osv import osv,fields
+from tools.translate import _
+
+class create_data_template(osv.osv_memory):
+    _name = 'jasper.create.data.template'
+    _description = 'Create data template'
+
+    def action_create_xml(self, cr, uid, ids, context=None):
+        for data in  self.read(cr, uid, ids, context=context):
+            model = self.pool.get('ir.model').browse(cr, uid, data['model'][0], context=context)
+            xml = self.pool.get('ir.actions.report.xml').create_xml(cr, uid, model.model, data['depth'], context)
+            self.write(cr,uid,ids,{
+                'data' : base64.encodestring( xml ), 
+                'filename': 'template.xml'
+            })
+        return {
+            'type': ''
+        }
+
+    _columns = {
+        'model': fields.many2one('ir.model', 'Model', required=True),
+        'depth': fields.integer("Depth", required=True),
+        'filename': fields.char('File Name', size=32),
+        'data': fields.binary('XML')
+    }
+
+    _defaults = {
+        'depth': 1
+    }    
+create_data_template()

=== added file 'jasper_reports/wizard/jasper_create_data_template.xml'
--- jasper_reports/wizard/jasper_create_data_template.xml	1970-01-01 00:00:00 +0000
+++ jasper_reports/wizard/jasper_create_data_template.xml	2012-04-30 12:59:17 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_pos_box_out" model="ir.ui.view">
+            <field name="name">Create Data Template</field>
+            <field name="model">jasper.create.data.template</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            	<form string="Create Data Template">
+				    <group colspan="2">
+				        <field name="model"/>
+				        <field name="depth"/>
+				        <field name="data" filename="filename" readonly="1" />
+				        <field name="filename" invisible="1"/>
+				    </group>
+				    <group colspan="4" col="4">
+                        <group col="2" colspan="2"/>
+                        <button name="action_create_xml" string="Create"
+                            colspan="1" type="object" icon="gtk-apply" />
+                        <button icon="gtk-stop" special="cancel"
+                            string="Close" />
+                    </group>
+				</form>
+            </field>
+        </record>
+
+        <record id="action_jasper_create_date_template" model="ir.actions.act_window">
+            <field name="name">Create Data Template</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">jasper.create.data.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file