pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-14 up to 7836c41763

Browse Source
This commit is contained in:
Christophe Simonis
2018-08-01 12:06:06 +02:00
parent 42e5b322af 7836c41763
commit c2f220f977
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_aged_partner_balance.py
+1 -1
View File
@@ -68,7 +68,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
partner_ids = [partner['partner_id'] for partner in partners if partner['partner_id']] partner_ids = [partner['partner_id'] for partner in partners if partner['partner_id']]
lines = dict((partner['partner_id'] or False, []) for partner in partners) lines = dict((partner['partner_id'] or False, []) for partner in partners)
if not partner_ids: if not partner_ids:
return [], [], [] return [], [], {}
# This dictionary will store the not due amount of all partners # This dictionary will store the not due amount of all partners
undue_amounts = {} undue_amounts = {}
odoo/service/server.py
+3 -2
View File
@@ -138,8 +138,9 @@ class FSWatcher(object):
except SyntaxError: except SyntaxError:
_logger.error('autoreload: python code change detected, SyntaxError in %s', path) _logger.error('autoreload: python code change detected, SyntaxError in %s', path)
else: else:
_logger.info('autoreload: python code updated, autoreload activated') if not getattr(odoo, 'phoenix', False):
restart() _logger.info('autoreload: python code updated, autoreload activated')
restart()
def start(self): def start(self):
self.observer.start() self.observer.start()