Merge PR #1281 into 18.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

product_contract/__manifest__.py

@@ -22,5 +22,14 @@
     "application": False,
     "external_dependencies": {"python": ["python-dateutil"]},
     "maintainers": ["sbejaoui"],
-    "assets": {"web.assets_backend": ["product_contract/static/src/js/*"]},
+    "assets": {
+        "web.assets_backend": [
+            "product_contract/static/src/js/*",
+            (
+                "after",
+                "sale/static/src/xml/sale_product_field.xml",
+                "product_contract/static/src/xml/*",
+            ),
+        ]
+    },
 }

product_contract/static/src/js/sale_product_field.esm.js

@@ -1,40 +1,68 @@
-import {SaleOrderLineProductField} from "@sale/js/sale_product_field";
 import {patch} from "@web/core/utils/patch";
+import {SaleOrderLineProductField} from "@sale/js/sale_product_field";
 
 patch(SaleOrderLineProductField.prototype, {
+    setup() {
+        super.setup(...arguments);
+        this.lastContractData = false;
+    },
+
+    get extraLines() {
+        var res = super.extraLines;
+        if (
+            this.props.record.data.is_contract &&
+            this.props.record.data.product_contract_description
+        ) {
+            for (var val of this.props.record.data.product_contract_description.split(
+                "||"
+            )) {
+                res.push(val);
+            }
+        }
+        return res;
+    },
+
     async _onProductUpdate() {
         super._onProductUpdate(...arguments);
         if (this.props.record.data.is_contract) {
             this._openContractConfigurator(true);
         }
     },
 
-    _editLineConfiguration() {
-        super._editLineConfiguration(...arguments);
+    _editProductConfiguration() {
+        if (
+            this.props.record.data.is_configurable_product &&
+            this.props.record.data.is_contract
+        ) {
+            this.lastContractData = this.contractData;
+        }
+        super._editProductConfiguration(...arguments);
+    },
+
+    onEditContractConfiguration() {
         if (this.props.record.data.is_contract) {
             this._openContractConfigurator();
         }
     },
 
-    get isConfigurableLine() {
-        return super.isConfigurableLine || this.props.record.data.is_contract;
+    get isConfigurableContract() {
+        return this.props.record.data.is_contract;
     },
 
-    _getContractConfiguratorContext() {
+    get contractContext() {
         return {
             active_model: this.props.record.resModel,
             active_id: this.props.record.resId,
             default_product_id: this.props.record.data.product_id[0],
             default_partner_id: this.props.record.model.root.data.partner_id[0],
             default_company_id: this.props.record.model.root.data.company_id[0],
             default_recurrence_number: this.props.record.data.recurrence_number,
-            default_recurring_interval: this.props.record.data.recurring_interval,
             default_recurring_rule_type: this.props.record.data.recurring_rule_type,
-            default_recurrence_interval: this.props.record.data.recurrence_interval,
             default_recurring_invoicing_type:
                 this.props.record.data.recurring_invoicing_type,
             default_product_uom_qty: this.props.record.data.product_uom_qty,
             default_contract_id: this.props.record.data.contract_id[0],
+            default_recurring_interval: this.props.record.data.recurring_interval,
             default_date_start: this.props.record.data.date_start,
             default_date_end: this.props.record.data.date_end,
             default_is_auto_renew: this.props.record.data.is_auto_renew,
@@ -45,13 +73,36 @@ patch(SaleOrderLineProductField.prototype, {
         };
     },
 
+    get contractData() {
+        return {
+            product_id: this.props.record.data.product_id,
+            product_uom_qty: this.props.record.data.product_uom_qty,
+            contract_id: this.props.record.data.contract_id,
+            recurring_interval: this.props.record.data.recurring_interval,
+            date_start: this.props.record.data.date_start,
+            date_end: this.props.record.data.date_end,
+            is_auto_renew: this.props.record.data.is_auto_renew,
+            auto_renew_interval: this.props.record.data.auto_renew_interval,
+            auto_renew_rule_type: this.props.record.data.auto_renew_rule_type,
+        };
+    },
+
     async _openContractConfigurator(isNew = false) {
-        const actionContext = this._getContractConfiguratorContext();
+        if (this.lastContractData) {
+            const changes = Object.assign({}, this.lastContractData);
+            this.lastContractData = false;
+            return this.props.record._update(changes, {
+                withoutOnchange: true,
+            });
+        }
+        const actionContext = this.contractContext;
         this.action.doAction("product_contract.product_contract_configurator_action", {
             additionalContext: actionContext,
             onClose: async (closeInfo) => {
                 if (closeInfo && !closeInfo.special) {
-                    this.props.record.update(closeInfo.productContractConfiguration);
+                    this.props.record._update(closeInfo.productContractConfiguration, {
+                        withoutOnchange: true,
+                    });
                 } else if (isNew) {
                     this.props.record.update({
                         [this.props.name]: undefined,

product_contract/static/src/xml/sale_product_field.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+
+    <t t-inherit="sale.SaleProductField" t-inherit-mode="extension">
+        <xpath expr="//button[@t-if='hasExternalButton']" position="before">
+            <t t-if="isConfigurableContract">
+                <button
+                    type="button"
+                    class="btn btn-secondary fa fa-pencil-square-o"
+                    tabindex="-1"
+                    draggable="false"
+                    aria-label="Configure contract"
+                    data-tooltip="Configure contract"
+                    t-on-click="onEditContractConfiguration"
+                />
+            </t>
+        </xpath>
+    </t>
+
+</templates>