Merge lp:~openerp-dev/openobject-addons/ksa-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2

[Kirti Savalia(OpenERP)]

[1] https://bugs.launchpad.net/openobject-addons/+bug/711778
[2] https://bugs.launchpad.net/openobject-addons/+bug/718685
 hr related changes

=== modified file 'base_synchro/wizard/base_synchro.py'
--- base_synchro/wizard/base_synchro.py	2011-01-14 00:11:01 +0000
+++ base_synchro/wizard/base_synchro.py	2011-02-17 07:20:39 +0000
@@ -38,7 +38,7 @@
         self.rpc = xmlrpclib.ServerProxy(local_url)
         self.ressource = ressource
     def __getattr__(self, name):
-        return lambda cr, uid, *args, **kwargs: self.rpc.execute(self.server.server_db, self.uid, self.server.password, self.ressource, name, *args, **kwargs)
+        return lambda cr, uid, *args, **kwargs: self.rpc.execute(self.server.server_db, self.uid, self.server.password, self.ressource, name, *args)
 
 class RPCProxy(object):
     def __init__(self, server):
@@ -79,6 +79,7 @@
                 eval(object.domain),
                 {'action':'d'}
             )
+
         if object.action in ('u','b'):
             ids += pool2.get('base.synchro.obj').get_ids(cr, uid,
                 object.model_id.model,
@@ -102,7 +103,7 @@
             if object.model_id.model=='crm.case.history':
                 fields = ['email','description','log_id']
             value = pool_src.get(object.model_id.model).read(cr, uid, [id], fields)[0]
-            value = self.data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
+            value = self.data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action, context=context)
             id2 = self.get_id(cr, uid, object.id, id, action, context)
             #
             # Transform value
@@ -110,7 +111,6 @@
             #tid=pool_dest.get(object.model_id.model).name_search(cr, uid, value['name'],[],'=',)
             if not (iii%50):
                 print 'Record', iii
-
             # Filter fields to not sync
             for field in object.avoid_ids:
                 if field.name in value:
@@ -133,7 +133,7 @@
                 })
                 self.report_total+=1
                 self.report_create+=1
-        self.meta = {}
+            self.meta = {}
         return True
 
     def get_id(self, cr, uid, object_id, id, action, context=None):
@@ -216,16 +216,16 @@
         start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
         syn_obj = self.browse(cr, uid, ids, context=context)[0]
         pool = pooler.get_pool(cr.dbname)
-        server = pool.get('base.synchro.server').browse(cr, uid, ids, context=context)[0]
+        server = pool.get('base.synchro.server').browse(cr, uid, syn_obj.server_url.id, context=context)
         for object in server.obj_ids:
             dt = time.strftime('%Y-%m-%d %H:%M:%S')
-            self.synchronize(cr, uid, server, object, context)
+            self.synchronize(cr, uid, server, object, context=context)
             if object.action=='b':
                 time.sleep(1)
                 dt = time.strftime('%Y-%m-%d %H:%M:%S')
             self.pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
         end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
-        if 'user_id' in syn_obj.user_id:
+        if syn_obj.user_id:
             request = pooler.get_pool(cr.dbname).get('res.request')
             if not self.report:
                 self.report.append('No exception.')
@@ -244,7 +244,7 @@
             request.create(cr, uid, {
                 'name' : "Synchronization report",
                 'act_from' : uid,
-                'act_to' : syn_obj.user_id,
+                'act_to' : syn_obj.user_id.id,
                 'body': summary,
             })
             return True

=== modified file 'base_synchro/wizard/base_synchro_view.xml'
--- base_synchro/wizard/base_synchro_view.xml	2011-01-14 00:11:01 +0000
+++ base_synchro/wizard/base_synchro_view.xml	2011-02-17 07:20:39 +0000
@@ -25,6 +25,7 @@
             <field name="res_model">base.synchro</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="view_id" ref="view_base_synchro"/>
             <field name="target">new</field>
         </record>
 

=== modified file 'hr/hr.py'
--- hr/hr.py	2011-01-17 18:02:22 +0000
+++ hr/hr.py	2011-02-17 07:20:39 +0000
@@ -204,15 +204,15 @@
             level -= 1
         return True
 
