openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06833
lp:~openerp-dev/openobject-addons/trunk-account-asset-asset-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset
Bharat Devnani (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-account-asset-asset-bde 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-account-asset-asset-bde/+merge/61116
Hello,
I have changed the following:
depreciation line:
* button should be hidden is state = draft
* change lable of boolean functional field: "posted" instead of "already in the acconting"
* color in blue if not posted
Thanks & Regards,
bde
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-asset-bde/+merge/61116
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-account-asset-asset-bde into lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2011-05-13 10:15:23 +0000
+++ account_asset/account_asset.py 2011-05-16 13:36:32 +0000
@@ -301,7 +301,7 @@
'depreciated_value': fields.float('Amount Already Depreciated', required=True),
'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
'move_id': fields.many2one('account.move', 'Depreciation Entry'),
- 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Move Included', store=True)
+ 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
}
def create_move(self, cr, uid,ids, context=None):
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-05-13 10:15:23 +0000
+++ account_asset/account_asset_view.xml 2011-05-16 13:36:32 +0000
@@ -80,8 +80,8 @@
<newline/>
</page>
<page string="Depreciation board">
- <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
- <tree>
+ <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph" >
+ <tree colors="blue:(move_check, '=', False)">
<field name="depreciation_date"/>
<field name="sequence" invisible="1"/>
<field name="amount"/>
@@ -96,7 +96,7 @@
<field name="depreciated_value"/>
</graph>
</field>
- <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2"/>
+ <button type="object" attrs="{'invisible':[('state','=','draft')]}" 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"/>
Follow ups