Merge lp:~vauxoo/addons-vauxoo/7.0-account_move_line_group_by_asset-dev_luis into lp:addons-vauxoo/7.0

Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 912
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-account_move_line_group_by_asset-dev_luis
Merge into: lp:addons-vauxoo/7.0
Diff against target: 146 lines (+125/-0)
4 files modified
account_move_line_group_by_asset/__init__.py (+26/-0)
account_move_line_group_by_asset/__openerp__.py (+49/-0)
account_move_line_group_by_asset/account_view.xml (+29/-0)
account_move_line_group_by_asset/i18n/es.po (+21/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-account_move_line_group_by_asset-dev_luis
Reviewer Review Type Date Requested Status
Isaac López Zúñiga Pending
Review via email: mp+193523@code.launchpad.net

Description of the change

Se agrego la opcion de agrupar los account_move_line por activo

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'account_move_line_group_by_asset'
2=== added file 'account_move_line_group_by_asset/__init__.py'
3--- account_move_line_group_by_asset/__init__.py 1970-01-01 00:00:00 +0000
4+++ account_move_line_group_by_asset/__init__.py 2013-11-01 00:23:29 +0000
5@@ -0,0 +1,26 @@
6+# -*- encoding: utf-8 -*-
7+###########################################################################
8+# Module Writen to OpenERP, Open Source Management Solution
9+#
10+# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
11+# All Rights Reserved.
12+# info Vauxoo (info@vauxoo.com)
13+############################################################################
14+# Coded by: Luis Torres (luis_t@vauxoo.com)
15+############################################################################
16+#
17+# This program is free software: you can redistribute it and/or modify
18+# it under the terms of the GNU Affero General Public License as
19+# published by the Free Software Foundation, either version 3 of the
20+# License, or (at your option) any later version.
21+#
22+# This program is distributed in the hope that it will be useful,
23+# but WITHOUT ANY WARRANTY; without even the implied warranty of
24+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25+# GNU Affero General Public License for more details.
26+#
27+# You should have received a copy of the GNU Affero General Public License
28+# along with this program. If not, see <http://www.gnu.org/licenses/>.
29+#
30+##############################################################################
31+
32
33=== added file 'account_move_line_group_by_asset/__openerp__.py'
34--- account_move_line_group_by_asset/__openerp__.py 1970-01-01 00:00:00 +0000
35+++ account_move_line_group_by_asset/__openerp__.py 2013-11-01 00:23:29 +0000
36@@ -0,0 +1,49 @@
37+# -*- encoding: utf-8 -*-
38+###########################################################################
39+# Module Writen to OpenERP, Open Source Management Solution
40+#
41+# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
42+# All Rights Reserved.
43+# info Vauxoo (info@vauxoo.com)
44+############################################################################
45+# Coded by: Luis Torres (luis_t@vauxoo.com)
46+############################################################################
47+#
48+# This program is free software: you can redistribute it and/or modify
49+# it under the terms of the GNU Affero General Public License as
50+# published by the Free Software Foundation, either version 3 of the
51+# License, or (at your option) any later version.
52+#
53+# This program is distributed in the hope that it will be useful,
54+# but WITHOUT ANY WARRANTY; without even the implied warranty of
55+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
56+# GNU Affero General Public License for more details.
57+#
58+# You should have received a copy of the GNU Affero General Public License
59+# along with this program. If not, see <http://www.gnu.org/licenses/>.
60+#
61+##############################################################################
62+{
63+ "name" : "Account Move Line Group By Asset",
64+ "version" : "1.0",
65+ "author" : "Vauxoo",
66+ "category" : "Generic Modules",
67+ "description" : """
68+ This module add the option by group in Journal Items by asset
69+ """,
70+ "website" : "http://www.vauxoo.com/",
71+ "license" : "AGPL-3",
72+ "depends" : [
73+ "account_asset",
74+ ],
75+ "demo" : [],
76+ "data" : [
77+ 'account_view.xml',
78+ ],
79+ 'js': [],
80+ 'qweb' : [],
81+ 'css':[],
82+ 'test': [],
83+ "installable" : True,
84+ "active" : False,
85+}
86
87=== added file 'account_move_line_group_by_asset/account_view.xml'
88--- account_move_line_group_by_asset/account_view.xml 1970-01-01 00:00:00 +0000
89+++ account_move_line_group_by_asset/account_view.xml 2013-11-01 00:23:29 +0000
90@@ -0,0 +1,29 @@
91+<?xml version='1.0' encoding='utf-8'?>
92+<openerp>
93+ <data>
94+ <record model="ir.ui.view" id="view_account_move_line_group_by_asset_filter">
95+ <field name="name">view.account.move.line.group.by.asset.filter</field>
96+ <field name="model">account.move.line</field>
97+ <field name="inherit_id" ref="account.view_account_move_line_filter"/>
98+ <field name="arch" type="xml">
99+ <xpath
100+ expr="//filter[@string='Period']" position="after">
101+ <filter string="Asset" icon="terp-folder-orange" domain="[]" context="{'group_by':'asset_id'}"/>
102+ </xpath>
103+ </field>
104+ </record>
105+
106+ <record id="view_account_move_line_group_by_asset_tree" model="ir.ui.view">
107+ <field name="name">view.account.move.line.group.by.asset.tree</field>
108+ <field name="model">account.move.line</field>
109+ <field name="inherit_id" ref="account.view_move_line_tree"/>
110+ <field name="arch" type="xml">
111+ <xpath
112+ expr="//field[@name='company_id']" position="after">
113+ <field name="asset_id"/>
114+ </xpath>
115+ </field>
116+ </record>
117+
118+ </data>
119+</openerp>
120
121=== added directory 'account_move_line_group_by_asset/i18n'
122=== added file 'account_move_line_group_by_asset/i18n/es.po'
123--- account_move_line_group_by_asset/i18n/es.po 1970-01-01 00:00:00 +0000
124+++ account_move_line_group_by_asset/i18n/es.po 2013-11-01 00:23:29 +0000
125@@ -0,0 +1,21 @@
126+# Translation of OpenERP Server.
127+# This file contains the translation of the following modules:
128+#
129+msgid ""
130+msgstr ""
131+"Project-Id-Version: OpenERP Server 7.0\n"
132+"Report-Msgid-Bugs-To: \n"
133+"POT-Creation-Date: 2013-11-01 00:14+0000\n"
134+"PO-Revision-Date: 2013-11-01 00:14+0000\n"
135+"Last-Translator: <>\n"
136+"Language-Team: \n"
137+"MIME-Version: 1.0\n"
138+"Content-Type: text/plain; charset=UTF-8\n"
139+"Content-Transfer-Encoding: \n"
140+"Plural-Forms: \n"
141+
142+#. module: account_move_line_group_by_asset
143+#: view:account.move.line:0
144+msgid "Asset"
145+msgstr "Activo"
146+