Merge lp:~dreis-pt/department-mgmt/analytic-v7 into lp:~department-core-editors/department-mgmt/7.0

[Daniel Reis]

Migrated analytic_department to v7.
I chose to remove the features depending on the deprecated user department.

[Niels Huylebroeck (red15)]

Very good styling, this could serve as an example for us all!

I'd like to point out you are adding +x attributes (executable) on each file? Are you perhaps using bzr under windows? Is there any way you can avoid passing this in the commit ?

Also feel free I'd say to add yourself to the authors by converting it to a list of strings:
"author": ["Camptocamp", "Daniel Reis"],

Perhaps even the copyright section can be expanded to include your name and the current year.

review: Approve (no test)

[Daniel Reis (dreis-pt)]

Thank you - I'm just applying what I learned in other MP reviews.

I'm fixing the +x attributes, and I'll be adding my name to the authors list as you kindly suggested.
I tried with the list, but it just gets converted to a string, so it's best not to the list.

As for the license text, IMHO it's rather pointless to repeat it in every .py file, including empty __init__.py files. And the license is ment to apply to all files, not only python code. I have seen that newer modules include a LICENSE text file for this, and I think that a DRYer single license file makes more sense.

I'll be resubmitting the changes soon.

[lp:~dreis-pt/department-mgmt/analytic-v7]

11. By Daniel Reis on 2013-02-27

[FIX] file 'x' attributes; license now stated in a single place.

[Daniel Reis (dreis-pt)]

Just pushed the changes into the MP.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Nit picking : I believe Joël's last name is correctly spelled 'Grand-Guillaume" (with two capital "G"s).

Apart from that LGTM.

review: Approve (code review, no test)

[lp:~dreis-pt/department-mgmt/analytic-v7]

12. By Daniel Reis on 2013-02-28

[FIX] License and author

[Daniel Reis (dreis-pt)]

Don't want to mess with Joël - fixed.

[Niels Huylebroeck (red15)]

For that author field, I know inside OpenERP it's listed as simple repr() output but I think it's correctly parsed and assigned on the openerp apps (and it's future proof too). It still is a better way imho to indicate who worked on it instead of concatenating all the author names together inside and unbreakable string.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Oh, I saw that you proposed the module 2 times, here and in this branch: https://code.launchpad.net/~dreis-pt/department-mgmt/project-v7b/+merge/151006

I guess that this merge proposal is a pre-requisite for the other one, next time, in such case can you resubmit the 'project-v7b/+merge/151006' putting this branch as 'pre-requisite' please? Thus, the changes of this branch won't be displayed on the other one. Thanks

review: Needs Information

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Same remark than the other merge proposal, the <field name="type">...</field> is now useless in v7, they can be removed.

[lp:~dreis-pt/department-mgmt/analytic-v7]

13. By Daniel Reis on 2013-03-04

[FIX] removing useless <field name=type>; fixing DOS linebreaks and +x file attributes.

[Daniel Reis (dreis-pt)]

Fixed!

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks! LGTM

review: Approve

=== added file 'analytic_department/LICENSE'
--- analytic_department/LICENSE	1970-01-01 00:00:00 +0000
+++ analytic_department/LICENSE	2013-03-04 16:38:22 +0000
@@ -0,0 +1,18 @@
+OpenERP, Open Source Management Solution
+
+Original author: Joël Grand-Guillaume
+Copyright © 2011 Camptocamp SA (http://www.camptocamp.com)
+Copyright © 2013 Daniel Reis (SECURITAS)
+
+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 Lice
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== modified file 'analytic_department/__init__.py'
--- analytic_department/__init__.py	2011-08-12 12:53:16 +0000
+++ analytic_department/__init__.py	2013-03-04 16:38:22 +0000
@@ -1,32 +1,1 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joel Grand-guillaume (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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 General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
 import analytic

=== modified file 'analytic_department/__openerp__.py'
--- analytic_department/__openerp__.py	2013-01-04 10:32:58 +0000
+++ analytic_department/__openerp__.py	2013-03-04 16:38:22 +0000
@@ -1,55 +1,15 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joel Grand-guillaume (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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 General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
 {
-    "name" : "Analytic Account Department Categorization",
-    "version" : "1.0",
-    "author" : "Camptocamp",
-    "category" : "Generic Modules/Projects & Services",
-    "description":
-"""
-    Add the department on Analytic Account and Analytical line as well as the related filter and button in the search form of
-    both object.
-    
+    "name": "Analytic Account Department Categorization",
+    "version": "1.0",
+    "author": "Camptocamp, Daniel Reis",
+    "license": "AGPL-3",
+    "category": "Generic Modules/Projects & Services",
+    "description": """\
+Add Department to Analytic Account and Analytical Line models, and to
+corresponding tree, search and form  views.
 """,
     "website": "http://camptocamp.com",
-    "depends" : [
-        "account",
-        "hr",
-                ],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : [
-        "analytic_view.xml",
-    ],
-    "active": False,
-    'installable': False
+    "depends": ["account", "hr"],
+    "data": ["analytic_view.xml"],
 }

=== modified file 'analytic_department/analytic.py'
--- analytic_department/analytic.py	2011-08-12 12:53:16 +0000
+++ analytic_department/analytic.py	2013-03-04 16:38:22 +0000
@@ -1,58 +1,16 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joel Grand-guillaume (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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 General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-
-class analytic_account(osv.osv):
+from openerp.osv import fields, orm
+
+
+class AnalyticAccount(orm.Model):
     _inherit = "account.analytic.account"
-
     _columns = {
         'department_id': fields.many2one('hr.department', 'Department'),
     }
-    _defaults = {
-        'department_id': lambda s,cr,uid,c: s.pool.get('res.users').browse(cr,uid,uid).context_department_id.id,
-    }
-
-analytic_account()
-
-class analytic_line(osv.osv):
+
+
+class AnalyticLine(orm.Model):
     _inherit = "account.analytic.line"
-
     _columns = {
         'department_id': fields.many2one('hr.department', 'Department'),
     }
-    _defaults = {
-        'department_id': lambda s,cr,uid,c: s.pool.get('res.users').browse(cr,uid,uid).context_department_id.id,
-    }
-
-analytic_line()
-

=== modified file 'analytic_department/analytic_view.xml'
--- analytic_department/analytic_view.xml	2012-07-23 06:52:34 +0000
+++ analytic_department/analytic_view.xml	2013-03-04 16:38:22 +0000
@@ -5,15 +5,12 @@
         <record id="view_account_analytic_account_search" model="ir.ui.view">
             <field name="name">account.analytic.account.search</field>
             <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_search" />
-            <field name="type">search</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_search"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/group/field[@name='user_id']" position="after">
-                    <field name="department_id" widget="selection" >
-                        <filter icon="terp-personal+" domain="[('department_id','=',context.get('department_id',False))]" string="My Departments Employee"/>
-                    </field>
-                </xpath>
-                <xpath expr="/search/group/filter[@string='Manager']" position="after">
+                <field name="user_id" position="after">
+                    <field name="department_id"/>
+                </field>
+                <xpath expr="/search/group/filter[1]" position="after">
                      <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
                 </xpath>
             </field>
@@ -22,60 +19,44 @@
         <record id="view_account_analytic_account_tree" model="ir.ui.view">
             <field name="name">account.analytic.account.tree</field>
             <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_tree" />
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='code']" position="after">
-                    <field name="department_id" />
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.form</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="account.view_account_analytic_account_form" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group/field[@name='partner_id']" position="after">
-                    <field name="department_id" />
-                </xpath>
-            </field>
-        </record>
-        
+            <field name="inherit_id" ref="account.view_account_analytic_account_tree"/>
+            <field name="arch" type="xml">
+                <field name="code" position="after">
+                    <field name="department_id"/>
+                </field>
+            </field>
+        </record>
         
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_form" />
-            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='company_id']" position="after">
-                    <field name="department_id" />
-                </xpath>
+                <field name="company_id" position="after">
+                    <field name="department_id"/>
+                </field>
             </field>
         </record>
         
         <record id="view_account_analytic_line_tree" model="ir.ui.view">
             <field name="name">account.analytic.line.tree</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_tree" />
-            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='user_id']" position="after">
-                    <field name="department_id" />
-                </xpath>
+                <field name="company_id" position="after">
+                    <field name="department_id"/>
+                </field>
             </field>
         </record>
+
         <record id="view_account_analytic_line_filter" model="ir.ui.view">
             <field name="name">account.analytic.line.select</field>
             <field name="model">account.analytic.line</field>
-            <field name="inherit_id" ref="account.view_account_analytic_line_filter" />
-            <field name="type">search</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/group/field[@name='user_id']" position="before">
-                    <field name="department_id" widget="selection" />
-                </xpath>
+                <field name="user_id" position="before">
+                    <field name="department_id" widget="selection"/>
+                </field>
                 <xpath expr="/search/group/filter[@string='User']" position="after">
                     <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
                 </xpath>
@@ -84,3 +65,4 @@
         
     </data>
 </openerp>
+

=== modified file 'analytic_department/i18n/analytic_department.pot' (properties changed: +x to -x)
=== modified file 'analytic_department/i18n/es.po' (properties changed: +x to -x)
=== removed directory 'analytic_department/security'