openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06631
[Merge] lp:~openerp-dev/openobject-addons/trunk-boolean-asset-pso into lp:~openerp-dev/openobject-addons/trunk-account-asset
Priyesh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-boolean-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-boolean-asset-pso/+merge/60722
Added new function field of type boolean to check the presence of move line.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-boolean-asset-pso/+merge/60722
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-boolean-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-11 06:47:44 +0000
+++ account_asset/account_asset.py 2011-05-12 05:34:24 +0000
@@ -278,15 +278,29 @@
class account_asset_depreciation_line(osv.osv):
_name = 'account.asset.depreciation.line'
_description = 'Asset depreciation line'
+
+ def get_move_line(self, cr, uid, ids, name, args, context={}):
+ res = {}
+ for line in self.browse(cr, uid, ids, context=context):
+ res[line.id] = line.move_line_id and True or False
+ return res
+
_columns = {
'name': fields.char('Depreciation Name', size=64, required=True, select=1),
'sequence': fields.integer('Sequence of the depreciation', required=True),
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
'amount': fields.float('Depreciation Amount', required=True),
+<<<<<<< TREE
'remaining_value': fields.float('Amount to Depreciate', required=True),
'depreciated_value': fields.float('Amount Already Depreciated', required=True),
'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
+=======
+ 'remaining_value': fields.float('Amount to Depreciate', required=True),
+ 'depreciated_value': fields.float('Amount Already Depreciated', required=True),
+ 'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
+>>>>>>> MERGE-SOURCE
'move_line_id': fields.many2one('account.move.line', 'Depreciation Entry'),
+ 'move_line_present': fields.function(get_move_line, method=True, type='boolean', string='Move Line Present', store=True)
}
account_asset_depreciation_line()
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-05-10 18:52:09 +0000
+++ account_asset/account_asset_view.xml 2011-05-12 05:34:24 +0000
@@ -48,6 +48,7 @@
<field name="model">account.asset.asset</field>
<field name="type">form</field>
<field name="arch" type="xml">
+<<<<<<< TREE
<form string="Asset">
<group col="6" colspan="4">
<field name="name" select="1"/>
@@ -112,6 +113,98 @@
</group>
</form>
</field>
+=======
+ <form string="Asset">
+ <group col="6" colspan="4">
+ <field name="name" select="1"/>
+ <field name="category_id" select="1"/>
+ <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"/>
+ </group>
+ <!-- <field name="period_id" select="2"/>-->
+<!-- <field name="name" select="1" colspan="4"/>-->
+ <!--<separator string="Methods" colspan="4"/>-->
+
+
+ <notebook colspan="4">
+ <page string="Depreciation">
+ <!--<field name="partner_id" select="2"/>
+ <field name="parent_id" select="2"/>
+ <field name="note" colspan="4" nolabel="1"/>-->
+ <separator string="Other information" colspan="4"/>
+ <field name="partner_id"/>
+ <group col="6" colspan="4" groups="analytic.group_analytic_accounting">
+ <separator string="Accounts information" colspan="4" />
+ <field name="account_analytic_id" />
+ <field name="journal_analytic_id" />
+ </group>
+ <!--<separator string="Methods" colspan="4"/>
+ <field name="name" select="1" colspan="2"/>-->
+ <separator string="Depreciation duration" colspan="4"/>
+ <field name="purchase_date"/>
+
+ <field name="method"/>
+ <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')]}"/>
+ <newline/>
+ <field name="prorata" colspan="1"/>
+ <field name="method_time"/>
+ <field name="method_period" attrs="{'invisible':[('method_time','=','end')]}"/>
+ <button
+ name="%(wizard_asset_modify)d"
+ states="open"
+ string="Change duration"
+ type="action"
+ colspan="2"/>
+
+ <field name="method_delay"/>
+ <newline/>
+
+<!--
+ <field name="method_end"/> -->
+ </page>
+ <page string="Depreciation board">
+<!-- <field name="value_total"/>
+ <field name="value_residual"/>-->
+ <field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph">
+ <tree>
+ <field name="depreciation_date"/>
+ <field name="sequence" invisible="1"/>
+ <field name="amount"/>
+ <field name="depreciated_value"/>
+ <field name="remaining_value"/>
+ <field name="move_line_present"/>
+ </tree>
+ <graph type="bar">
+ <field name="name"/>
+ <field name="amount"/>
+ <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" name="account_move_line_deprec" string="Create move line" icon="gtk-execute" colspan="2"/>
+ </page>
+
+ <page string="History">
+ <field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="history_ids" colspan="4" nolabel="1" readonly="1"/>
+ </page>
+
+
+ <page string="Notes">
+ <field name="note" nolabel="1"/>
+ </page>
+ </notebook>
+ <field name="state" readonly="1"/>
+ <group colspan="2" col="2">
+ <button name="validate" states="draft" string="Confirm asset" type="object"/>
+ </group>
+ </form>
+ </field>
+>>>>>>> MERGE-SOURCE
</record>
<record model="ir.ui.view" id="view_account_asset_history_form">
