From 49e83f054b4d60d4fffbc691fbeab6a23bdf5b4f Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Thu, 31 Mar 2011 16:11:18 +0530
Subject: [PATCH 01/56] [FIX] survey: Fixed buildbot warning.

bzr revid: uco@tinyerp.com-20110331104118-wpkebdiysq7u1gc6
---
 addons/survey/wizard/survey_browse_answer.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index b1bef814a86..2d740aa2655 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -21,7 +21,6 @@
 
 from osv import osv
 from osv import fields
-from tools.translate import _
 
 class survey_browse_answer(osv.osv_memory):
     _name = 'survey.browse.answer'

From 241d8ffbf2139a8779faf40a6ed56511e3746051 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Thu, 31 Mar 2011 16:15:02 +0530
Subject: [PATCH 02/56] [REF] survey: Refactored.

bzr revid: uco@tinyerp.com-20110331104502-c2hdl8ldzgnpx38w
---
 addons/survey/wizard/survey_browse_answer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 2d740aa2655..1798a7c418c 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -63,7 +63,7 @@ class survey_browse_answer(osv.osv_memory):
         record = self.read(cr, uid, ids, [])
         record = record and record[0] or {} 
         if record['response_id']:
-            res_id = [(record['response_id'][0])]
+            res_id = [(record.get('response_id') and record['response_id'][0])]
         else:
             sur_response_obj = self.pool.get('survey.response')
             res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])

From dae3189fda270bfb39ab66b1f55cb5a09c85d90f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <>
Date: Tue, 17 May 2011 15:01:01 +0530
Subject: [PATCH 03/56] [FIX] account: Add company column in taxes list

lp bug: https://launchpad.net/bugs/782293 fixed

bzr revid: ara@tinyerp.com-20110517093101-sp07bvmf6xno9rjf
---
 addons/account/account_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e0a355c35bf..a9904dcf25b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -897,6 +897,7 @@
                     <field name="name"/>
                     <field name="price_include" groups="base.group_extended"/>
                     <field name="description"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>

From d3d1065fc83d29e7f11e50d343f61dcfcefc7678 Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Thu, 19 May 2011 10:46:07 +0530
Subject: [PATCH 04/56] [FIX] account: Add company column in taxes list

bzr revid: ara@tinyerp.com-20110519051607-e5eyjbuhdsrkslvb
---
 addons/account/account_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a9904dcf25b..d3d54a51918 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -910,6 +910,7 @@
                     <group col="10" colspan="4">
                         <field name="name"/>
                         <field name="description"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>

From 25fc84728e1f4e1034ae9b79d6876a06cf327ac7 Mon Sep 17 00:00:00 2001
From: "Ujjvala Collins (OpenERP)" <uco@tinyerp.com>
Date: Wed, 8 Jun 2011 12:58:32 +0530
Subject: [PATCH 05/56] [FIX] account: Fixed issue of 'balance' type tax using
 chart of accounts.

lp bug: https://launchpad.net/bugs/789658 fixed

bzr revid: uco@tinyerp.com-20110608072832-dg68dfnsvnzz58vm
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index f6dd36c01fc..07ff993694a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2473,7 +2473,7 @@ class account_tax_template(osv.osv):
         'name': fields.char('Tax Name', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."),
         'amount': fields.float('Amount', required=True, digits=(14,4), help="For Tax Type percent enter % ratio between 0-1."),
-        'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code')], 'Tax Type', required=True),
+        'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True),
         'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
         'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
         'account_collected_id':fields.many2one('account.account.template', 'Invoice Tax Account'),

From f2c41053ea4d5216897d115df81662aad1d7d9b4 Mon Sep 17 00:00:00 2001
From: "Bhumika (OpenERP)" <sbh@tinyerp.com>
Date: Thu, 16 Jun 2011 18:04:36 +0530
Subject: [PATCH 06/56] [Fix]: mail_gateway : Fix  fetch attachement even if
 the check box add attachement is not checked

bzr revid: sbh@tinyerp.com-20110616123436-tclirmg6vju75i1j
---
 addons/mail_gateway/mail_gateway.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index c67a2668192..e891c081279 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -519,7 +519,7 @@ class mailgate_tool(osv.osv_memory):
                             body = content
                             has_plain_text = True
                 elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
+                    if filename and attach:
                         attachments[filename] = part.get_payload(decode=True)
                     else:
                         res = part.get_payload(decode=True)

From 05120d4d1037b0b1a06817471126a12eebe53a24 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 16 Jun 2011 19:05:49 +0530
Subject: [PATCH 07/56] [FIX] sale:-renamed the label 'Shipped Qty'=> 'Shipped'
 on Sales Analysis

lp bug: https://launchpad.net/bugs/797715 fixed

bzr revid: mtr@mtr-20110616133549-pndpm5m4w1j98axc
---
 addons/sale/report/sale_report.py       | 2 +-
 addons/sale/report/sale_report_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index aaaec228d7b..e4f917ba063 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -31,7 +31,7 @@ class sale_report(osv.osv):
         'date': fields.date('Date Order', readonly=True),
         'date_confirm': fields.date('Date Confirm', readonly=True),
         'shipped': fields.boolean('Shipped', readonly=True),
-        'shipped_qty_1': fields.integer('Shipped Qty', readonly=True),
+        'shipped_qty_1': fields.integer('Shipped', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
             ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 41cdecee0ea..c62510e9ab6 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -21,7 +21,7 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_uom_qty" sum="# of Qty"/>
-                <field name="shipped_qty_1" sum="Shipped Qty"/>
+                <field name="shipped_qty_1" sum="Shipped"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>

From ca2598f997dbea98d9d9bad5f890cf3e872e129e Mon Sep 17 00:00:00 2001
From: "Bhumika (OpenERP)" <sbh@tinyerp.com>
Date: Fri, 17 Jun 2011 12:09:14 +0530
Subject: [PATCH 08/56] [IMP]: fetchmail: improve the log message

bzr revid: sbh@tinyerp.com-20110617063914-lue87brktmevt9a8
---
 addons/fetchmail/fetchmail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 41f84cfdedd..58a580d79c3 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -199,7 +199,7 @@ class email_server(osv.osv):
 
                     pop_server.quit()
 
-                    logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
+                    logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
 
             except Exception, e:
                 logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))

From 6df880e9a4a092b1614154a68ef5f5eb31e1bf67 Mon Sep 17 00:00:00 2001
From: "Bhumika (OpenERP)" <sbh@tinyerp.com>
Date: Fri, 17 Jun 2011 13:57:38 +0530
Subject: [PATCH 09/56] [IMP]: fetchmail: improve the log message

bzr revid: sbh@tinyerp.com-20110617082738-i0umdo9cptek6l4j
---
 addons/fetchmail/fetchmail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 58a580d79c3..386b48f1546 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -116,7 +116,7 @@ class email_server(osv.osv):
         if context is None:
             context = {}
         for server in self.browse(cr, uid, ids, context=context):
-            logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
+            logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             context.update({'server_id': server.id, 'server_type': server.type})
             try:
                 if server.type == 'imap':

From c89947c8fb60a3b2ae247a2a4d22f34c95a0de5c Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 20 Jun 2011 10:42:42 +0530
Subject: [PATCH 10/56] [FIX] Fix the new step in the configuration for host
 name

lp bug: https://launchpad.net/bugs/785673 fixed

bzr revid: dbr@tinyerp.com-20110620051242-irs0jljjfpbkdbaq
---
 addons/caldav/wizard/caldav_browse.py       | 24 ++++++++++++++++++---
 addons/caldav/wizard/caldav_browse_view.xml | 22 +++++++++++++++++++
 addons/crm_caldav/crm_caldav_view.xml       |  2 +-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 9e67f972216..134454627c1 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -197,8 +197,9 @@ configuration
             host = config.get('xmlrpc_interface', None)
             port = config.get('xmlrpc_port',8069)
         if host ==  '' or None:
-                host = 'localhost'
-                port = 8069
+            obj = self.pool.get('user.preference').browse(cr,uid,uid,context)
+            host = obj.host_name
+            port = 8069
         if not config.get_misc('webdav','enable',True):
             raise Exception("WebDAV is disabled, cannot continue")
         user_pool = self.pool.get('res.users')
@@ -238,6 +239,7 @@ class user_preference(osv.osv_memory):
                'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
                'service': fields.selection([('webdav','CalDAV')], "Services"),
                'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"),
+               'host_name': fields.char('Host Name', size=64, required=True),  
     }
     
     def _get_default_calendar(self, cr, uid, context):
@@ -278,6 +280,22 @@ class user_preference(osv.osv_memory):
             'target': 'new',
             'context': context,
         }
-    
+        
+    def next_window(self, cr, uid, ids, context=None):
+        obj_model = self.pool.get('ir.model.data')
+        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','user_prefernce_form')])
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
+        context.update({'res_id': ids})
+        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'user.preference',
+            'views': [(resource_id,'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': context,
+        }
     
 user_preference()
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 53af6029883..18429232de0 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -24,6 +24,28 @@
             </field>
         </record>
 
+ 		<record id="host_prefernce_form" model="ir.ui.view">
+            <field name="name">host_preference</field>
+           <field name="model">user.preference</field>
+           <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Host name configuration for caldev synchronization">
+                   <separator string="Hostname example : " colspan="4"/>
+                    <newline/>
+                    <label string="database.my.openerp.com" colspan="4"/>
+                    <newline/>
+                    <label string=" or companyserver.com" colspan="4"/>
+                    <newline/>
+                    <field name="host_name"  colspan="4" width="250" />
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                       <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                       <button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
+                    </group>
+               </form>
+            </field>
+        </record>
+
      <record id="user_prefernce_form" model="ir.ui.view">
             <field name="name">user_preference</field>
             <field name="model">user.preference</field>
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
index b8b0ffdea03..a610095d6a6 100644
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ b/addons/crm_caldav/crm_caldav_view.xml
@@ -5,7 +5,7 @@
             <field name="name">Caldav Browse</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">user.preference</field>
-            <field name="view_id" ref="caldav.user_prefernce_form"/>
+            <field name="view_id" ref="caldav.host_prefernce_form"/>
             <field name="context">{'cal_name' : 'Meetings'}</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>

From b0c833492adb5cca3031c8b33aa7d0b519c2d48b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 20 Jun 2011 15:04:41 +0530
Subject: [PATCH 11/56] [IMP]Resubmit the changes

bzr revid: dbr@tinyerp.com-20110620093441-l68jgqg6d4temrvl
---
 addons/caldav/wizard/caldav_browse.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 134454627c1..9f6ed7858cd 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -181,30 +181,24 @@ configuration
     }
 
     def default_get(self, cr, uid, fields, context=None):
+        pref_obj = self.pool.get('user.preference')
+        obj_ids = pref_obj.browse(cr, uid ,context.get('res_id'), context=context)
         res = {}
-        host = ''
+        host = obj_ids[0].host_name
         port = ''
         prefix = 'http://'  
         if not config.get('xmlrpc'):
             if not config.get('netrpc'):
                 prefix = 'https://' 
-                host = config.get('xmlrpcs_interface', None)
                 port = config.get('xmlrpcs_port', 8071)
             else:
-                host = config.get('netrpc_interface', None)
                 port = config.get('netrpc_port',8070) 
         else: 
-            host = config.get('xmlrpc_interface', None)
             port = config.get('xmlrpc_port',8069)
-        if host ==  '' or None:
-            obj = self.pool.get('user.preference').browse(cr,uid,uid,context)
-            host = obj.host_name
-            port = 8069
         if not config.get_misc('webdav','enable',True):
             raise Exception("WebDAV is disabled, cannot continue")
         user_pool = self.pool.get('res.users')
         current_user = user_pool.browse(cr, uid, uid, context=context)
-        pref_obj = self.pool.get('user.preference')
         pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
         #TODO write documentation
         res['description'] = self.__doc['other']

From 7883f13e68ce498ba1978885ff4f47f321c2c278 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 21 Jun 2011 11:22:41 +0530
Subject: [PATCH 12/56] [IMP]Remove the extra space,browse() and use context

bzr revid: dbr@tinyerp.com-20110621055241-5pblbhewnz8pl0bq
---
 addons/caldav/wizard/caldav_browse.py | 90 +++++++++++++--------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index 9f6ed7858cd..f6f64900c1f 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -26,9 +26,9 @@ import addons
 from tools.translate import _
 
 class caldav_browse(osv.osv_memory):
-    
+
     __doc = {
-    
+
     'other' : _("""
   * Webdav server that provides remote access to calendar
   * Synchronisation of calendar using WebDAV
@@ -47,9 +47,9 @@ class caldav_browse(osv.osv_memory):
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
      """),
-     
-     
-     
+
+
+
      'iphone' : _("""
     For SSL specific configuration see the documentation below
 
@@ -60,7 +60,7 @@ Now, to setup the calendars, you need to:
 3. Click on "Other"
 4. From the "Calendars" group, select "Add CalDAV Account"
 
-5. Enter the host's name 
+5. Enter the host's name
    (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com is the host)
 
 6. Fill Username and password with your openerp login and password
@@ -71,8 +71,8 @@ Now, to setup the calendars, you need to:
 9. If you are not using a SSL server, you'll get an error, do not worry and push "Continue"
 
 10. Then click to "Advanced Settings" to specify the right
-    ports and paths. 
-    
+    ports and paths.
+
 11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
 
 12. Set the "Account URL" to the right path of the OpenERP webdav:
@@ -99,13 +99,13 @@ steps:
       is the default 8071)
     s2. Safari will try to connect and issue a warning about the certificate
       used. Inspect the certificate and click "Accept" so that iPhone
-      now trusts it.   
+      now trusts it.
     """),
     'android' : _("""
 Prerequire
 ----------
 There is no buit-in way to synchronize calendar with caldav.
-So you need to install a third part software : Calendar (CalDav) 
+So you need to install a third part software : Calendar (CalDav)
 for now it's the only one
 
 configuration
@@ -114,7 +114,7 @@ configuration
 1. Open Calendar Sync
    I'll get an interface with 2 tabs
    Stay on the first one
-   
+
 2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
 
 3. Put your openerp username and password
@@ -122,15 +122,15 @@ configuration
 4. If your server don't use SSL, you'll get a warnign, say "Yes"
 
 5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
-    
+
     """),
-    
+
      'evolution' : _("""
     1. Go to Calendar View
 
     2. File -> New -> Calendar
 
-    3. Fill the form 
+    3. Fill the form
         - type : CalDav
         - name : Whaterver you want (ie : Meeting)
         - url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one given on the top of this window
@@ -140,10 +140,10 @@ configuration
 
     4. Click ok and give your openerp password
 
-    5. A new calendar named with the name you gave should appear on the left side.     
+    5. A new calendar named with the name you gave should appear on the left side.
      """),
-     
-     
+
+
      'thunderbird' : _("""
 Prerequire
 ----------
@@ -161,7 +161,7 @@ configuration
 
 4. for format choose CalDav
    and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
-   
+
 5. Choose a name and a color for the Calendar, and we advice you to uncheck "alarm"
 
 6. Then put your openerp login and password (to give the password only check the box "Use password Manager to remember this password"
@@ -169,8 +169,8 @@ configuration
 7. Then Finish, your meetings should appear now in your calendar view
 """),
     }
-    
-    
+
+
     _name = 'caldav.browse'
     _description = 'Caldav Browse'
 
@@ -182,37 +182,36 @@ configuration
 
     def default_get(self, cr, uid, fields, context=None):
         pref_obj = self.pool.get('user.preference')
-        obj_ids = pref_obj.browse(cr, uid ,context.get('res_id'), context=context)
+        pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
         res = {}
-        host = obj_ids[0].host_name
+        host = context.get('host')
         port = ''
-        prefix = 'http://'  
+        prefix = 'http://'
         if not config.get('xmlrpc'):
             if not config.get('netrpc'):
-                prefix = 'https://' 
+                prefix = 'https://'
                 port = config.get('xmlrpcs_port', 8071)
             else:
-                port = config.get('netrpc_port',8070) 
-        else: 
+                port = config.get('netrpc_port',8070)
+        else:
             port = config.get('xmlrpc_port',8069)
         if not config.get_misc('webdav','enable',True):
             raise Exception("WebDAV is disabled, cannot continue")
         user_pool = self.pool.get('res.users')
         current_user = user_pool.browse(cr, uid, uid, context=context)
-        pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
         #TODO write documentation
         res['description'] = self.__doc['other']
         if pref_ids:
-            pref_ids = pref_ids[0] 
+            pref_ids = pref_ids[0]
             if pref_ids.device == 'iphone':
                 url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'
             else :
                 url = host + ':' + str(port) + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'+ 'users/'+ current_user.login + '/'+ pref_ids.collection.name+ '/'+ pref_ids.calendar.name
-            
+
             res['description'] = self.__doc.get(pref_ids.device , self.__doc['other'])
         file = open(addons.get_module_resource('caldav','doc', 'caldav_doc.pdf'),'rb')
         res['caldav_doc_file'] = base64.encodestring(file.read())
-        
+
         #res['doc_link'] = 'http://doc.openerp.com/'
         res['url'] = prefix+url
         return res
@@ -224,7 +223,7 @@ configuration
 caldav_browse()
 
 class user_preference(osv.osv_memory):
-    
+
     _name = 'user.preference'
     _description = 'User preference Form'
 
@@ -233,33 +232,33 @@ class user_preference(osv.osv_memory):
                'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
                'service': fields.selection([('webdav','CalDAV')], "Services"),
                'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"),
-               'host_name': fields.char('Host Name', size=64, required=True),  
+               'host_name': fields.char('Host Name', size=64, required=True),
     }
-    
+
     def _get_default_calendar(self, cr, uid, context):
         if context == None:
             context = {}
         name = context.get('cal_name')
-        
+
         collection_obj = self.pool.get('basic.calendar')
         ids = collection_obj.search(cr, uid, [('name', '=', name)])
         return ids[0]
-       
-        
+
+
     def _get_default_collection(self, cr, uid, context):
         collection_obj = self.pool.get('document.directory')
         ids = collection_obj.search(cr, uid, [('name', '=', 'c')])
         return ids[0]
-    
-        
+
+
     _defaults={
               'service': 'webdav',
               'collection' : _get_default_collection,
               'calendar' : _get_default_calendar,
               'device' : 'other',
-              
-    }    
-   
+
+    }
+
     def open_window(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
         model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','caldav_Browse')])
@@ -274,14 +273,15 @@ class user_preference(osv.osv_memory):
             'target': 'new',
             'context': context,
         }
-        
+
     def next_window(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
+        host_name  = self.browse (cr,uid,ids)[0].host_name
         model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','user_prefernce_form')])
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
-        context.update({'res_id': ids})
+        context.update({'res_id': ids,'host':host_name})
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        
+
         return {
             'view_type': 'form',
             'view_mode': 'form',
@@ -291,5 +291,5 @@ class user_preference(osv.osv_memory):
             'target': 'new',
             'context': context,
         }
-    
+
 user_preference()

From 12bdf16ed26bcaac1b0fe591485ec8abf4201efa Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 21 Jun 2011 15:50:42 +0530
Subject: [PATCH 13/56] [IMP]caldev : change in label

bzr revid: dbr@tinyerp.com-20110621102042-e34d8zug4m07siee
---
 addons/caldav/wizard/caldav_browse_view.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 18429232de0..18a0a61baec 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -11,30 +11,27 @@
                     <group colspan="4" width="700" height="500">
                         <separator string="Browse caldav" colspan="4"/>
                         <field name="url" colspan="4" />
-                        
                         <separator string="Description" colspan="4"/>
                         <field name="description"  colspan="4"  nolabel="1"/>
                         <separator colspan="4"/>
-                      <group col="4" colspan="4">
-                        <label string="" colspan="2"/>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                      </group>
+                        <group col="4" colspan="4">
+                            <label string="" colspan="2"/>
+                            <button special="cancel" string="_Close" icon="gtk-close"/>
+                        </group>
                     </group>
                 </form>
             </field>
         </record>
 
- 		<record id="host_prefernce_form" model="ir.ui.view">
+        <record id="host_prefernce_form" model="ir.ui.view">
             <field name="name">host_preference</field>
            <field name="model">user.preference</field>
            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Host name configuration for caldev synchronization">
-                   <separator string="Hostname example : " colspan="4"/>
+                    <separator string="Hostname example : " colspan="4"/>
                     <newline/>
-                    <label string="database.my.openerp.com" colspan="4"/>
-                    <newline/>
-                    <label string=" or companyserver.com" colspan="4"/>
+                    <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
                     <newline/>
                     <field name="host_name"  colspan="4" width="250" />
                     <separator colspan="4"/>

From f9c9c79bbfdd3b65b0edd3416c1c12c0fcb994bb Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 21 Jun 2011 17:28:09 +0530
Subject: [PATCH 14/56] [IMP]caldev : Remove extra lines

bzr revid: dbr@tinyerp.com-20110621115809-p3e0ut8r4a6gvzyk
---
 addons/caldav/wizard/caldav_browse.py | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index f6f64900c1f..d1f58592de7 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -28,7 +28,6 @@ from tools.translate import _
 class caldav_browse(osv.osv_memory):
 
     __doc = {
-
     'other' : _("""
   * Webdav server that provides remote access to calendar
   * Synchronisation of calendar using WebDAV
@@ -45,11 +44,8 @@ class caldav_browse(osv.osv_memory):
         HOSTNAME: Host on which OpenERP server(With webdav) is running
         PORT : Port on which OpenERP server is running (By Default : 8069)
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
-        CALENDAR_NAME: Name of calendar to access
      """),
 
-
-
      'iphone' : _("""
     For SSL specific configuration see the documentation below
 
@@ -87,8 +83,6 @@ Now, to setup the calendars, you need to:
     Note that when creating a new calendar entry, you will have to specify
     which calendar it should be saved at.
 
-
-
 IF you need SSL (and your certificate is not a verified one, as usual),
 then you first will need to let the iPhone trust that. Follow these
 steps:
@@ -124,7 +118,7 @@ configuration
 5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
 
     """),
-
+    
      'evolution' : _("""
     1. Go to Calendar View
 
@@ -143,7 +137,6 @@ configuration
     5. A new calendar named with the name you gave should appear on the left side.
      """),
 
-
      'thunderbird' : _("""
 Prerequire
 ----------
@@ -169,8 +162,6 @@ configuration
 7. Then Finish, your meetings should appear now in your calendar view
 """),
     }
-
-
     _name = 'caldav.browse'
     _description = 'Caldav Browse'
 
@@ -217,7 +208,6 @@ configuration
         return res
 
     def browse_caldav(self, cr, uid, ids, context):
-
         return {}
 
 caldav_browse()
@@ -239,18 +229,15 @@ class user_preference(osv.osv_memory):
         if context == None:
             context = {}
         name = context.get('cal_name')
-
         collection_obj = self.pool.get('basic.calendar')
         ids = collection_obj.search(cr, uid, [('name', '=', name)])
         return ids[0]
 
-
     def _get_default_collection(self, cr, uid, context):
         collection_obj = self.pool.get('document.directory')
         ids = collection_obj.search(cr, uid, [('name', '=', 'c')])
         return ids[0]
 
-
     _defaults={
               'service': 'webdav',
               'collection' : _get_default_collection,
@@ -281,7 +268,6 @@ class user_preference(osv.osv_memory):
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
         context.update({'res_id': ids,'host':host_name})
         resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-
         return {
             'view_type': 'form',
             'view_mode': 'form',

From 53dfea69f8539335a04eff5149422e4f164debbe Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 22 Jun 2011 11:49:23 +0530
Subject: [PATCH 15/56] [BUG/FIX] project : chid task has to be done before
 parent for scheduling the tasks

bzr revid: jam@tinyerp.com-20110622061923-3lhjlc649ov2llqd
---
 addons/project/project.py | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 072f7cc31c3..b1a8fddee3c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -529,8 +529,6 @@ class task(osv.osv):
     #
     # Override view according to the company definition
     #
-
-
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
 
@@ -562,13 +560,27 @@ class task(osv.osv):
                 res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
         return res
 
+    def _check_child_task(self, cr, uid, ids, context=None):
+        if context == None:
+            context = {}
+        tasks = self.browse(cr, uid, ids, context=context)
+        for task in tasks:
+            if task.child_ids:
+                for child in task.child_ids:
+                    if child.state in ['draft', 'open', 'pending']:
+                        raise osv.except_osv(_("Warning !"), _("Child task still open.\nPlease cancel or complete child task first."))
+        return True
+
     def action_close(self, cr, uid, ids, context=None):
         # This action open wizard to send email to partner or project manager after close task.
-        project_id = len(ids) and ids[0] or False
-        if not project_id: return False
-        task = self.browse(cr, uid, project_id, context=context)
+        if context == None:
+            context = {}
+        task_id = len(ids) and ids[0] or False
+        self._check_child_task(cr, uid, ids, context=context)
+        if not task_id: return False
+        task = self.browse(cr, uid, task_id, context=context)
         project = task.project_id
-        res = self.do_close(cr, uid, [project_id], context=context)
+        res = self.do_close(cr, uid, [task_id], context=context)
         if project.warn_manager or project.warn_customer:
             return {
                 'name': _('Send Email after close task'),
@@ -643,6 +655,7 @@ class task(osv.osv):
     def do_cancel(self, cr, uid, ids, *args):
         request = self.pool.get('res.request')
         tasks = self.browse(cr, uid, ids)
+        self._check_child_task(cr, uid, ids, context=context)
         for task in tasks:
             project = task.project_id
             if project.warn_manager and project.user_id and (project.user_id.id != uid):
@@ -736,13 +749,19 @@ class task(osv.osv):
                     index = sorted_types.index(typeid)
                     self.write(cr, uid, task.id, {'type_id': sorted_types[index+1]})
         return True
-        
+
     def next_type(self, cr, uid, ids, *args):
         return self._change_type(cr, uid, ids, True, *args)
 
     def prev_type(self, cr, uid, ids, *args):
         return self._change_type(cr, uid, ids, False, *args)
-       
+
+    def unlink(self, cr, uid, ids, context=None):
+        if context == None:
+            context = {}
+        self._check_child_task(cr, uid, ids, context=context)
+        res = super(task, self).unlink(cr, uid, ids, context)
+        return res
 
 task()
 

From f84f7f5729272d5d429207cd236d233a643bc81c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Jun 2011 14:10:08 +0200
Subject: [PATCH 16/56] [IMP] Improved dates widgets

bzr revid: fme@openerp.com-20110630121008-qt4yr12z6sk70yua
---
 addons/base/static/src/css/base.css | 13 +++++++------
 addons/base/static/src/js/form.js   | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 84b51b2cd54..32a335d7eb8 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -773,13 +773,14 @@ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,
     position: relative;
     vertical-align: top;
 }
-.openerp input.field_date, .openerp input.field_datetime {
-    background: #fff url('../img/ui/field_calendar.png') no-repeat right center;
-    background-origin: content-box;
-    -moz-background-origin: content;
-    -moz-background-origin: content-box;
-    -webkit-background-origin: content-box;
+.openerp img.ui-datepicker-trigger, .openerp img.ui-datepicker-trigger {
+    margin-left: -20px;
+    vertical-align: middle;
+    cursor: pointer;
+    position: relative;
+    top: -1px;
 }
+
 /* http://www.quirksmode.org/dom/inputfile.html
  * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
  */
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 9b6367e52ca..79f2a610e44 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -879,12 +879,17 @@ openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
         this._super(view, node);
         this.template = "FieldDate";
         this.jqueryui_object = 'datetimepicker';
+        this.validation_regex = /^\d+-\d+-\d+( \d+:\d+(:\d+)?)?$/;
     },
     start: function() {
         this._super.apply(this, arguments);
         this.$element.find('input').change(this.on_ui_change)[this.jqueryui_object]({
             dateFormat: 'yy-mm-dd',
-            timeFormat: 'hh:mm:ss'
+            timeFormat: 'hh:mm:ss',
+            showOn: 'button',
+            buttonImage: '/base/static/src/img/ui/field_calendar.png',
+            buttonImageOnly: true,
+            constrainInput: false
         });
     },
     set_value: function(value) {
@@ -909,7 +914,15 @@ openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
         this.$element.find('input').attr('disabled', this.readonly);
     },
     validate: function() {
-        this.invalid = this.required && !this.$element.find('input')[this.jqueryui_object]('getDate');
+        this.invalid = false;
+        var value = this.$element.find('input').val();
+        if (value === "") {
+            this.invalid = this.required;
+        } else if (this.validation_regex) {
+            this.invalid = !this.validation_regex.test(value);
+        } else {
+            this.invalid = !this.$element.find('input')[this.jqueryui_object]('getDate');
+        }
     },
     focus: function() {
         this.$element.find('input').focus();
@@ -922,6 +935,7 @@ openerp.base.form.FieldDate = openerp.base.form.FieldDatetime.extend({
     init: function(view, node) {
         this._super(view, node);
         this.jqueryui_object = 'datepicker';
+        this.validation_regex = /^\d+-\d+-\d+$/;
     },
     parse: openerp.base.parse_date,
     format: openerp.base.format_date

From a394f6b1419747a1eff264466f6d507286ceef00 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Jun 2011 14:15:34 +0200
Subject: [PATCH 17/56] [FIX] dashboard should go through full action
 resolution via the ActionManager, as it may get non-window actions

bzr revid: xmo@openerp.com-20110630121534-ay6g9f207snfelca
---
 addons/base_dashboard/static/src/js/dashboard.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index feb4e92d8a9..fe52f1affd9 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -225,10 +225,10 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({
             views_switcher : false,
             action_buttons : false,
             pager: false
-        }
-        var element_id = this.view.element_id + '_action_' + action.id;
-        var view = new openerp.base.ViewManagerAction(this.session, element_id, action);
-        view.start();
+        };
+        new openerp.base.ActionManager(
+                this.session, this.view.element_id + '_action_' + action.id)
+            .do_action(action);
     },
     render: function() {
         // We should start with three columns available

From d80b26989191d49559afdaae4ab0ebb886964689 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 30 Jun 2011 14:31:13 +0200
Subject: [PATCH 18/56] [imp] corrected some problems with context and domains
 in relation + evalution of non literal context/domains

bzr revid: nicolas.vanhoren@openerp.com-20110630123113-tnzb6owv8kxtl3sw
---
 addons/base/controllers/main.py   | 19 ++++++++++---------
 addons/base/static/src/js/form.js | 11 +++++++----
 openerpweb/nonliterals.py         |  4 ++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 7b9d34b7623..6116cfd7e6f 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -649,15 +649,16 @@ class View(openerpweb.Controller):
         """
         self.parse_domain(elem, 'domain', session)
         self.parse_domain(elem, 'filter_domain', session)
-        context_string = elem.get('context', '').strip()
-        if context_string:
-            try:
-                elem.set('context',
-                         openerpweb.ast.literal_eval(context_string))
-            except ValueError:
-                elem.set('context',
-                         openerpweb.nonliterals.Context(
-                             session, context_string))
+        for el in ['context', 'default_get']:
+            context_string = elem.get(el, '').strip()
+            if context_string:
+                try:
+                    elem.set(el,
+                             openerpweb.ast.literal_eval(context_string))
+                except ValueError:
+                    elem.set(el,
+                             openerpweb.nonliterals.Context(
+                                 session, context_string))
 
 class FormView(View):
     _cp_path = "/base/formview"
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 3fd50f86c7c..325488a8671 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1116,14 +1116,17 @@ var build_view_fields_values = function(view) {
 var build_relation_context = function(relation_field) {
     var a_context = relation_field.view.dataset.get_context() || {};
     var fields_values = build_view_fields_values(relation_field.view);
-    var f_context = new openerp.base.CompoundContext(relation_field.field.context || {}).set_eval_context(fields_values);
-    var ctx = new openerp.base.CompoundContext(a_context, f_context);
+    var f_context = relation_field.field.context || {};
+    var v_context = new openerp.base.CompoundContext(relation_field.node.attrs.default_get || {},
+        relation_field.node.attrs.context || {}).set_eval_context(fields_values);
+    var ctx = new openerp.base.CompoundContext(a_context, f_context, v_context);
     return ctx;
 }
 var build_relation_domain = function(relation_field) {
     var fields_values = build_view_fields_values(relation_field.view);
-    var f_domain = new openerp.base.CompoundDomain(relation_field.field.domain || []).set_eval_context(fields_values);
-    return f_domain;
+    var f_domain = relation_field.field.domain || [];
+    var v_domain = new openerp.base.CompoundDomain(relation_field.node.attrs.domain || []).set_eval_context(fields_values);
+    return new openerp.base.CompoundDomain(f_domain, v_domain);
 }
 
 openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
diff --git a/openerpweb/nonliterals.py b/openerpweb/nonliterals.py
index a99e2215a00..2e4d91f1bc9 100644
--- a/openerpweb/nonliterals.py
+++ b/openerpweb/nonliterals.py
@@ -173,14 +173,14 @@ class Context(BaseContext):
         return eval(self.get_context_string(),
                     SuperDict(ctx))
         
-def SuperDict(dict):
+class SuperDict(dict):
     def __getattr__(self, name):
         try:
             return self[name]
         except KeyError:
             raise AttributeError(name)
     def __getitem__(self, key):
-        tmp = super(dict, self)[key]
+        tmp = super(type(self), self).__getitem__(key)
         if isinstance(tmp, dict):
             return SuperDict(tmp)
         return tmp

From 1712ad5dea21c1c318bfdc1504d4dfa12dedb8dd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 30 Jun 2011 15:07:13 +0200
Subject: [PATCH 19/56] [imp] refactoring of context/domain + optimisations +
 added context in on_change

bzr revid: nicolas.vanhoren@openerp.com-20110630130713-a3relc19bpehg94s
---
 addons/base/static/src/js/form.js | 85 +++++++++++++++++--------------
 1 file changed, 46 insertions(+), 39 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index be40d2b7f9a..abc2f6e2f72 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -172,7 +172,8 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
                 var argument_replacement = {
                     'False' : false,
                     'True' : true,
-                    'None' : null
+                    'None' : null,
+                    'context': widget.build_context ? widget.build_context() : {}
                 }
                 var parent_fields = null;
                 _.each(call[2].split(','), function(a) {
@@ -775,6 +776,39 @@ openerp.base.form.Field = openerp.base.form.Widget.extend({
         this.invalid = false;
     },
     focus: function() {
+    },
+    _build_view_fields_values: function() {
+        var a_dataset = this.view.dataset || {};
+        var fields_values = this.view.get_fields_values();
+        var parent_values = a_dataset.parent_view ? a_dataset.parent_view.get_fields_values() : {};
+        fields_values.parent = parent_values;
+        return fields_values;
+    },
+    /**
+     * Builds a new context usable for operations related to fields by merging
+     * the fields'context with the action's context.
+     */
+    build_context: function() {
+        var a_context = this.view.dataset.get_context() || {};
+        var f_context = this.field.context || {};
+        var v_context1 = this.node.attrs.default_get || {};
+        var v_context2 = this.node.attrs.context || {};
+        var v_context = new openerp.base.CompoundContext(v_context1, v_context2);
+        if (v_context1.__ref || v_context2.__ref) {
+            var fields_values = this._build_view_fields_values();
+            v_context.set_eval_context(fields_values);
+        }
+        var ctx = new openerp.base.CompoundContext(a_context, f_context, v_context);
+        return ctx;
+    },
+    build_domain: function() {
+        var f_domain = this.field.domain || [];
+        var v_domain = this.node.attrs.domain || [];
+        if (!(v_domain instanceof Array)) {
+            var fields_values = this._build_view_fields_values();
+            v_domain = new openerp.base.CompoundDomain(v_domain).set_eval_context(fields_values);
+        }
+        return new openerp.base.CompoundDomain(f_domain, v_domain);
     }
 });
 
@@ -1120,33 +1154,6 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
     });
 })();
 
-var build_view_fields_values = function(view) {
-    var a_dataset = view.dataset || {};
-    var fields_values = view.get_fields_values();
-    var parent_values = a_dataset.parent_view ? a_dataset.parent_view.get_fields_values() : {};
-    fields_values.parent = parent_values;
-    return fields_values;
-}
-/**
- * Builds a new context usable for operations related to fields by merging
- * the fields'context with the action's context.
- */
-var build_relation_context = function(relation_field) {
-    var a_context = relation_field.view.dataset.get_context() || {};
-    var fields_values = build_view_fields_values(relation_field.view);
-    var f_context = relation_field.field.context || {};
-    var v_context = new openerp.base.CompoundContext(relation_field.node.attrs.default_get || {},
-        relation_field.node.attrs.context || {}).set_eval_context(fields_values);
-    var ctx = new openerp.base.CompoundContext(a_context, f_context, v_context);
-    return ctx;
-}
-var build_relation_domain = function(relation_field) {
-    var fields_values = build_view_fields_values(relation_field.view);
-    var f_domain = relation_field.field.domain || [];
-    var v_domain = new openerp.base.CompoundDomain(relation_field.node.attrs.domain || []).set_eval_context(fields_values);
-    return new openerp.base.CompoundDomain(f_domain, v_domain);
-}
-
 openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
@@ -1182,7 +1189,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                 "res_id": self.value[0],
                 "type":"ir.actions.act_window",
                 "target":"new",
-                "context": build_relation_context(self)
+                "context": self.build_context()
             });
         };
         var cmenu = this.$menu_btn.contextMenu(this.cm_id, {'leftClickToo': true,
@@ -1257,9 +1264,9 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
         var search_val = request.term;
         var self = this;
 
-        var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, build_relation_context(self));
+        var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, self.build_context());
 
-        dataset.name_search(search_val, build_relation_domain(self), 'ilike',
+        dataset.name_search(search_val, self.build_domain(), 'ilike',
                 this.limit + 1, function(data) {
             self.last_search = data.result;
             // possible selections for the m2o
@@ -1271,7 +1278,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
             if (values.length > self.limit) {
                 values = values.slice(0, self.limit);
                 values.push({label: "<em>   Search More...</em>", action: function() {
-                    dataset.name_search(search_val, build_relation_domain(self), 'ilike'
+                    dataset.name_search(search_val, self.build_domain(), 'ilike'
                     , false, function(data) {
                         self._change_int_value(null);
                         self._search_create_popup("search", data.result);
@@ -1299,7 +1306,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
     },
     _quick_create: function(name) {
         var self = this;
-        var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, build_relation_context(self));
+        var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, self.build_context());
         dataset.name_create(name, function(data) {
             self._change_int_ext_value(data.result);
         }).fail(function(error, event) {
@@ -1316,10 +1323,10 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
                 initial_ids: ids ? _.map(ids, function(x) {return x[0]}) : undefined,
                 initial_view: view,
                 disable_multiple_selection: true
-                }, build_relation_domain(self),
-                new openerp.base.CompoundContext(build_relation_context(self), context || {}));
+                }, self.build_domain(),
+                new openerp.base.CompoundContext(self.build_context(), context || {}));
         pop.on_select_elements.add(function(element_ids) {
-            var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, build_relation_context(self));
+            var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, self.build_context());
             dataset.name_get([element_ids[0]], function(data) {
                 self._change_int_ext_value(data.result[0]);
                 pop.stop();
@@ -1357,7 +1364,7 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({
             self._change_int_ext_value(rval);
         };
         if(typeof(value) === "number") {
-            var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, build_relation_context(self));
+            var dataset = new openerp.base.DataSetStatic(this.session, this.field.relation, self.build_context());
             dataset.name_get([value], function(data) {
                 real_set_value(data.result[0]);
             }).fail(function() {self.tmp_value = undefined;});
@@ -1571,7 +1578,7 @@ openerp.base.form.FieldOne2Many = openerp.base.form.Field.extend({
 
 openerp.base.form.One2ManyDataSet = openerp.base.BufferedDataSet.extend({
     get_context: function() {
-        this.context = build_relation_context(this.o2m);
+        this.context = this.o2m.build_context();
         return this.context;
     }
 });
@@ -1585,7 +1592,7 @@ openerp.base.form.One2ManyListView = openerp.base.ListView.extend({
             alternative_form_view: self.o2m.field.views ? self.o2m.field.views["form"] : undefined,
             auto_create: false,
             parent_view: self.o2m.view
-        }, build_relation_domain(self.o2m), build_relation_context(self.o2m));
+        }, self.o2m.build_domain(), self.o2m.build_context());
         pop.on_create.add(function(data) {
             self.o2m.dataset.create(data, function(r) {
                 self.o2m.dataset.set_ids(self.o2m.dataset.ids.concat([r.result]));

From 6102406eeac7969c1bbe2c547f52ed553ea43be0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Jun 2011 16:08:17 +0200
Subject: [PATCH 20/56] [REM] Removed debug remains, sorry everyone

bzr revid: fme@openerp.com-20110630140817-65xvlcqia2b6m9xw
---
 addons/base/static/src/js/list.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index dab8eef596d..62bedf8784d 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -427,7 +427,6 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
 
         if (_.isEmpty(records)) {
             records = this.groups.get_records();
-            if (records.constructor != Array) debugger
         }
 
         var count = 0, sums = {};
@@ -935,7 +934,6 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
     },
     get_records: function () {
         if (_(this.children).isEmpty()) {
-            alert("HERE")
             return {
                 count: this.datagroup.length,
                 values: this.datagroup.aggregates

From 1b236bd882bc0554228103e6ddc436f81de58250 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 30 Jun 2011 16:25:28 +0200
Subject: [PATCH 21/56] [FIX] xmlrpclib being an asshole

xmlrpclib.ServerProxy will convert XMLRPC strings to 'str'. Or to 'unicode' if it does not feel right today, or just wants to fuck with you. Competence is overrated!

Check precise type of view archiectures and re-encode to str if we're facing unicode strings, so it's possible to feed these little bastards to ElementTree

bzr revid: xmo@openerp.com-20110630142528-1xtj61gaou2klzme
---
 addons/base/controllers/main.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 6116cfd7e6f..850069bb141 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -536,11 +536,23 @@ class View(openerpweb.Controller):
         return fvg
     
     def process_view(self, session, fvg, context, transform):
+        # depending on how it feels, xmlrpclib.ServerProxy can translate
+        # XML-RPC strings to ``str`` or ``unicode``. ElementTree does not
+        # enjoy unicode strings which can not be trivially converted to
+        # strings, and it blows up during parsing.
+
+        # So ensure we fix this retardation by converting view xml back to
+        # bit strings.
+        if isinstance(fvg['arch'], unicode):
+            arch = fvg['arch'].encode('utf-8')
+        else:
+            arch = fvg['arch']
+
         if transform:
             evaluation_context = session.evaluation_context(context or {})
-            xml = self.transform_view(fvg['arch'], session, evaluation_context)
+            xml = self.transform_view(arch, session, evaluation_context)
         else:
-            xml = ElementTree.fromstring(fvg['arch'])
+            xml = ElementTree.fromstring(arch)
         fvg['arch'] = Xml2Json.convert_element(xml)
         for field in fvg['fields'].values():
             if field.has_key('views') and field['views']:

From 1950fc4216122840767324beaf15c7c4eeb40bfd Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 30 Jun 2011 16:25:02 +0200
Subject: [PATCH 22/56] [FIX] account: added Invoice Analysis multi-company
 record rule

bzr revid: qdp-launchpad@openerp.com-20110630142502-t95rt219e26ivwsb
---
 addons/account/security/account_security.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index b7271fec84b..016c147be91 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -97,6 +97,13 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record id="invoice_analysis_comp_rule" model="ir.rule">
+        <field name="name">Invoice Analysis multi-company</field>
+        <field model="ir.model" name="model_id" ref="model_account_invoice_report"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>

From f0a1342d5d7be58039bad19e8383c28617018c78 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 30 Jun 2011 17:13:58 +0200
Subject: [PATCH 23/56] [imp] added necessary team song

bzr revid: nicolas.vanhoren@openerp.com-20110630151358-zan8osv4vnh0y3h9
---
 addons/base/static/src/css/base.css | 6 ++++++
 addons/base/static/src/xml/base.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 32a335d7eb8..2f11af26ed5 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -1037,6 +1037,12 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
     background: #828282;
     border-color: #828282;
 }
+.openerp .oe_necessary_team_song {
+    display: none;
+}
+.openerp.kitten-mode-activated .oe_necessary_team_song {
+    display: block;
+}
 
 .openerp .oe-m2o {
     padding-right: 16px;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9bef00147d3..e6ab1858b6f 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -42,6 +42,9 @@
         <td colspan="2">
             <div id="oe_footer" class="oe_footer">
                 <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">openerp.com</a>.</p>
+                <iframe class="oe_necessary_team_song" style="height:1;" height="1"
+                    src="http://www.youtube.com/embed/QH2-TGUlwu4?autoplay=1"
+                    frameborder="0"></iframe>
             </div>
         </td>
     </tr>

From a1ba78184dec6b74cbd1a4c44342e2de27078b80 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 1 Jul 2011 04:54:28 +0000
Subject: [PATCH 24/56] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110701045428-brozmnv50tuoe0f4
---
 openerp/addons/base/i18n/en_GB.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index d57ef3f2944..767d20130e6 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-06-27 13:53+0000\n"
+"PO-Revision-Date: 2011-06-30 15:19+0000\n"
 "Last-Translator: John Bradshaw <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-28 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
@@ -2348,7 +2348,7 @@ msgstr "Sir"
 #: code:addons/orm.py:1622
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr ""
+msgstr "There is no view of type '%s' defined for the structure!"
 
 #. module: base
 #: field:ir.default,ref_id:0
@@ -2494,7 +2494,7 @@ msgstr "Title"
 #. module: base
 #: help:ir.property,res_id:0
 msgid "If not set, acts as a default value for new resources"
-msgstr ""
+msgstr "If not set, acts as a default value for new resources"
 
 #. module: base
 #: code:addons/orm.py:3448
@@ -3618,7 +3618,7 @@ msgstr "Kazakhstan"
 #. module: base
 #: view:res.lang:0
 msgid "%w - Weekday number [0(Sunday),6]."
-msgstr ""
+msgstr "%w - Weekday number [0(Sunday),6]."
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_form

From 88b74dd3151e6e6cef5c1e8ada079f6c289248b0 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 22 Jun 2011 10:38:33 +0200
Subject: [PATCH 25/56] [REF] fields_view_get: merge fields attributes inside
 the architecture as a new attribute.

bzr revid: vmt@openerp.com-20110622083833-xoh5b5r08xxgljqs
---
 openerp/osv/orm.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index f4a7dfa8ed2..6238b77921c 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1325,12 +1325,27 @@ class orm_template(object):
         return False
 
     def __view_look_dom(self, cr, user, node, view_id, context=None):
+        """ Return the description of the fields in the node.
+
+        In a normal call to this method, node is a complete view architecture
+        but it is actually possible to give some sub-node (this is used so
+        that the method can call itself recursively).
+
+        Originally, the field descriptions are drawn from the node itself.
+        But there is now some code calling fields_get() in order to merge some
+        of those information in the architecture.
+
+        """
         if context is None:
             context = {}
         result = False
         fields = {}
         children = True
 
+        modifiers = {}
+        if node.get('attrs'):
+            modifiers = eval(node.get('attrs')) # get the attrs before they are (possibly) deleted by check_group below
+
         def encode(s):
             if isinstance(s, unicode):
                 return s.encode('utf8')
@@ -1344,6 +1359,7 @@ class orm_template(object):
                 can_see = any(access_pool.check_groups(cr, user, group) for group in groups)
                 if not can_see:
                     node.set('invisible', '1')
+                    modifiers.setdefault('invisible', '1')
                     if 'attrs' in node.attrib:
                         del(node.attrib['attrs']) #avoid making field visible later
                 del(node.attrib['groups'])
@@ -1415,6 +1431,15 @@ class orm_template(object):
                             attrs['selection'].append((False, ''))
                 fields[node.get('name')] = attrs
 
+                # TODO a true fields_get is unnecessary (no need for the translation)
+                field = self.fields_get(cr, user, [node.get('name')], context)[node.get('name')]
+                for a in ('invisible', 'readonly', 'required'):
+                    if field.get(a):
+                        modifiers[a] = field.get(a)
+                    # The view architeture overrides the python model.
+                    if node.get(a):
+                        modifiers[a] = node.get(a)
+
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)
             if result:
@@ -1454,6 +1479,8 @@ class orm_template(object):
             if children or (node.tag == 'field' and f.tag in ('filter','separator')):
                 fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
+        if modifiers:
+            node.set('modifiers', str(modifiers))
         return fields
 
     def _disable_workflow_buttons(self, cr, user, node):
@@ -1482,6 +1509,16 @@ class orm_template(object):
         return node
 
     def __view_look_dom_arch(self, cr, user, node, view_id, context=None):
+        """ Return an architecture and a description of all the fields.
+
+        The field description combines the result of fields_get() and
+        __view_look_dom().
+
+        :param node: the architecture as as an etree
+        :return: a tuple (arch, fields) where arch is the given node as a
+            string and fields is the description of all the fields.
+
+        """
         fields_def = self.__view_look_dom(cr, user, node, view_id, context=context)
         node = self._disable_workflow_buttons(cr, user, node)
         arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
@@ -1515,6 +1552,7 @@ class orm_template(object):
     def __get_default_calendar_view(self):
         """Generate a default calendar view (For internal use only).
         """
+        # TODO could return an etree instead of a string
 
         arch = ('<?xml version="1.0" encoding="utf-8"?>\n'
                 '<calendar string="%s"') % (self._description)
@@ -1582,6 +1620,7 @@ class orm_template(object):
         for field_name in fields_to_search:
             field_group.append(etree.Element("field", attrib={'name': field_name}))
 
+        #TODO tostring can be removed as fromstring is call directly after...
         return etree.tostring(search_view, encoding="utf-8").replace('\t', '')
 
     #

From b0f06f7e52c8587290bed055e62f5e6efa26ec04 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:02:28 +0300
Subject: [PATCH 26/56] orm, tools, addons: Doc strings improvements

bzr revid: xrg@linux.gr-20110623090228-4gn6xoyykcvfhv13
---
 openerp/osv/fields.py | 40 ++++++++++++++++--------
 openerp/osv/orm.py    | 71 +++++++++++++++++++++++++++----------------
 openerp/tools/misc.py | 64 +++++++++++++++++++++-----------------
 3 files changed, 109 insertions(+), 66 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index f55e4b9c027..54d1d1dae6b 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -19,18 +19,19 @@
 #
 ##############################################################################
 
-# . Fields:
-#      - simple
-#      - relations (one2many, many2one, many2many)
-#      - function
-#
-# Fields Attributes:
-#   _classic_read: is a classic sql fields
-#   _type   : field type
-#   readonly
-#   required
-#   size
-#
+""" Fields:
+      - simple
+      - relations (one2many, many2one, many2many)
+      - function
+
+    Fields Attributes:
+        * _classic_read: is a classic sql fields
+        * _type   : field type
+        * readonly
+        * required
+        * size
+"""
+
 import datetime as DT
 import string
 import sys
@@ -51,6 +52,12 @@ def _symbol_set(symb):
 
 
 class _column(object):
+    """ Base of all fields, a database column
+    
+        An instance of this object is a *description* of a database column. It will
+        not hold any data, but only provide the methods to manipulate data of an
+        ORM record or even prepare/update the database to hold such a field of data.
+    """
     _classic_read = True
     _classic_write = True
     _prefetch = True
@@ -855,6 +862,15 @@ class function(_column):
 # ---------------------------------------------------------
 
 class related(function):
+    """Field that points to some data inside another field of the current record.
+
+    Example::
+
+       _columns = {
+           'foo_id': fields.many2one('my.foo', 'Foo'),
+           'bar': fields.related('frol', 'foo_id', type='char', string='Frol of Foo'),
+        }
+    """
 
     def _fnct_search(self, tobj, cr, uid, obj=None, name=None, domain=None, context=None):
         self._field_get2(cr, uid, obj, context)
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 4141176fc5b..9578a4d356b 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -19,24 +19,25 @@
 #
 ##############################################################################
 
-#
-# Object relationnal mapping to postgresql module
-#    . Hierarchical structure
-#    . Constraints consistency, validations
-#    . Object meta Data depends on its status
-#    . Optimised processing by complex query (multiple actions at once)
-#    . Default fields value
-#    . Permissions optimisation
-#    . Persistant object: DB postgresql
-#    . Datas conversions
-#    . Multi-level caching system
-#    . 2 different inheritancies
-#    . Fields:
-#         - classicals (varchar, integer, boolean, ...)
-#         - relations (one2many, many2one, many2many)
-#         - functions
-#
-#
+"""
+  Object relational mapping to database (postgresql) module
+     * Hierarchical structure
+     * Constraints consistency, validations
+     * Object meta Data depends on its status
+     * Optimised processing by complex query (multiple actions at once)
+     * Default fields value
+     * Permissions optimisation
+     * Persistant object: DB postgresql
+     * Datas conversions
+     * Multi-level caching system
+     * 2 different inheritancies
+     * Fields:
+          - classicals (varchar, integer, boolean, ...)
+          - relations (one2many, many2one, many2many)
+          - functions
+ 
+"""
+
 import calendar
 import copy
 import datetime
@@ -123,8 +124,9 @@ class except_orm(Exception):
 class BrowseRecordError(Exception):
     pass
 
-# Readonly python database object browser
 class browse_null(object):
+    """ Readonly python database object browser
+    """
 
     def __init__(self):
         self.id = False
@@ -152,6 +154,11 @@ class browse_null(object):
 # TODO: execute an object method on browse_record_list
 #
 class browse_record_list(list):
+    """ Collection of browse objects
+    
+        Such an instance will be returned when doing a ``browse([ids..])``
+        and will be iterable, yielding browse() objects
+    """
 
     def __init__(self, lst, context=None):
         if not context:
@@ -161,13 +168,25 @@ class browse_record_list(list):
 
 
 class browse_record(object):
+    """ An object that behaves like a row of an object's table.
+        It has attributes after the columns of the corresponding object.
+        
+        Examples::
+        
+            uobj = pool.get('res.users')
+            user_rec = uobj.browse(cr, uid, 104)
+            name = user_rec.name
+    """
     logger = netsvc.Logger()
 
     def __init__(self, cr, uid, id, table, cache, context=None, list_class=None, fields_process=None):
-        '''
-        table : the object (inherited from orm)
-        context : dictionary with an optional context
-        '''
+        """
+        @param cache a dictionary of model->field->data to be shared accross browse
+            objects, thus reducing the SQL read()s . It can speed up things a lot,
+            but also be disastrous if not discarded after write()/unlink() operations
+        @param table the object (inherited from orm)
+        @param context dictionary with an optional context
+        """
         if fields_process is None:
             fields_process = {}
         if context is None:
@@ -361,10 +380,10 @@ class browse_record(object):
 
 
 def get_pg_type(f):
-    '''
+    """
     returns a tuple
     (type returned by postgres when the column was created, type expression to create the column)
-    '''
+    """
 
     type_dict = {
             fields.boolean: 'bool',
@@ -725,7 +744,7 @@ class orm_template(object):
 
         :param cr: database cursor
         :param user: current user id
-        :param select: id or list of ids
+        :param select: id or list of ids.
         :param context: context arguments, like lang, time zone
         :rtype: object or list of objects requested
 
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 4167befd42d..a79bbb0cf49 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -124,16 +124,18 @@ def exec_command_pipe(name, *args):
 def file_open(name, mode="r", subdir='addons', pathinfo=False):
     """Open a file from the OpenERP root, using a subdir folder.
 
+    Example::
+    
     >>> file_open('hr/report/timesheer.xsl')
     >>> file_open('addons/hr/report/timesheet.xsl')
     >>> file_open('../../base/report/rml_template.xsl', subdir='addons/hr/report', pathinfo=True)
 
-    @param name: name of the file
-    @param mode: file open mode
-    @param subdir: subdirectory
-    @param pathinfo: if True returns tupple (fileobject, filepath)
+    @param name name of the file
+    @param mode file open mode
+    @param subdir subdirectory
+    @param pathinfo if True returns tupple (fileobject, filepath)
 
-    @return: fileobject if pathinfo is False else (fileobject, filepath)
+    @return fileobject if pathinfo is False else (fileobject, filepath)
     """
     import openerp.modules as addons
     adps = addons.module.ad_paths
@@ -217,7 +219,7 @@ def flatten(list):
     """Flatten a list of elements into a uniqu list
     Author: Christophe Simonis (christophe@tinyerp.com)
 
-    Examples:
+    Examples::
     >>> flatten(['a'])
     ['a']
     >>> flatten('b')
@@ -246,6 +248,8 @@ def flatten(list):
 
 def reverse_enumerate(l):
     """Like enumerate but in the other sens
+    
+    Usage::
     >>> a = ['a', 'b', 'c']
     >>> it = reverse_enumerate(a)
     >>> it.next()
@@ -285,16 +289,14 @@ priorities = {
     }
 
 def html2plaintext(html, body_id=None, encoding='utf-8'):
+    """ From an HTML text, convert the HTML to plain text.
+    If @param body_id is provided then this is the tag where the
+    body (not necessarily <body>) starts.
+    """
     ## (c) Fry-IT, www.fry-it.com, 2007
     ## <peter@fry-it.com>
     ## download here: http://www.peterbe.com/plog/html2plaintext
 
-
-    """ from an HTML text, convert the HTML to plain text.
-    If @body_id is provided then this is the tag where the
-    body (not necessarily <body>) starts.
-    """
-
     html = ustr(html)
 
     from lxml.etree import tostring
@@ -351,14 +353,16 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
     return html
 
 def generate_tracking_message_id(openobject_id):
-    """Returns a string that can be used in the Message-ID RFC822 header field so we
-       can track the replies related to a given object thanks to the "In-Reply-To" or
-       "References" fields that Mail User Agents will set.
+    """Returns a string that can be used in the Message-ID RFC822 header field
+    
+       Used to track the replies related to a given object thanks to the "In-Reply-To"
+       or "References" fields that Mail User Agents will set.
     """
     return "<%s-openobject-%s@%s>" % (time.time(), openobject_id, socket.gethostname())
 
 def _email_send(smtp_from, smtp_to_list, message, openobject_id=None, ssl=False, debug=False):
-    """Low-level method to send directly a Message through the configured smtp server.
+    """ Low-level method to send directly a Message through the configured smtp server.
+    
         :param smtp_from: RFC-822 envelope FROM (not displayed to recipient)
         :param smtp_to_list: RFC-822 envelope RCPT_TOs (not displayed to recipient)
         :param message: an email.message.Message to send
@@ -427,17 +431,16 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
 
     """Send an email.
 
-    Arguments:
-
-    `email_from`: A string used to fill the `From` header, if falsy,
+    @param email_from A string used to fill the `From` header, if falsy,
                   config['email_from'] is used instead.  Also used for
                   the `Reply-To` header if `reply_to` is not provided
 
-    `email_to`: a sequence of addresses to send the mail to.
+    @param email_to a sequence of addresses to send the mail to.
     """
     if x_headers is None:
         x_headers = {}
 
+        
 
     if not (email_from or config['email_from']):
         raise ValueError("Sending an email requires either providing a sender "
@@ -507,10 +510,9 @@ def sms_send(user, password, api_id, text, to):
     # FIXME: Use the logger if there is an error
     return True
 
-#---------------------------------------------------------
-# Class that stores an updateable string (used in wizards)
-#---------------------------------------------------------
 class UpdateableStr(local):
+    """ Class that stores an updateable string (used in wizards)
+    """
 
     def __init__(self, string=''):
         self.string = string
@@ -526,7 +528,8 @@ class UpdateableStr(local):
 
 
 class UpdateableDict(local):
-    '''Stores an updateable dict to use in wizards'''
+    """Stores an updateable dict to use in wizards
+    """
 
     def __init__(self, dict=None):
         if dict is None:
@@ -624,8 +627,13 @@ class UpdateableDict(local):
         return self.dict.__ne__(y)
 
 
-# Don't use ! Use res.currency.round()
 class currency(float):
+    """ Deprecate
+    
+    .. warning::
+    
+    Don't use ! Use res.currency.round()
+    """
 
     def __init__(self, value, accuracy=2, rounding=None):
         if rounding is None:
@@ -1168,7 +1176,7 @@ def detect_ip_addr():
 #  times.
 def get_win32_timezone():
     """Attempt to return the "standard name" of the current timezone on a win32 system.
-       @return: the standard name of the current win32 timezone, or False if it cannot be found.
+       @return the standard name of the current win32 timezone, or False if it cannot be found.
     """
     res = False
     if (sys.platform == "win32"):
@@ -1186,7 +1194,7 @@ def get_win32_timezone():
 def detect_server_timezone():
     """Attempt to detect the timezone to use on the server side.
        Defaults to UTC if no working timezone can be found.
-       @return: the timezone identifier as expected by pytz.timezone.
+       @return the timezone identifier as expected by pytz.timezone.
     """
     try:
         import pytz
@@ -1312,7 +1320,7 @@ def server_to_local_timestamp(src_tstamp_str, src_format, dst_format, dst_tz_nam
     @param ignore_unparsable_time: if True, return False if src_tstamp_str cannot be parsed
                                    using src_format or formatted using dst_format.
 
-    @return: local/client formatted timestamp, expressed in the local/client timezone if possible
+    @return local/client formatted timestamp, expressed in the local/client timezone if possible
             and if tz_offset is true, or src_tstamp_str if timezone offset could not be determined.
     """
     if not src_tstamp_str:

From 732a395a4bc196894f8c4d54b51077d86da081ff Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:03:11 +0300
Subject: [PATCH 27/56] amount-to-text: docstrings

bzr revid: xrg@linux.gr-20110623090311-1w881l56hdl811y4
---
 openerp/tools/amount_to_text.py    | 33 +++++++++++++++++++-----------
 openerp/tools/amount_to_text_en.py | 20 ++++++++++--------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/openerp/tools/amount_to_text.py b/openerp/tools/amount_to_text.py
index 0b626af8a7a..331640a2c28 100644
--- a/openerp/tools/amount_to_text.py
+++ b/openerp/tools/amount_to_text.py
@@ -34,8 +34,9 @@ denom_fr = ( '',
           'Décillion',    'Undecillion',     'Duodecillion',  'Tredecillion',   'Quattuordecillion',
           'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Icosillion', 'Vigintillion' )
 
-# convert a value < 100 to French.
 def _convert_nn_fr(val):
+    """ convert a value < 100 to French
+    """
     if val < 20:
         return to_19_fr[val]
     for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens_fr)):
@@ -44,10 +45,13 @@ def _convert_nn_fr(val):
                 return dcap + '-' + to_19_fr[val % 10]
             return dcap
 
-# convert a value < 1000 to french, special cased because it is the level that kicks 
-# off the < 100 special case.  The rest are more general.  This also allows you to
-# get strings in the form of 'forty-five hundred' if called directly.
 def _convert_nnn_fr(val):
+    """ convert a value < 1000 to french
+    
+        special cased because it is the level that kicks 
+        off the < 100 special case.  The rest are more general.  This also allows you to
+        get strings in the form of 'forty-five hundred' if called directly.
+    """
     word = ''
     (mod, rem) = (val % 100, val // 100)
     if rem > 0:
@@ -98,8 +102,9 @@ denom_nl = ( '',
            'Decillion', 'Undecillion', 'Duodecillion', 'Tredecillion', 'Quattuordecillion',
            'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' )
 
-# convert a value < 100 to Dutch.
 def _convert_nn_nl(val):
+    """ convert a value < 100 to Dutch
+    """
     if val < 20:
         return to_19_nl[val]
     for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens_nl)):
@@ -108,10 +113,13 @@ def _convert_nn_nl(val):
                 return dcap + '-' + to_19_nl[val % 10]
             return dcap
 
-# convert a value < 1000 to Dutch, special cased because it is the level that kicks 
-# off the < 100 special case.  The rest are more general.  This also allows you to
-# get strings in the form of 'forty-five hundred' if called directly.
 def _convert_nnn_nl(val):
+    """ convert a value < 1000 to Dutch
+    
+        special cased because it is the level that kicks 
+        off the < 100 special case.  The rest are more general.  This also allows you to
+        get strings in the form of 'forty-five hundred' if called directly.
+    """
     word = ''
     (mod, rem) = (val % 100, val // 100)
     if rem > 0:
@@ -160,10 +168,11 @@ def add_amount_to_text_function(lang, func):
 #TODO: we should use the country AND language (ex: septante VS soixante dix)
 #TODO: we should use en by default, but the translation func is yet to be implemented
 def amount_to_text(nbr, lang='fr', currency='euro'):
-    """
-    Converts an integer to its textual representation, using the language set in the context if any.
-    Example:
-        1654: mille six cent cinquante-quatre.
+    """ Converts an integer to its textual representation, using the language set in the context if any.
+
+        Example::
+        
+            1654: mille six cent cinquante-quatre.
     """
 #    if nbr > 1000000:
 ##TODO: use logger   
diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py
index 77d18cbb55d..914794118aa 100644
--- a/openerp/tools/amount_to_text_en.py
+++ b/openerp/tools/amount_to_text_en.py
@@ -34,8 +34,9 @@ denom = ( '',
           'Decillion',    'Undecillion',     'Duodecillion',  'Tredecillion',   'Quattuordecillion',
           'Sexdecillion', 'Septendecillion', 'Octodecillion', 'Novemdecillion', 'Vigintillion' )
 
-# convert a value < 100 to English.
 def _convert_nn(val):
+    """convert a value < 100 to English.
+    """
     if val < 20:
         return to_19[val]
     for (dcap, dval) in ((k, 20 + (10 * v)) for (v, k) in enumerate(tens)):
@@ -44,10 +45,12 @@ def _convert_nn(val):
                 return dcap + '-' + to_19[val % 10]
             return dcap
 
-# convert a value < 1000 to english, special cased because it is the level that kicks 
-# off the < 100 special case.  The rest are more general.  This also allows you to
-# get strings in the form of 'forty-five hundred' if called directly.
 def _convert_nnn(val):
+    """
+        convert a value < 1000 to english, special cased because it is the level that kicks 
+        off the < 100 special case.  The rest are more general.  This also allows you to
+        get strings in the form of 'forty-five hundred' if called directly.
+    """
     word = ''
     (mod, rem) = (val % 100, val // 100)
     if rem > 0:
@@ -94,10 +97,11 @@ _translate_funcs = {'en' : amount_to_text}
 #TODO: we should use the country AND language (ex: septante VS soixante dix)
 #TODO: we should use en by default, but the translation func is yet to be implemented
 def amount_to_text(nbr, lang='en', currency='euro'):
-    """
-    Converts an integer to its textual representation, using the language set in the context if any.
-    Example:
-        1654: thousands six cent cinquante-quatre.
+    """ Converts an integer to its textual representation, using the language set in the context if any.
+    
+        Example::
+        
+            1654: thousands six cent cinquante-quatre.
     """
     import openerp.loglevels as loglevels
 #    if nbr > 10000000:

From 803d5c4c78beac2d45bb725d709f8810ebdda1ae Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:03:11 +0300
Subject: [PATCH 28/56] tools.func: docstrings

bzr revid: xrg@linux.gr-20110623090311-dbez41ijva3lwri9
---
 openerp/tools/func.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openerp/tools/func.py b/openerp/tools/func.py
index 4150b3e688b..03463678ffb 100644
--- a/openerp/tools/func.py
+++ b/openerp/tools/func.py
@@ -30,6 +30,10 @@ except ImportError:
     # http://svn.python.org/view/python/tags/r254/Lib/functools.py?view=markup
 
     def partial(fun, *args, **kwargs):
+        """ Partial implementation
+        
+            See: http://svn.python.org/view/python/tags/r254/Lib/functools.py
+        """
         def _partial(*args2, **kwargs2):
             return fun(*(args+args2), **dict(kwargs, **kwargs2))
         return _partial

From a3beae41e464e92d73aedf2bd02e5ff286a4bb76 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:03:11 +0300
Subject: [PATCH 29/56] tools.graph: cleanup docstrings

bzr revid: xrg@linux.gr-20110623090311-ntqxz67t23n58igo
---
 openerp/tools/graph.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/openerp/tools/graph.py b/openerp/tools/graph.py
index 7f85bf1ba35..df3fb39ef47 100755
--- a/openerp/tools/graph.py
+++ b/openerp/tools/graph.py
@@ -25,11 +25,11 @@ import math
 
 class graph(object):
     def __init__(self, nodes, transitions, no_ancester=None):
-        """Initailize graph's object
+        """Initialize graph's object
 
-        @param nodes: list of ids of nodes in the graph
-        @param transitions: list of edges in the graph in the form (source_node, destination_node)
-        @param no_ancester: list of nodes with no incoming edges
+        @param nodes list of ids of nodes in the graph
+        @param transitions list of edges in the graph in the form (source_node, destination_node)
+        @param no_ancester list of nodes with no incoming edges
         """
 
         self.nodes = nodes or []
@@ -210,8 +210,8 @@ class graph(object):
 
     def exchange(self, e, f):
         """Exchange edges to make feasible-tree optimized
-        @param edge: edge with negative cut-value
-        @param edge: new edge with minimum slack-value
+        @param edge edge with negative cut-value
+        @param edge new edge with minimum slack-value
         """
         self.tree_edges.__delitem__(self.tree_edges.index(e))
         self.tree_edges.append(f)
@@ -221,7 +221,7 @@ class graph(object):
     def enter_edge(self, edge):
         """Finds a new_edge with minimum slack value to replace an edge with negative cut-value
 
-        @param edge: edge with negative cut-value
+        @param edge edge with negative cut-value
         """
 
         self.head_nodes = []
@@ -345,8 +345,8 @@ class graph(object):
     def median_value(self, node, adj_rank):
         """Returns median value of a vertex , defined as the median position of the adjacent vertices
 
-        @param node: node to process
-        @param adj_rank: rank 1 less than the node's rank
+        @param node node to process
+        @param adj_rank rank 1 less than the node's rank
         """
         adj_nodes = self.adj_position(node, adj_rank)
         l = len(adj_nodes)
@@ -367,8 +367,8 @@ class graph(object):
     def adj_position(self, node, adj_rank):
         """Returns list of the present positions of the nodes adjacent to node in the given adjacent rank.
 
-        @param node: node to process
-        @param adj_rank: rank 1 less than the node's rank
+        @param node node to process
+        @param adj_rank rank 1 less than the node's rank
         """
 
         pre_level_nodes = self.levels.get(adj_rank, [])
@@ -606,7 +606,7 @@ class graph(object):
     def rank(self):
         """Finds the optimized rank of the nodes using Network-simplex algorithm
 
-        @param start: starting node of the component
+        @param start starting node of the component
         """
         self.levels = {}
         self.critical_edges = []
@@ -668,7 +668,7 @@ class graph(object):
     def process(self, starting_node):
         """Process the graph to find ranks and order of the nodes
 
-        @param starting_node: node from where to start the graph search
+        @param starting_node node from where to start the graph search
         """
 
         self.start_nodes = starting_node or []

From 5aa560791394e7d03d08d780e4cb1194a0ff6222 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:03:12 +0300
Subject: [PATCH 30/56] tools.which: docstring fix

bzr revid: xrg@linux.gr-20110623090312-8kon0hgauxbrpace
---
 openerp/tools/which.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/which.py b/openerp/tools/which.py
index 66b264bddec..548b836247c 100755
--- a/openerp/tools/which.py
+++ b/openerp/tools/which.py
@@ -19,8 +19,8 @@
        Return a generator which yields full paths in which the *file* name exists
        in a directory that is part of the file name, or on *path*,
        and has the given *mode*.
-       By default, *mode* matches an inclusive OR of os.F_OK and os.X_OK
-        - an existing executable file.
+       By default, *mode* matches an inclusive OR of os.F_OK and os.X_OK - an 
+       existing executable file.
        The *path* is, by default, the ``PATH`` variable on the platform,
        or the string/iterable passed in as *path*.
        In the event that a ``PATH`` variable is not found, :const:`os.defpath` is used.

From 588552b52dbf41381ff9ca80fe414416367acc16 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:03:12 +0300
Subject: [PATCH 31/56] sql_db: docstrings

bzr revid: xrg@linux.gr-20110623090312-afwjqqduqdtex017
---
 openerp/sql_db.py | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index e759a13e1d3..5d3ad49259f 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -20,6 +20,14 @@
 #
 ##############################################################################
 
+"""
+The PostgreSQL connector is a connectivity layer between the OpenERP code and
+the database, *not* a database abstraction toolkit. Database abstraction is what
+the ORM does, in fact.
+
+See also: the `pooler` module
+"""
+
 __all__ = ['db_connect', 'close_db']
 
 from threading import currentThread
@@ -66,6 +74,13 @@ re_into = re.compile('.* into "?([a-zA-Z_0-9]+)"? .*$');
 sql_counter = 0
 
 class Cursor(object):
+    """ Cursor is an open transaction to Postgres, utilizing a TCP connection
+    
+        A lightweight wrapper around psycopg2's `psycopg1cursor` objects
+        
+        This is the object behind the `cr` variable used all over the OpenERP
+        code.
+    """
     IN_MAX = 1000 # decent limit on size of IN queries - guideline = Oracle limit
     __logger = None
 
@@ -233,22 +248,37 @@ class Cursor(object):
 
     @check
     def commit(self):
+        """ Perform an SQL `COMMIT`
+        """
         return self._cnx.commit()
 
     @check
     def rollback(self):
+        """ Perform an SQL `ROLLBACK`
+        """
         return self._cnx.rollback()
 
     @check
     def __getattr__(self, name):
         return getattr(self._obj, name)
 
+        """ Set the mode of postgres operations for all cursors
+        """
+        """Obtain the mode of postgres operations for all cursors
+        """
 
 class PsycoConnection(psycopg2.extensions.connection):
     pass
 
 class ConnectionPool(object):
-
+    """ The pool of connections to database(s)
+    
+        Keep a set of connections to pg databases open, and reuse them
+        to open cursors for all transactions.
+        
+        The connections are *not* automatically closed. Only a close_db()
+        can trigger that.
+    """
     __logger = logging.getLogger('db.connection_pool')
 
     def locked(fun):
@@ -340,6 +370,8 @@ class ConnectionPool(object):
 
 
 class Connection(object):
+    """ A lightweight instance of a connection to postgres
+    """
     __logger = logging.getLogger('db.connection')
 
     def __init__(self, pool, dbname):

From cf6e623f7d030fde80c310c99323f8d6e5e3c93a Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:03:57 +0300
Subject: [PATCH 32/56] API docs: settings file and titles at modules

bzr revid: xrg@linux.gr-20110623090357-nazly8vpfnw0iskr
---
 bin/.apidoc                                        | 1 +
 openerp/addons/base/publisher_warranty/__init__.py | 2 ++
 openerp/osv/__init__.py                            | 1 +
 openerp/osv/expression.py                          | 2 ++
 openerp/osv/orm.py                                 | 3 +++
 openerp/osv/osv.py                                 | 4 +---
 openerp/osv/query.py                               | 1 +
 openerp/report/__init__.py                         | 2 ++
 openerp/report/render/__init__.py                  | 2 ++
 openerp/sql_db.py                                  | 5 +++++
 openerp/tiny_socket.py                             | 4 +++-
 openerp/tools/__init__.py                          | 2 ++
 openerp/tools/config.py                            | 2 ++
 openerp/tools/misc.py                              | 2 ++
 openerp/workflow/__init__.py                       | 2 ++
 15 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 bin/.apidoc

diff --git a/bin/.apidoc b/bin/.apidoc
new file mode 100644
index 00000000000..e4441c5240d
--- /dev/null
+++ b/bin/.apidoc
@@ -0,0 +1 @@
+excludes: pychart release openerp-server test run_tests
\ No newline at end of file
diff --git a/openerp/addons/base/publisher_warranty/__init__.py b/openerp/addons/base/publisher_warranty/__init__.py
index 6b60ddf3ca1..2baa53f5c1d 100644
--- a/openerp/addons/base/publisher_warranty/__init__.py
+++ b/openerp/addons/base/publisher_warranty/__init__.py
@@ -21,5 +21,7 @@
 
 import publisher_warranty
 
+#.apidoc title: IR interface (Deprecated)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/osv/__init__.py b/openerp/osv/__init__.py
index 630090954e6..b32d81d659e 100644
--- a/openerp/osv/__init__.py
+++ b/openerp/osv/__init__.py
@@ -22,6 +22,7 @@
 import osv
 import fields
 
+#.apidoc title: Object Services and Relational Mapping
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 1922d5e8388..143b5992904 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -23,6 +23,8 @@
 from openerp.tools import flatten, reverse_enumerate
 import fields
 
+#.apidoc title: Domain Expressions
+
 
 class expression(object):
     """
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 9578a4d356b..eeb7e70b65a 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -19,6 +19,9 @@
 #
 ##############################################################################
 
+#.apidoc title: Object Relational Mapping
+#.apidoc module-mods: member-order: bysource
+
 """
   Object relational mapping to database (postgresql) module
      * Hierarchical structure
diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index acf262af343..1327efe5731 100644
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-#
-# OSV: Objects Services
-#
+#.apidoc title: Objects Services (OSV)
 
 import orm
 import openerp.netsvc as netsvc
diff --git a/openerp/osv/query.py b/openerp/osv/query.py
index ab4f4143634..0b2bf47305a 100644
--- a/openerp/osv/query.py
+++ b/openerp/osv/query.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+#.apidoc title: Query object
 
 def _quote(to_quote):
     if '"' not in to_quote:
diff --git a/openerp/report/__init__.py b/openerp/report/__init__.py
index ca2b86d9731..646967f00d1 100644
--- a/openerp/report/__init__.py
+++ b/openerp/report/__init__.py
@@ -31,5 +31,7 @@ import report_sxw
 
 import printscreen
 
+#.apidoc title: Reporting Support and Engines
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/render/__init__.py b/openerp/report/render/__init__.py
index 1becd5ee514..1b751fa4104 100644
--- a/openerp/report/render/__init__.py
+++ b/openerp/report/render/__init__.py
@@ -23,6 +23,8 @@ from simple import simple
 from rml import rml, rml2html, rml2txt, odt2odt , html2html, makohtml2html
 from render import render
 
+#.apidoc title: Report Rendering
+
 try:
     import Image
 except ImportError:
diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index 5d3ad49259f..43a508f9082 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+#.apidoc title: PostgreSQL interface
+
 """
 The PostgreSQL connector is a connectivity layer between the OpenERP code and
 the database, *not* a database abstraction toolkit. Database abstraction is what
@@ -28,6 +30,9 @@ the ORM does, in fact.
 See also: the `pooler` module
 """
 
+#.apidoc add-functions: print_stats
+#.apidoc add-classes: Cursor Connection ConnectionPool
+
 __all__ = ['db_connect', 'close_db']
 
 from threading import currentThread
diff --git a/openerp/tiny_socket.py b/openerp/tiny_socket.py
index cc0f09ec976..29782109347 100644
--- a/openerp/tiny_socket.py
+++ b/openerp/tiny_socket.py
@@ -26,9 +26,11 @@ import marshal
 
 import netsvc
 
+#.apidoc title: Net-RPC classes
+
 class Myexception(Exception):
     """
-    custome exception object store 
+    custom exception object store
     * faultcode
     * faulestring
     * args
diff --git a/openerp/tools/__init__.py b/openerp/tools/__init__.py
index 16042841b6e..3d1cdc960ab 100644
--- a/openerp/tools/__init__.py
+++ b/openerp/tools/__init__.py
@@ -32,5 +32,7 @@ from pdf_utils import *
 from yaml_import import *
 from sql import *
 
+#.apidoc title: Tools
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 9a59235773a..b35769fc8e6 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -45,6 +45,8 @@ class MyOption (optparse.Option, object):
         self.my_default = attrs.pop('my_default', None)
         super(MyOption, self).__init__(*opts, **attrs)
 
+#.apidoc title: Server Configuration
+
 def check_ssl():
     try:
         from OpenSSL import SSL
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index a79bbb0cf49..dc66142fc4a 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -20,6 +20,8 @@
 #
 ##############################################################################
 
+#.apidoc title: Utilities: tools.misc
+
 """
 Miscelleanous tools used by OpenERP.
 """
diff --git a/openerp/workflow/__init__.py b/openerp/workflow/__init__.py
index 50e6181fa5f..959a878f208 100644
--- a/openerp/workflow/__init__.py
+++ b/openerp/workflow/__init__.py
@@ -21,6 +21,8 @@
 
 import wkf_service
 
+#.apidoc title: Workflow objects
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 18c480d1cb65ac05440e8fc9a7eebfe973d14c7d Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:03:57 +0300
Subject: [PATCH 33/56] netsvc: API doc title and docstring fixes

bzr revid: xrg@linux.gr-20110623090357-vcr58sj3sbgd1r2i
---
 openerp/netsvc.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 42ccab414c7..eac8a13b8fe 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -63,6 +63,9 @@ def close_socket(sock):
     sock.close()
 
 
+#.apidoc title: Common Services: netsvc
+#.apidoc module-mods: member-order: bysource
+
 class Service(object):
     """ Base class for *Local* services
 
@@ -249,19 +252,22 @@ def init_alternative_logger():
     logger.setLevel(logging.ERROR)
 
 class Agent(object):
-    """Singleton that keeps track of cancellable tasks to run at a given
-       timestamp.
-       The tasks are caracterised by:
+    """ Singleton that keeps track of cancellable tasks to run at a given
+        timestamp.
+       
+        The tasks are characterised by:
+       
             * a timestamp
             * the database on which the task run
             * the function to call
             * the arguments and keyword arguments to pass to the function
 
         Implementation details:
-          Tasks are stored as list, allowing the cancellation by setting
-          the timestamp to 0.
-          A heapq is used to store tasks, so we don't need to sort
-          tasks ourself.
+        
+          - Tasks are stored as list, allowing the cancellation by setting
+            the timestamp to 0.
+          - A heapq is used to store tasks, so we don't need to sort
+            tasks ourself.
     """
     __tasks = []
     __tasks_by_db = {}

From 8cfb7dae73471b3e7e3c6c71068b4aaa83990f9d Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:04:57 +0300
Subject: [PATCH 34/56] API docs: docstrings, module titles

bzr revid: xrg@linux.gr-20110623090457-y5o7pd5y1ltpo9t9
---
 openerp/addons/base/module/report/__init__.py   | 10 ++++++++++
 openerp/report/printscreen/__init__.py          |  5 +++++
 openerp/report/printscreen/ps_list.py           |  2 ++
 openerp/report/pyPdf/__init__.py                |  3 +++
 openerp/report/render/html2html/__init__.py     |  2 ++
 openerp/report/render/makohtml2html/__init__.py |  5 ++++-
 openerp/report/render/odt2odt/__init__.py       |  2 ++
 openerp/report/render/rml2html/__init__.py      |  2 ++
 openerp/report/render/rml2pdf/__init__.py       |  2 ++
 openerp/report/render/rml2pdf/customfonts.py    |  2 ++
 openerp/report/render/rml2txt/__init__.py       |  9 +++++++++
 openerp/service/http_server.py                  | 11 ++++++++++-
 openerp/service/netrpc_server.py                |  2 ++
 openerp/service/security.py                     |  5 ++++-
 openerp/service/web_services.py                 |  9 +++++++++
 openerp/service/websrv_lib.py                   |  4 ++++
 openerp/tools/config.py                         |  2 +-
 17 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/module/report/__init__.py b/openerp/addons/base/module/report/__init__.py
index 4d58fb00b42..f9d787085b4 100644
--- a/openerp/addons/base/module/report/__init__.py
+++ b/openerp/addons/base/module/report/__init__.py
@@ -21,5 +21,15 @@
 
 import ir_module_reference_print
 
+#.apidoc title: RPC Services
+
+""" Classes of this module implement the network protocols that the
+    OpenERP server uses to communicate with remote clients.
+
+    Some classes are mostly utilities, whose API need not be visible to
+    the average user/developer. Study them only if you are about to
+    implement an extension to the network protocols, or need to debug some
+    low-level behavior of the wire.
+"""
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/printscreen/__init__.py b/openerp/report/printscreen/__init__.py
index b9dd9702b7c..e940a7e467c 100644
--- a/openerp/report/printscreen/__init__.py
+++ b/openerp/report/printscreen/__init__.py
@@ -22,6 +22,11 @@
 import ps_list
 import ps_form
 
+#.apidoc title: Printscreen Support
+
+""" A special report, that is automatically formatted to look like the
+    screen contents of Form/List Views.
+"""
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/printscreen/ps_list.py b/openerp/report/printscreen/ps_list.py
index 8b0ece6eaa0..dc280a53e3e 100644
--- a/openerp/report/printscreen/ps_list.py
+++ b/openerp/report/printscreen/ps_list.py
@@ -31,6 +31,8 @@ import time, os
 from operator import itemgetter
 from datetime import datetime
 
+#.apidoc title: Printscreen for List Views
+
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
diff --git a/openerp/report/pyPdf/__init__.py b/openerp/report/pyPdf/__init__.py
index af02553da69..8d17648d4b9 100644
--- a/openerp/report/pyPdf/__init__.py
+++ b/openerp/report/pyPdf/__init__.py
@@ -1,2 +1,5 @@
 from pdf import PdfFileReader, PdfFileWriter
+#.apidoc title: pyPdf Engine
+
 __all__ = ["pdf"]
+
diff --git a/openerp/report/render/html2html/__init__.py b/openerp/report/render/html2html/__init__.py
index bb497aca94f..40917030f45 100644
--- a/openerp/report/render/html2html/__init__.py
+++ b/openerp/report/render/html2html/__init__.py
@@ -21,5 +21,7 @@
 
 from html2html import parseString
 
+#.apidoc title: HTML to HTML engine
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/render/makohtml2html/__init__.py b/openerp/report/render/makohtml2html/__init__.py
index 9303d40b850..ee458d04718 100644
--- a/openerp/report/render/makohtml2html/__init__.py
+++ b/openerp/report/render/makohtml2html/__init__.py
@@ -19,4 +19,7 @@
 #
 ##############################################################################
 
-from makohtml2html import parseNode
\ No newline at end of file
+from makohtml2html import parseNode
+
+#.apidoc title: MAKO to HTML engine
+
diff --git a/openerp/report/render/odt2odt/__init__.py b/openerp/report/render/odt2odt/__init__.py
index 775cbabb3d4..7155923b6b6 100644
--- a/openerp/report/render/odt2odt/__init__.py
+++ b/openerp/report/render/odt2odt/__init__.py
@@ -21,4 +21,6 @@
 
 from odt2odt import parseNode
 
+#.apidoc title: ODT to ODT engine
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/openerp/report/render/rml2html/__init__.py b/openerp/report/render/rml2html/__init__.py
index 52c52863008..96b9afc6e70 100644
--- a/openerp/report/render/rml2html/__init__.py
+++ b/openerp/report/render/rml2html/__init__.py
@@ -21,5 +21,7 @@
 
 from rml2html import parseString
 
+#.apidoc title: RML to HTML engine
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/render/rml2pdf/__init__.py b/openerp/report/render/rml2pdf/__init__.py
index 001aea413fd..ffe9339b659 100644
--- a/openerp/report/render/rml2pdf/__init__.py
+++ b/openerp/report/render/rml2pdf/__init__.py
@@ -21,3 +21,5 @@
 
 from trml2pdf import parseString, parseNode
 
+#.apidoc title: RML to PDF engine
+
diff --git a/openerp/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py
index 17a8a9c0ab7..bc70d1f65ea 100644
--- a/openerp/report/render/rml2pdf/customfonts.py
+++ b/openerp/report/render/rml2pdf/customfonts.py
@@ -28,6 +28,8 @@ from reportlab import rl_config
 
 from openerp.tools import config
 
+#.apidoc title: TTF Font Table
+
 """This module allows the mapping of some system-available TTF fonts to
 the reportlab engine.
 
diff --git a/openerp/report/render/rml2txt/__init__.py b/openerp/report/render/rml2txt/__init__.py
index 56c577d51d3..cc0530eedb6 100644
--- a/openerp/report/render/rml2txt/__init__.py
+++ b/openerp/report/render/rml2txt/__init__.py
@@ -21,5 +21,14 @@
 
 from rml2txt import parseString, parseNode
 
+#.apidoc title: RML to TXT engine
+
+""" This engine is the minimalistic renderer of RML documents into text files,
+    using spaces and newlines to format.
+
+    It was needed in some special applications, where legal reports need to be
+    printed in special (dot-matrix) printers.
+"""
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index a7524186fe2..61713e9f2dd 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -26,10 +26,19 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ###############################################################################
 
-""" This file contains instance of the http server.
+#.apidoc title: HTTP and XML-RPC Server
 
+""" This module offers the family of HTTP-based servers. These are not a single
+    class/functionality, but a set of network stack layers, implementing
+    extendable HTTP protocols.
 
+    The OpenERP server defines a single instance of a HTTP server, listening at
+    the standard 8069, 8071 ports (well, it is 2 servers, and ports are 
+    configurable, of course). This "single" server then uses a `MultiHTTPHandler`
+    to dispatch requests to the appropriate channel protocol, like the XML-RPC,
+    static HTTP, DAV or other.
 """
+
 from websrv_lib import *
 import openerp.netsvc as netsvc
 import errno
diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
index b4d5a74dc48..70855a018e5 100644
--- a/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+#.apidoc title: NET-RPC Server
+
 """ This file contains instance of the net-rpc server
 
     
diff --git a/openerp/service/security.py b/openerp/service/security.py
index ec13fe3de8c..86c381b683f 100644
--- a/openerp/service/security.py
+++ b/openerp/service/security.py
@@ -22,8 +22,11 @@
 import openerp.pooler as pooler
 import openerp.tools as tools
 
-# When rejecting a password, hide the traceback
+#.apidoc title: Authentication helpers
+
 class ExceptionNoTb(Exception):
+    """ When rejecting a password, hide the traceback
+    """
     def __init__(self, msg):
         super(ExceptionNoTb, self).__init__(msg)
         self.traceback = ('','','')
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 39457807868..40e7ccf1d69 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -38,6 +38,15 @@ import locale
 import logging
 from cStringIO import StringIO
 
+#.apidoc title: Exported Service methods
+#.apidoc module-mods: member-order: bysource
+
+""" This python module defines the RPC methods available to remote clients.
+
+    Each 'Export Service' is a group of 'methods', which in turn are RPC
+    procedures to be called. Each method has its own arguments footprint.
+"""
+
 class db(netsvc.ExportService):
     def __init__(self, name="db"):
         netsvc.ExportService.__init__(self, name)
diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py
index 859845de8f8..2e098169bae 100644
--- a/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@ -24,8 +24,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ###############################################################################
 
+#.apidoc title: HTTP Layer library (websrv_lib)
+
 """ Framework for generic http servers
 
+    This library contains *no* OpenERP-specific functionality. It should be
+    usable in other projects, too.
 """
 
 import socket
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index b35769fc8e6..18f40e0011f 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -45,7 +45,7 @@ class MyOption (optparse.Option, object):
         self.my_default = attrs.pop('my_default', None)
         super(MyOption, self).__init__(*opts, **attrs)
 
-#.apidoc title: Server Configuration
+#.apidoc title: Server Configuration Loader
 
 def check_ssl():
     try:

From 025c77b6a20eef7a2847223ce29c186134813008 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:04:57 +0300
Subject: [PATCH 35/56] API docs: docstring for report/printscreen/ps_form.py

bzr revid: xrg@linux.gr-20110623090457-m9tjszds4jg8m010
---
 openerp/report/printscreen/ps_form.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/report/printscreen/ps_form.py b/openerp/report/printscreen/ps_form.py
index d997f1eb038..3afe9d5f401 100644
--- a/openerp/report/printscreen/ps_form.py
+++ b/openerp/report/printscreen/ps_form.py
@@ -28,6 +28,8 @@ from lxml import etree
 
 import time, os
 
+#.apidoc title: Printscreen for Form Views
+
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)

From 121b9ce97c790d7e7f1dfa7d581957c7a731662c Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@openerp.com>
Date: Thu, 23 Jun 2011 12:05:34 +0300
Subject: [PATCH 36/56] apidoc: exclude the old/broken/nasty b-q-i module

It is still lurking inside addons, waiting to screw your database!

bzr revid: xrg@linux.gr-20110623090534-ebfk79ki7c90yfno
---
 bin/.apidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/.apidoc b/bin/.apidoc
index e4441c5240d..9109e4388fe 100644
--- a/bin/.apidoc
+++ b/bin/.apidoc
@@ -1 +1 @@
-excludes: pychart release openerp-server test run_tests
\ No newline at end of file
+excludes: pychart release openerp-server test run_tests addons/base_quality_interrogation
\ No newline at end of file

From bec65af2681dd4bdb021af20610e38d919ed7269 Mon Sep 17 00:00:00 2001
From: "P. Christeas" <xrg@linux.gr>
Date: Thu, 23 Jun 2011 12:08:07 +0300
Subject: [PATCH 37/56] API doc: move settings file from bin/ to openerp/

bzr revid: xrg@linux.gr-20110623090807-0nqxrlsr3re8v8on
---
 {bin => openerp}/.apidoc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {bin => openerp}/.apidoc (100%)

diff --git a/bin/.apidoc b/openerp/.apidoc
similarity index 100%
rename from bin/.apidoc
rename to openerp/.apidoc

From 8beaaedd0a59e601836a0757637148f6a80058a3 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 23 Jun 2011 12:10:30 +0200
Subject: [PATCH 38/56] [IMP] fields_view_get: began to handle states attr
 server-side.

bzr revid: vmt@openerp.com-20110623101030-95t095jp5evdb1c3
---
 openerp/osv/orm.py | 92 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 81 insertions(+), 11 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 6238b77921c..70dc221dafb 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -48,6 +48,7 @@ import re
 import time
 import traceback
 import types
+import simplejson
 
 import openerp.netsvc as netsvc
 from lxml import etree
@@ -71,6 +72,76 @@ module_class_list = {}
 # Super-user identifier (aka Administrator aka root)
 ROOT_USER_ID = 1
 
+def transfer_field_to_modifiers(field, modifiers):
+    for a in ('invisible', 'readonly', 'required'):
+        if field.get(a):
+            modifiers[a] = field.get(a)
+
+
+# Don't deal with groups, it is done by check_group().
+def transfer_node_to_modifiers(node, modifiers):
+    if node.get('attrs'):
+        modifiers.update(eval(node.get('attrs')))
+
+    if node.get('states'):
+        # TODO combine with AND or OR, use implicit AND for now.
+        modifiers.setdefault('invisible', [])\
+            .append(('state', 'not in', node.get('states').split(',')))
+
+    for a in ('invisible', 'readonly', 'required'):
+        if node.get(a):
+            try:
+                # TODO only simple expression as it is evaluated server-side
+                modifiers[a] = bool(eval(node.get(a)))
+            except:
+                print ">>> Can't seem to eval this thing:", node.get(a)
+
+def simplify_modifiers(modifiers):
+    for a in ('invisible', 'readonly', 'required'):
+        if a in modifiers and not modifiers[a]:
+            del modifiers[a]
+
+
+def transfer_modifiers_to_node(modifiers, node):
+    if modifiers:
+        simplify_modifiers(modifiers)
+        node.set('modifiers', simplejson.dumps(modifiers))
+
+
+def test_modifiers(what, expected):
+    modifiers = {}
+    if isinstance(what, basestring):
+        node = etree.fromstring(what)
+        transfer_node_to_modifiers(node, modifiers)
+        simplify_modifiers(modifiers)
+        json = simplejson.dumps(modifiers)
+        assert json == expected, "%s != %s" % (json, expected)
+    elif isinstance(what, dict):
+        transfer_field_to_modifiers(what, modifiers)
+        simplify_modifiers(modifiers)
+        json = simplejson.dumps(modifiers)
+        assert json == expected, "%s != %s" % (json, expected)
+
+
+def tests():
+    test_modifiers('<field name="a"/>', '{}')
+    test_modifiers('<field name="a" invisible="1"/>', '{"invisible": true}')
+    test_modifiers('<field name="a" readonly="1"/>', '{"readonly": true}')
+    test_modifiers('<field name="a" required="1"/>', '{"required": true}')
+    test_modifiers('<field name="a" invisible="0"/>', '{}')
+    test_modifiers('<field name="a" readonly="0"/>', '{}')
+    test_modifiers('<field name="a" required="0"/>', '{}')
+    test_modifiers('<field name="a" invisible="1" required="1"/>', '{"invisible": true, "required": true}') # TODO order is not guaranteed
+    test_modifiers('<field name="a" invisible="1" required="0"/>', '{"invisible": true}')
+    test_modifiers('<field name="a" invisible="0" required="1"/>', '{"required": true}')
+    test_modifiers("""<field name="a" attrs="{'invisible': [('b', '=', 'c')]}"/>""", '{"invisible": [["b", "=", "c"]]}')
+
+    # The dictionary is supposed to be the result of fields_get().
+    test_modifiers({}, '{}')
+    test_modifiers({"invisible": True}, '{"invisible": true}')
+    test_modifiers({"invisible": False}, '{}')
+    
+
 def check_object_name(name):
     """ Check if the given name is a valid openerp object name.
 
@@ -1343,8 +1414,6 @@ class orm_template(object):
         children = True
 
         modifiers = {}
-        if node.get('attrs'):
-            modifiers = eval(node.get('attrs')) # get the attrs before they are (possibly) deleted by check_group below
 
         def encode(s):
             if isinstance(s, unicode):
@@ -1359,7 +1428,7 @@ class orm_template(object):
                 can_see = any(access_pool.check_groups(cr, user, group) for group in groups)
                 if not can_see:
                     node.set('invisible', '1')
-                    modifiers.setdefault('invisible', '1')
+                    modifiers['invisible'] = True
                     if 'attrs' in node.attrib:
                         del(node.attrib['attrs']) #avoid making field visible later
                 del(node.attrib['groups'])
@@ -1432,13 +1501,9 @@ class orm_template(object):
                 fields[node.get('name')] = attrs
 
                 # TODO a true fields_get is unnecessary (no need for the translation)
+                # TODO do this in _view_look_dom_arch instead of here
                 field = self.fields_get(cr, user, [node.get('name')], context)[node.get('name')]
-                for a in ('invisible', 'readonly', 'required'):
-                    if field.get(a):
-                        modifiers[a] = field.get(a)
-                    # The view architeture overrides the python model.
-                    if node.get(a):
-                        modifiers[a] = node.get(a)
+                transfer_field_to_modifiers(field, modifiers)
 
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)
@@ -1452,6 +1517,12 @@ class orm_template(object):
 
         check_group(node)
 
+        # The view architeture overrides the python model.
+        # Get the attrs before they are (possibly) deleted by check_group below
+        transfer_node_to_modifiers(node, modifiers)
+
+        # TODO remove attrs couterpart in modifiers when invisible is true ?
+
         # translate view
         if 'lang' in context:
             if node.get('string') and not result:
@@ -1479,8 +1550,7 @@ class orm_template(object):
             if children or (node.tag == 'field' and f.tag in ('filter','separator')):
                 fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
-        if modifiers:
-            node.set('modifiers', str(modifiers))
+        transfer_modifiers_to_node(modifiers, node)
         return fields
 
     def _disable_workflow_buttons(self, cr, user, node):

From da785dae559dde0cf77d97237c51f12b5479d636 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 28 Jun 2011 11:09:40 +0530
Subject: [PATCH 39/56] [FIX] 1) project - imporved the gantt view of the Task
 2) project_long_term:refectored phase scheduling procress

bzr revid: jam@tinyerp.com-20110628053940-fg62i9foq6ph1adz
---
 addons/project/project_view.xml               |  2 +-
 addons/project_long_term/project_long_term.py | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5faa0090a15..0f53aff7ed4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -369,7 +369,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Tasks">
+                <gantt color="user_id" date_start="date_start" date_stop="date_end" string="Tasks">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 779c7f6d062..9925c59bee4 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -725,11 +725,22 @@ class project_task(osv.osv):
         'user_id' : False
     }
 
+    def _get_child_duration(self, cr, uid, tasks, duration, context=None):
+        #DFS : visit all child
+        for task in tasks:
+            if task.child_ids:
+                duration = self._get_child_duration(cr, uid, task.child_ids, duration, context)
+            duration += task.planned_hours
+        return duration
+
     def generate_task(self, cr, uid, task_id, parent=False, flag=False, context=None):
         if context is None:
             context = {}
         task = self.browse(cr, uid, task_id, context=context)
-        duration = str(task.planned_hours )+ 'H'
+        duration = task.planned_hours
+        if task.child_ids:
+            duration = self._get_child_duration(cr, uid, task.child_ids, duration, context)
+        duration = str(duration)+ 'H'
         str_resource = False
         parent = task.parent_ids
         if task.phase_id.resource_ids:
@@ -745,7 +756,7 @@ class project_task(osv.osv):
 '''%(task.id, task.name, duration, str_resource)
             if parent:
                 s +='''
-            start = up.Task_%s.end
+            start = up.Task_%s.start
 '''%(parent[0].id)
         else:
             s = '''
@@ -756,7 +767,7 @@ class project_task(osv.osv):
 '''%(task.id, task.name, duration, str_resource)
             if parent:
                 s +='''
-        start = up.Task_%s.end
+        start = up.Task_%s.start
 '''%(parent[0].id)
         s += '\n'
         return s

From b8cc3b0d47c90d2393f065e73f301b9f2157bed4 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Tue, 28 Jun 2011 16:27:53 +0200
Subject: [PATCH 40/56] [REF]: fields_view_get: continuing the merge of attrs:
 - pass a flag to __view_look_dom indicating if we are in a tree view (this is
 needed as it can contain more complex expression, and its meaning is
 different as it affects the tree column, instead of a single field on a
 line). - pass the result of fields_get to __view_look_dom to let it augment
 the nodes with info from the python fields.

bzr revid: vmt@openerp.com-20110628142753-7819z5sp39qxfxev
---
 openerp/osv/orm.py | 49 +++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 70dc221dafb..cc6ca0f603c 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -79,7 +79,9 @@ def transfer_field_to_modifiers(field, modifiers):
 
 
 # Don't deal with groups, it is done by check_group().
-def transfer_node_to_modifiers(node, modifiers):
+# Need the context to evaluate the invisible attribute on tree views.
+# For non-tree views, the context shouldn't be given.
+def transfer_node_to_modifiers(node, modifiers, context=None):
     if node.get('attrs'):
         modifiers.update(eval(node.get('attrs')))
 
@@ -90,11 +92,19 @@ def transfer_node_to_modifiers(node, modifiers):
 
     for a in ('invisible', 'readonly', 'required'):
         if node.get(a):
-            try:
-                # TODO only simple expression as it is evaluated server-side
-                modifiers[a] = bool(eval(node.get(a)))
-            except:
-                print ">>> Can't seem to eval this thing:", node.get(a)
+            if a == 'invisible' and context is not None:
+                # Invisible in a tree view has a specific meaning, make it a
+                # new key in the modifiers attribute.
+                try:
+                    modifiers['tree_invisible'] = bool(eval(node.get(a), {'context': context}))
+                except:
+                    print ">>> Can't seem to eval this thing (1):", node.get(a)
+            else:
+                try:
+                    # Only simple expression as it is evaluated server-side
+                    modifiers[a] = bool(eval(node.get(a)))
+                except:
+                    print ">>> Can't seem to eval this thing (2):", node.get(a)
 
 def simplify_modifiers(modifiers):
     for a in ('invisible', 'readonly', 'required'):
@@ -1395,7 +1405,7 @@ class orm_template(object):
     def view_header_get(self, cr, user, view_id=None, view_type='form', context=None):
         return False
 
-    def __view_look_dom(self, cr, user, node, view_id, context=None):
+    def __view_look_dom(self, cr, user, node, view_id, in_tree_view, model_fields, context=None):
         """ Return the description of the fields in the node.
 
         In a normal call to this method, node is a complete view architecture
@@ -1500,15 +1510,15 @@ class orm_template(object):
                             attrs['selection'].append((False, ''))
                 fields[node.get('name')] = attrs
 
-                # TODO a true fields_get is unnecessary (no need for the translation)
-                # TODO do this in _view_look_dom_arch instead of here
-                field = self.fields_get(cr, user, [node.get('name')], context)[node.get('name')]
+                field = model_fields[node.get('name')]
                 transfer_field_to_modifiers(field, modifiers)
 
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)
             if result:
                 node.set('string', result)
+            if node.tag == 'tree':
+                in_tree_view = True
 
         elif node.tag == 'calendar':
             for additional_field in ('date_start', 'date_delay', 'date_stop', 'color'):
@@ -1519,7 +1529,7 @@ class orm_template(object):
 
         # The view architeture overrides the python model.
         # Get the attrs before they are (possibly) deleted by check_group below
-        transfer_node_to_modifiers(node, modifiers)
+        transfer_node_to_modifiers(node, modifiers, context if in_tree_view else None)
 
         # TODO remove attrs couterpart in modifiers when invisible is true ?
 
@@ -1548,7 +1558,7 @@ class orm_template(object):
 
         for f in node:
             if children or (node.tag == 'field' and f.tag in ('filter','separator')):
-                fields.update(self.__view_look_dom(cr, user, f, view_id, context))
+                fields.update(self.__view_look_dom(cr, user, f, view_id, in_tree_view, model_fields, context))
 
         transfer_modifiers_to_node(modifiers, node)
         return fields
@@ -1589,19 +1599,22 @@ class orm_template(object):
             string and fields is the description of all the fields.
 
         """
-        fields_def = self.__view_look_dom(cr, user, node, view_id, context=context)
-        node = self._disable_workflow_buttons(cr, user, node)
-        arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
         fields = {}
         if node.tag == 'diagram':
             if node.getchildren()[0].tag == 'node':
-                node_fields = self.pool.get(node.getchildren()[0].get('object')).fields_get(cr, user, fields_def.keys(), context)
+                node_fields = self.pool.get(node.getchildren()[0].get('object')).fields_get(cr, user, None, context)
                 fields.update(node_fields)
             if node.getchildren()[1].tag == 'arrow':
-                arrow_fields = self.pool.get(node.getchildren()[1].get('object')).fields_get(cr, user, fields_def.keys(), context)
+                arrow_fields = self.pool.get(node.getchildren()[1].get('object')).fields_get(cr, user, None, context)
                 fields.update(arrow_fields)
         else:
-            fields = self.fields_get(cr, user, fields_def.keys(), context)
+            fields = self.fields_get(cr, user, None, context)
+        fields_def = self.__view_look_dom(cr, user, node, view_id, False, fields, context=context)
+        node = self._disable_workflow_buttons(cr, user, node)
+        arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
+        for k in fields.keys():
+            if k not in fields_def:
+                del fields[k]
         for field in fields_def:
             if field == 'id':
                 # sometime, the view may contain the (invisible) field 'id' needed for a domain (when 2 objects have cross references)

From ffe4df20d4f4097a52b49c5aa310dc707cd7cee8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 30 Jun 2011 14:11:24 +0530
Subject: [PATCH 41/56] [IMP]Improve code : save the host name value to avoid
 writing each time.

bzr revid: dbr@tinyerp.com-20110630084124-gd84vzblzarth5lg
---
 addons/caldav/wizard/caldav_browse.py       | 10 ++++++++++
 addons/caldav/wizard/caldav_browse_view.xml |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index d1f58592de7..a345c9a95bf 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -237,12 +237,22 @@ class user_preference(osv.osv_memory):
         collection_obj = self.pool.get('document.directory')
         ids = collection_obj.search(cr, uid, [('name', '=', 'c')])
         return ids[0]
+    
+    def _get_default_host(self, cr, uid, context):
+        ids=self.search(cr,uid,[])
+        host_name = ''
+        if ids:
+            ids = len(ids)> 1 and len(ids)-1 or ids[0] # Use len(ids)-1 for taking the value of last id 
+            host_obj = self.browse(cr, uid,[ids],context=context)[0]
+            host_name = host_obj.host_name
+        return host_name
 
     _defaults={
               'service': 'webdav',
               'collection' : _get_default_collection,
               'calendar' : _get_default_calendar,
               'device' : 'other',
+              'host_name':_get_default_host
 
     }
 
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 18a0a61baec..565e3a44407 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -28,11 +28,12 @@
            <field name="model">user.preference</field>
            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Host name configuration for caldev synchronization">
-                    <separator string="Hostname example : " colspan="4"/>
+               <form string="Caldav's host name configuration">
+                	<label string="Configure your openerp hostname. For example : " colspan="4"></label>
                     <newline/>
                     <label string="database.my.openerp.com  or companyserver.com" colspan="4"/>
                     <newline/>
+                    <separator colspan="4"/>
                     <field name="host_name"  colspan="4" width="250" />
                     <separator colspan="4"/>
                     <group col="4" colspan="4">

From c7b27ed02784e39ac3617dc4b95680478905a706 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 30 Jun 2011 14:31:52 +0530
Subject: [PATCH 42/56] [IMP] Improve the code

bzr revid: dbr@tinyerp.com-20110630090152-rgfh2y8wvs6l8omj
---
 addons/caldav/wizard/caldav_browse.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
index a345c9a95bf..f6ecc5dccd5 100644
--- a/addons/caldav/wizard/caldav_browse.py
+++ b/addons/caldav/wizard/caldav_browse.py
@@ -243,8 +243,7 @@ class user_preference(osv.osv_memory):
         host_name = ''
         if ids:
             ids = len(ids)> 1 and len(ids)-1 or ids[0] # Use len(ids)-1 for taking the value of last id 
-            host_obj = self.browse(cr, uid,[ids],context=context)[0]
-            host_name = host_obj.host_name
+            host_name = self.browse(cr, uid,[ids],context=context)[0].host_name
         return host_name
 
     _defaults={

From 987b8f1e9fdc223e516d7337dfae530d8908486d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 30 Jun 2011 11:59:31 +0200
Subject: [PATCH 43/56] [FIX] Need time & datetime modules for evaluation

bzr revid: fme@openerp.com-20110630095931-nysrcqz8666gafgb
---
 addons/base/static/src/js/list.js | 2 ++
 openerpweb/nonliterals.py         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 62bedf8784d..dab8eef596d 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -427,6 +427,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
 
         if (_.isEmpty(records)) {
             records = this.groups.get_records();
+            if (records.constructor != Array) debugger
         }
 
         var count = 0, sums = {};
@@ -934,6 +935,7 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
     },
     get_records: function () {
         if (_(this.children).isEmpty()) {
+            alert("HERE")
             return {
                 count: this.datagroup.length,
                 values: this.datagroup.aggregates
diff --git a/openerpweb/nonliterals.py b/openerpweb/nonliterals.py
index a99e2215a00..1465123eba8 100644
--- a/openerpweb/nonliterals.py
+++ b/openerpweb/nonliterals.py
@@ -7,6 +7,8 @@ can't be sent there themselves).
 import binascii
 import hashlib
 import simplejson.encoder
+import time
+import datetime
 
 __all__ = ['Domain', 'Context', 'NonLiteralEncoder, non_literal_decoder', 'CompoundDomain', 'CompoundContext']
 

From 8fec9dab1183705ba7ccd2fa69446c7898f1577d Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Thu, 30 Jun 2011 17:17:31 +0530
Subject: [PATCH 44/56] [FIX] project_long_term - scheduling task based on
 child task paretn shoud be at last

bzr revid: jam@tinyerp.com-20110630114731-usnnqe2y834chwb0
---
 addons/project_long_term/project_long_term.py | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 9925c59bee4..a6437819248 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -23,6 +23,7 @@ from datetime import datetime
 from tools.translate import _
 from osv import fields, osv
 from resource.faces import task as Task 
+from operator import itemgetter
 
 class project_phase(osv.osv):
     _name = "project.phase"
@@ -725,22 +726,11 @@ class project_task(osv.osv):
         'user_id' : False
     }
 
-    def _get_child_duration(self, cr, uid, tasks, duration, context=None):
-        #DFS : visit all child
-        for task in tasks:
-            if task.child_ids:
-                duration = self._get_child_duration(cr, uid, task.child_ids, duration, context)
-            duration += task.planned_hours
-        return duration
-
     def generate_task(self, cr, uid, task_id, parent=False, flag=False, context=None):
         if context is None:
             context = {}
         task = self.browse(cr, uid, task_id, context=context)
-        duration = task.planned_hours
-        if task.child_ids:
-            duration = self._get_child_duration(cr, uid, task.child_ids, duration, context)
-        duration = str(duration)+ 'H'
+        duration = str(task.planned_hours)+ 'H'
         str_resource = False
         parent = task.parent_ids
         if task.phase_id.resource_ids:
@@ -754,10 +744,12 @@ class project_task(osv.osv):
             effort = \'%s\'
             resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            if parent:
+            if task.child_ids:
+                seq = [[child.planned_hours, child.id] for child in task.child_ids]
+                seq.sort(key=itemgetter(0))
                 s +='''
-            start = up.Task_%s.start
-'''%(parent[0].id)
+            start = up.Task_%s.end
+    '''%(seq[-1][1])
         else:
             s = '''
     def Task_%s():
@@ -765,10 +757,12 @@ class project_task(osv.osv):
         effort = \'%s\'
         resource = %s
 '''%(task.id, task.name, duration, str_resource)
-            if parent:
+            if task.child_ids:
+                seq = [[child.planned_hours, child.id] for child in task.child_ids]
+                seq.sort(key=itemgetter(0))
                 s +='''
-        start = up.Task_%s.start
-'''%(parent[0].id)
+        start = up.Task_%s.end
+'''%(seq[-1][1])
         s += '\n'
         return s
 project_task()

From 8845ae12597db1233fdf3997eb8bb4b38f22c35d Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 30 Jun 2011 17:33:34 +0200
Subject: [PATCH 45/56] [IMP]: fields_view_get: respect priority of node over
 fields, and of static invisible over dynamic invisible.

bzr revid: vmt@openerp.com-20110630153334-d34qep1727gdbh8l
---
 openerp/osv/orm.py | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index cc6ca0f603c..4c52a8730fb 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -75,36 +75,35 @@ ROOT_USER_ID = 1
 def transfer_field_to_modifiers(field, modifiers):
     for a in ('invisible', 'readonly', 'required'):
         if field.get(a):
-            modifiers[a] = field.get(a)
+            modifiers[a] = bool(field.get(a))
 
 
 # Don't deal with groups, it is done by check_group().
 # Need the context to evaluate the invisible attribute on tree views.
 # For non-tree views, the context shouldn't be given.
-def transfer_node_to_modifiers(node, modifiers, context=None):
+def transfer_node_to_modifiers(node, modifiers, context=None, in_tree_view=False):
     if node.get('attrs'):
         modifiers.update(eval(node.get('attrs')))
 
     if node.get('states'):
-        # TODO combine with AND or OR, use implicit AND for now.
-        modifiers.setdefault('invisible', [])\
-            .append(('state', 'not in', node.get('states').split(',')))
+        if 'invisible' in modifiers and isinstance(modifiers['invisible'], list):
+             # TODO combine with AND or OR, use implicit AND for now.
+             modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
+        else:
+             modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
 
     for a in ('invisible', 'readonly', 'required'):
         if node.get(a):
-            if a == 'invisible' and context is not None:
+            v = bool(eval(node.get(a), {'context': context or {}}))
+            if in_tree_view and a == 'invisible':
                 # Invisible in a tree view has a specific meaning, make it a
                 # new key in the modifiers attribute.
-                try:
-                    modifiers['tree_invisible'] = bool(eval(node.get(a), {'context': context}))
-                except:
-                    print ">>> Can't seem to eval this thing (1):", node.get(a)
-            else:
-                try:
-                    # Only simple expression as it is evaluated server-side
-                    modifiers[a] = bool(eval(node.get(a)))
-                except:
-                    print ">>> Can't seem to eval this thing (2):", node.get(a)
+                modifiers['tree_invisible'] = v
+            elif v or (a not in modifiers or not isinstance(modifiers[a], list)):
+                # Don't set the attribute to False if a dynamic value was
+                # provided (i.e. a domain from attrs or states).
+                modifiers[a] = v
+
 
 def simplify_modifiers(modifiers):
     for a in ('invisible', 'readonly', 'required'):
@@ -133,7 +132,10 @@ def test_modifiers(what, expected):
         assert json == expected, "%s != %s" % (json, expected)
 
 
-def tests():
+# To use this test:
+# import openerp
+# openerp.osv.orm.modifiers_tests()
+def modifiers_tests():
     test_modifiers('<field name="a"/>', '{}')
     test_modifiers('<field name="a" invisible="1"/>', '{"invisible": true}')
     test_modifiers('<field name="a" readonly="1"/>', '{"readonly": true}')
@@ -1517,8 +1519,7 @@ class orm_template(object):
             result = self.view_header_get(cr, user, False, node.tag, context)
             if result:
                 node.set('string', result)
-            if node.tag == 'tree':
-                in_tree_view = True
+            in_tree_view = node.tag == 'tree'
 
         elif node.tag == 'calendar':
             for additional_field in ('date_start', 'date_delay', 'date_stop', 'color'):
@@ -1529,7 +1530,7 @@ class orm_template(object):
 
         # The view architeture overrides the python model.
         # Get the attrs before they are (possibly) deleted by check_group below
-        transfer_node_to_modifiers(node, modifiers, context if in_tree_view else None)
+        transfer_node_to_modifiers(node, modifiers, context, in_tree_view)
 
         # TODO remove attrs couterpart in modifiers when invisible is true ?
 

From f1ea42e230a304ee6b8229cfc632eaf4aef3b038 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 1 Jul 2011 04:54:57 +0000
Subject: [PATCH 46/56] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110701045457-prq3cv67drfa19xt
---
 addons/anonymization/i18n/fi.po         |  227 +++++
 addons/marketing_campaign/i18n/zh_CN.po | 1054 +++++++++++++++++++++++
 addons/project_issue/i18n/zh_CN.po      |  972 +++++++++++++++++++++
 addons/project_long_term/i18n/zh_CN.po  |  599 +++++++++++++
 4 files changed, 2852 insertions(+)
 create mode 100644 addons/anonymization/i18n/fi.po
 create mode 100644 addons/marketing_campaign/i18n/zh_CN.po
 create mode 100644 addons/project_issue/i18n/zh_CN.po
 create mode 100644 addons/project_long_term/i18n/zh_CN.po

diff --git a/addons/anonymization/i18n/fi.po b/addons/anonymization/i18n/fi.po
new file mode 100644
index 00000000000..9526b2a0f71
--- /dev/null
+++ b/addons/anonymization/i18n/fi.po
@@ -0,0 +1,227 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-06-30 09:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Kentän nimi"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Kenttä"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Tuo"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr "Tietokannan anonymisointi moduuli"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "suunta"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Anonymisoidut kentät"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Tietokannan anonymisointi"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+"Sinulla ei voi olla kahta tietuetta joilla on sama malli ja sama kenttä"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonymisoitu"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "Tuntematon"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Tiedoston polku"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Päiväys"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Vie"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Poista tietokannan anonymisointi"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Tietokannan anonymisointi"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Anonymisoi tietokanta"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Kentät"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Tyhjennä"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "näkyvä -> anonymisoitu"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Epävakaa"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Poikkeus tapahtui"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Ei ole olemassa"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objektin nimi"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Anonymisoinnin historia"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonymisoi tietokanta"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Tiedostonimi"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anonymisoitu -> näkyvä"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Käynnistetty"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Viesti"
diff --git a/addons/marketing_campaign/i18n/zh_CN.po b/addons/marketing_campaign/i18n/zh_CN.po
new file mode 100644
index 00000000000..fead6d161a3
--- /dev/null
+++ b/addons/marketing_campaign/i18n/zh_CN.po
@@ -0,0 +1,1054 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-07-01 03:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "手工模式"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "前一个活动"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr "这步没有邮件或者报表。"
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr "前后活动必须属于同一个营销活动 "
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity (or "
+"any activity with a signal and no previous activity)"
+msgstr "营销活动无法开始：它没有开始的活动（或者标识为开始但没有前一个活动的活动）"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "时间"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr "自定义操作"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is missing in email "
+"activity '%s'"
+msgstr "营销活动无法开始：没有为邮件活动'%s'设置邮箱帐号"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+"   - activity: the campaign activity\n"
+"   - workitem: the campaign workitem\n"
+"   - resource: the resource object this campaign item represents\n"
+"   - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Year"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:772
+#, python-format
+msgid "No preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Sorry, campaign duplication is not supported at the moment."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+"   - Email: send an email using a predefined email template\n"
+"   - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+"   - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+"  "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "This Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"         The campaigns are dynamic and multi-channels. The process is as "
+"follows:\n"
+"          * Design marketing campaigns like workflows, including email "
+"templates to send, reports to print and send by email, custom actions, etc.\n"
+"          * Define input segments that will select the items that should "
+"enter the campaign (e.g leads from certain countries, etc.)\n"
+"          * Run you campaign in simulation mode to test it real-time or "
+"accelerated, and fine-tune it\n"
+"          * You may also start the real campaign in manual mode, where each "
+"action requires manual validation\n"
+"          * Finally launch your campaign live, and watch the statistics as "
+"the campaign does everything fully automatically. \n"
+"          While the campaign runs you can of course continue to fine-tune "
+"the parameters, input segments, workflow, etc.\n"
+"          \n"
+"          Note: If you need demo data, you can install the "
+"marketing_campaign_crm_demo module, but this will also install the CRM "
+"application as it depends on CRM Leads.\n"
+"    "
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#, python-format
+msgid ""
+"The campaign cannot be started: the email account is not approved in email "
+"activity '%s'"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:488
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
+msgid "marketing_campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:490
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:209
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:154
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are done"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:489
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:746
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
new file mode 100644
index 00000000000..1c41a92d2f9
--- /dev/null
+++ b/addons/project_issue/i18n/zh_CN.po
@@ -0,0 +1,972 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-30 11:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "距开始处理"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr "据开始处理小时数"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "错误！项目的开始日期必须小于项目的结束日期"
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr "已开启"
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr "距开始日期天数"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr "三月"
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr "进度（％）"
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr "关注者的电子邮件"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Close Working hours"
+msgstr "距处理结束小时数"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr "project.issue.version"
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr "距开始日期"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+"不能升级此缺陷。\n"
+"所属项目没有配置相关项目。"
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "不能升级到相同的项目"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Date Closed"
+msgstr "结束日期"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr "天"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Add Internal Note"
+msgstr "添加内部备注"
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr "任务"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By Stage"
+msgstr "按状态查看缺陷"
+
+#. module: project_issue
+#: field:project.issue,partner_mobile:0
+msgid "Mobile"
+msgstr "手机"
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr "项目"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
+msgid "My Open Project issues"
+msgstr "我的未处理缺陷"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:360
+#, python-format
+msgid "Warning !"
+msgstr "警告！"
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr "结束日期"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr "缺陷列表"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr "距开始日期小时数"
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr "下一动作"
+
+#. module: project_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr "如果当前项目的缺陷被提升，则这个缺陷会归属于这里输入的项目"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr "附加信息"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr "缺陷报表用于分析你的支持或售后服务的数量。报表自动分页。可以分析开始处理或关闭一个缺陷需要的时间，邮件的数量和处理缺陷的平均时间。"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:473
+#, python-format
+msgid " (copy)"
+msgstr " (copy)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Previous"
+msgstr "上一个"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr "统计信息"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Convert To Task"
+msgstr "转为任务"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr "缺陷分析"
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr "版本号"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Next"
+msgstr "下一个"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Send New Email"
+msgstr "发送新电子邮件"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr "版本"
+
+#. module: project_issue
+#: model:ir.module.module,shortdesc:project_issue.module_meta_information
+msgid "Issue Management in Project Management"
+msgstr "项目管理中的缺陷管理"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Pending Issues"
+msgstr "暂停的缺陷"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Open Working Hours"
+msgstr "距开始处理小时数"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr "缺陷类别"
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr "电子邮件"
+
+#. module: project_issue
+#: field:project.issue,canal_id:0
+#: field:project.issue.report,canal_id:0
+msgid "Channel"
+msgstr "渠道"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr "版本"
+
+#. module: project_issue
+#: field:project.issue,partner_phone:0
+msgid "Phone"
+msgstr "电话"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reset to Draft"
+msgstr "重置为草稿"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Today"
+msgstr "今天"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.open_board_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
+msgid "Project Issue Dashboard"
+msgstr "缺陷控制台"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr "已完成"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr "七月"
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr "类别"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,type_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History Information"
+msgstr "历史信息"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
+#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
+msgid "Project issues"
+msgstr "缺陷"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication & History"
+msgstr "沟通&日志"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "My Open Project Issue"
+msgstr "我未处理的缺陷"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr "我的缺陷清单"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Contact"
+msgstr "联系方式"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Board"
+msgstr "我的控制台"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr "我的缺陷清单"
+
+#. module: project_issue
+#: help:project.issue,canal_id:0
+msgid ""
+"The channels represent the different communication modes available with the "
+"customer. With each commercial opportunity, you can indicate the canall "
+"which is this opportunity source."
+msgstr "渠道是不同的接触客户的方式。每个商机都要指定来源的渠道。"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"You can use the issues tracker in OpenERP to handle bugs in the software "
+"development project, to handle claims in after-sales services, etc. Define "
+"here the different versions of your products on which you can work on issues."
+msgstr "可以用缺陷跟踪来管理软件开发中的Bug或售后的产品缺陷等。这里输入您管理缺陷的产品的不同版本。"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:283
+#, python-format
+msgid "Tasks"
+msgstr "任务"
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr "缺陷编号"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr "九月"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr "十二月"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr "缺陷列表"
+
+#. module: project_issue
+#: help:project.issue,assigned_to:0
+msgid "This is the current user to whom the related task have been assigned"
+msgstr "这是这个任务现在的负责人"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr "project.issue.report"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:362
+#: view:project.issue:0
+#, python-format
+msgid "Escalate"
+msgstr "提升"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr "功能请求"
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid ""
+"\n"
+"        This module provide Issues/Bugs Management in Project\n"
+"    "
+msgstr ""
+"\n"
+"        这个模块在项目管理中增加了缺陷管理\n"
+"    "
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,categ_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,categ_id:0
+msgid "Category"
+msgstr "类别"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr "缺陷编号"
+
+#. module: project_issue
+#: help:project.issue,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "这些邮箱地址将添加到所有接收的发送邮件的抄送字段，用逗号分隔多个邮件地址。"
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr "最低"
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr "已结束"
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr "平均耗用天数"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr "等待中"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Status"
+msgstr "状态"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr "缺陷编号"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Current Issues"
+msgstr "当前缺陷"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr "八月"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr "一般"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Global CC"
+msgstr "完整抄送"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "To Do"
+msgstr "待办"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr "六月"
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr "剩余天数"
+
+#. module: project_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr "十一月"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Extended Filters..."
+msgstr "增加筛选条件"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr "搜索"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr "十月"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr "一月"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr "缺陷列表"
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "Issues By State"
+msgstr "按状态列出缺陷"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: project_issue
+#: field:project.issue,partner_address_id:0
+msgid "Partner Contact"
+msgstr "业务伙伴联系人"
+
+#. module: project_issue
+#: field:project.issue,type_id:0
+msgid "Resolution"
+msgstr "解决方案"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "History"
+msgstr "历史记录"
+
+#. module: project_issue
+#: field:project.issue,assigned_to:0
+#: view:project.issue.report:0
+#: field:project.issue.report,assigned_to:0
+msgid "Assigned to"
+msgstr "指派到"
+
+#. module: project_issue
+#: field:project.project,reply_to:0
+msgid "Reply-To Email Address"
+msgstr "回复给邮件地址"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Form"
+msgstr "缺陷"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: view:project.issue.report:0
+#: field:project.issue.report,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "General"
+msgstr "一般"
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr "缺陷版本"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Communication"
+msgstr "沟通"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr "取消(&C)"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Close"
+msgstr "结束"
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr "待办"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+msgid "Issues"
+msgstr "缺陷"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state
+#: model:ir.model,name:project_issue.model_project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr "缺陷"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr "计算方式：花费时间 / 总时间"
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"Issues such as system bugs, customer complaints, and material breakdowns are "
+"collected here. You can define the stages assigned when solving the project "
+"issue (analysis, development, done). With the mailgateway module, issues can "
+"be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+"缺陷（如系统故障、客户投诉、材料破损）在这里搜集。可以输入缺陷处理的阶段（分析原因、正在处理、已完成）。安装了mailgateway模块后，缺陷管理可以与"
+"特定邮件集成（如：support@mycompany.com）"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Details"
+msgstr "详细信息"
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr "这些人将收到电子邮件。"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Reply"
+msgstr "回复"
+
+#. module: project_issue
+#: field:project.issue,name:0
+msgid "Issue"
+msgstr "缺陷"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr "缺陷列表"
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,description:0
+msgid "Description"
+msgstr "描述"
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr "五月"
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Sale Team    "
+msgstr "销售团队    "
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr "电子邮件"
+
+#. module: project_issue
+#: field:project.issue,partner_name:0
+msgid "Employee's Name"
+msgstr "员工姓名"
+
+#. module: project_issue
+#: help:project.issue,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"当一个业务创建时状态设为'草稿'\n"
+"如果业务正在处理状态设为'开启'\n"
+"当业务结束状态设为'完成'\n"
+"如果业务需要审查状态设为'待定'"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr "二月"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:61
+#, python-format
+msgid "Issue '%s' has been opened."
+msgstr "缺陷 ‘%s' 已新建"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr "功能描述"
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr "提升"
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr "这个业务所属的销售团队。输入团队负责人和邮箱。"
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:76
+#, python-format
+msgid "Issue '%s' has been closed."
+msgstr "缺陷 '%s' 已处理"
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr "四月"
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr "参考资料"
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr "剩余工时"
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:377
+#, python-format
+msgid "No Title"
+msgstr "无标题"
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr "剩余天数"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr "销售团队"
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr "平均剩余工时"
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr "最近动作"
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr "时长"
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Open Issues by Creation Date"
+msgstr "未处理的缺陷（按创建日期）"
+
+#~ msgid "Maintenance"
+#~ msgstr "维护"
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
new file mode 100644
index 00000000000..65ebffc73c9
--- /dev/null
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -0,0 +1,599 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-06-30 06:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n"
+"X-Generator: Launchpad (build 13168)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "长期项目管理"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "项目周期计算"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "下一阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "项目任务"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "错误！项目的开始日期必须小于项目的结束日期"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "资源分配"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr "显示设置"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "日程"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "错误！不能创建循环引用的任务"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "资源分配"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "不能升级到相同的项目"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:128
+#, python-format
+msgid "Day"
+msgstr "天"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "任务"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "计算单个项目"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "上一阶段"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "某个周期的计量单位"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+" It's computed by the scheduler according to the start date and the duration."
+msgstr " 这个日期是由开始日期和计划日数根据日历计算出来的。"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "项目"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Error!"
+msgstr "错误！"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "结束日期"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "计划"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "计算阶段日程"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:190
+#, python-format
+msgid " (copy)"
+msgstr " (copy)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "可用"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "计算（_O）"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr "针对所有或特定的一个项目计算阶段周期"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "时间段计量单位"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+msgid "Compute Task Scheduling"
+msgstr "计算项目日程"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "最早开始时间"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "项目资源分配"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "计算任务日程"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "资源"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+"某个或所有项目的阶段日程。会显示一个甘特图。\n"
+"\t           "
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "开始日期"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "相关任务"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr "这个资源在此项目阶段的可用性，用百分数表示"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "强制项目在此日期之后开始"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "项目任务列表"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "项目资源"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "确定(_O)"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr "日程和显示信息"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed by the scheduler according the project date or the end date of "
+"the previous phase."
+msgstr "这个日期根据项目的开始日期或前一个阶段的结束日期结算而来"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "月份"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "阶段的开始日期必须早于项目的结束日期"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr "project.schedule.tasks"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next phases, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on the project."
+msgstr ""
+"项目能分成不同的阶段。可以为每个阶段分配资源，定义不同的任务并可以把各个阶段连起来，按日历自动计算计划日期。使用长期计划可以在项目的开始阶段管理人员可用性"
+"、划分每阶段的任务。"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "开始日期"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "资源分配"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "强制该阶段在此日期前完成"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "等待中"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "未知的"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "用户"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "任务细节"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "从时间表的工作时间来调整甘特图报表"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "计算任务计划"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "限制"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "输入序号用于阶段列表排序"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "项目阶段"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "已完成"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "取消(&C)"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "进行中"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "剩余小时数"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "工作的时间"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "阶段开始"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr "请输入要排计划的项目"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "总小时数"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "任务日程排列完毕"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "为某个特定的项目计算日程"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "阶段"
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+"新建的阶段状态是草稿\n"
+"开始后的阶段状态是正在进行中\n"
+"如果需要复核则状态为等待中\n"
+"已结束的阶段状态是完成"
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "结束日期"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "资源"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr "任务详情"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "资源明细"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
+msgstr "调度"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "项目阶段"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "计算项目阶段"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "消息"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "阶段间不能递归引用"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "序号"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "计算所有项目"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "成员请假"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "任务日程"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "默认按天"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "时长"

From a533d962364af82b99dd45b0cd878e2ca2b0eec8 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Fri, 1 Jul 2011 15:15:10 +0530
Subject: [PATCH 47/56] [ADD] hr : converted ids in list of ids where _check
 method is called

lp bug: https://launchpad.net/bugs/798190 fixed

bzr revid: bde@tiny2-desktop-20110701094510-x6ysb65d71blszkd
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index ea2b5017790..4384a9e536f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -494,6 +494,8 @@ class hr_timesheet_line(osv.osv):
     ]
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         self._check(cr, uid, ids)
         return super(hr_timesheet_line,self).unlink(cr, uid, ids,*args, **kwargs)
 
@@ -619,12 +621,16 @@ class hr_attendance(osv.osv):
         return res
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         self._check(cr, uid, ids)
         return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs)
 
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         self._check(cr, uid, ids)
         res = super(hr_attendance,self).write(cr, uid, ids, vals, context=context)
         if 'sheet_id' in context:

From 3c4330da9c58b1ad521deb53ef1354c3f7709357 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 1 Jul 2011 12:13:49 +0200
Subject: [PATCH 48/56] [fix] forgot on_ui_change in m2m

bzr revid: nicolas.vanhoren@openerp.com-20110701101349-l1n2o0y59ucywm13
---
 addons/base/static/src/js/form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index abc2f6e2f72..59427255964 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1660,6 +1660,7 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
             _.each(element_ids, function(element_id) {
                 if(! _.detect(self.dataset.ids, function(x) {return x == element_id;})) {
                     self.dataset.set_ids([].concat(self.dataset.ids, [element_id]));
+                    self.m2m_field.on_ui_change();
                     self.reload_content();
                 }
             });

From 320601a54f33372ff3097781c72f64fac65e74c6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 1 Jul 2011 12:27:27 +0200
Subject: [PATCH 49/56] [imp] added context handling in m2m

bzr revid: nicolas.vanhoren@openerp.com-20110701102727-rxuv241pea5w9xhh
---
 addons/base/static/src/js/form.js | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 59427255964..88dbbe989f2 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1616,10 +1616,10 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
 
         var self = this;
 
-        this.dataset = new openerp.base.DataSetStatic(
+        this.dataset = new openerp.base.form.Many2ManyDataSet(
                 this.session, this.field.relation);
+        this.dataset.m2m = this;
         this.dataset.on_unlink.add_last(function(ids) {
-            //TODO niv: should check this for other cases
             self.on_ui_change();
         });
 
@@ -1647,6 +1647,18 @@ openerp.base.form.FieldMany2Many = openerp.base.form.Field.extend({
     },
     get_value: function() {
         return [commands.replace_with(this.dataset.ids)];
+    },
+    set_value_from_ui: function() {},
+    validate: function() {
+        this.invalid = false;
+        // TODO niv
+    }
+});
+
+openerp.base.form.Many2ManyDataSet = openerp.base.DataSetStatic.extend({
+    get_context: function() {
+        this.context = this.m2m.build_context();
+        return this.context;
     }
 });
 
@@ -1654,7 +1666,7 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
     do_add_record: function () {
         var pop = new openerp.base.form.SelectCreatePopup(
                 null, this.m2m_field.view.session);
-        pop.select_element(this.model);
+        pop.select_element(this.model, {}, this.m2m_field.build_domain(), this.m2m_field.build_context());
         var self = this;
         pop.on_select_elements.add(function(element_ids) {
             _.each(element_ids, function(element_id) {
@@ -1670,12 +1682,13 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({
     do_activate_record: function(index, id) {
         this.m2m_field.view.session.action_manager.do_action({
             "res_model": this.dataset.model,
-            "views":[[false,"form"]],
+            "views": [[false,"form"]],
             "res_id": id,
-            "type":"ir.actions.act_window",
-            "view_type":"form",
-            "view_mode":"form",
-            "target":"new"
+            "type": "ir.actions.act_window",
+            "view_type": "form",
+            "view_mode": "form",
+            "target": "new",
+            "context": this.m2m_field.build_context()
         });
     }
 });

From 723c39a30490b27d032f3df2489996e39a7be372 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 1 Jul 2011 12:29:18 +0200
Subject: [PATCH 50/56] [fix] removed team song ;(

bzr revid: nicolas.vanhoren@openerp.com-20110701102918-4l9ullsenqeg3zqr
---
 addons/base/static/src/css/base.css | 6 ------
 addons/base/static/src/xml/base.xml | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 2f11af26ed5..32a335d7eb8 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -1037,12 +1037,6 @@ background: linear-gradient(top, #ffffff 0%,#ebe9e9 100%); /* W3C */
     background: #828282;
     border-color: #828282;
 }
-.openerp .oe_necessary_team_song {
-    display: none;
-}
-.openerp.kitten-mode-activated .oe_necessary_team_song {
-    display: block;
-}
 
 .openerp .oe-m2o {
     padding-right: 16px;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index e6ab1858b6f..9bef00147d3 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -42,9 +42,6 @@
         <td colspan="2">
             <div id="oe_footer" class="oe_footer">
                 <p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">openerp.com</a>.</p>
-                <iframe class="oe_necessary_team_song" style="height:1;" height="1"
-                    src="http://www.youtube.com/embed/QH2-TGUlwu4?autoplay=1"
-                    frameborder="0"></iframe>
             </div>
         </td>
     </tr>

From a8e6836f3c501ff0bcee113b0944f757ed1f9ba9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 1 Jul 2011 13:59:12 +0200
Subject: [PATCH 51/56] [imp] refactoring related to the usage of
 dataset.context

bzr revid: nicolas.vanhoren@openerp.com-20110701115912-40hkax6c4s28quop
---
 addons/base/static/src/js/form.js        | 4 ++--
 addons/base/static/src/js/list.js        | 4 ++--
 addons/base/static/src/js/views.js       | 2 +-
 addons/base_gantt/static/src/js/gantt.js | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 88dbbe989f2..bfa62f102cc 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -43,7 +43,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
         if (this.embedded_view) {
             return $.Deferred().then(this.on_loaded).resolve({fields_view: this.embedded_view});
         } else {
-            var context = new openerp.base.CompoundContext(this.dataset.context);
+            var context = new openerp.base.CompoundContext(this.dataset.get_context());
             if (this.view_manager.action && this.view_manager.action.context) {
                 context.add(this.view_manager.action.context);
             }
@@ -394,7 +394,7 @@ openerp.base.FormView =  openerp.base.View.extend( /** @lends openerp.base.FormV
                 model: 'ir.attachment',
                 fields: ['name', 'url', 'type'],
                 domain: [['res_model', '=', this.dataset.model], ['res_id', '=', this.datarecord.id], ['type', 'in', ['binary', 'url']]],
-                context: this.dataset.context
+                context: this.dataset.get_context()
             }, this.on_attachments_loaded);*/
         }
     },
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 62bedf8784d..9c68e4f9b78 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -275,7 +275,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             return this.rpc('/base/listview/load', {
                 model: this.model,
                 view_id: this.view_id,
-                context: this.dataset.context,
+                context: this.dataset.get_context(),
                 toolbar: !!this.flags.sidebar
             }, callback);
         }
@@ -388,7 +388,7 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
         var self = this;
         _.extend(this.dataset, {
             domain: dataset.domain,
-            context: dataset.context
+            context: dataset.get_context()
         }).read_slice([], 0, false, function () {
             self.select_record(index);
         });
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index b32f8b88140..23cd43c0efd 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -467,7 +467,7 @@ openerp.base.View = openerp.base.Controller.extend({
                 result : { type: 'ir.actions.act_window_close', special: action_data.special }
             });
         } else {
-            var context = new openerp.base.CompoundContext(dataset.context, action_data.context || {});
+            var context = new openerp.base.CompoundContext(dataset.get_context(), action_data.context || {});
             switch(action_data.type) {
                 case 'object':
                     return dataset.call_button(action_data.name, [[record_id], context], handler);
diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js
index b8ca9a49e9e..7f7aec85b63 100644
--- a/addons/base_gantt/static/src/js/gantt.js
+++ b/addons/base_gantt/static/src/js/gantt.js
@@ -271,7 +271,7 @@ init: function(view_manager, session, element_id, dataset, view_id) {
             this.rpc(ajax, {
                 model: this.dataset.model,
                 domain: self.dataset.domain,
-                context :self.dataset.context
+                context :self.dataset.get_context()
             }, function(response) {
                 ganttChartControl.clearAll();
                 jQuery("#GanttDiv").children().remove();

From b3f48d4432f2188097ebcb1c11051f2bccc22dff Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 1 Jul 2011 14:00:25 +0200
Subject: [PATCH 52/56] [fix] possible issue with rpc

bzr revid: nicolas.vanhoren@openerp.com-20110701120025-nzv1gmm19fn5uo9t
---
 addons/base/static/src/js/chrome.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 5e1c7432cb8..6064e0f4c46 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -408,7 +408,8 @@ openerp.base.Session = openerp.base.BasicController.extend( /** @lends openerp.b
                         self.on_session_invalid(function() {
                             self.rpc(url, payload.params,
                                 function() {deferred.resolve.apply(deferred, arguments);},
-                                function() {deferred.reject.apply(deferred, arguments);});
+                                function(error, event) {event.preventDefault();
+                                    deferred.reject.apply(deferred, arguments);});
                         });
                     } else {
                         deferred.reject(response.error);

From 1ac0c5f053466e1b5388134a97d434bfadafa597 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 1 Jul 2011 17:18:39 +0200
Subject: [PATCH 53/56] [REVERT] last 4 revisions on fields_view_get, need
 further review

bzr revid: odo@openerp.com-20110701151839-g8nhfr4z8pmkflah
---
 openerp/osv/orm.py | 139 +++------------------------------------------
 1 file changed, 8 insertions(+), 131 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 4c52a8730fb..f4a7dfa8ed2 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -48,7 +48,6 @@ import re
 import time
 import traceback
 import types
-import simplejson
 
 import openerp.netsvc as netsvc
 from lxml import etree
@@ -72,88 +71,6 @@ module_class_list = {}
 # Super-user identifier (aka Administrator aka root)
 ROOT_USER_ID = 1
 
-def transfer_field_to_modifiers(field, modifiers):
-    for a in ('invisible', 'readonly', 'required'):
-        if field.get(a):
-            modifiers[a] = bool(field.get(a))
-
-
-# Don't deal with groups, it is done by check_group().
-# Need the context to evaluate the invisible attribute on tree views.
-# For non-tree views, the context shouldn't be given.
-def transfer_node_to_modifiers(node, modifiers, context=None, in_tree_view=False):
-    if node.get('attrs'):
-        modifiers.update(eval(node.get('attrs')))
-
-    if node.get('states'):
-        if 'invisible' in modifiers and isinstance(modifiers['invisible'], list):
-             # TODO combine with AND or OR, use implicit AND for now.
-             modifiers['invisible'].append(('state', 'not in', node.get('states').split(',')))
-        else:
-             modifiers['invisible'] = [('state', 'not in', node.get('states').split(','))]
-
-    for a in ('invisible', 'readonly', 'required'):
-        if node.get(a):
-            v = bool(eval(node.get(a), {'context': context or {}}))
-            if in_tree_view and a == 'invisible':
-                # Invisible in a tree view has a specific meaning, make it a
-                # new key in the modifiers attribute.
-                modifiers['tree_invisible'] = v
-            elif v or (a not in modifiers or not isinstance(modifiers[a], list)):
-                # Don't set the attribute to False if a dynamic value was
-                # provided (i.e. a domain from attrs or states).
-                modifiers[a] = v
-
-
-def simplify_modifiers(modifiers):
-    for a in ('invisible', 'readonly', 'required'):
-        if a in modifiers and not modifiers[a]:
-            del modifiers[a]
-
-
-def transfer_modifiers_to_node(modifiers, node):
-    if modifiers:
-        simplify_modifiers(modifiers)
-        node.set('modifiers', simplejson.dumps(modifiers))
-
-
-def test_modifiers(what, expected):
-    modifiers = {}
-    if isinstance(what, basestring):
-        node = etree.fromstring(what)
-        transfer_node_to_modifiers(node, modifiers)
-        simplify_modifiers(modifiers)
-        json = simplejson.dumps(modifiers)
-        assert json == expected, "%s != %s" % (json, expected)
-    elif isinstance(what, dict):
-        transfer_field_to_modifiers(what, modifiers)
-        simplify_modifiers(modifiers)
-        json = simplejson.dumps(modifiers)
-        assert json == expected, "%s != %s" % (json, expected)
-
-
-# To use this test:
-# import openerp
-# openerp.osv.orm.modifiers_tests()
-def modifiers_tests():
-    test_modifiers('<field name="a"/>', '{}')
-    test_modifiers('<field name="a" invisible="1"/>', '{"invisible": true}')
-    test_modifiers('<field name="a" readonly="1"/>', '{"readonly": true}')
-    test_modifiers('<field name="a" required="1"/>', '{"required": true}')
-    test_modifiers('<field name="a" invisible="0"/>', '{}')
-    test_modifiers('<field name="a" readonly="0"/>', '{}')
-    test_modifiers('<field name="a" required="0"/>', '{}')
-    test_modifiers('<field name="a" invisible="1" required="1"/>', '{"invisible": true, "required": true}') # TODO order is not guaranteed
-    test_modifiers('<field name="a" invisible="1" required="0"/>', '{"invisible": true}')
-    test_modifiers('<field name="a" invisible="0" required="1"/>', '{"required": true}')
-    test_modifiers("""<field name="a" attrs="{'invisible': [('b', '=', 'c')]}"/>""", '{"invisible": [["b", "=", "c"]]}')
-
-    # The dictionary is supposed to be the result of fields_get().
-    test_modifiers({}, '{}')
-    test_modifiers({"invisible": True}, '{"invisible": true}')
-    test_modifiers({"invisible": False}, '{}')
-    
-
 def check_object_name(name):
     """ Check if the given name is a valid openerp object name.
 
@@ -1407,26 +1324,13 @@ class orm_template(object):
     def view_header_get(self, cr, user, view_id=None, view_type='form', context=None):
         return False
 
-    def __view_look_dom(self, cr, user, node, view_id, in_tree_view, model_fields, context=None):
-        """ Return the description of the fields in the node.
-
-        In a normal call to this method, node is a complete view architecture
-        but it is actually possible to give some sub-node (this is used so
-        that the method can call itself recursively).
-
-        Originally, the field descriptions are drawn from the node itself.
-        But there is now some code calling fields_get() in order to merge some
-        of those information in the architecture.
-
-        """
+    def __view_look_dom(self, cr, user, node, view_id, context=None):
         if context is None:
             context = {}
         result = False
         fields = {}
         children = True
 
-        modifiers = {}
-
         def encode(s):
             if isinstance(s, unicode):
                 return s.encode('utf8')
@@ -1440,7 +1344,6 @@ class orm_template(object):
                 can_see = any(access_pool.check_groups(cr, user, group) for group in groups)
                 if not can_see:
                     node.set('invisible', '1')
-                    modifiers['invisible'] = True
                     if 'attrs' in node.attrib:
                         del(node.attrib['attrs']) #avoid making field visible later
                 del(node.attrib['groups'])
@@ -1512,14 +1415,10 @@ class orm_template(object):
                             attrs['selection'].append((False, ''))
                 fields[node.get('name')] = attrs
 
-                field = model_fields[node.get('name')]
-                transfer_field_to_modifiers(field, modifiers)
-
         elif node.tag in ('form', 'tree'):
             result = self.view_header_get(cr, user, False, node.tag, context)
             if result:
                 node.set('string', result)
-            in_tree_view = node.tag == 'tree'
 
         elif node.tag == 'calendar':
             for additional_field in ('date_start', 'date_delay', 'date_stop', 'color'):
@@ -1528,12 +1427,6 @@ class orm_template(object):
 
         check_group(node)
 
-        # The view architeture overrides the python model.
-        # Get the attrs before they are (possibly) deleted by check_group below
-        transfer_node_to_modifiers(node, modifiers, context, in_tree_view)
-
-        # TODO remove attrs couterpart in modifiers when invisible is true ?
-
         # translate view
         if 'lang' in context:
             if node.get('string') and not result:
@@ -1559,9 +1452,8 @@ class orm_template(object):
 
         for f in node:
             if children or (node.tag == 'field' and f.tag in ('filter','separator')):
-                fields.update(self.__view_look_dom(cr, user, f, view_id, in_tree_view, model_fields, context))
+                fields.update(self.__view_look_dom(cr, user, f, view_id, context))
 
-        transfer_modifiers_to_node(modifiers, node)
         return fields
 
     def _disable_workflow_buttons(self, cr, user, node):
@@ -1590,32 +1482,19 @@ class orm_template(object):
         return node
 
     def __view_look_dom_arch(self, cr, user, node, view_id, context=None):
-        """ Return an architecture and a description of all the fields.
-
-        The field description combines the result of fields_get() and
-        __view_look_dom().
-
-        :param node: the architecture as as an etree
-        :return: a tuple (arch, fields) where arch is the given node as a
-            string and fields is the description of all the fields.
-
-        """
+        fields_def = self.__view_look_dom(cr, user, node, view_id, context=context)
+        node = self._disable_workflow_buttons(cr, user, node)
+        arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
         fields = {}
         if node.tag == 'diagram':
             if node.getchildren()[0].tag == 'node':
-                node_fields = self.pool.get(node.getchildren()[0].get('object')).fields_get(cr, user, None, context)
+                node_fields = self.pool.get(node.getchildren()[0].get('object')).fields_get(cr, user, fields_def.keys(), context)
                 fields.update(node_fields)
             if node.getchildren()[1].tag == 'arrow':
-                arrow_fields = self.pool.get(node.getchildren()[1].get('object')).fields_get(cr, user, None, context)
+                arrow_fields = self.pool.get(node.getchildren()[1].get('object')).fields_get(cr, user, fields_def.keys(), context)
                 fields.update(arrow_fields)
         else:
-            fields = self.fields_get(cr, user, None, context)
-        fields_def = self.__view_look_dom(cr, user, node, view_id, False, fields, context=context)
-        node = self._disable_workflow_buttons(cr, user, node)
-        arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
-        for k in fields.keys():
-            if k not in fields_def:
-                del fields[k]
+            fields = self.fields_get(cr, user, fields_def.keys(), context)
         for field in fields_def:
             if field == 'id':
                 # sometime, the view may contain the (invisible) field 'id' needed for a domain (when 2 objects have cross references)
@@ -1636,7 +1515,6 @@ class orm_template(object):
     def __get_default_calendar_view(self):
         """Generate a default calendar view (For internal use only).
         """
-        # TODO could return an etree instead of a string
 
         arch = ('<?xml version="1.0" encoding="utf-8"?>\n'
                 '<calendar string="%s"') % (self._description)
@@ -1704,7 +1582,6 @@ class orm_template(object):
         for field_name in fields_to_search:
             field_group.append(etree.Element("field", attrib={'name': field_name}))
 
-        #TODO tostring can be removed as fromstring is call directly after...
         return etree.tostring(search_view, encoding="utf-8").replace('\t', '')
 
     #

From ce0d89e7e75af2b379e98f559546f871dad1de49 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 2 Jul 2011 01:23:28 +0200
Subject: [PATCH 54/56] [IMP] fields.function: removed method=True param, added
 docstring

The 'method' param was quite useless, as 100% of functions
fields were using method=True. In addition, there is no need
to distinguish methods and functions, as methods are unbound
and passed as function objects in the declaration of a function
field, so they only need a proper signature.
Finally, docstring was added for fields.function class,
based on current doc from developer book (in preparation of
future API doc).
(A fix in addons follows, getting rid of all the useless
method=True params there too).

bzr revid: odo@openerp.com-20110701232328-flgxulxva70vnyxr
---
 openerp/osv/fields.py | 200 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 190 insertions(+), 10 deletions(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index b7979f03812..3cf87a1e4fe 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -741,6 +741,192 @@ def sanitize_binary_value(value):
 # Function fields
 # ---------------------------------------------------------
 class function(_column):
+    """
+    A field whose value is computed by a function (rather
+    than being read from the database).
+
+    :param fnct: the callable that will compute the field value.
+    :param arg: arbitrary value to be passed to ``fnct`` when computing the value.
+    :param fnct_inv: the callable that will allow writing values in that field
+                     (if not provided, the field is read-only).
+    :param fnct_inv_arg: arbitrary value to be passed to ``fnct_inv`` when
+                         writing a value.
+    :param str type: type of the field simulated by the function field
+    :param fnct_search: the callable that allows searching on the field
+                        (if not provided, search will not return any result).
+    :param store: store computed value in database
+                  (see :ref:`The *store* parameter <field-function-store>`).
+    :type store: True or dict specifying triggers for field computation
+    :param multi: name of batch for batch computation of function fields.
+                  All fields with the same batch name will be computed by
+                  a single function call. This changes the signature of the
+                  ``fnct`` callable.
+
+    .. _field-function-fnct: The ``fnct`` parameter
+
+    .. rubric:: The ``fnct`` parameter
+
+    The callable implementing the function field must have the following signature:
+
+    .. function:: fnct(model, cr, uid, ids, field_name(s), arg, context)
+
+        Implements the function field.
+
+        :param orm_template model: model to which the field belongs (should be ``self`` for
+                                   a model method)
+        :param field_name(s): name of the field to compute, or if ``multi`` is provided,
+                              list of field names to compute.
+        :type field_name(s): str | [str]
+        :param arg: arbitrary value passed when declaring the function field
+        :rtype: dict
+        :return: mapping of ``ids`` to computed values, or if multi is provided,
+                 to a map of field_names to computed values
+
+    The values in the returned dictionary must be of the type specified by the type
+    argument in the field declaration.
+
+    Here is an example with a simple function ``char`` function field::
+
+        # declarations
+        def compute(self, cr, uid, ids, field_name, arg, context):
+            result = {}
+            # ...
+            return result
+        _columns['my_char'] = fields.function(compute, type='char', size=50)
+
+        # when called with ``ids=[1,2,3]``, ``compute`` could return:
+        {
+            1: 'foo',
+            2: 'bar',
+            3: False # null values should be returned explicitly too
+        }
+
+    If ``multi`` is set, then ``field_name`` is replaced by ``field_names``: a list
+    of the field names that should be computed. Each value in the returned
+    dictionary must then be a dictionary mapping field names to values.
+
+    Here is an example where two function fields (``name`` and ``age``)
+    are both computed by a single function field::
+
+        # declarations
+        def compute(self, cr, uid, ids, field_names, arg, context):
+            result = {}
+            # ...
+            return result
+        _columns['name'] = fields.function(compute_person_data, type='char',\
+                                           size=50, multi='person_data')
+        _columns[''age'] = fields.function(compute_person_data, type='integer',\
+                                           multi='person_data')
+
+        # when called with ``ids=[1,2,3]``, ``compute_person_data`` could return:
+        {
+            1: {'name': 'Bob', 'age': 23},
+            2: {'name': 'Sally', 'age': 19},
+            3: {'name': 'unknown', 'age': False}
+        }
+
+    .. _field-function-fnct-inv:
+
+    .. rubric:: The ``fnct_inv`` parameter
+
+    This callable implements the write operation for the function field
+    and must have the following signature:
+
+    .. function:: fnct_inv(model, cr, uid, ids, field_name, field_value, fnct_inv_arg, context)
+
+        Callable that implements the ``write`` operation for the function field.
+
+        :param orm_template model: model to which the field belongs (should be ``self`` for
+                                   a model method)
+        :param str field_name: name of the field to set
+        :param fnct_inv_arg: arbitrary value passed when declaring the function field
+        :return: True
+
+    When writing values for a function field, the ``multi`` parameter is ignored.
+
+    .. _field-function-fnct-search:
+
+    .. rubric:: The ``fnct_search`` parameter
+
+    This callable implements the search operation for the function field
+    and must have the following signature:
+
+    .. function:: fnct_search(model, cr, uid, model_again, field_name, criterion, context)
+
+        Callable that implements the ``search`` operation for the function field by expanding
+        a search criterion based on the function field into a new domain based only on
+        columns that are stored in the database.
+
+        :param orm_template model: model to which the field belongs (should be ``self`` for
+                                   a model method)
+        :param orm_template model_again: same value as ``model`` (seriously! this is for backwards
+                                         compatibility)
+        :param str field_name: name of the field to search on
+        :param list criterion: domain component specifying the search criterion on the field.
+        :rtype: list
+        :return: domain to use instead of ``criterion`` when performing the search.
+                 This new domain must be based only on columns stored in the database, as it
+                 will be used directly without any translation.
+
+        The returned value must be a domain, that is, a list of the form [(field_name, operator, operand)].
+        The most generic way to implement ``fnct_search`` is to directly search for the records that
+        match the given ``criterion``, and return their ``ids`` wrapped in a domain, such as
+        ``[('id','in',[1,3,5])]``.
+
+    .. _field-function-store:
+
+    .. rubric:: The ``store`` parameter
+
+    The ``store`` parameter allows caching the result of the field computation in the
+    database, and defining the triggers that will invalidate that cache and force a
+    recomputation of the function field.
+    When not provided, the field is computed every time its value is read.
+    The value of ``store`` may be either ``True`` (to recompute the field value whenever
+    any field in the same record is modified), or a dictionary specifying a more
+    flexible set of recomputation triggers.
+
+    A trigger specification is a dictionary that maps the names of the models that
+    will trigger the computation, to a tuple describing the trigger rule, in the
+    following form::
+
+        store = {
+            'trigger_model': (mapping_function,
+                              ['trigger_field1', 'trigger_field2'],
+                              priority),
+        }
+
+    A trigger rule is defined by a 3-item tuple where:
+
+        * The ``mapping_function`` is defined as follows:
+
+            .. function:: mapping_function(trigger_model, cr, uid, trigger_ids, context)
+
+                Callable that maps record ids of a trigger model to ids of the
+                corresponding records in the source model (whose field values
+                need to be recomputed).
+
+                :param orm_template model: trigger_model
+                :param list trigger_ids: ids of the records of trigger_model that were
+                                         modified
+                :rtype: list
+                :return: list of ids of the source model whose function field values
+                         need to be recomputed
+
+        * The second item is a list of the fields who should act as triggers for
+          the computation. If an empty list is given, all fields will act as triggers.
+        * The last item is the priority, used to order the triggers when processing them
+          after any write operation on a model that has function field triggers. The
+          default priority is 10.
+
+    In fact, setting store = True is the same as using the following trigger dict::
+
+        store = {
+              'model_itself': (lambda self, cr, uid, ids, context: ids,
+                               [],
+                               10)
+        }
+
+    """
     _classic_read = False
     _classic_write = False
     _prefetch = False
@@ -750,10 +936,9 @@ class function(_column):
 #
 # multi: compute several fields in one call
 #
-    def __init__(self, fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='float', fnct_search=None, obj=None, method=False, store=False, multi=False, **args):
+    def __init__(self, fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='float', fnct_search=None, obj=None, store=False, multi=False, **args):
         _column.__init__(self, **args)
         self._obj = obj
-        self._method = method
         self._fnct = fnct
         self._fnct_inv = fnct_inv
         self._arg = arg
@@ -834,11 +1019,7 @@ class function(_column):
         return result
 
     def get(self, cr, obj, ids, name, uid=False, context=None, values=None):
-        result = {}
-        if self._method:
-            result = self._fnct(obj, cr, uid, ids, name, self._arg, context)
-        else:
-            result = self._fnct(cr, obj._table, ids, name, self._arg, context)
+        result = self._fnct(obj, cr, uid, ids, name, self._arg, context)
         for id in ids:
             if self._multi and id in result:
                 for field, value in result[id].iteritems():
@@ -968,7 +1149,7 @@ class related(function):
     def __init__(self, *arg, **args):
         self.arg = arg
         self._relations = []
-        super(related, self).__init__(self._fnct_read, arg, self._fnct_write, fnct_inv_arg=arg, method=True, fnct_search=self._fnct_search, **args)
+        super(related, self).__init__(self._fnct_read, arg, self._fnct_write, fnct_inv_arg=arg, fnct_search=self._fnct_search, **args)
         if self.store is True:
             # TODO: improve here to change self.store = {...} according to related objects
             pass
@@ -1005,7 +1186,7 @@ class dummy(function):
     def __init__(self, *arg, **args):
         self.arg = arg
         self._relations = []
-        super(dummy, self).__init__(self._fnct_read, arg, self._fnct_write, fnct_inv_arg=arg, method=True, fnct_search=None, **args)
+        super(dummy, self).__init__(self._fnct_read, arg, self._fnct_write, fnct_inv_arg=arg, fnct_search=None, **args)
 
 # ---------------------------------------------------------
 # Serialized fields
@@ -1164,7 +1345,6 @@ def field_to_dict(self, cr, user, context, field):
         res['fnct_inv'] = field._fnct_inv and field._fnct_inv.func_name or False
         res['fnct_inv_arg'] = field._fnct_inv_arg or False
         res['func_obj'] = field._obj or False
-        res['func_method'] = field._method
     if isinstance(field, many2many):
         res['related_columns'] = list((field._id1, field._id2))
         res['third_table'] = field._rel

From 06fb14130a4bb88399c38979d1d07f37fbacf658 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 2 Jul 2011 01:41:24 +0200
Subject: [PATCH 55/56] [IMP] removed method=True params from all
 fields.function

Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
---
 addons/account/account.py                     | 22 ++++-----
 addons/account/account_bank_statement.py      |  4 +-
 addons/account/account_cash_statement.py      |  8 ++--
 addons/account/account_move_line.py           |  8 ++--
 addons/account/invoice.py                     | 20 ++++----
 addons/account/partner.py                     |  4 +-
 addons/account/report/account_report.py       |  2 +-
 .../account/report/account_treasury_report.py |  4 +-
 .../account_analytic_analysis.py              | 40 ++++++++--------
 .../account_analytic_plans.py                 |  2 +-
 addons/account_budget/account_budget.py       |  6 +--
 .../account_invoice_layout.py                 |  2 +-
 addons/account_payment/account_invoice.py     |  2 +-
 addons/account_payment/account_move_line.py   |  2 +-
 addons/account_payment/account_payment.py     | 10 ++--
 addons/account_voucher/account_voucher.py     |  8 ++--
 addons/analytic/analytic.py                   | 14 +++---
 addons/anonymization/anonymization.py         |  4 +-
 addons/auction/auction.py                     | 24 +++++-----
 addons/base_calendar/base_calendar.py         | 22 ++++-----
 addons/base_contact/base_contact.py           |  2 +-
 .../base_report_creator.py                    |  2 +-
 addons/crm/crm.py                             |  2 +-
 addons/crm/crm_lead.py                        |  2 +-
 addons/crm/crm_meeting.py                     |  2 +-
 addons/delivery/delivery.py                   |  2 +-
 addons/delivery/stock.py                      |  8 ++--
 addons/document/directory_report.py           |  2 +-
 addons/document/document.py                   |  2 +-
 addons/event/event.py                         |  6 +--
 addons/hr/hr.py                               |  6 +--
 addons/hr/hr_department.py                    |  2 +-
 addons/hr_attendance/hr_attendance.py         |  4 +-
 addons/hr_contract/hr_contract.py             |  2 +-
 addons/hr_expense/hr_expense.py               |  4 +-
 addons/hr_holidays/hr_holidays.py             |  8 ++--
 addons/hr_payroll/hr_payroll.py               | 46 +++++++++----------
 .../hr_payroll_account/hr_payroll_account.py  |  4 +-
 .../hr_timesheet_invoice.py                   |  2 +-
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  | 18 ++++----
 addons/idea/idea.py                           | 10 ++--
 addons/l10n_ch/invoice.py                     |  2 +-
 addons/lunch/lunch.py                         |  4 +-
 addons/mail_gateway/mail_gateway.py           |  2 +-
 .../marketing_campaign/marketing_campaign.py  |  6 +--
 .../report/campaign_analysis.py               |  2 +-
 addons/membership/membership.py               | 10 ++--
 addons/mrp/mrp.py                             | 12 ++---
 addons/mrp_operations/mrp_operations.py       |  6 +--
 addons/mrp_repair/mrp_repair.py               | 12 ++---
 addons/point_of_sale/point_of_sale.py         | 18 ++++----
 addons/procurement/procurement.py             |  2 +-
 addons/product/product.py                     | 26 +++++------
 addons/product_margin/product_margin.py       | 34 +++++++-------
 addons/project/project.py                     | 20 ++++----
 addons/project_issue/project_issue.py         |  2 +-
 addons/project_long_term/project_long_term.py |  4 +-
 addons/project_planning/project_planning.py   | 20 ++++----
 addons/project_scrum/project_scrum.py         | 12 ++---
 .../project_timesheet/report/task_report.py   |  4 +-
 addons/purchase/purchase.py                   | 16 +++----
 addons/sale/sale.py                           | 16 +++----
 addons/sale_journal/sale_journal.py           |  1 -
 addons/sale_margin/sale_margin.py             |  4 +-
 addons/sale_mrp/sale_mrp.py                   |  4 +-
 addons/sale_order_dates/sale_order_dates.py   |  4 +-
 addons/stock/product.py                       | 18 ++++----
 addons/stock/stock.py                         | 12 ++---
 addons/stock_planning/stock_planning.py       | 10 ++--
 addons/survey/survey.py                       |  6 +--
 70 files changed, 316 insertions(+), 317 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index e50e18e8a1d..aced4041f13 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -368,16 +368,16 @@ class account_account(osv.osv):
         'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
         'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
-        'child_id': fields.function(_get_child_ids, method=True, type='many2many', relation="account.account", string="Child Accounts"),
-        'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Balance', multi='balance'),
-        'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Credit', multi='balance'),
-        'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Debit', multi='balance'),
+        'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
+        'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
+        'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
+        'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
         'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
             'account_id', 'tax_id', 'Default Taxes'),
         'note': fields.text('Note'),
-        'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Company Currency'),
+        'company_currency_id': fields.function(_get_company_currency, type='many2one', relation='res.currency', string='Company Currency'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'active': fields.boolean('Active', select=2, help="If the active field is set to False, it will allow you to hide the account without removing it."),
 
@@ -390,7 +390,7 @@ class account_account(osv.osv):
             'manage this. So if you import from another software system you may have to use the rate at date. ' \
             'Incoming transactions always use the rate at date.', \
             required=True),
-        'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
+        'level': fields.function(_get_level, string='Level', store=True, type='integer'),
     }
 
     _defaults = {
@@ -587,7 +587,7 @@ class account_journal_column(osv.osv):
     _description = "Journal Column"
     _columns = {
         'name': fields.char('Column Name', size=64, required=True),
-        'field': fields.selection(_col_get, 'Field Name', method=True, required=True, size=32),
+        'field': fields.selection(_col_get, 'Field Name', required=True, size=32),
         'view_id': fields.many2one('account.journal.view', 'Journal View', select=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order to journal column.", readonly=True),
         'required': fields.boolean('Required'),
@@ -985,7 +985,7 @@ class account_journal_period(osv.osv):
         'name': fields.char('Journal-Period Name', size=64, required=True),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"),
         'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
-        'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32),
+        'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
         'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
         'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
                                   help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
@@ -1139,7 +1139,7 @@ class account_move(osv.osv):
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
-        'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
+        'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
         'narration':fields.text('Narration'),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
@@ -1646,8 +1646,8 @@ class account_tax_code(osv.osv):
         'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
         'code': fields.char('Case Code', size=64),
         'info': fields.text('Description'),
-        'sum': fields.function(_sum_year, method=True, string="Year Sum"),
-        'sum_period': fields.function(_sum_period, method=True, string="Period Sum"),
+        'sum': fields.function(_sum_year, string="Year Sum"),
+        'sum_period': fields.function(_sum_period, string="Period Sum"),
         'parent_id': fields.many2one('account.tax.code', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code', 'parent_id', 'Child Codes'),
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 54776e5c7e6..f712cc9ab0c 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -137,7 +137,7 @@ class account_bank_statement(osv.osv):
             states={'confirm':[('readonly',True)]}),
         'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly', True)]}),
-        'balance_end': fields.function(_end_balance, method=True, string='Balance'),
+        'balance_end': fields.function(_end_balance, string='Balance'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'line_ids': fields.one2many('account.bank.statement.line',
             'statement_id', 'Statement lines',
@@ -149,7 +149,7 @@ class account_bank_statement(osv.osv):
             states={'confirm': [('readonly', True)]}, readonly="1",
             help='When new statement is created the state will be \'Draft\'. \
             \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
-        'currency': fields.function(_currency, method=True, string='Currency',
+        'currency': fields.function(_currency, string='Currency',
             type='many2one', relation='res.currency'),
         'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
     }
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 04e780ade30..982383ea2a7 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -58,7 +58,7 @@ class account_cashbox_line(osv.osv):
     _columns = {
         'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
         'number': fields.integer('Number'),
-        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
+        'subtotal': fields.function(_sub_total, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
         'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'),
      }
@@ -223,10 +223,10 @@ class account_cash_statement(osv.osv):
             [('draft', 'Draft'),
             ('confirm', 'Closed'),
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
-        'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
+        'total_entry_encoding': fields.function(_get_sum_entry_encoding, store=True, string="Cash Transaction", help="Total cash transactions"),
         'closing_date': fields.datetime("Closed On"),
-        'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
-        'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
+        'balance_end': fields.function(_end_balance, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
+        'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
         'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2117d7fc40e..2733ecbd189 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -489,8 +489,8 @@ class account_move_line(osv.osv):
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
-        'amount_residual_currency': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
-        'amount_residual': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
+        'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
+        'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
@@ -504,13 +504,13 @@ class account_move_line(osv.osv):
         'date_created': fields.date('Creation date', select=True),
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
-        'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'),
+        'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
         'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True,
                                   help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
                     "this field will contain the basic amount(without tax)."),
-        'invoice': fields.function(_invoice, method=True, string='Invoice',
+        'invoice': fields.function(_invoice, string='Invoice',
             type='many2one', relation='account.invoice', fnct_search=_invoice_search),
         'account_tax_id':fields.many2one('account.tax', 'Tax'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 9d95a5af4ba..8b1b2a0edda 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -227,21 +227,21 @@ class account_invoice(osv.osv):
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
         'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
-        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed',
+        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
                 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
             },
             multi='all'),
-        'amount_tax': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Tax',
+        'amount_tax': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Tax',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
                 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
             },
             multi='all'),
-        'amount_total': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Total',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
@@ -252,7 +252,7 @@ class account_invoice(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
         'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
-        'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
+        'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
                 'account.move.line': (_get_invoice_from_line, None, 50),
@@ -260,8 +260,8 @@ class account_invoice(osv.osv):
             }, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
-        'move_lines':fields.function(_get_lines, method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
-        'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
+        'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'),
+        'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='Residual',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50),
                 'account.invoice.tax': (_get_invoice_tax, None, 50),
@@ -270,7 +270,7 @@ class account_invoice(osv.osv):
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
             },
             help="Remaining amount due."),
-        'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
+        'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
@@ -1282,7 +1282,7 @@ class account_invoice_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
             digits_compute= dp.get_precision('Account'), store=True),
         'quantity': fields.float('Quantity', required=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
@@ -1505,8 +1505,8 @@ class account_invoice_tax(osv.osv):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
         'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
-        'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
-        'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
+        'factor_base': fields.function(_count_factor, string='Multipication factor for Base code', type='float', multi="all"),
+        'factor_tax': fields.function(_count_factor, string='Multipication factor Tax code', type='float', multi="all")
     }
 
     def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False):
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 9e2aafe849a..984c7e037e0 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -142,8 +142,8 @@ class res_partner(osv.osv):
 
     _columns = {
         'credit': fields.function(_credit_debit_get,
-            fnct_search=_credit_search, method=True, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
-        'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, method=True, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
+            fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
+        'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
         'property_account_payable': fields.property(
             'account.account',
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 6b22dc21fdf..6666b1ccd83 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -114,7 +114,7 @@ class report_aged_receivable(osv.osv):
 
     _columns = {
         'name': fields.char('Month Range', size=7, readonly=True),
-        'balance': fields.function(_calc_bal, method=True, string='Balance', readonly=True),
+        'balance': fields.function(_calc_bal, string='Balance', readonly=True),
     }
 
     def init(self, cr, uid=1):
diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py
index 4d3ec449204..fce3661b4c4 100644
--- a/addons/account/report/account_treasury_report.py
+++ b/addons/account/report/account_treasury_report.py
@@ -47,8 +47,8 @@ class account_treasury_report(osv.osv):
         'credit': fields.float('Credit', readonly=True),
         'balance': fields.float('Balance', readonly=True),
         'date': fields.date('Beginning of Period Date', readonly=True),
-        'starting_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), method=True, string='Starting Balance', multi='balance'),
-        'ending_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), method=True, string='Ending Balance', multi='balance'),
+        'starting_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Starting Balance', multi='balance'),
+        'ending_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Ending Balance', multi='balance'),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 11f92614b73..22eb9401ad7 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -375,49 +375,49 @@ class account_analytic_account(osv.osv):
         return res
 
     _columns ={
-        'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount',
+        'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount',
             help="Total customer invoiced amount for this account.",
             digits_compute=dp.get_precision('Account')),
-        'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs',
+        'total_cost': fields.function(_total_cost_calc, type='float', string='Total Costs',
             help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets.",
             digits_compute=dp.get_precision('Account')),
-        'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
+        'ca_to_invoice': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
             help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
             digits_compute=dp.get_precision('Account')),
-        'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theoretical Revenue',
+        'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
             help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
             digits_compute=dp.get_precision('Account')),
-        'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot',
+        'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Hours Tot',
             help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
-        'last_invoice_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Last Invoice Date',
+        'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
             help="If invoice from the costs, this is the date of the latest invoiced."),
-        'last_worked_invoiced_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost',
+        'last_worked_invoiced_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost',
             help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
-        'last_worked_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Cost/Work',
+        'last_worked_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Cost/Work',
             help="Date of the latest work done on this account."),
-        'hours_qtt_non_invoiced': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Hours',
+        'hours_qtt_non_invoiced': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Hours',
             help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
-        'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours',
+        'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Hours',
             help="Number of hours that can be invoiced plus those that already have been invoiced."),
-        'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours',
+        'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Hours',
             help="Computed using the formula: Maximum Quantity - Hours Tot."),
-        'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue',
+        'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
             help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
             digits_compute=dp.get_precision('Account')),
-        'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)',
+        'revenue_per_hour': fields.function(_revenue_per_hour_calc, type='float', string='Revenue per Hours (real)',
             help="Computed using the formula: Invoiced Amount / Hours Tot.",
             digits_compute=dp.get_precision('Account')),
-        'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin',
+        'real_margin': fields.function(_real_margin_calc, type='float', string='Real Margin',
             help="Computed using the formula: Invoiced Amount - Total Costs.",
             digits_compute=dp.get_precision('Account')),
-        'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theoretical Margin',
+        'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin',
             help="Computed using the formula: Theorial Revenue - Total Costs",
             digits_compute=dp.get_precision('Account')),
-        'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)',
+        'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
             digits_compute=dp.get_precision('Account')),
-        'month_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
-        'user_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
+        'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
+        'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
     }
 
 account_analytic_account()
@@ -456,7 +456,7 @@ class account_analytic_account_summary_user(osv.osv):
 
     _columns = {
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'unit_amount': fields.function(_unit_amount, method=True, type='float',
+        'unit_amount': fields.function(_unit_amount, type='float',
             string='Total Time'),
         'user': fields.many2one('res.users', 'User'),
     }
@@ -620,7 +620,7 @@ class account_analytic_account_summary_month(osv.osv):
 
     _columns = {
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'unit_amount': fields.function(_unit_amount, method=True, type='float', string='Total Time'),
+        'unit_amount': fields.function(_unit_amount, type='float', string='Total Time'),
         'month': fields.char('Month', size=32, readonly=True),
     }
 
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 990f53e91ef..c8ab5334d8a 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -61,7 +61,7 @@ class account_analytic_line(osv.osv):
         return res
 
     _columns = {
-        'amount_currency': fields.function(_get_amount, string="Amount Currency", type="float", method=True, store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+        'amount_currency': fields.function(_get_amount, string="Amount Currency", type="float", store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
         'percentage': fields.float('Percentage')
     }
 
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 12caba17374..7d9666ae5ac 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -196,9 +196,9 @@ class crossovered_budget_lines(osv.osv):
         'date_to': fields.date('End Date', required=True),
         'paid_date': fields.date('Paid Date'),
         'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
-        'practical_amount':fields.function(_prac, method=True, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'theoritical_amount':fields.function(_theo, method=True, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'percentage':fields.function(_perc, method=True, string='Percentage', type='float'),
+        'practical_amount':fields.function(_prac, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'theoritical_amount':fields.function(_theo, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'percentage':fields.function(_perc, string='Percentage', type='float'),
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
 
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 3337710420f..b0fb92c9abb 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -161,7 +161,7 @@ class account_invoice_line(osv.osv):
                 ('break','Page Break'),]
             ,'Type', select=True, required=True),
         'sequence': fields.integer('Sequence Number', help="Gives the sequence order when displaying a list of invoice lines."),
-        'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, method=True, store=False, string="Source Account"),
+        'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"),
     }
 
     def _default_account(self, cr, uid, context=None):
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index 1f882b48421..fd787863c7d 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -42,7 +42,7 @@ class Invoice(osv.osv):
         return res
 
     _columns = {
-        'amount_to_pay': fields.function(_amount_to_pay, method=True,
+        'amount_to_pay': fields.function(_amount_to_pay,
             type='float', string='Amount to be paid',
             help='The amount which should be paid at the current date\n' \
                     'minus the amount which is already in payment order'),
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 68bb33ca4e5..24f9486be95 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -111,7 +111,7 @@ class account_move_line(osv.osv):
         return line2bank
 
     _columns = {
-        'amount_to_pay': fields.function(amount_to_pay, method=True,
+        'amount_to_pay': fields.function(amount_to_pay,
             type='float', string='Amount to pay', fnct_search=_to_pay_search),
     }
 
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 19de746b7c9..a7b803b2d3b 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -96,7 +96,7 @@ class payment_order(osv.osv):
             ('done', 'Done')], 'State', select=True,
             help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
-        'total': fields.function(_total, string="Total", method=True, type='float'),
+        'total': fields.function(_total, string="Total", type='float'),
         'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}),
         'date_prefered': fields.selection([
             ('now', 'Directly'),
@@ -348,10 +348,10 @@ class payment_line(osv.osv):
             help='Payment amount in the company currency'),
         'ml_date_created': fields.function(_get_ml_created_date, string="Effective Date",
             method=True, type='date', help="Invoice Effective Date"),
-        'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Due Date'),
-        'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref.'),
-        'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'),
-        'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),
+        'ml_maturity_date': fields.function(_get_ml_maturity_date, type='date', string='Due Date'),
+        'ml_inv_ref': fields.function(_get_ml_inv_ref, type='many2one', relation='account.invoice', string='Invoice Ref.'),
+        'info_owner': fields.function(info_owner, string="Owner Account", type="text", help='Address of the Main Partner'),
+        'info_partner': fields.function(info_partner, string="Destination Account", type="text", help='Address of the Ordering Customer.'),
         'date': fields.date('Payment Date', help="If no payment date is specified, the bank will treat this payment line directly"),
         'create_date': fields.datetime('Created', readonly=True),
         'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True),
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index b4422cd8051..dee3d81832b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -226,7 +226,7 @@ class account_voucher(osv.osv):
         'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}),
         'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
-        'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Write-Off Amount', type='float', readonly=True),
+        'writeoff_amount': fields.function(_get_writeoff_amount, string='Write-Off Amount', type='float', readonly=True),
     }
     _defaults = {
         'period_id': _get_period,
@@ -845,8 +845,8 @@ class account_voucher_line(osv.osv):
         'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
         'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1),
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
-        'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True),
-        'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
+        'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True),
+        'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True),
         'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
     }
     _defaults = {
@@ -991,7 +991,7 @@ class account_bank_statement_line(osv.osv):
 
     _columns = {
         'amount_reconciled': fields.function(_amount_reconciled,
-            string='Amount reconciled', method=True, type='float'),
+            string='Amount reconciled', type='float'),
         'voucher_id': fields.many2one('account.voucher', 'Payment'),
 
     }
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index d822c382c91..a155352adf8 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -149,18 +149,18 @@ class account_analytic_account(osv.osv):
 
     _columns = {
         'name': fields.char('Account Name', size=128, required=True),
-        'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
+        'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
         'code': fields.char('Account Code', size=24, select=True),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
         'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
-        'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', method=True, string="Account Hierarchy", type='many2many'),
+        'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'),
         'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
-        'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'credit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
-        'quantity': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
+        'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+        'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'contact_id': fields.many2one('res.partner.address', 'Contact'),
@@ -175,7 +175,7 @@ class account_analytic_account(osv.osv):
                                   \n* And finally when all the transactions are over, it can be in \'Close\' state. \
                                   \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
                                  \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
-        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, method=True,
+        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency,
             store = {
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 2814227015a..c4a2d9f0488 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -240,10 +240,10 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
 
     _columns = {
         'name': fields.char(size='64', string='File Name'),
-        'summary': fields.function(_get_summary, method=True, type='text', string='Summary'),
+        'summary': fields.function(_get_summary, type='text', string='Summary'),
         'file_export': fields.binary(string='Export'),
         'file_import': fields.binary(string='Import'),
-        'state': fields.function(_get_state, method=True, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
+        'state': fields.function(_get_state, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
         'msg': fields.text(string='Message'),
     }
 
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0b2fc467f88..685b6ee3368 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -95,12 +95,12 @@ class auction_dates(osv.osv):
         'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account tax for seller"),
         'acc_income': fields.many2one('account.account', 'Income Account', required=True),
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
-        'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
+        'adj_total': fields.function(_adjudication_get, string='Total Adjudication', store=True),
         'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
                                   help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
-        'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Buyer Invoice", type='many2many', multi=True),
-        'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Seller Invoice", type='many2many', multi=True),
+        'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Buyer Invoice", type='many2many', multi=True),
+        'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Seller Invoice", type='many2many', multi=True),
     }
 
     _defaults = {
@@ -382,8 +382,8 @@ class auction_lots(osv.osv):
         'vnd_lim': fields.float('Seller limit'),
         'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
         'image': fields.binary('Image', help="Object Image"),
-        'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."),
-        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."),
+        'paid_vnd':fields.function(_getprice, string='Seller Paid', type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."),
+        'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."),
         'state': fields.selection((
             ('draft', 'Draft'),
             ('unsold', 'Unsold'),
@@ -394,14 +394,14 @@ class auction_lots(osv.osv):
                 \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
                 \n* The \'Paid\' state is used when user pay for the object \
                 \n* The \'Sold\' state is used when user buy the object.'),
-        'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
-        'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
-        'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
-        'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
-        'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
+        'buyer_price': fields.function(_getprice, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
+        'seller_price': fields.function(_getprice, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
+        'gross_revenue':fields.function(_getprice, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
+        'gross_margin':fields.function(_getprice, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
+        'costs':fields.function(_getprice, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
         'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement line for given buyer"),
-        'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
-        'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
+        'net_revenue':fields.function(_getprice, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
+        'net_margin':fields.function(_getprice, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
     }
     _defaults = {
         'state':lambda *a: 'draft',
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4df126e191e..5f24b08884a 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -341,26 +341,26 @@ class calendar_attendee(osv.osv):
                         help="Status of the attendee's participation"),
         'rsvp':  fields.boolean('Required Reply?',
                     help="Indicats whether the favor of a reply is requested"),
-        'delegated_to': fields.function(_compute_data, method=True, \
+        'delegated_to': fields.function(_compute_data, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
 request was delegated to"),
-        'delegated_from': fields.function(_compute_data, method=True, string=\
+        'delegated_from': fields.function(_compute_data, string=\
             'Delegated From', type="char", store=True, size=124, multi='delegated_from'),
         'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', \
                                     'attendee_id', 'parent_id', 'Delegrated From'),
         'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', \
                                       'attendee_id', 'child_id', 'Delegrated To'),
-        'sent_by': fields.function(_compute_data, method=True, string='Sent By', \
+        'sent_by': fields.function(_compute_data, string='Sent By', \
                         type="char", multi='sent_by', store=True, size=124, \
                         help="Specify the user that is acting on behalf of the calendar user"),
-        'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', \
+        'sent_by_uid': fields.function(_compute_data, string='Sent By User', \
                             type="many2one", relation="res.users", multi='sent_by_uid'),
-        'cn': fields.function(_compute_data, method=True, string='Common name', \
+        'cn': fields.function(_compute_data, string='Common name', \
                             type="char", size=124, multi='cn', store=True),
         'dir': fields.char('URI Reference', size=124, help="Reference to the URI\
 that points to the directory information corresponding to the attendee."),
-        'language': fields.function(_compute_data, method=True, string='Language', \
+        'language': fields.function(_compute_data, string='Language', \
                     type="selection", selection=_lang_get, multi='language', \
                     store=True, help="To specify the language for text values in a\
 property or property parameter."),
@@ -369,9 +369,9 @@ property or property parameter."),
         'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \
                         relation='res.partner', string='Partner', help="Partner related to contact"),
         'email': fields.char('Email', size=124, help="Email of Invited Person"),
-        'event_date': fields.function(_compute_data, method=True, string='Event Date', \
+        'event_date': fields.function(_compute_data, string='Event Date', \
                             type="datetime", multi='event_date'),
-        'event_end_date': fields.function(_compute_data, method=True, \
+        'event_end_date': fields.function(_compute_data, \
                             string='Event End Date', type="datetime", \
                             multi='event_end_date'),
         'ref': fields.reference('Event Ref', selection=_links_get, size=128),
@@ -1022,7 +1022,7 @@ class calendar_event(osv.osv):
 defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="Defines a \
 rule or repeating pattern of time to exclude from the recurring rule."),
-        'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
+        'rrule': fields.function(_get_rulestring, type='char', size=124, \
                                     store=True, string='Recurrent Rule'),
         'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
                             ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
@@ -1552,7 +1552,7 @@ class calendar_todo(osv.osv):
         return self.write(cr, uid, id, { 'date_start': value }, context=context)
 
     _columns = {
-        'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \
+        'date': fields.function(_get_date, fnct_inv=_set_date, \
                             string='Duration', store=True, type='datetime'),
         'duration': fields.integer('Duration'),
     }
@@ -1750,7 +1750,7 @@ class res_users(osv.osv):
     _columns = {
             'availability': fields.function(_get_user_avail_fun, type='selection', \
                     selection=[('free', 'Free'), ('busy', 'Busy')], \
-                    string='Free/Busy', method=True),
+                    string='Free/Busy'),
     }
 
 res_users()
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 8a003ec7cf1..cf0bc610be8 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -64,7 +64,7 @@ class res_partner_contact(osv.osv):
                          relation='res.partner', string='Main Employer'),
         'function': fields.related('job_ids', 'function', type='char', \
                                  string='Main Function'),
-        'job_id': fields.function(_main_job, method=True, type='many2one',\
+        'job_id': fields.function(_main_job, type='many2one',\
                                  relation='res.partner.job', string='Main Job'),
         'email': fields.char('E-Mail', size=240),
         'comment': fields.text('Notes', translate=True),
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index a026a077c85..29699b9000d 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -415,7 +415,7 @@ class report_creator(osv.osv):
         'model_ids': fields.many2many('ir.model', 'base_report_creator_report_model_rel', 'report_id', 'model_id', 'Reported Objects'),
         'field_ids': fields.one2many('base_report_creator.report.fields', 'report_id', 'Fields to Display'),
         'filter_ids': fields.one2many('base_report_creator.report.filter', 'report_id', 'Filters'),
-        'sql_query': fields.function(_sql_query_get, method=True, type="text", string='SQL Query', store=True),
+        'sql_query': fields.function(_sql_query_get, type="text", string='SQL Query', store=True),
         'group_ids': fields.many2many('res.groups', 'base_report_creator_group_rel', 'report_id', 'group_id', 'Authorized Groups'),
         'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
     }
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 7003bba2a8e..0b1e8db7bbb 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -682,7 +682,7 @@ class crm_case_section(osv.osv):
 
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
-        'complete_name': fields.function(get_full_name, method=True, type='char', size=256, readonly=True, store=True),
+        'complete_name': fields.function(get_full_name, type='char', size=256, readonly=True, store=True),
         'code': fields.char('Code', size=8),
         'active': fields.boolean('Active', help="If the active field is set to "\
                         "true, it will allow you to hide the sales team without removing it."),
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 11f465d8e39..a07974f4fd0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -170,7 +170,7 @@ class crm_lead(crm_case, osv.osv):
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
-        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', method=True, type='char', size=64),
+        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
     }
 
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 6d3d68ef881..440bbdfc3bf 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -125,7 +125,7 @@ class calendar_attendee(osv.osv):
        return result
 
     _columns = {
-        'categ_id': fields.function(_compute_data, method=True, \
+        'categ_id': fields.function(_compute_data, \
                         string='Event Type', type="many2one", \
                         relation="crm.case.categ", multi='categ_id'),
     }
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index aceee36e0a2..7ad3f7fff5f 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -63,7 +63,7 @@ class delivery_carrier(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
         'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
         'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
-        'price' : fields.function(get_price, method=True,string='Price'),
+        'price' : fields.function(get_price,string='Price'),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the delivery carrier without removing it.")
     }
     _defaults = {
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index d1ffb7ba968..05074268220 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -54,12 +54,12 @@ class stock_picking(osv.osv):
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier","Carrier"),
         'volume': fields.float('Volume'),
-        'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                  }),
-        'weight_net': fields.function(_cal_weight, method=True, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
                   store={
                  'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
                  'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
@@ -158,11 +158,11 @@ class stock_move(osv.osv):
         return res
 
     _columns = {
-        'weight': fields.function(_cal_move_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
+        'weight': fields.function(_cal_move_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
                   store={
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
-        'weight_net': fields.function(_cal_move_weight, method=True, type='float', string='Net weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
+        'weight_net': fields.function(_cal_move_weight, type='float', string='Net weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
                   store={
                  'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
                  }),
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 1665a7abf68..2726fcd5462 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -56,7 +56,7 @@ class ir_action_report_xml(osv.osv):
         return [('id','in',report_id)]
 
     _columns={
-        'model_id' : fields.function(_model_get, fnct_search=_model_search, method=True, string='Model Id'),
+        'model_id' : fields.function(_model_get, fnct_search=_model_search, string='Model Id'),
     }
 
 ir_action_report_xml()
diff --git a/addons/document/document.py b/addons/document/document.py
index 90f57438ce8..69e123b87eb 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -117,7 +117,7 @@ class document_file(osv.osv):
         # If ir.attachment contained any data before document is installed, preserve
         # the data, don't drop the column!
         'db_datas': fields.binary('Data', oldname='datas'),
-        'datas': fields.function(_data_get, method=True, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True),
+        'datas': fields.function(_data_get, fnct_inv=_data_set, string='File Content', type="binary", nodrop=True),
 
         # Fields of document:
         'user_id': fields.many2one('res.users', 'Owner', select=1),
diff --git a/addons/event/event.py b/addons/event/event.py
index 4d392689bba..0fc28c7c193 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -207,9 +207,9 @@ class event_event(osv.osv):
         'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}),
         'register_max': fields.integer('Maximum Registrations', help="Provide Maximum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
         'register_min': fields.integer('Minimum Registrations', help="Provide Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
+        'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_current',
             help="Total of Open and Done Registrations"),
-        'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
+        'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_prospect',
             help="Total of Prospect Registrations"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -301,7 +301,7 @@ class event_registration(osv.osv):
         "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
         "contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
         "unit_price": fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute=dp.get_precision('Sale Price'), store=True),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute=dp.get_precision('Sale Price'), store=True),
         "badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}),
         "event_product": fields.char("Invoice Name", size=128, readonly=True, states={'draft': [('readonly', False)]}),
         "tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 8a49fd876ba..70f7784f55b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -45,7 +45,7 @@ class hr_employee_category(osv.osv):
     _description = "Employee Category"
     _columns = {
         'name': fields.char("Category", size=64, required=True),
-        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
         'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories')
     }
@@ -92,8 +92,8 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees': fields.function(_no_of_employee, method=True, string='Expected Employees', help='Required number of Employees in total for that job.', multi="no_of_employee", store=True),
-        'no_of_employee': fields.function(_no_of_employee, method=True, string="No of Employee", help='Number of employee with that job.', multi="no_of_employee", store=True),
+        'expected_employees': fields.function(_no_of_employee, string='Expected Employees', help='Required number of Employees in total for that job.', multi="no_of_employee", store=True),
+        'no_of_employee': fields.function(_no_of_employee, string="No of Employee", help='Number of employee with that job.', multi="no_of_employee", store=True),
         'no_of_recruitment': fields.float('Expected in Recruitment'),
         'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
         'description': fields.text('Job Description'),
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index c885fdf30bd..3332207cb17 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -44,7 +44,7 @@ class hr_department(osv.osv):
     _name = "hr.department"
     _columns = {
         'name': fields.char('Department Name', size=64, required=True),
-        'complete_name': fields.function(_dept_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_dept_name_get_fnc, type="char", string='Name'),
         'company_id': fields.many2one('res.company', 'Company', select=True, required=False),
         'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
         'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 8c5648a1040..a138d66a285 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -56,7 +56,7 @@ class hr_attendance(osv.osv):
         'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
         'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
-        'day': fields.function(_day_compute, method=True, type='char', string='Day', store=True, select=1, size=32),
+        'day': fields.function(_day_compute, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
         'name': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), #please don't remove the lambda, if you remove it then the current time will not change
@@ -110,7 +110,7 @@ class hr_employee(osv.osv):
         return result
 
     _columns = {
-       'state': fields.function(_state, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
+       'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 7ed2d16d6b7..21d15a4194b 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -46,7 +46,7 @@ class hr_employee(osv.osv):
         'vehicle': fields.char('Company Vehicle', size=64),
         'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
-        'contract_id':fields.function(_get_latest_contract, method=True, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
+        'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
     }
 
 hr_employee()
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 2e7020306b5..0f996c79e79 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -70,7 +70,7 @@ class hr_expense_expense(osv.osv):
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
-        'amount': fields.function(_amount, method=True, string='Total Amount'),
+        'amount': fields.function(_amount, string='Total Amount'),
         'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
@@ -244,7 +244,7 @@ class hr_expense_line(osv.osv):
         'name': fields.char('Expense Note', size=128, required=True),
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
-        'total_amount': fields.function(_amount, method=True, string='Total', digits_compute=dp.get_precision('Account')),
+        'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
         'unit_quantity': fields.float('Quantities' ),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 7074fd5cecc..18b1bacc836 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -78,9 +78,9 @@ class hr_holidays_status(osv.osv):
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
         'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
-        'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
-        'leaves_taken': fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
-        'remaining_leaves': fields.function(_user_left_days, method=True, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
+        'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
+        'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
+        'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
         'double_validation': fields.boolean('Apply Double Validation', help="If its True then its Allocation/Request have to be validated by second validator")
     }
     _defaults = {
@@ -127,7 +127,7 @@ class hr_holidays(osv.osv):
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
-        'number_of_days': fields.function(_compute_number_of_days, method=True, string='Number of Days', store=True),
+        'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'case_id': fields.many2one('crm.meeting', 'Meeting'),
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone"),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index b29bd1312ac..43e35424da0 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -318,11 +318,11 @@ class hr_contract(osv.osv):
         'visa_expire': fields.date('Visa Expire Date'),
         'struct_id': fields.many2one('hr.payroll.structure', 'Salary Structure'),
         'working_days_per_week': fields.integer('Working Days', help="No of Working days / week for an employee"),
-        'basic': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
-        'gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
-        'net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
-        'advantages_net': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
-        'advantages_gross': fields.function(_calculate_salary, method=True, store=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
+        'basic': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
+        'gross': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
+        'net': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
+        'advantages_net': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
+        'advantages_gross': fields.function(_calculate_salary, store=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
     }
     _defaults = {
         'working_days_per_week': lambda *a: 5,
@@ -374,10 +374,10 @@ class payroll_register(osv.osv):
         ],'State', select=True, readonly=True),
         'active':fields.boolean('Active', required=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 4)),
-        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits=(16, 4)),
-        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits=(16, 4)),
-        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits=(16, 4)),
+        'grows': fields.function(_calculate, store=True, multi='dc', string='Gross Salary', type='float', digits=(16, 4)),
+        'net': fields.function(_calculate, store=True, multi='dc', string='Net Salary', digits=(16, 4)),
+        'allounce': fields.function(_calculate, store=True, multi='dc', string='Allowance', digits=(16, 4)),
+        'deduction': fields.function(_calculate, store=True, multi='dc', string='Deduction', digits=(16, 4)),
         'note': fields.text('Description'),
         'bank_id':fields.many2one('res.bank', 'Bank', required=False, help="Select the Bank Address from whcih the salary is going to be paid"),
     }
@@ -611,8 +611,8 @@ class contrib_register(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'register_line_ids':fields.one2many('hr.contibution.register.line', 'register_id', 'Register Line', readonly=True),
-        'monthly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', string='Total By Employee', digits=(16, 4)),
-        'monthly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', string='Total By Company', digits=(16, 4)),
+        'monthly_total_by_emp': fields.function(_total_contrib, multi='dc', string='Total By Employee', digits=(16, 4)),
+        'monthly_total_by_comp': fields.function(_total_contrib, multi='dc', string='Total By Company', digits=(16, 4)),
         'note': fields.text('Description'),
     }
     _defaults = {
@@ -644,7 +644,7 @@ class contrib_register_line(osv.osv):
         'date': fields.date('Date'),
         'emp_deduction': fields.float('Employee Deduction', digits=(16, 4)),
         'comp_deduction': fields.float('Company Deduction', digits=(16, 4)),
-        'total': fields.function(_total, method=True, store=True,  string='Total', digits=(16, 4)),
+        'total': fields.function(_total, store=True,  string='Total', digits=(16, 4)),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
@@ -884,12 +884,12 @@ class hr_payslip(osv.osv):
         'basic_before_leaves': fields.float('Basic Salary', readonly=True,  digits_compute=dp.get_precision('Account')),
         'leaves': fields.float('Leave Deductions', readonly=True,  digits_compute=dp.get_precision('Account')),
         'basic': fields.float('Net Basic', readonly=True,  digits_compute=dp.get_precision('Account')),
-        'grows': fields.function(_calculate, method=True, store=True, multi='dc', string='Gross Salary', digits_compute=dp.get_precision('Account')),
-        'net': fields.function(_calculate, method=True, store=True, multi='dc', string='Net Salary', digits_compute=dp.get_precision('Account')),
-        'allounce': fields.function(_calculate, method=True, store=True, multi='dc', string='Allowance', digits_compute=dp.get_precision('Account')),
-        'deduction': fields.function(_calculate, method=True, store=True, multi='dc', string='Deduction', digits_compute=dp.get_precision('Account')),
-        'other_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Others', digits_compute=dp.get_precision('Account')),
-        'total_pay': fields.function(_calculate, method=True, store=True, multi='dc', string='Total Payment', digits_compute=dp.get_precision('Account')),
+        'grows': fields.function(_calculate, store=True, multi='dc', string='Gross Salary', digits_compute=dp.get_precision('Account')),
+        'net': fields.function(_calculate, store=True, multi='dc', string='Net Salary', digits_compute=dp.get_precision('Account')),
+        'allounce': fields.function(_calculate, store=True, multi='dc', string='Allowance', digits_compute=dp.get_precision('Account')),
+        'deduction': fields.function(_calculate, store=True, multi='dc', string='Deduction', digits_compute=dp.get_precision('Account')),
+        'other_pay': fields.function(_calculate, store=True, multi='dc', string='Others', digits_compute=dp.get_precision('Account')),
+        'total_pay': fields.function(_calculate, store=True, multi='dc', string='Total Payment', digits_compute=dp.get_precision('Account')),
         'line_ids':fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'company_id':fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'holiday_days': fields.float('No of Leaves', readonly=True),
@@ -1436,11 +1436,11 @@ class hr_employee(osv.osv):
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'otherid': fields.char('Other Id', size=64),
 
-        'basic': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
-        'gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
-        'net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Net Salary', digits=(14,2)),
-        'advantages_net': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Deductions', digits=(14,2)),
-        'advantages_gross': fields.function(_calculate_salary, method=True, multi='dc', type='float', string='Allowances', digits=(14,2)),
+        'basic': fields.function(_calculate_salary, multi='dc', type='float', string='Basic Salary', digits=(14,2)),
+        'gross': fields.function(_calculate_salary, multi='dc', type='float', string='Gross Salary', digits=(14,2)),
+        'net': fields.function(_calculate_salary, multi='dc', type='float', string='Net Salary', digits=(14,2)),
+        'advantages_net': fields.function(_calculate_salary, multi='dc', type='float', string='Deductions', digits=(14,2)),
+        'advantages_gross': fields.function(_calculate_salary, multi='dc', type='float', string='Allowances', digits=(14,2)),
     }
 hr_employee()
 
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 416aeb485ef..deb06b121d0 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -180,8 +180,8 @@ class contrib_register(osv.osv):
     _columns = {
         'account_id': fields.many2one('account.account', 'Account'),
         'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
-        'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
-        'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
+        'yearly_total_by_emp': fields.function(_total_contrib, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
+        'yearly_total_by_comp': fields.function(_total_contrib, multi='dc', store=True,  string='Total By Company', digits=(16, 4)),
     }
 contrib_register()
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 5c042c5c7e3..d9314690ce7 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -66,7 +66,7 @@ class account_analytic_account(osv.osv):
         'pricelist_id': fields.many2one('product.pricelist', 'Sale Pricelist',
             help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
         'amount_max': fields.float('Max. Invoice Price'),
-        'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
+        'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Reinvoice Costs',
             help="Fill this field if you plan to automatically generate invoices based " \
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 4384a9e536f..cf4351112a4 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -286,13 +286,13 @@ class hr_timesheet_sheet(osv.osv):
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \
                 \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \
                 \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'),
-        'state_attendance' : fields.function(_state_attendance, method=True, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
-        'total_attendance_day': fields.function(_total_day, method=True, string='Total Attendance', multi="_total_day"),
-        'total_timesheet_day': fields.function(_total_day, method=True, string='Total Timesheet', multi="_total_day"),
-        'total_difference_day': fields.function(_total_day, method=True, string='Difference', multi="_total_day"),
-        'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total_sheet"),
-        'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total_sheet"),
-        'total_difference': fields.function(_total, method=True, string='Difference', multi="_total_sheet"),
+        'state_attendance' : fields.function(_state_attendance, type='selection', selection=[('absent', 'Absent'), ('present', 'Present'),('none','No employee defined')], string='Current Status'),
+        'total_attendance_day': fields.function(_total_day, string='Total Attendance', multi="_total_day"),
+        'total_timesheet_day': fields.function(_total_day, string='Total Timesheet', multi="_total_day"),
+        'total_difference_day': fields.function(_total_day, string='Difference', multi="_total_day"),
+        'total_attendance': fields.function(_total, string='Total Attendance', multi="_total_sheet"),
+        'total_timesheet': fields.function(_total, string='Total Timesheet', multi="_total_sheet"),
+        'total_difference': fields.function(_total, string='Difference', multi="_total_sheet"),
         'period_ids': fields.one2many('hr_timesheet_sheet.sheet.day', 'sheet_id', 'Period', readonly=True),
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
         'company_id': fields.many2one('res.company', 'Company'),
@@ -473,7 +473,7 @@ class hr_timesheet_line(osv.osv):
         return [('id', 'in', [x[0] for x in res])]
 
     _columns = {
-        'sheet_id': fields.function(_sheet, method=True, string='Sheet',
+        'sheet_id': fields.function(_sheet, string='Sheet',
             type='many2one', relation='hr_timesheet_sheet.sheet',
             fnct_search=_sheet_search),
     }
@@ -598,7 +598,7 @@ class hr_attendance(osv.osv):
         return [('id', 'in', [x[0] for x in res])]
 
     _columns = {
-        'sheet_id': fields.function(_sheet, method=True, string='Sheet',
+        'sheet_id': fields.function(_sheet, string='Sheet',
             type='many2one', relation='hr_timesheet_sheet.sheet',
             fnct_search=_sheet_search),
     }
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 04ae4dff5df..0e6e89f15b5 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -52,7 +52,7 @@ class idea_category(osv.osv):
 
     _columns = {
         'name': fields.char('Category', size=64, required=True),
-        'complete_name': fields.function(_categ_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_categ_name_get_fnc, type="char", string='Name'),
         'summary': fields.text('Summary'),
         'parent_id': fields.many2one('idea.category', 'Parent Categories', ondelete='set null'),
         'child_ids': fields.one2many('idea.category', 'parent_id', 'Child Categories'),
@@ -180,10 +180,10 @@ class idea_idea(osv.osv):
         'created_date': fields.datetime('Creation date', readonly=True),
         'open_date': fields.datetime('Open date', readonly=True, help="Date when an idea opened"),
         'vote_ids': fields.one2many('idea.vote', 'idea_id', 'Vote'),
-        'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", method=True, type="selection", selection=VoteValues),
-        'vote_avg': fields.function(_vote_avg_compute, method=True, string="Average Score", type="float"),
-        'count_votes': fields.function(_vote_count, method=True, string="Count of votes", type="integer"),
-        'count_comments': fields.function(_comment_count, method=True, string="Count of comments", type="integer"),
+        'my_vote': fields.function(_vote_read, fnct_inv = _vote_save, string="My Vote", type="selection", selection=VoteValues),
+        'vote_avg': fields.function(_vote_avg_compute, string="Average Score", type="float"),
+        'count_votes': fields.function(_vote_count, string="Count of votes", type="integer"),
+        'count_comments': fields.function(_comment_count, string="Count of comments", type="integer"),
         'category_id': fields.many2one('idea.category', 'Category', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Draft'),
             ('open', 'Opened'),
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index af9beac55e0..4896931b77b 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -73,7 +73,7 @@ class account_invoice(osv.osv):
             help='The partner bank account to pay\nKeep empty to use the default'
             ),
         ### Amount to pay
-        'amount_to_pay': fields.function(_amount_to_pay, method=True,
+        'amount_to_pay': fields.function(_amount_to_pay,
             type='float', string='Amount to be paid',
             help='The amount which should be paid at the current date\n' \
                     'minus the amount which is already in payment order'),
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 1499dd4414e..c940d23fa40 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -81,7 +81,7 @@ class lunch_cashbox(osv.osv):
     _columns = {
         'manager': fields.many2one('res.users', 'Manager'),
         'name': fields.char('Name', size=30, required=True, unique = True),
-        'sum_remain': fields.function(amount_available, method=True, string='Total Remaining'),
+        'sum_remain': fields.function(amount_available, string='Total Remaining'),
     }
 
 lunch_cashbox()
@@ -140,7 +140,7 @@ class lunch_order(osv.osv):
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
-        'price': fields.function(_price_get, method=True, string="Price"),
+        'price': fields.function(_price_get, string="Price"),
         'category': fields.many2one('lunch.category','Category'),
     }
 
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index ab40a9572e1..4fa70484666 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -281,7 +281,7 @@ class mailgate_message(osv.osv):
         'description': fields.text('Description', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
-        'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
+        'display_text': fields.function(_get_display_text, type='text', size="512", string='Display Text'),
     }
 
     def init(self, cr):
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 15c86f5298e..ae1ab2309e2 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -281,7 +281,7 @@ class marketing_campaign_segment(osv.osv):
                                    'State',),
         'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
         'date_done': fields.datetime('End Date', help="Date this segment was last closed or cancelled."),
-        'date_next_sync': fields.function(_get_next_sync, method=True, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),
+        'date_next_sync': fields.function(_get_next_sync, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),
     }
 
     _defaults = {
@@ -548,7 +548,7 @@ class marketing_campaign_transition(osv.osv):
 
 
     _columns = {
-        'name': fields.function(_get_name, method=True, string='Name',
+        'name': fields.function(_get_name, string='Name',
                                 type='char', size=128),
         'activity_from_id': fields.many2one('marketing.campaign.activity',
                                             'Previous Activity', select=1,
@@ -649,7 +649,7 @@ class marketing_campaign_workitem(osv.osv):
         'object_id': fields.related('activity_id', 'campaign_id', 'object_id',
              type='many2one', relation='ir.model', string='Resource', select=1, readonly=True, store=True),
         'res_id': fields.integer('Resource ID', select=1, readonly=True),
-        'res_name': fields.function(_res_name_get, method=True, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
+        'res_name': fields.function(_res_name_get, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
         'date': fields.datetime('Execution Date', help='If date is not set, this workitem has to be run manually', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True),
         'state': fields.selection([('todo', 'To Do'),
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index 0b245aee785..af04a7e6dff 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -62,7 +62,7 @@ class campaign_analysis(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'country_id': fields.related('partner_id','address', 'country_id',
                     type='many2one', relation='res.country',string='Country'),
-        'total_cost' : fields.function(_total_cost, string='Cost', method=True,
+        'total_cost' : fields.function(_total_cost, string='Cost',
                                     type="float", digits_compute=dp.get_precision('Purchase Price')),
         'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Sale Price')),
         'count' : fields.integer('# of Actions', readonly=True),
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 48fd8dc2d41..6384a255ac3 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -149,7 +149,7 @@ class membership_line(osv.osv):
         'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True,  help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
-        'state': fields.function(_state, method=True,
+        'state': fields.function(_state,
                         string='Membership State', type='selection',
                         selection=STATE, store = {
                         'account.invoice': (_get_membership_lines, ['state'], 10),
@@ -322,7 +322,7 @@ class Partner(osv.osv):
                     'Membership amount', digits=(16, 2),
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
-                    __get_membership_state, method=True,
+                    __get_membership_state,
                     string = 'Current Membership State', type = 'selection',
                     selection = STATE,
                     store = {
@@ -337,7 +337,7 @@ class Partner(osv.osv):
                     -Invoiced Member: A member whose invoice has been created.
                     -Paid Member: A member who has paid the membership amount."""),
         'membership_start': fields.function(
-                    _membership_date, method=True, multi = 'membeship_start',
+                    _membership_date, multi = 'membeship_start',
                     string = 'Start membership date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
@@ -345,7 +345,7 @@ class Partner(osv.osv):
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
-                    _membership_date, method=True,
+                    _membership_date,
                     string = 'Stop membership date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
@@ -353,7 +353,7 @@ class Partner(osv.osv):
                         'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
                     }, help="Date until which membership remains active."),
         'membership_cancel': fields.function(
-                    _membership_date, method=True,
+                    _membership_date,
                     string = 'Cancel membership date', type='date', multi='membership_cancel',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 11),
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5603327290d..ec429488914 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -197,7 +197,7 @@ class mrp_bom(osv.osv):
                                  help= "If a sub-product is used in several products, it can be useful to create its own BoM. "\
                                  "Though if you don't want separated production orders for this sub-product, select Set/Phantom as BoM type. "\
                                  "If a Phantom BoM is used for a root product, it will be sold and shipped as a set of components, instead of being produced."),
-        'method': fields.function(_compute_type, string='Method', method=True, type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
+        'method': fields.function(_compute_type, string='Method', type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
         'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
         'date_stop': fields.date('Valid Until', help="Validity of this BoM or component. Keep empty if it's always valid."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bills of material."),
@@ -214,7 +214,7 @@ class mrp_bom(osv.osv):
         'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
         'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
         'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
-        'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
+        'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
@@ -457,8 +457,8 @@ class mrp_production(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True,
             readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will stock the finished products."),
 
-        'date_planned_end': fields.function(_production_date_end, method=True, type='date', string='Scheduled End Date'),
-        'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'),
+        'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'),
+        'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'),
         'date_planned': fields.datetime('Scheduled date', required=True, select=1),
         'date_start': fields.datetime('Start Date', select=True),
         'date_finished': fields.datetime('End Date', select=True),
@@ -478,8 +478,8 @@ class mrp_production(osv.osv):
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
-        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder', store=True),
-        'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder', store=True),
+        'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
+        'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 589d3c27031..fe926d30ac1 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -92,9 +92,9 @@ class mrp_production_workcenter_line(osv.osv):
                                        "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pause' state.\n" \
                                        "* When the user cancels the work order it will be set in 'Canceled' state.\n" \
                                        "* When order is completely processed that time it is set in 'Finished' state."),
-       'date_start_date': fields.function(_get_date_date, method=True, string='Start Date', type='date'),
+       'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'),
        'date_planned': fields.datetime('Scheduled Date'),
-       'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
+       'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'),
        'date_start': fields.datetime('Start Date'),
        'date_finished': fields.datetime('End Date'),
        'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this Work Center",readonly=True),
@@ -554,7 +554,7 @@ class mrp_operations_operation(osv.osv):
         'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
         'date_start': fields.datetime('Start Date'),
         'date_finished': fields.datetime('End Date'),
-        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'], 10)}),
+        'order_date': fields.function(_get_order_date,string='Order Date',type='date',store={'mrp.production':(_order_date_search_production,['date_planned'], 10)}),
         }
     _defaults={
         'date_start': lambda *a:datetime.now().strftime('%Y-%m-%d %H:%M:%S')
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index e95e3fb6058..caacb2e3247 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -117,7 +117,7 @@ class mrp_repair(osv.osv):
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'),
         'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
-        'default_address_id': fields.function(_get_default_address, method=True, type="many2one", relation="res.partner.address"),
+        'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner.address"),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
             ('draft','Quotation'),
@@ -156,17 +156,17 @@ class mrp_repair(osv.osv):
         'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired': fields.boolean('Repaired', readonly=True),
-        'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount',
             store={
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
-        'amount_tax': fields.function(_amount_tax, method=True, string='Taxes',
+        'amount_tax': fields.function(_amount_tax, string='Taxes',
             store={
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
-        'amount_total': fields.function(_amount_total, method=True, string='Total',
+        'amount_total': fields.function(_amount_total, string='Total',
             store={
                 'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
@@ -661,7 +661,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], required=True),
         'invoiced': fields.boolean('Invoiced',readonly=True),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2), required=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
@@ -750,7 +750,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         'product_uom_qty': fields.float('Quantity', digits=(16,2), required=True),
         'price_unit': fields.float('Unit Price', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'repair_fee_line_tax', 'repair_fee_line_id', 'tax_id', 'Taxes'),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
         'to_invoice': fields.boolean('To Invoice'),
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 4eeb7b2dd9f..917e6273ddc 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -253,17 +253,17 @@ class pos_order(osv.osv):
                                            method=True,
                                            string='Validation Date',
                                            type='date', select=True, store=True),
-        'date_payment': fields.function(_get_date_payment2, method=True,
+        'date_payment': fields.function(_get_date_payment2,
                                         string='Payment Date',
                                         type='date', select=True, store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
         'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
         'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
-        'amount_tax': fields.function(_amount_all, method=True, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
-        'amount_total': fields.function(_amount_all, method=True, string='Total', multi='all'),
-        'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
-        'amount_return': fields.function(_amount_all, 'Returned', method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_tax': fields.function(_amount_all, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_total': fields.function(_amount_all, string='Total', multi='all'),
+        'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+        'amount_return': fields.function(_amount_all, 'Returned', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
         'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
         'price_type': fields.selection([
                                 ('tax_excluded','Tax excluded')],
@@ -955,7 +955,7 @@ class account_bank_statement_line(osv.osv):
             res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
         return res
     _columns= {
-        'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
+        'journal_id': fields.function(_get_statement_journal,store=True, string='Journal', type='char', size=64),
         'am_out': fields.boolean("To count"),
         'is_acc': fields.boolean("Is accompte"),
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
@@ -1141,12 +1141,12 @@ class pos_order_line(osv.osv):
         'notice': fields.char('Discount Notice', size=128, required=True),
         'serial_number': fields.char('Serial Number', size=128),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-        'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
+        'price_unit': fields.function(_get_amount, string='Unit Price', store=True),
         'price_ded': fields.float('Discount(Amount)', digits_compute=dp.get_precision('Point Of Sale')),
         'qty': fields.float('Quantity'),
         'qty_rfd': fields.float('Refunded Quantity'),
-        'price_subtotal': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal w/o Tax'),
-        'price_subtotal_incl': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal'),
+        'price_subtotal': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal w/o Tax'),
+        'price_subtotal_incl': fields.function(_amount_line_all, multi='pos_order_line_amount', string='Subtotal'),
         'discount': fields.float('Discount (%)', digits=(16, 2)),
         'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 743ef85a9ea..f05ca64144d 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -527,7 +527,7 @@ class stock_warehouse_orderpoint(osv.osv):
             help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
         'company_id': fields.many2one('res.company','Company',required=True),
-        'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \
+        'procurement_draft_ids': fields.function(_get_draft_procurements, type='many2many', relation="procurement.order", \
                                 string="Related Procurement Orders",help="Draft procurement of the product and location of that orderpoint"),
     }
     _defaults = {
diff --git a/addons/product/product.py b/addons/product/product.py
index fa6796b3953..320b4552c18 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -206,7 +206,7 @@ class product_category(osv.osv):
     _description = "Product Category"
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
-        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
         'parent_id': fields.many2one('product.category','Parent Category', select=True),
         'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
@@ -296,9 +296,9 @@ class product_template(osv.osv):
             help='Coefficient to convert UOM to UOS\n'
             ' uos = uom * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
-        'seller_delay': fields.function(_calc_seller, method=True, type='integer', string='Supplier Lead Time', multi="seller_delay", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
-        'seller_qty': fields.function(_calc_seller, method=True, type='float', string='Supplier Quantity', multi="seller_qty", help="This is minimum quantity to purchase from Main Supplier."),
-        'seller_id': fields.function(_calc_seller, method=True, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_id"),
+        'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_delay", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
+        'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_qty", help="This is minimum quantity to purchase from Main Supplier."),
+        'seller_id': fields.function(_calc_seller, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_id"),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
         'loc_rack': fields.char('Rack', size=16),
         'loc_row': fields.char('Row', size=16),
@@ -469,14 +469,14 @@ class product_product(osv.osv):
     _inherits = {'product.template': 'product_tmpl_id'}
     _order = 'default_code,name_template'
     _columns = {
-        'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock'),
-        'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
-        'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming'),
-        'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing'),
-        'price': fields.function(_product_price, method=True, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
-        'lst_price' : fields.function(_product_lst_price, method=True, type='float', string='Public Price', digits_compute=dp.get_precision('Sale Price')),
-        'code': fields.function(_product_code, method=True, type='char', string='Reference'),
-        'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'),
+        'qty_available': fields.function(_product_qty_available, type='float', string='Real Stock'),
+        'virtual_available': fields.function(_product_virtual_available, type='float', string='Virtual Stock'),
+        'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
+        'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
+        'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
+        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Sale Price')),
+        'code': fields.function(_product_code, type='char', string='Reference'),
+        'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
         'default_code' : fields.char('Reference', size=64),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
@@ -733,7 +733,7 @@ class product_supplierinfo(osv.osv):
         'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
         'product_uom': fields.many2one('product.uom', string="Supplier UoM", help="Choose here the Unit of Measure in which the prices and quantities are expressed below."),
         'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."),
-        'qty': fields.function(_calc_qty, method=True, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
+        'qty': fields.function(_calc_qty, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
         'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
         'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index 37639c3b223..5895feedf3f 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -92,38 +92,38 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'date_from': fields.function(_product_margin, method=True, type='date', string='From Date', multi='product_margin'),
-        'date_to': fields.function(_product_margin, method=True, type='date', string='To Date', multi='product_margin'),
-        'invoice_state': fields.function(_product_margin, method=True, type='selection', selection=[
+        'date_from': fields.function(_product_margin, type='date', string='From Date', multi='product_margin'),
+        'date_to': fields.function(_product_margin, type='date', string='To Date', multi='product_margin'),
+        'invoice_state': fields.function(_product_margin, type='selection', selection=[
                 ('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid')
             ], string='Invoice State',multi='product_margin', readonly=True),
-        'sale_avg_price' : fields.function(_product_margin, method=True, type='float', string='Avg. Unit Price', multi='product_margin',
+        'sale_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin',
             help="Avg. Price in Customer Invoices)"),
-        'purchase_avg_price' : fields.function(_product_margin, method=True, type='float', string='Avg. Unit Price', multi='product_margin',
+        'purchase_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin',
             help="Avg. Price in Supplier Invoices "),
-        'sale_num_invoiced' : fields.function(_product_margin, method=True, type='float', string='# Invoiced', multi='product_margin',
+        'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
             help="Sum of Quantity in Customer Invoices"),
-        'purchase_num_invoiced' : fields.function(_product_margin, method=True, type='float', string='# Invoiced', multi='product_margin',
+        'purchase_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
             help="Sum of Quantity in Supplier Invoices"),
-        'sales_gap' : fields.function(_product_margin, method=True, type='float', string='Sales Gap', multi='product_margin',
+        'sales_gap' : fields.function(_product_margin, type='float', string='Sales Gap', multi='product_margin',
             help="Expected Sale - Turn Over"),
-        'purchase_gap' : fields.function(_product_margin, method=True, type='float', string='Purchase Gap', multi='product_margin',
+        'purchase_gap' : fields.function(_product_margin, type='float', string='Purchase Gap', multi='product_margin',
             help="Normal Cost - Total Cost"),
-        'turnover' : fields.function(_product_margin, method=True, type='float', string='Turnover' ,multi='product_margin',
+        'turnover' : fields.function(_product_margin, type='float', string='Turnover' ,multi='product_margin',
             help="Sum of Multification of Invoice price and quantity of Customer Invoices"),
-        'total_cost'  : fields.function(_product_margin, method=True, type='float', string='Total Cost', multi='product_margin',
+        'total_cost'  : fields.function(_product_margin, type='float', string='Total Cost', multi='product_margin',
             help="Sum of Multification of Invoice price and quantity of Supplier Invoices "),
-        'sale_expected' :  fields.function(_product_margin, method=True, type='float', string='Expected Sale', multi='product_margin',
+        'sale_expected' :  fields.function(_product_margin, type='float', string='Expected Sale', multi='product_margin',
             help="Sum of Multification of Sale Catalog price and quantity of Customer Invoices"),
-        'normal_cost'  : fields.function(_product_margin, method=True, type='float', string='Normal Cost', multi='product_margin',
+        'normal_cost'  : fields.function(_product_margin, type='float', string='Normal Cost', multi='product_margin',
             help="Sum of Multification of Cost price and quantity of Supplier Invoices"),
-        'total_margin' : fields.function(_product_margin, method=True, type='float', string='Total Margin', multi='product_margin',
+        'total_margin' : fields.function(_product_margin, type='float', string='Total Margin', multi='product_margin',
             help="Turnorder - Standard price"),
-        'expected_margin' : fields.function(_product_margin, method=True, type='float', string='Expected Margin', multi='product_margin',
+        'expected_margin' : fields.function(_product_margin, type='float', string='Expected Margin', multi='product_margin',
             help="Expected Sale - Normal Cost"),
-        'total_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Total Margin (%)', multi='product_margin',
+        'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin (%)', multi='product_margin',
             help="Total margin * 100 / Turnover"),
-        'expected_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Expected Margin (%)', multi='product_margin',
+        'expected_margin_rate' : fields.function(_product_margin, type='float', string='Expected Margin (%)', multi='product_margin',
             help="Expected margin * 100 / Expected Sale"),
     }
 
diff --git a/addons/project/project.py b/addons/project/project.py
index 3d20bc2f5f8..b1461da424c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -123,7 +123,7 @@ class project(osv.osv):
         return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
 
     _columns = {
-        'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=250),
+        'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
@@ -133,18 +133,18 @@ class project(osv.osv):
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
-        'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
+        'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
             }),
-        'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
-        'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
+        'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects."),
+        'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (lambda self, cr, uid, ids, c={}: ids, ['tasks'], 10),
                 'project.task': (_get_project_task, ['planned_hours', 'effective_hours', 'remaining_hours', 'total_hours', 'progress', 'delay_hours','state'], 10),
             }),
-        'progress_rate': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo."),
+        'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo."),
         'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -420,7 +420,7 @@ class task(osv.osv):
         return result.keys()
 
     _columns = {
-        'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
+        'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority'),
@@ -438,23 +438,23 @@ class task(osv.osv):
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
         'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
-        'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
+        'effective_hours': fields.function(_hours_get, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
-        'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
+        'total_hours': fields.function(_hours_get, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
+        'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
+        'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index a8a32847243..abb9b7e92ff 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -216,7 +216,7 @@ class project_issue(crm.crm_case, osv.osv):
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
-        'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
+        'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
             store = {
                 'project.issue': (lambda self, cr, uid, ids, c={}: ids, ['task_id'], 10),
                 'project.task': (_get_issue_task, ['progress'], 10),
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index a6437819248..6c5ef7890bf 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -120,7 +120,7 @@ class project_phase(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
                                   help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
                                   \n If the phase is over, the states is set to \'Done\'.'),
-        'total_hours': fields.function(_compute, method=True, string='Total Hours'),
+        'total_hours': fields.function(_compute, string='Total Hours'),
      }
     _defaults = {
         'responsible_id': lambda obj,cr,uid,context: uid,
@@ -399,7 +399,7 @@ class project_resource_allocation(osv.osv):
             res[allocation.id] = name
         return res
     _columns = {
-        'name': fields.function(get_name, method=True, type='char', size=256),
+        'name': fields.function(get_name, type='char', size=256),
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
         'project_id': fields.related('phase_id', 'project_id', type='many2one', relation="project.project", string='Project', store=True),
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 46cc225153e..701a9a12cd6 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -128,8 +128,8 @@ class report_account_analytic_planning(osv.osv):
         'business_days': fields.integer('Business Days', required=True, states={'done':[('readonly', True)]}, help='Set here the number of working days within this planning for one person full time'),
         'planning_user_ids': one2many_mod3('report_account_analytic.planning.user', 'planning_id', 'Planning By User'),
         'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'),
-        'total_planned': fields.function(_get_total_planned, method=True, string='Total Planned'),
-        'total_free': fields.function(_get_total_free, method=True, string='Total Free'),
+        'total_planned': fields.function(_get_total_planned, string='Total Planned'),
+        'total_free': fields.function(_get_total_free, string='Total Free'),
     }
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-01'),
@@ -202,7 +202,7 @@ class report_account_analytic_planning_line(osv.osv):
         'amount': fields.float('Quantity', required=True),
         'amount_unit': fields.many2one('product.uom', 'Qty UoM', required=True),
         'note': fields.text('Note', size=64),
-        'amount_in_base_uom': fields.function(_amount_base_uom, method=True, string='Quantity in base uom', store=True),
+        'amount_in_base_uom': fields.function(_amount_base_uom, string='Quantity in base uom', store=True),
         'task_ids': fields.one2many('project.task', 'planning_line_id', 'Planning Tasks'),
     }
     _order = 'user_id, account_id'
@@ -301,13 +301,13 @@ class report_account_analytic_planning_user(osv.osv):
     _columns = {
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'tasks': fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+        'tasks': fields.function(_get_tasks, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
         'plan_tasks': fields.float('Time Planned on Tasks', readonly=True, help='This value is given by the sum of time allocation with task(s) linked, expressed in days.'),
-        'free': fields.function(_get_free, method=True, string='Unallocated Time', readonly=True, help='Computed as \
+        'free': fields.function(_get_free, string='Unallocated Time', readonly=True, help='Computed as \
 Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)'),
         'plan_open': fields.float('Time Allocation without Tasks', readonly=True,help='This value is given by the sum of time allocation without task(s) linked, expressed in days.'),
         'holiday': fields.float('Leaves',help='This value is given by the total of validated leaves into the \'Date From\' and \'Date To\' of the planning.'),
-        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
+        'timesheet': fields.function(_get_timesheets, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
     }
 
     def init(self, cr):
@@ -435,10 +435,10 @@ class report_account_analytic_planning_account(osv.osv):
     _columns = {
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'account_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
-        'tasks': fields.function(_get_tasks, method=True, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
+        'tasks': fields.function(_get_tasks, string='Remaining Tasks', help='This value is given by the sum of work remaining to do on the task for this planning, expressed in days.'),
         'plan_tasks': fields.float('Time Allocation of Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to TRUE expressed in days.'),
         'plan_open': fields.float('Time Allocation without Tasks', readonly=True, help='This value is given by the sum of time allocation with the checkbox \'Assigned in Taks\' set to FALSE, expressed in days.'),
-        'timesheet': fields.function(_get_timesheets, method=True, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
+        'timesheet': fields.function(_get_timesheets, string='Timesheet', help='This value is given by the sum of all work encoded in the timesheet(s) between the \'Date From\' and \'Date To\' of the planning.'),
     }
 
     def init(self, cr):
@@ -546,8 +546,8 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         'manager_id': fields.many2one('res.users', 'Manager'),
         'account_id': fields.many2one('account.analytic.account', 'Account'),
         'sum_amount': fields.float('Planned Days', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
-        'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
+        'sum_amount_real': fields.function(_sum_amount_real, string='Timesheet'),
+        'sum_amount_tasks': fields.function(_sum_amount_tasks, string='Tasks'),
     }
 
     def init(self, cr):
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 6c274aa3f6a..334a415982d 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -106,9 +106,9 @@ class project_scrum_sprint(osv.osv):
         'review': fields.text('Sprint Review'),
         'retrospective': fields.text('Sprint Retrospective'),
         'backlog_ids': fields.one2many('project.scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
-        'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", method=True, string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
-        'effective_hours': fields.function(_compute, multi="effective_hours", method=True, string='Effective hours', help="Computed using the sum of the task work done."),
-        'expected_hours': fields.function(_compute, multi="expected_hours", method=True, string='Planned Hours', help='Estimated time to do the task.'),
+        'progress': fields.function(_compute, group_operator="avg", type='float', multi="progress", string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
+        'effective_hours': fields.function(_compute, multi="effective_hours", string='Effective hours', help="Computed using the sum of the task work done."),
+        'expected_hours': fields.function(_compute, multi="expected_hours", string='Planned Hours', help='Estimated time to do the task.'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
     }
     _defaults = {
@@ -230,11 +230,11 @@ class project_scrum_product_backlog(osv.osv):
         'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
         'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
-        'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', method=True, string='Progress', help="Computed as: Time Spent / Total Time."),
-        'effective_hours': fields.function(_compute, multi="effective_hours", method=True, string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
+        'progress': fields.function(_compute, multi="progress", group_operator="avg", type='float', string='Progress', help="Computed as: Time Spent / Total Time."),
+        'effective_hours': fields.function(_compute, multi="effective_hours", string='Spent Hours', help="Computed using the sum of the time spent on every related tasks", store=True),
         'expected_hours': fields.float('Planned Hours', help='Estimated total time to do the Backlog'),
         'create_date': fields.datetime("Creation Date", readonly=True),
-        'task_hours': fields.function(_compute, multi="task_hours", method=True, string='Task Hours', help='Estimated time of the total hours of the tasks')
+        'task_hours': fields.function(_compute, multi="task_hours", string='Task Hours', help='Estimated time of the total hours of the tasks')
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index 623d4e4a5cd..3c223ab6b07 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -62,8 +62,8 @@ class report_timesheet_task_user(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'user_id': fields.many2one('res.users', 'User',readonly=True),
-        'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"),
-        'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"),
+        'timesheet_hrs': fields.function(get_hrs_timesheet, string="Timesheet Hours"),
+        'task_hrs': fields.function(_get_task_hours, string="Task Hours"),
     }
 
     def init(self, cr):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6f6ab0c1b44..6ec558acc97 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -185,29 +185,29 @@ class purchase_order(osv.osv):
         'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"),
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
-        'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
-        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
+        'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
+        'invoiced': fields.function(_invoiced, string='Invoiced & Paid', type='boolean', help="It indicates that an invoice has been paid"),
+        'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
                 "will just have to validate this invoice for control.\n" \
                 "From Picking: a draft invoice will be pre-generated based on validated receptions.\n" \
                 "Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
         ),
-        'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
+        'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
             store = {
                 'purchase.order.line': (_get_order, ['date_planned'], 10),
             }
         ),
-        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The amount without tax"),
-        'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The tax amount"),
-        'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums",help="The total amount"),
@@ -622,7 +622,7 @@ class purchase_order_line(osv.osv):
         'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Purchase Price')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
         'notes': fields.text('Notes'),
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0b436f0dc91..e9a670cdaaf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -236,25 +236,25 @@ class sale_order(osv.osv):
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
         'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is a list of picking that has been generated for this sales order."),
         'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
-        'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
-        'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Paid',
+        'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
+        'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
+        'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
         'note': fields.text('Notes'),
 
-        'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The amount without tax."),
-        'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The tax amount."),
-        'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Total',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
@@ -851,7 +851,7 @@ class sale_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
@@ -863,7 +863,7 @@ class sale_order_line(osv.osv):
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
         'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
         'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft': [('readonly', False)]}),
-        'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
+        'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 8d5d219537f..136e7d68198 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -48,7 +48,6 @@ class res_partner(osv.osv):
             type = 'many2one',
             relation = 'sale_journal.invoice.type',
             string = "Invoicing Method",
-            method = True,
             view_load = True,
             group_name = "Accounting Properties",
             help = "The type of journal used for sales and picking."),
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 8f1cb8027ae..24f36b9f94b 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -49,7 +49,7 @@ class sale_order_line(osv.osv):
         return res
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True),
+        'margin': fields.function(_product_margin, string='Margin', store=True),
         'purchase_price': fields.float('Cost Price', digits=(16,2))
     }
 
@@ -67,7 +67,7 @@ class sale_order(osv.osv):
         return result
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
+        'margin': fields.function(_product_margin, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
     }
 
 sale_order()
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index ae1df1eb946..840c33770a7 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -70,8 +70,8 @@ class mrp_production(osv.osv):
         return res
 
     _columns = {
-        'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
-        'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
+        'sale_name': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
+        'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
     }
 
 mrp_production()
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index 60595903ab8..ceb6d48755c 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -54,9 +54,9 @@ class sale_order_dates(osv.osv):
         return res
 
     _columns = {
-        'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."),
+        'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."),
         'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales."),
-        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
+        'effective_date': fields.function(_get_effective_date, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
     }
 
 sale_order_dates()
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 2a819ea89b2..49068deba96 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -326,10 +326,10 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
-        'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'qty_available': fields.function(_product_available, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'virtual_available': fields.function(_product_available, type='float', string='Virtual Stock', help="Future stock for this product according to the selected locations or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'incoming_qty': fields.function(_product_available, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
+        'outgoing_qty': fields.function(_product_available, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available', digits_compute=dp.get_precision('Product UoM')),
         'track_production': fields.boolean('Track Manufacturing Lots' , help="Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"),
@@ -423,11 +423,11 @@ class product_template(osv.osv):
             help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"),
         'property_stock_account_input': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Input Account', method=True, view_load=True,
+            string='Stock Input Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
         'property_stock_account_output': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Output Account', method=True, view_load=True,
+            string='Stock Output Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. If not set on the product, the one from the product category is used.'),
     }
 
@@ -439,15 +439,15 @@ class product_category(osv.osv):
     _columns = {
         'property_stock_journal': fields.property('account.journal',
             relation='account.journal', type='many2one',
-            string='Stock journal', method=True, view_load=True,
+            string='Stock journal', view_load=True,
             help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
         'property_stock_account_input_categ': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Input Account', method=True, view_load=True,
+            string='Stock Input Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
         'property_stock_account_output_categ': fields.property('account.account',
             type='many2one', relation='account.account',
-            string='Stock Output Account', method=True, view_load=True,
+            string='Stock Output Account', view_load=True,
             help='When doing real-time inventory valuation, counterpart Journal Items for all outgoing stock moves will be posted in this account. This is the default value for all products in this category, it can also directly be set on each product.'),
         'property_stock_variation': fields.property('account.account',
             type='many2one',
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d478ab39c9c..e93a60289aa 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -167,10 +167,10 @@ class stock_location(osv.osv):
                        \n* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products
                       """, select = True),
          # temporarily removed, as it's unused: 'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
-        'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
+        'complete_name': fields.function(_complete_name, type='char', size=100, string="Location Name"),
 
-        'stock_real': fields.function(_product_value, method=True, type='float', string='Real Stock', multi="stock"),
-        'stock_virtual': fields.function(_product_value, method=True, type='float', string='Virtual Stock', multi="stock"),
+        'stock_real': fields.function(_product_value, type='float', string='Real Stock', multi="stock"),
+        'stock_virtual': fields.function(_product_value, type='float', string='Virtual Stock', multi="stock"),
 
         'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
         'child_ids': fields.one2many('stock.location', 'location_id', 'Contains'),
@@ -207,8 +207,8 @@ class stock_location(osv.osv):
 
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
-        'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
-        'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
+        'stock_real_value': fields.function(_product_value, type='float', string='Real Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
+        'stock_virtual_value': fields.function(_product_value, type='float', string='Virtual Stock Value', multi="stock", digits_compute=dp.get_precision('Account')),
         'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
         'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
         'valuation_in_account_id': fields.many2one('account.account', 'Stock Input Account',domain = [('type','=','other')], help='This account will be used to value stock moves that have this location as destination, instead of the stock output account from the product.'),
@@ -1399,7 +1399,7 @@ class stock_production_lot(osv.osv):
         'prefix': fields.char('Prefix', size=64, help="Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]"),
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
         'date': fields.datetime('Creation Date', required=True),
-        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select=True,
+        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True,
             help="Current quantity of products with this Production Lot Number available in company warehouses",
             digits_compute=dp.get_precision('Product UoM')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 160ce6a3c20..7e9342292b9 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -459,9 +459,9 @@ class stock_planning(osv.osv):
         'planned_outgoing': fields.float('Planned Out', required=True,  \
                 help = 'Enter planned outgoing quantity from selected Warehouse during the selected Period of selected Product. '\
                         'To plan this value look at Confirmed Out or Sales Forecasts. This value should be equal or greater than Confirmed Out.'),
-        'company_forecast': fields.function(_get_forecast, method=True, string ='Company Forecast', multi = 'company', \
+        'company_forecast': fields.function(_get_forecast, string ='Company Forecast', multi = 'company', \
                 help = 'All sales forecasts for whole company (for all Warehouses) of selected Product during selected Period.'),
-        'warehouse_forecast': fields.function(_get_forecast, method=True, string ='Warehouse Forecast',  multi = 'warehouse',\
+        'warehouse_forecast': fields.function(_get_forecast, string ='Warehouse Forecast',  multi = 'warehouse',\
                 help = 'All sales forecasts for selected Warehouse of selected Product during selected Period.'),
         'stock_simulation': fields.float('Stock Simulation', readonly =True, \
                 help = 'Stock simulation at the end of selected Period.\n For current period it is: \n' \
@@ -480,10 +480,10 @@ class stock_planning(osv.osv):
         'to_procure': fields.float(string='Planned In', required=True, \
                 help = 'Enter quantity which (by your plan) should come in. Change this value and observe Stock simulation. ' \
                         'This value should be equal or greater than Confirmed In.'),
-        'line_time': fields.function(_get_past_future, method=True,type='char', string='Past/Future'),
-        'minimum_op': fields.function(_get_op, method=True, type='float', string = 'Minimum Rule', multi= 'minimum', \
+        'line_time': fields.function(_get_past_future,type='char', string='Past/Future'),
+        'minimum_op': fields.function(_get_op, type='float', string = 'Minimum Rule', multi= 'minimum', \
                             help = 'Minimum quantity set in Minimum Stock Rules for this Warhouse'),
-        'maximum_op': fields.function(_get_op, method=True, type='float', string = 'Maximum Rule', multi= 'maximum', \
+        'maximum_op': fields.function(_get_op, type='float', string = 'Maximum Rule', multi= 'maximum', \
                             help = 'Maximum quantity set in Minimum Stock Rules for this Warhouse'),
         'outgoing_before': fields.float('Planned Out Before', readonly=True, \
                             help= 'Planned Out in periods before calculated. '\
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 42111499187..74d15382670 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -247,7 +247,7 @@ class survey_question(osv.osv):
         'req_error_msg': fields.text('Error Message'),
         'allow_comment': fields.boolean('Allow Comment Field'),
         'sequence': fields.integer('Sequence'),
-        'tot_resp': fields.function(_calc_response, method=True, string="Total Answer"),
+        'tot_resp': fields.function(_calc_response, string="Total Answer"),
         'survey': fields.related('page_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'descriptive_text': fields.text('Descriptive Text', size=255),
         'column_heading_ids': fields.one2many('survey.question.column.heading', 'question_id',' Column heading'),
@@ -586,8 +586,8 @@ class survey_answer(osv.osv):
         'question_id': fields.many2one('survey.question', 'Question', ondelete='cascade'),
         'answer': fields.char('Answer', size=128, required=1),
         'sequence': fields.integer('Sequence'),
-        'response': fields.function(_calc_response_avg, method=True, string="#Answer", multi='sums'),
-        'average': fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
+        'response': fields.function(_calc_response_avg, string="#Answer", multi='sums'),
+        'average': fields.function(_calc_response_avg, string="#Avg", multi='sums'),
         'type': fields.selection([('char','Character'),('date','Date'),('datetime','Date & Time'),\
             ('integer','Integer'),('float','Float'),('selection','Selection'),\
             ('email','Email')], "Type of Answer",required=1),

From 63ebd1cdb30dfca27e897ae03ddfa49fb2c824ce Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 2 Jul 2011 05:05:53 +0000
Subject: [PATCH 56/56] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110702050553-o1o1p8skzk0twqr9
---
 debian/po/bg.po                      |  2 +-
 debian/po/ca.po                      |  2 +-
 debian/po/cs.po                      |  2 +-
 debian/po/de.po                      |  2 +-
 debian/po/el.po                      |  2 +-
 debian/po/en_GB.po                   |  2 +-
 debian/po/es.po                      |  2 +-
 debian/po/es_CL.po                   |  2 +-
 debian/po/es_EC.po                   |  2 +-
 debian/po/fa.po                      |  2 +-
 debian/po/fi.po                      |  2 +-
 debian/po/fr.po                      |  2 +-
 debian/po/gl.po                      |  2 +-
 debian/po/he.po                      |  2 +-
 debian/po/hr.po                      |  2 +-
 debian/po/hu.po                      |  2 +-
 debian/po/it.po                      |  2 +-
 debian/po/ja.po                      |  2 +-
 debian/po/ko.po                      |  2 +-
 debian/po/lv.po                      |  2 +-
 debian/po/mn.po                      |  2 +-
 debian/po/nb.po                      |  2 +-
 debian/po/nl.po                      |  2 +-
 debian/po/pl.po                      |  2 +-
 debian/po/pt.po                      |  2 +-
 debian/po/pt_BR.po                   |  2 +-
 debian/po/ro.po                      |  2 +-
 debian/po/ru.po                      |  2 +-
 debian/po/sk.po                      |  2 +-
 debian/po/sq.po                      |  2 +-
 debian/po/sr.po                      |  2 +-
 debian/po/sv.po                      |  2 +-
 debian/po/tr.po                      |  2 +-
 debian/po/uk.po                      |  2 +-
 debian/po/vi.po                      |  2 +-
 debian/po/zh_CN.po                   |  2 +-
 debian/po/zh_TW.po                   |  2 +-
 openerp/addons/base/i18n/af.po       |  2 +-
 openerp/addons/base/i18n/am.po       |  2 +-
 openerp/addons/base/i18n/ar.po       | 26 +++++++++++++-------------
 openerp/addons/base/i18n/bg.po       |  2 +-
 openerp/addons/base/i18n/bs.po       |  2 +-
 openerp/addons/base/i18n/ca.po       |  2 +-
 openerp/addons/base/i18n/cs.po       |  2 +-
 openerp/addons/base/i18n/da.po       |  2 +-
 openerp/addons/base/i18n/de.po       |  2 +-
 openerp/addons/base/i18n/el.po       |  2 +-
 openerp/addons/base/i18n/en_GB.po    |  2 +-
 openerp/addons/base/i18n/es.po       |  2 +-
 openerp/addons/base/i18n/es_CL.po    |  2 +-
 openerp/addons/base/i18n/es_EC.po    |  2 +-
 openerp/addons/base/i18n/et.po       |  2 +-
 openerp/addons/base/i18n/eu.po       |  2 +-
 openerp/addons/base/i18n/fa.po       |  2 +-
 openerp/addons/base/i18n/fa_AF.po    |  2 +-
 openerp/addons/base/i18n/fi.po       |  2 +-
 openerp/addons/base/i18n/fr.po       |  2 +-
 openerp/addons/base/i18n/gl.po       |  2 +-
 openerp/addons/base/i18n/he.po       |  2 +-
 openerp/addons/base/i18n/hr.po       |  2 +-
 openerp/addons/base/i18n/hu.po       |  2 +-
 openerp/addons/base/i18n/hy.po       |  2 +-
 openerp/addons/base/i18n/id.po       |  2 +-
 openerp/addons/base/i18n/is.po       |  2 +-
 openerp/addons/base/i18n/it.po       |  2 +-
 openerp/addons/base/i18n/ja.po       |  2 +-
 openerp/addons/base/i18n/ko.po       |  2 +-
 openerp/addons/base/i18n/lt.po       |  2 +-
 openerp/addons/base/i18n/lv.po       |  2 +-
 openerp/addons/base/i18n/mk.po       |  2 +-
 openerp/addons/base/i18n/mn.po       |  2 +-
 openerp/addons/base/i18n/nb.po       |  2 +-
 openerp/addons/base/i18n/nl.po       |  2 +-
 openerp/addons/base/i18n/nl_BE.po    |  2 +-
 openerp/addons/base/i18n/pl.po       |  2 +-
 openerp/addons/base/i18n/pt.po       |  2 +-
 openerp/addons/base/i18n/pt_BR.po    |  2 +-
 openerp/addons/base/i18n/ro.po       |  2 +-
 openerp/addons/base/i18n/ru.po       |  8 ++++----
 openerp/addons/base/i18n/sk.po       |  2 +-
 openerp/addons/base/i18n/sl.po       |  2 +-
 openerp/addons/base/i18n/sq.po       |  2 +-
 openerp/addons/base/i18n/sr.po       |  2 +-
 openerp/addons/base/i18n/sr@latin.po |  2 +-
 openerp/addons/base/i18n/sv.po       |  2 +-
 openerp/addons/base/i18n/th.po       |  2 +-
 openerp/addons/base/i18n/tlh.po      |  2 +-
 openerp/addons/base/i18n/tr.po       |  4 ++--
 openerp/addons/base/i18n/uk.po       |  2 +-
 openerp/addons/base/i18n/ur.po       |  2 +-
 openerp/addons/base/i18n/vi.po       |  2 +-
 openerp/addons/base/i18n/zh_CN.po    |  2 +-
 openerp/addons/base/i18n/zh_TW.po    |  2 +-
 93 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/debian/po/bg.po b/debian/po/bg.po
index 09b50a70b26..09d5b6390ba 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 07094463302..cfeccff5ec7 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 14ba09b9a54..8b41f7f4702 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/de.po b/debian/po/de.po
index 8653956dd71..972d8c13bea 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/el.po b/debian/po/el.po
index 7a2875ef213..55234f50535 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/en_GB.po b/debian/po/en_GB.po
index 512d7666477..ea295d8c03e 100644
--- a/debian/po/en_GB.po
+++ b/debian/po/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/es.po b/debian/po/es.po
index a68e0fd543d..77e79d58b08 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/es_CL.po b/debian/po/es_CL.po
index 5146f4cc7b4..7f953ce377d 100644
--- a/debian/po/es_CL.po
+++ b/debian/po/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/es_EC.po b/debian/po/es_EC.po
index da256cfbe36..d59820c54e3 100644
--- a/debian/po/es_EC.po
+++ b/debian/po/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/fa.po b/debian/po/fa.po
index f9cdb06112c..0703c40444c 100644
--- a/debian/po/fa.po
+++ b/debian/po/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 10a1cdc7010..19c253f5fbf 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/fr.po b/debian/po/fr.po
index deedfd07dcb..731c7355bb6 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/gl.po b/debian/po/gl.po
index ce42e2aab4f..897e4403052 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/he.po b/debian/po/he.po
index d7b3b0dbcee..5fae5da9f4d 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/hr.po b/debian/po/hr.po
index c2d97d82b40..a46872aec17 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/hu.po b/debian/po/hu.po
index e647b27cfc3..be7d7d35a1d 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/it.po b/debian/po/it.po
index ec640df4f3e..4891f1b3e22 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/ja.po b/debian/po/ja.po
index efc1e263544..9e66fcf3b2c 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 32f178ed132..63f1decc99d 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/lv.po b/debian/po/lv.po
index f9703dfa007..aa84c323469 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/mn.po b/debian/po/mn.po
index aad21704d52..cf0a9b1d061 100644
--- a/debian/po/mn.po
+++ b/debian/po/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/nb.po b/debian/po/nb.po
index e17168b4c90..865961a630f 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 42999c15d53..9432670cb10 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 72060b2014c..4e8f8884998 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 5ee3f072953..144f8272d23 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index e889e19762d..d5266e3ae25 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/ro.po b/debian/po/ro.po
index fa877dc4422..37bd9211980 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 3f4aae1e425..7bfd46dc961 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/sk.po b/debian/po/sk.po
index c5ff614ee84..28d8301e688 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 08011f04f2f..5e860c2de73 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/sr.po b/debian/po/sr.po
index 0276e221057..e28d9d50012 100644
--- a/debian/po/sr.po
+++ b/debian/po/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/sv.po b/debian/po/sv.po
index afd5118f8c8..ba2e0f434bf 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 "X-Poedit-Language: Swedish\n"
 
diff --git a/debian/po/tr.po b/debian/po/tr.po
index fce53c415ba..0c37bafb2f6 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/uk.po b/debian/po/uk.po
index 4c58df2d35a..3c2b29dc28a 100644
--- a/debian/po/uk.po
+++ b/debian/po/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 8e20be9d311..e2392f3089c 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 10e078fe5c9..6d4a3abea9f 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. Type: string
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index d13900e0b39..c36e8d6f1a5 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-Language: Chinese\n"
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index d13be8cad4d..a62a0a5f409 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:54+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index d02211564a2..806bc3996d6 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:54+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 6b23e8bdb0a..d31657dc6d2 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:54+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
@@ -23,7 +23,7 @@ msgstr ""
 #: field:ir.rule,domain_force:0
 #: field:res.partner.title,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "النطاق"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -33,12 +33,12 @@ msgstr "سانت هيلينا"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "عدادت أخري"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr ""
+msgstr "الوقت و التاريخ"
 
 #. module: base
 #: code:addons/fields.py:534
@@ -52,18 +52,18 @@ msgstr ""
 #: view:ir.values:0
 #: field:ir.values,meta_unpickle:0
 msgid "Metadata"
-msgstr "الفوقية"
+msgstr "بيانات وصفية"
 
 #. module: base
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr ""
+msgstr "العرض الهندسي"
 
 #. module: base
 #: field:base.language.import,code:0
 msgid "Code (eg:en__US)"
-msgstr ""
+msgstr "الرمز (مثال: ar_EG)"
 
 #. module: base
 #: view:workflow:0
@@ -73,32 +73,32 @@ msgstr ""
 #: field:workflow.transition,wkf_id:0
 #: field:workflow.workitem,wkf_id:0
 msgid "Workflow"
-msgstr ""
+msgstr "مسار العمل"
 
 #. module: base
 #: view:partner.sms.send:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "بوابة خدمة الرسائل القصيرة: كليكاتل (clickatell)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
-msgstr "المجرية / Magyar"
+msgstr "المجرية"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr ""
+msgstr "لا يمكن البحث"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (VE) / Español (VE)"
-msgstr ""
+msgstr "الأسبانية"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Workflow On"
-msgstr ""
+msgstr "سير العمل نشط"
 
 #. module: base
 #: field:ir.actions.act_window,display_menu_tip:0
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index d0542a285fe..11815db83cf 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:55+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index e215a7b82bd..8fd720e3bf9 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:55+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index 99229b6c0c1..4aba4a07e20 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:55+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 01dae8672dc..17f6ff64933 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:55+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index b3f0dbb3df7..e5f56280bff 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:56+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 02b09c21ea4..5146c4e2e63 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:57+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 540f4781dbe..b172877037d 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,7 +12,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:57+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 767d20130e6..0ef8c396af9 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:03+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index d98e431a8f1..33a55d3d48f 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:02+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index e1e3a2255e2..677954e0eb0 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:03+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 45eec53b194..49f72241e18 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:04+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 041b13c2792..21c8a8d8fac 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:56+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 137a54a51c9..a8961b0230b 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:55+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index a1729f76c33..acefa636f09 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:59+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index c6a2bf513da..d5e8e9a8c67 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:04+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 45948bb1940..3b06900818a 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:56+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 5e984b1fd46..bb9ae5bc952 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:57+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index b7fee49be45..c475ce4ec81 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:57+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 1949320519e..5ad60ae9239 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:37+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:57+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index f6226e92acb..be5fa480890 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:01+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 "Language: hr\n"
 
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 9186811847d..06dcf001af6 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:57+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 3d19fad4508..450366011c7 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:54+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 5aec4b7fe34..565acf48f7f 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:58+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 97d15aeb416..bdf18dde66e 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:58+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index f7956f84a5e..039bf5559f5 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:58+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index f86695e1b25..f28eb20e671 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:58+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index b6018a42228..81e9ccef173 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:58+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 802c8ae2d9d..358189dca42 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:59+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index a7f97812004..6f8df39b27b 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:58+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 7470171a6fa..e6ef5793b1e 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:59+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index d7dbdc0c50e..9703f44e8b0 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:59+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 1222db742ea..8fc7dd23bf4 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:59+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 181763c2c92..0ea92b3a9cb 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:56+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 2d36e27c2c1..75d5d14595f 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:04+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 491091f73ab..c79a5101143 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:00+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index bc6f208b7a6..a91e17f2cda 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:00+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index f20ecad6b2c..0aad95a26f8 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:03+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 1a36c2dc401..69fd9cb131b 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:00+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index b3f1f53f385..ba72b09a89e 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:00+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
@@ -3897,7 +3897,7 @@ msgstr "Название группы не может начинаться с \"
 #: view:ir.ui.view_sc:0
 #: field:res.partner.title,shortcut:0
 msgid "Shortcut"
-msgstr "Закладка"
+msgstr "Сокращение"
 
 #. module: base
 #: field:ir.model.data,date_init:0
@@ -4902,7 +4902,7 @@ msgstr "Внутренний заголовок RML"
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr "Поиск ссылки на обзор"
+msgstr "Ссылка на поиск вида"
 
 #. module: base
 #: field:ir.module.module,installed_version:0
@@ -5811,7 +5811,7 @@ msgstr "Основные параметры"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration_shortcut
 msgid "Custom Shortcuts"
-msgstr "Пользовательские комбинации клавиш"
+msgstr "Пользовательские закладки"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index a834c76e010..80af22b0ddb 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:01+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 2107f5d679b..dd4e41803bb 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:01+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 651ed315278..0116da8da9e 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:34+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 04:54+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 960ea4a3c16..d561e75e6ea 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:01+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 0eb57da2331..3a790bd7359 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:45+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:05+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index e1916dcb213..2eec4d20a4e 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:02+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 3b26332bae3..d46ab414ba9 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:02+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index 991d3198b6d..cd3af824b8e 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:02+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 1d0d5a2f5cb..ca95ba8578c 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:02+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
@@ -80,7 +80,7 @@ msgstr "İş Akışı"
 #. module: base
 #: view:partner.sms.send:0
 msgid "SMS - Gateway: clickatell"
-msgstr "SMS - Gateway: Clickatell Hizmeti"
+msgstr "SMS - Geçidi: Clickatell Hizmeti"
 
 #. module: base
 #: selection:base.language.install,lang:0
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 27cf922aadb..06b961294ff 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:02+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 6268436c9eb..540c435f95c 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:03+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index bd6ec58cd50..b204ad1f46a 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:03+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 360fc641b5b..f434645ec60 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:04+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 88981464ee4..eb060090425 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-27 04:44+0000\n"
+"X-Launchpad-Export-Date: 2011-07-02 05:04+0000\n"
 "X-Generator: Launchpad (build 13168)\n"
 
 #. module: base