Merge lp:~matjaz-6/openerpsl/openerpsl_04_29 into lp:openerpsl/7.0

[Matjaz Kalic]

[ADD] account_asset_extensions

[lp:~matjaz-6/openerpsl/openerpsl_04_29]

428. By Dušan Laznik (Mentis) on 2014-07-08

[ADD] account_asset_extensions

=== added directory 'account_asset_extensions'
=== added file 'account_asset_extensions/__init__.py'
--- account_asset_extensions/__init__.py	1970-01-01 00:00:00 +0000
+++ account_asset_extensions/__init__.py	2014-07-08 10:45:37 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import account_asset

=== added file 'account_asset_extensions/__openerp__.py'
--- account_asset_extensions/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_asset_extensions/__openerp__.py	2014-07-08 10:45:37 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+{
+    'name': 'Assets Extensions',
+    'version': '1.0',
+    'category': 'Account',
+    'description': """
+	This Module adds following extensions to Account Asset: 
+	- analytic account can be set on asset
+	- location can be set for asset
+    - Deprication date can be explicitly set
+
+    """,
+    'author': 'Mentis d.o.o.',
+    'depends': ['account_asset'],
+    'data': [
+        'account_asset_view.xml',
+    ],
+    'installable': True,
+    'active': False,
+}

=== added file 'account_asset_extensions/account_asset.py'
--- account_asset_extensions/account_asset.py	1970-01-01 00:00:00 +0000
+++ account_asset_extensions/account_asset.py	2014-07-08 10:45:37 +0000
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class account_asset_asset(osv.osv):
+    _inherit = 'account.asset.asset'
+    
+    _columns = {
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
+        'purchase_date': fields.date('Depreciation Date', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = _('Depreciation start date')),
+        'date_acquisition': fields.date('Date Acquisition', help = _('Date acquisition'))
+    }
+    
+    def onchange_category_id(self, cr, uid, ids, category_id, context=None):
+        res = super(account_asset_asset, self).onchange_category_id(cr, uid, ids, category_id, context=context)
+        if category_id:
+            for category in self.pool.get('account.asset.category').browse(cr, uid, [category_id], context=context):
+                if category.account_analytic_id:
+                    res['value']['account_analytic_id'] = category.account_analytic_id.id
+        return res
+    
+#    def _get_last_depreciation_date(self, cr, uid, ids, context=None):
+#        """
+#        @param id: ids of a account.asset.asset objects
+#        @return: Returns a dictionary of the effective dates of the last depreciation entry made for given asset ids. If there isn't any, return the purchase date of this asset
+#        """
+#        cr.execute("""
+#            SELECT a.id as id, COALESCE(MAX(l.date),(DATE_TRUNC('month', a.purchase_date) + interval '1' month)::date) AS date
+#            FROM account_asset_asset a
+#            LEFT JOIN account_move_line l ON (l.asset_id = a.id)
+#            WHERE a.id IN %s
+#            GROUP BY a.id, a.purchase_date """, (tuple(ids),))
+#        return dict(cr.fetchall())
+
+account_asset_asset()
+
+class account_asset_depreciation_line(osv.osv):
+    _inherit = 'account.asset.depreciation.line'
+    
+    def create_move(self, cr, uid, ids, context=None):
+        res = super(account_asset_depreciation_line, self).create_move(cr, uid, ids=ids, context=context)
+        if res:
+            line_ids = self.pool.get('account.move.line').search(cr, uid, [('move_id', 'in', res)])
+            for line in self.pool.get('account.move.line').browse(cr, uid, line_ids):
+                if line.asset_id:
+                    self.pool.get('account.move.line').write(cr, uid, [line.id], {'analytic_account_id':line.asset_id.account_analytic_id.id})
+        
+        #raise 'stop'
+        return res
+    
+account_asset_depreciation_line()

=== added file 'account_asset_extensions/account_asset_view.xml'
--- account_asset_extensions/account_asset_view.xml	1970-01-01 00:00:00 +0000
+++ account_asset_extensions/account_asset_view.xml	2014-07-08 10:45:37 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	
+        <record id="view_account_asset_asset_form_extensions" model="ir.ui.view">
+            <field name="name">account.asset.asset.form.extensions</field>
+            <field name="model">account.asset.asset</field>
+            <field name="inherit_id" ref="account_asset.view_account_asset_asset_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//sheet/group/group/field[@name='purchase_date']" position="after">
+                	<field name="date_acquisition"/>
+                	<field name="account_analytic_id"/>
+                	<field name="location_id"/>
+                </xpath>
+            </field>
+        </record>
+
+		<record id="view_account_asset_search_extensions" model="ir.ui.view">
+        <field name="name">account.asset.asset.search.extensions</field>
+        <field name="model">account.asset.asset</field>
+        <field name="inherit_id" ref="account_asset.view_account_asset_search"/>
+        <field name="arch" type="xml">
+        	<filter string="Closed" position="after">
+            	<group expand="0" string="Group By...">
+                	<filter string="Analytic Account" domain="[]" context="{'group_by':'account_analytic_id'}"/>
+                    <filter string="Location" icon="terp-folder-orange" domain="[]"  context="{'group_by':'location_id'}"/>
+                </group>
+            </filter>
+        </field>
+    </record>
+    
+    </data>    
+</openerp>
\ No newline at end of file