[MIG] pos_margin: Migration to 18.0

Author: Tisho99

pos_margin/README.rst

@@ -17,13 +17,13 @@ PoS Order Margin
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github
-    :target: https://github.com/OCA/pos/tree/17.0/pos_margin
+    :target: https://github.com/OCA/pos/tree/18.0/pos_margin
     :alt: OCA/pos
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/pos-17-0/pos-17-0-pos_margin
+    :target: https://translation.odoo-community.org/projects/pos-18-0/pos-18-0-pos_margin
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -38,13 +38,13 @@ This module shows margins in PoS frontend during an order creation.
 Configuration
 =============
 
-- If you want to disable the display of the margin, in the front-office
-  UI, you can uncheck the check box in the res.config.settings shop
-  form:
+-  If you want to disable the display of the margin, in the front-office
+   UI, you can uncheck the check box in the res.config.settings shop
+   form:
 
 |image1|
 
-.. |image1| image:: https://raw.githubusercontent.com/OCA/pos/17.0/pos_margin/static/description/pos_config_setting.png
+.. |image1| image:: https://raw.githubusercontent.com/OCA/pos/18.0/pos_margin/static/description/pos_config_setting.png
 
 Usage
 =====
@@ -64,34 +64,34 @@ Changelog
 16.0.1.0.0
 ----------
 
-- Migrate to V16.0
-- Remove ``pos.order`` and ``pos.order.line`` funcionality from V14.0.
-  It's already done by V16.0.
-- Remove tests.
-- Create a ``res.config.settings`` field pos_iface_display_margin to
-  display margins in PoS frontend.
+-  Migrate to V16.0
+-  Remove ``pos.order`` and ``pos.order.line`` funcionality from V14.0.
+   It's already done by V16.0.
+-  Remove tests.
+-  Create a ``res.config.settings`` field pos_iface_display_margin to
+   display margins in PoS frontend.
 
 14.0.1.0.0
 ----------
 
-- Migrate to V14.0
+-  Migrate to V14.0
 
 13.0.1.0.0
 ----------
 
-- Migrate to V13.0
-- Reuse ``sale_margin`` computation to handle multi currency context.
-- Correct computation of margin, if a module that adds ``uom_id`` on
-  ``pos.order.line`` is installed.
-- Add test
+-  Migrate to V13.0
+-  Reuse ``sale_margin`` computation to handle multi currency context.
+-  Correct computation of margin, if a module that adds ``uom_id`` on
+   ``pos.order.line`` is installed.
+-  Add test
 
 Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/pos/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/pos/issues/new?body=module:%20pos_margin%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/pos/issues/new?body=module:%20pos_margin%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -107,12 +107,13 @@ Authors
 Contributors
 ------------
 
