[MERGE] Forward-port saas-3 up to 7273474

diff --cc addons/website/views/website_templates.xml
Simple merge

diff --cc openerp/osv/orm.py
index 79d460e,f83a31b..2855a17
--- 1/openerp/osv/orm.py
--- 2/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@@ -4075,7 -4095,9 +4085,9 @@@ class BaseModel(object)
              self._transient_vacuum(cr, user)
  
          self.check_access_rights(cr, user, 'create')
 -        
 +
+         vals = self._add_missing_default_values(cr, user, vals, context)
+ 
          if self._log_access:
              for f in LOG_ACCESS_COLUMNS:
                  if vals.pop(f, None) is not None: