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

[10.0][FIX] Correct domain attribute in field journal_id (#120)

Browse Source 
* Correct domain attribute in field journal_id

Original domain includes unknown value company_id. Throws error when selecting the journal.

* Corregidos errores detectados por Lint

* Refactoring, DRY

* [FIX] Add missing field company_id to account_analytic_contract

* Small refactoring for company_id field
This commit is contained in:
Gustavo Orozco H
2017-11-19 18:58:20 -05:00
committed by Pedro M. Baeza
parent b5036f8332
commit 9c71bd93b5
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contract/models/account_analytic_contract.py
View File

@@ -59,6 +59,12 @@ class AccountAnalyticContract(models.Model):
default=lambda s: s._default_journal(), default=lambda s: s._default_journal(),
domain="[('type', '=', 'sale'),('company_id', '=', company_id)]", domain="[('type', '=', 'sale'),('company_id', '=', company_id)]",
) )
company_id = fields.Many2one(
'res.company',
string='Company',
required=True,
default=lambda self: self.env.user.company_id,
)
@api.model @api.model
def _default_journal(self): def _default_journal(self):
@@ -68,3 +74,4 @@ class AccountAnalyticContract(models.Model):
('type', '=', 'sale'), ('type', '=', 'sale'),
('company_id', '=', company_id)] ('company_id', '=', company_id)]
return self.env['account.journal'].search(domain, limit=1) return self.env['account.journal'].search(domain, limit=1)

1
contract/views/account_analytic_contract_view.xml
View File

@@ -7,6 +7,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Contract Template"> <form string="Contract Template">
<group name="group_main"> <group name="group_main">
<field name="company_id" invisible="1" />
<field name="name" /> <field name="name" />
<group name="group_main_left"> <group name="group_main_left">
<field name="journal_id" /> <field name="journal_id" />