Merge lp:~camptocamp/project-service/7.0-port-project_service_type into lp:~project-core-editors/project-service/trunk

[Yannick Vaucher @ Camptocamp]

[Daniel Reis (dreis-pt)]

To fix:
- "WARNING: The model project.service_type has no access rules, consider adding one."

Other comments:
- Project "Type": would it be adequate to call it "Budget type"? Personally I'm not familiar with "Forfait" and "Regie" terms. Probably I know them as "Fixed price" and "Responsibility / Closed price". It would be nice to add a little explanation on these on the field's Help text.

review: Needs Fixing

[Frederic Clementi - Camptocamp (frederic-clementi)]

Ok for the comment. Do you agree with this king of comment ?

Fixed price -> 'when project price is an upfront agreed price'

Responsibility / Closed price -> 'when invoicing is based on actual worked time (only an hourly/daily price has been agreed).

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I updated the terms and made help text:

Forfait (FR) -> Fixed price
Plafond (FR) -> Responsibility / Closed price
Régie (FR) -> Force account

Maybe not the best terms?

[Daniel Reis (dreis-pt)]

Sorry for not commenting earlier.

I've just learned that v7 official modules have some support for different type of service projects: take a look at https://doc.openerp.com/book/4/4_12_Services/4_12_Services_contract

If you install "Contract Management", you get new fields for the invoicing methods to use:
- `fix_price_invoices` flag, if there is fixed invoicing
- `invoice_on timesheets` flag, if there is invoicing based on actual work

Could this make the new `project_type` unnecessary?

review: Needs Information

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> I updated the terms and made help text:
>
> Forfait (FR) -> Fixed price
> Plafond (FR) -> Responsibility / Closed price
> Régie (FR) -> Force account
>
> Maybe not the best terms?

Renaming the string of a selection is a thing. The 'stored' part of the selection should be renamed as well.

> If you install "Contract Management", you get new fields for the invoicing methods to use:
> - `fix_price_invoices` flag, if there is fixed invoicing
> - `invoice_on timesheets` flag, if there is invoicing based on actual work
>
> Could this make the new `project_type` unnecessary?

Good catch, this is something to consider.

review: Needs Fixing

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

Based on Daniel's comment, I would disapprove this MP as the need is already answered.

But I guess this module is a dependency of others and their migration requires an effort I don't know, which is why I will abstain.

review: Abstain

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

That's a module we use at least for our own OpenERP.

My guess is that project_type exists for historical reasons, and we might consider to remove it if it can be replaced by native fields. I don't know exactly what it is used for and the implications if we change that.

Yannick, can you check, according to the Daniel's comment, if the 'project_type' is really a requirement for us and if it can be replaced by 'fix_price_invoices' and 'invoice_on timesheets'.

Thanks!

Unmerged revisions

32. By Yannick Vaucher @ Camptocamp on 2013-06-17

[ADD] project_service_type - translations + reformat help message for field project_type

31. By Yannick Vaucher @ Camptocamp on 2013-06-17

[IMP] project_service_type - change class name to camelcase

30. By Yannick Vaucher @ Camptocamp on 2013-06-17

[FIX] project_service_type - remove extra coma

29. By Yannick Vaucher @ Camptocamp on 2013-06-17

[ADD] project_service_type - security

28. By Yannick Vaucher @ Camptocamp on 2013-06-17

[IMP] project_service_type - translate budget types

27. By Yannick Vaucher @ Camptocamp on 2013-05-02

[IMP] project_service_type - retab xml file

26. By Yannick Vaucher @ Camptocamp on 2013-05-02

[IMP] project_service_type - update license to AGPL

25. By Yannick Vaucher @ Camptocamp on 2013-05-02

[IMP] project_service_type - use orm.Model instead of alias osv.osv

24. By Yannick Vaucher @ Camptocamp on 2013-05-02

[MIG] portage of project_service_type by OpenERP

