merge

bzr revid: fp@tinyerp.com-20090309125044-b2rj7ulmv2yxrsvt

addons/hr_expense/hr_expense.py

@@ -125,6 +125,9 @@ class hr_expense_expense(osv.osv):
                     tax_id = [x.id for x in l.product_id.supplier_taxes_id]
                 else:
                     acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+                    if not acc:
+                        raise osv.except_osv(_('Error !'), _('Please configure Default Expanse account for Product purchase, `property_account_expense_categ`'))
+                    
                 lines.append((0, False, {
                     'name': l.name,
                     'account_id': acc,

addons/wiki/wizard/open_page.py

@@ -39,7 +39,7 @@ class wiz_timesheet_open(wizard.interface):
         group = pool.get('wiki.groups.link').browse(cr, uid, group_ids[0])
         
         value = {
-            'context': "{'group_id':%d}" % (group.group_id.id),
+            'context': "{'group_id':%d, 'section':%s}" % (group.group_id.id, group.group_id.section),
             'domain': "[('group_id','child_of',[%s])]" % (group.group_id.id),
             'name': 'Wiki Page',
             'view_type': 'form',