From 07460d719155a609c75096814c97e1b26d6cbe25 Mon Sep 17 00:00:00 2001 From: qdp-odoo Date: Fri, 30 May 2014 19:04:13 +0200 Subject: [PATCH] [IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed)) --- ...e_reconciliation.js => account_widgets.js} | 0 .../wizard/account_statement_from_invoice.py | 1 - .../account_statement_from_invoice_view.xml | 0 addons/account_voucher/wizard/__init__.py | 24 ------------------- 4 files changed, 25 deletions(-) rename addons/account/static/src/js/{account_move_reconciliation.js => account_widgets.js} (100%) rename addons/{account_voucher => account}/wizard/account_statement_from_invoice.py (98%) rename addons/{account_voucher => account}/wizard/account_statement_from_invoice_view.xml (100%) delete mode 100644 addons/account_voucher/wizard/__init__.py diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_widgets.js similarity index 100% rename from addons/account/static/src/js/account_move_reconciliation.js rename to addons/account/static/src/js/account_widgets.js diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account/wizard/account_statement_from_invoice.py similarity index 98% rename from addons/account_voucher/wizard/account_statement_from_invoice.py rename to addons/account/wizard/account_statement_from_invoice.py index 734a2d8ec66..285b8e336b3 100644 --- a/addons/account_voucher/wizard/account_statement_from_invoice.py +++ b/addons/account/wizard/account_statement_from_invoice.py @@ -34,7 +34,6 @@ class account_statement_from_invoice_lines(osv.osv_memory): } def populate_statement(self, cr, uid, ids, context=None): - #TODO: can be moved in account module if context is None: context = {} statement_id = context.get('statement_id', False) diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml similarity index 100% rename from addons/account_voucher/wizard/account_statement_from_invoice_view.xml rename to addons/account/wizard/account_statement_from_invoice_view.xml diff --git a/addons/account_voucher/wizard/__init__.py b/addons/account_voucher/wizard/__init__.py deleted file mode 100644 index 47b87b27162..00000000000 --- a/addons/account_voucher/wizard/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import account_statement_from_invoice - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: