Merge lp:~pexego/openerp-spain/l10n_es_account_asset_improvements6.0 into lp:~openerp-spain-team/openerp-spain/6.0

[Omar (Pexego)]

Se permite el cálculo de líneas de amortización a partir de un línea asentada para permitir continuar con amortizaciones ya comenzadas en otros sistemas.
Se añaden también algunas pequeñas correcciones como, el cálculo correcto de años bisiestos y correcciones en redondeos
Arrastramos la cuenta analítica de la categoría de activo al activo por si se quisiera cambiar.
Al duplicar el activo se limpia de apuntes contables.
Se permiten amortizaciones mensuales.

[lp:~pexego/openerp-spain/l10n_es_account_asset_improvements6.0]

338. By Omar (Pexego) on 2013-01-03

[IMP] l10n_es_account_asset: Arrastramos la cuenta analítica de la categoría de activo al activo por si se quisiera cambiar. Al duplicar el activo se limpia de apuntes contables. Se permiten amortizaciones mensuales.

[Omar (Pexego) (omar7r)]

Pasado el márgen hablado para la revisión, lo apruebo. Dejo el merge de la 6.1 abierto un poco más por si surge cualquier cosa.

review: Approve

=== modified file 'l10n_es_account_asset/account_asset.py'
--- l10n_es_account_asset/account_asset.py	2012-03-09 16:21:34 +0000
+++ l10n_es_account_asset/account_asset.py	2013-01-03 19:17:22 +0000
@@ -122,16 +122,28 @@
         return amount
 
     def _compute_board_undone_dotation_nb(self, cr, uid, asset, depreciation_date, total_days, context=None):
-        undone_dotation_number = asset.method_number
+        depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
+        posted_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_check', '=', True)])
         if asset.method_time == 'end':
             end_date = datetime.strptime(asset.method_end, '%Y-%m-%d')
-            undone_dotation_number = 0
-            while depreciation_date <= end_date:
-                depreciation_date = (datetime(depreciation_date.year, depreciation_date.month, depreciation_date.day) + relativedelta(months=+asset.method_period))
+        else:
+            end_date = datetime.strptime(asset.deprec_start_date, '%Y-%m-%d')
+            if asset.method_period == 12:
+                end_date = end_date + relativedelta(years=+asset.method_number)
+            else:
+                end_date = end_date + relativedelta(months=+asset.method_number)
+        last_depreciation_date = asset._get_last_depreciation_date()
+        if last_depreciation_date:
+            last_depreciation_date = datetime.strptime(last_depreciation_date[asset.id], '%Y-%m-%d') 
+        undone_dotation_number = 0
+        while depreciation_date <= end_date or (depreciation_date.year == end_date.year and asset.prorata and asset.method_period == 12):
+            depreciation_date = (datetime(depreciation_date.year, depreciation_date.month, depreciation_date.day) + relativedelta(months=+asset.method_period))
+            if last_depreciation_date:
+                if depreciation_date > last_depreciation_date:
+                    undone_dotation_number += 1
+            else:
                 undone_dotation_number += 1
-        if asset.prorata:
-            undone_dotation_number += 1
-        return undone_dotation_number
+        return undone_dotation_number + len(posted_depreciation_line_ids)
     
     def compute_depreciation_board(self, cr, uid, ids, context=None):
         depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
@@ -143,15 +155,16 @@
             if old_depreciation_line_ids:
                 depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
             
-            amount_to_depr = residual_amount = asset.value_residual
+            amount_to_depr = residual_amount = asset.purchase_value - asset.salvage_value
 
             depreciation_date = datetime.strptime(self._get_last_depreciation_date(cr, uid, [asset.id], context)[asset.id], '%Y-%m-%d')
             day = depreciation_date.day
             month = depreciation_date.month
             year = depreciation_date.year
-            total_days = (year % 4) and 365 or 366
+            total_days = ((year % 4 == 0 and year % 100 != 0) or year % 400 == 0) and 366 or 365
 
             undone_dotation_number = self._compute_board_undone_dotation_nb(cr, uid, asset, depreciation_date, total_days, context=context)
