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
|
||||
_commit: v1.14.2
|
||||
_commit: v1.17.2
|
||||
_src_path: gh:oca/oca-addons-repo-template
|
||||
ci: GitHub
|
||||
dependency_installation_mode: PIP
|
||||
generate_requirements_txt: true
|
||||
github_check_license: true
|
||||
github_ci_extra_env: {}
|
||||
@@ -11,6 +10,7 @@ github_enable_makepot: true
|
||||
github_enable_stale_action: true
|
||||
github_enforce_dev_status_compatibility: true
|
||||
include_wkhtmltopdf: false
|
||||
odoo_test_flavor: Both
|
||||
odoo_version: 14.0
|
||||
org_name: Odoo Community Association (OCA)
|
||||
org_slug: OCA
|
||||
@@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.'
|
||||
repo_name: account-reconcile
|
||||
repo_slug: account-reconcile
|
||||
repo_website: https://github.com/OCA/account-reconcile
|
||||
travis_apt_packages: []
|
||||
travis_apt_sources: []
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ globals:
|
||||
odoo: readonly
|
||||
openerp: readonly
|
||||
owl: readonly
|
||||
luxon: readonly
|
||||
|
||||
# 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
|
||||
|
||||
13
.github/workflows/pre-commit.yml
vendored
13
.github/workflows/pre-commit.yml
vendored
@@ -13,8 +13,10 @@ jobs:
|
||||
pre-commit:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: "3.11"
|
||||
- name: Get python version
|
||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||
- uses: actions/cache@v1
|
||||
@@ -25,6 +27,15 @@ jobs:
|
||||
run: pip install pre-commit
|
||||
- name: Run pre-commit
|
||||
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
|
||||
run: |
|
||||
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
|
||||
name: Detect unreleased dependencies
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
- run: |
|
||||
for reqfile in requirements.txt test-requirements.txt ; do
|
||||
if [ -f ${reqfile} ] ; then
|
||||
@@ -36,10 +36,10 @@ jobs:
|
||||
matrix:
|
||||
include:
|
||||
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
|
||||
makepot: "true"
|
||||
name: test with Odoo
|
||||
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
|
||||
name: test with OCB
|
||||
makepot: "true"
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:9.6
|
||||
@@ -50,7 +50,7 @@ jobs:
|
||||
ports:
|
||||
- 5432:5432
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Install addons and dependencies
|
||||
|
||||
@@ -12,6 +12,8 @@ exclude: |
|
||||
/static/(src/)?lib/|
|
||||
# Repos using Sphinx to generate docs don't need prettying
|
||||
^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
|
||||
(LICENSE.*|COPYING.*)
|
||||
default_language_version:
|
||||
@@ -33,12 +35,24 @@ repos:
|
||||
language: fail
|
||||
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
|
||||
- repo: https://github.com/oca/maintainer-tools
|
||||
rev: ab1d7f6
|
||||
rev: 969238e47c07d0c40573acff81d170f63245d738
|
||||
hooks:
|
||||
# update the NOT INSTALLABLE ADDONS section above
|
||||
- id: oca-update-pre-commit-excluded-addons
|
||||
- id: oca-fix-manifest-website
|
||||
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
|
||||
rev: v1.4
|
||||
hooks:
|
||||
|
||||
@@ -101,23 +101,15 @@ msgstr ""
|
||||
|
||||
#. 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_tree
|
||||
msgid "Automatic Mass Reconcile"
|
||||
msgstr ""
|
||||
|
||||
#. 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_tree
|
||||
#: model_terms:ir.ui.view,arch_db:account_mass_reconcile.view_mass_reconcile_history_search
|
||||
msgid "Automatic Mass Reconcile History"
|
||||
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
|
||||
#: code:addons/account_mass_reconcile/models/base_reconciliation.py:0
|
||||
#, python-format
|
||||
@@ -327,7 +319,6 @@ msgstr ""
|
||||
|
||||
#. 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_sms_error
|
||||
msgid "If checked, some messages have a delivery error."
|
||||
msgstr ""
|
||||
|
||||
@@ -600,11 +591,6 @@ msgstr ""
|
||||
msgid "Run date"
|
||||
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
|
||||
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile_method__sequence
|
||||
msgid "Sequence"
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
</page>
|
||||
<page name="history" string="History">
|
||||
<field name="history_ids" nolabel="1">
|
||||
<tree string="Automatic Mass Reconcile History">
|
||||
<tree>
|
||||
<field name="date" />
|
||||
<button
|
||||
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="model">account.mass.reconcile</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Automatic Mass Reconcile">
|
||||
<tree>
|
||||
<field name="name" />
|
||||
<field name="account" />
|
||||
<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="model">account.mass.reconcile.method</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree editable="top" string="Automatic Mass Reconcile Method">
|
||||
<tree editable="top">
|
||||
<field name="sequence" widget="handle" />
|
||||
<field name="name" />
|
||||
<field name="write_off" />
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
<field name="name">mass.reconcile.history.tree</field>
|
||||
<field name="model">mass.reconcile.history</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Automatic Mass Reconcile History">
|
||||
<tree>
|
||||
<field name="mass_reconcile_id" />
|
||||
<field name="date" />
|
||||
<button
|
||||
|
||||
@@ -279,9 +279,7 @@ msgstr ""
|
||||
|
||||
#. 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_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_sms_error
|
||||
msgid "If checked, some messages have a delivery error."
|
||||
msgstr ""
|
||||
|
||||
@@ -482,7 +480,6 @@ msgstr ""
|
||||
#. module: account_move_base_import
|
||||
#: 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_tree
|
||||
msgid "Move Completion Rule"
|
||||
msgstr ""
|
||||
|
||||
@@ -582,12 +579,6 @@ msgstr ""
|
||||
msgid "Related journals"
|
||||
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
|
||||
#: model:ir.model.fields,field_description:account_move_base_import.field_account_move_completion_rule__sequence
|
||||
msgid "Sequence"
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
<field name="name">account.move.completion.rule.view</field>
|
||||
<field name="model">account.move.completion.rule</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Move Completion Rule">
|
||||
<tree>
|
||||
<field name="sequence" />
|
||||
<field name="name" select="1" />
|
||||
<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.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.view_account_move_reconciled_report_tree
|
||||
msgid "Reconciled items with partner mismatch"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -4,12 +4,7 @@
|
||||
<field name="name">Reconciled items with partner mismatch</field>
|
||||
<field name="model">account.reconcile.partner.mismatch.report</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree
|
||||
string="Reconciled items with partner mismatch"
|
||||
create="false"
|
||||
delete="false"
|
||||
edit="false"
|
||||
>
|
||||
<tree create="false" delete="false" edit="false">
|
||||
<!-- links are not clickable in tree view
|
||||
only after open form view -->
|
||||
<field name="partial_reconcile_id" />
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<odoo>
|
||||
<data>
|
||||
<record id="view_bank_statement_form" model="ir.ui.view">
|
||||
<field name="name">account.bank.statement.inherit.view.form</field>
|
||||
<field name="model">account.bank.statement</field>
|
||||
@@ -20,6 +19,4 @@
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -1,13 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<odoo>
|
||||
<data>
|
||||
<record id="account_journal_dashboard_kanban_view" model="ir.ui.view">
|
||||
<field name="name">account.journal.inherit.dashboard.kanban</field>
|
||||
<field name="model">account.journal</field>
|
||||
<field
|
||||
name="inherit_id"
|
||||
ref="account.account_journal_dashboard_kanban_view"
|
||||
/>
|
||||
<field name="inherit_id" ref="account.account_journal_dashboard_kanban_view" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath
|
||||
expr="//kanban/templates//div[@id='dashboard_bank_cash_left']/t[1]"
|
||||
@@ -43,5 +39,4 @@
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<odoo>
|
||||
<data>
|
||||
<record id="action_bank_reconcile" model="ir.actions.client">
|
||||
<field name="name">Reconciliation on Bank Statements</field>
|
||||
<field name="res_model">account.bank.statement.line</field>
|
||||
@@ -26,5 +25,4 @@
|
||||
action="action_manual_reconciliation"
|
||||
sequence="25"
|
||||
/>
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
-->
|
||||
<odoo>
|
||||
<data>
|
||||
<record id="res_config_settings_view_form" model="ir.ui.view">
|
||||
<field name="model">res.config.settings</field>
|
||||
<field
|
||||
@@ -22,5 +21,4 @@
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user