Merge lp:~openerp-dev/openobject-addons/trunk-move-service-product-to-hr-timesheet-tpa into lp:openobject-addons

[Turkesh Patel (openERP)]

[IMP] Move Service product to the module hr_timesheet module.

[lp:~openerp-dev/openobject-addons/trunk-move-service-product-to-hr-timesheet-tpa]

9031. By Turkesh Patel (openERP) on 2014-01-22

[IMP] improved image related code of service product

9032. By Turkesh Patel (openERP) on 2014-01-23

[IMP] improved code

9033. By Turkesh Patel (openERP) on 2014-01-23

[IMP] improved code to apply time method and view.

9034. By Turkesh Patel (openERP) on 2014-02-04

[MRG] merge with lp:openobject-addons

9035. By Turkesh Patel (openERP) on 2014-02-05

[IMP] move code to account_analytic_analysis module from hr_timesheet

9036. By Turkesh Patel (openERP) on 2014-02-05

[IMP] improved code

9037. By Turkesh Patel (openERP) on 2014-02-06

[MRG] merge with lp;openobject-addons

9038. By Turkesh Patel (openERP) on 2014-02-06

[IMP] improved view and yml

9039. By Turkesh Patel (openERP) on 2014-02-06

[IMP] improved code.

9040. By Turkesh Patel (openERP) on 2014-02-12

[RMV] remove unnecessary changes

9041. By Turkesh Patel (openERP) on 2014-02-12

[MRG] merge with lp:openobject-addons

9042. By Turkesh Patel (openERP) on 2014-02-12

[MRG] merge with lp:openobject-addons

9043. By Turkesh Patel (openERP) on 2014-03-06

[MRG] merge with lp:openobject-addons

9044. By Chirag Dodiya(OpenERP) on 2014-03-13

[MRG]Merge with lp:openobject-addons

9045. By Chirag Dodiya(OpenERP) on 2014-03-13

[IMP]Improved demo and data file

9046. By Chirag Dodiya(OpenERP) on 2014-03-18

[MRG]Merge with lp:openobject-addons

9047. By Chirag Dodiya(OpenERP) on 2014-03-18

[REM]Removed _get_default_time_unit method and improved typo

9048. By Chirag Dodiya(OpenERP) on 2014-03-27

[FIX]Fixed issue the "service" product is not set by default on admin

9049. By Chirag Dodiya(OpenERP) on 2014-03-27

[MRG]Merge with lp:openobject-addons

Unmerged revisions

9049. By Chirag Dodiya(OpenERP) on 2014-03-27

[MRG]Merge with lp:openobject-addons

9048. By Chirag Dodiya(OpenERP) on 2014-03-27

[FIX]Fixed issue the "service" product is not set by default on admin

9047. By Chirag Dodiya(OpenERP) on 2014-03-18

[REM]Removed _get_default_time_unit method and improved typo

9046. By Chirag Dodiya(OpenERP) on 2014-03-18

[MRG]Merge with lp:openobject-addons

9045. By Chirag Dodiya(OpenERP) on 2014-03-13

[IMP]Improved demo and data file

9044. By Chirag Dodiya(OpenERP) on 2014-03-13

[MRG]Merge with lp:openobject-addons

9043. By Turkesh Patel (openERP) on 2014-03-06

[MRG] merge with lp:openobject-addons

9042. By Turkesh Patel (openERP) on 2014-02-12

[MRG] merge with lp:openobject-addons

9041. By Turkesh Patel (openERP) on 2014-02-12

[MRG] merge with lp:openobject-addons

9040. By Turkesh Patel (openERP) on 2014-02-12

[RMV] remove unnecessary changes

=== modified file 'account_analytic_analysis/res_config.py'
--- account_analytic_analysis/res_config.py	2012-12-06 14:56:32 +0000
+++ account_analytic_analysis/res_config.py	2014-03-27 07:11:26 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
@@ -28,4 +29,35 @@
         'group_template_required': fields.boolean("Mandatory use of templates.",
             implied_group='account_analytic_analysis.group_template_required',
             help="Allows you to set the template field as required when creating an analytic account or a contract."),
+        'time_unit': fields.many2one('product.uom', 'The default working time unit.'),
     }
