diff --git a/addons/portal_customer/__openerp__.py b/addons/portal_customer/__openerp__.py index 65b60d65ab1..f65742fd9e5 100644 --- a/addons/portal_customer/__openerp__.py +++ b/addons/portal_customer/__openerp__.py @@ -22,7 +22,7 @@ { 'name' : "Portal Customer", 'version' : "1.0", - 'depends' : ["sale","portal","event"], + 'depends' : ["sale","portal","event","survey"], 'author' : "OpenERP SA", 'category': 'Portal', 'description': """ diff --git a/addons/portal_customer/portal_customer_menu.xml b/addons/portal_customer/portal_customer_menu.xml index daad23d0ce9..87c4cca14fe 100644 --- a/addons/portal_customer/portal_customer_menu.xml +++ b/addons/portal_customer/portal_customer_menu.xml @@ -25,7 +25,7 @@ - + diff --git a/addons/portal_customer/security/ir.model.access.csv b/addons/portal_customer/security/ir.model.access.csv index 42f218721a1..8ca48c0163f 100644 --- a/addons/portal_customer/security/ir.model.access.csv +++ b/addons/portal_customer/security/ir.model.access.csv @@ -15,3 +15,14 @@ access_account_move_line,account.move.line,account.model_account_move_line,porta access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,portal_customer.group_sales_portal,1,0,0,0 access_event_event,event.event,event.model_event_event,portal_customer.group_sales_portal,1,1,0,0 access_event_registration,event.registration,event.model_event_registration,portal_customer.group_sales_portal,1,1,0,0 +access_event_event,event.event,event.model_event_event,portal_customer.group_sales_portal,1,1,0,0 +access_event_registration,event.registration,event.model_event_registration,portal_customer.group_sales_portal,1,1,0,0 +access_survey_survey,survey_survey,survey.model_survey,portal_customer.group_sales_portal,1,1,0,0 +access_survey_page,survey_page,survey.model_survey_page,portal_customer.group_sales_portal,1,1,0,0 +access_survey_question,survey_question,survey.model_survey_question,portal_customer.group_sales_portal,1,0,0,0 +access_survey_answer,survey_answer,survey.model_survey_answer,portal_customer.group_sales_portal,1,1,0,0 +access_survey_response,survey_response,survey.model_survey_response,portal_customer.group_sales_portal,1,1,1,0 +access_survey_history,survey_history,survey.model_survey_history,portal_customer.group_sales_portal,1,1,1,0 +access_survey_question_column_heading,survey_question_column_heading,survey.model_survey_question_column_heading,portal_customer.group_sales_portal,1,0,0,0 +access_survey_response_line,survey_response_line,survey.model_survey_response_line,portal_customer.group_sales_portal,1,1,1,0 +access_survey_response_answer,survey_response_answer,survey.model_survey_response_answer,portal_customer.group_sales_portal,1,1,1,0 \ No newline at end of file diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py index e4c83a37eee..90d7c2e469f 100644 --- a/addons/survey/__openerp__.py +++ b/addons/survey/__openerp__.py @@ -53,6 +53,7 @@ Partners are also sent mails with user name and password for the invitation of t 'test/survey_question_type.yml', 'test/survey_report.yml', ], + 'css': ['static/src/css/survey.css'], 'installable': True, 'auto_install': False, 'certificate' : '001131639736864143245', diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css new file mode 100644 index 00000000000..81c0e258d2f --- /dev/null +++ b/addons/survey/static/src/css/survey.css @@ -0,0 +1,37 @@ +.oe_module_survey{ + font-size: 12px; + border: 1px solid #ababab; + text-align: left; + height:135px; + width:210px; +} + +.oe_survey_title{ + font-size: 15px; + height: auto; + color: #FFFFFF; + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + background-color: #8A89BA; + width: 205px; +} + +.oe_survey_responsible{ + height: auto; + width: 200px; + font-size: 14px; +} + +.oe_survey_start_date{ + height: auto; + width: 200px; + font-size: 14px; +} + +.oe_survey_fill{ + align:right; + padding: 1px 165px; +} + +.oe_survey_rate{ + font-size: 14px; +} diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 0101cef17b8..51f97eead02 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -142,6 +142,17 @@ class survey(osv.osv): 'nodestroy':True, } return report + + def fill_survey(self, cr, uid, ids, context=None): + return { + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'survey.question.wiz', + 'type': 'ir.actions.act_window', + 'target': 'new', + 'context': {'survey_id': ids[0]} + } + survey() class survey_history(osv.osv): diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 4673bcd9846..93a0511d4e1 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -279,13 +279,52 @@ + + + event.survey.kanban + survey + kanban + + + + + + +
+ +

+
+ By: +

+
+ Open From: + + , + + +

+
+ Rate: +
+
+ +
+ +
+ + + + + Surveys survey form - tree,form - + kanban,tree,form + You can create survey for different purposes: recruitment interviews, employee's periodical evaluations, marketing campaigns, etc. A survey is made of pages containing questions of several types: text, multiple choices, etc. You can edit survey manually or click on the 'Edit Survey' for a WYSIWYG interface.