[FIX] Formatting
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) 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/>
|
||||
#
|
||||
##############################################################################
|
||||
# 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>)
|
||||
# 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) 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/>.
|
||||
#
|
||||
##############################################################################
|
||||
# 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>)
|
||||
# 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,25 +1,20 @@
|
|||
<?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>
|
||||
|
||||
<!-- Groups - Bank Stmt Preparer , Bank Stmt Verifier -->
|
||||
<record id="group_bank_stmt_verifier" model="res.groups">
|
||||
<field name="name">Bank Statement Verifier</field>
|
||||
</record>
|
||||
|
||||
<record id="group_bank_stmt_preparer" model="res.groups">
|
||||
<field name="name">Bank Statement Preparer</field>
|
||||
</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"/>
|
||||
<field eval="True" name="global"/>
|
||||
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
</record>
|
||||
|
||||
<record id="group_bank_stmt_verifier" model="res.groups">
|
||||
<field name="name">Bank Statement Verifier</field>
|
||||
</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"/>
|
||||
<field eval="True" name="global"/>
|
||||
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
|
|
|
@ -1,230 +1,226 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<!-- Bank Account Reconciliation Statement -->
|
||||
<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>
|
||||
<field name="type">tree</field>
|
||||
<field name="priority">2</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Bank Account Reconciliation Statements" colors="grey:state=='cancel';blue:state in ('to_be_reviewed')">
|
||||
<field name="name"/>
|
||||
<field name="ending_date"/>
|
||||
<field name="account_id"/>
|
||||
<field name="verified_by_user_id"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="name">bank.acc.rec.statement.tree</field>
|
||||
<field name="model">bank.acc.rec.statement</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="priority">2</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Bank Account Reconciliation Statements" colors="grey:state=='cancel';blue:state in ('to_be_reviewed')">
|
||||
<field name="name"/>
|
||||
<field name="ending_date"/>
|
||||
<field name="account_id"/>
|
||||
<field name="verified_by_user_id"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_bank_acc_rec_statement_form" model="ir.ui.view">
|
||||
<record id="view_bank_acc_rec_statement_form" model="ir.ui.view">
|
||||
<field name="name">bank.acc.rec.statement.form</field>
|
||||
<field name="model">bank.acc.rec.statement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="model">bank.acc.rec.statement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Bank Account Reconciliation Statement" version="7.0">
|
||||
<header>
|
||||
<button name="action_cancel" type="object" states="draft,to_be_reviewed" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="action_review" type="object" states="draft" string="Ready for Review" icon="gtk-go-forward"/>
|
||||
<button name="action_process" type="object" states="to_be_reviewed" string="Process" icon="gtk-apply"/>
|
||||
<button name="action_cancel_draft" states="cancel,done" string="Set to Draft" type="object" icon="gtk-convert"/>
|
||||
<button name='refresh_record' string='Refresh' confirm="Current edits in statement will be lost. Do you want to refresh?" states="draft" type='object'/>
|
||||
<field name="state" widget="statusbar" nolabel="1"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<group col="4" colspan="4">
|
||||
<field name="account_id" placeholder="Enter Account Name" on_change="onchange_account_id(account_id, ending_date, suppress_ending_date_filter)"/>
|
||||
<field name="name" placeholder="Enter Name"/>
|
||||
<field name="ending_date" placeholder="Enter ending date" on_change="onchange_account_id(account_id, ending_date, suppress_ending_date_filter)"/>
|
||||
<field name="starting_balance" placeholder="Enter Starting Balance"/>
|
||||
<field name="ending_balance" placeholder="Enter Ending Balance"/>
|
||||
<field name="last_ending_date" placeholder="Last Statement Date" readonly="1"/>
|
||||
<field name="suppress_ending_date_filter" on_change="onchange_account_id(account_id, ending_date, suppress_ending_date_filter)"/>
|
||||
<field name="company_id" groups="base.group_multi_company" placeholder="Enter Company Name"/>
|
||||
</group>
|
||||
<notebook colspan="5">
|
||||
<page string="Journal Items">
|
||||
<label for='account_label' string='Deposits, Credits, and Interest'/>
|
||||
<field colspan="4" mode="tree" name="debit_move_line_ids" nolabel="1" widget="one2many_list" height="300">
|
||||
<form string="Deposits, Credits, and Interest" version="7.0">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1"/>
|
||||
<field name="research_required" readonly="1"/>
|
||||
</form>
|
||||
<tree string="Deposits, Credits, and Interest" editable="top" mute_additem="draft,to_be_reviewed,done, cancel">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1"/>
|
||||
<header>
|
||||
<button name="action_cancel" type="object" states="draft,to_be_reviewed" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="action_review" type="object" states="draft" string="Ready for Review" icon="gtk-go-forward"/>
|
||||
<button name="action_process" type="object" states="to_be_reviewed" string="Process" icon="gtk-apply"/>
|
||||
<button name="action_cancel_draft" states="cancel,done" string="Set to Draft" type="object" icon="gtk-convert"/>
|
||||
<button name='refresh_record' string='Refresh' confirm="Current edits in statement will be lost. Do you want to refresh?" states="draft" type='object'/>
|
||||
<field name="state" widget="statusbar" nolabel="1"/>
|
||||
</header>
|
||||
<sheet>
|
||||
<group col="4" colspan="4">
|
||||
<field name="account_id" placeholder="Enter Account Name" on_change="onchange_account_id(account_id, ending_date, suppress_ending_date_filter)"/>
|
||||
<field name="name" placeholder="Enter Name"/>
|
||||
<field name="ending_date" placeholder="Enter ending date" on_change="onchange_account_id(account_id, ending_date, suppress_ending_date_filter)"/>
|
||||
<field name="starting_balance" placeholder="Enter Starting Balance"/>
|
||||
<field name="ending_balance" placeholder="Enter Ending Balance"/>
|
||||
<field name="last_ending_date" placeholder="Last Statement Date" readonly="1"/>
|
||||
<field name="suppress_ending_date_filter" on_change="onchange_account_id(account_id, ending_date, suppress_ending_date_filter)"/>
|
||||
<field name="company_id" groups="base.group_multi_company" placeholder="Enter Company Name"/>
|
||||
</group>
|
||||
<notebook colspan="5">
|
||||
<page string="Journal Items">
|
||||
<label for='account_label' string='Deposits, Credits, and Interest'/>
|
||||
<field colspan="4" mode="tree" name="debit_move_line_ids" nolabel="1" widget="one2many_list" height="300">
|
||||
<form string="Deposits, Credits, and Interest" version="7.0">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1"/>
|
||||
<field name="research_required" readonly="1"/>
|
||||
</form>
|
||||
<tree string="Deposits, Credits, and Interest" editable="top" mute_additem="draft,to_be_reviewed,done, cancel">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1"/>
|
||||
<field name="research_required"/>
|
||||
<field name="move_line_id" readonly="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
<label for='account_label2' string='Checks, Withdrawals, Debits, and Service Charges'/>
|
||||
<field colspan="4" mode="tree" name="credit_move_line_ids" nolabel="1" widget="one2many_list" height="300">
|
||||
<form string="Checks, Withdrawals, Debits, and Service Charges" version="7.0">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1"/>
|
||||
<field name="research_required" readonly="1"/>
|
||||
</form>
|
||||
<tree string="Checks, Withdrawals, Debits, and Service Charges" editable="top" mute_additem="draft,to_be_reviewed,done, cancel">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1" />
|
||||
</tree>
|
||||
</field>
|
||||
<label for='account_label2' string='Checks, Withdrawals, Debits, and Service Charges'/>
|
||||
<field colspan="4" mode="tree" name="credit_move_line_ids" nolabel="1" widget="one2many_list" height="300">
|
||||
<form string="Checks, Withdrawals, Debits, and Service Charges" version="7.0">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1"/>
|
||||
<field name="research_required" readonly="1"/>
|
||||
</form>
|
||||
<tree string="Checks, Withdrawals, Debits, and Service Charges" editable="top" mute_additem="draft,to_be_reviewed,done, cancel">
|
||||
<field name="cleared_bank_account"/>
|
||||
<field name="date" readonly="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="ref" readonly="1"/>
|
||||
<field name="partner_id" readonly="1"/>
|
||||
<field name="amount" readonly="1"/>
|
||||
<field name="amountcur" readonly="1" />
|
||||
<field name="currency_id" readonly="1" />
|
||||
<field name="research_required"/>
|
||||
<field name="move_line_id" readonly="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
<group col="2" colspan="1" groups="ursa_npg_bank_account_reconciliation.group_bank_stmt_verifier">
|
||||
<button name="action_select_all" confirm="Current edits in statement will be lost. Do you want to select all?" type="object" states="draft,to_be_reviewed" string="Select All" icon="gtk-go-forward"/>
|
||||
<button name="action_unselect_all" confirm="Current edits in statement will be lost. Do you want to unselect all?" type="object" states="draft,to_be_reviewed" string="Unselect All" icon="gtk-cancel"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<separator string="Totals - Cleared and Uncleared" colspan="2"/>
|
||||
<group name="totals" col="4" colspan="4">
|
||||
</tree>
|
||||
</field>
|
||||
<group col="2" colspan="1" groups="ursa_npg_bank_account_reconciliation.group_bank_stmt_verifier">
|
||||
<button name="action_select_all" confirm="Current edits in statement will be lost. Do you want to select all?" type="object" states="draft,to_be_reviewed" string="Select All" icon="gtk-go-forward"/>
|
||||
<button name="action_unselect_all" confirm="Current edits in statement will be lost. Do you want to unselect all?" type="object" states="draft,to_be_reviewed" string="Unselect All" icon="gtk-cancel"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<separator string="Totals - Cleared and Uncleared" colspan="2"/>
|
||||
<group name="totals" col="4" colspan="4">
|
||||
|
||||
<group name="total1" col="2" colspan="2">
|
||||
<field name="sum_of_debits" />
|
||||
<field name="sum_of_debits_cur"/>
|
||||
<field name="sum_of_debits_lines"/>
|
||||
<field name="sum_of_credits" />
|
||||
<field name="sum_of_credits_cur"/>
|
||||
<field name="sum_of_credits_lines"/>
|
||||
</group>
|
||||
<group name="total2" col="2" colspan="2">
|
||||
<field name="sum_of_udebits" />
|
||||
<field name="sum_of_udebits_cur"/>
|
||||
<field name="sum_of_udebits_lines"/>
|
||||
<field name="sum_of_ucredits" />
|
||||
<field name="sum_of_ucredits_cur"/>
|
||||
<field name="sum_of_ucredits_lines"/>
|
||||
</group>
|
||||
</group>
|
||||
<newline />
|
||||
<separator string="Balances - Cleared and Uncleared"/>
|
||||
<group name="balances" col="4" colspan="4">
|
||||
<group name="balance1" col="2" colspan="2">
|
||||
<field name="cleared_balance" />
|
||||
<field name="cleared_balance_cur" attrs="{'invisible':[('cleared_balance_cur','=', 0.0)]}"/>
|
||||
<field name="difference" />
|
||||
<field name="difference_cur" attrs="{'invisible':[('cleared_balance_cur','=', 0.0)]}"/>
|
||||
</group>
|
||||
<group name="balance2" col="2" colspan="2">
|
||||
<field name="uncleared_balance" />
|
||||
<field name="uncleared_balance_cur" attrs="{'invisible':[('uncleared_balance_cur','=', 0.0)]}"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Other Information">
|
||||
<separator string="Tracking Information" colspan="4"/>
|
||||
<group name="total1" col="2" colspan="2">
|
||||
<field name="sum_of_debits" />
|
||||
<field name="sum_of_debits_cur"/>
|
||||
<field name="sum_of_debits_lines"/>
|
||||
<field name="sum_of_credits" />
|
||||
<field name="sum_of_credits_cur"/>
|
||||
<field name="sum_of_credits_lines"/>
|
||||
</group>
|
||||
<group name="total2" col="2" colspan="2">
|
||||
<field name="sum_of_udebits" />
|
||||
<field name="sum_of_udebits_cur"/>
|
||||
<field name="sum_of_udebits_lines"/>
|
||||
<field name="sum_of_ucredits" />
|
||||
<field name="sum_of_ucredits_cur"/>
|
||||
<field name="sum_of_ucredits_lines"/>
|
||||
</group>
|
||||
</group>
|
||||
<newline />
|
||||
<separator string="Balances - Cleared and Uncleared"/>
|
||||
<group name="balances" col="4" colspan="4">
|
||||
<group name="balance1" col="2" colspan="2">
|
||||
<field name="cleared_balance" />
|
||||
<field name="cleared_balance_cur" attrs="{'invisible':[('cleared_balance_cur','=', 0.0)]}"/>
|
||||
<field name="difference" />
|
||||
<field name="difference_cur" attrs="{'invisible':[('cleared_balance_cur','=', 0.0)]}"/>
|
||||
</group>
|
||||
<group name="balance2" col="2" colspan="2">
|
||||
<field name="uncleared_balance" />
|
||||
<field name="uncleared_balance_cur" attrs="{'invisible':[('uncleared_balance_cur','=', 0.0)]}"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Other Information">
|
||||
<separator string="Tracking Information" colspan="4"/>
|
||||
<group colspan="2" col="2">
|
||||
<field name="verified_by_user_id" placeholder="Enter user whoever varified"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<field name="verified_date" placeholder="Enter date of varification"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field name="notes" nolabel="1" placeholder="Enter notes about reconciliation"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
<field name="verified_by_user_id" placeholder="Enter user whoever varified"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<field name="verified_date" placeholder="Enter date of varification"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field name="notes" nolabel="1" placeholder="Enter notes about reconciliation"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_bank_acc_rec_statement_filter" model="ir.ui.view">
|
||||
<field name="name">bank.acc.rec.statement.select</field>
|
||||
<field name="model">bank.acc.rec.statement</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Bank Account Reconciliation Statements">
|
||||
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Statements that haven't yet been confirmed"/>
|
||||
<filter icon="terp-dolar" string="To be Reviewed" domain="[('state','=','to_be_reviewed')]" help="Statements that are ready for review"/>
|
||||
<filter icon="terp-check" string="Done" domain="[('state','=','done')]" help="Statements that have been processed"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="ending_date" select="1" string="Ending Date" />
|
||||
<field name="account_id" select="1"/>
|
||||
<field name="verified_by_user_id" select="1">
|
||||
<filter domain="[('verified_by_user_id','=',uid)]" help="Verified by me" icon="terp-personal"/>
|
||||
</field>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
|
||||
<filter string="Account" icon="terp-personal" domain="[]" context="{'group_by':'account_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_bank_acc_rec_statement_filter" model="ir.ui.view">
|
||||
<field name="name">bank.acc.rec.statement.select</field>
|
||||
<field name="model">bank.acc.rec.statement</field>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Bank Account Reconciliation Statements">
|
||||
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Statements that haven't yet been confirmed"/>
|
||||
<filter icon="terp-dolar" string="To be Reviewed" domain="[('state','=','to_be_reviewed')]" help="Statements that are ready for review"/>
|
||||
<filter icon="terp-check" string="Done" domain="[('state','=','done')]" help="Statements that have been processed"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="ending_date" select="1" string="Ending Date" />
|
||||
<field name="account_id" select="1"/>
|
||||
<field name="verified_by_user_id" select="1">
|
||||
<filter domain="[('verified_by_user_id','=',uid)]" help="Verified by me" icon="terp-personal"/>
|
||||
</field>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
|
||||
<filter string="Account" icon="terp-personal" domain="[]" context="{'group_by':'account_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_bank_acc_rec_statement" model="ir.actions.act_window">
|
||||
<field name="name">Bank Statements</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">bank.acc.rec.statement</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_bank_acc_rec_statement_filter"/>
|
||||
</record>
|
||||
<record id="action_bank_acc_rec_statement" model="ir.actions.act_window">
|
||||
<field name="name">Bank Statements</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">bank.acc.rec.statement</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_bank_acc_rec_statement_filter"/>
|
||||
</record>
|
||||
|
||||
<record id="account.menu_bank_statement_tree" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(4,ref('base.group_system'))]"/>
|
||||
</record>
|
||||
<record id="account.menu_bank_statement_tree" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(4,ref('base.group_system'))]"/>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
icon="STOCK_JUSTIFY_FILL"
|
||||
action="action_bank_acc_rec_statement"
|
||||
id="npg_bank_acc_rec_statement_menu"
|
||||
parent="account.menu_finance_bank_and_cash"
|
||||
sequence="5"/>
|
||||
<menuitem
|
||||
icon="STOCK_JUSTIFY_FILL"
|
||||
action="action_bank_acc_rec_statement"
|
||||
id="npg_bank_acc_rec_statement_menu"
|
||||
parent="account.menu_finance_bank_and_cash"
|
||||
sequence="5"/>
|
||||
|
||||
<act_window
|
||||
id="act_account_move_line_to_add"
|
||||
name="Journal Items"
|
||||
res_model="account.move.line"
|
||||
src_model="bank.acc.rec.statement"/>
|
||||
id="act_account_move_line_to_add"
|
||||
name="Journal Items"
|
||||
res_model="account.move.line"
|
||||
src_model="bank.acc.rec.statement"/>
|
||||
|
||||
<act_window
|
||||
id="act_supplier_payment_to_add"
|
||||
name="Supplier Payment"
|
||||
domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]"
|
||||
context="{'type':'payment'}"
|
||||
res_model="account.voucher"
|
||||
src_model="bank.acc.rec.statement"/>
|
||||
<act_window
|
||||
id="act_supplier_payment_to_add"
|
||||
name="Supplier Payment"
|
||||
domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]"
|
||||
context="{'type':'payment'}"
|
||||
res_model="account.voucher"
|
||||
src_model="bank.acc.rec.statement"/>
|
||||
|
||||
<act_window
|
||||
id="act_customer_payment_to_add"
|
||||
name="Customer Payment"
|
||||
domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]"
|
||||
context="{'type':'receipt'}"
|
||||
res_model="account.voucher"
|
||||
src_model="bank.acc.rec.statement"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
<act_window
|
||||
id="act_customer_payment_to_add"
|
||||
name="Customer Payment"
|
||||
domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]"
|
||||
context="{'type':'receipt'}"
|
||||
res_model="account.voucher"
|
||||
src_model="bank.acc.rec.statement"/>
|
||||
|
||||
</odoo>
|
||||
|
|
|
@ -1,40 +1,36 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<!--- Journal Items -->
|
||||
<odoo>
|
||||
<!--- Journal Items -->
|
||||
|
||||
<record id="view_account_move_line_bank_acc_rec_statement_id" model="ir.ui.view">
|
||||
<field name="name">account.move.line.bank.acc.rec.statement.id</field>
|
||||
<field name="model">account.move.line</field>
|
||||
<field name="inherit_id" ref="account.view_account_move_line_filter"/>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="period_id" position="after">
|
||||
<field name="bank_acc_rec_statement_id"/>
|
||||
</field>
|
||||
<field name="move_id" position="before">
|
||||
<filter icon="terp-document-new" string="Uncleared Bank Account" domain="[('cleared_bank_account','=',False)]" help="Journal Entries not cleared"/>
|
||||
<separator orientation="vertical"/>
|
||||
</field>
|
||||
<record id="view_account_move_line_bank_acc_rec_statement_id" model="ir.ui.view">
|
||||
<field name="name">account.move.line.bank.acc.rec.statement.id</field>
|
||||
<field name="model">account.move.line</field>
|
||||
<field name="inherit_id" ref="account.view_account_move_line_filter"/>
|
||||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="period_id" position="after">
|
||||
<field name="bank_acc_rec_statement_id"/>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_move_line_bank_acc_rec_statement_id_form" model="ir.ui.view">
|
||||
<field name="name">account.move.line.bank.acc.rec.statement.id.form</field>
|
||||
<field name="model">account.move.line</field>
|
||||
<field name="inherit_id" ref="account.view_move_line_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="statement_id" position="after">
|
||||
<field name="bank_acc_rec_statement_id"/>
|
||||
</field>
|
||||
<field name="blocked" position="after">
|
||||
<field name="cleared_bank_account"/>
|
||||
</field>
|
||||
<field name="move_id" position="before">
|
||||
<filter icon="terp-document-new" string="Uncleared Bank Account" domain="[('cleared_bank_account','=',False)]" help="Journal Entries not cleared"/>
|
||||
<separator orientation="vertical"/>
|
||||
</field>
|
||||
</record>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_move_line_bank_acc_rec_statement_id_form" model="ir.ui.view">
|
||||
<field name="name">account.move.line.bank.acc.rec.statement.id.form</field>
|
||||
<field name="model">account.move.line</field>
|
||||
<field name="inherit_id" ref="account.view_move_line_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="statement_id" position="after">
|
||||
<field name="bank_acc_rec_statement_id"/>
|
||||
</field>
|
||||
<field name="blocked" position="after">
|
||||
<field name="cleared_bank_account"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
Loading…
Reference in New Issue