[FIX] sale, _management: portal sale order optional products #32980

kebeclibre · 2019-04-26T11:42:31Z

Forward Port 0c46c8a from v10.0
has dome flows, namely, the new feature of grouping the taxes by tax group was not supported

Now it is supported: when modifying an optional product's quantity, every field is updated with the new values

OPW 1974708

Description of the issue/feature this PR addresses:

Current behavior before PR:

Desired behavior after PR is merged:

--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

seb-odoo

Here is a quick review, I didn't test it.

I assume this is only for the tax table, and not taking into account discount & pricelist/unit price?

Also commit message contains some errors:

dome->some?
missing dot at end of sentence
_management? Maybe do sale(_management), or put both in full if there is space for it
title not starting with verb "this commit will..."

seb-odoo · 2019-04-26T11:46:58Z

addons/sale/views/sale_portal_templates.xml

-                                </tr>
-                            </t>
+                        </table>
+                        <t t-call='sale.portal_content_tax_table' />


Unfortunately you cannot change the view like that in stable, because it will break all custo xpathing it. You'll have to do a duplicate of the view if you need to render it from the controller too.

seb-odoo · 2019-04-26T11:49:31Z

addons/sale_management/controllers/portal.py

@@ -54,6 +54,7 @@ def update_line_dict(self, line_id, remove=False, unlink=False, order_id=None, a
            'order_amount_total': format_price(order_sudo.amount_total),
            'order_amount_untaxed': format_price(order_sudo.amount_untaxed),
            'order_amount_tax': format_price(order_sudo.amount_tax),
+            'order_tax_table': request.env['ir.ui.view'].render_template('sale.portal_content_tax_table', {'sale_order': order_sudo}),


You need to check if the new view exists, because it will not most of the time and this will crash (because no upgrade by default).

seb-odoo · 2019-04-26T11:49:58Z

addons/sale/static/src/scss/sale_portal.scss

+.oe_sale_order_tax_table {
+    margin-bottom: 0;
+    margin-top: -1rem;
+}


new line at end of file

seb-odoo · 2019-04-26T11:50:57Z

addons/sale/views/sale_portal_templates.xml

@@ -520,7 +520,7 @@
                <div id="total" class="row" name="total" style="page-break-inside: avoid;">
                    <div t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto">
                        <table class="table table-sm">
-                            <tr class="border-black" style="border-bottom:1px solid #dddddd;">
+                            <tr class="border-black" style="">


Are you sure about this change? I remember I had trouble when I tried to remove it, but maybe it was on another template like the report.

The rendering is the same visually
That border specifically will then be handled by the tax_table

seb-odoo · 2019-04-26T11:51:53Z

addons/sale/static/src/scss/sale_portal.scss

+
+.oe_sale_order_tax_table {
+    margin-bottom: 0;
+    margin-top: -1rem;


Why is it needed?

margin-top -1rem is needed because default Bootstrap table or table-sm classes have a margin-bottom of 1rem. This is just for compensating (not really elegant though)

kebeclibre · 2019-04-26T14:44:04Z

@seb-odoo
changes made

seb-odoo

Quick review again, still not tested.

Good catch on the translation! I would have forgotten that.

seb-odoo · 2019-04-26T14:46:27Z

addons/sale_management/controllers/portal.py

            'order_line_product_uom_qty': str(quantity),
            'order_line_price_total': format_price(order_line.price_total),
            'order_line_price_subtotal': format_price(order_line.price_subtotal),
            'order_amount_total': format_price(order_sudo.amount_total),
            'order_amount_untaxed': format_price(order_sudo.amount_untaxed),
            'order_amount_tax': format_price(order_sudo.amount_tax),
+            'order_amount_undiscounted': format_price(order_sudo.amount_undiscounted),
+            'order_totals_table': request.env['ir.ui.view'].render_template('sale.sale_order_portal_content_totals_table', {'sale_order': order_sudo}),


you forgot to remove this one

seb-odoo · 2019-04-26T14:47:39Z

addons/sale/views/sale_portal_templates.xml

@@ -127,7 +127,7 @@
                    <t t-set="classes" t-value="'col-lg-auto d-print-none'"/>

                    <t t-set="title">
-                        <h2 class="mb-0"><b t-field="sale_order.amount_total"/> </h2>
+                        <h2 class="mb-0"><b t-field="sale_order.amount_total" data-id="total_amount"/> </h2>


Is there a benefit to use data-id instead of a class?

Well, no, there is none, but identifying fields started that way, so I'm just continuing in that direction.
Plus, using CSS class not to apply style but for identifying data seems odd

seb-odoo · 2019-04-26T14:48:54Z

addons/sale/views/sale_portal_templates.xml

@@ -582,4 +584,47 @@
        </div>
    </template>

+    <template id="sale_order_portal_content_totals_table">
+        <table class="table table-sm">
+            <tr class="border-black" style="border-bottom:1px solid #dddddd;">


We probably don't want to copy this inline style if avoidable?

seb-odoo · 2019-04-26T14:49:18Z

addons/sale/views/sale_portal_templates.xml

+                </td>
+            </tr>
+            <t t-foreach="sale_order.amount_by_group" t-as="amount_by_group">
+                <tr style="border-bottom:1px solid #dddddd;">


inline style?

seb-odoo · 2019-04-26T14:55:50Z

addons/sale_management/static/src/js/sale_management.js

@@ -66,19 +67,20 @@ if (!$('.o_portal_sale_sidebar').length) {
         * when the quantity of a product has changed
         *
         * @private
+         * @param {Int} order_id


I think we usually write it {integer} (and to be exact there is only Number in JS, so we should use that instead and specify in the description that integer is expected).

Forward Port 0c46c8a from v10.0 has dome flows, namely, the new feature of grouping the taxes by tax group was not supported Now it is supported: when modifying an optional product's quantity, every field is updated with the new values OPW 1974708

kebeclibre · 2019-04-29T07:48:28Z

robodoo r+

Forward Port 0c46c8a from v10.0 has dome flows, namely, the new feature of grouping the taxes by tax group was not supported Now it is supported: when modifying an optional product's quantity, every field is updated with the new values OPW 1974708 closes #32980 Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>

robodoo · 2019-04-29T10:35:33Z

Merged, thanks!

kebeclibre requested review from beledouxdenis and seb-odoo April 26, 2019 11:42

robodoo added the seen 🙂 label Apr 26, 2019

kebeclibre force-pushed the 12.0-portal-optional-yet-again-lpe branch from e06d30b to 4ae20aa Compare April 26, 2019 11:44

seb-odoo requested changes Apr 26, 2019

View reviewed changes

C3POdoo added the OE the report is linked to a support ticket (opw-...) label Apr 26, 2019

seb-odoo added the RD research & development, internal work label Apr 26, 2019

robodoo added CI 🤖 Robodoo has seen passing statuses and removed CI 🤖 Robodoo has seen passing statuses labels Apr 26, 2019

kebeclibre force-pushed the 12.0-portal-optional-yet-again-lpe branch 2 times, most recently from b09c292 to 5afb62e Compare April 26, 2019 14:42

seb-odoo requested changes Apr 26, 2019

View reviewed changes

robodoo added the CI 🤖 Robodoo has seen passing statuses label Apr 26, 2019

kebeclibre force-pushed the 12.0-portal-optional-yet-again-lpe branch from 5afb62e to 20d0a08 Compare April 29, 2019 07:47

robodoo removed the CI 🤖 Robodoo has seen passing statuses label Apr 29, 2019

robodoo added r+ 👌 CI 🤖 Robodoo has seen passing statuses labels Apr 29, 2019

robodoo added merging 👷 and removed merging 👷 labels Apr 29, 2019

robodoo closed this Apr 29, 2019

fw-bot deleted the 12.0-portal-optional-yet-again-lpe branch October 19, 2019 10:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FIX] sale, _management: portal sale order optional products #32980

[FIX] sale, _management: portal sale order optional products #32980

kebeclibre commented Apr 26, 2019

seb-odoo left a comment •

edited

seb-odoo Apr 26, 2019

seb-odoo Apr 26, 2019

seb-odoo Apr 26, 2019

seb-odoo Apr 26, 2019

kebeclibre Apr 26, 2019

seb-odoo Apr 26, 2019

kebeclibre Apr 26, 2019

kebeclibre commented Apr 26, 2019

seb-odoo left a comment

seb-odoo Apr 26, 2019

seb-odoo Apr 26, 2019

kebeclibre Apr 29, 2019

seb-odoo Apr 26, 2019

seb-odoo Apr 26, 2019

seb-odoo Apr 26, 2019

kebeclibre commented Apr 29, 2019

robodoo commented Apr 29, 2019

[FIX] sale, _management: portal sale order optional products #32980

[FIX] sale, _management: portal sale order optional products #32980

Conversation

kebeclibre commented Apr 26, 2019

seb-odoo left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kebeclibre commented Apr 26, 2019

seb-odoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kebeclibre commented Apr 29, 2019

robodoo commented Apr 29, 2019

seb-odoo left a comment •

edited