[IMP] product_contract: black, isort, prettier

This commit is contained in:
Mourad
2021-11-12 11:25:08 +01:00
committed by Adasat
parent 18e8fb7a72
commit b14c3cf104
6 changed files with 36 additions and 21 deletions

View File

@@ -8,7 +8,7 @@
"category": "Contract Management", "category": "Contract Management",
"license": "AGPL-3", "license": "AGPL-3",
"author": "LasLabs, " "ACSONE SA/NV, " "Odoo Community Association (OCA)", "author": "LasLabs, " "ACSONE SA/NV, " "Odoo Community Association (OCA)",
"website": "https://github.com/oca/contract", "website": "https://github.com/OCA/contract",
"depends": ["product", "contract", "sale"], "depends": ["product", "contract", "sale"],
"data": [ "data": [
"views/res_config_settings.xml", "views/res_config_settings.xml",

View File

@@ -46,7 +46,9 @@ class ProductTemplate(models.Model):
string="Termination Notice type", string="Termination Notice type",
) )
auto_renew_interval = fields.Integer( auto_renew_interval = fields.Integer(
default=1, string="Renew Every", help="Renew every (Days/Week/Month/Year)", default=1,
string="Renew Every",
help="Renew every (Days/Week/Month/Year)",
) )
auto_renew_rule_type = fields.Selection( auto_renew_rule_type = fields.Selection(
[ [

View File

@@ -16,8 +16,14 @@ class SaleOrder(models.Model):
@api.constrains("state") @api.constrains("state")
def check_contact_is_not_terminated(self): def check_contact_is_not_terminated(self):
for rec in self: for rec in self:
if rec.state not in ("sale", "done", "cancel",) and rec.order_line.filtered( if (
"contract_id.is_terminated" rec.state
not in (
"sale",
"done",
"cancel",
)
and rec.order_line.filtered("contract_id.is_terminated")
): ):
raise ValidationError( raise ValidationError(
_("You can't upsell or downsell a terminated contract") _("You can't upsell or downsell a terminated contract")

View File

@@ -54,7 +54,9 @@ class SaleOrderLine(models.Model):
) )
is_auto_renew = fields.Boolean(string="Auto Renew", default=False) is_auto_renew = fields.Boolean(string="Auto Renew", default=False)
auto_renew_interval = fields.Integer( auto_renew_interval = fields.Integer(
default=1, string="Renew Every", help="Renew every (Days/Week/Month/Year)", default=1,
string="Renew Every",
help="Renew every (Days/Week/Month/Year)",
) )
auto_renew_rule_type = fields.Selection( auto_renew_rule_type = fields.Selection(
[ [
@@ -106,7 +108,8 @@ class SaleOrderLine(models.Model):
rec.date_end = ( rec.date_end = (
rec.date_start rec.date_start
+ contract_line_model.get_relative_delta( + contract_line_model.get_relative_delta(
rec._get_auto_renew_rule_type(), int(rec.product_uom_qty), rec._get_auto_renew_rule_type(),
int(rec.product_uom_qty),
) )
- relativedelta(days=1) - relativedelta(days=1)
) )
@@ -125,7 +128,8 @@ class SaleOrderLine(models.Model):
rec.date_end = ( rec.date_end = (
rec.date_start rec.date_start
+ contract_line_model.get_relative_delta( + contract_line_model.get_relative_delta(
rec._get_auto_renew_rule_type(), int(rec.product_uom_qty), rec._get_auto_renew_rule_type(),
int(rec.product_uom_qty),
) )
- relativedelta(days=1) - relativedelta(days=1)
) )

View File

@@ -103,7 +103,8 @@ class TestSaleOrder(TransactionCase):
contracts = self.sale.order_line.mapped("contract_id") contracts = self.sale.order_line.mapped("contract_id")
self.assertEqual(len(contracts), 2) self.assertEqual(len(contracts), 2)
self.assertEqual( self.assertEqual(
self.order_line1.contract_id.contract_template_id, self.contract_template1, self.order_line1.contract_id.contract_template_id,
self.contract_template1,
) )
contract_line = self.order_line1.contract_id.contract_line_ids contract_line = self.order_line1.contract_id.contract_line_ids
self.assertEqual(contract_line.date_start, Date.to_date("2018-01-01")) self.assertEqual(contract_line.date_start, Date.to_date("2018-01-01"))
@@ -159,7 +160,8 @@ class TestSaleOrder(TransactionCase):
self.assertEqual(len(self.sale.order_line.mapped("contract_id")), 2) self.assertEqual(len(self.sale.order_line.mapped("contract_id")), 2)
self.assertFalse(self.sale.need_contract_creation) self.assertFalse(self.sale.need_contract_creation)
self.assertEqual( self.assertEqual(
self.order_line1.contract_id.contract_template_id, self.contract_template1, self.order_line1.contract_id.contract_template_id,
self.contract_template1,
) )
contract_line = self.order_line1.contract_id.contract_line_ids contract_line = self.order_line1.contract_id.contract_line_ids
self.assertEqual(contract_line.date_start, Date.to_date("2018-01-01")) self.assertEqual(contract_line.date_start, Date.to_date("2018-01-01"))
@@ -178,7 +180,8 @@ class TestSaleOrder(TransactionCase):
its product""" its product"""
self.order_line1.onchange_product() self.order_line1.onchange_product()
self.assertEqual( self.assertEqual(
self.order_line1.recurring_rule_type, self.product1.recurring_rule_type, self.order_line1.recurring_rule_type,
self.product1.recurring_rule_type,
) )
self.assertEqual( self.assertEqual(
self.order_line1.recurring_invoicing_type, self.order_line1.recurring_invoicing_type,