audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MIG] contract: Migration to 14.0

Browse Source
This commit is contained in:
Francisco Ivan Anton Prieto
2021-04-02 13:49:16 +02:00
committed by Christopher Rogos
parent cddd13cf5c
commit 6965b755e0
22 changed files with 62 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contract/models/contract.py
View File

@@ -239,8 +239,8 @@ class ContractContract(models.Model):
# Use pricelist currency
currency = (
self.pricelist_id.currency_id
or self.partner_id.with_context(
force_company=self.company_id.id,
or self.partner_id.with_company(
self.company_id
).property_product_pricelist.currency_id
)
return currency or self.journal_id.currency_id or self.company_id.currency_id
@@ -360,7 +360,7 @@ class ContractContract(models.Model):
partner = (
self.partner_id
if not self.company_id
else self.partner_id.with_context(force_company=self.company_id.id)
else self.partner_id.with_company(self.company_id)
)
self.pricelist_id = partner.property_product_pricelist.id
self.fiscal_position_id = partner.env[
@@ -423,9 +423,9 @@ class ContractContract(models.Model):
if self.contract_type == "purchase":
invoice_type = "in_invoice"
move_form = Form(
self.env["account.move"].with_context(
force_company=self.company_id.id, default_type=invoice_type
)
self.env["account.move"]
.with_company(self.company_id)
.with_context(default_move_type=invoice_type)
)
move_form.partner_id = self.invoice_partner_id
if self.payment_term_id:
@@ -491,11 +491,11 @@ class ContractContract(models.Model):
"""
self.ensure_one()
def can_be_invoiced(l):
def can_be_invoiced(contract_line):
return (
not l.is_canceled
and l.recurring_next_date
and l.recurring_next_date <= date_ref
not contract_line.is_canceled
and contract_line.recurring_next_date
and contract_line.recurring_next_date <= date_ref
)
lines2invoice = previous = self.env["contract.line"]