Techsystech
/
account-reconcile
mirror of https://github.com/OCA/account-reconcile.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MIG] FIX XML Formatting using pycharm

pull/268/head
Sandip Mangukiya 2017-06-01 13:12:04 +05:30 committed by Murtuza Saleh
parent 93a864d1d8
commit 4070cd5531
6 changed files with 1089 additions and 1018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
account_banking_reconciliation/security/account_banking_reconciliation.xml
View File

@ -14,7 +14,8 @@
<field name="name">Bank Statements</field> <field name="name">Bank Statements</field>
<field ref="model_bank_acc_rec_statement" name="model_id"/> <field ref="model_bank_acc_rec_statement" name="model_id"/>
<field eval="True" name="global"/> <field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] <field name="domain_force">
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
</field> </field>
</record> </record>

101
account_banking_reconciliation/views/account_banking_reconciliation.xml
View File

@ -26,11 +26,13 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bank Account Reconciliation Statement" version="7.0"> <form string="Bank Account Reconciliation Statement" version="7.0">
<header> <header>
<button name="action_cancel" type="object" states="draft,to_be_reviewed" <button name="action_cancel" type="object"
states="draft,to_be_reviewed"
string="Cancel" icon="fa-ban"/> string="Cancel" icon="fa-ban"/>
<button name="action_review" type="object" states="draft" <button name="action_review" type="object" states="draft"
string="Ready for Review" icon="fa-forward"/> string="Ready for Review" icon="fa-forward"/>
<button name="action_process" type="object" states="to_be_reviewed" <button name="action_process" type="object"
states="to_be_reviewed"
string="Process"/> string="Process"/>
<button name="action_cancel_draft" states="cancel,done" <button name="action_cancel_draft" states="cancel,done"
string="Set to Draft" type="object"/> string="Set to Draft" type="object"/>
@ -41,23 +43,33 @@
</header> </header>
<sheet> <sheet>
<group col="4" colspan="4"> <group col="4" colspan="4">
<field name="account_id" placeholder="Enter Account Name" /> <field name="account_id"
placeholder="Enter Account Name"/>
<field name="name" placeholder="Enter Name"/> <field name="name" placeholder="Enter Name"/>
<field name="ending_date" placeholder="Enter ending date" /> <field name="ending_date"
<field name="starting_balance" placeholder="Enter Starting Balance" /> placeholder="Enter ending date"/>
<field name="ending_balance" placeholder="Enter Ending Balance" /> <field name="starting_balance"
<field name="last_ending_date" placeholder="Last Statement Date" placeholder="Enter Starting Balance"/>
<field name="ending_balance"
placeholder="Enter Ending Balance"/>
<field name="last_ending_date"
placeholder="Last Statement Date"
readonly="1"/> readonly="1"/>
<field name="suppress_ending_date_filter"/> <field name="suppress_ending_date_filter"/>
<field name="company_id" groups="base.group_multi_company" <field name="company_id"
groups="base.group_multi_company"
placeholder="Enter Company Name"/> placeholder="Enter Company Name"/>
</group> </group>
<notebook colspan="5"> <notebook colspan="5">
<page string="Journal Items"> <page string="Journal Items">
<label for='account_label' string='Deposits, Credits, and Interest' /> <label for='account_label'
<field colspan="4" mode="tree" name="debit_move_line_ids" string='Deposits, Credits, and Interest'/>
nolabel="1" widget="one2many_list" height="300"> <field colspan="4" mode="tree"
<form string="Deposits, Credits, and Interest" version="7.0"> 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="cleared_bank_account"/>
<field name="date" readonly="1"/> <field name="date" readonly="1"/>
<field name="name" readonly="1"/> <field name="name" readonly="1"/>
@ -66,9 +78,11 @@
<field name="amount" readonly="1"/> <field name="amount" readonly="1"/>
<field name="amountcur" readonly="1"/> <field name="amountcur" readonly="1"/>
<field name="currency_id" readonly="1"/> <field name="currency_id" readonly="1"/>
<field name="research_required" readonly="1" /> <field name="research_required"
readonly="1"/>
</form> </form>
<tree string="Deposits, Credits, and Interest" editable="top" <tree string="Deposits, Credits, and Interest"
editable="top"
mute_additem="draft,to_be_reviewed,done, cancel"> mute_additem="draft,to_be_reviewed,done, cancel">
<field name="cleared_bank_account"/> <field name="cleared_bank_account"/>
<field name="date" readonly="1"/> <field name="date" readonly="1"/>
@ -84,8 +98,10 @@
</field> </field>
<label for='account_label2' <label for='account_label2'
string='Checks, Withdrawals, Debits, and Service Charges'/> string='Checks, Withdrawals, Debits, and Service Charges'/>
<field colspan="4" mode="tree" name="credit_move_line_ids" <field colspan="4" mode="tree"
nolabel="1" widget="one2many_list" height="300"> name="credit_move_line_ids"
nolabel="1" widget="one2many_list"
height="300">
<form string="Checks, Withdrawals, Debits, and Service Charges" <form string="Checks, Withdrawals, Debits, and Service Charges"
version="7.0"> version="7.0">
<field name="cleared_bank_account"/> <field name="cleared_bank_account"/>
@ -96,10 +112,12 @@
<field name="amount" readonly="1"/> <field name="amount" readonly="1"/>
<field name="amountcur" readonly="1"/> <field name="amountcur" readonly="1"/>
<field name="currency_id" readonly="1"/> <field name="currency_id" readonly="1"/>
<field name="research_required" readonly="1" /> <field name="research_required"
readonly="1"/>
</form> </form>
<tree string="Checks, Withdrawals, Debits, and Service Charges" <tree string="Checks, Withdrawals, Debits, and Service Charges"
editable="top" mute_additem="draft,to_be_reviewed,done, cancel"> editable="top"
mute_additem="draft,to_be_reviewed,done, cancel">
<field name="cleared_bank_account"/> <field name="cleared_bank_account"/>
<field name="date" readonly="1"/> <field name="date" readonly="1"/>
<field name="name" readonly="1"/> <field name="name" readonly="1"/>
@ -116,11 +134,15 @@
groups="account_banking_reconciliation.group_bank_stmt_verifier"> groups="account_banking_reconciliation.group_bank_stmt_verifier">
<button name="action_select_all" <button name="action_select_all"
confirm="Current edits in statement will be lost. Do you want to 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" type="object"
states="draft,to_be_reviewed"
string="Select All"
icon="gtk-go-forward"/> icon="gtk-go-forward"/>
<button name="action_unselect_all" <button name="action_unselect_all"
confirm="Current edits in statement will be lost. Do you want to 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" type="object"
states="draft,to_be_reviewed"
string="Unselect All"
icon="gtk-cancel"/> icon="gtk-cancel"/>
</group> </group>
<newline/> <newline/>
@ -146,7 +168,8 @@
</group> </group>
</group> </group>
<newline/> <newline/>
<separator string="Balances - Cleared and Uncleared" /> <separator
string="Balances - Cleared and Uncleared"/>
<group name="balances" col="4" colspan="4"> <group name="balances" col="4" colspan="4">
<group name="balance1" col="2" colspan="2"> <group name="balance1" col="2" colspan="2">
<field name="cleared_balance"/> <field name="cleared_balance"/>
@ -164,12 +187,15 @@
</group> </group>
</page> </page>
<page string="Other Information"> <page string="Other Information">
<separator string="Tracking Information" colspan="4" /> <separator string="Tracking Information"
colspan="4"/>
<group colspan="2" col="2"> <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>
<group colspan="2" col="2"> <group colspan="2" col="2">
<field name="verified_date" placeholder="Enter date of varification" /> <field name="verified_date"
placeholder="Enter date of varification"/>
</group> </group>
</page> </page>
<page string="Notes"> <page string="Notes">
@ -189,17 +215,21 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Bank Account Reconciliation Statements"> <search string="Search Bank Account Reconciliation Statements">
<filter icon="terp-document-new" string="Draft" <filter icon="terp-document-new" string="Draft"
domain="[('state','=','draft')]" help="Statements that haven't yet been confirmed" /> domain="[('state','=','draft')]"
help="Statements that haven't yet been confirmed"/>
<filter icon="terp-dolar" string="To be Reviewed" <filter icon="terp-dolar" string="To be Reviewed"
domain="[('state','=','to_be_reviewed')]" help="Statements that are ready for review" /> domain="[('state','=','to_be_reviewed')]"
<filter icon="terp-check" string="Done" domain="[('state','=','done')]" help="Statements that are ready for review"/>
<filter icon="terp-check" string="Done"
domain="[('state','=','done')]"
help="Statements that have been processed"/> help="Statements that have been processed"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="ending_date" select="1" string="Ending Date"/> <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"> <field name="verified_by_user_id" select="1">
<filter domain="[('verified_by_user_id','=',uid)]" help="Verified by me" <filter domain="[('verified_by_user_id','=',uid)]"
help="Verified by me"
icon="terp-personal"/> icon="terp-personal"/>
</field> </field>
<newline/> <newline/>
@ -208,7 +238,8 @@
<filter string="Account" icon="terp-personal" domain="[]" <filter string="Account" icon="terp-personal" domain="[]"
context="{'group_by':'account_id'}"/> context="{'group_by':'account_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" <filter string="State"
icon="terp-stock_effects-object-colorize"
domain="[]" context="{'group_by':'state'}"/> domain="[]" context="{'group_by':'state'}"/>
</group> </group>
</search> </search>
@ -229,18 +260,22 @@
<!-- </record> --> <!-- </record> -->
<menuitem icon="STOCK_JUSTIFY_FILL" action="action_bank_acc_rec_statement" <menuitem icon="STOCK_JUSTIFY_FILL" action="action_bank_acc_rec_statement"
id="npg_bank_acc_rec_statement_menu" parent="account.menu_finance_configuration" id="npg_bank_acc_rec_statement_menu"
parent="account.menu_finance_configuration"
sequence="5"/> sequence="5"/>
<act_window id="act_account_move_line_to_add" name="Journal Items" <act_window id="act_account_move_line_to_add" name="Journal Items"
res_model="account.move.line" src_model="bank.acc.rec.statement" /> res_model="account.move.line"
src_model="bank.acc.rec.statement"/>
<act_window id="act_supplier_payment_to_add" name="Supplier Payment" <act_window id="act_supplier_payment_to_add" name="Supplier Payment"
domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]" domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]"
context="{'type':'payment'}" res_model="account.voucher" src_model="bank.acc.rec.statement" /> context="{'type':'payment'}" res_model="account.voucher"
src_model="bank.acc.rec.statement"/>
<act_window id="act_customer_payment_to_add" name="Customer Payment" <act_window id="act_customer_payment_to_add" name="Customer Payment"
domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]" domain="[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]"
context="{'type':'receipt'}" res_model="account.voucher" src_model="bank.acc.rec.statement" /> context="{'type':'receipt'}" res_model="account.voucher"
src_model="bank.acc.rec.statement"/>
</odoo> </odoo>

