diff --git a/account_check_deposit/__init__.py b/account_check_deposit/__init__.py index 20b98b3f5..f1c1297b1 100644 --- a/account_check_deposit/__init__.py +++ b/account_check_deposit/__init__.py @@ -2,7 +2,7 @@ ############################################################################### # # account_check_deposit for Odoo/OpenERP -# Copyright (C) 2012-2014 Akretion (http://www.akretion.com/) +# Copyright (C) 2012-2015 Akretion (http://www.akretion.com/) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/account_check_deposit/__openerp__.py b/account_check_deposit/__openerp__.py index 136b6dc1d..8c9e0752a 100644 --- a/account_check_deposit/__openerp__.py +++ b/account_check_deposit/__openerp__.py @@ -2,7 +2,7 @@ ############################################################################### # # account_check_deposit for Odoo/OpenERP -# Copyright (C) 2012-2014 Akretion (http://www.akretion.com/) +# Copyright (C) 2012-2015 Akretion (http://www.akretion.com/) # @author: Benoît GUILLOT # @author: Chafique DELLI # @author: Alexis de Lattre @@ -24,7 +24,7 @@ { 'name': 'Account Check Deposit', - 'version': '0.1', + 'version': '8.0.0.1.0', 'category': 'Accounting & Finance', 'license': 'AGPL-3', 'summary': 'Manage deposit of checks to the bank', @@ -40,7 +40,7 @@ You must configure on this journal the default debit account and the default credit account. You must also configure on the company the account for check deposits. """, - 'author': 'Akretion', + 'author': "Akretion,Odoo Community Association (OCA)", 'website': 'http://www.akretion.com/', 'depends': [ 'account_accountant', @@ -48,11 +48,14 @@ check deposits. ], 'data': [ 'account_deposit_view.xml', + 'account_move_line_view.xml', 'account_deposit_sequence.xml', 'company_view.xml', 'security/ir.model.access.csv', 'security/check_deposit_security.xml', 'account_data.xml', + 'report.xml', + 'report/report_checkdeposit.xml', ], 'installable': True, 'application': True, diff --git a/account_check_deposit/account_data.xml b/account_check_deposit/account_data.xml index 8bc79336f..141123f54 100644 --- a/account_check_deposit/account_data.xml +++ b/account_check_deposit/account_data.xml @@ -1,7 +1,7 @@ diff --git a/account_check_deposit/account_deposit.py b/account_check_deposit/account_deposit.py index a98df3166..cdc0fbd2c 100644 --- a/account_check_deposit/account_deposit.py +++ b/account_check_deposit/account_deposit.py @@ -2,7 +2,7 @@ ############################################################################### # # account_check_deposit for Odoo/OpenERP -# Copyright (C) 2012-2014 Akretion (http://www.akretion.com/) +# Copyright (C) 2012-2015 Akretion (http://www.akretion.com/) # @author: Benoît GUILLOT # @author: Chafique DELLI # @author: Alexis de Lattre diff --git a/account_check_deposit/account_deposit_sequence.xml b/account_check_deposit/account_deposit_sequence.xml index 912b8047b..47a53f88e 100644 --- a/account_check_deposit/account_deposit_sequence.xml +++ b/account_check_deposit/account_deposit_sequence.xml @@ -1,7 +1,7 @@ diff --git a/account_check_deposit/account_deposit_view.xml b/account_check_deposit/account_deposit_view.xml index 3c09da374..629541f88 100644 --- a/account_check_deposit/account_deposit_view.xml +++ b/account_check_deposit/account_deposit_view.xml @@ -1,7 +1,7 @@ + + + + + + + account_check_deposit.view_move_line_form + account.move.line + + + + + + + + + + account_check_deposit.view_move_line_form2 + account.move.line + + + + + + + + + + + diff --git a/account_check_deposit/company_view.xml b/account_check_deposit/company_view.xml index 74b9019e4..06329163a 100644 --- a/account_check_deposit/company_view.xml +++ b/account_check_deposit/company_view.xml @@ -1,7 +1,7 @@ diff --git a/account_check_deposit/report.xml b/account_check_deposit/report.xml new file mode 100644 index 000000000..961c835a2 --- /dev/null +++ b/account_check_deposit/report.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + diff --git a/account_check_deposit/report/__init__.py b/account_check_deposit/report/__init__.py deleted file mode 100644 index 6d4950f0c..000000000 --- a/account_check_deposit/report/__init__.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# account_check_deposit for Odoo/OpenERP -# Copyright (C) 2012-2014 Akretion (http://www.akretion.com/) -# -# 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 . -# -############################################################################### - -from . import report_webkit_html diff --git a/account_check_deposit/report/check_deposit.mako b/account_check_deposit/report/check_deposit.mako deleted file mode 100644 index 67a660ebe..000000000 --- a/account_check_deposit/report/check_deposit.mako +++ /dev/null @@ -1,90 +0,0 @@ -# -*- coding: utf-8 -*- - - - - - -%for deposit in objects : -<% setLang(deposit.company_id.partner_id.lang) %> -${_("Deposit Slip of Checks in ")} ${deposit.currency_id.name} - - - - - - - - - - - - - - -
${_("Deposit Date")}${_("Deposit Ref")}${_("Beneficiary")}${_("Bank Account Number")}
${formatLang(deposit.deposit_date, date=True)}${deposit.name}${deposit.company_id.partner_id.name}${deposit.partner_bank_id.acc_number}
- -

${_("Check Payments")}

- - - - - - - - - - - - %for move_line in deposit.check_payment_ids : - - - - - - - - - %endfor - %endfor - - - - - - -
${_("Payment Date")}${_("Reference")}${_("Debtor")}${_("Amount")}
${move_line.date or ''}${move_line.ref or ''}${move_line.partner_id.name or ''}${deposit.currency_id == deposit.company_id.currency_id and move_line.debit or move_line.amount_currency} ${deposit.currency_id.name}
${_("Total:")}${deposit.total_amount or '0'} ${deposit.currency_id.name}
- - - diff --git a/account_check_deposit/report/report_checkdeposit.xml b/account_check_deposit/report/report_checkdeposit.xml new file mode 100644 index 000000000..0ec70ed2b --- /dev/null +++ b/account_check_deposit/report/report_checkdeposit.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + diff --git a/account_check_deposit/report/report_webkit_html.py b/account_check_deposit/report/report_webkit_html.py deleted file mode 100644 index 9d8a2f77c..000000000 --- a/account_check_deposit/report/report_webkit_html.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# account_check_deposit for Odoo/OpenERP -# Copyright (C) 2012-2014 Akretion (http://www.akretion.com/) -# @author: Benoît GUILLOT -# @author: Chafique DELLI -# -# 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 time -from report import report_sxw - - -class report_webkit_html(report_sxw.rml_parse): - - def __init__(self, cr, uid, name, context): - super(report_webkit_html, self).__init__( - cr, uid, name, context=context) - self.localcontext.update({ - 'time': time, - 'cr': cr, - 'uid': uid, - }) - -report_sxw.report_sxw('report.account.check.deposit', - 'account.check.deposit', - 'addons/account_check_deposit/report/check_deposit.mako', - parser=report_webkit_html) diff --git a/account_check_deposit/security/check_deposit_security.xml b/account_check_deposit/security/check_deposit_security.xml index 0a952aa30..0f362cbf5 100644 --- a/account_check_deposit/security/check_deposit_security.xml +++ b/account_check_deposit/security/check_deposit_security.xml @@ -1,7 +1,7 @@ diff --git a/account_check_deposit/static/description/icon.png b/account_check_deposit/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/account_check_deposit/static/description/icon.png differ