[MERGE] forward port branch 10.0 up to e372ca5cd8

addons/account/report/account_aged_partner_balance.py

@@ -68,7 +68,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
         partner_ids = [partner['partner_id'] for partner in partners if partner['partner_id']]
         lines = dict((partner['partner_id'] or False, []) for partner in partners)
         if not partner_ids:
-            return [], [], []
+            return [], [], {}
 
         # This dictionary will store the not due amount of all partners
         undue_amounts = {}

odoo/service/server.py

@@ -137,8 +137,9 @@ class FSWatcher(object):
                     except SyntaxError:
                         _logger.error('autoreload: python code change detected, SyntaxError in %s', path)
                     else:
-                        _logger.info('autoreload: python code updated, autoreload activated')
-                        restart()
+                        if not getattr(odoo, 'phoenix', False):
+                            _logger.info('autoreload: python code updated, autoreload activated')
+                            restart()
 
     def start(self):
         self.observer.start()