mirror of
https://github.com/OCA/account-reconcile.git
synced 2025-01-20 12:27:39 +02:00
Merge pull request #606 from OCA/14.0-ocabot-update-dotfiles
[14.0] dotfiles update needs manual intervention
This commit is contained in:
@@ -1,8 +1,7 @@
|
|||||||
# Do NOT update manually; changes here will be overwritten by Copier
|
# Do NOT update manually; changes here will be overwritten by Copier
|
||||||
_commit: v1.14.2
|
_commit: v1.17.2
|
||||||
_src_path: gh:oca/oca-addons-repo-template
|
_src_path: gh:oca/oca-addons-repo-template
|
||||||
ci: GitHub
|
ci: GitHub
|
||||||
dependency_installation_mode: PIP
|
|
||||||
generate_requirements_txt: true
|
generate_requirements_txt: true
|
||||||
github_check_license: true
|
github_check_license: true
|
||||||
github_ci_extra_env: {}
|
github_ci_extra_env: {}
|
||||||
@@ -11,6 +10,7 @@ github_enable_makepot: true
|
|||||||
github_enable_stale_action: true
|
github_enable_stale_action: true
|
||||||
github_enforce_dev_status_compatibility: true
|
github_enforce_dev_status_compatibility: true
|
||||||
include_wkhtmltopdf: false
|
include_wkhtmltopdf: false
|
||||||
|
odoo_test_flavor: Both
|
||||||
odoo_version: 14.0
|
odoo_version: 14.0
|
||||||
org_name: Odoo Community Association (OCA)
|
org_name: Odoo Community Association (OCA)
|
||||||
org_slug: OCA
|
org_slug: OCA
|
||||||
@@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.'
|
|||||||
repo_name: account-reconcile
|
repo_name: account-reconcile
|
||||||
repo_slug: account-reconcile
|
repo_slug: account-reconcile
|
||||||
repo_website: https://github.com/OCA/account-reconcile
|
repo_website: https://github.com/OCA/account-reconcile
|
||||||
travis_apt_packages: []
|
|
||||||
travis_apt_sources: []
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ globals:
|
|||||||
odoo: readonly
|
odoo: readonly
|
||||||
openerp: readonly
|
openerp: readonly
|
||||||
owl: readonly
|
owl: readonly
|
||||||
|
luxon: readonly
|
||||||
|
|
||||||
# Styling is handled by Prettier, so we only need to enable AST rules;
|
# Styling is handled by Prettier, so we only need to enable AST rules;
|
||||||
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
|
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
|
||||||
|
|||||||
13
.github/workflows/pre-commit.yml
vendored
13
.github/workflows/pre-commit.yml
vendored
@@ -13,8 +13,10 @@ jobs:
|
|||||||
pre-commit:
|
pre-commit:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-python@v2
|
- uses: actions/setup-python@v2
|
||||||
|
with:
|
||||||
|
python-version: "3.11"
|
||||||
- name: Get python version
|
- name: Get python version
|
||||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||||
- uses: actions/cache@v1
|
- uses: actions/cache@v1
|
||||||
@@ -25,6 +27,15 @@ jobs:
|
|||||||
run: pip install pre-commit
|
run: pip install pre-commit
|
||||||
- name: Run pre-commit
|
- name: Run pre-commit
|
||||||
run: pre-commit run --all-files --show-diff-on-failure --color=always
|
run: pre-commit run --all-files --show-diff-on-failure --color=always
|
||||||
|
env:
|
||||||
|
# Consider valid a PR that changes README fragments but doesn't
|
||||||
|
# change the README.rst file itself. It's not really a problem
|
||||||
|
# because the bot will update it anyway after merge. This way, we
|
||||||
|
# lower the barrier for functional contributors that want to fix the
|
||||||
|
# readme fragments, while still letting developers get README
|
||||||
|
# auto-generated (which also helps functionals when using runboat).
|
||||||
|
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
|
||||||
|
SKIP: oca-gen-addon-readme
|
||||||
- name: Check that all files generated by pre-commit are in git
|
- name: Check that all files generated by pre-commit are in git
|
||||||
run: |
|
run: |
|
||||||
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
|
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
|
||||||
|
|||||||
6
.github/workflows/test.yml
vendored
6
.github/workflows/test.yml
vendored
@@ -14,7 +14,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Detect unreleased dependencies
|
name: Detect unreleased dependencies
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- run: |
|
- run: |
|
||||||
for reqfile in requirements.txt test-requirements.txt ; do
|
for reqfile in requirements.txt test-requirements.txt ; do
|
||||||
if [ -f ${reqfile} ] ; then
|
if [ -f ${reqfile} ] ; then
|
||||||
@@ -36,10 +36,10 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
|
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
|
||||||
makepot: "true"
|
|
||||||
name: test with Odoo
|
name: test with Odoo
|
||||||
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
|
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
|
||||||
name: test with OCB
|
name: test with OCB
|
||||||
|
makepot: "true"
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:9.6
|
image: postgres:9.6
|
||||||
@@ -50,7 +50,7 @@ jobs:
|
|||||||
ports:
|
ports:
|
||||||
- 5432:5432
|
- 5432:5432
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
- name: Install addons and dependencies
|
- name: Install addons and dependencies
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ exclude: |
|
|||||||
/static/(src/)?lib/|
|
/static/(src/)?lib/|
|
||||||
# Repos using Sphinx to generate docs don't need prettying
|
# Repos using Sphinx to generate docs don't need prettying
|
||||||
^docs/_templates/.*\.html$|
|
^docs/_templates/.*\.html$|
|
||||||
|
# Don't bother non-technical authors with formatting issues in docs
|
||||||
|
readme/.*\.(rst|md)$|
|
||||||
# You don't usually want a bot to modify your legal texts
|
# You don't usually want a bot to modify your legal texts
|
||||||
(LICENSE.*|COPYING.*)
|
(LICENSE.*|COPYING.*)
|
||||||
default_language_version:
|
default_language_version:
|
||||||
@@ -33,12 +35,24 @@ repos:
|
|||||||
language: fail
|
language: fail
|
||||||
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
|
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
|
||||||
- repo: https://github.com/oca/maintainer-tools
|
- repo: https://github.com/oca/maintainer-tools
|
||||||
rev: ab1d7f6
|
rev: 969238e47c07d0c40573acff81d170f63245d738
|
||||||
hooks:
|
hooks:
|
||||||
# update the NOT INSTALLABLE ADDONS section above
|
# update the NOT INSTALLABLE ADDONS section above
|
||||||
- id: oca-update-pre-commit-excluded-addons
|
- id: oca-update-pre-commit-excluded-addons
|
||||||
- id: oca-fix-manifest-website
|
- id: oca-fix-manifest-website
|
||||||
args: ["https://github.com/OCA/account-reconcile"]
|
args: ["https://github.com/OCA/account-reconcile"]
|
||||||
|
- id: oca-gen-addon-readme
|
||||||
|
args:
|
||||||
|
- --addons-dir=.
|
||||||
|
- --branch=14.0
|
||||||
|
- --org-name=OCA
|
||||||
|
- --repo-name=account-reconcile
|
||||||
|
- --if-source-changed
|
||||||
|
- repo: https://github.com/OCA/odoo-pre-commit-hooks
|
||||||
|
rev: v0.0.25
|
||||||
|
hooks:
|
||||||
|
- id: oca-checks-odoo-module
|
||||||
|
- id: oca-checks-po
|
||||||
- repo: https://github.com/myint/autoflake
|
- repo: https://github.com/myint/autoflake
|
||||||
rev: v1.4
|
rev: v1.4
|
||||||
hooks:
|
hooks:
|
||||||
|
|||||||
@@ -101,23 +101,15 @@ msgstr ""
|
|||||||
|
|
||||||
#. module: account_mass_reconcile
|
#. module: account_mass_reconcile
|
||||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form
|
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form
|
||||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_tree
|
|
||||||
msgid "Automatic Mass Reconcile"
|
msgid "Automatic Mass Reconcile"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_mass_reconcile
|
#. module: account_mass_reconcile
|
||||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_form
|
|
||||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.mass_reconcile_history_form
|
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.mass_reconcile_history_form
|
||||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.mass_reconcile_history_tree
|
|
||||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_mass_reconcile_history_search
|
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_mass_reconcile_history_search
|
||||||
msgid "Automatic Mass Reconcile History"
|
msgid "Automatic Mass Reconcile History"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_mass_reconcile
|
|
||||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.account_mass_reconcile_method_tree
|
|
||||||
msgid "Automatic Mass Reconcile Method"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: account_mass_reconcile
|
#. module: account_mass_reconcile
|
||||||
#: code:addons/account_mass_reconcile/models/base_reconciliation.py:0
|
#: code:addons/account_mass_reconcile/models/base_reconciliation.py:0
|
||||||
#, python-format
|
#, python-format
|
||||||
@@ -327,7 +319,6 @@ msgstr ""
|
|||||||
|
|
||||||
#. module: account_mass_reconcile
|
#. module: account_mass_reconcile
|
||||||
#: model:ir.model.fields,help:account_mass_reconcile.field_account_mass_reconcile__message_has_error
|
#: model:ir.model.fields,help:account_mass_reconcile.field_account_mass_reconcile__message_has_error
|
||||||
#: model:ir.model.fields,help:account_mass_reconcile.field_account_mass_reconcile__message_has_sms_error
|
|
||||||
msgid "If checked, some messages have a delivery error."
|
msgid "If checked, some messages have a delivery error."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@@ -600,11 +591,6 @@ msgstr ""
|
|||||||
msgid "Run date"
|
msgid "Run date"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_mass_reconcile
|
|
||||||
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile__message_has_sms_error
|
|
||||||
msgid "SMS Delivery error"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: account_mass_reconcile
|
#. module: account_mass_reconcile
|
||||||
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile_method__sequence
|
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile_method__sequence
|
||||||
msgid "Sequence"
|
msgid "Sequence"
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
</page>
|
</page>
|
||||||
<page name="history" string="History">
|
<page name="history" string="History">
|
||||||
<field name="history_ids" nolabel="1">
|
<field name="history_ids" nolabel="1">
|
||||||
<tree string="Automatic Mass Reconcile History">
|
<tree>
|
||||||
<field name="date" />
|
<field name="date" />
|
||||||
<button
|
<button
|
||||||
icon="fa-share"
|
icon="fa-share"
|
||||||
@@ -116,7 +116,7 @@ The lines should have the same partner, and the credit entry ref. is matched wit
|
|||||||
<field name="priority">20</field>
|
<field name="priority">20</field>
|
||||||
<field name="model">account.mass.reconcile</field>
|
<field name="model">account.mass.reconcile</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Automatic Mass Reconcile">
|
<tree>
|
||||||
<field name="name" />
|
<field name="name" />
|
||||||
<field name="account" />
|
<field name="account" />
|
||||||
<field name="company_id" groups="base.group_multi_company" />
|
<field name="company_id" groups="base.group_multi_company" />
|
||||||
@@ -161,7 +161,7 @@ The lines should have the same partner, and the credit entry ref. is matched wit
|
|||||||
<field name="priority">20</field>
|
<field name="priority">20</field>
|
||||||
<field name="model">account.mass.reconcile.method</field>
|
<field name="model">account.mass.reconcile.method</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree editable="top" string="Automatic Mass Reconcile Method">
|
<tree editable="top">
|
||||||
<field name="sequence" widget="handle" />
|
<field name="sequence" widget="handle" />
|
||||||
<field name="name" />
|
<field name="name" />
|
||||||
<field name="write_off" />
|
<field name="write_off" />
|
||||||
|
|||||||
@@ -69,7 +69,7 @@
|
|||||||
<field name="name">mass.reconcile.history.tree</field>
|
<field name="name">mass.reconcile.history.tree</field>
|
||||||
<field name="model">mass.reconcile.history</field>
|
<field name="model">mass.reconcile.history</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Automatic Mass Reconcile History">
|
<tree>
|
||||||
<field name="mass_reconcile_id" />
|
<field name="mass_reconcile_id" />
|
||||||
<field name="date" />
|
<field name="date" />
|
||||||
<button
|
<button
|
||||||
|
|||||||
@@ -279,9 +279,7 @@ msgstr ""
|
|||||||
|
|
||||||
#. module: account_move_base_import
|
#. module: account_move_base_import
|
||||||
#: model:ir.model.fields,help:account_move_base_import.field_account_journal__message_has_error
|
#: model:ir.model.fields,help:account_move_base_import.field_account_journal__message_has_error
|
||||||
#: model:ir.model.fields,help:account_move_base_import.field_account_journal__message_has_sms_error
|
|
||||||
#: model:ir.model.fields,help:account_move_base_import.field_account_move__message_has_error
|
#: model:ir.model.fields,help:account_move_base_import.field_account_move__message_has_error
|
||||||
#: model:ir.model.fields,help:account_move_base_import.field_account_move__message_has_sms_error
|
|
||||||
msgid "If checked, some messages have a delivery error."
|
msgid "If checked, some messages have a delivery error."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@@ -482,7 +480,6 @@ msgstr ""
|
|||||||
#. module: account_move_base_import
|
#. module: account_move_base_import
|
||||||
#: model:ir.ui.menu,name:account_move_base_import.menu_action_move_completion_rule_tree_menu
|
#: model:ir.ui.menu,name:account_move_base_import.menu_action_move_completion_rule_tree_menu
|
||||||
#: model_terms:ir.ui.view,arch_db:account_move_base_import.move_completion_rule_view_form
|
#: model_terms:ir.ui.view,arch_db:account_move_base_import.move_completion_rule_view_form
|
||||||
#: model_terms:ir.ui.view,arch_db:account_move_base_import.move_completion_rule_view_tree
|
|
||||||
msgid "Move Completion Rule"
|
msgid "Move Completion Rule"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@@ -582,12 +579,6 @@ msgstr ""
|
|||||||
msgid "Related journals"
|
msgid "Related journals"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. module: account_move_base_import
|
|
||||||
#: model:ir.model.fields,field_description:account_move_base_import.field_account_journal__message_has_sms_error
|
|
||||||
#: model:ir.model.fields,field_description:account_move_base_import.field_account_move__message_has_sms_error
|
|
||||||
msgid "SMS Delivery error"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: account_move_base_import
|
#. module: account_move_base_import
|
||||||
#: model:ir.model.fields,field_description:account_move_base_import.field_account_move_completion_rule__sequence
|
#: model:ir.model.fields,field_description:account_move_base_import.field_account_move_completion_rule__sequence
|
||||||
msgid "Sequence"
|
msgid "Sequence"
|
||||||
|
|||||||
@@ -53,7 +53,7 @@
|
|||||||
<field name="name">account.move.completion.rule.view</field>
|
<field name="name">account.move.completion.rule.view</field>
|
||||||
<field name="model">account.move.completion.rule</field>
|
<field name="model">account.move.completion.rule</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree string="Move Completion Rule">
|
<tree>
|
||||||
<field name="sequence" />
|
<field name="sequence" />
|
||||||
<field name="name" select="1" />
|
<field name="name" select="1" />
|
||||||
<field name="journal_ids" />
|
<field name="journal_ids" />
|
||||||
|
|||||||
@@ -95,7 +95,6 @@ msgstr ""
|
|||||||
#: model:ir.actions.act_window,name:account_reconcile_restrict_partner_mismatch.action_account_reconcile_partner_mismatch_report
|
#: model:ir.actions.act_window,name:account_reconcile_restrict_partner_mismatch.action_account_reconcile_partner_mismatch_report
|
||||||
#: model:ir.ui.menu,name:account_reconcile_restrict_partner_mismatch.menu_account_reconcile_partner_mismatch_report
|
#: model:ir.ui.menu,name:account_reconcile_restrict_partner_mismatch.menu_account_reconcile_partner_mismatch_report
|
||||||
#: model_terms:ir.ui.view,arch_db:account_reconcile_restrict_partner_mismatch.account_reconcile_partner_mismatch_report_view_form
|
#: model_terms:ir.ui.view,arch_db:account_reconcile_restrict_partner_mismatch.account_reconcile_partner_mismatch_report_view_form
|
||||||
#: model_terms:ir.ui.view,arch_db:account_reconcile_restrict_partner_mismatch.view_account_move_reconciled_report_tree
|
|
||||||
msgid "Reconciled items with partner mismatch"
|
msgid "Reconciled items with partner mismatch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|||||||
@@ -4,12 +4,7 @@
|
|||||||
<field name="name">Reconciled items with partner mismatch</field>
|
<field name="name">Reconciled items with partner mismatch</field>
|
||||||
<field name="model">account.reconcile.partner.mismatch.report</field>
|
<field name="model">account.reconcile.partner.mismatch.report</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<tree
|
<tree create="false" delete="false" edit="false">
|
||||||
string="Reconciled items with partner mismatch"
|
|
||||||
create="false"
|
|
||||||
delete="false"
|
|
||||||
edit="false"
|
|
||||||
>
|
|
||||||
<!-- links are not clickable in tree view
|
<!-- links are not clickable in tree view
|
||||||
only after open form view -->
|
only after open form view -->
|
||||||
<field name="partial_reconcile_id" />
|
<field name="partial_reconcile_id" />
|
||||||
|
|||||||
@@ -1,25 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<data>
|
<record id="view_bank_statement_form" model="ir.ui.view">
|
||||||
<record id="view_bank_statement_form" model="ir.ui.view">
|
<field name="name">account.bank.statement.inherit.view.form</field>
|
||||||
<field name="name">account.bank.statement.inherit.view.form</field>
|
<field name="model">account.bank.statement</field>
|
||||||
<field name="model">account.bank.statement</field>
|
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
||||||
<field name="inherit_id" ref="account.view_bank_statement_form" />
|
<field name="arch" type="xml">
|
||||||
<field name="arch" type="xml">
|
<xpath expr="//button[@name='button_post']" position="before">
|
||||||
<xpath expr="//button[@name='button_post']" position="before">
|
<button
|
||||||
<button
|
name="action_bank_reconcile_bank_statements"
|
||||||
name="action_bank_reconcile_bank_statements"
|
string="Reconcile"
|
||||||
string="Reconcile"
|
type="object"
|
||||||
type="object"
|
class="oe_highlight"
|
||||||
class="oe_highlight"
|
attrs="{'invisible':['|','|',('all_lines_reconciled','=',True),('line_ids','=',[]),('state', '!=', 'posted')]}"
|
||||||
attrs="{'invisible':['|','|',('all_lines_reconciled','=',True),('line_ids','=',[]),('state', '!=', 'posted')]}"
|
/>
|
||||||
/>
|
</xpath>
|
||||||
</xpath>
|
<xpath expr="//field[@name='date']" position="after">
|
||||||
<xpath expr="//field[@name='date']" position="after">
|
<field name="accounting_date" groups="base.group_no_one" />
|
||||||
<field name="accounting_date" groups="base.group_no_one" />
|
</xpath>
|
||||||
</xpath>
|
</field>
|
||||||
</field>
|
</record>
|
||||||
</record>
|
|
||||||
|
|
||||||
</data>
|
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|||||||
@@ -1,47 +1,42 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<data>
|
<record id="account_journal_dashboard_kanban_view" model="ir.ui.view">
|
||||||
<record id="account_journal_dashboard_kanban_view" model="ir.ui.view">
|
<field name="name">account.journal.inherit.dashboard.kanban</field>
|
||||||
<field name="name">account.journal.inherit.dashboard.kanban</field>
|
<field name="model">account.journal</field>
|
||||||
<field name="model">account.journal</field>
|
<field name="inherit_id" ref="account.account_journal_dashboard_kanban_view" />
|
||||||
<field
|
<field name="arch" type="xml">
|
||||||
name="inherit_id"
|
<xpath
|
||||||
ref="account.account_journal_dashboard_kanban_view"
|
expr="//kanban/templates//div[@id='dashboard_bank_cash_left']/t[1]"
|
||||||
/>
|
position="before"
|
||||||
<field name="arch" type="xml">
|
>
|
||||||
<xpath
|
<t t-if="dashboard.number_to_reconcile > 0">
|
||||||
expr="//kanban/templates//div[@id='dashboard_bank_cash_left']/t[1]"
|
<button
|
||||||
position="before"
|
type="object"
|
||||||
>
|
name="action_open_reconcile"
|
||||||
<t t-if="dashboard.number_to_reconcile > 0">
|
class="btn btn-primary"
|
||||||
<button
|
> Reconcile <t
|
||||||
type="object"
|
t-esc="dashboard.number_to_reconcile"
|
||||||
name="action_open_reconcile"
|
/> Items</button>
|
||||||
class="btn btn-primary"
|
</t>
|
||||||
> Reconcile <t
|
</xpath>
|
||||||
t-esc="dashboard.number_to_reconcile"
|
<xpath
|
||||||
/> Items</button>
|
expr="//kanban/templates//div[@id='dashboard_bank_cash_right']"
|
||||||
</t>
|
position="inside"
|
||||||
</xpath>
|
>
|
||||||
<xpath
|
<t t-if="dashboard.number_to_check > 0">
|
||||||
expr="//kanban/templates//div[@id='dashboard_bank_cash_right']"
|
<div class="row">
|
||||||
position="inside"
|
<div class="col overflow-hidden text-left">
|
||||||
>
|
<a type="object" name="action_open_reconcile_to_check">
|
||||||
<t t-if="dashboard.number_to_check > 0">
|
<t t-esc="dashboard.number_to_check" /> to check</a>
|
||||||
<div class="row">
|
|
||||||
<div class="col overflow-hidden text-left">
|
|
||||||
<a type="object" name="action_open_reconcile_to_check">
|
|
||||||
<t t-esc="dashboard.number_to_check" /> to check</a>
|
|
||||||
</div>
|
|
||||||
<div class="col-auto text-right">
|
|
||||||
<span>
|
|
||||||
<t t-esc="dashboard.to_check_balance" />
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</t>
|
<div class="col-auto text-right">
|
||||||
</xpath>
|
<span>
|
||||||
</field>
|
<t t-esc="dashboard.to_check_balance" />
|
||||||
</record>
|
</span>
|
||||||
</data>
|
</div>
|
||||||
|
</div>
|
||||||
|
</t>
|
||||||
|
</xpath>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|||||||
@@ -1,30 +1,28 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<data>
|
<record id="action_bank_reconcile" model="ir.actions.client">
|
||||||
<record id="action_bank_reconcile" model="ir.actions.client">
|
<field name="name">Reconciliation on Bank Statements</field>
|
||||||
<field name="name">Reconciliation on Bank Statements</field>
|
<field name="res_model">account.bank.statement.line</field>
|
||||||
<field name="res_model">account.bank.statement.line</field>
|
<field name="tag">bank_statement_reconciliation_view</field>
|
||||||
<field name="tag">bank_statement_reconciliation_view</field>
|
</record>
|
||||||
</record>
|
|
||||||
|
|
||||||
<record id="action_view_account_move_line_reconcile" model="ir.actions.client">
|
<record id="action_view_account_move_line_reconcile" model="ir.actions.client">
|
||||||
<field name="name">Reconcile</field>
|
<field name="name">Reconcile</field>
|
||||||
<field name="tag">manual_reconciliation_view</field>
|
<field name="tag">manual_reconciliation_view</field>
|
||||||
<field name="binding_model_id" ref="account.model_account_move_line" />
|
<field name="binding_model_id" ref="account.model_account_move_line" />
|
||||||
<field name="binding_type">action</field>
|
<field name="binding_type">action</field>
|
||||||
<field name="binding_view_types">list</field>
|
<field name="binding_view_types">list</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="action_manual_reconciliation" model="ir.actions.client">
|
<record id="action_manual_reconciliation" model="ir.actions.client">
|
||||||
<field name="name">Reconciliation</field>
|
<field name="name">Reconciliation</field>
|
||||||
<field name="tag">manual_reconciliation_view</field>
|
<field name="tag">manual_reconciliation_view</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<menuitem
|
<menuitem
|
||||||
id="menu_action_manual_reconciliation"
|
id="menu_action_manual_reconciliation"
|
||||||
parent="account.menu_finance_entries_actions"
|
parent="account.menu_finance_entries_actions"
|
||||||
action="action_manual_reconciliation"
|
action="action_manual_reconciliation"
|
||||||
sequence="25"
|
sequence="25"
|
||||||
/>
|
/>
|
||||||
</data>
|
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|||||||
@@ -4,23 +4,21 @@
|
|||||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
-->
|
-->
|
||||||
<odoo>
|
<odoo>
|
||||||
<data>
|
<record id="res_config_settings_view_form" model="ir.ui.view">
|
||||||
<record id="res_config_settings_view_form" model="ir.ui.view">
|
<field name="model">res.config.settings</field>
|
||||||
<field name="model">res.config.settings</field>
|
<field
|
||||||
<field
|
name="inherit_id"
|
||||||
name="inherit_id"
|
ref="account_reconciliation_widget.res_config_settings_view_form"
|
||||||
ref="account_reconciliation_widget.res_config_settings_view_form"
|
/>
|
||||||
/>
|
<field name="arch" type="xml">
|
||||||
<field name="arch" type="xml">
|
<xpath
|
||||||
<xpath
|
expr="//field[@name='account_bank_reconciliation_start']"
|
||||||
expr="//field[@name='account_bank_reconciliation_start']"
|
position="after"
|
||||||
position="after"
|
>
|
||||||
>
|
<br />
|
||||||
<br />
|
<field name="account_bank_reconciliation_start_all_aml" />
|
||||||
<field name="account_bank_reconciliation_start_all_aml" />
|
<label for="account_bank_reconciliation_start_all_aml" />
|
||||||
<label for="account_bank_reconciliation_start_all_aml" />
|
</xpath>
|
||||||
</xpath>
|
</field>
|
||||||
</field>
|
</record>
|
||||||
</record>
|
|
||||||
</data>
|
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|||||||
Reference in New Issue
Block a user