diff --git a/addons/point_of_sale/views/product_view.xml b/addons/point_of_sale/views/product_view.xml
index a4a5ebf1163..c8b903db57e 100644
--- a/addons/point_of_sale/views/product_view.xml
+++ b/addons/point_of_sale/views/product_view.xml
@@ -94,9 +94,6 @@
detailed_type == "combo"
-
- 0
-
diff --git a/addons/pos_self_order/__manifest__.py b/addons/pos_self_order/__manifest__.py
index f66d0d64721..e86b49db248 100644
--- a/addons/pos_self_order/__manifest__.py
+++ b/addons/pos_self_order/__manifest__.py
@@ -64,8 +64,6 @@
'web/static/lib/bootstrap/js/dist/scrollspy.js',
"pos_self_order/static/src/app/**/*",
"point_of_sale/static/src/app/store/models/product_custom_attribute.js",
- 'web_editor/static/src/js/editor/odoo-editor/src/base_style.scss',
- 'web_editor/static/src/scss/web_editor.common.scss',
],
# Assets tests
"pos_self_order.assets_tests": [
diff --git a/addons/pos_self_order/models/product_product.py b/addons/pos_self_order/models/product_product.py
index f14fdfcb79d..7bdd490a7a1 100644
--- a/addons/pos_self_order/models/product_product.py
+++ b/addons/pos_self_order/models/product_product.py
@@ -117,7 +117,7 @@ class ProductProduct(models.Model):
"attributes": self._get_attributes(pos_config),
"name": self._get_name(),
"id": self.id,
- "description_ecommerce": self.description_ecommerce,
+ "description_sale": self.description_sale,
"pos_categ_ids": self.pos_categ_ids.mapped("name") or ["Other"],
"pos_combo_ids": self.combo_ids.mapped("id") or False,
"is_pos_groupable": self.uom_id.is_pos_groupable,
diff --git a/addons/pos_self_order/static/src/app/components/product_card/product_card.js b/addons/pos_self_order/static/src/app/components/product_card/product_card.js
index 144c1e41c99..95dd5d420e9 100644
--- a/addons/pos_self_order/static/src/app/components/product_card/product_card.js
+++ b/addons/pos_self_order/static/src/app/components/product_card/product_card.js
@@ -4,7 +4,6 @@ import { Component, useRef } from "@odoo/owl";
import { useSelfOrder } from "@pos_self_order/app/self_order_service";
import { useService, useForwardRefToParent } from "@web/core/utils/hooks";
import { Line } from "@pos_self_order/app/models/line";
-import { ProductInfoPopup } from "@pos_self_order/app/components/product_info_popup/product_info_popup";
export class ProductCard extends Component {
static template = "pos_self_order.ProductCard";
@@ -16,7 +15,6 @@ export class ProductCard extends Component {
setup() {
this.selfOrder = useSelfOrder();
this.router = useService("router");
- this.dialog = useService("dialog");
useForwardRefToParent("currentProductCard");
}
@@ -111,11 +109,4 @@ export class ProductCard extends Component {
await this.selfOrder.getPricesFromServer();
}
}
-
- getProductInfo() {
- this.dialog.add(ProductInfoPopup, {
- product: this.props.product,
- title: this.props.product.name,
- });
- }
}
diff --git a/addons/pos_self_order/static/src/app/components/product_card/product_card.scss b/addons/pos_self_order/static/src/app/components/product_card/product_card.scss
index d92c7b388e9..834a90b8e65 100644
--- a/addons/pos_self_order/static/src/app/components/product_card/product_card.scss
+++ b/addons/pos_self_order/static/src/app/components/product_card/product_card.scss
@@ -2,7 +2,6 @@
width: 100%;
display:flex;
flex-direction: column;
- position: relative;
.o_self_order_item_card_image {
width: 100%;
@@ -29,22 +28,3 @@
}
}
}
-
-.product-information-tag {
- width: 0;
- height: 0;
- border-style: solid;
- border-width: 0 40px 40px 0;
- border-color: transparent #9a9ea180 transparent transparent;
- position: absolute;
- top: 0;
- right: 0;
- color: white;
- text-align: center;
-}
-
-.product-information-tag-logo {
- position: absolute;
- left: 25px;
- top: 4px;
-}
diff --git a/addons/pos_self_order/static/src/app/components/product_card/product_card.xml b/addons/pos_self_order/static/src/app/components/product_card/product_card.xml
index 38e3eb2bf36..9e540b82f45 100644
--- a/addons/pos_self_order/static/src/app/components/product_card/product_card.xml
+++ b/addons/pos_self_order/static/src/app/components/product_card/product_card.xml
@@ -5,9 +5,6 @@
diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 0630795a840..04a70d5fea6 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -8,7 +8,6 @@ from collections import defaultdict
from odoo import api, fields, models, tools, _, SUPERUSER_ID
from odoo.exceptions import UserError, ValidationError
from odoo.osv import expression
-from odoo.tools.translate import html_translate
_logger = logging.getLogger(__name__)
PRICE_CONTEXT_KEYS = ['pricelist', 'quantity', 'uom', 'date']
@@ -49,13 +48,6 @@ class ProductTemplate(models.Model):
'Sales Description', translate=True,
help="A description of the Product that you want to communicate to your customers. "
"This description will be copied to every Sales Order, Delivery Order and Customer Invoice/Credit Note")
- description_ecommerce = fields.Html(
- string="eCommerce Description",
- translate=html_translate,
- sanitize_overridable=True,
- sanitize_attributes=False,
- sanitize_form=False,
- )
detailed_type = fields.Selection([
('consu', 'Consumable'),
('service', 'Service')], string='Product Type', default='consu', required=True,
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 573bb432055..67da7f7ff3d 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -104,12 +104,6 @@
-
-
-
diff --git a/addons/website_sale/models/product_template.py b/addons/website_sale/models/product_template.py
index f464dbfb496..6e5231b0dd5 100644
--- a/addons/website_sale/models/product_template.py
+++ b/addons/website_sale/models/product_template.py
@@ -48,6 +48,13 @@ class ProductTemplate(models.Model):
sanitize_attributes=False,
sanitize_form=False,
)
+ description_ecommerce = fields.Html(
+ string="eCommerce Description",
+ translate=html_translate,
+ sanitize_overridable=True,
+ sanitize_attributes=False,
+ sanitize_form=False,
+ )
alternative_product_ids = fields.Many2many(
string="Alternative Products",
diff --git a/addons/website_sale/views/product_views.xml b/addons/website_sale/views/product_views.xml
index 242695bc41d..0c75212cb62 100644
--- a/addons/website_sale/views/product_views.xml
+++ b/addons/website_sale/views/product_views.xml
@@ -157,9 +157,6 @@
invisible="not sale_ok"
placeholder="Displayed in bottom of product pages"/>
-
- 0
-
@@ -171,6 +168,12 @@
+
+
+