-    def _check_department_id(self, cr, uid, ids, context=None):
-        for emp in self.browse(cr, uid, ids, context=context):
-            if emp.department_id.manager_id and emp.id == emp.department_id.manager_id.id:
-                return False
-        return True
+#    def _check_department_id(self, cr, uid, ids, context=None):
+#        for emp in self.browse(cr, uid, ids, context=context):
+#            if emp.department_id.manager_id and emp.id == emp.department_id.manager_id.id:
+#                return False
+#        return True
 
     _constraints = [
         (_check_recursion, 'Error ! You cannot create recursive Hierarchy of Employees.', ['parent_id']),
-        (_check_department_id, 'Error ! You cannot select a department for which the employee is the manager.', ['department_id']),
+#        (_check_department_id, 'Error ! You cannot select a department for which the employee is the manager.', ['department_id']),
     ]
 
 hr_employee()

=== modified file 'hr/security/hr_security.xml'
--- hr/security/hr_security.xml	2011-01-14 00:11:01 +0000
+++ hr/security/hr_security.xml	2011-02-17 07:20:39 +0000
@@ -7,7 +7,7 @@
     </record>
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / User</field>
+        <field name="name">Human Resources / Officer</field>
     </record>
 </data>
 </openerp>

=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml	2011-01-21 06:59:40 +0000
+++ hr_holidays/hr_holidays_view.xml	2011-02-17 07:20:39 +0000
@@ -94,7 +94,7 @@
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
                                 <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
                                 <button string="Set to Draft" name="set_to_draft" states="refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
@@ -414,7 +414,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
-        
+
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"

=== modified file 'hr_timesheet/wizard/hr_timesheet_print_employee.py'
--- hr_timesheet/wizard/hr_timesheet_print_employee.py	2011-02-15 13:27:07 +0000
+++ hr_timesheet/wizard/hr_timesheet_print_employee.py	2011-02-17 07:20:39 +0000
@@ -31,7 +31,7 @@
                                   'Month', required=True),
         'year': fields.integer('Year', required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
-    
+
                 }
 
     def _get_user(self, cr, uid, context=None):
@@ -50,6 +50,8 @@
 
     def print_report(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, context=context)[0]
+        if isinstance(data['employee_id'], tuple):
+            data['employee_id'] = data['employee_id'][0]
         datas = {
              'ids': [],
              'model': 'hr.employee',

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py	2011-02-15 13:27:07 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py	2011-02-17 07:20:39 +0000
@@ -59,6 +59,9 @@
         res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
 
         data = self.read(cr, uid, ids, [], context=context)[0]
+        if isinstance(data['balance_product'], tuple):
+            data['balance_product'] = data['balance_product'][0]
+
         account_ids = 'active_ids' in context and context['active_ids'] or []
 
         for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2011-01-17 11:20:56 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2011-02-17 07:20:39 +0000
@@ -269,7 +269,7 @@
                 'draft': [('readonly', False)],
                 'new': [('readonly', False)]}
             ),
-        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True,),
+        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)],'new':[('readonly',False)]}),
         'state' : fields.selection([
             ('new', 'New'),
             ('draft','Draft'),

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2011-01-17 08:00:48 +0000
+++ mrp/mrp_view.xml	2011-02-17 07:20:39 +0000
@@ -406,6 +406,8 @@
                             <field name="date_stop"/>
                             <field name="product_rounding"/>
                             <field name="product_efficiency" groups="base.group_extended"/>
+                            <separator string="Properties" colspan="4"/>
+                            <newline/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
                     </notebook>

=== modified file 'mrp/wizard/mrp_product_produce.py'
--- mrp/wizard/mrp_product_produce.py	2011-02-15 13:27:07 +0000
+++ mrp/wizard/mrp_product_produce.py	2011-02-17 07:20:39 +0000
@@ -70,10 +70,10 @@
             context = {}
         prod_obj = self.pool.get('mrp.production')
         move_ids = context.get('active_ids', [])
-        for data in self.read(cr, uid, ids, context=context):
+        for data in self.browse(cr, uid, ids, context=context):
             for move_id in move_ids:
                 prod_obj.action_produce(cr, uid, move_id,
-                                    data['product_qty'], data['mode'], context=context)
+                                    data.product_qty, data.mode, context=context)
         return {}
 
 mrp_product_produce()

=== modified file 'product/product.py'
--- product/product.py	2011-02-14 04:47:46 +0000
+++ product/product.py	2011-02-17 07:20:39 +0000
@@ -482,7 +482,7 @@
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True),
     }
