[MERGE] forward port of branch 8.0 up to 0aab81c

1 files changed, 11 insertions, 8 deletions

diff --git a/openerp/cli/scaffold.py b/openerp/cli/scaffold.py
index a4b65690382..8194aa6cbba 100644
--- a/openerp/cli/scaffold.py
+++ b/openerp/cli/scaffold.py
@@ -83,18 +83,21 @@ env.filters['snake'] = snake
 env.filters['pascal'] = pascal
 class template(object):
     def __init__(self, identifier):
-        # TODO: directories, archives (zipfile, tarfile)
+        # TODO: archives (zipfile, tarfile)
         self.id = identifier
-        if not os.path.isdir(self.path):
-            die("{} is not a valid module template".format(identifier))
+        # is identifier a builtin?
+        self.path = builtins(identifier)
+        if os.path.isdir(self.path):
+            return
+        # is identifier a directory?
+        self.path = identifier
+        if os.path.isdir(self.path):
+            return
+        die("{} is not a valid module template".format(identifier))
 
     def __str__(self):
         return self.id
 
-    @property
-    def path(self):
-        return builtins(self.id)
-
     def files(self):
         """ Lists the (local) path and content of all files in the template
         """
@@ -118,7 +121,7 @@ class template(object):
                 os.makedirs(destdir)
 
             with open(dest, 'wb') as f:
-                if ext not in ('.py', '.xml', '.csv', '.js'):
+                if ext not in ('.py', '.xml', '.csv', '.js', '.rst', '.html'):
                     f.write(content)
                 else:
                     env.from_string(content)\