6
account_banking_reconciliation/views/account_move_line.xml
View File

@ -13,8 +13,10 @@
<field name="bank_acc_rec_statement_id"/> <field name="bank_acc_rec_statement_id"/>
</field> </field>
<field name="move_id" position="before"> <field name="move_id" position="before">
<filter icon="terp-document-new" string="Uncleared Bank Account" <filter icon="terp-document-new"
domain="[('cleared_bank_account','=',False)]" help="Journal Entries not cleared" /> string="Uncleared Bank Account"
domain="[('cleared_bank_account','=',False)]"
help="Journal Entries not cleared"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
</field> </field>
</field> </field>

72
account_banking_reconciliation/views/report_bank_statement_detail.xml
View File

@ -2,7 +2,8 @@
<odoo> <odoo>
<template id="report_bank_statement_detail_doc"> <template id="report_bank_statement_detail_doc">
<t t-call="report.external_layout"> <t t-call="report.external_layout">
<t t-set="o" t-value="o.with_context({'lang':o.company_id.partner_id.lang})" /> <t t-set="o"
t-value="o.with_context({'lang':o.company_id.partner_id.lang})"/>
<div class="page"> <div class="page">
<h2 style='text-align:center;'> <h2 style='text-align:center;'>
Reconciliation Detail Reconciliation Detail
@ -13,7 +14,8 @@
</h5> </h5>
<div class="row"> <div class="row">
<table class="table table-condensed" t-if="not o.account_id.currency_id"> <table class="table table-condensed"
t-if="not o.account_id.currency_id">
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
@ -31,7 +33,8 @@
</tr> </tr>
</thead> </thead>
</table> </table>
<table class="table table-condensed" t-if="o.account_id.currency_id"> <table class="table table-condensed"
t-if="o.account_id.currency_id">
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
@ -46,7 +49,8 @@
</tr> </tr>
</thead> </thead>
</table> </table>
<table class="table table-condensed" t-if="not o.account_id.currency_id"> <table class="table table-condensed"
t-if="not o.account_id.currency_id">
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<tr> <tr>
<td> <td>
@ -81,7 +85,8 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="table table-condensed" t-if="o.account_id.currency_id"> <table class="table table-condensed"
t-if="o.account_id.currency_id">
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<tr> <tr>
<td> <td>
@ -116,7 +121,8 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="table table-condensed" t-if="not o.account_id.currency_id"> <table class="table table-condensed"
t-if="not o.account_id.currency_id">
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<tr t-foreach="o.debit_move_line_ids" t-as="debit" <tr t-foreach="o.debit_move_line_ids" t-as="debit"
t-if="debit.cleared_bank_account"> t-if="debit.cleared_bank_account">
@ -147,7 +153,8 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="table table-condensed" t-if="o.account_id.currency_id"> <table class="table table-condensed"
t-if="o.account_id.currency_id">
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<tr t-foreach="o.debit_move_line_ids" t-as="debit" <tr t-foreach="o.debit_move_line_ids" t-as="debit"
t-if="debit.cleared_bank_account"> t-if="debit.cleared_bank_account">
@ -180,16 +187,20 @@
<tr> <tr>
<td> <td>
<b> <b>
<span>Total Deposits &amp; Credits</span> <span>Total Deposits &amp;
Credits
</span>
</b> </b>
</td> </td>
<td></td> <td></td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_debits" t-field="o.sum_of_debits" <span t-if="o.sum_of_debits"
t-field="o.sum_of_debits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_debits_cur" t-field="o.sum_of_debits_cur" <span t-if="o.sum_of_debits_cur"
t-field="o.sum_of_debits_cur"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
</tr> </tr>
@ -217,12 +228,15 @@
<tr> <tr>
<td> <td>
<b> <b>
<span>Total Deposits &amp; Credits</span> <span>Total Deposits &amp;
Credits
</span>
</b> </b>
</td> </td>
<td></td> <td></td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_debits" t-field="o.sum_of_debits" <span t-if="o.sum_of_debits"
t-field="o.sum_of_debits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
</tr> </tr>
@ -244,9 +258,11 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<table class="table table-condensed" t-if="not o.account_id.currency_id"> <table class="table table-condensed"
t-if="not o.account_id.currency_id">
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<tr t-foreach="o.credit_move_line_ids" t-as="credit" <tr t-foreach="o.credit_move_line_ids"
t-as="credit"
t-if="credit.cleared_bank_account"> t-if="credit.cleared_bank_account">
<td></td> <td></td>
<td> <td>
@ -275,9 +291,11 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="table table-condensed" t-if="o.account_id.currency_id"> <table class="table table-condensed"
t-if="o.account_id.currency_id">
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<tr t-foreach="o.credit_move_line_ids" t-as="credit" <tr t-foreach="o.credit_move_line_ids"
t-as="credit"
t-if="credit.cleared_bank_account"> t-if="credit.cleared_bank_account">
<td></td> <td></td>
<td> <td>
@ -308,16 +326,19 @@
<tr> <tr>
<td> <td>
<b> <b>
<span>Total Checks &amp; Payments</span> <span>Total Checks &amp; Payments
</span>
</b> </b>
</td> </td>
<td></td> <td></td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_credits" t-field="o.sum_of_credits" <span t-if="o.sum_of_credits"
t-field="o.sum_of_credits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_credits_cur" t-field="o.sum_of_credits_cur" <span t-if="o.sum_of_credits_cur"
t-field="o.sum_of_credits_cur"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
</tr> </tr>
@ -328,7 +349,8 @@
<tr> <tr>
<td> <td>
<b> <b>
<span>Total Cleared Transactions</span> <span>Total Cleared Transactions
</span>
</b> </b>
</td> </td>
<td></td> <td></td>
@ -379,12 +401,15 @@
<tr> <tr>
<td> <td>
<b> <b>
<span>Total Deposits &amp; Credits</span> <span>Total Deposits &amp;
Credits
</span>
</b> </b>
</td> </td>
<td></td> <td></td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_credits" t-field="o.sum_of_credits" <span t-if="o.sum_of_credits"
t-field="o.sum_of_credits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
</tr> </tr>
@ -395,7 +420,8 @@
<tr> <tr>
<td> <td>
<b> <b>
<span>Total Cleared Transactions</span> <span>Total Cleared Transactions
</span>
</b> </b>
</td> </td>
<td></td> <td></td>

