Merge lp:~initos.com/account-analytic/7.0 into lp:~account-core-editors/account-analytic/7.0

[Markus Schneider]

migrate acy_account_analytic_lines from lp:acysos/openerp-addons-6.0 to OpenERP 7
this modul fits this branch

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Markus,

Thank you very much for the new MP.

Some things seeing the code (not functional review yet):

- Lines inside for of _append_childs have an incorrect indentation.
- You should make PEP8 compliance according community guides. You can use flake8 tool to check it on .py files.

review: Needs Fixing (code review, no test)

[lp:~initos.com/account-analytic/7.0]

18. By Markus Schneider on 2013-11-15

correct indentation

[Markus Schneider (markus-schneider)]

we read it carefully

flake8 .
./__init__.py:22:1: F401 'wizard' imported but unused
./__openerp__.py:30:80: E501 line too long (95 > 79 characters)
./__openerp__.py:31:80: E501 line too long (97 > 79 characters)
./wizard/__init__.py:24:1: F401 'account_analytic_line' imported but unused
./wizard/account_analytic_line.py:31:80: E501 line too long (102 > 79 characters)
./wizard/account_analytic_line.py:43:80: E501 line too long (109 > 79 characters)

less then other modules in this branch

[Pedro Manuel Baeza (pedro.baeza)]

Indeed, there are modules that are already hosted on community repositories that have less coding conventions than yours, but these modules were included blindly when we start the project to have a base where we can work, and for now what we are trying to do is to increase more and more the quality of new additions. In the same way, when someone propose a change on that existing modules, we ask for a refactorization of them at the same time.

I hope you understand it.

On flake8 output, you can ignore the two line of "imported but unused"

Regards.

[lp:~initos.com/account-analytic/7.0]

19. By Markus Schneider on 2013-11-15

fix code formating

20. By Markus Schneider on 2013-11-28

remove debug

[Markus Schneider (markus-schneider)]

i have fix it and have PEP8 fully covered

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Markus,

Thank you very much for the changes.

Regards.

review: Approve (code review, no test)

[Omar (Pexego) (omar7r)]

Please, update translation files. Replace acy_account_analytic_lines by account_analytic_line_list.

review: Needs Fixing (code review)

[lp:~initos.com/account-analytic/7.0]

21. By Markus Schneider on 2013-12-13

rename translation

[Markus Schneider (markus-schneider)]

fixed: translation files renamed

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Hello Markus,

I don't know if it has an impact but the PO files still contains the previous name of the module.

Otherwise I would approve it.

Thanks.

review: Needs Fixing (code review)

[lp:~initos.com/account-analytic/7.0]

22. By Markus Schneider on 2014-01-03

update translation stuff

[Markus Schneider (markus-schneider)]

sorry, now i fix it

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Please provide a better explanation in module description.

review: Needs Fixing (description)

[lp:~initos.com/account-analytic/7.0]

23. By Markus Schneider on 2014-03-21

update module description

[Markus Schneider (markus-schneider)]

Update module description.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks it may lead a bit better the user who search modules through apps.openerp.com

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

I proceed with the merge, because Omar needs fixing comment is already repaired.

Regards.

=== added directory 'account_analytic_line_list'
=== added file 'account_analytic_line_list/__init__.py'
--- account_analytic_line_list/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_line_list/__init__.py	2014-03-21 10:39:26 +0000
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2013 Markus SChneider <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 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 . import wizard

=== added file 'account_analytic_line_list/__openerp__.py'
--- account_analytic_line_list/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_line_list/__openerp__.py	2014-03-21 10:39:26 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#                  2013 Markus SChneider <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 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": "Account Analytic Line List",
+    "version": "1.1",
+    "author": "initOS GmbH & Co. KG",
+    "website": "www.initos.com",
+    "category": "Generic Modules/Projects & Services",
+    "description": """Adds a wizard on financial reporting to search
+        the analytic lines for a given analytic account including all
+        their child accounts. Ported module acy_account_analytic_lines
+        from Acysos S.L. (Sponsored by Talleres Mutilva)""",
+    "license": "AGPL-3",
+    "depends": [
+        "base",
+        "account",
+        "analytic"
+        ],
+    "data": ["wizard/account_analytic_line.xml"],
+    "demo": [],
+    "active": False,
+    "installable": True
+}