+
+    def default_get(self, cr, uid, fields, context=None):
+        ir_model_data = self.pool.get('ir.model.data')
+        res = super(sale_configuration, self).default_get(cr, uid, fields, context)
+        if res.get('module_project'):
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            res['time_unit'] = user.company_id.project_time_mode_id.id
+        else:
+            product = ir_model_data.xmlid_to_object(cr, uid, 'product.product_product_consultant')
+            if product and product.exists():
+                res['time_unit'] = product.uom_id.id
+        return res
+
+    def set_sale_defaults(self, cr, uid, ids, context=None):
+        ir_model_data = self.pool.get('ir.model.data')
+        wizard = self.browse(cr, uid, ids)[0]
+
+        if wizard.time_unit:
+            product = ir_model_data.xmlid_to_object(cr, uid, 'product.product_product_consultant')
+            if product and product.exists():
+                product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
+            else:
+                _logger.warning("Product with xml_id 'product.product_product_consultant' not found, UoMs not updated!")
+
+        if wizard.module_project and wizard.time_unit:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            user.company_id.write({'project_time_mode_id': wizard.time_unit.id})
+        return {}
+
+

=== modified file 'account_analytic_analysis/res_config_view.xml'
--- account_analytic_analysis/res_config_view.xml	2012-11-29 16:08:47 +0000
+++ account_analytic_analysis/res_config_view.xml	2014-03-27 07:11:26 +0000
@@ -13,6 +13,15 @@
                         <label for="group_template_required"/>
                     </div>
                 </xpath>
+                <xpath expr="//label[@string='Default Options']" position="replace">
+                    <label for="id" string="Default Options" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                </xpath>
+                <div name='time_unit' position="replace">
+                    <div name='time_unit' attrs="{'invisible': [('module_account_analytic_analysis','=',False)],'required':[('module_account_analytic_analysis','=',True)]}">
+                        <label for="time_unit"/>
+                        <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
+                    </div>
+                </div> 
             </field>
         </record>
 

=== modified file 'hr_timesheet/hr_timesheet_data.xml'
--- hr_timesheet/hr_timesheet_data.xml	2014-01-15 15:25:26 +0000
+++ hr_timesheet/hr_timesheet_data.xml	2014-03-27 07:11:26 +0000
@@ -8,13 +8,22 @@
             <field name="type">general</field>
         </record>
 
+
+        <!-- Service Product -->
+        <record id="product.product_product_consultant" model="product.product">
+            <field name="list_price">75.0</field>
+            <field name="standard_price">30.0</field>
+            <field name="uom_id" ref="product.product_uom_hour"/>
+            <field name="uom_po_id" ref="product.product_uom_hour"/>
+            <field name="name">Service</field>
+            <field name="categ_id" ref="product.product_category_all"/>
+            <field name="type">service</field>
+            <field name="sale_ok">False</field>
+        </record>
+
         <record id="hr.employee" model="hr.employee">
             <field name="journal_id" ref="analytic_journal"/>
-        </record>
-
-        <record id="product.product_product_consultant" model="product.product">
-            <field name="sale_ok">True</field>
-        </record>
-
+            <field name="product_id" ref="product.product_product_consultant"/>
+        </record>
     </data>
 </openerp>

=== modified file 'hr_timesheet/hr_timesheet_demo.xml'
--- hr_timesheet/hr_timesheet_demo.xml	2013-10-27 12:31:04 +0000
+++ hr_timesheet/hr_timesheet_demo.xml	2014-03-27 07:11:26 +0000
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="hr.employee" model="hr.employee">
-            <field name="product_id" ref="product.product_product_consultant"/>
-            <field name="journal_id" ref="analytic_journal"/>
-        </record>
 
         <!-- complete our example employee -->
         <record id="hr.employee_fp" model="hr.employee">
@@ -89,6 +85,15 @@
             <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
+        
+        <record id="product.product_product_consultant" model="product.product">
+            <field name="categ_id" ref="product.product_category_5"/>
+            <field name="sale_ok" eval="True"/>
+        </record>
+        <!-- service product Image -->
+        <record id="product.product_product_consultant" model="product.product">
+            <field name="image" type="base64" file="hr_timesheet/static/img/product_product_consultant-image.jpg"/>
+        </record>
 
     </data>
 </openerp>

=== added directory 'hr_timesheet/static'
=== added directory 'hr_timesheet/static/img'
=== renamed file 'product/static/img/product_product_consultant-image.jpg' => 'hr_timesheet/static/img/product_product_consultant-image.jpg'
=== modified file 'hr_timesheet/test/test_hr_timesheet.yml'
--- hr_timesheet/test/test_hr_timesheet.yml	2013-10-27 12:31:04 +0000
+++ hr_timesheet/test/test_hr_timesheet.yml	2014-03-27 07:11:26 +0000
@@ -14,6 +14,8 @@
     name: Gilles Gravie
     parent_id: 'hr.employee_al'
     user_id: 'base.user_demo'
