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

[FIX] contract: Select the correct sections/notes to be invoiced

Browse Source
This commit is contained in:
Ernesto Tejeda
2020-04-28 13:02:56 -04:00
committed by Francisco Ivan Anton Prieto
parent d039b42a41
commit cd93b6a114
75 changed files with 5027 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contract/models/contract_line.py
View File

@@ -15,6 +15,7 @@ class ContractLine(models.Model):
_name = 'contract.line'
_description = "Contract Line"
_inherit = 'contract.abstract.contract.line'
_order = 'sequence,id'
sequence = fields.Integer(
string="Sequence",
@@ -654,8 +655,8 @@ class ContractLine(models.Model):
# have no meaning in certain invoices
today = fields.Date.context_today(self)
for rec in self:
if (not rec.display_type and
rec.date_start and today >= rec.date_start):
if ((not rec.display_type or rec.is_recurring_note)
and rec.date_start and today >= rec.date_start):
rec.create_invoice_visibility = bool(rec.recurring_next_date)
else:
rec.create_invoice_visibility = False
@@ -691,6 +692,7 @@ class ContractLine(models.Model):
name = self._insert_markers(dates[0], dates[1])
invoice_line_vals.update(
{
'sequence': self.sequence,
'name': name,
'account_analytic_id': self.analytic_account_id.id,
'analytic_tag_ids': [(6, 0, self.analytic_tag_ids.ids)],