From 7a17fca354f426b9b2ffd6975bb05e22dc1b78f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Fri, 13 May 2016 08:36:57 +0200
Subject: [PATCH] [IMP] mis_builder: cosmetics in style form

---
 mis_builder/models/mis_builder_style.py | 10 +++++-----
 mis_builder/views/mis_builder.xml       | 13 +++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/mis_builder/models/mis_builder_style.py b/mis_builder/models/mis_builder_style.py
index 3208623e..91f831c1 100644
--- a/mis_builder/models/mis_builder_style.py
+++ b/mis_builder/models/mis_builder_style.py
@@ -10,9 +10,6 @@ class MisReportKpiStyle(models.Model):
 
     _name = 'mis.report.kpi.style'
 
-    # TODO use WEB WIdget color picker
-    name = fields.Char(string='style name', required=True)
-
     @api.depends('indent_level')
     def check_positive_val(self):
         return self.indent_level > 0
@@ -47,11 +44,14 @@ class MisReportKpiStyle(models.Model):
         'xx-large': 17
     }
 
+    name = fields.Char(string='Style name', required=True)
+
     color = fields.Char(
-        help='Line color in valid RGB code (from #000000 to #FFFFFF)',
+        string='Text color',
+        help='Text color in valid RGB code (from #000000 to #FFFFFF)',
     )
     background_color = fields.Char(
-        help='Line color in valid RGB code (from #000000 to #FFFFFF)'
+        help='Background color in valid RGB code (from #000000 to #FFFFFF)'
     )
     font_style = fields.Selection(
         selection=_font_style_selection,
diff --git a/mis_builder/views/mis_builder.xml b/mis_builder/views/mis_builder.xml
index 245be2de..52d67c9b 100644
--- a/mis_builder/views/mis_builder.xml
+++ b/mis_builder/views/mis_builder.xml
@@ -111,15 +111,23 @@
             <field name="model">mis.report.kpi.style</field>
             <field name="arch" type="xml">
                 <form>
-                    <group>
+                <sheet>
+                    <group string="Style" col="2">
                         <field name="name" />
+		    </group>
+		    <group string="Color" col="2">
                         <field name="color" />
                         <field name="background_color" />
+		    </group>
+		    <group string="Font" col="2">
                         <field name="font_style" />
                         <field name="font_weight" />
                         <field name="font_size" />
+		    </group>
+		    <group string="Indent">
                         <field name="indent_level" />
                     </group>
+		</sheet>
                 </form>
             </field>
         </record>
@@ -161,7 +169,8 @@
                     </group>
 		    <group col="4" string="Auto expand">
 			<field name="auto_expand_accounts"/>
-			<field name="auto_expand_accounts_style"/>
+			<field name="auto_expand_accounts_style"
+                               attrs="{'invisible': [('auto_expand_accounts', '!=', True)]}"/>
 		    </group>
                     <group col="2" string="Legend (for kpi expressions)">
                         <group>