-    
+
     def unlink(self, cr, uid, ids, context=None):
         unlink_ids = []
         unlink_product_tmpl_ids = []
@@ -715,10 +715,16 @@
             result[supplier_info.id]['qty'] = qty
         return result
 
-    def _get_uom_id(self, cr, uid, *args):
-        cr.execute('select id from product_uom order by id limit 1')
-        res = cr.fetchone()
-        return res and res[0] or False
+    def _get_uom_id(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        uom_id = context.get('uom_id', False)
+        if uom_id:
+            return uom_id
+        else:
+            cr.execute('select id from product_uom order by id limit 1')
+            res = cr.fetchone()
+            return res and res[0] or False
 
     _columns = {
         'name' : fields.many2one('res.partner', 'Supplier', required=True,domain = [('supplier','=',True)], ondelete='cascade', help="Supplier of this product"),

=== modified file 'product/product_view.xml'
--- product/product_view.xml	2011-01-17 08:00:48 +0000
+++ product/product_view.xml	2011-02-17 07:20:39 +0000
@@ -150,7 +150,7 @@
 
                         </page>
                         <page string="Suppliers">
-                            <field colspan="4" name="seller_ids" nolabel="1"/>
+                            <field colspan="4" name="seller_ids" nolabel="1" context="{'uom_id': uom_id}"/>
                         </page>
                         <page string="Descriptions">
                             <separator string="Description"/>

=== modified file 'project_scrum/wizard/project_scrum_backlog_create_task.py'
--- project_scrum/wizard/project_scrum_backlog_create_task.py	2011-02-15 13:27:07 +0000
+++ project_scrum/wizard/project_scrum_backlog_create_task.py	2011-02-17 07:20:39 +0000
@@ -35,6 +35,9 @@
         ids_task = []
 
         data = self.read(cr, uid, ids, [], context=context)[0]
+        if isinstance(data['user_id'], tuple):
+            data['user_id'] = data['user_id'][0]
+
         backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context)
         result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
         id = mod_obj.read(cr, uid, result, ['res_id'])

=== modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py'
--- project_scrum/wizard/project_scrum_backlog_sprint.py	2011-02-15 13:27:07 +0000
+++ project_scrum/wizard/project_scrum_backlog_sprint.py	2011-02-17 07:20:39 +0000
@@ -42,6 +42,9 @@
         if context is None:
             context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
+        if isinstance(data['sprint_id'], tuple):
+            data['sprint_id'] = data['sprint_id'][0]
+
         for backlog in backlog_obj.browse(cr, uid, context['active_ids'], context=context):
             backlog_ids.append(backlog.id)
             if data['convert_to_task']:

=== modified file 'purchase_requisition/wizard/purchase_requisition_partner.py'
--- purchase_requisition/wizard/purchase_requisition_partner.py	2011-02-15 13:27:07 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner.py	2011-02-17 07:20:39 +0000
@@ -67,7 +67,11 @@
             context = {}
         record_ids = context and context.get('active_ids', False)
         if record_ids:
-            data =  self.read(cr, uid, ids)
+            data =  self.read(cr, uid, ids,context=context)
+            for m2o_field in ['partner_id','partner_address_id']:
+                if isinstance(data[0][m2o_field], tuple):
+                    data[0][m2o_field] = data[0][m2o_field][0]
+
             company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
             order_obj = self.pool.get('purchase.order')
             order_line_obj = self.pool.get('purchase.order.line')

=== modified file 'stock/wizard/stock_inventory_line_split.py'
--- stock/wizard/stock_inventory_line_split.py	2011-01-14 00:11:01 +0000
+++ stock/wizard/stock_inventory_line_split.py	2011-02-17 07:20:39 +0000
@@ -29,65 +29,68 @@
     _name = "stock.inventory.line.split"
     _description = "Split inventory lines"
 
-    
+
     def default_get(self, cr, uid, fields, context=None):
-        """ To check the availability of production lot. 
+        """ To check the availability of production lot.
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values 
-        @param context: A standard dictionary 
-        @return: A dictionary which of fields with values. 
-        """        
+        @param fields: List of fields for which we want default values
+        @param context: A standard dictionary
+        @return: A dictionary which of fields with values.
+        """
         if context is None:
             context = {}
         record_id = context and context.get('active_id',False)
         res = {}
-        line = self.pool.get('stock.inventory.line').browse(cr, uid, record_id, context=context)        
+        line = self.pool.get('stock.inventory.line').browse(cr, uid, record_id, context=context)
         if 'product_id' in fields:
             res.update({'product_id':line.product_id.id})
         if 'product_uom' in fields:
             res.update({'product_uom': line.product_uom.id})
         if 'qty' in fields:
-            res.update({'qty': line.product_qty})       
+            res.update({'qty': line.product_qty})
         return res
-    
+
     def split(self, cr, uid, ids, line_ids, context=None):
         """ To split stock inventory lines according to production lot.
         @param self: The object pointer.
         @param cr: A database cursor
         @param uid: ID of the user currently logged in
-        @param ids: the ID or list of IDs if we want more than one 
+        @param ids: the ID or list of IDs if we want more than one
         @param line_ids: the ID or list of IDs of inventory lines we want to split
-        @param context: A standard dictionary 
-        @return: 
-        """                    
+        @param context: A standard dictionary
+        @return:
+        """
         prodlot_obj = self.pool.get('stock.production.lot')
         ir_sequence_obj = self.pool.get('ir.sequence')
         line_obj = self.pool.get('stock.inventory.line')
-        new_line = []        
+        new_line = []
         for data in self.browse(cr, uid, ids, context=context):
             for inv_line in line_obj.browse(cr, uid, line_ids, context=context):
                 line_qty = inv_line.product_qty
-                quantity_rest = inv_line.product_qty                
-                new_line = []   
+                quantity_rest = inv_line.product_qty
+                new_line = []
                 if data.use_exist:
                     lines = [l for l in data.line_exist_ids if l]
                 else:
-                    lines = [l for l in data.line_ids if l]                         
+                    lines = [l for l in data.line_ids if l]
                 for line in lines:
                     quantity = line.quantity
                     if quantity <= 0 or line_qty == 0:
                         continue
-                    quantity_rest -= quantity                    
-                    if quantity_rest <= 0:
+                    quantity_rest -= quantity
+                    if quantity_rest < 0:
                         quantity_rest = quantity
                         break
                     default_val = {
-                        'product_qty': quantity,                         
+                        'product_qty': quantity,
                     }
-                    current_line = line_obj.copy(cr, uid, inv_line.id, default_val)
-                    new_line.append(current_line)
+                    if quantity_rest > 0:
+                        current_line = line_obj.copy(cr, uid, inv_line.id, default_val)
+                        new_line.append(current_line)
+                    if quantity_rest == 0:
+                        current_line = inv_line.id
                     prodlot_id = False
                     if data.use_exist:
                         prodlot_id = line.prodlot_id.id
@@ -97,13 +100,13 @@
                             'product_id': inv_line.product_id.id},
                         context=context)
                     line_obj.write(cr, uid, [current_line], {'prod_lot_id': prodlot_id})
-                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id)                    
-                    
+                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
+
                     update_val = {}
-                    if quantity_rest > 0:                        
-                        update_val['product_qty'] = quantity_rest                                            
+                    if quantity_rest > 0:
+                        update_val['product_qty'] = quantity_rest
                         line_obj.write(cr, uid, [inv_line.id], update_val)
-                    
+
         return new_line
 stock_inventory_line_split()