diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py index 77314929269..4819007f1d0 100644 --- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py +++ b/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 diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml index 133a816d0be..7179eb8a4eb 100644 --- a/addons/l10n_gr/account_tax.xml +++ b/addons/l10n_gr/account_tax.xml @@ -213,11 +213,11 @@ --> - + - Εκροές 19 + Outputs 19 percent purchase diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py index 85c92d63989..204cb2d5d03 100644 --- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py +++ b/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') diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 869f8aa05fb..8b5dfd5fa21 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -153,11 +153,25 @@ + + project.project.gantt + project.project + gantt + + + + + + + + + Projects project.project form [] + tree,form,gantt {'search_default_Current':1}