From e51d9ad7d2ec5540df391fa18f1f0681acb5c6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 1 Oct 2016 18:31:52 +0200
Subject: [PATCH] Improve Template and Product views

- Better label for attribute_set
- Add the attributes page to template and move attribute_set in it
---
 product.py             |  2 +-
 view/product_form.xml  |  7 +++----
 view/template_form.xml | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/product.py b/product.py
index d0265dc937..afed62b6ff 100644
--- a/product.py
+++ b/product.py
@@ -38,7 +38,7 @@ class ProductAttributeAttributeSet(ModelSQL):
 class Template:
     __metaclass__ = PoolMeta
     __name__ = 'product.template'
-    attribute_set = fields.Many2One('product.attribute.set', 'Set')
+    attribute_set = fields.Many2One('product.attribute.set', 'Attribute Set')
 
 
 class Product:
diff --git a/view/product_form.xml b/view/product_form.xml
index 0ac3905476..b90c58cba8 100644
--- a/view/product_form.xml
+++ b/view/product_form.xml
@@ -2,9 +2,8 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form/notebook" position="inside">
-        <page name="attributes">
-            <field name="attributes" colspan="4"/>
-        </page>
+    <xpath expr="/form/notebook/page[@id='attributes']/field[@name='attribute_set']"
+        position="after">
+        <field name="attributes" colspan="4"/>
     </xpath>
 </data>
diff --git a/view/template_form.xml b/view/template_form.xml
index ea461b4dec..75897fe0b0 100644
--- a/view/template_form.xml
+++ b/view/template_form.xml
@@ -2,10 +2,10 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <data>
-    <xpath expr="/form/notebook/page[@id='general']/field[@name='products']"
-        position="before">
-        <label name="attribute_set"/>
-        <field name="attribute_set"/>
-        <newline/>
+    <xpath expr="/form/notebook" position="inside">
+        <page id="attributes" string="Attributes">
+            <label name="attribute_set"/>
+            <field name="attribute_set"/>
+        </page>
     </xpath>
 </data>