CriptoMart/addons-cm
2
0
Fork 0
Code Issues 2 Pull requests Releases Wiki Activity

Compare commits

base: CriptoMart:3f822a28cfa9187b3c6f5185111f9db13e3d8aef
Branches Tags
CriptoMart:16.0
CriptoMart:18.0
CriptoMart:feature/refactor-cyclomatic-complexity
CriptoMart:17.0
CriptoMart:test
CriptoMart:12.0
CriptoMart:master
..
compare: CriptoMart:e4e03d4794574e5b01cd654d3ff986916c6cf58f
Branches Tags
CriptoMart:18.0
CriptoMart:16.0
CriptoMart:feature/refactor-cyclomatic-complexity
CriptoMart:17.0
CriptoMart:test
CriptoMart:12.0
CriptoMart:master

No commits in common. "3f822a28cfa9187b3c6f5185111f9db13e3d8aef" and "e4e03d4794574e5b01cd654d3ff986916c6cf58f" have entirely different histories.
3f822a28cf ... e4e03d4794

3 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mypy.ini
View file

@ -5,13 +5,8 @@
exclude = .*/migrations/.*
# Ignore missing imports from Odoo modules
[mypy-odoo.*]
ignore_missing_imports = True
[mypy-odoo]
ignore_missing_imports = True
[mypy-odoo.*]
ignore_missing_imports = True
[mypy-odoo.addons.*]
ignore_missing_imports = True

4
website_sale_aplicoop/__manifest__.py
View file

@ -3,7 +3,7 @@
{ # noqa: B018
"name": "Website Sale - Aplicoop",
"version": "18.0.1.7.0",
"version": "18.0.1.6.0",
"category": "Website/Sale",
"summary": "Modern replacement of legacy Aplicoop - Collaborative consumption group orders",
"author": "Odoo Community Association (OCA), Criptomart",
@ -17,7 +17,7 @@
"stock",
"account",
"product_get_price_helper",
"product_origin_char",
"product_origin",
],
"data": [
# Datos: Grupos propios

17
website_sale_aplicoop/views/website_templates.xml
View file

@ -1142,7 +1142,7 @@
</p>
</t>
<t
t-if="product.origin_text"
t-if="product.country_id or product.state_id"
>
<p
class="product-origin mb-2"
@ -1153,8 +1153,21 @@
aria-hidden="true"
/>
<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>
</p>
</t>