+    product_id: product.product_product_consultant
+    journal_id: hr_timesheet.analytic_journal
 -
   Give the access rights of Employee to Sign In/Sign Out in  Project.
 -

=== modified file 'product/product_data.xml'
--- product/product_data.xml	2014-02-07 15:13:20 +0000
+++ product/product_data.xml	2014-03-27 07:11:26 +0000
@@ -236,20 +236,6 @@
             <field name="digits" eval="3"/>
         </record>
 
-        <!--
-        Product
-        -->
-        <record id="product_product_consultant" model="product.product">
-            <field name="list_price">75.0</field>
-            <field name="standard_price">30.0</field>
-            <field name="uom_id" ref="product.product_uom_hour"/>
-            <field name="uom_po_id" ref="product.product_uom_hour"/>
-            <field name="name">Service</field>
-            <field name="categ_id" ref="product.product_category_all"/>
-            <field name="type">service</field>
-            <field name="sale_ok" eval="False"/>
-        </record>
-
         <!-- Product Public Categories -->
         <record id="categ_others" model="product.public.category">
             <field name="name">Others</field>

=== modified file 'product/product_demo.xml'
--- product/product_demo.xml	2014-01-26 20:43:34 +0000
+++ product/product_demo.xml	2014-03-27 07:11:26 +0000
@@ -205,11 +205,6 @@
     Resource: product.product
     -->
 
-        <record id="product_product_consultant" model="product.product">
-            <field name="categ_id" ref="product.product_category_5"/>
-            <field name="sale_ok" eval="True"/>
-        </record>
-
         <record id="product_template_1" model="product.template">
             <field name="name">On Site Monitoring</field>
             <field name="categ_id" ref="product_category_5"/>

=== modified file 'product/product_image_demo.xml'
--- product/product_image_demo.xml	2014-01-17 07:00:28 +0000
+++ product/product_image_demo.xml	2014-03-27 07:11:26 +0000
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="false">
 
-        <record id="product_product_consultant" model="product.product">
-            <field name="image" type="base64" file="product/static/img/product_product_consultant-image.jpg"/>
-        </record>
-
         <record id="product_product_1" model="product.product">
             <field name="image" type="base64" file="product/static/img/product_product_1-image.jpg"/>
         </record>

=== modified file 'purchase/purchase_demo.xml'
--- purchase/purchase_demo.xml	2012-11-29 22:26:45 +0000
+++ purchase/purchase_demo.xml	2014-03-27 07:11:26 +0000
@@ -14,9 +14,6 @@
             <field eval="80.0" name="schedule_range"/>
         </record>
 
-        <record id="product.product_product_consultant" model="product.product">
-            <field eval="False" name="purchase_ok"/>
-        </record>
     </data>
 </openerp>
 

=== modified file 'sale/res_config.py'
--- sale/res_config.py	2014-01-29 05:35:33 +0000
+++ sale/res_config.py	2014-03-27 07:11:26 +0000
@@ -71,7 +71,6 @@
                  '(650€/day for a developer), the duration (one year support contract).\n'
                  'You will be able to follow the progress of the contract and invoice automatically.\n'
                  '-It installs the account_analytic_analysis module.'),
-        'time_unit': fields.many2one('product.uom', 'The default working time unit for services is'),
         'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers",
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers.
@@ -113,42 +112,6 @@
             help="Allows you to specify different delivery and invoice addresses on a sales order."),
     }
 
