Merge lp:~vauxoo/addons-vauxoo/asientos_group_origen_dev_juancarlos into lp:addons-vauxoo/6.1

Proposed by Juan Carlos Hernandez
Status: Merged
Merged at revision: 530
Proposed branch: lp:~vauxoo/addons-vauxoo/asientos_group_origen_dev_juancarlos
Merge into: lp:addons-vauxoo/6.1
Diff against target: 96 lines (+81/-0)
3 files modified
account_entries_report_group_by_ref/__init__.py (+22/-0)
account_entries_report_group_by_ref/__openerp__.py (+41/-0)
account_entries_report_group_by_ref/account_entries_report_view.xml (+18/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/asientos_group_origen_dev_juancarlos
Reviewer Review Type Date Requested Status
Isaac López Zúñiga Pending
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+129766@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Moisés López - http://www.vauxoo.com (moylop260) wrote :
Download full text (6.1 KiB)

Juan Carlos,
Podrias por favor cambiar el nombre del modulo a:
account_entries_report_group_by_ref

El nombre que le pusiste usó una traducción de "asientos" mal para el
contexto.
Aquí no hay asientos de sentarse.
Aqui son asientos contables, "Journal Items"

Correo escrito desde un dispositivo móvil. Disculpa las faltas de
ortografía y la brevedad del email.
"No imprimas este email al menos que sea muy necesario, la ecología es cosa
de todos"

Moisés López - Vauxoo - moylop260
El 15/10/2012 16:25, "Juan Carlos Hernandez Funes" <email address hidden>
escribió:

> Juan Carlos Hernandez Funes has proposed merging
> lp:~vauxoo/addons-vauxoo/asientos_group_origen_dev_juancarlos into
> lp:addons-vauxoo/6.1.
>
> Requested reviews:
> Isaac López Zúñiga - http://www.vauxoo.com (isaako34)
> Moisés López - http://www.vauxoo.com (moylop260)
>
> For more details, see:
>
> https://code.launchpad.net/~vauxoo/addons-vauxoo/asientos_group_origen_dev_juancarlos/+merge/129766
> --
>
> https://code.launchpad.net/~vauxoo/addons-vauxoo/asientos_group_origen_dev_juancarlos/+merge/129766
> You are requested to review the proposed merge of
> lp:~vauxoo/addons-vauxoo/asientos_group_origen_dev_juancarlos into
> lp:addons-vauxoo/6.1.
>
> === added directory 'account_analysis_seats_group_origin'
> === added file 'account_analysis_seats_group_origin/__init__.py'
> --- account_analysis_seats_group_origin/__init__.py 1970-01-01
> 00:00:00 +0000
> +++ account_analysis_seats_group_origin/__init__.py 2012-10-15
> 21:24:27 +0000
> @@ -0,0 +1,22 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +###########################################################################
> +# Module Writen to OpenERP, Open Source Management Solution
> +# Copyright (C) Vauxoo (<http://vauxoo.com>).
> +# All Rights Reserved
>
> +###############Credits######################################################
> +# Coded by: Juan Carlos Funes(<email address hidden>)
>
> +#############################################################################
> +# 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/
> >.
>
> +################################################################################
>
> === added file 'account_analysis_seats_group_origin/__openerp__.py'
> --- account_analysis_seats_group_origin/__openerp__.py 1970-01-01
> 00:00:00 +0000
> +++ account_analysis_seats_group_origin/__openerp__.py 2012-10-15
> 21:24:27 +0000
> @@ -0,0 +1,41 @@
> +#!/usr/bin/python
> +# -*- encoding: utf-8 -*-
>
> +###########################...

Read more...

502. By Juan Carlos Hernandez

[REM][account_entries_report_group_by_ref]rename

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'account_entries_report_group_by_ref'
2=== added file 'account_entries_report_group_by_ref/__init__.py'
3--- account_entries_report_group_by_ref/__init__.py 1970-01-01 00:00:00 +0000
4+++ account_entries_report_group_by_ref/__init__.py 2012-10-16 21:30:35 +0000
5@@ -0,0 +1,22 @@
6+#!/usr/bin/python
7+# -*- encoding: utf-8 -*-
8+###########################################################################
9+# Module Writen to OpenERP, Open Source Management Solution
10+# Copyright (C) Vauxoo (<http://vauxoo.com>).
11+# All Rights Reserved
12+###############Credits######################################################
13+# Coded by: Juan Carlos Funes(juan@vauxoo.com)
14+#############################################################################
15+# This program is free software: you can redistribute it and/or modify
16+# it under the terms of the GNU Affero General Public License as published by
17+# the Free Software Foundation, either version 3 of the License, or
18+# (at your option) any later version.
19+#
20+# This program is distributed in the hope that it will be useful,
21+# but WITHOUT ANY WARRANTY; without even the implied warranty of
22+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23+# GNU Affero General Public License for more details.
24+#
25+# You should have received a copy of the GNU Affero General Public License
26+# along with this program. If not, see <http://www.gnu.org/licenses/>.
27+################################################################################
28
29=== added file 'account_entries_report_group_by_ref/__openerp__.py'
30--- account_entries_report_group_by_ref/__openerp__.py 1970-01-01 00:00:00 +0000
31+++ account_entries_report_group_by_ref/__openerp__.py 2012-10-16 21:30:35 +0000
32@@ -0,0 +1,41 @@
33+#!/usr/bin/python
34+# -*- encoding: utf-8 -*-
35+###########################################################################
36+# Module Writen to OpenERP, Open Source Management Solution
37+# Copyright (C) Vauxoo (<http://vauxoo.com>).
38+# All Rights Reserved
39+###############Credits######################################################
40+# Coded by: Juan Carlos Funes(juan@vauxoo.com)
41+#############################################################################
42+# This program is free software: you can redistribute it and/or modify
43+# it under the terms of the GNU Affero General Public License as published by
44+# the Free Software Foundation, either version 3 of the License, or
45+# (at your option) any later version.
46+#
47+# This program is distributed in the hope that it will be useful,
48+# but WITHOUT ANY WARRANTY; without even the implied warranty of
49+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
50+# GNU Affero General Public License for more details.
51+#
52+# You should have received a copy of the GNU Affero General Public License
53+# along with this program. If not, see <http://www.gnu.org/licenses/>.
54+################################################################################
55+{
56+ "name" : "Inherits the xml account_entries_report_view a button grouping by origin",
57+ "version" : "1.0",
58+ "depends" : ['account'],
59+ "author" : "Vauxoo",
60+ #"license" : "AGPL-3",
61+ "description" : """This module inherits the xml account_entries_report_view a button grouping by origin
62+ """,
63+ "website" : "http://vauxoo.com",
64+ "category" : "Generic Modules",
65+ "init_xml" : [],
66+ "demo_xml" : [],
67+ "test": [],
68+ "update_xml" : ['account_entries_report_view.xml',
69+ ],
70+ "active": False,
71+ "installable": True,
72+}
73+
74
75=== added file 'account_entries_report_group_by_ref/account_entries_report_view.xml'
76--- account_entries_report_group_by_ref/account_entries_report_view.xml 1970-01-01 00:00:00 +0000
77+++ account_entries_report_group_by_ref/account_entries_report_view.xml 2012-10-16 21:30:35 +0000
78@@ -0,0 +1,18 @@
79+<?xml version="1.0" encoding="utf-8"?>
80+<openerp>
81+ <data>
82+
83+ <record id="view_account_entries_report_search_origin_inh" model="ir.ui.view">
84+ <field name="name">view.account.entries.report.search.origin.inh</field>
85+ <field name="model">account.entries.report</field>
86+ <field name="type">search</field>
87+ <field name="inherit_id" ref="account.view_account_entries_report_search"/>
88+ <field name="arch" type="xml">
89+ <xpath expr="/search/group[@string='Group By...']/filter[@string='Fiscal Year']" position="after">
90+ <filter string="Origin" icon="terp-stock_symbol-selection" context="{'group_by':'ref'}"/>
91+ </xpath>
92+ </field>
93+ </record>
94+
95+ </data>
96+</openerp>