diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py index 3b06ea5ce32..c771c42cfe1 100644 --- a/addons/lunch/lunch.py +++ b/addons/lunch/lunch.py @@ -134,7 +134,7 @@ class lunch_order(osv.osv): 'product': fields.many2one('lunch.product', 'Product', required=True, \ readonly=True, states={'draft':[('readonly', False)]}, change_default=True), 'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}), - 'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True), + 'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True), 'descript': fields.char('Description Order', readonly=True, size=250, \ states = {'draft':[('readonly', False)]}), 'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \ diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css index 0102dc1ade6..6964e4c2f3e 100644 --- a/addons/survey/static/src/css/survey.css +++ b/addons/survey/static/src/css/survey.css @@ -1,20 +1,3 @@ -.oe_module_survey{ - font-size: 12px; - border-style:dotted; - border-radius: 15px; - text-align: left; - height:145px; - width:220px; -} - -.oe_survey_title{ - font-size: 15px; - height: auto; - font-size: 16px; - font-weight:bold; - width: 205px; -} - .oe_survey_responsible{ height: auto; width: 200px; @@ -26,12 +9,10 @@ width: 200px; font-size: 14px; } - -.oe_survey_fill{ - align:right; - padding: 1px 165px; -} - .oe_survey_rate{ font-size: 14px; } +.oe_kanban_survey { + width: 300px; +} + diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 40f13b226f8..1c1c8b6df91 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -68,6 +68,7 @@ class survey(osv.osv): 'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'), 'send_response': fields.boolean('Email Notification on Answer'), 'type': fields.many2one('survey.type', 'Type'), + 'color': fields.integer('Color Index'), 'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'), } _defaults = { diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index dedb044eee9..c1e0355073c 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -313,32 +313,37 @@ + - +
+
+ i +
+
+

+
+ By: +

+
+ Open From: + + + , + + +

+
+ Rate: + Fill +
+
+