Merge lp:~openerp-dev/openobject-addons/trunk-module_rename-avo into lp:openobject-addons

[Amit Vora(OpenERP)]

Hello,

I have rename project_mrp to sale_service

Thanks
avo

Unmerged revisions

9438. By Amit Vora(OpenERP) on 2014-05-12

[IMP] rename .pot file

9437. By Amit Vora(OpenERP) on 2014-05-12

[IMP] rename project_mrp module to sale_service

=== modified file 'project/res_config.py'
--- project/res_config.py	2014-04-09 11:17:38 +0000
+++ project/res_config.py	2014-05-12 08:55:23 +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-12 08:55:23 +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"/>

=== modified file 'sale/res_config.py'
--- sale/res_config.py	2014-01-29 08:32:09 +0000
+++ sale/res_config.py	2014-05-12 08:55:23 +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.py'
--- sale/sale.py	2014-05-07 18:29:17 +0000
+++ sale/sale.py	2014-05-12 08:55:23 +0000
@@ -656,7 +656,7 @@
 
     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):
@@ -809,7 +809,7 @@
 
     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):

=== renamed directory 'project_mrp' => 'sale_service'
=== modified file 'sale_service/__init__.py'
--- project_mrp/__init__.py	2013-07-10 15:00:42 +0000
+++ sale_service/__init__.py	2014-05-12 08:55:23 +0000
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import project_mrp
+import models
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale_service/__openerp__.py'
--- project_mrp/__openerp__.py	2014-05-02 13:03:52 +0000
+++ sale_service/__openerp__.py	2014-05-12 08:55:23 +0000
@@ -50,8 +50,8 @@
     '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,

=== added directory 'sale_service/demo'
=== renamed file 'project_mrp/project_mrp_demo.xml' => 'sale_service/demo/sale_service_demo.xml'
=== renamed file 'project_mrp/i18n/project_mrp.pot' => 'sale_service/i18n/sale_service.pot'
=== added directory 'sale_service/models'
=== added file 'sale_service/models/__init__.py'
--- sale_service/models/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_service/models/__init__.py	2014-05-12 08:55:23 +0000
@@ -0,0 +1,1 @@
+import sale_service
\ No newline at end of file

=== renamed file 'project_mrp/project_mrp.py' => 'sale_service/models/sale_service.py'
--- project_mrp/project_mrp.py	2013-12-20 10:57:22 +0000
+++ sale_service/models/sale_service.py	2014-05-12 08:55:23 +0000
@@ -151,7 +151,7 @@
     _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:

=== added directory 'sale_service/views'
=== renamed file 'project_mrp/project_mrp_view.xml' => 'sale_service/views/sale_service_view.xml'
--- project_mrp/project_mrp_view.xml	2013-12-20 10:33:33 +0000
+++ sale_service/views/sale_service_view.xml	2014-05-12 08:55:23 +0000
@@ -34,7 +34,7 @@
                 </field>
             </field>
         </record>
-        <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
+        <record id="view_sale_service_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"/>

=== modified file 'sale_stock/res_config.py'
--- sale_stock/res_config.py	2014-05-08 14:39:40 +0000
+++ sale_stock/res_config.py	2014-05-12 08:55:23 +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"),
         '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 @@
     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-04-14 09:47:43 +0000
+++ sale_stock/res_config_view.xml	2014-05-12 08:55:23 +0000
@@ -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)]}">

=== modified file 'stock/procurement.py'
--- stock/procurement.py	2014-05-08 11:03:57 +0000
+++ stock/procurement.py	2014-05-12 08:55:23 +0000
@@ -78,7 +78,7 @@
 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"),