[MERGE] merge bde branch with improvements of access rules

bzr revid: qdp-launchpad@openerp.com-20110607101949-b733lp1iiktsym78

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 8cfb4f2..1afab3a 100644 (file)
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -183,7 +183,7 @@ class account_asset_asset(osv.osv):
         'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'prorata':fields.boolean('Prorata Temporis', Readonly="True", help='Indicates that the accounting entries for this asset have to be done from the purchase date instead of the first January'),
         'history_ids': fields.one2many('account.asset.history', 'asset_id', 'History', readonly=True),
-        'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines', readonly=True,),
+        'depreciation_line_ids': fields.one2many('account.asset.depreciation.line', 'asset_id', 'Depreciation Lines'),
         'salvage_value': fields.float('Salvage Value', digits_compute=dp.get_precision('Account'), help="It is the amount you plan to have that you cannot depreciate."),
     }
     _defaults = {

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index dd9e168..018a6bf 100644 (file)
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -110,7 +110,7 @@
                           <field name="depreciated_value"/>
                        </graph>
                     </field>
-                    <button type="object" attrs="{'invisible':[('state','&lt;&gt;','open')]}" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
+                    <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
                  </page>
                  <page string="History">
                     <field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>

diff --git a/addons/account_asset/security/ir.model.access.csv b/addons/account_asset/security/ir.model.access.csv
index ed932a5..936d575 100755 (executable)
--- a/addons/account_asset/security/ir.model.access.csv
+++ b/addons/account_asset/security/ir.model.access.csv
@@ -7,5 +7,7 @@
 "access_account_asset_asset_manager","account.asset.asset","model_account_asset_asset","account.group_account_manager",1,1,1,1
 "access_account_asset_history_manager","account.asset.history","model_account_asset_history","account.group_account_manager",1,1,1,1
 "access_account_asset_board_manager","account.asset.board","model_account_asset_board","account.group_account_manager",1,1,1,1
+"access_account_asset_depreciation_line","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_user",1,0,0,0
+"access_account_asset_depreciation_line_manager","account.asset.depreciation.line","model_account_asset_depreciation_line","account.group_account_manager",1,1,1,1
 "access_asset_asset_report","asset.asset.report","model_asset_asset_report","account.group_account_user",1,0,0,0
 "access_asset_asset_report_manager","asset.asset.report","model_asset_asset_report","account.group_account_manager",1,1,1,1