Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[13.0][MIG] account_banking_reconciliation #506

Open
wants to merge 32 commits into
base: 13.0
Choose a base branch
from
Open

[13.0][MIG] account_banking_reconciliation #506

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e717356
[ADD] account_banking_reconciliation
May 22, 2017
cc680e8
[FIX] Formatting
May 22, 2017
352de9a
[FIX] Formatting
May 22, 2017
f5bb7fe
[MIG10] migrate account-banking-reconciliation module to odoo v10, in…
May 31, 2017
5762473
[MIG]FIX formatting
May 31, 2017
a91aa9e
[MIG] FIX XML Formatting using space instead tab
Jun 1, 2017
f8c46ca
[MIG] FIX XML Formatting using pycharm
Jun 1, 2017
1bf049f
[MIG] FIX PY Formatting
Jun 1, 2017
c795156
[MIG]FIX PY FORMATTING
Jun 1, 2017
5ec8dc2
[IMP] Reference to authors in source code
Jun 7, 2017
9e46ca4
[FIX] Travis errors
Aug 27, 2017
c9208ee
[IMP] Add newline at EOF
Aug 27, 2017
3943864
[IMP] api.one is deprecated
Aug 27, 2017
8e070b0
[IMP] code and fixup
Jan 11, 2019
a900a9f
[fixup]
Jan 11, 2019
808eeea
[fixup] line_ids and statement_line_ids
Jan 11, 2019
5f03fa1
[UPD] Update account_banking_reconciliation.pot
oca-travis May 20, 2019
f1688a2
[WIP][MIG][11.0] account_banking_reconciliation
murtuzasaleh May 25, 2019
3eb7689
[IMP] account_banking_reconciliation: view, security and documentation
max3903 May 31, 2019
4e9dd37
[UPD] Update account_banking_reconciliation.pot
oca-travis Jul 8, 2019
f1387e8
[UPD] README.rst
OCA-git-bot Jul 8, 2019
6f00600
[12.0][MIG] account_banking_reconciliation
murtuzasaleh Jul 9, 2019
b5f0439
[UPD] Update account_banking_reconciliation.pot
oca-travis Jul 12, 2019
3d3543f
[UPD] README.rst
OCA-git-bot Jul 12, 2019
c8c88fa
[UPD] README.rst
OCA-git-bot Jul 29, 2019
c2e85a9
Added translation using Weblate (Spanish (Ecuador))
ovnicraft Aug 30, 2019
76e967f
Added translation using Weblate (Portuguese)
alvarorib Apr 7, 2020
6b1dd16
Translated using Weblate (Portuguese)
alvarorib Apr 7, 2020
5d5df61
[FIX] account_banking_reconciliation: correct development_status key
MiquelRForgeFlow Jun 8, 2022
a84d157
[UPD] README.rst
OCA-git-bot Jun 8, 2022
ca23658
[IMP] account_banking_reconciliation: black, isort, prettier
JevinD Oct 26, 2020
c00c9a6
[MIG] account_banking_reconciliation: Migration to 13.0
JevinD Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[MIG] FIX XML Formatting using space instead tab
  • Loading branch information
