Improve Template and Product views

- Better label for attribute_set
- Add the attributes page to template and move attribute_set in it

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:

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>

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>