Merge lp:~vauxoo/addons-vauxoo/7.0-asset_analytic-dev-hbto into lp:addons-vauxoo/7.0

Proposed by hbto [Vauxoo] http://www.vauxoo.com
Status: Merged
Merged at revision: 861
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-asset_analytic-dev-hbto
Merge into: lp:addons-vauxoo/7.0
Diff against target: 160 lines (+122/-0)
7 files modified
account_asset_analytic/__init__.py (+2/-0)
account_asset_analytic/__openerp__.py (+29/-0)
account_asset_analytic/i18n/account_asset_analytic.pot (+32/-0)
account_asset_analytic/model/__init__.py (+2/-0)
account_asset_analytic/model/account_asset.py (+37/-0)
account_asset_analytic/view/menues_and_actions.xml (+5/-0)
account_asset_analytic/view/view.xml (+15/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-asset_analytic-dev-hbto
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Approve
Isaac López Zúñiga Pending
Sabrina Romero - http://www.vauxoo.com Pending
Review via email: mp+190295@code.launchpad.net

Description of the change

New field analytic_account_id was added to account.asset.asset module,
whenever an asset category is selected its analytic account is set into
the asset, furthermore when creating the Entry Lines, the analytic account
that was set in the asset is the one used in the Entry Line.

To post a comment you must log in.
857. By hbto [Vauxoo] http://www.vauxoo.com

[IMP][account_asset_analytic] Added Translation Template

Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

Traduciones agregadas

Dado que las expectativas se cumplen la apruebo para merge

Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'account_asset_analytic'
2=== added file 'account_asset_analytic/__init__.py'
3--- account_asset_analytic/__init__.py 1970-01-01 00:00:00 +0000
4+++ account_asset_analytic/__init__.py 2013-10-12 02:24:24 +0000
5@@ -0,0 +1,2 @@
6+# -*- encoding: utf-8 -*-
7+import model
8
9=== added file 'account_asset_analytic/__openerp__.py'
10--- account_asset_analytic/__openerp__.py 1970-01-01 00:00:00 +0000
11+++ account_asset_analytic/__openerp__.py 2013-10-12 02:24:24 +0000
12@@ -0,0 +1,29 @@
13+# -*- encoding: utf-8 -*-
14+{
15+ "name": "Account Asset Analytic",
16+ "version": "1.0",
17+ "author": "Vauxoo",
18+ "category": "Generic Modules",
19+ "description" : """
20+Account Asset Analytic
21+======================
22+
23+A description is intended to fill this space
24+ """,
25+ "website": "http://www.vauxoo.com/",
26+ "license": "AGPL-3",
27+ "depends": [
28+ "account",
29+ "account_asset",
30+ ],
31+ "demo": [
32+ ],
33+ "data": [
34+ 'view/view.xml',
35+ 'view/menues_and_actions.xml',
36+ ],
37+ "test" : [
38+ ],
39+ "installable": True,
40+ "active": False,
41+}
42
43=== added directory 'account_asset_analytic/i18n'
44=== added file 'account_asset_analytic/i18n/account_asset_analytic.pot'
45--- account_asset_analytic/i18n/account_asset_analytic.pot 1970-01-01 00:00:00 +0000
46+++ account_asset_analytic/i18n/account_asset_analytic.pot 2013-10-12 02:24:24 +0000
47@@ -0,0 +1,32 @@
48+# Translation of OpenERP Server.
49+# This file contains the translation of the following modules:
50+# * account_asset_analytic
51+#
52+msgid ""
53+msgstr ""
54+"Project-Id-Version: OpenERP Server 7.0\n"
55+"Report-Msgid-Bugs-To: \n"
56+"POT-Creation-Date: 2013-10-12 02:21+0000\n"
57+"PO-Revision-Date: 2013-10-12 02:21+0000\n"
58+"Last-Translator: <>\n"
59+"Language-Team: \n"
60+"MIME-Version: 1.0\n"
61+"Content-Type: text/plain; charset=UTF-8\n"
62+"Content-Transfer-Encoding: \n"
63+"Plural-Forms: \n"
64+
65+#. module: account_asset_analytic
66+#: field:account.asset.asset,account_analytic_id:0
67+msgid "Analytic account"
68+msgstr ""
69+
70+#. module: account_asset_analytic
71+#: model:ir.model,name:account_asset_analytic.model_account_asset_depreciation_line
72+msgid "Asset depreciation line"
73+msgstr ""
74+
75+#. module: account_asset_analytic
76+#: model:ir.model,name:account_asset_analytic.model_account_asset_asset
77+msgid "Asset"
78+msgstr ""
79+
80
81=== added directory 'account_asset_analytic/model'
82=== added file 'account_asset_analytic/model/__init__.py'
83--- account_asset_analytic/model/__init__.py 1970-01-01 00:00:00 +0000
84+++ account_asset_analytic/model/__init__.py 2013-10-12 02:24:24 +0000
85@@ -0,0 +1,2 @@
86+# -*- encoding: utf-8 -*-
87+import account_asset
88
89=== added file 'account_asset_analytic/model/account_asset.py'
90--- account_asset_analytic/model/account_asset.py 1970-01-01 00:00:00 +0000
91+++ account_asset_analytic/model/account_asset.py 2013-10-12 02:24:24 +0000
92@@ -0,0 +1,37 @@
93+# -*- encoding: utf-8 -*-
94+from openerp.osv import fields, osv
95+
96+class account_asset_asset(osv.osv):
97+ _inherit = 'account.asset.asset'
98+
99+ def onchange_category_id(self, cr, uid, ids, category_id, context=None):
100+ context = context or {}
101+ val = super(account_asset_asset, self).onchange_category_id(cr, uid, ids, category_id, context=context)
102+ val = val or {'value':{}}
103+ if category_id:
104+ category = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context)
105+ if category.account_analytic_id:
106+ val['value']['account_analytic_id'] = category.account_analytic_id.id
107+ return val
108+
109+ _columns = {
110+ 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
111+ }
112+
113+class account_asset_depreciation_line(osv.osv):
114+ _inherit = 'account.asset.depreciation.line'
115+
116+ def create_move(self, cr, uid, ids, context=None):
117+ context = context or {}
118+ created_move_ids = super(account_asset_depreciation_line, self).create_move(cr, uid, ids, context=None)
119+ if not created_move_ids: return created_move_ids
120+ move_line_obj = self.pool.get('account.move.line')
121+ for line in self.browse(cr, uid, ids, context=context):
122+ aml_ids = move_line_obj.search(cr,uid, [('asset_id','=',line.asset_id.id),
123+ ('move_id','in',created_move_ids)],context=context)
124+ if aml_ids and line.asset_id.account_analytic_id:
125+ move_line_obj.write(cr, uid, aml_ids, {
126+ 'analytic_account_id': line.asset_id.account_analytic_id.id,
127+ },context=context)
128+ return created_move_ids
129+
130
131=== added directory 'account_asset_analytic/view'
132=== added file 'account_asset_analytic/view/menues_and_actions.xml'
133--- account_asset_analytic/view/menues_and_actions.xml 1970-01-01 00:00:00 +0000
134+++ account_asset_analytic/view/menues_and_actions.xml 2013-10-12 02:24:24 +0000
135@@ -0,0 +1,5 @@
136+<?xml version='1.0' encoding='utf-8'?>
137+<openerp>
138+ <data>
139+ </data>
140+</openerp>
141
142=== added file 'account_asset_analytic/view/view.xml'
143--- account_asset_analytic/view/view.xml 1970-01-01 00:00:00 +0000
144+++ account_asset_analytic/view/view.xml 2013-10-12 02:24:24 +0000
145@@ -0,0 +1,15 @@
146+<?xml version='1.0' encoding='utf-8'?>
147+<openerp>
148+ <data>
149+ <record model="ir.ui.view" id="view_account_asset_analytic_form">
150+ <field name="name">account.asset.asset.form</field>
151+ <field name="model">account.asset.asset</field>
152+ <field name="inherit_id" ref="account_asset.view_account_asset_asset_form"/>
153+ <field name="arch" type="xml">
154+ <xpath expr='//field[@name="category_id"]' position='after'>
155+ <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
156+ </xpath>
157+ </field>
158+ </record>
159+ </data>
160+</openerp>