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

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-10-04 19:00:31 +00:00
parent 1f1f0e69fd cc0b6751d2
commit f07306eeff
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contract/__manifest__.py
View File

@@ -36,6 +36,7 @@
"wizards/contract_manually_create_invoice.xml", "wizards/contract_manually_create_invoice.xml",
"wizards/contract_contract_terminate.xml", "wizards/contract_contract_terminate.xml",
"views/contract_tag.xml", "views/contract_tag.xml",
"views/account_move_views.xml",
"views/assets.xml", "views/assets.xml",
"views/abstract_contract_line.xml", "views/abstract_contract_line.xml",
"views/contract.xml", "views/contract.xml",

10
contract/models/contract.py
View File

@@ -436,9 +436,13 @@ class ContractContract(models.Model):
move_form = Form( move_form = Form(
self.env["account.move"] self.env["account.move"]
.with_company(self.company_id) .with_company(self.company_id)
.with_context(default_move_type=invoice_type, default_name="/") .with_context(default_move_type=invoice_type, default_name="/"),
view="contract.view_account_move_contract_helper_form",
) )
move_form.partner_id = self.invoice_partner_id move_form.partner_id = self.invoice_partner_id
move_form.journal_id = journal
move_form.currency_id = self.currency_id
move_form.invoice_date = date_invoice
if self.payment_term_id: if self.payment_term_id:
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:
@@ -449,11 +453,7 @@ class ContractContract(models.Model):
invoice_vals.update( invoice_vals.update(
{ {
"ref": self.code, "ref": self.code,
"company_id": self.company_id.id,
"currency_id": self.currency_id.id,
"invoice_date": date_invoice,
"date": date_invoice, "date": date_invoice,
"journal_id": journal.id,
"invoice_origin": self.name, "invoice_origin": self.name,
} }
) )

15
contract/views/account_move_views.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<!-- Auxiliary view for correct Form operation -->
<record id="view_account_move_contract_helper_form" model="ir.ui.view">
<field name="inherit_id" ref="account.view_move_form" />
<field name="model">account.move</field>
<field name="mode">primary</field>
<field name="arch" type="xml">
<form position="inside">
<field name="journal_id" invisible="1" />
<field name="currency_id" invisible="1" />
</form>
</field>
</record>
</odoo>