-    def default_get(self, cr, uid, fields, context=None):
-        ir_model_data = self.pool.get('ir.model.data')
-        res = super(sale_configuration, self).default_get(cr, uid, fields, context)
-        if res.get('module_project'):
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            res['time_unit'] = user.company_id.project_time_mode_id.id
-        else:
-            product = ir_model_data.xmlid_to_object(cr, uid, 'product.product_product_consultant')
-            if product and product.exists():
-                res['time_unit'] = product.uom_id.id
-        return res
-
-    def _get_default_time_unit(self, cr, uid, context=None):
-        ids = self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=context)
-        return ids and ids[0] or False
-
-    _defaults = {
-        'time_unit': _get_default_time_unit,
-    }
-
-    def set_sale_defaults(self, cr, uid, ids, context=None):
-        ir_model_data = self.pool.get('ir.model.data')
-        wizard = self.browse(cr, uid, ids)[0]
-
-        if wizard.time_unit:
-            product = ir_model_data.xmlid_to_object(cr, uid, 'product.product_product_consultant')
-            if product and product.exists():
-                product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
-            else:
-                _logger.warning("Product with xml_id 'product.product_product_consultant' not found, UoMs not updated!")
-
-        if wizard.module_project and wizard.time_unit:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            user.company_id.write({'project_time_mode_id': wizard.time_unit.id})
-        return {}
-
     def onchange_task_work(self, cr, uid, ids, task_work, context=None):
         return {'value': {
             'module_project_timesheet': task_work,

=== modified file 'sale/res_config_view.xml'
--- sale/res_config_view.xml	2014-01-25 23:08:47 +0000
+++ sale/res_config_view.xml	2014-03-27 07:11:26 +0000
@@ -22,12 +22,9 @@
                         </div>
                     </group>
                     <group name='default_options'>
-                        <label for="id" string="Default Options" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                        <label for="id" string="Default Options" invisible="1"/>
                         <div>
-                            <div name='time_unit' attrs="{'invisible': [('module_account_analytic_analysis','=',False)],'required':[('module_account_analytic_analysis','=',True)]}">
-                                <label for="time_unit"/>
-                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
-                            </div>
+                            <div name='time_unit'/>
                         </div>
                     </group>
                 </div>

=== modified file 'sale/sale_demo.xml'
--- sale/sale_demo.xml	2014-01-17 07:00:28 +0000
+++ sale/sale_demo.xml	2014-03-27 07:11:26 +0000
@@ -52,7 +52,6 @@
         <record id="sale_order_line_4" model="sale.order.line">
             <field name="order_id" ref="sale_order_2"/>
             <field name="name">Service on demand</field>
-            <field name="product_id" ref="product.product_product_consultant"/>
             <field name="product_uom_qty">24</field>
             <field name="product_uos_qty">24</field>
             <field name="product_uom" ref="product.product_uom_hour"/>
@@ -109,7 +108,6 @@
         <record id="sale_order_line_8" model="sale.order.line">
             <field name="order_id" ref="sale_order_4"/>
             <field name="name">Service on demand</field>
-            <field name="product_id" ref="product.product_product_consultant"/>
             <field name="product_uom_qty">16</field>
             <field name="product_uos_qty">16</field>
             <field name="product_uom" ref="product.product_uom_hour"/>

=== modified file 'sale_stock/res_config.py'
--- sale_stock/res_config.py	2014-01-15 11:05:47 +0000
+++ sale_stock/res_config.py	2014-03-27 07:11:26 +0000
@@ -78,8 +78,7 @@
 
         default_picking_policy = 'one' if wizard.default_picking_policy else 'direct'
         ir_values.set_default(cr, SUPERUSER_ID, 'sale.order', 'picking_policy', default_picking_policy)
-        res = super(sale_configuration, self).set_sale_defaults(cr, uid, ids, context)
-        return res
+        return {}
     
     def onchange_invoice_methods(self, cr, uid, ids, group_invoice_so_lines, group_invoice_deli_orders, context=None):
         if not group_invoice_deli_orders:

=== modified file 'sale_stock/res_config_view.xml'
--- sale_stock/res_config_view.xml	2014-01-15 11:05:47 +0000
+++ sale_stock/res_config_view.xml	2014-03-27 07:11:26 +0000
@@ -56,12 +56,6 @@
                      <field name="group_invoice_so_lines" position="replace">
                          <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
                      </field>
-                     <xpath expr="//div[@name='time_unit']" position="replace">
-                         <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
-                             <label for="time_unit"/>
-                             <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
-                         </div>
-                     </xpath>
                 </data>
              </field>
          </record>

=== modified file 'website_sale/data/website_sale_demo.xml'
--- website_sale/data/website_sale_demo.xml	2014-01-30 23:32:40 +0000
+++ website_sale/data/website_sale_demo.xml	2014-03-27 07:11:26 +0000
@@ -2,10 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="product.product_product_consultant" model="product.product">
-            <field name="image" type="base64" file="website/static/description/website_edit.png"/>
-        </record>
-
         <record id="product.product_product_4" model="product.product">
             <field name="website_published" eval="True"/>
             <field name="website_size_x">2</field>