Compare commits
No commits in common. "3f822a28cfa9187b3c6f5185111f9db13e3d8aef" and "e4e03d4794574e5b01cd654d3ff986916c6cf58f" have entirely different histories.
3f822a28cf
...
e4e03d4794
3 changed files with 19 additions and 11 deletions
7
mypy.ini
7
mypy.ini
|
|
@ -5,13 +5,8 @@
|
||||||
exclude = .*/migrations/.*
|
exclude = .*/migrations/.*
|
||||||
|
|
||||||
# Ignore missing imports from Odoo modules
|
# Ignore missing imports from Odoo modules
|
||||||
|
[mypy-odoo.*]
|
||||||
ignore_missing_imports = True
|
ignore_missing_imports = True
|
||||||
|
|
||||||
[mypy-odoo]
|
[mypy-odoo]
|
||||||
ignore_missing_imports = True
|
ignore_missing_imports = True
|
||||||
|
|
||||||
[mypy-odoo.*]
|
|
||||||
ignore_missing_imports = True
|
|
||||||
|
|
||||||
[mypy-odoo.addons.*]
|
|
||||||
ignore_missing_imports = True
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
{ # noqa: B018
|
{ # noqa: B018
|
||||||
"name": "Website Sale - Aplicoop",
|
"name": "Website Sale - Aplicoop",
|
||||||
"version": "18.0.1.7.0",
|
"version": "18.0.1.6.0",
|
||||||
"category": "Website/Sale",
|
"category": "Website/Sale",
|
||||||
"summary": "Modern replacement of legacy Aplicoop - Collaborative consumption group orders",
|
"summary": "Modern replacement of legacy Aplicoop - Collaborative consumption group orders",
|
||||||
"author": "Odoo Community Association (OCA), Criptomart",
|
"author": "Odoo Community Association (OCA), Criptomart",
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
"stock",
|
"stock",
|
||||||
"account",
|
"account",
|
||||||
"product_get_price_helper",
|
"product_get_price_helper",
|
||||||
"product_origin_char",
|
"product_origin",
|
||||||
],
|
],
|
||||||
"data": [
|
"data": [
|
||||||
# Datos: Grupos propios
|
# Datos: Grupos propios
|
||||||
|
|
|
||||||
|
|
@ -1142,7 +1142,7 @@
|
||||||
</p>
|
</p>
|
||||||
</t>
|
</t>
|
||||||
<t
|
<t
|
||||||
t-if="product.origin_text"
|
t-if="product.country_id or product.state_id"
|
||||||
>
|
>
|
||||||
<p
|
<p
|
||||||
class="product-origin mb-2"
|
class="product-origin mb-2"
|
||||||
|
|
@ -1153,8 +1153,21 @@
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
/>
|
/>
|
||||||
<t
|
<t
|
||||||
t-out="product.origin_text"
|
t-if="product.state_id"
|
||||||
|
>
|
||||||
|
<t
|
||||||
|
t-out="product.state_id.name"
|
||||||
|
/><t
|
||||||
|
t-if="product.country_id"
|
||||||
|
>, </t>
|
||||||
|
</t>
|
||||||
|
<t
|
||||||
|
t-if="product.country_id"
|
||||||
|
>
|
||||||
|
<t
|
||||||
|
t-out="product.country_id.name"
|
||||||
/>
|
/>
|
||||||
|
</t>
|
||||||
</small>
|
</small>
|
||||||
</p>
|
</p>
|
||||||
</t>
|
</t>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue