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 #883 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2022-10-18 10:24:41 +00:00
parent 632901e672 848ac3166a
commit ec4a8fcbb5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contract/models/contract.py
View File

@@ -436,6 +436,8 @@ class ContractContract(models.Model):
move_form.invoice_payment_term_id = self.payment_term_id move_form.invoice_payment_term_id = self.payment_term_id
if self.fiscal_position_id: if self.fiscal_position_id:
move_form.fiscal_position_id = self.fiscal_position_id move_form.fiscal_position_id = self.fiscal_position_id
if invoice_type == "out_invoice" and self.user_id:
move_form.invoice_user_id = self.user_id
invoice_vals = move_form._values_to_save(all_fields=True) invoice_vals = move_form._values_to_save(all_fields=True)
invoice_vals.update( invoice_vals.update(
{ {
@@ -445,7 +447,6 @@ class ContractContract(models.Model):
"invoice_date": date_invoice, "invoice_date": date_invoice,
"journal_id": journal.id, "journal_id": journal.id,
"invoice_origin": self.name, "invoice_origin": self.name,
"invoice_user_id": self.user_id.id,
} }
) )
return invoice_vals, move_form return invoice_vals, move_form

3
contract/tests/test_contract.py
View File

@@ -331,7 +331,8 @@ class TestContract(TestContractBase):
self.contract._recurring_create_invoice() self.contract._recurring_create_invoice()
invoice_daily = self.contract._get_related_invoices() invoice_daily = self.contract._get_related_invoices()
self.assertTrue(invoice_daily) self.assertTrue(invoice_daily)
self.assertEquals(self.contract.user_id, invoice_daily.user_id) self.assertEqual(self.contract.user_id, invoice_daily.user_id)
self.assertEqual(self.contract.user_id, invoice_daily.invoice_user_id)
def test_contract_weekly_post_paid(self): def test_contract_weekly_post_paid(self):
recurring_next_date = to_date("2018-03-01") recurring_next_date = to_date("2018-03-01")