diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index edfbb573911..e70e34a5606 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -107,7 +107,7 @@ class base_setup_installer(osv.osv_memory): def _if_misc_tools(self, cr, uid, ids, context=None): interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view if interface == 'simple' or interface =='extended' : - return ['lunch','idea','survey'] + return ['profile_tools'] return None def _if_account(self, cr, uid, ids, context=None): diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 87ae7a8f642..3c33dcd247e 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -364,18 +364,18 @@ - - + - + + domain="[('date','<=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','>',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" + help="Box amount in last month"/> diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml index 39fa1f87d62..d47cc6d8ee9 100644 --- a/addons/lunch/wizard/lunch_order_cancel_view.xml +++ b/addons/lunch/wizard/lunch_order_cancel_view.xml @@ -34,7 +34,7 @@ + view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/> diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml index aa59acae628..dabcd7d5e84 100644 --- a/addons/lunch/wizard/lunch_order_confirm_view.xml +++ b/addons/lunch/wizard/lunch_order_confirm_view.xml @@ -36,7 +36,7 @@ + view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>