From 4dadaf2f2f0682c04e3bc25f9a6e4863570748bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 25 Mar 2012 15:41:01 +0200
Subject: [PATCH] Remove special uom search clause

review291004
---
 invoice.py | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/invoice.py b/invoice.py
index 92f9c8b6f2..6d85a017d5 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1375,13 +1375,11 @@ class InvoiceLine(ModelSQL, ModelView):
             'invisible': Eval('type') != 'line',
             },
         domain=[
-            ('category', '=',
-                (Eval('product'), 'product.default_uom.category')),
+            If(Bool(Eval('product_uom_category')),
+                ('category', '=', Eval('product_uom_category')),
+                ('category', '!=', -1)),
             ],
-        context={
-            'category': (Eval('product'), 'product.default_uom.category'),
-            },
-        depends=['product', 'type'])
+        depends=['product', 'type', 'product_uom_category'])
     unit_digits = fields.Function(fields.Integer('Unit Digits',
         on_change_with=['unit']), 'get_unit_digits')
     product = fields.Many2One('product.product', 'Product',
@@ -1393,6 +1391,10 @@ class InvoiceLine(ModelSQL, ModelView):
             '_parent_invoice.currency', '_parent_invoice.currency_date',
             'party', 'currency', 'invoice'],
         depends=['type'])
+    product_uom_category = fields.Function(
+        fields.Many2One('product.uom.category', 'Product Uom Category',
+            on_change_with=['product']),
+        'get_product_uom_category')
     account = fields.Many2One('account.account', 'Account',
         domain=[
             ('kind', '!=', 'view'),
@@ -1741,6 +1743,22 @@ class InvoiceLine(ModelSQL, ModelView):
         res['amount'] = self.on_change_with_amount(vals)
         return res
 
+    def on_change_with_product_uom_category(self, values):
+        pool = Pool()
+        product_obj = pool.get('product.product')
+        if values.get('product'):
+            product = product_obj.browse(values['product'])
+            return product.default_uom_category.id
+
+    def get_product_uom_category(self, ids, name):
+        categories = {}
+        for line in self.browse(ids):
+            if line.product:
+                categories[line.id] = line.product.default_uom_category.id
+            else:
+                categories[line.id] = None
+        return categories
+
     def on_change_account(self, values):
         account_obj = Pool().get('account.account')
         if values.get('product'):