openerp-dev-web team mailing list archive

["Priyesh \(Open ERP\)" <pso@xxxxxxxxxxx>]

Priyesh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-company-asset-pso into lp:~openerp-dev/openobject-addons/trunk-account-asset.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-company-asset-pso/+merge/60861

Added company by default in asset and asset category and Added group multicompany on company field
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-company-asset-pso/+merge/60861
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-company-asset-pso into lp:~openerp-dev/openobject-addons/trunk-account-asset.

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2011-05-12 17:10:05 +0000
+++ account_asset/account_asset.py	2011-05-13 05:18:24 +0000
@@ -26,6 +26,7 @@
 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 @@
         '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 @@
         '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),
     }
 
 

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2011-05-12 17:24:31 +0000
+++ account_asset/account_asset_view.xml	2011-05-13 05:18:24 +0000
@@ -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">
@@ -194,6 +194,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>