Merge lp:~akretion-team/project-service/project-service-port-functionnal-block into lp:~project-core-editors/project-service/trunk

[Sébastien BEAU - http://www.akretion.com]

Port project functionnal block to 7 version.

[Daniel Reis (dreis-pt)]

In L203, `colspan="4"`: I can be wrong, but I think in v7 this is ignored.
Otherwise, LGTM.

review: Approve

[lp:~akretion-team/project-service/project-service-port-functionnal-block]

36. By Sébastien BEAU - http://www.akretion.com on 2014-03-20

[REF] port view on 7

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

I clean the view

[lp:~akretion-team/project-service/project-service-port-functionnal-block]

37. By Sébastien BEAU - http://www.akretion.com on 2014-03-20

[IMP] add demo data

38. By Sébastien BEAU - http://www.akretion.com on 2014-03-20

[REF] rename project_functional_blocks into project_functional_block

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

I add some demo data and also I rename the module (remove the useless "s")

Regarding the name of the object "project.functional_block" what is better keeping the "_" ou replacing it by a "."

Thanks

[Daniel Reis (dreis-pt)]

Good question.
I grepped the addons, and IMHO it would be more consistent to use "project.functional.block".

[lp:~akretion-team/project-service/project-service-port-functionnal-block]

39. By Sébastien BEAU - http://www.akretion.com on 2014-03-21

[REF] rename project.functional_block into project.functional.block

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Done ;)

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Thanks Seb, seems all right; tested.

review: Approve

[lp:~akretion-team/project-service/project-service-port-functionnal-block]

40. By David BEAL (ak) on 2014-03-25

[FIX] replace project.functional_block by project.functional.block

41. By David BEAL (ak) on 2014-03-25

[FIX] rename project.functional_block in project.functional.block in roject_task_service

42. By David BEAL (ak) on 2014-03-25

[FIX] rename project.functional_block in project.functional.block in project_issue_service

[Daniel Reis (dreis-pt)]

review: Approve (lgtm)

