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

Merge PR #537 into 12.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2020-08-07 15:01:39 +00:00
parent 6c809f759a dcc55ee073
commit 87dcb48a41
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
contract/models/contract.py
View File

@@ -524,17 +524,18 @@ class ContractContract(models.Model):
This method triggers the creation of the next invoices of the contracts
even if their next invoicing date is in the future.
"""
invoice = self._recurring_create_invoice()
if invoice:
self.message_post(
body=_(
'Contract manually invoiced: '
'<a href="#" data-oe-model="%s" data-oe-id="%s">Invoice'
'</a>'
invoices = self._recurring_create_invoice()
if invoices:
for invoice in invoices:
self.message_post(
body=_(
'Contract manually invoiced: '
'<a href="#" data-oe-model="%s" data-oe-id="%s">Invoice'
'</a>'
)
% (invoice._name, invoice.id)
)
% (invoice._name, invoice.id)
)
return invoice
return invoices
@api.multi
def _recurring_create_invoice(self, date_ref=False):

29
contract_sale_invoicing/models/contract.py
View File

@@ -16,16 +16,19 @@ class ContractContract(models.Model):
@api.multi
def _recurring_create_invoice(self, date_ref=False):
invoices = super()._recurring_create_invoice(date_ref)
if not self.invoicing_sales:
return invoices
sales = self.env['sale.order'].search([
('analytic_account_id', '=', self.group_id.id),
('partner_invoice_id', 'child_of',
self.partner_id.commercial_partner_id.ids),
('invoice_status', '=', 'to invoice'),
('date_order', '<=',
'{} 23:59:59'.format(self.recurring_next_date)),
])
if sales:
invoice_ids = sales.action_invoice_create()
invoices |= self.env['account.invoice'].browse(invoice_ids)[:1]
for contract in self:
if not contract.invoicing_sales or not contract.recurring_next_date:
continue
sales = self.env['sale.order'].search([
('analytic_account_id', '=', contract.group_id.id),
('partner_invoice_id', 'child_of',
contract.partner_id.commercial_partner_id.ids),
('invoice_status', '=', 'to invoice'),
('date_order', '<=',
'{} 23:59:59'.format(contract.recurring_next_date)),
])
if sales:
invoice_ids = sales.action_invoice_create()
invoices |= self.env['account.invoice'].browse(invoice_ids)[:1]
return invoices