Merge lp:~gs.clearcorp/openerp-ccorp-addons/7.0_account_asset_extended_ccorp into lp:openerp-ccorp-addons/7.0

[Glen Sojo]

[ADD] Module account_asset_extended_ccorp: Added Report View on Reports > Accounting

[lp:~gs.clearcorp/openerp-ccorp-addons/7.0_account_asset_extended_ccorp]

797. By Glen Sojo on 2013-12-20

[FIX] Some translations not matching case with es_CR and es translations

=== modified file 'account_asset_extended_ccorp/__init__.py'
--- account_asset_extended_ccorp/__init__.py	2013-05-16 22:17:03 +0000
+++ account_asset_extended_ccorp/__init__.py	2013-12-20 17:52:16 +0000
@@ -21,5 +21,6 @@
 ##############################################################################
 
 import account_asset_extended_ccorp
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_asset_extended_ccorp/__openerp__.py'
--- account_asset_extended_ccorp/__openerp__.py	2013-05-16 22:17:03 +0000
+++ account_asset_extended_ccorp/__openerp__.py	2013-12-20 17:52:16 +0000
@@ -37,7 +37,10 @@
     'depends': ['account_asset'],
     'init_xml': [],
     'demo_xml': [],
-    'data': ['account_asset_extended_ccorp_view.xml'],
+    'data': [
+             'account_asset_extended_ccorp_view.xml',
+             'report/extended_asset_report_view.xml',
+             ],
     'license': 'AGPL-3',
     'installable': True,
     'active': False,

=== removed file 'account_asset_extended_ccorp/i18n/account_asset_extended.pot'
--- account_asset_extended_ccorp/i18n/account_asset_extended.pot	2013-05-16 22:17:03 +0000
+++ account_asset_extended_ccorp/i18n/account_asset_extended.pot	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_asset_extended_ccorp
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-16 22:09+0000\n"
-"PO-Revision-Date: 2013-05-16 22:09+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_asset_extended_ccorp
-#: field:account.asset.asset,responsible:0
-msgid "Responsible"
-msgstr "Responsible"
-
-#. module: account_asset_extended_ccorp
-#: field:account.asset.asset,account_invoice_line_id:0
-#: model:ir.model,name:account_asset_extended_ccorp.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Línea factura"
-
-#. module: account_asset_extended_ccorp
-#: field:account.invoice.line,asset_ids:0
-#: model:ir.model,name:account_asset_extended_ccorp.model_account_asset_asset
-msgid "Asset"
-msgstr "Activo"
-
-#. module: account_asset_extended_ccorp
-#: field:account.asset.asset,account_invoice_id:0
-msgid "Invoice"
-msgstr "Invoice"
-
-#. module: account_asset_extended_ccorp
-#: field:account.asset.asset,asset_number:0
-msgid "Asset Number"
-msgstr "Asset Number"
-
-#. module: account_asset_extended_ccorp
-#: field:account.asset.asset,model:0
-msgid "Model"
-msgstr "Model"
-

=== modified file 'account_asset_extended_ccorp/i18n/es_CR.po'
--- account_asset_extended_ccorp/i18n/es_CR.po	2013-05-16 22:17:03 +0000
+++ account_asset_extended_ccorp/i18n/es_CR.po	2013-12-20 17:52:16 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-16 22:09+0000\n"
-"PO-Revision-Date: 2013-05-16 22:09+0000\n"
+"POT-Creation-Date: 2013-12-20 17:12+0000\n"
+"PO-Revision-Date: 2013-12-20 17:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,34 +16,109 @@
 "Plural-Forms: \n"
 
 #. module: account_asset_extended_ccorp
+#: model:ir.actions.act_window,help:account_asset_extended_ccorp.action_asset_report_extended
+msgid "<p>\n"
+"            From this report, you can have an overview on all depreciation. The\n"
+"            tool search can also be used to personalise your Assets reports and\n"
+"            so, match this analysis to your needs;\n"
+"          </p>\n"
+"        "
+msgstr "<p>Desde este informe, se puede tener una vista global de todas las depreciaciones. Se puede utilizar también la herramienta de búsqueda para personalizar los informes de activos y, de esa forma, hacer que el análisis case con sus necesidades;</p>\n"
+"        "
+
+#. module: account_asset_extended_ccorp
 #: field:account.asset.asset,responsible:0
+#: field:asset.asset.report.extended,responsible_id:0
 msgid "Responsible"
 msgstr "Responsable"
 
 #. module: account_asset_extended_ccorp
