[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101210054216-6he4dnegsl005qhu

addons/account/report/account_balance_sheet.py

@@ -60,6 +60,13 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
         })
         self.context = context
 
+    def set_context(self, objects, data, ids, report_type=None):
+        new_ids = ids
+        if (data['model'] == 'ir.ui.menu'):
+            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        return super(report_balancesheet_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
+
     def sum_dr(self):
         if self.res_bl['type'] == _('Net Profit'):
             self.result_sum_dr += self.res_bl['balance']*-1

addons/account/report/account_profit_loss.py

@@ -56,6 +56,13 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
         })
         self.context = context
 
+    def set_context(self, objects, data, ids, report_type=None):
+        new_ids = ids
+        if (data['model'] == 'ir.ui.menu'):
+            new_ids = 'chart_account_id' in data['form'] and [data['form']['chart_account_id']] or []
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
+        return super(report_pl_account_horizontal, self).set_context(objects, data, new_ids, report_type=report_type)
+
 
     def final_result(self):
         return self.res_pl

addons/l10n_uk/__openerp__.py

@@ -75,6 +75,6 @@
     'demo_xml': [],
     'installable': True,
     'active': False,
-    'certificate': '18956603329629',
+    'certificate': '008956603329629',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/project/board_project_manager_view.xml

@@ -15,14 +15,7 @@
             res_model="project.project" view_mode="tree,form" 
             view_type="form"/>
 
-        <act_window 
-            id="act_my_account"
-            name="My accounts to invoice"
-            res_model="account.analytic.account"
-            domain="[('user_id','=',uid),('state','&lt;&gt;','close')]"
-            view_id="account.view_account_analytic_account_tree"
-            view_mode="tree,form"
-            view_type="form"/>
+        <act_window domain="[('user_id','=',uid),('state','&lt;&gt;','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
 
     </data>
 </openerp>