Skip to content

Commit be8f71c

Browse files
committed
[BETA] Merge in-progress PRs:
* OCA#682 * OCA#644 * OCA#687
2 parents 0b4c9ac + 88e2b33 commit be8f71c

File tree

161 files changed

+8301
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+8301
-162
lines changed

.copier-answers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.19
2+
_commit: v1.24
33
_src_path: gh:oca/oca-addons-repo-template
44
additional_ruff_rules: []
55
ci: GitHub

.eslintrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ env:
44

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

99
overrides:
1010
- files:

.github/workflows/stale.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Stale PRs and issues policy
12-
uses: actions/stale@v4
12+
uses: actions/stale@v9
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
# General settings.
@@ -48,7 +48,7 @@ jobs:
4848
# * Issues that are pending more information
4949
# * Except Issues marked as "no stale"
5050
- name: Needs more information stale issues policy
51-
uses: actions/stale@v4
51+
uses: actions/stale@v9
5252
with:
5353
repo-token: ${{ secrets.GITHUB_TOKEN }}
5454
ascending: true

.github/workflows/test.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ jobs:
6363
run: oca_init_test_database
6464
- name: Run tests
6565
run: oca_run_tests
66-
- uses: codecov/codecov-action@v1
66+
- uses: codecov/codecov-action@v4
67+
with:
68+
token: ${{ secrets.CODECOV_TOKEN }}
6769
- name: Update .pot files
6870
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
6971
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'OCA' }}

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ var/
2525
*.egg
2626
*.eggs
2727

28+
# Debian packages
29+
*.deb
30+
31+
# Redhat packages
32+
*.rpm
33+
34+
# MacOS packages
35+
*.dmg
36+
2837
# Installer logs
2938
pip-log.txt
3039
pip-delete-this-directory.txt

.pre-commit-config.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ exclude: |
1616
readme/.*\.(rst|md)$|
1717
# Ignore build and dist directories in addons
1818
/build/|/dist/|
19+
# Ignore test files in addons
20+
/tests/samples/.*|
1921
# You don't usually want a bot to modify your legal texts
2022
(LICENSE.*|COPYING.*)
2123
default_language_version:
@@ -41,7 +43,7 @@ repos:
4143
hooks:
4244
- id: whool-init
4345
- repo: https://github.com/oca/maintainer-tools
44-
rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60
46+
rev: d5fab7ee87fceee858a3d01048c78a548974d935
4547
hooks:
4648
# update the NOT INSTALLABLE ADDONS section above
4749
- id: oca-update-pre-commit-excluded-addons
@@ -110,7 +112,7 @@ repos:
110112
args: [--fix, --exit-non-zero-on-fix]
111113
- id: ruff-format
112114
- repo: https://github.com/OCA/pylint-odoo
113-
rev: v8.0.19
115+
rev: v9.0.4
114116
hooks:
115117
- id: pylint_odoo
116118
name: pylint with optional checks

.ruff.toml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ fix = true
66
extend-select = [
77
"B",
88
"C90",
9+
"E501", # line too long (default 88)
910
"I", # isort
1011
"UP", # pyupgrade
1112
]

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ Available addons
2222
addon | version | maintainers | summary
2323
--- | --- | --- | ---
2424
[account_analytic_parent](account_analytic_parent/) | 17.0.1.0.0 | | This module reintroduces the hierarchy to the analytic accounts.
25+
[account_analytic_required](account_analytic_required/) | 17.0.1.0.0 | | Account Analytic Required
26+
[account_analytic_tag](account_analytic_tag/) | 17.0.1.0.0 | | Account Analytic Tag
27+
[analytic_base_department](analytic_base_department/) | 17.0.1.0.0 | | Add relationship between Analytic and Department
28+
[stock_analytic](stock_analytic/) | 17.0.1.0.0 | | Adds analytic distribution in stock move
29+
[stock_picking_analytic](stock_picking_analytic/) | 17.0.1.0.0 | | Allows to define the analytic account on picking level
2530

