[FIX] Formatting
Maxime Chambreuil
Murtuza Saleh
parent
4feca3bc65
commit
7c40c48090
|
|
@ -1,25 +1,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2014 Ursa Information Systems (<http://www.ursainfosystems.com>)
|
||||
# Copyright (C) 2015 Ursa Information Systems (http://www.ursainfosystems.com>)
|
||||
# Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
|
||||
# Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
|
||||
#
|
||||
# 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 <http://www.gnu.org/licenses/>
|
||||
#
|
||||
##############################################################################
|
||||
# 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:
|
||||
|
|
@ -1,37 +1,15 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2015 Ursa Information Systems (http://www.ursainfosystems.com>)
|
||||
# Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
|
||||
# Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.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 <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
# 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:
|
||||
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')
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<odoo>
|
||||
<report
|
||||
id="bank_statement_detail"
|
||||
model="bank.acc.rec.statement"
|
||||
|
|
@ -15,5 +14,4 @@
|
|||
string="Bank Statement-Summary"
|
||||
rml="npg_bank_account_reconciliation/bank_statement_summary.rml"
|
||||
attachment="'Summary Statement-'+(object.name)"/>
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<odoo>
|
||||
<!-- Groups - Bank Stmt Preparer , Bank Stmt Verifier -->
|
||||
|
||||
<record id="group_bank_stmt_preparer" model="res.groups">
|
||||
<field name="name">Bank Statement Preparer</field>
|
||||
</record>
|
||||
|
|
@ -13,7 +10,6 @@
|
|||
</record>
|
||||
|
||||
<!-- Security Rule for Bank Rec Stmts -->
|
||||
|
||||
<record id="npg_bank_account_reconciliation_comp_rule" model="ir.rule">
|
||||
<field name="name">Bank Statements</field>
|
||||
<field ref="model_bank_acc_rec_statement" name="model_id"/>
|
||||
|
|
@ -21,5 +17,4 @@
|
|||
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<odoo>
|
||||
|
||||
<!-- Bank Account Reconciliation Statement -->
|
||||
|
||||
<record id="view_bank_acc_rec_statement_tree" model="ir.ui.view">
|
||||
<field name="name">bank.acc.rec.statement.tree</field>
|
||||
<field name="model">bank.acc.rec.statement</field>
|
||||
|
|
@ -225,6 +223,4 @@
|
|||
res_model="account.voucher"
|
||||
src_model="bank.acc.rec.statement"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<odoo>
|
||||
<!--- Journal Items -->
|
||||
|
||||
<record id="view_account_move_line_bank_acc_rec_statement_id" model="ir.ui.view">
|
||||
|
|
@ -34,7 +33,4 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
Loading…
Reference in New Issue