Merge lp:~dreis-pt/department-mgmt/project-v7b into lp:~department-core-editors/department-mgmt/7.0

[Daniel Reis]

[Resubmitting with fixes and proper prerequisite branch info]:
Migrating "project_department" to v7.
Timesheet features were split into a separate module.
Both these modules will auto-install if "analytic_department" is also installed.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Nitpicking:

l.299,314,326,338,350,429,441,453,702,714,729
The <field name="type">...</field> is now useless in v7, they can be removed.

Otherwise, it seems good to me, so I approve.

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

hmm, not noticed that before, can you remove the +x flag on some .py files ?

=== modified file 'analytic_department/__init__.py' (properties changed: -x to +x)
=== modified file 'analytic_department/__openerp__.py' (properties changed: -x to +x)
=== modified file 'analytic_department/analytic.py' (properties changed: -x to +x)

review: Needs Fixing

[Daniel Reis (dreis-pt)]

Prerequisite added and MP resubmited.

[Nhomar - Vauxoo (nhomar)]

Daniel.

When it is useful?, why do you need department in timesheet friend?

Thanks in advance.

Regards

[Daniel Reis (dreis-pt)]

@nhomar: actually I don't, but Camp2Camp does (or at least it's in their codebase).
That's I'm separating it into a different module. I do need Departments in Projects and in Issues (MP on the way).

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

@ Nohmar, this is useful to sum spent hours by department for a same project, in our case for revenue splitting for example. But could just be to have a reporting on average repatition between department per project or such a thing we do need at least...

Hope this helps,

Joël

Le 18 mars 2013 à 15:04, Nhomar - Vauxoo <email address hidden> a écrit :

> Daniel.
>
> When it is useful?, why do you need department in timesheet friend?
>
> Thanks in advance.
>
> Regards
> --
> https://code.launchpad.net/~dreis-pt/department-mgmt/project-v7b/+merge/151562
> Your team Department Core Editors is subscribed to branch lp:department-mgmt.

--

Camptocamp
Innovative Solutions by Open Source Experts

Joël Grand-Guillaume
Division Manager - Business Solutions

www.camptocamp.com

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Sorry to bump into this a bit late but here are 2 things about this module I just figured out that should be fixed:

http://bazaar.launchpad.net/~department-core-editors/department-mgmt/7.0/view/head:/project_department/project.py
We need to remove it.

And an other module with the same name is in
https://code.launchpad.net/~project-core-editors/project-service/trunk

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I did the following MP to solve those 2 issues:

https://code.launchpad.net/~camptocamp/department-mgmt/7.0-remove-useless-py-file-20130502/+merge/162057

https://code.launchpad.net/~camptocamp/project-service/trunk-remove-project-department-20130502/+merge/162056

=== added directory 'hr_timesheet_department'
=== added file 'hr_timesheet_department/LICENSE'
--- hr_timesheet_department/LICENSE	1970-01-01 00:00:00 +0000
+++ hr_timesheet_department/LICENSE	2013-03-04 17:08:21 +0000
@@ -0,0 +1,18 @@
+OpenERP, Open Source Management Solution
+
+Original author: Joël Grand-Guillaume (in module project_department)
+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/>.

=== added file 'hr_timesheet_department/__init__.py'
--- hr_timesheet_department/__init__.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_department/__init__.py	2013-03-04 17:08:21 +0000
@@ -0,0 +1,1 @@
+#empty

=== added file 'hr_timesheet_department/__openerp__.py'
--- hr_timesheet_department/__openerp__.py	1970-01-01 00:00:00 +0000
+++ hr_timesheet_department/__openerp__.py	2013-03-04 17:08:21 +0000
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+{
+    "name": "Analytic Accounts / Contracts Department Categorization",
+    "version": "1.0",
+    "author": "Camptocamp, Daniel Reis",
+    "license": "AGPL-3",
+    "category": "Generic Modules/Projects & Services",
+    "description": """\
+Add Department to Timesheets (hr.analytic.timesheet) and to corresponding tree,
+search and form  views.
+""",
+    "website": "http://camptocamp.com",
+    "depends": ["hr_timesheet", "analytic_department"],
+    "data": ["hr_timesheet_view.xml"],
+    "auto_install": True,
+}

