diff --git a/addons/account/account.py b/addons/account/account.py index 869daa85867..5b9b829b001 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -773,12 +773,10 @@ class account_move_reconcile(osv.osv): 'line_id': fields.one2many('account.move.line', 'reconcile_id', 'Entry lines'), } _defaults = { - 'name': lambda *a: 'reconcile '+time.strftime('%Y-%m-%d') + 'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/' } account_move_reconcile() - - #---------------------------------------------------------- # Tax #---------------------------------------------------------- diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 9565e6369b2..39dccae5fdc 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -750,6 +750,7 @@ + diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml index 5f0df3a983f..e450e3c062b 100644 --- a/addons/account/data/account_data2.xml +++ b/addons/account/data/account_data2.xml @@ -187,6 +187,19 @@ Account Statement Sequences --> + + Account reconcile sequence + account.reconcile + + + Account reconcile sequence + account.reconcile + A + + + + + Bank Statement account.bank.statement diff --git a/addons/board_account/__terp__.py b/addons/board_account/__terp__.py index 57c9514678a..96eb6a40c57 100644 --- a/addons/board_account/__terp__.py +++ b/addons/board_account/__terp__.py @@ -10,7 +10,8 @@ "report_account", "report_analytic", "report_analytic_line", - "account_report" + "account_report", + "hr_timesheet_sheet" ], "demo_xml":["board_account_demo.xml"], "update_xml":["board_account_view.xml"], diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 38a4b9a46a7..54f26808148 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -12,9 +12,9 @@ - - - + + + @@ -36,10 +36,10 @@ - - - - + + + +