-- Sylvain LE GAL (https://twitter.com/legalsylvain)
-- Wolfgang Pichler
-- Murtaza Mithaiwala (https://twitter.com/MurtazaMithaiw4)
-- Dhara Solanki <dhara.solanki@initos.com>
-- Juan Carlos Bonilla <juancarlos.bonilla@factorlibre.com>
-- Antonio Ruban <antoniodavid8@gmail.com>
+-  Sylvain LE GAL (https://twitter.com/legalsylvain)
+-  Wolfgang Pichler
+-  Murtaza Mithaiwala (https://twitter.com/MurtazaMithaiw4)
+-  Dhara Solanki <dhara.solanki@initos.com>
+-  Juan Carlos Bonilla <juancarlos.bonilla@factorlibre.com>
+-  Antonio Ruban <antoniodavid8@gmail.com>
+-  Alberto Martínez <alberto.martinez@sygel.es>
 
 Maintainers
 -----------
@@ -135,6 +136,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-legalsylvain| 
 
-This module is part of the `OCA/pos <https://github.com/OCA/pos/tree/17.0/pos_margin>`_ project on GitHub.
+This module is part of the `OCA/pos <https://github.com/OCA/pos/tree/18.0/pos_margin>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

pos_margin/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "PoS Order Margin",
     "summary": "Margin on PoS Order",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "category": "Point Of Sale",
     "author": "GRAP, FactorLibre, Odoo Community Association (OCA)",
     "maintainers": ["legalsylvain"],

pos_margin/readme/CONTRIBUTORS.md

@@ -4,3 +4,4 @@
 - Dhara Solanki \<dhara.solanki@initos.com\>
 - Juan Carlos Bonilla \<juancarlos.bonilla@factorlibre.com\>
 - Antonio Ruban \<antoniodavid8@gmail.com\>
+- Alberto Martínez \<alberto.martinez@sygel.es\>

pos_margin/report/pos_order_report.py

@@ -14,14 +14,14 @@ def _select(self):
         return (
             super()._select()
             + """,
-             SUM(
+            (
                 l.price_subtotal - l.total_cost /
                 CASE COALESCE(s.currency_rate, 0)
                     WHEN 0 THEN 1.0
                     ELSE s.currency_rate
                 END
-             ) / NULLIF(SUM(l.price_subtotal), 0) * 100
-             AS margin_rate
+            ) / NULLIF(l.price_subtotal, 0) * 100
+            AS margin_rate
             """
         )
 

pos_margin/static/description/index.html

@@ -369,7 +369,7 @@ <h1 class="title">PoS Order Margin</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:5efe86f27e3f8a6c1fa3ea8fa60ee57d4c767bb29d04edc3c284a0b5baa6ede9
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/pos/tree/17.0/pos_margin"><img alt="OCA/pos" src="https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/pos-17-0/pos-17-0-pos_margin"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/pos&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/pos/tree/18.0/pos_margin"><img alt="OCA/pos" src="https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/pos-18-0/pos-18-0-pos_margin"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/pos&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module shows margins in PoS frontend during an order creation.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -399,7 +399,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 UI, you can uncheck the check box in the res.config.settings shop
 form:</li>
 </ul>
-<p><img alt="image1" src="https://raw.githubusercontent.com/OCA/pos/17.0/pos_margin/static/description/pos_config_setting.png" /></p>
+<p><img alt="image1" src="https://raw.githubusercontent.com/OCA/pos/18.0/pos_margin/static/description/pos_config_setting.png" /></p>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
@@ -445,7 +445,7 @@ <h1><a class="toc-backref" href="#toc-entry-8">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/pos/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/pos/issues/new?body=module:%20pos_margin%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/pos/issues/new?body=module:%20pos_margin%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -466,6 +466,7 @@ <h2><a class="toc-backref" href="#toc-entry-11">Contributors</a></h2>
 <li>Dhara Solanki &lt;<a class="reference external" href="mailto:dhara.solanki&#64;initos.com">dhara.solanki&#64;initos.com</a>&gt;</li>
 <li>Juan Carlos Bonilla &lt;<a class="reference external" href="mailto:juancarlos.bonilla&#64;factorlibre.com">juancarlos.bonilla&#64;factorlibre.com</a>&gt;</li>
 <li>Antonio Ruban &lt;<a class="reference external" href="mailto:antoniodavid8&#64;gmail.com">antoniodavid8&#64;gmail.com</a>&gt;</li>
+<li>Alberto Martínez &lt;<a class="reference external" href="mailto:alberto.martinez&#64;sygel.es">alberto.martinez&#64;sygel.es</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -479,7 +480,7 @@ <h2><a class="toc-backref" href="#toc-entry-12">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/legalsylvain"><img alt="legalsylvain" src="https://github.com/legalsylvain.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/pos/tree/17.0/pos_margin">OCA/pos</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/pos/tree/18.0/pos_margin">OCA/pos</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

pos_margin/static/src/js/OrderSummaryMargin.esm.js

@@ -1,4 +1,3 @@
-/** @odoo-module **/
 // Copyright (C) 2023 - Today: GRAP (http://www.grap.coop)
 // @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

pos_margin/static/src/js/models.esm.js

@@ -1,15 +1,17 @@
-/** @odoo-module **/
 // Copyright (C) 2023 - Today: GRAP (http://www.grap.coop)
 // @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-import {Order, Orderline} from "@point_of_sale/app/store/models";
+import {Orderline} from "@point_of_sale/app/generic_components/orderline/orderline";
+import {PosOrder} from "@point_of_sale/app/models/pos_order";
+import {PosOrderline} from "@point_of_sale/app/models/pos_order_line";
 import {patch} from "@web/core/utils/patch";
+import {roundCurrency} from "@point_of_sale/app/models/utils/currency";
 
 // /////////////////////////////
-// Overload models.Order
+// Overload models.PosOrder
 // /////////////////////////////
-patch(Order.prototype, {
+patch(PosOrder.prototype, {
     get_margin() {
         return this.get_orderlines().reduce(
             (margin, line) => margin + line.get_margin(),
@@ -22,18 +24,14 @@ patch(Order.prototype, {
     },
 
     get_margin_rate_str() {
-        return this.env.utils.roundCurrency(this.get_margin_rate()) + "%";
+        return roundCurrency(this.get_margin_rate(), this.currency) + "%";
     },
 });
 
 // /////////////////////////////
-// Overload models.OrderLine
+// Overload models.PosOrderline
 // /////////////////////////////
-patch(Orderline.prototype, {
-    setup() {
-        super.setup(...arguments);
-        console.log(this.pos);
-    },
+patch(PosOrderline.prototype, {
     getDisplayData() {
         return {
             ...super.getDisplayData(),
@@ -43,23 +41,37 @@ patch(Orderline.prototype, {
         };
     },
     get_iface_display_margin() {
-        return this.pos.config.iface_display_margin;
+        return this.config.iface_display_margin;
     },
     get_purchase_price() {
         // Overload the function to use another field that the default standard_price
-        return this.product.standard_price;
+        return this.product_id.standard_price;
     },
     get_margin() {
         return (
-            this.get_all_prices().priceWithoutTax -
-            this.quantity * this.get_purchase_price()
+            this.get_all_prices().priceWithoutTax - this.qty * this.get_purchase_price()
         );
     },
     get_margin_rate() {
         const priceWithoutTax = this.get_all_prices().priceWithoutTax;
         return priceWithoutTax ? (this.get_margin() / priceWithoutTax) * 100 : 0;
     },
     get_margin_rate_str() {
-        return this.env.utils.roundCurrency(this.get_margin_rate()) + "%";
+        return roundCurrency(this.get_margin_rate(), this.currency) + "%";
+    },
+});
+
+patch(Orderline, {
+    props: {
+        ...Orderline.props,
+        line: {
+            ...Orderline.props.line,
+            shape: {
+                ...Orderline.props.line.shape,
+                ifaceDisplayMargin: {type: Boolean, optional: true},
+                margin_rate: {type: Number, optional: true},
+                margin_rate_str: {type: String, optional: true},
+            },
+        },
     },
 });

pos_margin/views/res_config_settings_view.xml

@@ -9,7 +9,15 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="point_of_sale.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='module_loyalty']/../.." position="after">
+            <xpath expr="//setting[@id='pos-loyalty']" position="after">
+                <setting
+                    id="order_margin"
+                    help="Display Margin and Margin Rate in the frontend"
+                >
+                    <field name="pos_iface_display_margin" />
+                </setting>
+            </xpath>
+            <!-- <xpath expr="//field[@name='module_loyalty']/../.." position="after">
                 <div class="col-xs-12 col-lg-6 o_setting_box" id="order_margin">
                     <div class="o_setting_left_pane">
                         <field name="pos_iface_display_margin" />
@@ -21,7 +29,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                         </div>
                     </div>
                 </div>
-            </xpath>
+            </xpath> -->
         </field>
     </record>
 </odoo>