Reviewers: ,
Please review this at http://codereview.tryton.org/721005/
Affected files:
M inventory.py
M location.py
Index: inventory.py
===================================================================
--- a/inventory.py
+++ b/inventory.py
@@ -101,17 +101,17 @@ class Inventory(Workflow, ModelSQL, Mode
return locations[0].id
@classmethod
def delete(cls, inventories):
# Cancel before delete
cls.cancel(inventories)
for inventory in inventories:
if inventory.state != 'cancel':
- cls.raise_user_error('delete_cancel', inventory.rec_name)
+ cls.raise_user_error('delete_cancel',
(inventory.rec_name,))
super(Inventory, cls).delete(inventories)
@classmethod
@ModelView.button
@Workflow.transition('done')
def confirm(self, inventories):
Move = Pool().get('stock.move')
move_ids = []
Index: location.py
===================================================================
--- a/location.py
+++ b/location.py
@@ -121,18 +121,17 @@ class Location(ModelSQL, ModelView):
""" Check locations with moves have types compatible with
moves. """
invalid_move_types = ['warehouse', 'view']
Move = Pool().get('stock.move')
if (self.type in invalid_move_types
and Move.search(['OR',
('to_location', '=', self.id),
('from_location', '=', self.id),
])):
- self.raise_user_error('invalid_type_for_moves', (
- location.rec_name,))
+ self.raise_user_error('invalid_type_for_moves',
(self.rec_name,))
@staticmethod
def default_active():
return True
@staticmethod
def default_left():
return 0