[MERGE] merge wid main addons

bzr revid: mra@mra-laptop-20100826122813-krbf53346xic2gap

addons/account_voucher/voucher_payment_receipt_view.xml

@@ -161,18 +161,5 @@
         </record>
         <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="16"
             id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
-        
-        <record id="action_cheque_pay" model="ir.actions.act_window">
-            <field name="name">Cheques</field>
-            <field name="res_model">account.voucher.open</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>
-            <field name="context">{'journal_type':'bank', 'type':'payment'}</field>
-            <field name="view_id" ref="account_open_vouchers_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem action="action_cheque_pay" icon="STOCK_JUSTIFY_FILL" sequence="16"
-            id="menu_action_cheque_pay" parent="account.menu_finance_bank_and_cash"/>
     </data>
 </openerp>

addons/hr/hr_department.py

@@ -130,8 +130,8 @@ class res_users(osv.osv):
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'], context=context)
                 parent_ids = map(lambda x: x['manager_id'][0], data_dept)
                 cr.execute('SELECT res.user_id FROM hr_employee AS emp JOIN resource_resource AS res ON res.id=emp.resource_id \
-                        WHERE emp.id IN %s', (tuple(parent_ids),))
-                parent_ids = [x[0] for x in cr.fetchall() if x[0]]
+                        WHERE emp.id IN %s AND res.user_id IS NOT NULL', (tuple(parent_ids),))
+                parent_ids = [x[0] for x in cr.fetchall()]
             result[user_id] = parent_ids
         return result