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

[IMP] contract_invoice_merge_by_partner: Don't require to merge invoices later

Browse Source 
Adapting source contract module, we don't need to rely on account_invoice_merge
functionality for having all the invoices merged.
This commit is contained in:
Pedro M. Baeza
2017-07-01 18:51:47 +02:00
parent 7695115130
commit 7d7295c8bb
7 changed files with 99 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contract_payment_mode/models/contract.py
View File

@@ -19,8 +19,9 @@ class AccountAnalyticAccount(models.Model):
@api.multi
def _prepare_invoice(self):
invoice_vals = super(AccountAnalyticAccount, self)._prepare_invoice()
if self.payment_mode_id:
invoice_vals['payment_mode_id'] = self.payment_mode_id.id
contract = self[:1]
if contract.payment_mode_id:
invoice_vals['payment_mode_id'] = contract.payment_mode_id.id
invoice = self.env['account.invoice'].new(invoice_vals)
invoice.payment_mode_id_change()
invoice_vals = invoice._convert_to_write(invoice._cache)