mirror of
https://github.com/OCA/account-reconcile.git
synced 2025-01-20 12:27:39 +02:00
[IMP] update dotfiles [ci skip]
This commit is contained in:
@@ -1,14 +1,17 @@
|
|||||||
# Do NOT update manually; changes here will be overwritten by Copier
|
# Do NOT update manually; changes here will be overwritten by Copier
|
||||||
_commit: v1.3.6
|
_commit: v1.5.2
|
||||||
_src_path: gh:oca/oca-addons-repo-template
|
_src_path: gh:oca/oca-addons-repo-template
|
||||||
ci: Travis
|
ci: Travis
|
||||||
dependency_installation_mode: PIP
|
dependency_installation_mode: PIP
|
||||||
generate_requirements_txt: true
|
generate_requirements_txt: true
|
||||||
include_wkhtmltopdf: false
|
include_wkhtmltopdf: false
|
||||||
odoo_version: 14.0
|
odoo_version: 14.0
|
||||||
|
org_name: Odoo Community Association (OCA)
|
||||||
|
org_slug: OCA
|
||||||
rebel_module_groups: []
|
rebel_module_groups: []
|
||||||
repo_description: 'TODO: add repo description.'
|
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
|
||||||
travis_apt_packages: []
|
travis_apt_packages: []
|
||||||
travis_apt_sources: []
|
travis_apt_sources: []
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ env:
|
|||||||
|
|
||||||
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
|
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
|
||||||
parserOptions:
|
parserOptions:
|
||||||
ecmaVersion: 2017
|
ecmaVersion: 2019
|
||||||
|
|
||||||
overrides:
|
overrides:
|
||||||
- files:
|
- files:
|
||||||
|
|||||||
29
.github/workflows/pre-commit.yml
vendored
29
.github/workflows/pre-commit.yml
vendored
@@ -2,7 +2,12 @@ name: pre-commit
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- "14.0*"
|
||||||
push:
|
push:
|
||||||
|
branches:
|
||||||
|
- "14.0"
|
||||||
|
- "14.0-ocabot-*"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
pre-commit:
|
pre-commit:
|
||||||
@@ -10,11 +15,21 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: actions/setup-python@v2
|
- uses: actions/setup-python@v2
|
||||||
|
- name: Get python version
|
||||||
|
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||||
|
- uses: actions/cache@v1
|
||||||
with:
|
with:
|
||||||
# The pylint-odoo version we use here does not support python 3.10
|
path: ~/.cache/pre-commit
|
||||||
# https://github.com/OCA/oca-addons-repo-template/issues/80
|
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||||
# We also need to pin to an older version of python for older odoo versions
|
- name: Install pre-commit
|
||||||
# where we are not using black > 21. Older black versions won't work with
|
run: pip install pre-commit
|
||||||
# Python 3.9.8+, and we can't bump black without reformatting.
|
- name: Run pre-commit
|
||||||
python-version: "3.9.7"
|
run: pre-commit run --all-files --show-diff-on-failure --color=always
|
||||||
- uses: pre-commit/action@v2.0.0
|
- name: Check that all files generated by pre-commit are in git
|
||||||
|
run: |
|
||||||
|
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
|
||||||
|
if [ "$newfiles" != "" ] ; then
|
||||||
|
echo "Please check-in the following files:"
|
||||||
|
echo "$newfiles"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ repos:
|
|||||||
- --remove-duplicate-keys
|
- --remove-duplicate-keys
|
||||||
- --remove-unused-variables
|
- --remove-unused-variables
|
||||||
- repo: https://github.com/psf/black
|
- repo: https://github.com/psf/black
|
||||||
rev: 20.8b1
|
rev: 22.3.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: black
|
- id: black
|
||||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||||
@@ -120,7 +120,7 @@ repos:
|
|||||||
name: flake8
|
name: flake8
|
||||||
additional_dependencies: ["flake8-bugbear==20.1.4"]
|
additional_dependencies: ["flake8-bugbear==20.1.4"]
|
||||||
- repo: https://github.com/PyCQA/pylint
|
- repo: https://github.com/PyCQA/pylint
|
||||||
rev: pylint-2.5.3
|
rev: v2.11.1
|
||||||
hooks:
|
hooks:
|
||||||
- id: pylint
|
- id: pylint
|
||||||
name: pylint with optional checks
|
name: pylint with optional checks
|
||||||
@@ -129,7 +129,7 @@ repos:
|
|||||||
- --exit-zero
|
- --exit-zero
|
||||||
verbose: true
|
verbose: true
|
||||||
additional_dependencies: &pylint_deps
|
additional_dependencies: &pylint_deps
|
||||||
- pylint-odoo==3.5.0
|
- pylint-odoo==5.0.5
|
||||||
- id: pylint
|
- id: pylint
|
||||||
name: pylint with mandatory checks
|
name: pylint with mandatory checks
|
||||||
args:
|
args:
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
[](https://runbot.odoo-community.org/runbot/repo/github-com-oca-account-reconcile-98)
|
|
||||||
|
[](https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=14.0)
|
||||||
[](https://travis-ci.com/OCA/account-reconcile)
|
[](https://travis-ci.com/OCA/account-reconcile)
|
||||||
[](https://codecov.io/gh/OCA/account-reconcile)
|
[](https://codecov.io/gh/OCA/account-reconcile)
|
||||||
[](https://translation.odoo-community.org/engage/account-reconcile-14-0/?utm_source=widget)
|
[](https://translation.odoo-community.org/engage/account-reconcile-14-0/?utm_source=widget)
|
||||||
@@ -37,12 +38,11 @@ addon | version | maintainers | summary
|
|||||||
|
|
||||||
This repository is licensed under [AGPL-3.0](LICENSE).
|
This repository is licensed under [AGPL-3.0](LICENSE).
|
||||||
|
|
||||||
However, each module can have a totally different license, as long as they adhere to OCA
|
However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA)
|
||||||
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
|
policy. Consult each module's `__manifest__.py` file, which contains a `license` key
|
||||||
that explains its license.
|
that explains its license.
|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
|
OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit
|
||||||
organization whose mission is to support the collaborative development of Odoo features
|
organization whose mission is to support the collaborative development of Odoo features
|
||||||
and promote its widespread use.
|
and promote its widespread use.
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class MassReconcileAdvanced(models.AbstractModel):
|
|||||||
_description = "Mass Reconcile Advanced"
|
_description = "Mass Reconcile Advanced"
|
||||||
|
|
||||||
def _query_debit(self):
|
def _query_debit(self):
|
||||||
"""Select all move (debit>0) as candidate. """
|
"""Select all move (debit>0) as candidate."""
|
||||||
select = self._select_query()
|
select = self._select_query()
|
||||||
sql_from = self._from_query()
|
sql_from = self._from_query()
|
||||||
where, params = self._where_query()
|
where, params = self._where_query()
|
||||||
@@ -28,7 +28,7 @@ class MassReconcileAdvanced(models.AbstractModel):
|
|||||||
return self.env.cr.dictfetchall()
|
return self.env.cr.dictfetchall()
|
||||||
|
|
||||||
def _query_credit(self):
|
def _query_credit(self):
|
||||||
"""Select all move (credit>0) as candidate. """
|
"""Select all move (credit>0) as candidate."""
|
||||||
select = self._select_query()
|
select = self._select_query()
|
||||||
sql_from = self._from_query()
|
sql_from = self._from_query()
|
||||||
where, params = self._where_query()
|
where, params = self._where_query()
|
||||||
@@ -220,7 +220,7 @@ class MassReconcileAdvanced(models.AbstractModel):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def _rec_auto_lines_advanced(self, credit_lines, debit_lines):
|
def _rec_auto_lines_advanced(self, credit_lines, debit_lines):
|
||||||
""" Advanced reconciliation main loop """
|
"""Advanced reconciliation main loop"""
|
||||||
# pylint: disable=invalid-commit
|
# pylint: disable=invalid-commit
|
||||||
reconciled_ids = []
|
reconciled_ids = []
|
||||||
reconcile_groups = []
|
reconcile_groups = []
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ class AccountMassReconcile(models.Model):
|
|||||||
}
|
}
|
||||||
|
|
||||||
def open_unreconcile(self):
|
def open_unreconcile(self):
|
||||||
""" Open the view of move line with the unreconciled move lines"""
|
"""Open the view of move line with the unreconciled move lines"""
|
||||||
self.ensure_one()
|
self.ensure_one()
|
||||||
obj_move_line = self.env["account.move.line"]
|
obj_move_line = self.env["account.move.line"]
|
||||||
lines = obj_move_line.search(
|
lines = obj_move_line.search(
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ from odoo.tests.common import TransactionCase
|
|||||||
|
|
||||||
|
|
||||||
class TestAccountPartnerReconcile(TransactionCase):
|
class TestAccountPartnerReconcile(TransactionCase):
|
||||||
""" Tests for Account Partner Reconcile."""
|
"""Tests for Account Partner Reconcile."""
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestAccountPartnerReconcile, self).setUp()
|
super(TestAccountPartnerReconcile, self).setUp()
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ class TestAccountReconcileReconciliationDate(AccountTestInvoicingCommon):
|
|||||||
partner=None,
|
partner=None,
|
||||||
account_id=None,
|
account_id=None,
|
||||||
):
|
):
|
||||||
""" Returns an open invoice """
|
"""Returns an open invoice"""
|
||||||
invoice = self.invoice_model.create(
|
invoice = self.invoice_model.create(
|
||||||
{
|
{
|
||||||
"partner_id": partner or self.partner_agrolait.id,
|
"partner_id": partner or self.partner_agrolait.id,
|
||||||
|
|||||||
@@ -846,7 +846,7 @@ class AccountReconciliation(models.AbstractModel):
|
|||||||
def _domain_move_lines_for_manual_reconciliation(
|
def _domain_move_lines_for_manual_reconciliation(
|
||||||
self, account_id, partner_id=False, excluded_ids=None, search_str=False
|
self, account_id, partner_id=False, excluded_ids=None, search_str=False
|
||||||
):
|
):
|
||||||
""" Create domain criteria that are relevant to manual reconciliation. """
|
"""Create domain criteria that are relevant to manual reconciliation."""
|
||||||
domain = [
|
domain = [
|
||||||
"&",
|
"&",
|
||||||
"&",
|
"&",
|
||||||
@@ -1072,7 +1072,7 @@ class AccountReconciliation(models.AbstractModel):
|
|||||||
|
|
||||||
@api.model
|
@api.model
|
||||||
def _get_move_line_reconciliation_proposition(self, account_id, partner_id=None):
|
def _get_move_line_reconciliation_proposition(self, account_id, partner_id=None):
|
||||||
""" Returns two lines whose amount are opposite """
|
"""Returns two lines whose amount are opposite"""
|
||||||
|
|
||||||
Account_move_line = self.env["account.move.line"]
|
Account_move_line = self.env["account.move.line"]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user