+#: field:account.asset.asset,account_invoice_id:0
+#: view:asset.asset.report.extended:0
+#: field:asset.asset.report.extended,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_asset_extended_ccorp
+#: field:asset.asset.report.extended,value_residual:0
+msgid "Residual Value"
+msgstr "Valor residual"
+
+#. module: account_asset_extended_ccorp
+#: view:asset.asset.report.extended:0
+#: model:ir.actions.act_window,name:account_asset_extended_ccorp.action_asset_report_extended
+#: model:ir.ui.menu,name:account_asset_extended_ccorp.menu_action_asset_report_extended
+msgid "Assets Analysis Extended"
+msgstr "Análisis de activos extendido"
+
+#. module: account_asset_extended_ccorp
+#: field:asset.asset.report.extended,depreciation:0
+msgid "Depreciation"
+msgstr "Depreciación"
+
+#. module: account_asset_extended_ccorp
 #: field:account.asset.asset,account_invoice_line_id:0
 #: model:ir.model,name:account_asset_extended_ccorp.model_account_invoice_line
 msgid "Invoice Line"
 msgstr "Línea factura"
 
 #. module: account_asset_extended_ccorp
+#: view:asset.asset.report.extended:0
+msgid "Assets Analysis"
+msgstr "Análisis de activos"
+
+#. module: account_asset_extended_ccorp
+#: view:asset.asset.report.extended:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_asset_extended_ccorp
+#: field:asset.asset.report.extended,salvage_value:0
+msgid "Salvage Amount"
+msgstr "Valor de salvaguarda"
+
+#. module: account_asset_extended_ccorp
+#: field:asset.asset.report.extended,gross_value:0
+msgid "Gross Amount"
+msgstr "Valor bruto"
+
+#. module: account_asset_extended_ccorp
 #: field:account.invoice.line,asset_ids:0
+#: field:asset.asset.report.extended,asset_id:0
 #: model:ir.model,name:account_asset_extended_ccorp.model_account_asset_asset
 msgid "Asset"
 msgstr "Activo"
 
 #. module: account_asset_extended_ccorp
-#: field:account.asset.asset,account_invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
+#: view:asset.asset.report.extended:0
+#: field:asset.asset.report.extended,asset_category_id:0
+msgid "Asset Category"
+msgstr "Categoría de activo"
 
 #. module: account_asset_extended_ccorp
 #: field:account.asset.asset,asset_number:0
+#: field:asset.asset.report.extended,asset_number:0
 msgid "Asset Number"
-msgstr "Número de Activo"
+msgstr "Número de activo"
+
+#. module: account_asset_extended_ccorp
+#: view:asset.asset.report.extended:0
+#: field:asset.asset.report.extended,supplier_id:0
+msgid "Supplier"
+msgstr "Proveedor"
 
 #. module: account_asset_extended_ccorp
 #: field:account.asset.asset,model:0
+#: field:asset.asset.report.extended,model:0
 msgid "Model"
 msgstr "Modelo"
 
+#. module: account_asset_extended_ccorp
+#: field:asset.asset.report.extended,name:0
+msgid "Asset Name"
+msgstr "Nombre de activo"
+
+#. module: account_asset_extended_ccorp
+#: view:asset.asset.report.extended:0
+msgid "Residual Value per Category"
+msgstr "Valor residual por categoría"

