NaNtic
/
trytond-farm
mirror of https://github.com/NaN-tic/trytond-farm.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Animals and groups can not be on silo locations.

This commit is contained in:
Sergi Almacellas Abellana 2014-04-09 12:07:33 +02:00
parent a69c790c71
commit 241c1e5afa
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
animal.py
View File

@ -126,6 +126,7 @@ class Animal(ModelSQL, ModelView, AnimalMixin):
location = fields.Many2One('stock.location', 'Current Location',
readonly=True, domain=[
('type', '!=', 'warehouse'),
('silo', '=', False),
], help='Indicates where the animal currently resides.')
farm = fields.Function(fields.Many2One('stock.location', 'Current Farm',
on_change_with=['location'], depends=['location']),
@ -146,7 +147,10 @@ class Animal(ModelSQL, ModelView, AnimalMixin):
states={'invisible': Not(Equal(Eval('origin'), 'purchased'))},
depends=['origin'])
initial_location = fields.Many2One('stock.location', 'Initial Location',
required=True, domain=[('type', '=', 'storage')],
required=True, domain=[
('type', '=', 'storage'),
('silo', '=', False),
],
states={'readonly': Greater(Eval('id', 0), 0)}, depends=['id'],
context={'restrict_by_specie_animal_type': True},
help="The Location where the animal was reached or where it was "

5
animal_group.py
View File

@ -58,7 +58,10 @@ class AnimalGroup(ModelSQL, ModelView, AnimalMixin):
states={'invisible': Not(Equal(Eval('origin'), 'purchased'))},
depends=['origin'])
initial_location = fields.Many2One('stock.location', "Initial Location",
required=True, domain=[('type', '=', 'storage')],
required=True, domain=[
('type', '=', 'storage'),
('silo', '=', False),
],
states={'readonly': Greater(Eval('id', 0), 0)}, depends=['id'],
context={'restrict_by_specie_animal_type': True},
help="The Location where the group was reached or where it was "