Merge lp:~openerp-dev/openobject-addons/trunk_module_rename-pza into lp:openobject-addons

[Pooja Zankhariya(OpenERP)]

Hello,
  I have done following changes:
  -> rename "project_mrp" with "sale_service"
  -> rename "mrp_jit" with "procurement_jit"
  -> Re-­organize modules project_mrp and mrp_jit

Thank You.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Changes seems ok.

Improve the Copyright to today date.

Regards,
Mustufa

[lp:~openerp-dev/openobject-addons/trunk_module_rename-pza]

8943. By Pooja Zankhariya(OpenERP) on 2013-10-22

[IMP]Improved Copyright

8944. By Pooja Zankhariya(OpenERP) on 2013-10-28

[MERGE]Merge with trunk

8945. By Pooja Zankhariya(OpenERP) on 2013-10-30

[MERGE]Merge with Trunk

8946. By Pooja Zankhariya(OpenERP) on 2013-11-25

[MERGE]Merge with Trunk

8947. By Pooja Zankhariya(OpenERP) on 2013-11-26

[MERGE]Merge with Trunk

8948. By Pooja Zankhariya(OpenERP) on 2013-12-03

[MERGE]Merge with Trunk

8949. By Pooja Zankhariya(OpenERP) on 2013-12-10

[MERGE]Merge with Trunk

8950. By Pooja Zankhariya(OpenERP) on 2013-12-16

[MERGE]Merge with Trunk

8951. By Pooja Zankhariya(OpenERP) on 2013-12-26

[MERGE]Merge with Trunk

8952. By Pooja Zankhariya(OpenERP) on 2013-12-30

[MERGE]Merge with Trunk

8953. By Pooja Zankhariya(OpenERP) on 2014-01-10

[MERGE]Mergw with Trunk

8954. By Pooja Zankhariya(OpenERP) on 2014-01-13

[MERGE]Merge with Trunk

8955. By Pooja Zankhariya(OpenERP) on 2014-01-17

[MERGE]Merge with Trunk

8956. By Pooja Zankhariya(OpenERP) on 2014-01-21

[MERGE]Merge with Trunk

8957. By Pooja Zankhariya(OpenERP) on 2014-01-28

[MERGE]Sync with Trunk

8958. By Pooja Zankhariya(OpenERP) on 2014-01-30

[MERGE]Sync with Trunk

8959. By Pooja Zankhariya(OpenERP) on 2014-01-31

[MERGE]Sync with Trunk

8960. By Jitendra Prajapati(OpenERP) on 2014-02-10

[MERGE]with lp:openobject-addons

8961. By Jitendra Prajapati(OpenERP) on 2014-03-19

[MERGE]with main branch

8962. By Jitendra Prajapati(OpenERP) on 2014-03-27

[MERGE]with main branch

8963. By Jaydeep Barot(OpenERP) on 2014-04-21

[MERGE] Merge with main branch

8964. By Jaydeep Barot(OpenERP) on 2014-04-21

[IMP] minor changes rename to mrp_jit to procurement_jit and project_mrp to sale_service

8965. By Jaydeep Barot(OpenERP) on 2014-04-25

[MERGE] Merge with addons

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Changes seems ok.

Improve the Copyright years.

Regards,
Mustufa

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk_module_rename-pza]

8966. By Jaydeep Barot(OpenERP) on 2014-04-25

[IMP] minor changes apply for Copyright msg add text 2004 instead of 2013

8967. By Jaydeep Barot(OpenERP) on 2014-05-02

[MERGE] Merge with addons

Unmerged revisions

8967. By Jaydeep Barot(OpenERP) on 2014-05-02

[MERGE] Merge with addons

8966. By Jaydeep Barot(OpenERP) on 2014-04-25

[IMP] minor changes apply for Copyright msg add text 2004 instead of 2013

8965. By Jaydeep Barot(OpenERP) on 2014-04-25

[MERGE] Merge with addons

8964. By Jaydeep Barot(OpenERP) on 2014-04-21

[IMP] minor changes rename to mrp_jit to procurement_jit and project_mrp to sale_service

8963. By Jaydeep Barot(OpenERP) on 2014-04-21

[MERGE] Merge with main branch

8962. By Jitendra Prajapati(OpenERP) on 2014-03-27

[MERGE]with main branch

8961. By Jitendra Prajapati(OpenERP) on 2014-03-19

[MERGE]with main branch

8960. By Jitendra Prajapati(OpenERP) on 2014-02-10

[MERGE]with lp:openobject-addons

8959. By Pooja Zankhariya(OpenERP) on 2014-01-31

[MERGE]Sync with Trunk

8958. By Pooja Zankhariya(OpenERP) on 2014-01-30

[MERGE]Sync with Trunk

=== modified file 'mrp/res_config.py'
--- mrp/res_config.py	2013-10-27 12:31:04 +0000
+++ mrp/res_config.py	2014-05-02 13:01:32 +0000
@@ -44,11 +44,11 @@
                  'Without this module: A + B + C -> D.\n'
                  'With this module: A + B + C -> D + E.\n'
                  '-This installs the module mrp_byproduct.'),
-        'module_mrp_jit': fields.boolean("Generate procurement in real time",
+        'module_procurement_jit': fields.boolean("Generate procurement in real time",
             help='This allows Just In Time computation of procurement orders.\n'
                  'All procurement orders will be processed immediately, which could in some '
                  'cases entail a small performance impact.\n'
-                 '-This installs the module mrp_jit.'),
+                 '-This installs the module procurement_jit.'),
         'module_stock_no_autopicking': fields.boolean("Manage manual picking to fulfill manufacturing orders ",
             help='This module allows an intermediate picking process to provide raw materials to production orders.\n'
                  'For example to manage production made by your suppliers (sub-contracting).\n'

=== modified file 'mrp/res_config_view.xml'
--- mrp/res_config_view.xml	2012-11-29 22:26:45 +0000
+++ mrp/res_config_view.xml	2014-05-02 13:01:32 +0000
@@ -45,8 +45,8 @@
                         <label for="id" string="Planning"/>
                         <div>
                             <div>
-                                <field name="module_mrp_jit" class="oe_inline"/>
-                                <label for="module_mrp_jit"/>
+                                <field name="module_procurement_jit" class="oe_inline"/>
+                                <label for="module_procurement_jit"/>
                             </div>
                             <div>
                                 <field name="group_mrp_routings" class="oe_inline"/>

=== modified file 'mrp/test/order_process.yml'
--- mrp/test/order_process.yml	2014-04-07 16:33:18 +0000
+++ mrp/test/order_process.yml	2014-05-02 13:01:32 +0000
@@ -110,7 +110,7 @@
                 procurement_ids = procurement.search(cr, uid, [('move_id','=',move_line.id)])
                 assert procurement_ids, "Procurement should be created for shipment line of raw materials."
                 shipment_procurement = procurement.browse(cr, uid, procurement_ids[0], context=context)
-                # procurement state should be `confirmed` at this stage, except if mrp_jit is installed, in which
+                # procurement state should be `confirmed` at this stage, except if procurement_jit is installed, in which
                 # case it could already be in `running` or `exception` state (not enough stock)
                 expected_states = ('confirmed', 'running', 'exception')
                 assert shipment_procurement.state in expected_states, 'Procurement state is `%s` for %s, expected one of %s' % \

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2014-04-24 12:35:38 +0000
+++ procurement/procurement.py	2014-05-02 13:01:32 +0000
@@ -247,7 +247,7 @@
 
     def check_produce_service(self, cr, uid, procurement, context=None):
         """ Depicts the capacity of the procurement workflow to deal with production of services.
-            By default, it's False. Overwritten by project_mrp module.
+            By default, it's False. Overwritten by sale_service module.
         """
         return False
 
@@ -312,9 +312,9 @@
                 return True
         return False
 
-    #Initialize get_phantom_bom_id method as it is raising an error from yml of mrp_jit
-    #when one install first mrp and after that, mrp_jit. get_phantom_bom_id defined in mrp module
-    #which is not dependent for mrp_jit.
+    #Initialize get_phantom_bom_id method as it is raising an error from yml of procurement_jit
+    #when one install first mrp and after that, procurement_jit. get_phantom_bom_id defined in mrp module
+    #which is not dependent for procurement_jit.
     def get_phantom_bom_id(self, cr, uid, ids, context=None):
         return False
 

=== renamed directory 'mrp_jit' => 'procurement_jit'
=== modified file 'procurement_jit/__openerp__.py'
--- mrp_jit/__openerp__.py	2012-11-29 22:26:45 +0000
+++ procurement_jit/__openerp__.py	2014-05-02 13:01:32 +0000
@@ -40,9 +40,9 @@
     """,
     'author': 'OpenERP SA',
     'depends': ['procurement'],
-    'data': ['mrp_jit.xml'],
+    'data': ['procurement_jit.xml'],
     'demo': [],
-    'test': ['test/mrp_jit.yml'],
+    'test': ['test/procurement_jit.yml'],
     'installable': True,
     'auto_install': False,
 }

=== renamed file 'mrp_jit/i18n/mrp_jit.pot' => 'procurement_jit/i18n/procurement_jit.pot'
=== renamed file 'mrp_jit/mrp_jit.xml' => 'procurement_jit/procurement_jit.xml'
=== renamed file 'mrp_jit/test/mrp_jit.yml' => 'procurement_jit/test/procurement_jit.yml'
--- mrp_jit/test/mrp_jit.yml	2012-11-29 22:26:45 +0000
+++ procurement_jit/test/procurement_jit.yml	2014-05-02 13:01:32 +0000
@@ -1,5 +1,5 @@
 -
-  In order to test mrp_jit module with OpenERP, I create procurement order for 
+  In order to test procurement_jit module with OpenERP, I create procurement order for 
   Computer Case product and check whether it runs without scheduler or not.
 -
   !record {model: procurement.order, id: procurement_order_test1}:

=== modified file 'project/res_config.py'
--- project/res_config.py	2014-04-09 11:17:38 +0000
+++ project/res_config.py	2014-05-02 13:01:32 +0000
@@ -27,11 +27,11 @@
     _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'

=== modified file 'project/res_config_view.xml'
--- project/res_config_view.xml	2014-04-09 11:17:38 +0000
+++ project/res_config_view.xml	2014-05-02 13:01:32 +0000
@@ -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"/>

=== removed file 'project_mrp/project_mrp.py'
--- project_mrp/project_mrp.py	2013-11-27 15:32:57 +0000
+++ project_mrp/project_mrp.py	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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, osv
-from openerp import workflow
-
-
-class ProjectTaskStageMrp(osv.Model):
-    """ Override project.task.type model to add a 'closed' boolean field allowing
-        to know that tasks in this stage are considered as closed. Indeed since
-        OpenERP 8.0 status is not present on tasks anymore, only stage_id. """
-    _name = 'project.task.type'
-    _inherit = 'project.task.type'
-
-    _columns = {
-        'closed': fields.boolean('Close', help="Tasks in this stage are considered as closed."),
-    }
-
-    _defaults = {
-        'closed': False,
-    }
-
-
-class project_task(osv.osv):
-    _name = "project.task"
-    _inherit = "project.task"
-    _columns = {
-        'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null'),
-        'sale_line_id': fields.related('procurement_id', 'sale_line_id', type='many2one', relation='sale.order.line', store=True, string='Sales Order Line'),
-    }
-
-    def _validate_subflows(self, cr, uid, ids, context=None):
-        for task in self.browse(cr, uid, ids):
-            if task.procurement_id:
-                workflow.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)
-
-    def write(self, cr, uid, ids, values, context=None):
-        """ When closing tasks, validate subflows. """
-        res = super(project_task, self).write(cr, uid, ids, values, context=context)
-        if values.get('stage_id'):
-            stage = self.pool.get('project.task.type').browse(cr, uid, values.get('stage_id'), context=context)
-            if stage.closed:
-                self._validate_subflows(cr, uid, ids, context=context)
-        return res
-
-
-class product_product(osv.osv):
-    _inherit = "product.product"
-    _columns = {
-        'project_id': fields.many2one('project.project', 'Project', ondelete='set null',)
-    }
-
-
-class sale_order(osv.osv):
-    _inherit = 'sale.order'
-
-    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
-        proc_data = super(sale_order, self)._prepare_order_line_procurement(cr,
-                uid, order, line, move_id, date_planned, context=context)
-        proc_data['sale_line_id'] = line.id
-        return proc_data
-
-    def _picked_rate(self, cr, uid, ids, name, arg, context=None):
-        if not ids:
-            return {}
-        res_sale = {}
-        res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
-        cr.execute('''select sol.order_id as sale_id, stage.closed as task_closed ,
-                    t.id as task_id, sum(sol.product_uom_qty) as total
-                    from project_task as t
-                    left join sale_order_line as sol on sol.id = t.sale_line_id
-                    left join project_task_type as stage on stage.id = t.stage_id
-                    where sol.order_id in %s group by sol.order_id,stage.closed,t.id ''',(tuple(ids),))
-        sale_task_data = cr.dictfetchall()
-
-        if not sale_task_data:
-            return res
-
-        for id in ids:
-            res_sale[id] = {
-                'number_of_done': 0,
-                'total_no_task': 0,
-            }
-        #compute the sum of quantity for each SO
-        cr.execute('''select sol.order_id as sale_id, sum(sol.product_uom_qty) as total
-                    from sale_order_line sol where sol.order_id in %s group by sol.order_id''',(tuple(ids),))
-        total_qtty_ref = cr.dictfetchall()
-        for item in total_qtty_ref:
-            res_sale[item['sale_id']]['number_of_stockable'] = item['total']
-
-        for item in sale_task_data:
-            res_sale[item['sale_id']]['total_no_task'] += item['total']
-            if item['task_closed']:
-                res_sale[item['sale_id']]['number_of_done'] += item['total']
-
-        for sale in self.browse(cr, uid, ids, context=context):
-            if 'number_of_stockable' in res_sale[sale.id]:
-                res_sale[sale.id]['number_of_stockable'] -= res_sale[sale.id]['total_no_task']
-                #adjust previously percentage because now we must also count the product of type service
-                res[sale.id] = res[sale.id] * float(res_sale[sale.id]['number_of_stockable']) / (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
-                #add the task
-                res[sale.id] += res_sale[sale.id]['number_of_done'] * 100 /  (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
-        return res
-
-    _columns = {
-        'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
-    }
-

=== removed file 'project_mrp/project_mrp_view.xml'
--- project_mrp/project_mrp_view.xml	2013-10-27 12:31:04 +0000
+++ project_mrp/project_mrp_view.xml	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_procurement_task_form" model="ir.ui.view">
-            <field name="name">procurement.procurement.form.view.inherit</field>
-            <field name="model">procurement.order</field>
-            <field name="inherit_id" ref="procurement.procurement_form_view"/>
-            <field name="arch" type="xml">
-                <field name="close_move" position="after">
-                    <field name="task_id"/>
-                </field>
-            </field>
-        </record>
-        <record id="view_product_task_form" model="ir.ui.view">
-            <field name="name">product.form.view.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
-            <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <field name="project_id" attrs="{'invisible':[('type','!=','service')]}" />
-                </field>
-            </field>
-        </record>
-        <record id="task_type_edit_mrp_inherit" model="ir.ui.view">
-            <field name="name">project.task.type.mrp.inherit</field>
-            <field name="model">project.task.type</field>
-            <field name="inherit_id" ref="project.task_type_edit"/>
-            <field name="arch" type="xml">
-                <field name="case_default" position="after">
-                    <field name="closed"/>
-                </field>
-            </field>
-        </record>
-        <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
-            <field name="name">project.mrp.form.view.inherit</field>
-            <field name="model">project.task</field>
-            <field name="inherit_id" ref="project.view_task_form2"/>
-            <field name="arch" type="xml">
-                <field name="company_id" position="before">
-                    <field name="sale_line_id" string="Order Line"/>
-                </field>
-            </field>
-        </record>
-        <record id="product_product_normal_form_supply_view" model="ir.ui.view">
-            <field name="name">product.normal.form.project_mrp.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='supply_method']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <group name="procurement_help" position="inside">
-                    <p attrs="{'invisible': ['|','|',('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
-                        When you sell this service to a customer, <b>a task</b> will be 
-                        created to follow up the job to do. This task will appear
-                        in the project related to the contract of the sales order.
-                    </p>
-                </group>
-            </field>
-        </record>
-    </data>
-</openerp>
-

=== modified file 'sale/res_config.py'
--- sale/res_config.py	2014-01-29 08:32:09 +0000
+++ sale/res_config.py	2014-05-02 13:01:32 +0000
@@ -152,7 +152,7 @@
     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):

=== modified file 'sale/sale_unit_test.xml'
--- sale/sale_unit_test.xml	2013-10-27 12:31:04 +0000
+++ sale/sale_unit_test.xml	2014-05-02 13:01:32 +0000
@@ -84,7 +84,7 @@
 
         <assert id="test_order_1" model="sale.order" severity="error" string="the sales order's picking will be sent to the good address and is already confirmed">
             <test expr="picking_ids[0].partner_id == partner_shipping_id"/>
-            <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT -->
+            <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of procurement_jit -->
         </assert>
 
         <!-- Here we need to use the function tag because action_assign is a method of stock_picking and not part of the workflow -->

=== renamed directory 'project_mrp' => 'sale_service'
=== added file 'sale_service/__init__.py'
--- sale_service/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_service/__init__.py	2014-05-02 13:01:32 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.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/>.
+#
+##############################################################################
+
+import models
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale_service/__openerp__.py'
--- project_mrp/__openerp__.py	2014-02-10 08:48:03 +0000
+++ sale_service/__openerp__.py	2014-05-02 13:01:32 +0000
@@ -49,9 +49,9 @@
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'],
-    'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
-    'data': ['project_mrp_workflow.xml', 'project_mrp_view.xml'],
-    'demo': ['project_mrp_demo.xml'],
+    'depends': ['project', 'procurement', 'sale', 'procurement_jit'],
+    'data': ['sale_service_workflow.xml', 'views/procurement_view.xml', 'views/project_view.xml', 'views/product_view.xml'],
+    'demo': ['demo/sale_service_demo.xml'],
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'auto_install': False,

=== added directory 'sale_service/demo'
=== renamed file 'project_mrp/project_mrp_demo.xml' => 'sale_service/demo/sale_service_demo.xml'
--- project_mrp/project_mrp_demo.xml	2013-10-27 12:31:04 +0000
+++ sale_service/demo/sale_service_demo.xml	2014-05-02 13:01:32 +0000
@@ -14,7 +14,7 @@
         </record>
 
         <record id="project.project_tt_deployment" model="project.task.type">
-                <field name="closed" eval="True"/>
+            <field name="closed" eval="True"/>
         </record>
     </data>
 </openerp>

=== renamed file 'project_mrp/i18n/project_mrp.pot' => 'sale_service/i18n/sale_service.pot'
=== added directory 'sale_service/models'
=== renamed file 'project_mrp/__init__.py' => 'sale_service/models/__init__.py'
--- project_mrp/__init__.py	2011-12-19 16:54:40 +0000
+++ sale_service/models/__init__.py	2014-05-02 13:01:32 +0000
@@ -19,7 +19,9 @@
 #
 ##############################################################################
 
-import project_procurement
-import project_mrp
+import procurement
+import product
+import project
+import sale
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'project_mrp/project_procurement.py' => 'sale_service/models/procurement.py'
=== added file 'sale_service/models/product.py'
--- sale_service/models/product.py	1970-01-01 00:00:00 +0000
+++ sale_service/models/product.py	2014-05-02 13:01:32 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.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, osv
+
+class product_product(osv.osv):
+    _inherit = "product.product"
+    _columns = {
+        'project_id': fields.many2one('project.project', 'Project', ondelete='set null',)
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'sale_service/models/project.py'
--- sale_service/models/project.py	1970-01-01 00:00:00 +0000
+++ sale_service/models/project.py	2014-05-02 13:01:32 +0000
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.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, osv
+from openerp import workflow
+
+class ProjectTaskStageMrp(osv.Model):
+    """ Override project.task.type model to add a 'closed' boolean field allowing
+        to know that tasks in this stage are considered as closed. Indeed since
+        OpenERP 8.0 status is not present on tasks anymore, only stage_id. """
+    _name = 'project.task.type'
+    _inherit = 'project.task.type'
+
+    _columns = {
+        'closed': fields.boolean('Close', help="Tasks in this stage are considered as closed."),
+    }
+
+    _defaults = {
+        'closed': False,
+    }
+
+
+class project_task(osv.osv):
+    _name = "project.task"
+    _inherit = "project.task"
+    _columns = {
+        'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null'),
+        'sale_line_id': fields.related('procurement_id', 'sale_line_id', type='many2one', relation='sale.order.line', store=True, string='Sales Order Line'),
+    }
+
+    def _validate_subflows(self, cr, uid, ids, context=None):
+        for task in self.browse(cr, uid, ids):
+            if task.procurement_id:
+                workflow.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)
+
+    def write(self, cr, uid, ids, values, context=None):
+        """ When closing tasks, validate subflows. """
+        res = super(project_task, self).write(cr, uid, ids, values, context=context)
+        if values.get('stage_id'):
+            stage = self.pool.get('project.task.type').browse(cr, uid, values.get('stage_id'), context=context)
+            if stage.closed:
+                self._validate_subflows(cr, uid, ids, context=context)
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'sale_service/models/sale.py'
--- sale_service/models/sale.py	1970-01-01 00:00:00 +0000
+++ sale_service/models/sale.py	2014-05-02 13:01:32 +0000
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-today OpenERP SA (<http://www.openerp.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, osv
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
+        proc_data = super(sale_order, self)._prepare_order_line_procurement(cr,
+                uid, order, line, move_id, date_planned, context=context)
+        proc_data['sale_line_id'] = line.id
+        return proc_data
+
+    def _picked_rate(self, cr, uid, ids, name, arg, context=None):
+        if not ids:
+            return {}
+        res_sale = {}
+        res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
+        cr.execute('''select sol.order_id as sale_id, stage.closed as task_closed ,
+                    t.id as task_id, sum(sol.product_uom_qty) as total
+                    from project_task as t
+                    left join sale_order_line as sol on sol.id = t.sale_line_id
+                    left join project_task_type as stage on stage.id = t.stage_id
+                    where sol.order_id in %s group by sol.order_id,stage.closed,t.id ''',(tuple(ids),))
+        sale_task_data = cr.dictfetchall()
+
+        if not sale_task_data:
+            return res
+
+        for id in ids:
+            res_sale[id] = {
+                'number_of_done': 0,
+                'total_no_task': 0,
+            }
+        #compute the sum of quantity for each SO
+        cr.execute('''select sol.order_id as sale_id, sum(sol.product_uom_qty) as total
+                    from sale_order_line sol where sol.order_id in %s group by sol.order_id''',(tuple(ids),))
+        total_qtty_ref = cr.dictfetchall()
+        for item in total_qtty_ref:
+            res_sale[item['sale_id']]['number_of_stockable'] = item['total']
+
+        for item in sale_task_data:
+            res_sale[item['sale_id']]['total_no_task'] += item['total']
+            if item['task_closed']:
+                res_sale[item['sale_id']]['number_of_done'] += item['total']
+
+        for sale in self.browse(cr, uid, ids, context=context):
+            if 'number_of_stockable' in res_sale[sale.id]:
+                res_sale[sale.id]['number_of_stockable'] -= res_sale[sale.id]['total_no_task']
+                #adjust previously percentage because now we must also count the product of type service
+                res[sale.id] = res[sale.id] * float(res_sale[sale.id]['number_of_stockable']) / (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
+                #add the task
+                res[sale.id] += res_sale[sale.id]['number_of_done'] * 100 /  (res_sale[sale.id]['number_of_stockable'] + res_sale[sale.id]['total_no_task'])
+        return res
+
+    _columns = {
+        'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed file 'project_mrp/project_mrp_workflow.xml' => 'sale_service/sale_service_workflow.xml'
=== added directory 'sale_service/views'
=== added file 'sale_service/views/procurement_view.xml'
--- sale_service/views/procurement_view.xml	1970-01-01 00:00:00 +0000
+++ sale_service/views/procurement_view.xml	2014-05-02 13:01:32 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_procurement_task_form" model="ir.ui.view">
+            <field name="name">procurement.procurement.form.view.inherit</field>
+            <field name="model">procurement.order</field>
+            <field name="inherit_id" ref="procurement.procurement_form_view"/>
+            <field name="arch" type="xml">
+                <field name="close_move" position="after">
+                    <field name="task_id"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'sale_service/views/product_view.xml'
--- sale_service/views/product_view.xml	1970-01-01 00:00:00 +0000
+++ sale_service/views/product_view.xml	2014-05-02 13:01:32 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_product_task_form" model="ir.ui.view">
+            <field name="name">product.form.view.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <field name="project_id" attrs="{'invisible':[('type','!=','service')]}" />
+                </field>
+            </field>
+        </record>
+        <record id="product_product_normal_form_supply_view" model="ir.ui.view">
+            <field name="name">product.normal.form.sale_service.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='supply_method']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': ['|','|',('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                        When you sell this service to a customer, <b>a task</b> will be 
+                        created to follow up the job to do. This task will appear
+                        in the project related to the contract of the sales order.
+                    </p>
+                </group>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'sale_service/views/project_view.xml'
--- sale_service/views/project_view.xml	1970-01-01 00:00:00 +0000
+++ sale_service/views/project_view.xml	2014-05-02 13:01:32 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="task_type_edit_mrp_inherit" model="ir.ui.view">
+            <field name="name">project.task.type.mrp.inherit</field>
+            <field name="model">project.task.type</field>
+            <field name="inherit_id" ref="project.task_type_edit"/>
+            <field name="arch" type="xml">
+                <field name="case_default" position="after">
+                    <field name="closed"/>
+                </field>
+            </field>
+        </record>
+        <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">
+                <field name="company_id" position="before">
+                    <field name="sale_line_id" string="Order Line"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'sale_stock/res_config.py'
--- sale_stock/res_config.py	2014-01-21 08:48:46 +0000
+++ sale_stock/res_config.py	2014-05-02 13:01:32 +0000
@@ -35,7 +35,7 @@
             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 @@
             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"),
     }
 
     _defaults = {
@@ -60,7 +60,7 @@
     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):

=== modified file 'sale_stock/res_config_view.xml'
--- sale_stock/res_config_view.xml	2014-01-21 08:48:46 +0000
+++ sale_stock/res_config_view.xml	2014-05-02 13:01:32 +0000
@@ -39,7 +39,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)]}">