[MERGE ] lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp

bzr revid: sbh@tinyerp.com-20101230124128-m7198v51bpmithjt

addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py

@@ -344,7 +344,6 @@ if __name__ == "__main__":
         parser.error("incorrect number of arguments")
 
     import sys
-    import StringIO
 
     fname = sys.argv[1]
     f = fname

addons/l10n_gr/account_tax.xml

@@ -213,11 +213,11 @@
         <field name="ref_tax_code_id" ref="vat_code_input_S"/> -->
     </record>
 
-    <!-- *-* revise the ΦΠΑ.. -->
+    <!-- revise the tax.. -->
 
     <record id="ovat19" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_gr_chart_template"/>
-        <field name="name">Εκροές 19</field>
+        <field name="name">Outputs 19</field>
         <field eval="0.19" name="amount"/>
         <field name="type">percent</field>
     	<field name="type_tax_use">purchase</field>

addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py

@@ -55,11 +55,10 @@ class email_parser(object):
             # pass message as bytes because we don't know its encoding until we parse its headers
             # and hence can't convert it to utf-8 for transport
             res_id = self.rpc('email.server.tools', 'process_email', self.model, xmlrpclib.Binary(message), custom_values)
-        except Exception, e:
+        except Exception:
             logger = logging.getLogger('mail-gateway')
             logger.warning('Failed to process incoming email. Source of the failed mail is available at debug level.', exc_info=True)
             logger.debug('Source of the mail that failed to parse:', message)
-            res_id = False
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')

addons/project/project_view.xml

@@ -153,11 +153,25 @@
             </field>
         </record>
 
+       <record id="view_project_project_gantt" model="ir.ui.view">
+            <field name="name">project.project.gantt</field>
+            <field name="model">project.project</field>
+            <field name="type">gantt</field>
+            <field name="arch" type="xml">
+                <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Projects">
+                    <level object="project.project" link="id" domain="[]">
+                        <field name="complete_name"/>
+                    </level>
+                </gantt>
+            </field>
+        </record>
+
         <record id="open_view_project_all" model="ir.actions.act_window">
             <field name="name">Projects</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
+            <field name="view_mode">tree,form,gantt</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{'search_default_Current':1}</field>