-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '14.0' into 14.0-add-mrp_bom_structure_xlsx_cost
- Loading branch information
Showing
267 changed files
with
4,942 additions
and
2,431 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| name: pre-commit | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: | ||
| - "14.0*" | ||
| push: | ||
| branches: | ||
| - "14.0" | ||
| - "14.0-ocabot-*" | ||
|
|
||
| jobs: | ||
| pre-commit: | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - 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 | ||
| with: | ||
| path: ~/.cache/pre-commit | ||
| key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} | ||
| - name: Install pre-commit | ||
| 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)" | ||
| if [ "$newfiles" != "" ] ; then | ||
| echo "Please check-in the following files:" | ||
| echo "$newfiles" | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ __pycache__/ | |
| *.py[cod] | ||
| /.venv | ||
| /.pytest_cache | ||
| /.ruff_cache | ||
|
|
||
| # C extensions | ||
| *.so | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| <odoo> | ||
| <data noupdate="1"> | ||
| <record id="quartering_sequence" model="ir.sequence"> | ||
| <field name="name">Secuencia para órdenes de producción de despiece</field> | ||
| <field name="prefix">DESP/</field> | ||
| <field name="padding">5</field> | ||
| </record> | ||
| <record id="classified_sequence" model="ir.sequence"> | ||
| <field name="name">Secuencia para órdenes de producción de clasificado</field> | ||
| <field name="prefix">CLAS/</field> | ||
| <field name="padding">5</field> | ||
| </record> | ||
| </data> | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <odoo noupdate="1"> | ||
| <record id="quartering_sequence" model="ir.sequence"> | ||
| <field name="name">Secuencia para órdenes de producción de despiece</field> | ||
| <field name="prefix">DESP/</field> | ||
| <field name="padding">5</field> | ||
| </record> | ||
| <record id="classified_sequence" model="ir.sequence"> | ||
| <field name="name">Secuencia para órdenes de producción de clasificado</field> | ||
| <field name="prefix">CLAS/</field> | ||
| <field name="padding">5</field> | ||
| </record> | ||
| </odoo> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,17 @@ | ||
| <odoo> | ||
| <data noupdate="1"> | ||
| <record id="quartering_category" model="mrp.bom.category"> | ||
| <field name="name">Despiece</field> | ||
| <field name="sequence_id" eval="ref('custom_mrp_descarga.quartering_sequence')"/> | ||
| </record> | ||
| <record id="classified_category" model="mrp.bom.category"> | ||
| <field name="name">Clasificado</field> | ||
| <field name="sequence_id" eval="ref('custom_mrp_descarga.classified_sequence')"/> | ||
| </record> | ||
| </data> | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <odoo noupdate="1"> | ||
| <record id="quartering_category" model="mrp.bom.category"> | ||
| <field name="name">Despiece</field> | ||
| <field | ||
| name="sequence_id" | ||
| eval="ref('custom_mrp_descarga.quartering_sequence')" | ||
| /> | ||
| </record> | ||
| <record id="classified_category" model="mrp.bom.category"> | ||
| <field name="name">Clasificado</field> | ||
| <field | ||
| name="sequence_id" | ||
| eval="ref('custom_mrp_descarga.classified_sequence')" | ||
| /> | ||
| </record> | ||
| </odoo> |
Oops, something went wrong.