+            residual_amount = asset.value_residual
             for x in range(len(posted_depreciation_line_ids), undone_dotation_number):
                 i = x + 1
                 amount = self._compute_board_amount(cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=context)
@@ -169,7 +182,7 @@
                      'sequence': i,
                      'name': str(asset.id) +'/' + str(i),
                      'remaining_value': residual_amount,
-                     'depreciated_value': (asset.purchase_value - asset.salvage_value) - (residual_amount + amount),
+                     'depreciated_value': round((asset.purchase_value - asset.salvage_value) - (residual_amount + amount),2),
                      'depreciation_date': depreciation_date.strftime('%Y-%m-%d'),
                 }
                 depreciation_lin_obj.create(cr, uid, vals, context=context)
@@ -190,7 +203,7 @@
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         cr.execute("""SELECT
-                l.asset_id as id, round(SUM(abs(l.debit-l.credit))) AS amount
+                l.asset_id as id, SUM(abs(l.debit-l.credit)) AS amount
             FROM
                 account_move_line l
             WHERE
@@ -237,6 +250,7 @@
         'prorata':fields.boolean('Prorata Temporis', readonly=True, states={'draft':[('readonly',False)]}, help='Indicates that the first depreciation entry 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, states={'draft':[('readonly',False)],'open':[('readonly',False)]}),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
         '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)]}),
     }
     _defaults = {
@@ -280,6 +294,7 @@
                             'method_progress_factor': category_obj.method_progress_factor,
                             'method_end': category_obj.method_end,
                             'prorata': category_obj.prorata,
+                            'account_analytic_id': category_obj.account_analytic_id and category_obj.account_analytic_id.id or False
             }
         return res
 
@@ -294,7 +309,7 @@
             default = {}
         if context is None:
             context = {}
-        default.update({'depreciation_line_ids': [], 'state': 'draft'})
+        default.update({'depreciation_line_ids': [], 'state': 'draft', 'account_move_line_ids': []})
         return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
 
     def _compute_entries(self, cr, uid, ids, period_id, context={}):
@@ -394,7 +409,7 @@
                 'partner_id': partner_id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
                 'amount_currency': company_currency <> current_currency and sign * line.amount or 0.0,
-                'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,
+                'analytic_account_id': line.asset_id.account_analytic_id and line.asset_id.account_analytic_id.id or False,
                 'date': depreciation_date,
                 'asset_id': line.asset_id.id
             })
 
=== modified file 'l10n_es_account_asset/account_asset_view.xml'
--- l10n_es_account_asset/account_asset_view.xml	2012-03-09 16:21:34 +0000
+++ l10n_es_account_asset/account_asset_view.xml	2013-01-03 19:17:22 +0000
@@ -32,11 +32,11 @@
                     <field name="prorata"/>
                     <field name="open_asset"/>
                 </group>
-        	<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
-        	    <separator string="Analytic information" colspan="4"/>
-        	    <newline/>
-        	    <field name="account_analytic_id"/>
-        	</group>
+                <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
+                    <separator string="Analytic information" colspan="4"/>
+                    <newline/>
+                    <field name="account_analytic_id"/>
+                </group>
                 <separator string="Notes" colspan="4"/>
                 <field name="note" colspan="4" nolabel="1"/>
             </form>
@@ -97,7 +97,7 @@
                     <field name="parent_id"/>
                     <field name="partner_id"/>
                     <field name="purchase_date"/>
-					<field name="deprec_start_date"/>
+                                        <field name="deprec_start_date"/>
                     <newline/>
                     <group colspan="2" col="2">
                         <separator string="Depreciation Dates" colspan="2"/>
@@ -113,7 +113,12 @@
                         <field name="method"/>
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                         <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-                        <field name="compute_at_end_period"/>				
+                        <field name="compute_at_end_period"/>                           
+                    </group>
+                    <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
+                        <separator string="Analytic information" colspan="4"/>
+                        <newline/>
+                        <field name="account_analytic_id"/>
                     </group>
                     <newline/>
                     <separator string="" colspan="4"/>