=== modified file 'project_service_type/__init__.py'
--- project_service_type/__init__.py	2011-08-12 12:33:12 +0000
+++ project_service_type/__init__.py	2013-06-17 13:17:26 +0000
@@ -1,29 +1,23 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2010 Camtocamp SA
-# @author Joël Grand-Guillaume
-#
-# 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.
+#    Author: Joël Grand-Guillaume
+#    Copyright 2010 Camptocamp SA
+#
+#    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/>.
 #
 ##############################################################################
-import project
\ No newline at end of file
+import project
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'project_service_type/__openerp__.py'
--- project_service_type/__openerp__.py	2013-03-04 16:16:31 +0000
+++ project_service_type/__openerp__.py	2013-06-17 13:17:26 +0000
@@ -1,48 +1,40 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# @author Grand-Guillaume Joel
-# 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.
+#    Author: Joël Grand-Guillaume
+#    Copyright 2010 Camptocamp SA
+#
+#    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/>.
 #
 ##############################################################################
-
 {
-     "name": "Add type of service on project",
-     "version": "1.0",
-     "author": "Camptocamp",
-     "category": "Generic Modules/Projects & Services",
-     "description":
-"""
+    'name' : 'Add type of service on project',
+    'version' : '1.0',
+    'category' : 'Generic Modules/Projects & Services',
+    'description':
+'''
 This will add a type of service on project allowing you to categorize them.
-""",
-     "website": "http://camptocamp.com",
-     "depends": [
-            "project",
-                ],
-     "init_xml": [],
-     "demo_xml": [],
-     "update_xml": [
-        "project_view.xml"
-     ],
-     "active": False,
-     "installable": False
+''',
+    'author' : 'Camptocamp',
+    'website': 'http://camptocamp.com',
+    'depends' : ['project'],
+    'data' : ['project_view.xml'],
+    'demo_xml' : [],
+    'test': [],
+    'installable': True,
+    'auto_install': False,
+    'application': False
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'project_service_type/i18n'
=== added file 'project_service_type/i18n/en.po'
--- project_service_type/i18n/en.po	1970-01-01 00:00:00 +0000
+++ project_service_type/i18n/en.po	2013-06-17 13:17:26 +0000
@@ -0,0 +1,79 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_service_type
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-17 12:56+0000\n"
+"PO-Revision-Date: 2013-06-17 12:56+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: project_service_type
+#: field:project.project,project_type:0
+msgid "Budget Type"
+msgstr "Budget Type"
+
+#. module: project_service_type
+#: selection:project.project,project_type:0
+msgid "Force account"
+msgstr "Force account"
+
+#. module: project_service_type
+#: field:project.project,project_service_id:0
+#: view:project.service_type:0
+#: field:project.service_type,name:0
+msgid "Service Type"
+msgstr "Service Type"
+
+#. module: project_service_type
+#: model:ir.model,name:project_service_type.model_project_service_type
+msgid "Service type"
+msgstr "Service type"
+
+#. module: project_service_type
+#: model:ir.module.module,shortdesc:project_service_type.module_meta_information
+msgid "Add type of service on project"
+msgstr "Add type of service on project"
+
+#. module: project_service_type
+#: model:ir.model,name:project_service_type.model_project_project
+msgid "Project"
+msgstr "Project"
+
+#. module: project_service_type
+#: model:ir.module.module,description:project_service_type.module_meta_information
+msgid "\n"
+"This will add a type of service on project allowing you to categorize them.\n"
+""
+msgstr "\n"
+"This will add a type of service on project allowing you to categorize them.\n"
+""
+
+#. module: project_service_type
+#: model:ir.actions.act_window,name:project_service_type.action_service_type
+#: model:ir.ui.menu,name:project_service_type.menu_service_type
+msgid "Service Types"
+msgstr "Service Types"
+
+#. module: project_service_type
+#: selection:project.project,project_type:0
+msgid "Responsibility / Closed price"
+msgstr "Responsibility / Closed price"
+
+#. module: project_service_type
+#: selection:project.project,project_type:0
+msgid "Fixed price"
+msgstr "Fixed price"
+
+#. module: project_service_type
+#: help:project.project,project_type:0
+msgid "Fixed price: When project is an upfront agreed price.\nResponsibility / Closed price : When a ceiling price is defined for the project.\nForce account: When invoicing is based on actual worked time (only an hourly/daily price has been agreed)."
+msgstr "Fixed price: When project is an upfront agreed price.\nResponsibility / Closed price : When a ceiling price is defined for the project.\nForce account: When invoicing is based on actual worked time (only an hourly/daily price has been agreed)."
+

=== added file 'project_service_type/i18n/fr.po'
--- project_service_type/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ project_service_type/i18n/fr.po	2013-06-17 13:17:26 +0000
@@ -0,0 +1,79 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_service_type
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-17 12:57+0000\n"
+"PO-Revision-Date: 2013-06-17 12:57+0000\n"
+"Last-Translator: Yannick Vaucher (Camptocamp) <>\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: project_service_type
+#: field:project.project,project_type:0
+msgid "Budget Type"
+msgstr "Type de budget"
+
+#. module: project_service_type
+#: selection:project.project,project_type:0
+msgid "Force account"
+msgstr "Régie"
+
+#. module: project_service_type
+#: field:project.project,project_service_id:0
+#: view:project.service_type:0
+#: field:project.service_type,name:0
+msgid "Service Type"
+msgstr "Type de service"
+
+#. module: project_service_type
+#: model:ir.model,name:project_service_type.model_project_service_type
+msgid "Service type"
+msgstr "Type de service"
+
+#. module: project_service_type
+#: model:ir.module.module,shortdesc:project_service_type.module_meta_information
+msgid "Add type of service on project"
+msgstr "Ajoute un type de service au project"
+
+#. module: project_service_type
+#: model:ir.model,name:project_service_type.model_project_project
+msgid "Project"
+msgstr "Projet"
+
+#. module: project_service_type
+#: model:ir.module.module,description:project_service_type.module_meta_information
+msgid "\n"
+"This will add a type of service on project allowing you to categorize them.\n"
+""
+msgstr "\n"
+"Ceci va ajouter un type de service au projet, ce qui permet de les catégoriser.\n"
+""
+
+#. module: project_service_type
+#: model:ir.actions.act_window,name:project_service_type.action_service_type
+#: model:ir.ui.menu,name:project_service_type.menu_service_type
+msgid "Service Types"
+msgstr "Types de service"
+
+#. module: project_service_type
+#: selection:project.project,project_type:0
+msgid "Responsibility / Closed price"
+msgstr "Plafond"
+
+#. module: project_service_type
+#: selection:project.project,project_type:0
+msgid "Fixed price"
+msgstr "Forfait"
+
+#. module: project_service_type
+#: help:project.project,project_type:0
+msgid "Fixed price: When project is an upfront agreed price.\nResponsibility / Closed price : When a ceiling price is defined for the project.\nForce account: When invoicing is based on actual worked time (only an hourly/daily price has been agreed)."
+msgstr "Forfait: Quand le prix convenu du projet est un prix défini à l'avance.\nPlafond : Quand un prix plafond est défini pour le projet.\nRégie: Quand la facturation se base sur le temps de travail accompli (seul un tarif heure/jour à été convenu)."
+

=== modified file 'project_service_type/project.py'
--- project_service_type/project.py	2011-08-12 12:33:12 +0000
+++ project_service_type/project.py	2013-06-17 13:17:26 +0000
@@ -1,57 +1,46 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2010 Camtocamp SA
-# @author Joël Grand-Guillaume
-# $Id: $
-#
-# 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.
+#    Author: Joël Grand-Guillaume
+#    Copyright 2010 Camptocamp SA
+#
+#    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/>.
 #
 ##############################################################################
-
-from osv import fields
-from osv import osv
-
-from tools import config
-
-class project_service_type(osv.osv):
+from openerp.osv import orm, fields
+
+class ProjectServiceType(orm.Model):
     _name = "project.service_type"
     _description = "Service type"
-    
     _columns = {
-        'name': fields.char('Service type', required=True, size=64),
-    }
-
-        
-project_service_type()
-
-
-class project_project(osv.osv):
+        'name': fields.char('Service Type', required=True, size=64),
+        }
+
+
+class ProjectProject(orm.Model):
     _inherit = 'project.project'
-
     _columns = {
-        'project_service_id':fields.many2one('project.service_type', 'Service type', required=True),
-        'project_type': fields.selection([('forfait', 'Forfait'),('plafond', 'Plafond'),('regie', 'Regie')], 'Type', required=True),
-   }
-
-
-project_project()
+        'project_service_id':fields.many2one('project.service_type', 'Service Type', required=True),
+        'project_type': fields.selection(
+                            [('forfait', 'Fixed price'),
+                             ('plafond', 'Responsibility / Closed price'),
+                             ('regie', 'Force account')], 'Budget Type', required=True,
+                            help=(
+                                "Fixed price: When project is an upfront agreed price.\n"
+                                "Responsibility / Closed price : When a ceiling price is defined for the project.\n"
+                                "Force account: When invoicing is based on actual"
+                                " worked time (only an hourly/daily price has been agreed).")),
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'project_service_type/project_view.xml'
--- project_service_type/project_view.xml	2011-08-12 12:33:12 +0000
+++ project_service_type/project_view.xml	2013-06-17 13:17:26 +0000
@@ -1,50 +1,52 @@
-<terp>
-<data>
-    
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
     <record model="ir.ui.view" id="view_service_type_form">
-        <field name="name">project.service_type.form</field>
-        <field name="model">project.service_type</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Service type">
-                <field name="name" select="1"/>
-            </form>
-        </field>
+      <field name="name">project.service_type.form</field>
+      <field name="model">project.service_type</field>
+      <field name="arch" type="xml">
+        <form string="Service Type" version="7.0">
+          <group>
+            <field name="name"/>
+          </group>
+        </form>
+      </field>
     </record>
+
     <record model="ir.ui.view" id="view_service_type_list">
-        <field name="name">project.service_type.list</field>
-        <field name="model">project.service_type</field>
-        <field name="type">tree</field>
-        <field name="priority" eval="6"/>
-        <field name="arch" type="xml">
-            <tree string="Service type">
-                <field name="name"/>
-            </tree>
-        </field>
+      <field name="name">project.service_type.list</field>
+      <field name="model">project.service_type</field>
+      <field name="priority" eval="6"/>
+      <field name="arch" type="xml">
+        <tree string="Service Type">
+          <field name="name"/>
+        </tree>
+      </field>
     </record>
-    
+
     <record model="ir.actions.act_window" id="action_service_type">
-        <field name="name">Service types</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">project.service_type</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_service_type_list"/>
+      <field name="name">Service Types</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">project.service_type</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="view_id" ref="view_service_type_list"/>
     </record>
-    
-    <menuitem parent="project.menu_definitions" id="menu_service_type" action="action_service_type"/>
-    
+
+    <menuitem parent="base.menu_definitions" id="menu_service_type" action="action_service_type"/>
+
     <record id="edit_project" model="ir.ui.view">
-        <field name="name">project.project.form</field>
-        <field name="model">project.project</field>
-        <field name="type">form</field>
-        <field name="inherit_id" ref="project.edit_project" />
-        <field name="arch" type="xml">
-            <xpath expr="/form/notebook/page/group/field[@name='warn_manager']" position="before">
-                <field name="project_service_id" widget="selection" />
-                <field name="project_type" />
-            </xpath>
-        </field>
+      <field name="name">project.project.form</field>
+      <field name="model">project.project</field>
+      <field name="inherit_id" ref="project.edit_project" />
+      <field name="arch" type="xml">
+        <xpath expr="/form/sheet/notebook/page[@string='Other Info']/group/group[@string='Miscellaneous']/field[@name='currency_id']" position="after">
+          <field name="project_service_id" widget="selection" />
+          <field name="project_type" />
+        </xpath>
+      </field>
     </record>
-</data>
-</terp>
+
+  </data>
+</openerp>

=== added directory 'project_service_type/security'
=== added file 'project_service_type/security/ir.model.access.csv'
--- project_service_type/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ project_service_type/security/ir.model.access.csv	2013-06-17 13:17:26 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_project_service_type","project.service_type","model_project_service_type","project.group_project_user",1,0,0,0
+"access_project_service_type_manager","project.service_type","model_project_service_type","project.group_project_manager",1,1,1,1