[merge] merge from lp:~xrg/openobject-server/optimize-5.0 and removed some confilts

bzr revid: hmo@tinyerp.com-20091120143104-tb6136unkdw7yfy9

3 files changed, 36 insertions, 2 deletions

diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/bin/addons/base/module/report/ir_module_reference.rml
index 1e09766e3e6..6f428d079c6 100644
--- a/bin/addons/base/module/report/ir_module_reference.rml
+++ b/bin/addons/base/module/report/ir_module_reference.rml
@@ -233,6 +233,12 @@
               <para style="terp_tblheader_Details">Object: [[ object.model ]] [[ objdoc(object.model) ]]</para>
             </td>
           </tr>
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ repeatIn(objdoc2(object.model), 'sline') ]]</para>
+	      <para style="terp_default_9"> [[ sline ]] </para>
+            </td>
+          </tr>
         </blockTable>
         <section>
           <para style="terp_default_1">
diff --git a/bin/addons/base/module/report/ir_module_reference_print.py b/bin/addons/base/module/report/ir_module_reference_print.py
index ff1fee02955..ac90ddd833f 100644
--- a/bin/addons/base/module/report/ir_module_reference_print.py
+++ b/bin/addons/base/module/report/ir_module_reference_print.py
@@ -29,11 +29,38 @@ class ir_module_reference_print(report_sxw.rml_parse):
             'time': time,
             'findobj': self._object_find,
             'objdoc': self._object_doc,
+	    'objdoc2': self._object_doc2,
             'findflds': self._fields_find,
         })
     def _object_doc(self, obj):
         modobj = self.pool.get(obj)
-        return modobj.__doc__
+	strdocs= modobj.__doc__
+	if not strdocs:
+		return None
+	else:
+		strdocs=strdocs.strip().splitlines(True)
+	res = ''
+	for stre in strdocs:
+		if not stre or stre.isspace():
+			break
+		res += stre
+        return res
+
+    def _object_doc2(self, obj):
+        modobj = self.pool.get(obj)
+	strdocs= modobj.__doc__
+	if not strdocs:
+		return None
+	else:
+		strdocs=strdocs.strip().splitlines(True)
+	res = []
+	fou = False
+	for stre in strdocs:
+		if fou:
+			res.append(stre.strip())
+		elif not stre or stre.isspace():
+			fou = True
+        return res
 
     def _object_find(self, module):
         ids2 = self.pool.get('ir.model.data').search(self.cr, self.uid, [('module','=',module), ('model','=','ir.model')])
diff --git a/bin/addons/base/module/wizard/wizard_export_lang.py b/bin/addons/base/module/wizard/wizard_export_lang.py
index 41ebbca64cb..d0f16680413 100644
--- a/bin/addons/base/module/wizard/wizard_export_lang.py
+++ b/bin/addons/base/module/wizard/wizard_export_lang.py
@@ -79,7 +79,8 @@ class wizard_export_lang(osv.osv_memory):
                                          ('get','get'),         # get the file
                                        ) ),
             }
-    _defaults = { 'state': lambda *a: 'choose', 
+    _defaults = { 'state': lambda *a: 'choose',
+    		  'name': lambda *a: 'lang.tar.gz'
                 }
 wizard_export_lang()