=== added file 'hr_timesheet_department/hr_timesheet_view.xml'
--- hr_timesheet_department/hr_timesheet_view.xml	1970-01-01 00:00:00 +0000
+++ hr_timesheet_department/hr_timesheet_view.xml	2013-03-04 17:08:21 +0000
@@ -0,0 +1,46 @@
+<openerp>
+    <data>
+        
+         <record id="hr_timesheet_line_tree" model="ir.ui.view">
+             <field name="name">hr.analytic.timesheet.tree</field>
+             <field name="model">hr.analytic.timesheet</field>
+             <field name="type">tree</field>
+             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+             <field name="arch" type="xml">
+                 <field name="user_id" position="after">
+                       <field name="department_id"/>
+                 </field>
+             </field>
+         </record>
+         
+         <record id="hr_timesheet_line_form" model="ir.ui.view">
+             <field name="name">hr.analytic.timesheet.form</field>
+             <field name="model">hr.analytic.timesheet</field>
+             <field name="type">form</field>
+             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+             <field name="arch" type="xml">
+                 <field name="date" position="after">
+                       <field name="department_id"/>
+                 </field>
+             </field>
+         </record>
+
+         <record id="hr_timesheet_line_search" model="ir.ui.view">
+             <field name="name">hr.analytic.timesheet.search</field>
+             <field name="model">hr.analytic.timesheet</field>
+             <field name="type">search</field>
+             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
+             <field name="arch" type="xml">
+                 <field name="user_id" position="after">
+                       <field name="department_id"/>
+                 </field>
+                 <xpath expr="/search/group/filter[@string='Users']" position="after">
+                       <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
+                 </xpath>
+             </field>
+
+         </record>
+
+    </data>
+</openerp>
+

=== added file 'project_department/LICENSE'
--- project_department/LICENSE	1970-01-01 00:00:00 +0000
+++ project_department/LICENSE	2013-03-04 17:08:21 +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 'project_department/__init__.py'
--- project_department/__init__.py	2011-08-12 12:53:16 +0000
+++ project_department/__init__.py	2013-03-04 17:08:21 +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 project
+#empty