=== added directory 'account_asset_extended_ccorp/report'
=== added file 'account_asset_extended_ccorp/report/__init__.py'
--- account_asset_extended_ccorp/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/report/__init__.py	2013-12-20 17:52:16 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    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 extended_asset_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_asset_extended_ccorp/report/extended_asset_report.py'
--- account_asset_extended_ccorp/report/extended_asset_report.py	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/report/extended_asset_report.py	2013-12-20 17:52:16 +0000
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    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 openerp.osv import osv, fields
+from openerp import tools
+
+class extendedAssetReport(osv.Model):
+    
+    _name = 'asset.asset.report.extended'
+    _description = 'Asset Analysis Extended '
+    _auto = False # Do not create table automatically
+    
+    _columns = _columns = {
+                           'invoice_id': fields.many2one('account.invoice', string='Invoice'),
+                           'name': fields.char('Asset Name', size=64),
+                           'asset_id': fields.many2one('account.asset.asset', string='Asset'),
+                           'asset_category_id': fields.many2one('account.asset.category', string='Asset Category'),
+                           'model': fields.char('Model', size=64),
+                           'asset_number': fields.char('Asset Number', size=64),
+                           'supplier_id': fields.many2one('res.partner', string='Supplier'),
+                           'gross_value': fields.float('Gross Amount', readonly=True),
+                           'salvage_value': fields.float('Salvage Amount', readonly=True),
+                           'depreciation': fields.float('Depreciation', readonly=True),
+                           'value_residual': fields.float('Residual Value', readonly=True),
+                           'responsible_id': fields.many2one('res.partner', string='Responsible'),
+                           }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'asset_asset_report_extended')
+        cr.execute("""CREATE OR REPLACE VIEW asset_asset_report_extended AS
+(SELECT
+  asset.id,
+  (CASE WHEN
+    asset.account_invoice_line_id IS NOT NULL
+  THEN
+   (SELECT
+     invoice.id
+   FROM
+     account_invoice AS invoice,
+     account_invoice_line AS line
+   WHERE
+    line.id = asset.account_invoice_line_id AND
+    line.invoice_id = invoice.id
+   )
+   ELSE
+     NULL
+   END
+  ) AS invoice_id,
+  asset.name,
+  asset.id AS asset_id,
+  asset.category_id AS asset_category_id,
+  asset.model,
+  asset.asset_number,
+  (CASE WHEN
+    asset.account_invoice_line_id IS NOT NULL
+  THEN
+   (SELECT
+     b.partner_id
+   FROM
+     account_asset_asset AS a,
+     account_invoice_line AS b
+   WHERE
+    a.account_invoice_line_id = b.id AND
+    a.id = asset.id
+   )
+   ELSE
+     NULL
+   END
+  ) AS supplier_id,
+  (CASE WHEN
+    (SELECT
+      dp.remaining_value
+    FROM
+      account_asset_depreciation_line AS dp
+    WHERE
+      dp.asset_id = asset.id AND
+      dp.move_check = TRUE
+    ORDER BY
+      dp.sequence DESC
+    LIMIT 1) IS NOT NULL
+  THEN
+    (SELECT
+      dp.remaining_value
+    FROM
+      account_asset_depreciation_line AS dp
+    WHERE
+      dp.asset_id = asset.id AND
+      dp.move_check = TRUE
+    ORDER BY
+      dp.sequence DESC
+    LIMIT 1)
+  ELSE
+    asset.purchase_value
+  END) AS value_residual,
+  asset.purchase_value AS gross_value,
+  asset.salvage_value,
+  (SELECT
+    SUM(dp.amount)
+  FROM
+    account_asset_depreciation_line as dp
+  WHERE
+    dp.asset_id = asset.id AND
+    dp.move_check = TRUE) AS depreciation,
+  asset.responsible AS responsible_id 
+FROM 
+  account_asset_asset AS asset)""")
+        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'account_asset_extended_ccorp/report/extended_asset_report_view.xml'
--- account_asset_extended_ccorp/report/extended_asset_report_view.xml	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/report/extended_asset_report_view.xml	2013-12-20 17:52:16 +0000
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record model="ir.ui.view" id="view_asset_asset_report_extended_tree">
+        <field name="name">asset.asset.report.extended.tree</field>
+        <field name="model">asset.asset.report.extended</field>
+        <field name="arch" type="xml">
+            <tree string="Assets Analysis" create="false">
+                <field name="asset_category_id"/>
+                <field name="asset_id"/>
+                <field name="invoice_id"/>
+                <field name="supplier_id"/>
+                <field name="model"/>
+                <field name="asset_number"/>
+                <field name="gross_value"/>
+                <field name="salvage_value"/>
+                <field name="depreciation"/>
+                <field name="value_residual"/>
+                <field name="responsible_id"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_asset_report_extended">
+        <field name="name">asset.report.extended.graph</field>
+        <field name="model">asset.asset.report.extended</field>
+        <field name="arch" type="xml">
+            <graph string="Residual Value per Category" type="pie">
+                <field name="asset_category_id"/>
+                <field name="value_residual"/>
+            </graph>
+        </field>
+    </record>
+    
+    <record id="view_asset_report_extended_search" model="ir.ui.view">
+        <field name="name">asset.report.extended.search</field>
+        <field name="model">asset.asset.report.extended</field>
+        <field name="arch" type="xml">
+            <search string="Assets Analysis Extended">
+                <field name="asset_id"/>
+                <field name="asset_category_id"/>
+                <group expand="1" string="Group By...">
+                    <filter string="Asset Category" name="asset_category" icon="terp-stock_symbol-selection" context="{'group_by':'asset_category_id'}"/>
+                    <filter string="Supplier" name="supplier" icon="terp-go-home" context="{'group_by':'supplier_id'}"/>
+                    <filter string="Invoice" name="invoice" icon="terp-stock_symbol-selection" context="{'group_by':'invoice_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+    
+    <record model="ir.actions.act_window" id="action_asset_report_extended">    
+        <field name="name">Assets Analysis Extended</field>
+        <field name="res_model">asset.asset.report.extended</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,graph</field>
+        <field name="search_view_id" ref="view_asset_report_extended_search"/>
+        <field name="context">{ 'search_default_asset_category':1}</field>
+        <field name="help" type="html">
+          <p>
+            From this report, you can have an overview on all depreciation. The
+            tool search can also be used to personalise your Assets reports and
+            so, match this analysis to your needs;
+          </p>
+        </field>
+    </record>
+    
+    <menuitem action="action_asset_report_extended"
+              id="menu_action_asset_report_extended"
+              parent="account.menu_finance_reporting"/>
+</data>
+</openerp>
\ No newline at end of file