diff --git a/account_banking_reconciliation/models/account_banking_reconciliation.py b/account_banking_reconciliation/models/account_banking_reconciliation.py index d7991fd1..c7416d8c 100644 --- a/account_banking_reconciliation/models/account_banking_reconciliation.py +++ b/account_banking_reconciliation/models/account_banking_reconciliation.py @@ -1,25 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2014 Ursa Information Systems () -# Copyright (C) 2011 NovaPoint Group LLC () -# Copyright (C) 2004-2010 OpenERP SA () -# -# 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 -# -############################################################################## +# Copyright (C) 2015 Ursa Information Systems (http://www.ursainfosystems.com>) +# Copyright (C) 2011 NovaPoint Group LLC () +# Copyright (C) 2004-2010 OpenERP SA () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). import time from openerp.osv import fields, osv @@ -27,6 +10,7 @@ from openerp.tools.translate import _ import openerp.addons.decimal_precision as dp from operator import itemgetter + class bank_acc_rec_statement(osv.osv): def check_group(self, cr, uid, ids, context=None): """Check if following security constraints are implemented for groups: @@ -426,7 +410,7 @@ class bank_acc_rec_statement(osv.osv): _sql_constraints = [ ('name_company_uniq', 'unique (name, company_id, account_id)', 'The name of the statement must be unique per company and G/L account!') ] -bank_acc_rec_statement() + class bank_acc_rec_statement_line(osv.osv): _name = "bank.acc.rec.statement.line" @@ -467,7 +451,3 @@ class bank_acc_rec_statement_line(osv.osv): 'bank_acc_rec_statement_id': False, }, context=context) return super(bank_acc_rec_statement_line, self).unlink(cr, uid, ids, context=context) - -bank_acc_rec_statement_line() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/account_banking_reconciliation/models/account_move_line.py b/account_banking_reconciliation/models/account_move_line.py index c6f8dea1..fa389fc2 100644 --- a/account_banking_reconciliation/models/account_move_line.py +++ b/account_banking_reconciliation/models/account_move_line.py @@ -1,37 +1,15 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2011 NovaPoint Group LLC () -# Copyright (C) 2004-2010 OpenERP SA () -# -# 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 . -# -############################################################################## +# Copyright (C) 2015 Ursa Information Systems (http://www.ursainfosystems.com>) +# Copyright (C) 2011 NovaPoint Group LLC () +# Copyright (C) 2004-2010 OpenERP SA () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp.osv import fields,osv +from odoo import fields, models -class account_move_line(osv.osv): + +class AccountMoveLine(models.Model): _inherit='account.move.line' - _columns = { - 'cleared_bank_account': fields.boolean('Cleared? ', help='Check if the transaction has cleared from the bank'), - 'bank_acc_rec_statement_id': fields.many2one('bank.acc.rec.statement', 'Bank Acc Rec Statement', help="The Bank Acc Rec Statement linked with the journal item"), - 'draft_assigned_to_statement': fields.boolean('Assigned to Statement? ', help='Check if the move line is assigned to statement lines') - } - - -account_move_line() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file + cleared_bank_account = fields.Boolean(string='Cleared? ', help='Check if the transaction has cleared from the bank'), + bank_acc_rec_statement_id = fields.Many2one('bank.acc.rec.statement', string='Bank Acc Rec Statement', help="The Bank Acc Rec Statement linked with the journal item"), + draft_assigned_to_statement = fields.Noolean(string='Assigned to Statement? ', help='Check if the move line is assigned to statement lines') diff --git a/account_banking_reconciliation/report/bank_statement_report.xml b/account_banking_reconciliation/report/bank_statement_report.xml index cb72d073..34fe0373 100644 --- a/account_banking_reconciliation/report/bank_statement_report.xml +++ b/account_banking_reconciliation/report/bank_statement_report.xml @@ -1,6 +1,5 @@ - - + - - + diff --git a/account_banking_reconciliation/security/account_banking_reconciliation.xml b/account_banking_reconciliation/security/account_banking_reconciliation.xml index eff450eb..a0acd076 100644 --- a/account_banking_reconciliation/security/account_banking_reconciliation.xml +++ b/account_banking_reconciliation/security/account_banking_reconciliation.xml @@ -1,25 +1,20 @@ - - + + + + Bank Statement Preparer + - + + Bank Statement Verifier + - - Bank Statement Preparer - + + + Bank Statements + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + - - Bank Statement Verifier - - - - - - Bank Statements - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - - - \ No newline at end of file + diff --git a/account_banking_reconciliation/views/account_banking_reconciliation.xml b/account_banking_reconciliation/views/account_banking_reconciliation.xml index 63901753..9938cc72 100644 --- a/account_banking_reconciliation/views/account_banking_reconciliation.xml +++ b/account_banking_reconciliation/views/account_banking_reconciliation.xml @@ -1,230 +1,226 @@ - - - - + + - bank.acc.rec.statement.tree - bank.acc.rec.statement - tree - 2 - - - - - - - - - + bank.acc.rec.statement.tree + bank.acc.rec.statement + tree + 2 + + + + + + + + + - + bank.acc.rec.statement.form - bank.acc.rec.statement - form - + bank.acc.rec.statement + form +
-
-
- - - - - - - - - - - - - -