2631
[//]: # (end addons)
2732

account_analytic_parent/i18n/ca.po

+24-24
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ msgstr ""
99
"Project-Id-Version: Odoo Server 10.0\n"
1010
"Report-Msgid-Bugs-To: \n"
1111
"POT-Creation-Date: 2017-06-30 02:40+0000\n"
12-
"PO-Revision-Date: 2019-10-07 11:10+0000\n"
13-
"Last-Translator: Jaume Planas <[email protected]>\n"
12+
"PO-Revision-Date: 2024-05-28 16:40+0000\n"
13+
"Last-Translator: Santiago Payà <[email protected]>\n"
1414
"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
1515
"Language: ca\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: \n"
1919
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20-
"X-Generator: Weblate 3.8\n"
20+
"X-Generator: Weblate 4.17\n"
2121

2222
#. module: account_analytic_parent
2323
#. odoo-python
@@ -36,7 +36,7 @@ msgstr "%(parent)s / %(own)s"
3636
#. module: account_analytic_parent
3737
#: model:account.analytic.account,name:account_analytic_parent.analytic_administratif
3838
msgid "Administrative"
39-
msgstr ""
39+
msgstr "Administratiu"
4040

4141
#. module: account_analytic_parent
4242
#: model:ir.model,name:account_analytic_parent.model_account_analytic_account
@@ -51,7 +51,7 @@ msgstr "Comptes fills"
5151
#. module: account_analytic_parent
5252
#: model:account.analytic.account,name:account_analytic_parent.analytic_commercial_marketing
5353
msgid "Commercial & Marketing"
54-
msgstr ""
54+
msgstr "Comercial & Màrqueting"
5555

5656
#. module: account_analytic_parent
5757
#: model:ir.model.fields,field_description:account_analytic_parent.field_account_analytic_account__complete_name
@@ -61,33 +61,33 @@ msgstr "Nom complet"
6161
#. module: account_analytic_parent
6262
#: model:account.analytic.account,name:account_analytic_parent.analytic_consultancy
6363
msgid "Consultancy"
64-
msgstr ""
64+
msgstr "Assessorament"
6565

6666
#. module: account_analytic_parent
6767
#: model:account.analytic.account,name:account_analytic_parent.analytic_customers
6868
msgid "Customers"
69-
msgstr ""
69+
msgstr "Clients"
7070

7171
#. module: account_analytic_parent
7272
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_1_development
7373
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_2_development
7474
msgid "Development"
75-
msgstr ""
75+
msgstr "En desenvolupament"
7676

7777
#. module: account_analytic_parent
7878
#: model:account.analytic.account,name:account_analytic_parent.analytic_in_house
7979
msgid "In House"
80-
msgstr ""
80+
msgstr "En l'emplaçament"
8181

8282
#. module: account_analytic_parent
8383
#: model:account.analytic.account,name:account_analytic_parent.analytic_integration
8484
msgid "Integration"
85-
msgstr ""
85+
msgstr "Integració"
8686

8787
#. module: account_analytic_parent
8888
#: model:account.analytic.account,name:account_analytic_parent.analytic_support_internal
8989
msgid "Internal"
90-
msgstr ""
90+
msgstr "Intern"
9191

9292
#. module: account_analytic_parent
9393
#: model_terms:ir.ui.view,arch_db:account_analytic_parent.view_account_analytic_account_list
@@ -97,17 +97,17 @@ msgstr "Nom"
9797
#. module: account_analytic_parent
9898
#: model:account.analytic.account,name:account_analytic_parent.analytic_online
9999
msgid "Online"
100-
msgstr ""
100+
msgstr "En línia"
101101

102102
#. module: account_analytic_parent
103103
#: model:account.analytic.account,name:account_analytic_parent.analytic_our_super_product_development
104104
msgid "Our Super Product Development"
105-
msgstr ""
105+
msgstr "El Nostre Súper Desenvolupament de Producte"
106106

107107
#. module: account_analytic_parent
108108
#: model:account.analytic.account,name:account_analytic_parent.analytic_paid
109109
msgid "Paid"
110-
msgstr ""
110+
msgstr "Pagat"
111111

112112
#. module: account_analytic_parent
113113
#: model:ir.model.fields,field_description:account_analytic_parent.field_account_analytic_account__parent_id
@@ -123,7 +123,7 @@ msgstr "Camí pare"
123123
#. module: account_analytic_parent
124124
#: model:account.analytic.account,name:account_analytic_parent.analytic_partners
125125
msgid "Partners"
126-
msgstr ""
126+
msgstr "Socis"
127127

128128
#. module: account_analytic_parent
129129
#. odoo-python
@@ -135,50 +135,50 @@ msgstr "Primer activeu el compte pare %s"
135135
#. module: account_analytic_parent
136136
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_1
137137
msgid "Project 1"
138-
msgstr ""
138+
msgstr "Projecte 1"
139139

140140
#. module: account_analytic_parent
141141
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_2
142142
msgid "Project 2"
143-
msgstr ""
143+
msgstr "Projecte 2"
144144

145145
#. module: account_analytic_parent
146146
#: model:account.analytic.account,name:account_analytic_parent.analytic_seagate_p1
147147
msgid "Seagate P1"
148-
msgstr ""
148+
msgstr "P1 de Seagate"
149149

150150
#. module: account_analytic_parent
151151
#: model:account.analytic.account,name:account_analytic_parent.analytic_seagate_p2
152152
msgid "Seagate P2"
153-
msgstr ""
153+
msgstr "P2 de Seagate"
154154

155155
#. module: account_analytic_parent
156156
#: model:account.analytic.account,name:account_analytic_parent.analytic_stable
157157
msgid "Stable"
158-
msgstr ""
158+
msgstr "Estable"
159159

160160
#. module: account_analytic_parent
161161
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_2_support
162162
#: model:account.analytic.account,name:account_analytic_parent.analytic_support
163163
msgid "Support"
164-
msgstr ""
164+
msgstr "Suport"
165165

166166
#. module: account_analytic_parent
167167
#: model:account.analytic.account,name:account_analytic_parent.analytic_journal_trainings
168168
#: model:account.analytic.account,name:account_analytic_parent.analytic_project_1_trainings
169169
#: model:account.analytic.account,name:account_analytic_parent.analytic_super_product_trainings
170170
msgid "Training"
171-
msgstr ""
171+
msgstr "Formació"
172172

173173
#. module: account_analytic_parent
174174
#: model:account.analytic.account,name:account_analytic_parent.analytic_trunk
175175
msgid "Trunk"
176-
msgstr ""
176+
msgstr "Bagul"
177177

178178
#. module: account_analytic_parent
179179
#: model:account.analytic.account,name:account_analytic_parent.analytic_unpaid
180180
msgid "Unpaid"
181-
msgstr ""
181+
msgstr "Impagat"
182182

183183
#. module: account_analytic_parent
184184
#. odoo-python

0 commit comments

Comments
 (0)