From b0a5e9286de6e7c416dd09508ea870c89aaa0942 Mon Sep 17 00:00:00 2001
From: Amit Vora <avo@openerp.com>
Date: Wed, 21 May 2014 15:57:24 +0530
Subject: [PATCH] [IMP]rename project_mrp to sale_service

---
 addons/project/res_config.py                                | 4 ++--
 addons/project/res_config_view.xml                          | 4 ++--
 addons/sale/res_config.py                                   | 2 +-
 addons/sale/sale.py                                         | 4 ++--
 addons/{project_mrp => sale_service}/__init__.py            | 2 +-
 addons/{project_mrp => sale_service}/__openerp__.py         | 4 ++--
 .../demo/sale_service_demo.xml}                             | 0
 addons/{project_mrp => sale_service}/i18n/ar.po             | 0
 addons/{project_mrp => sale_service}/i18n/bg.po             | 0
 addons/{project_mrp => sale_service}/i18n/bs.po             | 0
 addons/{project_mrp => sale_service}/i18n/ca.po             | 0
 addons/{project_mrp => sale_service}/i18n/cs.po             | 0
 addons/{project_mrp => sale_service}/i18n/da.po             | 0
 addons/{project_mrp => sale_service}/i18n/de.po             | 0
 addons/{project_mrp => sale_service}/i18n/el.po             | 0
 addons/{project_mrp => sale_service}/i18n/es.po             | 0
 addons/{project_mrp => sale_service}/i18n/es_AR.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_CR.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_EC.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_MX.po          | 0
 addons/{project_mrp => sale_service}/i18n/es_VE.po          | 0
 addons/{project_mrp => sale_service}/i18n/et.po             | 0
 addons/{project_mrp => sale_service}/i18n/fi.po             | 0
 addons/{project_mrp => sale_service}/i18n/fr.po             | 0
 addons/{project_mrp => sale_service}/i18n/gl.po             | 0
 addons/{project_mrp => sale_service}/i18n/gu.po             | 0
 addons/{project_mrp => sale_service}/i18n/hr.po             | 0
 addons/{project_mrp => sale_service}/i18n/hu.po             | 0
 addons/{project_mrp => sale_service}/i18n/id.po             | 0
 addons/{project_mrp => sale_service}/i18n/it.po             | 0
 addons/{project_mrp => sale_service}/i18n/ja.po             | 0
 addons/{project_mrp => sale_service}/i18n/ko.po             | 0
 addons/{project_mrp => sale_service}/i18n/lt.po             | 0
 addons/{project_mrp => sale_service}/i18n/lv.po             | 0
 addons/{project_mrp => sale_service}/i18n/mk.po             | 0
 addons/{project_mrp => sale_service}/i18n/mn.po             | 0
 addons/{project_mrp => sale_service}/i18n/nb.po             | 0
 addons/{project_mrp => sale_service}/i18n/nl.po             | 0
 addons/{project_mrp => sale_service}/i18n/nl_BE.po          | 0
 addons/{project_mrp => sale_service}/i18n/pl.po             | 0
 addons/{project_mrp => sale_service}/i18n/pt.po             | 0
 addons/{project_mrp => sale_service}/i18n/pt_BR.po          | 0
 addons/{project_mrp => sale_service}/i18n/ro.po             | 0
 addons/{project_mrp => sale_service}/i18n/ru.po             | 0
 .../project_mrp.pot => sale_service/i18n/sale_service.pot}  | 0
 addons/{project_mrp => sale_service}/i18n/sl.po             | 0
 addons/{project_mrp => sale_service}/i18n/sq.po             | 0
 addons/{project_mrp => sale_service}/i18n/sv.po             | 0
 addons/{project_mrp => sale_service}/i18n/tlh.po            | 0
 addons/{project_mrp => sale_service}/i18n/tr.po             | 0
 addons/{project_mrp => sale_service}/i18n/uk.po             | 0
 addons/{project_mrp => sale_service}/i18n/vi.po             | 0
 addons/{project_mrp => sale_service}/i18n/zh_CN.po          | 0
 addons/{project_mrp => sale_service}/i18n/zh_TW.po          | 0
 addons/sale_service/models/__init__.py                      | 1 +
 .../project_mrp.py => sale_service/models/sale_service.py}  | 2 +-
 .../security/ir.model.access.csv                            | 0
 .../test/project_task_procurement.yml                       | 0
 .../views/sale_service_view.xml}                            | 4 ++--
 addons/sale_stock/res_config.py                             | 6 +++---
 addons/sale_stock/res_config_view.xml                       | 2 +-
 addons/stock/procurement.py                                 | 2 +-
 openerp/addons/base/res/res_config.py                       | 4 ++--
 63 files changed, 21 insertions(+), 20 deletions(-)
 rename addons/{project_mrp => sale_service}/__init__.py (98%)
 rename addons/{project_mrp => sale_service}/__openerp__.py (95%)
 rename addons/{project_mrp/project_mrp_demo.xml => sale_service/demo/sale_service_demo.xml} (100%)
 rename addons/{project_mrp => sale_service}/i18n/ar.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/bg.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/bs.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ca.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/cs.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/da.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/de.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/el.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_AR.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_CR.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_EC.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_MX.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/es_VE.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/et.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/fi.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/fr.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/gl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/gu.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/hr.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/hu.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/id.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/it.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ja.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ko.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/lt.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/lv.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/mk.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/mn.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/nb.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/nl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/nl_BE.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/pl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/pt.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/pt_BR.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ro.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/ru.po (100%)
 rename addons/{project_mrp/i18n/project_mrp.pot => sale_service/i18n/sale_service.pot} (100%)
 rename addons/{project_mrp => sale_service}/i18n/sl.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/sq.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/sv.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/tlh.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/tr.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/uk.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/vi.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/zh_CN.po (100%)
 rename addons/{project_mrp => sale_service}/i18n/zh_TW.po (100%)
 create mode 100644 addons/sale_service/models/__init__.py
 rename addons/{project_mrp/project_mrp.py => sale_service/models/sale_service.py} (99%)
 rename addons/{project_mrp => sale_service}/security/ir.model.access.csv (100%)
 rename addons/{project_mrp => sale_service}/test/project_task_procurement.yml (100%)
 rename addons/{project_mrp/project_mrp_view.xml => sale_service/views/sale_service_view.xml} (93%)

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index e7699a61ec8..187ad0327d8 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -27,11 +27,11 @@ class project_configuration(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_project_mrp': fields.boolean('Generate tasks from sale orders',
+        'module_sale_service': fields.boolean('Generate tasks from sale orders',
             help='This feature automatically creates project tasks from service products in sale orders. '
                  'More precisely, tasks are created for procurement lines with product of type \'Service\', '
                  'procurement method \'Make to Order\', and supply method \'Manufacture\'.\n'
-                 '-This installs the module project_mrp.'),
+                 '-This installs the module sale_service.'),
         'module_pad': fields.boolean("Use integrated collaborative note pads on task",
             help='Lets the company customize which Pad installation should be used to link to new pads '
                  '(for example: http://ietherpad.com/).\n'
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index f190fba3b3a..16dce54d88b 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -33,8 +33,8 @@
                                 <label for="module_project_timesheet"/>
                             </div>
                             <div>
-                                <field name="module_project_mrp" class="oe_inline"/>
-                                <label for="module_project_mrp"/>
+                                <field name="module_sale_service" class="oe_inline"/>
+                                <label for="module_sale_service"/>
                             </div>
                             <div>
                                 <field name="module_pad" class="oe_inline"/>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 94fd74e035e..f4892598332 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -122,7 +122,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
     def onchange_task_work(self, cr, uid, ids, task_work, context=None):
         return {'value': {
             'module_project_timesheet': task_work,
-            'module_project_mrp': task_work,
+            'module_sale_service': task_work,
         }}
 
     def onchange_timesheet(self, cr, uid, ids, timesheet, context=None):
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 45c32a33b22..964fa1584ba 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -686,7 +686,7 @@ class sale_order(osv.osv):
 
     def procurement_needed(self, cr, uid, ids, context=None):
         #when sale is installed only, there is no need to create procurements, that's only
-        #further installed modules (project_mrp, sale_stock) that will change this.
+        #further installed modules (sale_service, sale_stock) that will change this.
         sale_line_obj = self.pool.get('sale.order.line')
         res = []
         for order in self.browse(cr, uid, ids, context=context):
@@ -839,7 +839,7 @@ class sale_order_line(osv.osv):
 
     def need_procurement(self, cr, uid, ids, context=None):
         #when sale is installed only, there is no need to create procurements, that's only
-        #further installed modules (project_mrp, sale_stock) that will change this.
+        #further installed modules (sale_service, sale_stock) that will change this.
         return False
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/project_mrp/__init__.py b/addons/sale_service/__init__.py
similarity index 98%
rename from addons/project_mrp/__init__.py
rename to addons/sale_service/__init__.py
index c0c3172c29f..d6bf9f9551c 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/sale_service/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import project_mrp
+import models
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/__openerp__.py b/addons/sale_service/__openerp__.py
similarity index 95%
rename from addons/project_mrp/__openerp__.py
rename to addons/sale_service/__openerp__.py
index 3730ec74113..85ea8df0735 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/sale_service/__openerp__.py
@@ -50,8 +50,8 @@ completed.
     'website': 'http://www.openerp.com',
     'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'],
     'depends': ['project', 'procurement', 'sale', 'procurement_jit'],
-    'data': ['project_mrp_view.xml'], #'process/project_mrp_process.xml'
-    'demo': ['project_mrp_demo.xml'],
+    'data': ['views/sale_service_view.xml'],
+    'demo': ['demo/sale_service_demo.xml'],
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/sale_service/demo/sale_service_demo.xml
similarity index 100%
rename from addons/project_mrp/project_mrp_demo.xml
rename to addons/sale_service/demo/sale_service_demo.xml
diff --git a/addons/project_mrp/i18n/ar.po b/addons/sale_service/i18n/ar.po
similarity index 100%
rename from addons/project_mrp/i18n/ar.po
rename to addons/sale_service/i18n/ar.po
diff --git a/addons/project_mrp/i18n/bg.po b/addons/sale_service/i18n/bg.po
similarity index 100%
rename from addons/project_mrp/i18n/bg.po
rename to addons/sale_service/i18n/bg.po
diff --git a/addons/project_mrp/i18n/bs.po b/addons/sale_service/i18n/bs.po
similarity index 100%
rename from addons/project_mrp/i18n/bs.po
rename to addons/sale_service/i18n/bs.po
diff --git a/addons/project_mrp/i18n/ca.po b/addons/sale_service/i18n/ca.po
similarity index 100%
rename from addons/project_mrp/i18n/ca.po
rename to addons/sale_service/i18n/ca.po
diff --git a/addons/project_mrp/i18n/cs.po b/addons/sale_service/i18n/cs.po
similarity index 100%
rename from addons/project_mrp/i18n/cs.po
rename to addons/sale_service/i18n/cs.po
diff --git a/addons/project_mrp/i18n/da.po b/addons/sale_service/i18n/da.po
similarity index 100%
rename from addons/project_mrp/i18n/da.po
rename to addons/sale_service/i18n/da.po
diff --git a/addons/project_mrp/i18n/de.po b/addons/sale_service/i18n/de.po
similarity index 100%
rename from addons/project_mrp/i18n/de.po
rename to addons/sale_service/i18n/de.po
diff --git a/addons/project_mrp/i18n/el.po b/addons/sale_service/i18n/el.po
similarity index 100%
rename from addons/project_mrp/i18n/el.po
rename to addons/sale_service/i18n/el.po
diff --git a/addons/project_mrp/i18n/es.po b/addons/sale_service/i18n/es.po
similarity index 100%
rename from addons/project_mrp/i18n/es.po
rename to addons/sale_service/i18n/es.po
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/sale_service/i18n/es_AR.po
similarity index 100%
rename from addons/project_mrp/i18n/es_AR.po
rename to addons/sale_service/i18n/es_AR.po
diff --git a/addons/project_mrp/i18n/es_CR.po b/addons/sale_service/i18n/es_CR.po
similarity index 100%
rename from addons/project_mrp/i18n/es_CR.po
rename to addons/sale_service/i18n/es_CR.po
diff --git a/addons/project_mrp/i18n/es_EC.po b/addons/sale_service/i18n/es_EC.po
similarity index 100%
rename from addons/project_mrp/i18n/es_EC.po
rename to addons/sale_service/i18n/es_EC.po
diff --git a/addons/project_mrp/i18n/es_MX.po b/addons/sale_service/i18n/es_MX.po
similarity index 100%
rename from addons/project_mrp/i18n/es_MX.po
rename to addons/sale_service/i18n/es_MX.po
diff --git a/addons/project_mrp/i18n/es_VE.po b/addons/sale_service/i18n/es_VE.po
similarity index 100%
rename from addons/project_mrp/i18n/es_VE.po
rename to addons/sale_service/i18n/es_VE.po
diff --git a/addons/project_mrp/i18n/et.po b/addons/sale_service/i18n/et.po
similarity index 100%
rename from addons/project_mrp/i18n/et.po
rename to addons/sale_service/i18n/et.po
diff --git a/addons/project_mrp/i18n/fi.po b/addons/sale_service/i18n/fi.po
similarity index 100%
rename from addons/project_mrp/i18n/fi.po
rename to addons/sale_service/i18n/fi.po
diff --git a/addons/project_mrp/i18n/fr.po b/addons/sale_service/i18n/fr.po
similarity index 100%
rename from addons/project_mrp/i18n/fr.po
rename to addons/sale_service/i18n/fr.po
diff --git a/addons/project_mrp/i18n/gl.po b/addons/sale_service/i18n/gl.po
similarity index 100%
rename from addons/project_mrp/i18n/gl.po
rename to addons/sale_service/i18n/gl.po
diff --git a/addons/project_mrp/i18n/gu.po b/addons/sale_service/i18n/gu.po
similarity index 100%
rename from addons/project_mrp/i18n/gu.po
rename to addons/sale_service/i18n/gu.po
diff --git a/addons/project_mrp/i18n/hr.po b/addons/sale_service/i18n/hr.po
similarity index 100%
rename from addons/project_mrp/i18n/hr.po
rename to addons/sale_service/i18n/hr.po
diff --git a/addons/project_mrp/i18n/hu.po b/addons/sale_service/i18n/hu.po
similarity index 100%
rename from addons/project_mrp/i18n/hu.po
rename to addons/sale_service/i18n/hu.po
diff --git a/addons/project_mrp/i18n/id.po b/addons/sale_service/i18n/id.po
similarity index 100%
rename from addons/project_mrp/i18n/id.po
rename to addons/sale_service/i18n/id.po
diff --git a/addons/project_mrp/i18n/it.po b/addons/sale_service/i18n/it.po
similarity index 100%
rename from addons/project_mrp/i18n/it.po
rename to addons/sale_service/i18n/it.po
diff --git a/addons/project_mrp/i18n/ja.po b/addons/sale_service/i18n/ja.po
similarity index 100%
rename from addons/project_mrp/i18n/ja.po
rename to addons/sale_service/i18n/ja.po
diff --git a/addons/project_mrp/i18n/ko.po b/addons/sale_service/i18n/ko.po
similarity index 100%
rename from addons/project_mrp/i18n/ko.po
rename to addons/sale_service/i18n/ko.po
diff --git a/addons/project_mrp/i18n/lt.po b/addons/sale_service/i18n/lt.po
similarity index 100%
rename from addons/project_mrp/i18n/lt.po
rename to addons/sale_service/i18n/lt.po
diff --git a/addons/project_mrp/i18n/lv.po b/addons/sale_service/i18n/lv.po
similarity index 100%
rename from addons/project_mrp/i18n/lv.po
rename to addons/sale_service/i18n/lv.po
diff --git a/addons/project_mrp/i18n/mk.po b/addons/sale_service/i18n/mk.po
similarity index 100%
rename from addons/project_mrp/i18n/mk.po
rename to addons/sale_service/i18n/mk.po
diff --git a/addons/project_mrp/i18n/mn.po b/addons/sale_service/i18n/mn.po
similarity index 100%
rename from addons/project_mrp/i18n/mn.po
rename to addons/sale_service/i18n/mn.po
diff --git a/addons/project_mrp/i18n/nb.po b/addons/sale_service/i18n/nb.po
similarity index 100%
rename from addons/project_mrp/i18n/nb.po
rename to addons/sale_service/i18n/nb.po
diff --git a/addons/project_mrp/i18n/nl.po b/addons/sale_service/i18n/nl.po
similarity index 100%
rename from addons/project_mrp/i18n/nl.po
rename to addons/sale_service/i18n/nl.po
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/sale_service/i18n/nl_BE.po
similarity index 100%
rename from addons/project_mrp/i18n/nl_BE.po
rename to addons/sale_service/i18n/nl_BE.po
diff --git a/addons/project_mrp/i18n/pl.po b/addons/sale_service/i18n/pl.po
similarity index 100%
rename from addons/project_mrp/i18n/pl.po
rename to addons/sale_service/i18n/pl.po
diff --git a/addons/project_mrp/i18n/pt.po b/addons/sale_service/i18n/pt.po
similarity index 100%
rename from addons/project_mrp/i18n/pt.po
rename to addons/sale_service/i18n/pt.po
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/sale_service/i18n/pt_BR.po
similarity index 100%
rename from addons/project_mrp/i18n/pt_BR.po
rename to addons/sale_service/i18n/pt_BR.po
diff --git a/addons/project_mrp/i18n/ro.po b/addons/sale_service/i18n/ro.po
similarity index 100%
rename from addons/project_mrp/i18n/ro.po
rename to addons/sale_service/i18n/ro.po
diff --git a/addons/project_mrp/i18n/ru.po b/addons/sale_service/i18n/ru.po
similarity index 100%
rename from addons/project_mrp/i18n/ru.po
rename to addons/sale_service/i18n/ru.po
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/sale_service/i18n/sale_service.pot
similarity index 100%
rename from addons/project_mrp/i18n/project_mrp.pot
rename to addons/sale_service/i18n/sale_service.pot
diff --git a/addons/project_mrp/i18n/sl.po b/addons/sale_service/i18n/sl.po
similarity index 100%
rename from addons/project_mrp/i18n/sl.po
rename to addons/sale_service/i18n/sl.po
diff --git a/addons/project_mrp/i18n/sq.po b/addons/sale_service/i18n/sq.po
similarity index 100%
rename from addons/project_mrp/i18n/sq.po
rename to addons/sale_service/i18n/sq.po
diff --git a/addons/project_mrp/i18n/sv.po b/addons/sale_service/i18n/sv.po
similarity index 100%
rename from addons/project_mrp/i18n/sv.po
rename to addons/sale_service/i18n/sv.po
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/sale_service/i18n/tlh.po
similarity index 100%
rename from addons/project_mrp/i18n/tlh.po
rename to addons/sale_service/i18n/tlh.po
diff --git a/addons/project_mrp/i18n/tr.po b/addons/sale_service/i18n/tr.po
similarity index 100%
rename from addons/project_mrp/i18n/tr.po
rename to addons/sale_service/i18n/tr.po
diff --git a/addons/project_mrp/i18n/uk.po b/addons/sale_service/i18n/uk.po
similarity index 100%
rename from addons/project_mrp/i18n/uk.po
rename to addons/sale_service/i18n/uk.po
diff --git a/addons/project_mrp/i18n/vi.po b/addons/sale_service/i18n/vi.po
similarity index 100%
rename from addons/project_mrp/i18n/vi.po
rename to addons/sale_service/i18n/vi.po
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/sale_service/i18n/zh_CN.po
similarity index 100%
rename from addons/project_mrp/i18n/zh_CN.po
rename to addons/sale_service/i18n/zh_CN.po
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/sale_service/i18n/zh_TW.po
similarity index 100%
rename from addons/project_mrp/i18n/zh_TW.po
rename to addons/sale_service/i18n/zh_TW.po
diff --git a/addons/sale_service/models/__init__.py b/addons/sale_service/models/__init__.py
new file mode 100644
index 00000000000..d9728749476
--- /dev/null
+++ b/addons/sale_service/models/__init__.py
@@ -0,0 +1 @@
+import sale_service
\ No newline at end of file
diff --git a/addons/project_mrp/project_mrp.py b/addons/sale_service/models/sale_service.py
similarity index 99%
rename from addons/project_mrp/project_mrp.py
rename to addons/sale_service/models/sale_service.py
index 651aa7dda48..bcce63cf66d 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/sale_service/models/sale_service.py
@@ -151,7 +151,7 @@ class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
 
     def need_procurement(self, cr, uid, ids, context=None):