=== renamed directory '__unported__/project_functional_blocks' => 'project_functional_block'
=== modified file 'project_functional_block/__init__.py'
--- __unported__/project_functional_blocks/__init__.py	2012-07-12 07:42:28 +0000
+++ project_functional_block/__init__.py	2014-03-25 15:51:09 +0000
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Akretion LDTA (<http://www.akretion.com>).
-#    
+#
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,6 +20,6 @@
 #
 ##############################################################################
 
-import project
+from . import project
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'project_functional_block/__openerp__.py' (properties changed: +x to -x)
--- __unported__/project_functional_blocks/__openerp__.py	2013-03-04 16:16:31 +0000
+++ project_functional_block/__openerp__.py	2014-03-25 15:51:09 +0000
@@ -18,22 +18,26 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{
-    "name": "Project requiring functional blocks",
-    "version": "1.1dr",
-    "author": "Akretion",
-    "website": "http://www.openerp.com",
-    "category": "project Management",
-    "depends": ["project"],
-    "description": """\
+
+{'name': 'Project requiring functional blocks',
+ 'version': '1.2',
+ 'author': 'Akretion',
+ 'website': 'www.akretion.com',
+ 'license': 'AGPL-3',
+ 'category': 'Generic Modules',
+ 'description': """
 Adds functional blocks to organize the projects tasks.
-(fork from lp:~akretion-team/+junk/advanced-project-management)
-    """,
-    "demo_xml": [],
-    "update_xml": [
-            "security/ir.model.access.csv",
-            "project_view.xml",
-            ],
-    'installable': False,
+ """,
+ 'depends': [
+     'project',
+ ],
+ 'data': [
+     'security/ir.model.access.csv',
+     'project_view.xml',
+ ],
+ 'demo': [
+     'project_demo.xml',
+ ],
+ 'installable': True,
+ 'application': True,
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'project_functional_block/project.py' (properties changed: +x to -x)
--- __unported__/project_functional_blocks/project.py	2012-11-22 13:15:34 +0000
+++ project_functional_block/project.py	2014-03-25 15:51:09 +0000
@@ -1,40 +1,67 @@
 # -*- coding: utf-8 -*-
-from osv import fields, osv
-
-class project_functional_block(osv.osv):
-    _name = 'project.functional_block'
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010 Akretion LDTA (<http://www.akretion.com>).
+#
+#
+#    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 openerp.osv import fields, orm
+
+
+class project_functional_block(orm.Model):
+    _name = 'project.functional.block'
     _description = 'Functional block to organize projects tasks'
 
     def name_get(self, cr, uid, ids, context=None):
         res = []
-        for row in self.read(cr, uid, ids, ['name','parent_id'], context=context):
+        for row in self.read(cr, uid, ids, ['name', 'parent_id'], context=context):
             parent = row['parent_id'] and (row['parent_id'][1]+' / ') or ''
             res.append((row['id'], parent + row['name']))
         return res
-        
+
     def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
-        return dict( self.name_get(cr, uid, ids, context=context) )
+        return dict(self.name_get(cr, uid, ids, context=context))
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
+        'sequence': fields.integer('Sequence'),
         'description': fields.text('Description', translate=True),
-        'parent_id': fields.many2one('project.functional_block', 'Parent block', select=True),
-        'child_id': fields.one2many('project.functional_block', 'parent_id', 'Child block'),
-        'complete_name': fields.function(_name_get_fnc, method=True, type='char', string='Name'),
+        'parent_id': fields.many2one(
+            'project.functional.block',
+            'Parent block'),
+        'child_id': fields.one2many(
+            'project.functional.block',
+            'parent_id',
+            'Child block'),
+        'complete_name': fields.function(
+            _name_get_fnc,
+            method=True,
+            type='char',
+            string='Name'),
         'code': fields.char('Code', size=10),
     }
-    _order = 'parent_id,name'
-
-    
-project_functional_block()
-
-class project_task(osv.osv):
+    _order = 'parent_id, sequence, name'
+
+
+class project_task(orm.Model):
     _inherit = 'project.task'
     _columns = {
-        'functional_block_id': fields.many2one('project.functional_block', 'Functional Block'),
+        'functional_block_id': fields.many2one(
+            'project.functional.block',
+            'Functional Block'),
     }
-    _constraints = [
-        (osv.osv._check_recursion, 'Error! Cannot create recursive cycle.', ['parent_id'])
-    ]
-    
-project_task()

=== added file 'project_functional_block/project_demo.xml'
--- project_functional_block/project_demo.xml	1970-01-01 00:00:00 +0000
+++ project_functional_block/project_demo.xml	2014-03-25 15:51:09 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="functional_block_1" model="project.functional.block">
+            <field name="name">WMS</field>
+            <field name="description">Warehouse Management System</field>
+        </record>
+
+        <record id="functional_block_2" model="project.functional.block">
+            <field name="name">CRM</field>
+            <field name="description">Customer Relationship Management</field>
+        </record>
+
+        <record id="functional_block_3" model="project.functional.block">
+            <field name="name">Accounting</field>
+            <field name="description">Accounting</field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'project_functional_block/project_view.xml'
--- __unported__/project_functional_blocks/project_view.xml	2012-07-12 07:42:28 +0000
+++ project_functional_block/project_view.xml	2014-03-25 15:51:09 +0000
@@ -7,8 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='progress']" position="after">
-                    <field name="functional_block_id" select="1"/>
+                <xpath expr="/form/sheet/group/group/field[@name='progress']" position="after">
+                    <field name="functional_block_id"/>
                 </xpath>
             </field>
         </record>
@@ -20,7 +20,7 @@
             <field name="inherit_id" ref="project.view_task_tree2"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="functional_block_id" select="1"/>
+                    <field name="functional_block_id"/>
                 </field>
             </field>
         </record>
@@ -31,10 +31,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/group/field[@name='name']" position="after">
+                <xpath expr="//field[@name='name']" position="after">
                     <field name="functional_block_id" select="1"/>
                 </xpath>
-                <xpath expr="/search/group[@string='Group By...']/filter[@string='Project']" position="after">
+                <xpath expr="//filter[@string='Project']" position="after">
                 	<separator orientation="vertical"/>
                     <filter string="Functional Block" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'functional_block_id'}"/>
                 </xpath>
@@ -44,8 +44,8 @@
 <!-- FUNCTIONAL BLOCK -->
 		<!-- Search view for software module -->
 		<record id="funct_block_search_view" model="ir.ui.view">
-            <field name="name">project.functional_block.search</field>
-            <field name="model">project.functional_block</field>
+            <field name="name">project.functional.block.search</field>
+            <field name="model">project.functional.block</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search software's module">                
@@ -64,28 +64,31 @@
         
 		<!-- tree view for functional block -->
 		<record model="ir.ui.view" id="funct_block_list_view">
-			<field name="name">project.functional_block.list</field>
-			<field name="model">project.functional_block</field>
+			<field name="name">project.functional.block.list</field>
+			<field name="model">project.functional.block</field>
 			<field name="type">tree</field>
 			<field name="arch" type="xml">
 			   <tree string="Functionality categories" >				
-					<field name="name"/>	
-					<field name="parent_id"/>				
+					<field name="name"/>
+					<field name="parent_id"/>
+                    <field name="sequence" invisible="True"/>
 			   </tree>
 			</field>			   
 		</record>
 		
 		<!-- Form view for functional block -->
 		<record model="ir.ui.view" id="funct_categ_form_view">
