From e0461e1d07aad6f8a97501b30c8d251fdd2c418d Mon Sep 17 00:00:00 2001
From: Demesmaeker <edm@odoo.com>
Date: Thu, 15 Sep 2022 13:46:50 +0000
Subject: [PATCH] [FIX] sale_product_matrix: error in matrix tour
Following the steps that changed every quantity in a matrix, the next
step was triggered after at least one sale order line's quantity was
changed. Due to the number of lines created, one of the so lines was
sometimes not updated before the next step, which produces an error in
the final sale_count.
In order to check the total and ensure every line was updated, we set
the partner sooner in the tour, which in turn sets the pricelist used to
get the price of each line. Thus allowing a check on the subtotal.
Backport of commit-af1e67aa2c6c676479ee4ea73106bcabd20c621e
closes odoo/odoo#100273
Signed-off-by: Morgane Demesmaeker <edm@odoo.com>
---
.../tests/tours/sale_product_matrix_tour.js | 47 +++++++++----------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/addons/sale_product_matrix/static/tests/tours/sale_product_matrix_tour.js b/addons/sale_product_matrix/static/tests/tours/sale_product_matrix_tour.js
index deb3c8bb2baf..f5fe7e081d95 100644
--- a/addons/sale_product_matrix/static/tests/tours/sale_product_matrix_tour.js
+++ b/addons/sale_product_matrix/static/tests/tours/sale_product_matrix_tour.js
@@ -12,20 +12,20 @@ tour.register('sale_matrix_tour', {
trigger: ".o_list_button_add",
extra_trigger: ".o_sale_order"
}, {
- trigger: "a:contains('Add a product')"
+ trigger: '.o_required_modifier[name=partner_id] input',
+ run: 'text Agrolait',
+}, {
+ trigger: '.ui-menu-item > a:contains("Agrolait")',
+ auto: true,
+}, {
+ trigger: 'a:contains("Add a product")',
+}, {
+ trigger: '.o_data_cell',
}, {
trigger: 'div[name="product_template_id"] input',
- run: function () {
- var $input = $('div[name="product_template_id"] input');
- $input.click();
- $input.val('Matrix');
- var keyDownEvent = jQuery.Event("keydown");
- keyDownEvent.which = 42;
- $input.trigger(keyDownEvent);
- }
+ run: "text Matrix",
}, {
trigger: 'ul.ui-autocomplete a:contains("Matrix")',
- run: 'click'
}, {
trigger: '.o_product_variant_matrix',
run: function () {
@@ -34,15 +34,10 @@ tour.register('sale_matrix_tour', {
}
}, {
trigger: 'span:contains("Confirm")',
- run: 'click'
-}, {
- trigger: ".o_form_editable .o_field_many2one[name='partner_id'] input",
- extra_trigger: ".o_sale_order",
- run: 'text Agrolait'
}, {
- trigger: ".ui-menu-item > a",
- auto: true,
- in_modal: false,
+ trigger: '.o_sale_order',
+ // wait for qty to be 1 => check the total to be sure all qties are set to 1
+ extra_trigger: '.oe_subtotal_footer_separator:contains("18.40")',
}, {
trigger: '.o_form_button_save:contains("Save")',
run: 'click' // SAVE Sales Order.
@@ -64,11 +59,13 @@ tour.register('sale_matrix_tour', {
$('.o_matrix_input').slice(8, 16).val(4);
} // set the qty to 4 for half of the matrix products.
}, {
- trigger: 'span:contains("Confirm")',
- run: 'click' // apply the matrix
+ trigger: 'span:contains("Confirm")', // apply the matrix
+}, {
+ trigger: '.o_sale_order',
+ // wait for qty to be changed => check the total to be sure all qties are set to either 1 or 4
+ extra_trigger: '.oe_subtotal_footer_separator:contains("46.00")',
}, {
trigger: '.o_form_button_save:contains("Save")',
- extra_trigger: '.o_field_cell.o_data_cell.o_list_number:contains("4.000")',
run: 'click' // SAVE Sales Order, after matrix has been applied (extra_trigger).
}, {
trigger: '.o_form_button_edit:contains("Edit")',
@@ -97,11 +94,13 @@ tour.register('sale_matrix_tour', {
$("input[value='4']").slice(0, 4).val(8.2);
}
}, {
- trigger: 'span:contains("Confirm")',
- run: 'click' // apply the matrix
+ trigger: 'span:contains("Confirm")', // apply the matrix
+}, {
+ trigger: '.o_sale_order',
+ // wait for qty to be changed => check the total to be sure all qties are set
+ extra_trigger: '.oe_subtotal_footer_separator:contains("65.32")',
}, {
trigger: '.o_form_button_save:contains("Save")',
- extra_trigger: '.o_field_cell.o_data_cell.o_list_number:contains("8.200")',
run: 'click' // SAVE Sales Order, after matrix has been applied (extra_trigger).
},
]);
--
GitLab