Skip to content

Commit

Permalink
[BETA] Merge in-progress PRs:
Browse files Browse the repository at this point in the history
  • Loading branch information
aisopuro committed Sep 5, 2024
2 parents 0b4c9ac + 88e2b33 commit be8f71c
Show file tree
Hide file tree
Showing 161 changed files with 8,301 additions and 162 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.19
_commit: v1.24
_src_path: gh:oca/oca-addons-repo-template
additional_ruff_rules: []
ci: GitHub
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:

# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
parserOptions:
ecmaVersion: 2019
ecmaVersion: 2022

overrides:
- files:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Stale PRs and issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# General settings.
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
# * Issues that are pending more information
# * Except Issues marked as "no stale"
- name: Needs more information stale issues policy
uses: actions/stale@v4
uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ascending: true
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ jobs:
run: oca_init_test_database
- name: Run tests
run: oca_run_tests
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
- name: Update .pot files
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }}
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ var/
*.egg
*.eggs

# Debian packages
*.deb

# Redhat packages
*.rpm

# MacOS packages
*.dmg

# Installer logs
pip-log.txt
pip-delete-this-directory.txt
Expand Down
6 changes: 4 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ exclude: |
readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# Ignore test files in addons
/tests/samples/.*|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -41,7 +43,7 @@ repos:
hooks:
- id: whool-init
- repo: https://github.com/oca/maintainer-tools
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
rev: d5fab7ee87fceee858a3d01048c78a548974d935
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
Expand Down Expand Up @@ -110,7 +112,7 @@ repos:
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
rev: v8.0.19
rev: v9.0.4
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
1 change: 1 addition & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ fix = true
extend-select = [
"B",
"C90",
"E501", # line too long (default 88)
"I", # isort
"UP", # pyupgrade
]
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ Available addons
addon | version | maintainers | summary
--- | --- | --- | ---
[account_analytic_parent](account_analytic_parent/) | 17.0.1.0.0 | | This module reintroduces the hierarchy to the analytic accounts.
[account_analytic_required](account_analytic_required/) | 17.0.1.0.0 | | Account Analytic Required
[account_analytic_tag](account_analytic_tag/) | 17.0.1.0.0 | | Account Analytic Tag
[analytic_base_department](analytic_base_department/) | 17.0.1.0.0 | | Add relationship between Analytic and Department
[stock_analytic](stock_analytic/) | 17.0.1.0.0 | | Adds analytic distribution in stock move
[stock_picking_analytic](stock_picking_analytic/) | 17.0.1.0.0 | | Allows to define the analytic account on picking level

[//]: # (end addons)

Expand Down
48 changes: 24 additions & 24 deletions account_analytic_parent/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-30 02:40+0000\n"
"PO-Revision-Date: 2019-10-07 11:10+0000\n"
"Last-Translator: Jaume Planas <jaume.planas@minorisa.net>\n"
"PO-Revision-Date: 2024-05-28 16:40+0000\n"
"Last-Translator: Santiago Payà <santiagopim@gmail.com>\n"
"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.8\n"
"X-Generator: Weblate 4.17\n"

#. module: account_analytic_parent
#. odoo-python
Expand All @@ -36,7 +36,7 @@ msgstr "%(parent)s / %(own)s"
#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_administratif
msgid "Administrative"
msgstr ""
msgstr "Administratiu"

#. module: account_analytic_parent
#: model:ir.model,name:account_analytic_parent.model_account_analytic_account
Expand All @@ -51,7 +51,7 @@ msgstr "Comptes fills"
#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_commercial_marketing
msgid "Commercial & Marketing"
msgstr ""
msgstr "Comercial & Màrqueting"

#. module: account_analytic_parent
#: model:ir.model.fields,field_description:account_analytic_parent.field_account_analytic_account__complete_name
Expand All @@ -61,33 +61,33 @@ msgstr "Nom complet"
#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_consultancy
msgid "Consultancy"
msgstr ""
msgstr "Assessorament"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_customers
msgid "Customers"
msgstr ""
msgstr "Clients"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_1_development
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_2_development
msgid "Development"
msgstr ""
msgstr "En desenvolupament"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_in_house
msgid "In House"
msgstr ""
msgstr "En l'emplaçament"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_integration
msgid "Integration"
msgstr ""
msgstr "Integració"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_support_internal
msgid "Internal"
msgstr ""
msgstr "Intern"

#. module: account_analytic_parent
#: model_terms:ir.ui.view,arch_db:account_analytic_parent.view_account_analytic_account_list
Expand All @@ -97,17 +97,17 @@ msgstr "Nom"
#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_online
msgid "Online"
msgstr ""
msgstr "En línia"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_our_super_product_development
msgid "Our Super Product Development"
msgstr ""
msgstr "El Nostre Súper Desenvolupament de Producte"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_paid
msgid "Paid"
msgstr ""
msgstr "Pagat"

#. module: account_analytic_parent
#: model:ir.model.fields,field_description:account_analytic_parent.field_account_analytic_account__parent_id
Expand All @@ -123,7 +123,7 @@ msgstr "Camí pare"
#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_partners
msgid "Partners"
msgstr ""
msgstr "Socis"

#. module: account_analytic_parent
#. odoo-python
Expand All @@ -135,50 +135,50 @@ msgstr "Primer activeu el compte pare %s"
#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_1
msgid "Project 1"
msgstr ""
msgstr "Projecte 1"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_2
msgid "Project 2"
msgstr ""
msgstr "Projecte 2"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_seagate_p1
msgid "Seagate P1"
msgstr ""
msgstr "P1 de Seagate"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_seagate_p2
msgid "Seagate P2"
msgstr ""
msgstr "P2 de Seagate"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_stable
msgid "Stable"
msgstr ""
msgstr "Estable"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_2_support
#: model:account.analytic.account,name:account_analytic_parent.analytic_support
msgid "Support"
msgstr ""
msgstr "Suport"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_journal_trainings
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_1_trainings
#: model:account.analytic.account,name:account_analytic_parent.analytic_super_product_trainings
msgid "Training"
msgstr ""
msgstr "Formació"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_trunk
msgid "Trunk"
msgstr ""
msgstr "Bagul"

#. module: account_analytic_parent
#: model:account.analytic.account,name:account_analytic_parent.analytic_unpaid
msgid "Unpaid"
msgstr ""
msgstr "Impagat"

#. module: account_analytic_parent
#. odoo-python
Expand Down
Loading

0 comments on commit be8f71c

Please sign in to comment.