From f155a414d78d47f4bdfbf210a4a80466d2da3ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 11 Mar 2010 16:54:57 +0100
Subject: [PATCH] New interface for Function/Property fields

---
 order_point.py      | 20 +++++++++-----------
 purchase_request.py | 24 +++++++++++-------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/order_point.py b/order_point.py
index 8709b2fca3..290550ce84 100644
--- a/order_point.py
+++ b/order_point.py
@@ -36,9 +36,8 @@ class OrderPoint(ModelSQL, ModelView):
             'invisible': Not(Equal(Eval('type'), 'internal')),
             'required': Equal(Eval('type'), 'internal'),
         })
-    location = fields.Function(
-        'get_location', type='many2one', relation='stock.location',
-        fnct_search='search_location', string='Location')
+    location = fields.Function(fields.Many2One('stock.location', 'Location'),
+            'get_location', searcher='search_location')
     provisioning_location = fields.Many2One(
         'stock.location', 'Provisioning Location',
         domain=[('type', '=', 'storage')],
@@ -59,10 +58,9 @@ class OrderPoint(ModelSQL, ModelView):
                 ('id', If(In('company', Eval('context', {})), '=', '!='),
                     Get(Eval('context', {}), 'company', 0)),
             ])
-    unit = fields.Function('get_unit', type='many2one', relation='product.uom',
-            string='Unit')
-    unit_digits = fields.Function('get_unit_digits', type='integer',
-            string='Unit Digits')
+    unit = fields.Function(fields.Many2One('product.uom', 'Unit'), 'get_unit')
+    unit_digits = fields.Function(fields.Integer('Unit Digits'),
+            'get_unit_digits')
 
     def __init__(self):
         super(OrderPoint, self).__init__()
@@ -99,13 +97,13 @@ class OrderPoint(ModelSQL, ModelView):
             res['unit_digits'] = product.default_uom.digits
         return res
 
-    def get_unit(self, cursor, user, ids, name, arg, context=None):
+    def get_unit(self, cursor, user, ids, name, context=None):
         res = {}
         for order in self.browse(cursor, user, ids, context=context):
             res[order.id] = order.product.default_uom.id
         return res
 
-    def get_unit_digits(self, cursor, user, ids, name, arg, context=None):
+    def get_unit_digits(self, cursor, user, ids, name, context=None):
         res = {}
         for order in self.browse(cursor, user, ids, context=context):
             res[order.id] = order.product.default_uom.digits
@@ -159,7 +157,7 @@ class OrderPoint(ModelSQL, ModelView):
         ids = self.search(cursor, user, query)
         return not bool(ids)
 
-    def get_rec_name(self, cursor, user, ids, name, arg, context=None):
+    def get_rec_name(self, cursor, user, ids, name, context=None):
         if not ids:
             return {}
         if isinstance(ids, (int, long)):
@@ -180,7 +178,7 @@ class OrderPoint(ModelSQL, ModelView):
             i += 1
         return args2
 
-    def get_location(self, cursor, user, ids, name, args, context=None):
+    def get_location(self, cursor, user, ids, name, context=None):
         location_obj = self.pool.get('stock.location')
         res = {}
         for op in self.browse(cursor, user, ids, context=context):
diff --git a/purchase_request.py b/purchase_request.py
index b1762f4138..1a6fd3d5aa 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -27,9 +27,8 @@ class PurchaseRequest(ModelSQL, ModelView):
         domain=[('type', '=', 'warehouse')], readonly=True)
     purchase_line = fields.Many2One(
         'purchase.line', 'Purchase Line',readonly=True)
-    purchase = fields.Function(
-        'get_purchase', type='many2one', relation='purchase.purchase',
-        string='Purchase')
+    purchase = fields.Function(fields.Many2One('purchase.purchase',
+        'Purchase'), 'get_purchase')
     company = fields.Many2One('company.company', 'Company', required=True,
             readonly=True, domain=[
                 ('id', If(In('company', Eval('context', {})), '=', '!='),
@@ -37,13 +36,12 @@ class PurchaseRequest(ModelSQL, ModelView):
             ])
     origin = fields.Reference('Origin', selection='origin_get', readonly=True,
             required=True)
-    state = fields.Function(
-        'get_state', type='selection',
-        selection=[("purchased", "Purchased"),
-                   ("done", "Done"),
-                   ("draft", "Draft"),
-                   ("cancel", "Cancel")],
-        string="State", readonly=True)
+    state = fields.Function(fields.Selection([
+        ('purchased', 'Purchased'),
+        ('done', 'Done'),
+        ('draft', 'Draft'),
+        ('cancel', 'Cancel'),
+        ], 'State'), 'get_state')
 
     def __init__(self):
         super(PurchaseRequest, self).__init__()
@@ -52,7 +50,7 @@ class PurchaseRequest(ModelSQL, ModelView):
             'create_request': 'Purchase requests are only created by the system.',
             })
 
-    def get_rec_name(self, cursor, user, ids, name, arg, context=None):
+    def get_rec_name(self, cursor, user, ids, name, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
         res = {}
@@ -78,7 +76,7 @@ class PurchaseRequest(ModelSQL, ModelView):
             return context['company']
         return False
 
-    def get_purchase(self, cursor, user, ids, name, args, context=None):
+    def get_purchase(self, cursor, user, ids, name, context=None):
         res = {}
 
         requests = self.browse(cursor, user, ids, context=context)
@@ -89,7 +87,7 @@ class PurchaseRequest(ModelSQL, ModelView):
                 res[request.id] = False
         return res
 
-    def get_state(self, cursor, user, ids, name, args, context=None):
+    def get_state(self, cursor, user, ids, name, context=None):
         res = {}.fromkeys(ids, 'draft')
         for request in self.browse(cursor, user, ids, context=context):
             if request.purchase_line: