Merge lp:~cv.clearcorp/openobject-addons/6.1-account_asset into lp:openobject-addons/6.1

[Carlos Vásquez (ClearCorp)]

From bug 1019932 description:

1. When the asset is created from an invoice, the asset reference is assigned as the invoice number. The correct thing to do is link the invoice to the asset, and let the invoice have it's sequential number (or custom user assigned number)

2. When the asset is created manually, the reference is filled because there is no sequence or sequence type created by default at module installation. The sequence code is there, but the user has to know to create at least one sequence with the specific code set to "account.asset.code".

3. When the move is created for a depreciation line, the date used is the purchase date (if asset is marked as prorata), or today. If the depreciation line already has a date, it must be used. Otherwise it is misleading for the user. The correct dates are already calculated when the depreciation lines are created. The move line creation must use those data.

4. The depreciation moves should use the default journal sequence for number (name), the reference (ref) can have some info about the asset and the depreciation line. The same applies for the move lines.

---------------------------

All the 4 points are corrected in this branch. We tested that it wouldn't break pre-existing assets or any functionality. But if there is something wrong please get back at us and we will be glad to fix it.

[xavi (xgilest)]

Please, review this merge proposal, its only a minute and it is completly necessary to have the journal right. The name of the move can't be the name of the asset. It's been more than a year.

review: Approve

Unmerged revisions

6867. By Carlos Vásquez (ClearCorp) on 2012-07-02

[FIX] asset creation from invoice now links the invoice and uses the correct sequence for code
[FIX] module installation creates sequence and sequence type ready for use
[FIX] asset depreciation move creation now uses the correct date and period
[FIX] asset depreciation move and move lines now use more standard info for number and reference.

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2012-01-31 13:36:57 +0000
+++ account_asset/account_asset.py	2012-07-02 04:55:24 +0000
@@ -163,7 +163,7 @@
                      'amount': amount,
                      'asset_id': asset.id,
                      'sequence': i,
-                     'name': str(asset.id) +'/' + str(i),
+                     'name': (asset.code or str(asset.id)) +'/' + str(i),
                      'remaining_value': residual_amount,
                      'depreciated_value': (asset.purchase_value - asset.salvage_value) - (residual_amount + amount),
                      'depreciation_date': depreciation_date.strftime('%Y-%m-%d'),
@@ -245,6 +245,7 @@
         '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, states={'draft':[('readonly',False)],'open':[('readonly',False)]}),
         '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.", readonly=True, states={'draft':[('readonly',False)]}),
+        'purchase_invoice_id': fields.many2one('account.invoice','Purchase Invoice'),
     }
     _defaults = {
         'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.asset.code'),
@@ -337,7 +338,7 @@
         'amount': fields.float('Depreciation Amount', required=True),
         '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),
+        'depreciation_date': fields.date('Depreciation Date', required=True),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
     }
@@ -355,7 +356,7 @@
         for line in self.browse(cr, uid, ids, context=context):
             if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):
                 can_close = True
-            depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')
+            depreciation_date = line.depreciation_date or time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
             current_currency = line.asset_id.currency_id.id
@@ -365,9 +366,8 @@
             asset_name = line.asset_id.name
             reference = line.name
             move_vals = {
-                'name': asset_name,
                 'date': depreciation_date,
-                'ref': reference,
+                'ref': reference + ' - ' + asset_name,
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': line.asset_id.category_id.journal_id.id,
                 }
 
=== modified file 'account_asset/account_asset_invoice.py'
--- account_asset/account_asset_invoice.py	2011-11-11 19:29:54 +0000
+++ account_asset/account_asset_invoice.py	2012-07-02 04:55:24 +0000
@@ -50,13 +50,13 @@
             if line.asset_category_id:
                 vals = {
                     'name': line.name,
-                    'code': line.invoice_id.number or False,
+                    'purchase_invoice_id': line.invoice_id and line.invoice_id.id or False,
                     'category_id': line.asset_category_id.id,
                     'purchase_value': line.price_subtotal,
-                    'period_id': line.invoice_id.period_id.id,
                     'partner_id': line.invoice_id.partner_id.id,
                     'company_id': line.invoice_id.company_id.id,
                     'currency_id': line.invoice_id.currency_id.id,
+                    'purchase_date': line.invoice_id.date_invoice,
                 }
                 changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
                 vals.update(changed_vals['value'])
 
=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2011-12-21 22:06:36 +0000
+++ account_asset/account_asset_view.xml	2012-07-02 04:55:24 +0000
@@ -95,6 +95,7 @@
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
                     <field name="parent_id" groups="base.group_extended"/>
+                    <field name="purchase_invoice_id"/>
                     <newline/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2"/>
 
=== modified file 'account_asset/report/account_asset_report.py'
--- account_asset/report/account_asset_report.py	2011-07-05 14:23:22 +0000
+++ account_asset/report/account_asset_report.py	2012-07-02 04:55:24 +0000
@@ -50,7 +50,7 @@
                 select 
                     min(dl.id) as id,
                     dl.name as name,
-                    to_date(dl.depreciation_date, 'YYYY-MM-DD') as depreciation_date,
+                    dl.depreciation_date as depreciation_date,
                     a.purchase_date as purchase_date,
                     (CASE WHEN (select min(d.id) from account_asset_depreciation_line as d
                                 left join account_asset_asset as ac ON (ac.id=d.asset_id)
@@ -77,7 +77,7 @@
                 from account_asset_depreciation_line dl
                     left join account_asset_asset a on (dl.asset_id=a.id)
                 group by 
-                    dl.amount,dl.asset_id,to_date(dl.depreciation_date, 'YYYY-MM-DD'),dl.name,
+                    dl.amount,dl.asset_id,dl.depreciation_date,dl.name,
                     a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,
                     a.purchase_value, a.id, a.salvage_value
         )""")