Ujjvala Collins (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-account-asset-supplier_invoice_asset-uco
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-supplier_invoice_asset-uco/+merge/62660
[IMP] account_asset:
---------------------------------
* Allow only supplier invoice to make asset.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-account-asset-supplier_invoice_asset-uco/+merge/62660
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-account-asset-supplier_invoice_asset-uco
into lp:~openerp-dev/openobject-addons/trunk-account-asset.
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2011-05-24 15:52:19 +0000
+++ account_asset/account_asset.py 2011-05-27 12:03:19 +0000
@@ -139,16 +139,7 @@
'state':'open'
}, context)
- def _amount_total(self, cr, uid, ids, name, args, context={}):
- #FIXME: function not working²
- id_set=",".join(map(str,ids))
- cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
- account_move_line l
- WHERE l.asset_id IN ("""+id_set+") GROUP BY l.asset_id ")
- res=dict(cr.fetchall())
- for id in ids:
- res.setdefault(id, 0.0)
- return res
+
def _amount_residual(self, cr, uid, ids, name, args, context={}):
cr.execute("""SELECT
@@ -187,7 +178,6 @@
'method_delay': fields.integer('During (interval)', readonly=True, states={'draft':[('readonly',False)]}),
'method_period': fields.integer('Depre. all (period)', readonly=True, states={'draft':[('readonly',False)]}),
'method_end': fields.date('Ending date'),
- 'value_total': fields.function(_amount_total, method=True, digits=(16,2),string='Gross Value'),
'method_progress_factor': fields.float('Progressif Factor', readonly=True, states={'draft':[('readonly',False)]}),
'value_residual': fields.function(_amount_residual, method=True, digits=(16,2), string='Residual Value'),
'method_time': fields.selection([('delay','Delay'),('end','Ending Period')], 'Time Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
=== modified file 'account_asset/account_asset_invoice.py'
--- account_asset/account_asset_invoice.py 2011-05-24 15:52:19 +0000
+++ account_asset/account_asset_invoice.py 2011-05-27 12:03:19 +0000
@@ -38,15 +38,16 @@
def move_line_get_item(self, cr, uid, line, context={}):
asset_obj = self.pool.get('account.asset.asset')
res = super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
- if line.asset_category_id:
- vals = {
- 'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name,
- 'category_id': line.asset_category_id.id,
- 'purchase_value': line.price_subtotal
- }
- asset_id = asset_obj.create(cr, uid, vals, context=context)
- if line.asset_category_id.open_asset:
- asset_obj.validate(cr, uid, [asset_id], context=context)
+ if line.invoice_id and line.invoice_id.type not in ['out_invoice', 'out_refund']:
+ if line.asset_category_id:
+ vals = {
+ 'name': line.product_id and (line.name + ": " + line.product_id.name) or line.name,
+ 'category_id': line.asset_category_id.id,
+ 'purchase_value': line.price_subtotal
+ }
+ asset_id = asset_obj.create(cr, uid, vals, context=context)
+ if line.asset_category_id.open_asset:
+ asset_obj.validate(cr, uid, [asset_id], context=context)
return res
account_invoice_line()
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml 2011-05-24 15:52:19 +0000
+++ account_asset/account_asset_view.xml 2011-05-27 12:03:19 +0000
@@ -72,7 +72,7 @@
</group>
<notebook colspan="4">
<page string="Depreciation">
- <separator string="Other information" colspan="4"/>
+ <separator string="Other Information" colspan="4"/>
<field name="partner_id"/>
<field name="purchase_date"/>
<separator string="Depreciation duration" colspan="4"/>
@@ -204,7 +204,6 @@
<tree string="Assets">
<field name="name"/>
<field name="code"/>
- <field name="value_total"/>
<field name="purchase_date"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="state"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : openerp-dev-web@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help : https://help.launchpad.net/ListHelp