@MiquelRForgeFlow
Sandip Mangukiya authored and MiquelRForgeFlow committed Jul 3, 2023
commit a91aa9e26d4eadae7a45e6b59d7edadfbe6a8e8e
30 changes: 11 additions & 19 deletions account_banking_reconciliation/report/bank_statement_report.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- QWeb Reports -->
<report
id="bank_statement_detail"
model="bank.acc.rec.statement"
string="Bank Statement-Detail"
report_type="qweb-pdf"
name="account_banking_reconciliation.report_bank_statement_detail"
file="account_banking_reconciliation.report_bank_statement_detail"
attachment="'Detail Statement-'+(object.name)+'.pdf'"
/>
<report
id="bank_statement_summary"
model="bank.acc.rec.statement"
string="Bank Statement-Summary"
report_type="qweb-pdf"
name="account_banking_reconciliation.report_bank_statement_summary"
file="account_banking_reconciliation.report_bank_statement_summary"
attachment="'Summary Statement-'+(object.name)+'.pdf'"
/>
<!-- QWeb Reports -->
<report id="bank_statement_detail" model="bank.acc.rec.statement"
string="Bank Statement-Detail" report_type="qweb-pdf"
name="account_banking_reconciliation.report_bank_statement_detail"
file="account_banking_reconciliation.report_bank_statement_detail"
attachment="'Detail Statement-'+(object.name)+'.pdf'" />
<report id="bank_statement_summary" model="bank.acc.rec.statement"
string="Bank Statement-Summary" report_type="qweb-pdf"
name="account_banking_reconciliation.report_bank_statement_summary"
file="account_banking_reconciliation.report_bank_statement_summary"
attachment="'Summary Statement-'+(object.name)+'.pdf'" />
</odoo>
7 changes: 4 additions & 3 deletions account_banking_reconciliation/security/account_banking_reconciliation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
<!-- 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>
<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>

</odoo>
264 changes: 142 additions & 122 deletions account_banking_reconciliation/views/account_banking_reconciliation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<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 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>
Expand All @@ -25,129 +26,155 @@
<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="fa-ban"/>
<button name="action_review" type="object" states="draft" string="Ready for Review" icon="fa-forward"/>
<button name="action_process" type="object" states="to_be_reviewed" string="Process"/>
<button name="action_cancel_draft" states="cancel,done" string="Set to Draft" type="object"/>
<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"/>
<button name="action_cancel" type="object" states="draft,to_be_reviewed"
string="Cancel" icon="fa-ban" />
<button name="action_review" type="object" states="draft"
string="Ready for Review" icon="fa-forward" />
<button name="action_process" type="object" states="to_be_reviewed"
string="Process" />
<button name="action_cancel_draft" states="cancel,done"
string="Set to Draft" type="object" />
<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"/>
<field name="name" placeholder="Enter Name"/>
<field name="ending_date" placeholder="Enter ending date"/>
<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"/>
<field name="company_id" groups="base.group_multi_company" placeholder="Enter Company Name"/>
<field name="account_id" placeholder="Enter Account Name" />
<field name="name" placeholder="Enter Name" />
<field name="ending_date" placeholder="Enter ending date" />
<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" />
<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">
<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="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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<field name="research_required" />
<field name="move_line_id" readonly="1" />
</tree>
</field>
<group col="2" colspan="1" groups="account_banking_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 col="2" colspan="1"
groups="account_banking_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"/>
<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_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"/>
<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_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"/>
<field name="sum_of_ucredits_cur" />
<field name="sum_of_ucredits_lines" />
</group>
</group>
<newline />
<separator string="Balances - Cleared and Uncleared"/>
<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="cleared_balance_cur"
attrs="{'invisible':[('cleared_balance_cur','=', 0.0)]}" />
<field name="difference" />
<field name="difference_cur" attrs="{'invisible':[('cleared_balance_cur','=', 0.0)]}"/>
<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)]}"/>
<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"/>
<separator string="Tracking Information" colspan="4" />
<group colspan="2" col="2">
<field name="verified_by_user_id" placeholder="Enter user whoever varified"/>
<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"/>
<field name="verified_date" placeholder="Enter date of varification" />
</group>
</page>
<page string="Notes">
<field name="notes" nolabel="1" placeholder="Enter notes about reconciliation"/>
<field name="notes" nolabel="1"
placeholder="Enter notes about reconciliation" />
</page>
</notebook>
</sheet>
Expand All @@ -161,21 +188,28 @@
<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"/>
<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="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"/>
<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'}"/>
<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>
Expand All @@ -187,40 +221,26 @@
<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"/>
<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_configuration"
sequence="5"/>
<menuitem icon="STOCK_JUSTIFY_FILL" action="action_bank_acc_rec_statement"
id="npg_bank_acc_rec_statement_menu" parent="account.menu_finance_configuration"
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"/>
<act_window 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"/>
<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>
Loading