21
account_banking_reconciliation/views/report_bank_statement_summary.xml
View File

@ -2,7 +2,8 @@
<odoo> <odoo>
<template id="report_bank_statement_summary_doc"> <template id="report_bank_statement_summary_doc">
<t t-call="report.external_layout"> <t t-call="report.external_layout">
<t t-set="o" t-value="o.with_context({'lang':o.company_id.partner_id.lang})" /> <t t-set="o"
t-value="o.with_context({'lang':o.company_id.partner_id.lang})"/>
<div class="page"> <div class="page">
<h2 style='text-align:center;'> <h2 style='text-align:center;'>
Reconciliation Summary Reconciliation Summary
@ -41,11 +42,13 @@
</b> </b>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_debits" t-field="o.sum_of_debits" <span t-if="o.sum_of_debits"
t-field="o.sum_of_debits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_debits_cur" t-field="o.sum_of_debits_cur" <span t-if="o.sum_of_debits_cur"
t-field="o.sum_of_debits_cur"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td></td> <td></td>
@ -60,11 +63,13 @@
</b> </b>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_credits" t-field="o.sum_of_credits" <span t-if="o.sum_of_credits"
t-field="o.sum_of_credits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_credits_cur" t-field="o.sum_of_credits_cur" <span t-if="o.sum_of_credits_cur"
t-field="o.sum_of_credits_cur"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td></td> <td></td>
@ -195,7 +200,8 @@
</td> </td>
<td></td> <td></td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_debits" t-field="o.sum_of_debits" <span t-if="o.sum_of_debits"
t-field="o.sum_of_debits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td></td> <td></td>
@ -211,7 +217,8 @@
</td> </td>
<td></td> <td></td>
<td class="text-right"> <td class="text-right">
<span t-if="o.sum_of_credits" t-field="o.sum_of_credits" <span t-if="o.sum_of_credits"
t-field="o.sum_of_credits"
t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/> t-options='{"widget": "monetary", "display_currency": o.account_id.currency_id}'/>
</td> </td>
<td></td> <td></td>