From 9265cda861321ea20296774bd54e2e0666983c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 16 Mar 2012 12:41:49 +0100
Subject: [PATCH] New product types: Goods, Assets and Service

review260001
---
 product.py  | 18 +++++++++---------
 product.xml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/product.py b/product.py
index 9d3caf8c99..12988b27e8 100644
--- a/product.py
+++ b/product.py
@@ -4,7 +4,7 @@ from trytond.model import Model, fields
 from trytond.pyson import Eval, Bool, Id
 from trytond.pool import Pool
 
-MEASURABLE = ['stockable', 'consumable']
+NON_MEASURABLE = ['service']
 
 
 class Template(Model):
@@ -13,13 +13,13 @@ class Template(Model):
     length = fields.Float('Length',
         digits=(16, Eval('length_digits', 2)),
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             },
         depends=['type', 'length_digits'])
     length_uom = fields.Many2One('product.uom', 'Length Uom',
         domain=[('category', '=', Id('product', 'uom_cat_length'))],
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             'required': Bool(Eval('length')),
             },
         depends=['type', 'length'])
@@ -28,13 +28,13 @@ class Template(Model):
     height = fields.Float('Height',
         digits=(16, Eval('height_digits', 2)),
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             },
         depends=['type', 'height_digits'])
     height_uom = fields.Many2One('product.uom', 'Height Uom',
         domain=[('category', '=', Id('product', 'uom_cat_length'))],
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             'required': Bool(Eval('height')),
             },
         depends=['type', 'height'])
@@ -43,13 +43,13 @@ class Template(Model):
     width = fields.Float('Width',
         digits=(16, Eval('width_digits', 2)),
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             },
         depends=['type', 'width_digits'])
     width_uom = fields.Many2One('product.uom', 'Width Uom',
         domain=[('category', '=', Id('product', 'uom_cat_length'))],
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             'required': Bool(Eval('width')),
             },
         depends=['type', 'width'])
@@ -58,13 +58,13 @@ class Template(Model):
     weight = fields.Float('Weight',
         digits=(16, Eval('weight_digits', 2)),
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             },
         depends=['type', 'weight_digits'])
     weight_uom = fields.Many2One('product.uom', 'Weight Uom',
         domain=[('category', '=', Id('product', 'uom_cat_weight'))],
         states={
-            'invisible': ~Eval('type').in_(MEASURABLE),
+            'invisible': Eval('type').in_(NON_MEASURABLE),
             'required': Bool(Eval('weight')),
             },
         depends=['type', 'weight'])
diff --git a/product.xml b/product.xml
index 8552c4ab98..e083cee38e 100644
--- a/product.xml
+++ b/product.xml
@@ -14,7 +14,7 @@ this repository contains the full copyright notices and license terms. -->
                         expr="/form/notebook"
                         position="inside">
                         <page string="Measurements" col="3" id="measurements"
-                            states="{'invisible': ~Eval('type').in_(['stockable', 'consumable'])}">
+                            states="{'invisible': Eval('type').in_(['service'])}">
                             <label name="length"/>
                             <field name="length"/>
                             <field name="length_uom"/>