From 71889afe9f8c4123334680f062a298e9800477ae Mon Sep 17 00:00:00 2001
From: Guillem Barba <guillem@nan-tic.com>
Date: Thu, 20 Feb 2014 12:31:41 +0100
Subject: [PATCH] Merge

---
 python.snippets | 4 ++--
 xml.snippets    | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/python.snippets b/python.snippets
index a21ae75..17388ad 100644
--- a/python.snippets
+++ b/python.snippets
@@ -254,8 +254,8 @@ endsnippet
 
 snippet error_messages "Tryton: cls._error_messages extension" b
 cls._error_messages.update({
-    ${1}
-    })
+        ${1}
+        })
 endsnippet
 
 snippet def_default "Tryton: default_fieldname() function" b
diff --git a/xml.snippets b/xml.snippets
index ddd6e4f..afb381b 100644
--- a/xml.snippets
+++ b/xml.snippets
@@ -47,6 +47,7 @@ snippet record_inform "Tryton: Record for Inherited Form View" b
 <record model="ir.ui.view" id="${1:model_id}_view_form">
     <field name="model">${2:model.name}</field>
     <field name="inherit" ref="${3:inherit_model}.${4:$1_view_form}"/>
+    <field name="type">form</field>
     <field name="name">$1_form</field>
 </record>
 endsnippet
@@ -55,6 +56,7 @@ snippet record_inlist "Tryton: Record for Inherited List View" b
 <record model="ir.ui.view" id="${1:model_id}_view_list">
     <field name="model">${2:model.name}</field>
     <field name="inherit" ref="${3:inherit_model}.${4:$1_view_${5:tree}}"/>
+    <field name="type">tree</field>
     <field name="name">$1_list</field>
 </record>
 endsnippet
@@ -104,8 +106,8 @@ snippet view_intree "Tryton: Inherited Tree View" b
 endsnippet
 
 snippet <field "Tryton: Record Field Tag" b
-${5:<label name="$1"/>
-}<field name="${1:fieldname}"${2: colspan="${3}"}${4: mode="${5:tree,form}"}/>
+${6:<label name="$1"/>
+}<field name="${1:fieldname}"${2: colspan="${3}"}${4: mode="${5:tree,form}"}/>${7}
 endsnippet