-			<field name="name">project.functional_block.form</field>
-			<field name="model">project.functional_block</field>
+			<field name="name">project.functional.block.form</field>
+			<field name="model">project.functional.block</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
-			   <form string="Functional block">
-					<field name="name" select="1" />
-					<field name="parent_id"/>
-					<separator colspan="4" string="Block description"/>
-					<field name="category_description" colspan="4" nolabel="1" widget="text_wiki"/>	
+                <form string="Functional block" version="7.0">
+                    <group>
+					    <field name="name"/>
+					    <field name="parent_id"/>
+                    </group>
+                    <separator string="Block description"/>
+                    <field name="description"/>
 			   </form>
 			</field>			   
 		</record>
@@ -93,14 +96,14 @@
 		<!-- OPEN BLOCK LIST -->	
 		<record model="ir.actions.act_window" id="action_funct_block_list">
 			<field name="name">Functional block list</field>
-			<field name="res_model">project.functional_block</field>
+			<field name="res_model">project.functional.block</field>
 			<field name="view_type">form</field> 
 			<field name="view_mode">tree,form</field> 
 			<field name="view_id" ref="funct_block_list_view"/>
 			<field name="search_view_id" ref="funct_block_search_view"/>
 		</record> 
 
-	<menuitem name="Functional blocks" parent="project.menu_definitions" id="menu_functional_blocks"/>		
+	<menuitem name="Functional blocks" id="menu_functional_blocks" parent="base.menu_main_pm" sequence="50"/>		
 	<menuitem name="Functional blocks" parent="menu_functional_blocks" id="menu_functional_blocks_list" action="action_funct_block_list" sequence="10"/> 				
 		
     </data>

=== modified file 'project_functional_block/security/ir.model.access.csv'
--- __unported__/project_functional_blocks/security/ir.model.access.csv	2012-07-12 07:42:28 +0000
+++ project_functional_block/security/ir.model.access.csv	2014-03-25 15:51:09 +0000
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_functional_block_manager","project.functional_block","model_project_functional_block","project.group_project_manager",1,1,1,1
-"access_project_functional_block_user","project.functional_block","model_project_functional_block","project.group_project_user",1,0,0,0
+"access_project_functional_block_manager","project.functional.block","model_project_functional_block","project.group_project_manager",1,1,1,1
+"access_project_functional_block_user","project.functional.block","model_project_functional_block","project.group_project_user",1,0,0,0

=== modified file 'project_issue_service/project_issue.py'
--- project_issue_service/project_issue.py	2013-01-03 11:34:54 +0000
+++ project_issue_service/project_issue.py	2014-03-25 15:51:09 +0000
@@ -28,7 +28,7 @@
     _inherit = 'project.issue'
     _columns = {
     #added fields:
-        'functional_block_id': fields.many2one('project.functional_block', 'Component', help = "Component (system, module, function) to be adressed"),
+        'functional_block_id': fields.many2one('project.functional.block', 'Component', help = "Component (system, module, function) to be adressed"),
         'assigned_to': fields.related('task_id', 'user_id', string = 'Task Assigned to', type="many2one", relation="res.users", store=True, help='This is the current user to whom the related task was assigned'),
         'tasks': fields.one2many('project.task', 'issue_id', 'Related tasks', help="Task history for the issue"),
         'create_uid': fields.many2one('res.users', 'Created by', help = "Person who reported the issue"),

=== modified file 'project_task_service/project_task.py'
--- project_task_service/project_task.py	2012-11-22 13:29:38 +0000
+++ project_task_service/project_task.py	2014-03-25 15:51:09 +0000
@@ -21,13 +21,14 @@
 from osv import fields, osv
 from datetime import datetime, timedelta
 
+
 class task(osv.osv):
     #FUTURE: use task recurrency, to generate maintenance plans
     #FUTURE: Apply maintenance plan templates (use Project templates?)
     _inherit = "project.task"
     _columns = {
         #modified fields:
-        'functional_block_id': fields.many2one('project.functional_block', 'Component', 
+        'functional_block_id': fields.many2one('project.functional.block', 'Component',
             help = "Component (system, module, function) to be addressed"),
         #added fields:
         'ref': fields.char('Code', 20, help="Service Order number"),
@@ -54,8 +55,6 @@
             vals = {'date_start': task_dts, 'date_end': task_dte}
             self.write(cr, uid, [t.id],vals, context=context)
         return super(task, self).do_close(cr, uid, ids, context)
-    
-task()
 
 
 class project_work(osv.osv):
@@ -64,7 +63,6 @@
     _defaults = {
         'date': lambda *a: datetime.now().strftime('%Y-%m-%d'),
     }
-project_work()
 
 
 class project_task_type(osv.osv):
@@ -72,17 +70,10 @@
     _columns = {
         'code': fields.char('Code', size=10),
     }
-project_task_type()
 
 
 class project_functional_block(osv.osv):
-    _inherit = 'project.functional_block'
+    _inherit = 'project.functional.block'
     _columns = {
         'code': fields.char('Code', size=10),
     }
-project_functional_block()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-