-        #when sale is installed alone, there is no need to create procurements, but with project_mrp
+        #when sale is installed alone, there is no need to create procurements, but with sale_service
         #we must create a procurement for each service that has the auto_create_task boolean set to True.
         for line in self.browse(cr, uid, ids, context=context):
             if line.product_id and line.product_id.type == 'service' and line.product_id.auto_create_task:
diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/sale_service/security/ir.model.access.csv
similarity index 100%
rename from addons/project_mrp/security/ir.model.access.csv
rename to addons/sale_service/security/ir.model.access.csv
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/sale_service/test/project_task_procurement.yml
similarity index 100%
rename from addons/project_mrp/test/project_task_procurement.yml
rename to addons/sale_service/test/project_task_procurement.yml
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/sale_service/views/sale_service_view.xml
similarity index 93%
rename from addons/project_mrp/project_mrp_view.xml
rename to addons/sale_service/views/sale_service_view.xml
index d2e1027b42e..0865d95fa0e 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/sale_service/views/sale_service_view.xml
@@ -34,8 +34,8 @@
                 </field>
             </field>
         </record>
-        <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
-            <field name="name">project.mrp.form.view.inherit</field>
+        <record id="view_sale_service_inherit_form2" model="ir.ui.view">
+            <field name="name">sale.service.form.view.inherit</field>
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 8c1d5c87f99..f702ca81929 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -35,7 +35,7 @@ class sale_configuration(osv.osv_memory):
             help='Lets you transfer the entries under tasks defined for Project Management to '
                  'the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways '
                  'and to automatically creates project tasks from procurement lines.\n'
