[IMP] project_mrp: Improve and Clean

bzr revid: mra@tinyerp.com-20100408054602-ksufizu8m4hs72o4

4 files changed, 17 insertions, 15 deletions

diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py
index 2d56968e7bd..b310d99d87d 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/project_mrp/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,10 +15,10 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import mrp
-import project
+import project_mrp
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py
index 7b09931c06b..8fe1717e631 100644
--- a/addons/project_mrp/__terp__.py
+++ b/addons/project_mrp/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,23 +25,23 @@
     'version': '1.0',
     'category': 'Generic Modules/Projects & Services',
     'description': """
-This module creates a link between procurement orders 
+This module creates a link between procurement orders
 containing "service" lines and project management tasks.
 
-When installed, this module will automatically create a new task 
-for each procurement order line, when the corresponding product  
-meets the following characteristics: 
+When installed, this module will automatically create a new task
+for each procurement order line, when the corresponding product
+meets the following characteristics:
   * Type = Service
   * Procurement method (Order fulfillment) = MTO (make to order)
-  * Supply/Procurement method = Produce  
+  * Supply/Procurement method = Produce
 
-The new task is created outside of any existing project, but 
+The new task is created outside of any existing project, but
 can be added to a project manually.
 
 When the project task is completed or cancelled, the workflow of the corresponding
-procurement line is updated accordingly. 
+procurement line is updated accordingly.
 
-This module is useful to be able to invoice services based on tasks 
+This module is useful to be able to invoice services based on tasks
 automatically created via sale orders.
 
 """,
@@ -49,7 +49,7 @@ automatically created via sale orders.
     'website': 'http://www.openerp.com',
     'depends': ['project', 'mrp', 'sale', 'mrp_jit'],
     'init_xml': [],
-    'update_xml': ['project_workflow.xml', 'process/project_mrp_process.xml'],
+    'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project_mrp.py
index 4f0cbdc2251..409c5730f57 100644
--- a/addons/project_mrp/project.py
+++ b/addons/project_mrp/project_mrp.py
@@ -28,6 +28,7 @@ class project_task(osv.osv):
     _columns = {
         'procurement_id': fields.many2one('mrp.procurement', 'Requisition', ondelete='set null')
     }
+
     def do_close(self, cr, uid, ids, *args):
         res = super(project_task, self).do_close(cr, uid, ids, *args)
         tasks = self.browse(cr, uid, ids)
@@ -45,6 +46,7 @@ class project_task(osv.osv):
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.cancel', cr)
         return True
+
 project_task()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_mrp/project_workflow.xml b/addons/project_mrp/project_mrp_workflow.xml
index d91c365f869..d91c365f869 100644
--- a/addons/project_mrp/project_workflow.xml
+++ b/addons/project_mrp/project_mrp_workflow.xml