=== modified file 'project_department/__openerp__.py'
--- project_department/__openerp__.py	2013-01-04 10:32:58 +0000
+++ project_department/__openerp__.py	2013-03-04 17:08:21 +0000
@@ -1,56 +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" : "Project and Timesheet Department Categorization",
-    "version" : "1.0",
-    "author" : "Camptocamp",
-    "category" : "Generic Modules/Projects & Services",
-    "description":
-"""
-    Add the department on Project and Timesheet (hr.analytic.timesheet) as well as the related filter and button in the search form of
-    both object.
-    
+    "name": "Project Department Categorization",
+    "version": "1.0",
+    "author": "Camptocamp, Daniel Reis",
+    "license": "AGPL-3",
+    "category": "Generic Modules/Projects & Services",
+    "description": """\
+Add Department to Projects and to corresponding tree, search and form  views.
 """,
     "website": "http://camptocamp.com",
-    "depends" : [
-        "hr_timesheet",
-        "project",
-        "analytic_department",
-                ],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : [
-        "project_view.xml",
-    ],
-    "active": False,
-    'installable': False
+    "depends": ["project", "analytic_department"],
+    "data": ["project_view.xml"],
+    "auto_install": True,
 }

=== removed directory 'project_department/i18n'
=== modified file 'project_department/project_view.xml'
--- project_department/project_view.xml	2011-08-12 12:53:16 +0000
+++ project_department/project_view.xml	2013-03-04 17:08:21 +0000
@@ -1,87 +1,46 @@
-<openerp>
-    <data>
-        
-         <record id="edit_project" model="ir.ui.view">
-             <field name="name">project.project.form</field>
-             <field name="model">project.project</field>
-             <field name="inherit_id" ref="project.edit_project" />
-             <field name="type">form</field>
-             <field name="arch" type="xml">
-                 <xpath expr="/form/notebook/page/group/field[@name='company_id']" position="after">
-                     <field name="department_id" widget="selection"/>
-                 </xpath>
-             </field>
-         </record>
-
-        <record id="view_project_project_filter" model="ir.ui.view">
-             <field name="name">project.project.select</field>
-             <field name="model">project.project</field>
-             <field name="inherit_id" ref="project.view_project_project_filter" />
-             <field name="type">search</field>
-             <field name="arch" type="xml">
-                   <xpath expr="/search/group/field[@name='partner_id']" position="before">
-                      <field name="department_id" widget="selection" />
-                   </xpath>
-                   <xpath expr="/search/group/filter[@string='Manager']" position="after">
-                      <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
-                   </xpath>
-             </field>
-         </record>
-
-         <record id="view_project" model="ir.ui.view">
-             <field name="name">project.project.tree</field>
-             <field name="model">project.project</field>
-             <field name="inherit_id" ref="project.view_project" />
-             <field name="type">tree</field>
-             <field name="field_parent">child_ids</field>
-             <field name="arch" type="xml">
-                 <xpath expr="/tree/field[@name='user_id']" position="after">
-                      <field name="department_id" />
-                  </xpath>
-             </field>
-         </record>
-        
-        
-         <record id="hr_timesheet_line_tree" model="ir.ui.view">
-             <field name="name">hr.analytic.timesheet.tree</field>
-             <field name="model">hr.analytic.timesheet</field>
-             <field name="type">tree</field>
-             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />
-             <field name="arch" type="xml">
-                 <xpath expr="/tree/field[@name='user_id']" position="after">
-                       <field name="department_id" />
-                 </xpath>
-             </field>
-         </record>
-         <record id="hr_timesheet_line_form" model="ir.ui.view">
-             <field name="name">hr.analytic.timesheet.form</field>
-             <field name="model">hr.analytic.timesheet</field>
-             <field name="type">form</field>
-             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form" />
-             <field name="arch" type="xml">
-                 <xpath expr="/form/group/field[@name='user_id']" position="after">
-                       <field name="department_id" widget="selection"/>
-                 </xpath>
-             </field>
-         </record>
-
-         <record id="hr_timesheet_line_search" model="ir.ui.view">
-             <field name="name">hr.analytic.timesheet.search</field>
-             <field name="model">hr.analytic.timesheet</field>
-             <field name="type">search</field>
-             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search" />
-             <field name="arch" type="xml">
-                 <xpath expr="/search/group/field[@name='user_id']" position="after">
-                       <field name="department_id" widget="selection" />
-                 </xpath>
-                 <xpath expr="/search/group/filter[@string='Users']" position="after">
-                       <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
-                 </xpath>
-             </field>
-
-         </record>
-
-        
-        
-    </data>
-</openerp>
\ No newline at end of file
+<openerp>
+    <data>
+        
+         <record id="edit_project" model="ir.ui.view">
+             <field name="name">project.project.form</field>
+             <field name="model">project.project</field>
+             <field name="inherit_id" ref="project.edit_project"/>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                 <field name="partner_id" position="after">
+                     <field name="department_id"/>
+                 </field>
+             </field>
+         </record>
+
+        <record id="view_project_project_filter" model="ir.ui.view">
+             <field name="name">project.project.select</field>
+             <field name="model">project.project</field>
+             <field name="inherit_id" ref="project.view_project_project_filter"/>
+             <field name="type">search</field>
+             <field name="arch" type="xml">
+                   <field name="partner_id" position="before">
+                      <field name="department_id"/>
+                   </field>
+                   <xpath expr="/search/group/filter[@string='Manager']" position="after">
+                      <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
+                   </xpath>
+             </field>
+         </record>
+
+         <record id="view_project" model="ir.ui.view">
+             <field name="name">project.project.tree</field>
+             <field name="model">project.project</field>
+             <field name="inherit_id" ref="project.view_project"/>
+             <field name="type">tree</field>
+             <field name="field_parent">child_ids</field>
+             <field name="arch" type="xml">
+                 <field name="user_id" position="after">
+                      <field name="department_id"/>
+                  </field>
+             </field>
+         </record>
+
+    </data>
+</openerp>
+

=== removed directory 'project_department/security'