=== added directory 'account_analytic_line_list/i18n'
=== added file 'account_analytic_line_list/i18n/account_analytic_line_list.pot'
--- account_analytic_line_list/i18n/account_analytic_line_list.pot	1970-01-01 00:00:00 +0000
+++ account_analytic_line_list/i18n/account_analytic_line_list.pot	2014-03-21 10:39:26 +0000
@@ -0,0 +1,45 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * account_analytic_line_list
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0.0\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-20-10 01:31:24+0000\n"
+"PO-Revision-Date: 2011-20-10 01:31:24+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_analytic_line_list
+#: field:account.analytic.view.line,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_line_list
+#: field:account.analytic.view.line,children:0
+msgid "With children"
+msgstr ""
+
+#. module: account_analytic_line_list
+#: model:ir.actions.act_window,name:account_analytic_view_line.action_view_account_analytic_lines
+#: model:ir.ui.menu,name:account_analytic_line_list.menu_view_account_analytic_lines
+#: view:account.analytic.view.line:0
+msgid "Analytic account lines"
+msgstr ""
+
+#. module: account_analytic_line_list
+#: view:account.analytic.view.line:0
+msgid "Open Lines"
+msgstr ""
+
+#. module: account_analytic_line_list
+#: view:account.analytic.view.line:0
+msgid "Cancel"
+msgstr ""
+
+

=== added file 'account_analytic_line_list/i18n/es.po'
--- account_analytic_line_list/i18n/es.po	1970-01-01 00:00:00 +0000
+++ account_analytic_line_list/i18n/es.po	2014-03-21 10:39:26 +0000
@@ -0,0 +1,43 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * account_analytic_line_list
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0.0\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-20-10 01:31:24+0000\n"
+"PO-Revision-Date: 2011-20-10 01:31:24+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_analytic_line_list
+#: field:account.analytic.view.line,analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_line_list
+#: field:account.analytic.view.line,children:0
+msgid "With children"
+msgstr "Con subcuentas"
+
+#. module: account_analytic_line_list
+#: model:ir.actions.act_window,name:account_analytic_view_line.action_view_account_analytic_lines
+#: model:ir.ui.menu,name:account_analytic_line_list.menu_view_account_analytic_lines
+#: view:account.analytic.view.line:0
+msgid "Analytic account lines"
+msgstr "Apuntes por cuenta analítica"
+
+#. module: account_analytic_line_list
+#: view:account.analytic.view.line:0
+msgid "Open Lines"
+msgstr "Abrir apuntes"
+
+#. module: account_analytic_line_list
+#: view:account.analytic.view.line:0
+msgid "Cancel"
+msgstr "Cancelar"

=== added directory 'account_analytic_line_list/wizard'
=== added file 'account_analytic_line_list/wizard/__init__.py'
--- account_analytic_line_list/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_line_list/wizard/__init__.py	2014-03-21 10:39:26 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#                  2013 Markus SChneider <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 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 . import account_analytic_line

=== added file 'account_analytic_line_list/wizard/account_analytic_line.py'
--- account_analytic_line_list/wizard/account_analytic_line.py	1970-01-01 00:00:00 +0000
+++ account_analytic_line_list/wizard/account_analytic_line.py	2014-03-21 10:39:26 +0000
@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2011 Acysos S.L. (http://acysos.com) All Rights Reserved.
+#                       Ignacio Ibeas <[e-mail]>
+#                  2013 Markus SChneider <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 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 orm, fields
+
+
+class AccountAnalyticViewLine(orm.TransientModel):
+    _name = "account.analytic.view.line"
+    _description = "Account Analytic View Line"
+
+    _columns = {
+        'analytic_id': fields.many2one('account.analytic.account',
+                                       'Analytic Account', required=True),
+        'children': fields.boolean('With children'),
+    }
+
+    def _append_childs(self, cr, uid, accounts, analytic_obj):
+        for child in analytic_obj.child_complete_ids:
+            accounts.append(child.id)
+            self._append_childs(cr, uid, accounts, child)
+
+    def open_account_analytic_lines(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        analytic_obj = self.pool.get('account.analytic.account')\
+                                .browse(cr, uid, [data['analytic_id'][0]])[0]
+        accounts = []
+        accounts.append(analytic_obj.id)
+        if data['children'] == 1:
+            self._append_childs(cr, uid, accounts, analytic_obj)
+        res = {
+            'domain': str([('account_id', 'in', accounts)]),
+            'name': 'Analytic account lines',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.analytic.line',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'context': {'search_default_to_invoice': 1},
+        }
+        return res

=== added file 'account_analytic_line_list/wizard/account_analytic_line.xml'
--- account_analytic_line_list/wizard/account_analytic_line.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_line_list/wizard/account_analytic_line.xml	2014-03-21 10:39:26 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <record id="view_account_analytic_lines" model="ir.ui.view">
+            <field name="name">view.account.analytic.lines.form</field>
+            <field name="model">account.analytic.view.line</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic account lines">
+                    <group colspan="4">
+                        <field name="analytic_id" />
+                        <field name="children"/>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Lines" name="open_account_analytic_lines" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_account_analytic_lines" model="ir.actions.act_window">
+            <field name="name">Analytic account lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.view.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        <menuitem
+                name="Analytic account lines"
+                action="action_view_account_analytic_lines"
+                id="menu_view_account_analytic_lines"
+                parent="account.next_id_40"
+                sequence="2"
+            icon="STOCK_INDENT"/>
+        
+    </data>
+</openerp>
\ No newline at end of file