diff --git a/account_check_deposit/__init__.py b/account_check_deposit/__init__.py new file mode 100644 index 000000000..d0334331b --- /dev/null +++ b/account_check_deposit/__init__.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +############################################################################### +# # +# account_check_deposit for OpenERP # +# Copyright (C) 2012 Akretion Benoît GUILLOT # +# # +# 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_deposit + + + + diff --git a/account_check_deposit/__openerp__.py b/account_check_deposit/__openerp__.py new file mode 100644 index 000000000..ffbee2c21 --- /dev/null +++ b/account_check_deposit/__openerp__.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +############################################################################### +# # +# account_check_deposit for OpenERP # +# Copyright (C) 2012 Akretion Benoît GUILLOT # +# # +# 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 . # +# # +############################################################################### + + + +{ + 'name': 'account_check_deposit', + 'version': '7.0', + 'category': 'Generic Modules/Others', + 'license': 'AGPL-3', + 'description': """This module allows you to use check deposits. + With a new model : account_check_deposit you can select all + the checks payments and create a global deposit for the selected checks. + You may have to create an account for recieved checks and a journal for payment by checks.""", + 'author': 'Akretion', + 'website': 'http://www.akretion.com/', + 'depends': ['account_accountant'], + 'init_xml': [], + 'update_xml': [ + 'account_deposit_view.xml', + 'account_deposit_sequence.xml', + 'account_type_data.xml', + ], + 'demo_xml': [], + 'installable': True, + 'active': False, +} + diff --git a/account_check_deposit/account_deposit.py b/account_check_deposit/account_deposit.py new file mode 100644 index 000000000..9643a2a6e --- /dev/null +++ b/account_check_deposit/account_deposit.py @@ -0,0 +1,142 @@ +# -*- coding: utf-8 -*- +############################################################################### +# # +# account_check_deposit for OpenERP # +# Copyright (C) 2012 Akretion Benoît GUILLOT # +# # +# 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 openerp.osv import fields, osv +from openerp.osv.orm import Model +from openerp.tools.translate import _ + +class account_check_deposit(Model): + _name = "account.check.deposit" + _description = "Account Check Deposit" + + _columns = { + 'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'check_payment_ids': fields.many2many('account.move.line', 'account_move_line_deposit_rel', + 'check_deposit_id', 'move_line_id', 'Check Payments', + readonly=True, states={'draft':[('readonly',False)]}), + 'deposit_date': fields.date('Deposit Date', readonly=True, states={'draft':[('readonly',False)]}), + 'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, + states={'draft':[('readonly',False)]}), + 'state': fields.selection([ + ('draft','Draft'), + ('done','Done'), + ('cancel','Cancelled') + ],'Status', readonly=True), + 'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, + states={'draft':[('readonly',False)]}), + } + + _defaults = { + 'name': lambda self, cr, uid, context: '/', + 'deposit_date': fields.date.context_today, + 'state':'draft', + } + + def cancel(self, cr, uid, ids, context=None): + for deposit in self.browse(cr, uid, ids, context=context): + if not deposit.journal_id.update_posted: + raise osv.except_osv(_('Error!'), _('You cannot modify a posted entry of this journal.\nFirst you should set the journal to allow cancelling entries.')) + for line in deposit.check_payment_ids: + line.reconcile_id.unlink() + deposit.move_id.button_cancel() + deposit.move_id.unlink() + return True + + def create(self, cr, uid, vals, context=None): + if vals.get('name','/')=='/': + vals['name'] = self.pool.get('ir.sequence').get(cr, uid, 'account.check.deposit') or '/' + return super(account_check_deposit, self).create(cr, uid, vals, context=context) + + def _prepare_account_move_vals(self, cr, uid, deposit, context=None): + move_vals = {} + move_lines = [[0, 0, self._prepare_sum_move_line_vals(cr, uid, deposit, move_vals, context=context)]] + for line in deposit.check_payment_ids: + move_lines.append([0, 0, self._prepare_move_line_vals(cr, uid, line, move_vals, context=context)]) + move_vals.update({ + 'journal_id': deposit.journal_id.id, + 'line_id': move_lines, + }) + return move_vals + + def _prepare_move_line_vals(self, cr, uid, line, move_vals, context=None): + move_line_vals = self.pool.get('account.move.line').default_get(cr, uid, + ['centralisation', 'date','date_created', + 'currency_id', 'journal_id', 'amount_currency', + 'account_id', 'period_id', 'company_id'], + context=context) + move_line_vals.update({ + 'name': line.ref, #name ? + 'credit': line.debit, + 'account_id': line.account_id.id, + 'partner_id': line.partner_id.id, + 'ref': line.ref, + }) + return move_line_vals + + def _prepare_sum_move_line_vals(self, cr, uid, deposit, move_vals, context=None): + move_line_vals = self.pool.get('account.move.line').default_get(cr, uid, + ['centralisation', 'date','date_created', + 'currency_id', 'journal_id', 'amount_currency', + 'account_id', 'period_id', 'company_id', 'state'], + context=context) + debit = 0.0 + for line in deposit.check_payment_ids: + debit += line.debit + move_line_vals.update({ + 'name': deposit.name, + 'debit': debit, + 'ref': deposit.name, + }) + + return move_line_vals + + def _reconcile_checks(self, cr, uid, deposit, move_id, context=None): + move_line_obj = self.pool.get('account.move.line') + for line in deposit.check_payment_ids: + move_line_ids = move_line_obj.search(cr, uid, [('move_id', '=', move_id), + ('credit', '=', line.debit), + ('name', '=', line.ref)], context=context) + if move_line_ids: + move_line_obj.reconcile(cr, uid, [line.id, move_line_ids[0]], context=context) + return True + + def validate_deposit(self, cr, uid, ids, context=None): + move_obj = self.pool.get('account.move') + if context is None: + context = {} + for deposit in self.browse(cr, uid, ids, context=context): + context['journal_id'] = deposit.journal_id.id + move_vals = self._prepare_account_move_vals(cr, uid, deposit, context=context) + print "move_vals ====>", move_vals + import pdb; pdb.set_trace() + move_id = move_obj.create(cr, uid, move_vals, context=context) + move_obj.post(cr, uid, [move_id], context=context) + self._reconcile_checks(cr, uid, deposit, move_id, context=context) + deposit.write({'state':'done', 'move_id': move_id}) + return True + +class account_move_line(Model): + _inherit = "account.move.line" + + _columns = { + 'check_deposit_id': fields.many2many('account.check.deposit', 'account_move_line_deposit_rel', + 'check_deposit_id', 'move_line_id', 'Check Deposit'), + } diff --git a/account_check_deposit/account_deposit_sequence.xml b/account_check_deposit/account_deposit_sequence.xml new file mode 100644 index 000000000..2208a5dbe --- /dev/null +++ b/account_check_deposit/account_deposit_sequence.xml @@ -0,0 +1,26 @@ + + + + + + + + + Account Check Deposit + account.check.deposit + + + + Account Check Deposit + account.check.deposit + DEP + 3 + + + + + diff --git a/account_check_deposit/account_deposit_view.xml b/account_check_deposit/account_deposit_view.xml new file mode 100644 index 000000000..10cc6cdd4 --- /dev/null +++ b/account_check_deposit/account_deposit_view.xml @@ -0,0 +1,102 @@ + + + + + + + + + + account_check_deposit.account_check_deposit.view_form + account.check.deposit + form + +
+
+
+ +

+

+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + account_check_deposit.account_check_deposit.view_tree + account.check.deposit + tree + + + + + + + + + + + + account.check.deposit.search + account.check.deposit + + + + + + + + + + + + + + Check Deposits + account.check.deposit + form + tree,form,graph + [] + {} + + + + + + + + diff --git a/account_check_deposit/account_type_data.xml b/account_check_deposit/account_type_data.xml new file mode 100644 index 000000000..1d34fc717 --- /dev/null +++ b/account_check_deposit/account_type_data.xml @@ -0,0 +1,20 @@ + + + + + + + + + + Recieved Checks + recieved_check + none + + + +