From 8fe08e9eb3be63b15042d928e988b951f0594955 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 12 May 2011 18:10:38 +0530
Subject: [PATCH 1/3] [IMP] account_asset: Added company by default

bzr revid: pso@tinyerp.com-20110512124038-nptmrgoyrq76aqoy
---
 addons/account_asset/account_asset.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 63cfe638d0d..94082fb3a1d 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -26,6 +26,7 @@ from datetime import datetime
 class account_asset_category(osv.osv):
     _name = 'account.asset.category'
     _description = 'Asset category'
+
     _columns = {
         'name': fields.char('Asset category', size=64, required=True, select=1),
         'note': fields.text('Note'),
@@ -37,6 +38,11 @@ class account_asset_category(osv.osv):
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
         'company_id': fields.many2one('res.company', 'Company'),
     }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.category', context=context),
+    }
+
 account_asset_category()
 
 #class one2many_mod_asset(fields.one2many):
@@ -189,6 +195,7 @@ class account_asset_asset(osv.osv):
         'method_period': lambda obj, cr, uid, context: 12,
         'method_progress_factor': lambda obj, cr, uid, context: 0.3,
         'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'account.asset.asset',context=context),
     }
 
 

From 5d071e9ed3ce8c452434aba95fe7d8d0a55cf3dd Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Thu, 12 May 2011 18:18:14 +0530
Subject: [PATCH 2/3] [IMP] account_asset: Put multicompany group on company
 field

bzr revid: pso@tinyerp.com-20110512124814-g6aw3stg5kzyh6wn
---
 addons/account_asset/account_asset_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 6ba615c60f5..e7fff088a26 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -55,8 +55,8 @@
                  <field name="code" select="1"/>
                  <field name="purchase_value" select="1"/>
                  <field name="currency_id" select="1"/>
-                 <field name="company_id" select="1"/>
-                 <field name="value_residual"/> 
+                 <field name="company_id" select="1" groups="base.group_multi_company"/>
+                 <field name="value_residual"/>
               </group>
               <notebook colspan="4">
                  <page string="Depreciation">
@@ -193,6 +193,7 @@
                 <field name="code"/>
                 <field name="value_total"/>
                 <field name="purchase_date"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
         </field>

From d666142b2b4ba94f87e8f35d4106e8ccec22dfba Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 13 May 2011 15:12:18 +0530
Subject: [PATCH 3/3] [IMP] account_Asset: Put selection widget on company

bzr revid: pso@tinyerp.com-20110513094218-xgi4w4hzr9xnpczo
---
 addons/account_asset/account_asset_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index e7fff088a26..8b7f892ab40 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -11,7 +11,7 @@
             <form string="Asset category">
            <group col="6" colspan="4">
                 <field name="name" select="1" colspan="4"/>
-                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 <newline/>
                 <field name="journal_id"/>
                 <field name="account_asset_id"/>
@@ -55,7 +55,7 @@
                  <field name="code" select="1"/>
                  <field name="purchase_value" select="1"/>
                  <field name="currency_id" select="1"/>
-                 <field name="company_id" select="1" groups="base.group_multi_company"/>
+                 <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
                  <field name="value_residual"/>
               </group>
               <notebook colspan="4">