diff --git a/.travis.yml b/.travis.yml index 80a8089e..bf8300d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ python: - "2.7" env: - - VERSION="8.0" ODOO_REPO="odoo/odoo" EXCLUDE="account_financial_report_webkit" + - VERSION="8.0" ODOO_REPO="odoo/odoo" - VERSION="8.0" ODOO_REPO="OCA/OCB" virtualenv: diff --git a/__unported__/account_financial_report_webkit/account_move_line.py b/__unported__/account_financial_report_webkit/account_move_line.py index 56e74b5a..f8671f99 100644 --- a/__unported__/account_financial_report_webkit/account_move_line.py +++ b/__unported__/account_financial_report_webkit/account_move_line.py @@ -29,26 +29,6 @@ class AccountMoveLine(orm.Model): account move line""" _inherit = 'account.move.line' - def init(self, cr): - # We do not want to catch error as if sql is not run it will give - # invalid data - cr.execute("UPDATE account_move_line as acm " - " SET last_rec_date =" - " (SELECT date from account_move_line" - " WHERE reconcile_id = acm.reconcile_id" - " AND reconcile_id IS NOT NULL" - " ORDER BY date DESC LIMIT 1)" - " WHERE last_rec_date is null;") - - cr.execute("UPDATE account_move_line as acm " - " SET last_rec_date =" - " (SELECT date from account_move_line" - " WHERE reconcile_partial_id" - " = acm.reconcile_partial_id" - " AND reconcile_partial_id IS NOT NULL" - " ORDER BY date DESC LIMIT 1)" - " WHERE last_rec_date is null;") - def _get_move_line_from_line_rec(self, cr, uid, ids, context=None): moves = [] for reconcile in self.pool['account.move.reconcile'].browse( diff --git a/__unported__/account_financial_report_webkit/tests/general_ledger.yml b/__unported__/account_financial_report_webkit/tests/general_ledger.yml index 17f733d8..0e34b1f8 100644 --- a/__unported__/account_financial_report_webkit/tests/general_ledger.yml +++ b/__unported__/account_financial_report_webkit/tests/general_ledger.yml @@ -1,3 +1,36 @@ +- + I first fix the demo periods (7.0 only) + see https://code.launchpad.net/~acsone-openerp/openobject-addons/7.0-bug-1281579-sbi/+merge/207311 + which was merged in 8.0 +- + !python {model: account.period}: | + import time + if not self.search(cr, uid, [('special', '=', False), + ('fiscalyear_id', '=', ref('account.data_fiscalyear')), + ('company_id', '=', ref('base.main_company'))]): + cur_year = time.strftime('%Y') + self.create(cr, uid, { + 'code': '00/' + cur_year, + 'name': 'X 00/' + cur_year, + 'special': True, + 'fiscalyear_id': ref('account.data_fiscalyear'), + 'date_start': cur_year + '-01-01', + 'date_stop': cur_year + '-01-01', + 'company_id': ref('base.main_company'), + }) + self.write(cr, uid, ref('account.period_1'), {'special': False}) + self.write(cr, uid, ref('account.period_2'), {'special': False}) + self.write(cr, uid, ref('account.period_3'), {'special': False}) + self.write(cr, uid, ref('account.period_4'), {'special': False}) + self.write(cr, uid, ref('account.period_5'), {'special': False}) + self.write(cr, uid, ref('account.period_6'), {'special': False}) + self.write(cr, uid, ref('account.period_7'), {'special': False}) + self.write(cr, uid, ref('account.period_8'), {'special': False}) + self.write(cr, uid, ref('account.period_9'), {'special': False}) + self.write(cr, uid, ref('account.period_10'), {'special': False}) + self.write(cr, uid, ref('account.period_11'), {'special': False}) + self.write(cr, uid, ref('account.period_12'), {'special': False}) + - In order to test the PDF General Ledger webkit wizard I will print report with default setting - diff --git a/account_financial_report_webkit/migrations/7.0.1.0.2/post-migration.py b/account_financial_report_webkit/migrations/7.0.1.0.2/post-migration.py new file mode 100644 index 00000000..aae75607 --- /dev/null +++ b/account_financial_report_webkit/migrations/7.0.1.0.2/post-migration.py @@ -0,0 +1,41 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Author: Nicolas Bessi. +# Copyright Camptocamp SA 2011 +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + + +def migrate(cr, version): + if not version: + # only run at first install + cr.execute("UPDATE account_move_line as acm " + " SET last_rec_date =" + " (SELECT date from account_move_line" + " WHERE reconcile_id = acm.reconcile_id" + " AND reconcile_id IS NOT NULL" + " ORDER BY date DESC LIMIT 1)" + " WHERE last_rec_date is null;") + + cr.execute("UPDATE account_move_line as acm " + " SET last_rec_date =" + " (SELECT date from account_move_line" + " WHERE reconcile_partial_id" + " = acm.reconcile_partial_id" + " AND reconcile_partial_id IS NOT NULL" + " ORDER BY date DESC LIMIT 1)" + " WHERE last_rec_date is null;")