-                 '-This installs the modules project_timesheet and project_mrp.'),
+                 '-This installs the modules project_timesheet and sale_service.'),
         'default_order_policy': fields.selection(
             [('manual', 'Invoice based on sales orders'), ('picking', 'Invoice based on deliveries')],
             'The default invoicing method is', default_model='sale.order',
@@ -50,7 +50,7 @@ class sale_configuration(osv.osv_memory):
             implied_group='sale.group_mrp_properties',
             help="Allows you to tag sales order lines with properties."),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
-        'module_project_mrp': fields.boolean("Project MRP"),
+        'module_sale_service': fields.boolean("Sale Service"),
         'group_route_so_lines': fields.boolean('Choose MTO, drop shipping,... on sales order lines',
             implied_group='sale_stock.group_route_so_lines',
             help="Allows you to choose a delivery route on sales order lines"),
@@ -63,7 +63,7 @@ class sale_configuration(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         res = super(sale_configuration, self).default_get(cr, uid, fields, context)
         # task_work, time_unit depend on other fields
-        res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet')
+        res['task_work'] = res.get('module_sale_service') and res.get('module_project_timesheet')
         return res
 
     def get_default_sale_config(self, cr, uid, ids, context=None):
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index 89c2f191915..69824ffdd5a 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -38,7 +38,7 @@
                      </xpath> 
                      <group name='default_options' position="after">
                          <field name="module_project_timesheet" invisible="1"/>
-                         <field name="module_project_mrp" invisible="1"/>
+                         <field name="module_sale_service" invisible="1"/>
                      </group>
                      <div name='warehouse_features' position='inside'>
                          <div name='default_picking_policy' attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index f53776d4b9a..a8fc778f2e6 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -78,7 +78,7 @@ class procurement_rule(osv.osv):
 class procurement_order(osv.osv):
     _inherit = "procurement.order"
     _columns = {
-        'location_id': fields.many2one('stock.location', 'Procurement Location'),  # not required because task may create procurements that aren't linked to a location with project_mrp
+        'location_id': fields.many2one('stock.location', 'Procurement Location'),  # not required because task may create procurements that aren't linked to a location with sale_service
         'partner_dest_id': fields.many2one('res.partner', 'Customer Address', help="In case of dropshipping, we need to know the destination address more precisely"),
         'move_ids': fields.one2many('stock.move', 'procurement_id', 'Moves', help="Moves created by the procurement"),
         'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Move which caused (created) the procurement"),
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 5bbd377f29d..767d9fcd705 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -221,10 +221,10 @@ class res_config_installer(osv.osv_memory, res_config_module_installation_mixin)
 
         _install_if = {
             ('sale','crm'): ['sale_crm'],
-            ('sale','project'): ['project_mrp'],
+            ('sale','project'): ['sale_service'],
         }
 
-    will install both ``sale_crm`` and ``project_mrp`` if all of
+    will install both ``sale_crm`` and ``sale_service`` if all of
     ``sale``, ``crm`` and ``project`` are selected for installation.
 
     Hook methods