Merge 54dd83f into 7694b30

contract_sale/README.rst

@@ -71,6 +71,10 @@ Contributors
 
 * Levent Karakaş
 * Bejaoui Souheil <souheil.bejaoui@acsone.eu>
+* Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
+
+  * Nikul Chaudhary <nikul.chaudhary.serpentcs@gmail.com>
+
 
 Maintainers
 ~~~~~~~~~~~

contract_sale/__init__.py

@@ -1 +1,2 @@
 # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+from . import models

contract_sale/__manifest__.py

@@ -9,7 +9,7 @@
               'Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/contract',
     'depends': [
-        'sale',
+        'sale_management',
         'contract',
     ],
     'data': [
@@ -20,6 +20,7 @@
         'views/contract_line.xml',
         'views/contract_template.xml',
         'views/res_partner_view.xml',
+        'views/sale_order.xml',
     ],
     'license': 'AGPL-3',
     'installable': True,

contract_sale/models/__init__.py

@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import contract
+from . import sale_order

contract_sale/models/contract.py

@@ -0,0 +1,29 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import api, models
+
+
+class ContractContract(models.Model):
+    _inherit = 'contract.contract'
+
+    @api.multi
+    def _prepare_recurring_invoices_values(self, date_ref=False):
+        invoices_values = super(ContractContract, self).\
+            _prepare_recurring_invoices_values(date_ref=date_ref)
+        return invoices_values
+
+    @api.depends('contract_line_ids')
+    def _compute_sale_order_count(self):
+        super(ContractContract, self)._compute_sale_order_count()
+        contract_count = len(
+            self.contract_line_ids.
+            mapped('sale_order_line_id.order_id.contract_id')) or 0
+        self.sale_order_count += contract_count
+
+    @api.multi
+    def action_view_sales_orders(self):
+        res = super(ContractContract, self).action_view_sales_orders()
+        contracts = self.contract_line_ids.mapped(
+            'sale_order_line_id.order_id.contract_id'
+        )
+        res.get('domain')[0][2].extend(contracts)
+        return res

contract_sale/models/sale_order.py

@@ -0,0 +1,11 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models
+
+
+class SaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    contract_id = fields.Many2one(
+        comodel_name="contract.contract",
+        string="Contract",
+    )

contract_sale/views/sale_order.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_order_form_form_view" model="ir.ui.view">
+        <field name="name">sale.order.form.view</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale.view_order_form"/>
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="contract_id" domain="[('partner_id', '=', partner_id)]"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>