diff --git a/custom_matrix_survey/COPYRIGHT b/custom_matrix_survey/COPYRIGHT
new file mode 100644
index 0000000..3143258
--- /dev/null
+++ b/custom_matrix_survey/COPYRIGHT
@@ -0,0 +1,15 @@
+
+Most of the files are
+
+  Copyright (c) 2012-TODAY Kanak Infosystems LLP
+
+Many files also contain contributions from third
+parties. In this case the original copyright of
+the contributions can be traced through the
+history of the source version control system.
+
+When that is not the case, the files contain a prominent
+notice stating the original copyright and applicable
+license, or come with their own dedicated COPYRIGHT
+and/or LICENSE file.
+
diff --git a/custom_matrix_survey/LICENSE b/custom_matrix_survey/LICENSE
new file mode 100644
index 0000000..d99face
--- /dev/null
+++ b/custom_matrix_survey/LICENSE
@@ -0,0 +1,11 @@
+Kanak Infosystems LLP Proprietary License v1.0
+
+This software and associated files (the "Software") may only be used (executed, modified, executed after modifications) if you have purchased a valid license from the authors, typically via Kanak Infosystems LLP Apps, or if you have received a written agreement from the authors of the Software (see the COPYRIGHT file).
+
+You may develop Kanak Infosystems LLP modules that use the Software as a library (typically by depending on it, importing it and using its resources), but without copying any source code or material from the Software. You may distribute those modules under the license of your choice, provided that this license is compatible with the terms of the Kanak Infosystems LLP Proprietary License (For example: LGPL, MIT, or proprietary licenses similar to this one).
+
+It is forbidden to publish, distribute, sublicense, or sell copies of the Software or modified copies of the Software.
+
+The above copyright notice and this permission notice must be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/custom_matrix_survey/__init__.py b/custom_matrix_survey/__init__.py
new file mode 100644
index 0000000..3b38916
--- /dev/null
+++ b/custom_matrix_survey/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+from . import controllers
diff --git a/custom_matrix_survey/__manifest__.py b/custom_matrix_survey/__manifest__.py
new file mode 100644
index 0000000..a788d35
--- /dev/null
+++ b/custom_matrix_survey/__manifest__.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+# Author      : Kanak Infosystems LLP. (<http://kanakinfosystems.com/>)
+# Copyright(c): 2012-Present Kanak Infosystems LLP.
+# All Rights Reserved.
+#
+#
+# This program is copyright property of the author mentioned above.
+# You can`t redistribute it and/or modify it.
+#
+#
+# You should have received a copy of the License along with this program.
+# If not, see <http://kanakinfosystems.com/license>
+#################################################################################
+
+{
+    'name': "Custom Matrix Survey",
+    'version': '1.0',
+    'summary': 'This app allows handling of complex survey forms with options like multiple choice questions, custom matrix etc.',
+    'description': """
+Custom Matrix Survey.
+================================
+    """,
+    'license': 'OPL-1',
+    'author': "Kanak Infosystems LLP.",
+    'website': "http://www.kanakinfosystems.com",
+    'images': ['static/description/banner.jpg'],
+    'category': 'Website',
+    'depends': ['survey_crm'],
+    'data': [
+        'security/ir.model.access.csv',
+        'views/survey_views.xml',
+        'views/custom_survey.xml',
+    ],
+    'application': True,
+    'price': 49,
+    'currency': 'EUR',
+}
diff --git a/custom_matrix_survey/controllers/__init__.py b/custom_matrix_survey/controllers/__init__.py
new file mode 100644
index 0000000..65a8c12
--- /dev/null
+++ b/custom_matrix_survey/controllers/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import main
diff --git a/custom_matrix_survey/controllers/main.py b/custom_matrix_survey/controllers/main.py
new file mode 100644
index 0000000..5f852c1
--- /dev/null
+++ b/custom_matrix_survey/controllers/main.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+import json
+from odoo import http
+from odoo.http import request
+import logging
+from odoo.addons.survey.controllers.main import Survey
+_logger = logging.getLogger(__name__)
+
+class Survey(Survey):
+    @http.route(['/survey/prefill/<model("survey.survey"):survey>/<string:token>',
+                 '/survey/prefill/<model("survey.survey"):survey>/<string:token>/<model("survey.page"):page>'],
+                type='http', auth='public', website=True)
+    def prefill(self, survey, token, page=None, **post):
+        UserInputLine = request.env['survey.user_input_line']
+        ret = {}
+        # Fetch previous answers
+        if page:
+            previous_answers = UserInputLine.sudo().search([('user_input_id.token', '=', token), ('page_id', '=', page.id)])
+        else:
+            previous_answers = UserInputLine.sudo().search([('user_input_id.token', '=', token)])
+        # Return non empty answers in a JSON compatible format
+        for answer in previous_answers:
+            if not answer.skipped:
+                answer_tag = '%s_%s_%s' % (answer.survey_id.id, answer.page_id.id, answer.question_id.id)
+                answer_value = None
+                if answer.question_id.matrix_subtype == 'custom_row':
+                    if answer.answer_type == 'free_text':
+                        answer_tag = "%s_%s_%s" % (answer_tag, answer.value_suggested_row.id, answer.value_suggested.id)
+                        answer_value = answer.value_free_text
+                    elif answer.answer_type == 'text':
+                        answer_tag = "%s_%s_%s" % (answer_tag, answer.value_suggested_row.id, answer.value_suggested.id)
+                        answer_value = answer.value_text
+                    elif answer.answer_type == 'number':
+                        answer_tag = "%s_%s_%s" % (answer_tag, answer.value_suggested_row.id, answer.value_suggested.id)
+                        answer_value = str(answer.value_number)
+                    elif answer.answer_type == 'date':
+                        answer_tag = "%s_%s_%s" % (answer_tag, answer.value_suggested_row.id, answer.value_suggested.id)
+                        answer_value = answer.value_date
+                    elif answer.answer_type == 'dropdown':
+                        answer_tag = "%s_%s_%s" % (answer_tag, answer.value_suggested_row.id, answer.value_suggested.id)
+                        answer_value = answer.value_dropdown.id
+                    elif answer.answer_type == 'suggestion' and not answer.value_suggested_row:
+                        answer_tag = "%s_%s_%s" % (answer_tag, answer.value_suggested_row.id, answer.value_suggested.id)
+                        answer_value = answer.value_suggested.id
+                    elif answer.answer_type == 'suggestion' and answer.value_suggested_row:
+                        answer_tag = "%s_%s_%s" % (answer_tag, answer.value_suggested_row.id, answer.value_suggested.id)
+                        answer_value = answer.value_suggested.id
+                    if answer_value:
+                        ret.setdefault(answer_tag, []).append(answer_value)
+                    else:
+                        _logger.warning("[survey] No answer has been found for question %s marked as non skipped" % answer_tag)
+                else:
+                    if answer.answer_type == 'free_text':
+                        answer_value = answer.value_free_text
+                    elif answer.answer_type == 'text' and answer.question_id.type == 'textbox':
+                        answer_value = answer.value_text
+                    elif answer.answer_type == 'text' and answer.question_id.type != 'textbox':
+                        # here come comment answers for matrices, simple choice and multiple choice
+                        answer_tag = "%s_%s" % (answer_tag, 'comment')
+                        answer_value = answer.value_text
+                    elif answer.answer_type == 'number':
+                        answer_value = str(answer.value_number)
+                    elif answer.answer_type == 'date':
+                        answer_value = answer.value_date
+                    elif answer.answer_type == 'suggestion' and not answer.value_suggested_row:
+                        answer_value = answer.value_suggested.id
+                    elif answer.answer_type == 'suggestion' and answer.value_suggested_row:
+                        answer_tag = "%s_%s" % (answer_tag, answer.value_suggested_row.id)
+                        answer_value = answer.value_suggested.id
+                    if answer_value:
+                        ret.setdefault(answer_tag, []).append(answer_value)
+                    else:
+                        _logger.warning("[survey] No answer has been found for question %s marked as non skipped" % answer_tag)
+        return json.dumps(ret)
\ No newline at end of file
diff --git a/custom_matrix_survey/models/__init__.py b/custom_matrix_survey/models/__init__.py
new file mode 100644
index 0000000..7e49d37
--- /dev/null
+++ b/custom_matrix_survey/models/__init__.py
@@ -0,0 +1 @@
+from . import survey
diff --git a/custom_matrix_survey/models/survey.py b/custom_matrix_survey/models/survey.py
new file mode 100644
index 0000000..eca2cdf
--- /dev/null
+++ b/custom_matrix_survey/models/survey.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+def dict_keys_startswith(dictionary, string):
+    """Returns a dictionary containing the elements of <dict> whose keys start with <string>.
+        .. note::
+            This function uses dictionary comprehensions (Python >= 2.7)
+    """
+    return {k: v for k, v in dictionary.items() if k.startswith(string)}
+
+class SurveyQuestion(models.Model):
+    _inherit = 'survey.question'
+
+    matrix_subtype = fields.Selection([('simple', 'One choice per row'),
+        ('multiple', 'Multiple choices per row'), ('custom_row', 'Custom Matrix')], string='Matrix Type', default='simple')
+
+    @api.multi
+    def validate_matrix(self, post, answer_tag):
+        self.ensure_one()
+        errors = {}
+        if self.constr_mandatory:
+            lines_number = len(self.labels_ids_2)
+            answer_candidates = dict_keys_startswith(post, answer_tag)
+            answer_candidates.pop(("%s_%s" % (answer_tag, 'comment')), '').strip()
+            # Number of lines that have been answered
+            if self.matrix_subtype == 'simple':
+                answer_number = len(answer_candidates)
+            elif self.matrix_subtype == 'multiple':
+                answer_number = len({sk.rsplit('_', 1)[0] for sk in answer_candidates})
+            elif self.matrix_subtype == 'custom_row':
+                answer_number = len({sk.rsplit('_', 1)[0] for sk in answer_candidates})
+            else:
+                raise RuntimeError("Invalid matrix subtype")
+            # Validate that each line has been answered
+            if answer_number != lines_number:
+                errors.update({answer_tag: self.constr_error_msg})
+        return errors
+
+class SurveyLabel(models.Model):
+    _inherit = 'survey.label'
+    type = fields.Selection([
+            ('free_text', 'Multiple Lines Text Box'),
+            ('textbox', 'Single Line Text Box'),
+            ('numerical_box', 'Numerical Value'),
+            ('dropdown', 'Dropdown'),
+            ('checkbox', 'Checkbox')
+            ], string='Type of Question', default="checkbox")
+
+    dpvalues = fields.Many2many('dp.attributes.value', string="values")
+
+class SurveyLabelManyTags(models.Model):
+    _name = 'dp.attributes.value'
+
+    name = fields.Char("Name")
+
+class SurveyUserInputLine(models.Model):
+    _inherit = 'survey.user_input_line'
+
+    answer_type = fields.Selection([
+        ('text', 'Text'),
+        ('number', 'Number'),
+        ('date', 'Date'),
+        ('free_text', 'Free Text'),
+        ('suggestion', 'Suggestion'), ('dropdown', 'Dropdown')], string='Answer Type')
+
+    value_dropdown = fields.Many2one('dp.attributes.value', string="Value Dropdown")
+    matrix_subtype_id = fields.Selection(related='question_id.matrix_subtype', string="Matrix subtype")
+
+    @api.model
+    def save_line_matrix(self, user_input_id, question, post, answer_tag):
+        vals = {
+            'user_input_id': user_input_id,
+            'question_id': question.id,
+            'survey_id': question.survey_id.id,
+            'skipped': False
+        }
+        old_uil = self.search([
+            ('user_input_id', '=', user_input_id),
+            ('survey_id', '=', question.survey_id.id),
+            ('question_id', '=', question.id)
+        ])
+        old_uil.sudo().unlink()
+
+        no_answers = True
+        ca_dict = dict_keys_startswith(post, answer_tag + '_')
+
+        comment_answer = ca_dict.pop(("%s_%s" % (answer_tag, 'comment')), '').strip()
+        if comment_answer:
+            vals.update({'answer_type': 'text', 'value_text': comment_answer})
+            self.create(vals)
+            no_answers = False
+
+        if question.matrix_subtype == 'simple':
+            for row in question.labels_ids_2:
+                a_tag = "%s_%s" % (answer_tag, row.id)
+                if a_tag in ca_dict:
+                    no_answers = False
+                    vals.update({'answer_type': 'suggestion', 'value_suggested': ca_dict[a_tag], 'value_suggested_row': row.id})
+                    self.create(vals)
+
+        elif question.matrix_subtype == 'multiple':
+            for col in question.labels_ids:
+                for row in question.labels_ids_2:
+                    a_tag = "%s_%s_%s" % (answer_tag, row.id, col.id)
+                    if a_tag in ca_dict:
+                        no_answers = False
+                        vals.update({'answer_type': 'suggestion', 'value_suggested': col.id, 'value_suggested_row': row.id})
+                        self.create(vals)
+        elif question.matrix_subtype == 'custom_row':
+            for col in question.labels_ids:
+                for row in question.labels_ids_2:
+                    a_tag = "%s_%s_%s" % (answer_tag, row.id, col.id)
+                    if a_tag in ca_dict:
+                        no_answers = False
+                        if post.get(a_tag): 
+                            sline = a_tag.split('_')[-1]
+                            label_obj = question.labels_ids.browse(int(sline))
+                            if label_obj.type == 'textbox':
+                                vals.update({'answer_type': 'text', 'value_suggested': col.id, 'value_suggested_row': row.id, 'value_text': post.get(a_tag)})
+                            elif label_obj.type == 'free_text':
+                                vals.update({'answer_type': 'free_text', 'value_suggested': col.id, 'value_suggested_row': row.id, 'value_free_text': post.get(a_tag)})
+                            elif label_obj.type == 'numerical_box':
+                                vals.update({'answer_type': 'number', 'value_suggested': col.id, 'value_suggested_row': row.id, 'value_number': post.get(a_tag)})
+                            elif label_obj.type == 'date':
+                                vals.update({'answer_type': 'date', 'value_suggested': col.id, 'value_suggested_row': row.id, 'value_date': post.get(a_tag)})
+                            elif label_obj.type == 'dropdown':
+                                vals.update({'answer_type': 'dropdown', 'value_suggested': col.id, 'value_suggested_row': row.id, 'value_dropdown': int(post.get(a_tag))})
+                            else:
+                                vals.update({'answer_type': 'suggestion', 'value_suggested': col.id, 'value_suggested_row': row.id})
+                            self.create(vals)
+
+        if no_answers:
+            vals.update({'answer_type': None, 'skipped': True})
+            self.create(vals)
+        return True
\ No newline at end of file
diff --git a/custom_matrix_survey/security/ir.model.access.csv b/custom_matrix_survey/security/ir.model.access.csv
new file mode 100644
index 0000000..0550a48
--- /dev/null
+++ b/custom_matrix_survey/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_dp_attributes_value,access_dp_attributes_value,model_dp_attributes_value,,1,1,1,1
diff --git a/custom_matrix_survey/static/description/banner.jpg b/custom_matrix_survey/static/description/banner.jpg
new file mode 100644
index 0000000..8177cdb
Binary files /dev/null and b/custom_matrix_survey/static/description/banner.jpg differ
diff --git a/custom_matrix_survey/static/description/call-icon.png b/custom_matrix_survey/static/description/call-icon.png
new file mode 100644
index 0000000..14f116d
Binary files /dev/null and b/custom_matrix_survey/static/description/call-icon.png differ
diff --git a/custom_matrix_survey/static/description/color code.txt b/custom_matrix_survey/static/description/color code.txt
new file mode 100644
index 0000000..4d68dc8
--- /dev/null
+++ b/custom_matrix_survey/static/description/color code.txt	
@@ -0,0 +1,2 @@
+Blue color: 123246
+Red Color: dc1d1d
\ No newline at end of file
diff --git a/custom_matrix_survey/static/description/features-icon.png b/custom_matrix_survey/static/description/features-icon.png
new file mode 100644
index 0000000..8d6b2f7
Binary files /dev/null and b/custom_matrix_survey/static/description/features-icon.png differ
diff --git a/custom_matrix_survey/static/description/icon-2.png b/custom_matrix_survey/static/description/icon-2.png
new file mode 100644
index 0000000..447419b
Binary files /dev/null and b/custom_matrix_survey/static/description/icon-2.png differ
diff --git a/custom_matrix_survey/static/description/icon-3.png b/custom_matrix_survey/static/description/icon-3.png
new file mode 100644
index 0000000..87af289
Binary files /dev/null and b/custom_matrix_survey/static/description/icon-3.png differ
diff --git a/custom_matrix_survey/static/description/icon-4.png b/custom_matrix_survey/static/description/icon-4.png
new file mode 100644
index 0000000..a3340a7
Binary files /dev/null and b/custom_matrix_survey/static/description/icon-4.png differ
diff --git a/custom_matrix_survey/static/description/icon-5.png b/custom_matrix_survey/static/description/icon-5.png
new file mode 100644
index 0000000..65d77bd
Binary files /dev/null and b/custom_matrix_survey/static/description/icon-5.png differ
diff --git a/custom_matrix_survey/static/description/icon-6.png b/custom_matrix_survey/static/description/icon-6.png
new file mode 100644
index 0000000..7a1044f
Binary files /dev/null and b/custom_matrix_survey/static/description/icon-6.png differ
diff --git a/custom_matrix_survey/static/description/icon.png b/custom_matrix_survey/static/description/icon.png
new file mode 100644
index 0000000..b27344b
Binary files /dev/null and b/custom_matrix_survey/static/description/icon.png differ
diff --git a/custom_matrix_survey/static/description/icon1.png b/custom_matrix_survey/static/description/icon1.png
new file mode 100644
index 0000000..00b2c78
Binary files /dev/null and b/custom_matrix_survey/static/description/icon1.png differ
diff --git a/custom_matrix_survey/static/description/index.html b/custom_matrix_survey/static/description/index.html
new file mode 100644
index 0000000..eb284b6
--- /dev/null
+++ b/custom_matrix_survey/static/description/index.html
@@ -0,0 +1,248 @@
+<section class="oe_container oe_dark"> 
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">
+                Matrix Survey
+            </h2>
+        </div>
+    </div>
+</section>
+<section class="oe_container" style="background-color: #eeeeee;">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Create Survey &amp; Add Survey pages</h2>
+        </div>
+        <div class="oe_span12">
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_1.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Add questions for survey page</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_2.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container" style="background-color: #eeeeee;">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Set question type as "matrix"</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_3.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Set type of matrix</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_4.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container" style="background-color: #eeeeee;">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h3 class="oe_slogan">
+                Add answer's choices &amp; Set display type of questions <br/>
+                with different types of input methods
+            </h3>
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_5.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Add multiple header rows</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_6.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container" style="background-color: #eeeeee;">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Fill survey</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_8.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">View filled answers of survey</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="">
+                    <img src="survey_9.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container" style="background-color: #eeeeee;">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Get print in .pdf</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="oe_span6">
+                    <img src="survey_10.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">PDF view</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="oe_span6">
+                    <img src="survey_11.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container" style="background-color: #eeeeee;">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Print filled answers</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="oe_span6">
+                    <img src="survey_12.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row oe_spaced text-center">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Filled Answers</h2>
+            <div class="oe_row_img oe_centered">
+                <div class="oe_span6">
+                    <img src="survey_13.png" class="oe_screenshot oe_centered" style="max-height: 400px;"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="laptop-wrapper">
+                <iframe width="560" height="315" src="https://www.youtube.com/embed/F7u41nqf_iA" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+            </div>
+        </div>
+    </div>
+</section>
+<section>
+    <div class="oe_row">
+        <div class="container-fluid">
+            <div class="oe_row">
+                <div class="col-md-12 col-xs-12 col-sm-12 mt32 mb32 text-center">
+                    <img src="logo.png" style="height:100px;">
+                </div>
+            </div>
+            <div class="oe_row oe_screenshot" style="box-shadow: 3px 4px 25px 6px rgba(0, 0, 0, 0.2);;border-radius: 8px; background: #ECEDF0;">
+                <div class="col-sm-12">
+                <div class="text-center">
+                <a href="https://kanakinfosystems.com/kanak_aboutus"><h3 class="oe_slogan" style="border-bottom: 1px solid #123246; margin-top: 8px; font-size:33px; color:#123246; opacity:1;  font-family:segoeuib">About kanak Infosystems</h3></a>
+                </div>
+                </div>
+                 <div class="col-sm-12">
+                <h5 class="oe_slogan" style="margin-top: -9px; color:#123246;margin-bottom: 12px; opacity: 0.6; font-family:segoeuiz;"><i><b>"We are groupies wrapped in Creativity, Skills and Innovation"</b></i></h5>
+                <p style="font-family:segoeui">We are authorized IT company to offer advanced, hight quality and affordable IT solutions. We have years of rich experience in the field of ODOO Development, ERP Solutions, Web Development, Mobile Apps, Web Designing and Digital marketing. Around a decade are offering quality assured and 100% customer satisfaction services to global clientele.</p>
+
+                <p style="font-family:segoeui">Our highly experienced and devoted team of professionals works with there heart, passion and talent to provide the most dedicated IT Business Solutions to our valuable clients globally. Our team works on the real words "Dedication,"Timely Deliverables",And "Happy Clients"!</p>
+                </div>
+            </div>
+            <div class="oe_row col-md-12 col-sm-12">
+                <div class="text-center">
+                    <h2 style="color:#123246;font-family:segoeuib"> What We Do</h2>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-2 col-sm-2">
+                    <img src="icon1.png">
+                    <h6 style="margin-top: -10px;font-size: 9px;color:#123246;font-family:">Odoo Customization</h6>
+                </div>
+                <div class="col-md-2 col-sm-2">
+                    <img src="icon-2.png">
+                    <h6 style="margin-top: -1px;font-size: 9px;color:#123246;font-family:">Odoo Code Migration</h6>
+                </div>
+                <div class="col-md-2 col-sm-2">
+                    <img src="icon-3.png">
+                    <h6 style="margin-top: -1px;font-size: 9px;color:#123246;font-family:">Odoo Mobile App</h6>
+                </div>
+                <div class="col-md-2 col-sm-2">
+                    <img src="icon-4.png">
+                    <h6 style="margin-top: -1px;font-size: 9px;color:#123246;font-family:">Odoo DB Migration</h6>
+                </div>
+                <div class="col-md-2 col-sm-2">
+                    <img src="icon-5.png">
+                    <h6 style="margin-top: -1px;font-size: 9px;color:#123246;font-family:">Odoo Web Development</h6>
+                </div>
+                <div class="col-md-2 col-sm-2">
+                    <img src="icon-6.png">
+                    <h6 style="margin-top: -1px;font-size: 9px;color:#123246;font-family:">Odoo Themes</h6>
+                </div>
+            </div>
+            <div class="oe_row">
+                <div class="text-center" style="text-align: center;">
+                    <a style="color:#dc1d1d; border:1px solid #dc1d1d; width:170px;" class="btn btn-lg" rel="nofollow" href="https://kanakinfosystems.com/contactus" target="_blank">
+                         Contact Us
+                    </a>
+                </div>
+            </div>
+            <div class="oe_row" style="box-shadow: 3px 5px 18px 6px rgba(0, 0, 0, 0.2);;border-radius: 8px; background: #ECEDF0; height:50px">
+
+            <div class="oe_row">
+                <div class="col-md-12 col-sm-12" style="padding-top: 10px;padding-left: 40px;">
+                    <div class="col-md-4 col-sm-4" style="float: left; text-align: center;">
+                        <span><img src="call-icon.png"/></span>
+                        <span>Help</span>
+                    </div>
+                    <div class="col-md-4 col-sm-4" style="float: left; text-align: center;">
+                        <span><img src="support-icon.png"/></span>
+                        <span>Support</span>
+                    </div>
+                    <div class="col-md-4 col-sm-4" style="float: left; text-align: center;">
+                        <span><img src="support-icon.png"/></span>
+                        <span>Request New Features</span>
+                    </div>
+                </div>
+            </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/custom_matrix_survey/static/description/logo.png b/custom_matrix_survey/static/description/logo.png
new file mode 100644
index 0000000..78fdb08
Binary files /dev/null and b/custom_matrix_survey/static/description/logo.png differ
diff --git a/custom_matrix_survey/static/description/main_image.jpg b/custom_matrix_survey/static/description/main_image.jpg
new file mode 100755
index 0000000..5b48b41
Binary files /dev/null and b/custom_matrix_survey/static/description/main_image.jpg differ
diff --git a/custom_matrix_survey/static/description/support-icon.png b/custom_matrix_survey/static/description/support-icon.png
new file mode 100644
index 0000000..c169f79
Binary files /dev/null and b/custom_matrix_survey/static/description/support-icon.png differ
diff --git a/custom_matrix_survey/static/description/survey_1.png b/custom_matrix_survey/static/description/survey_1.png
new file mode 100644
index 0000000..0816ad9
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_1.png differ
diff --git a/custom_matrix_survey/static/description/survey_10.png b/custom_matrix_survey/static/description/survey_10.png
new file mode 100644
index 0000000..ca397ef
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_10.png differ
diff --git a/custom_matrix_survey/static/description/survey_11.png b/custom_matrix_survey/static/description/survey_11.png
new file mode 100644
index 0000000..901a3e1
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_11.png differ
diff --git a/custom_matrix_survey/static/description/survey_12.png b/custom_matrix_survey/static/description/survey_12.png
new file mode 100644
index 0000000..0d58894
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_12.png differ
diff --git a/custom_matrix_survey/static/description/survey_13.png b/custom_matrix_survey/static/description/survey_13.png
new file mode 100644
index 0000000..46e65fb
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_13.png differ
diff --git a/custom_matrix_survey/static/description/survey_2.png b/custom_matrix_survey/static/description/survey_2.png
new file mode 100644
index 0000000..b79280c
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_2.png differ
diff --git a/custom_matrix_survey/static/description/survey_3.png b/custom_matrix_survey/static/description/survey_3.png
new file mode 100644
index 0000000..1c37524
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_3.png differ
diff --git a/custom_matrix_survey/static/description/survey_4.png b/custom_matrix_survey/static/description/survey_4.png
new file mode 100644
index 0000000..d7d1f16
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_4.png differ
diff --git a/custom_matrix_survey/static/description/survey_5.png b/custom_matrix_survey/static/description/survey_5.png
new file mode 100644
index 0000000..b079065
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_5.png differ
diff --git a/custom_matrix_survey/static/description/survey_6.png b/custom_matrix_survey/static/description/survey_6.png
new file mode 100644
index 0000000..a50a096
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_6.png differ
diff --git a/custom_matrix_survey/static/description/survey_8.png b/custom_matrix_survey/static/description/survey_8.png
new file mode 100644
index 0000000..12633c9
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_8.png differ
diff --git a/custom_matrix_survey/static/description/survey_9.png b/custom_matrix_survey/static/description/survey_9.png
new file mode 100644
index 0000000..df36c99
Binary files /dev/null and b/custom_matrix_survey/static/description/survey_9.png differ
diff --git a/custom_matrix_survey/static/src/js/custom.js b/custom_matrix_survey/static/src/js/custom.js
new file mode 100644
index 0000000..4f58016
--- /dev/null
+++ b/custom_matrix_survey/static/src/js/custom.js
@@ -0,0 +1,7 @@
+odoo.define('custom_matrix_survey.custom', function(require) {
+"use strict";
+	// var ajax = require('web.ajax');
+	$(document).ready(function() {
+		
+ 	});
+});
diff --git a/custom_matrix_survey/views/assets.xml b/custom_matrix_survey/views/assets.xml
new file mode 100644
index 0000000..9c779e3
--- /dev/null
+++ b/custom_matrix_survey/views/assets.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Custom Survey Assest">
+    <xpath expr="//link[last()]" position="after">
+      <link href="/custom_matrix_survey/static/src/css/custom.css" rel="stylesheet" type="text/css" />
+    </xpath>
+    <xpath expr="//script[last()]" position="after">
+    	<script src="/custom_matrix_survey/static/src/js/custom.js"></script>
+    </xpath>
+  </template>
+</odoo>
\ No newline at end of file
diff --git a/custom_matrix_survey/views/custom_survey.xml b/custom_matrix_survey/views/custom_survey.xml
new file mode 100644
index 0000000..933b778
--- /dev/null
+++ b/custom_matrix_survey/views/custom_survey.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="matrix_custom" inherit_id="survey.matrix">
+            <xpath expr="//table" position="replace">
+                <table class="table table-hover">
+                <thead>
+                    <tr>
+                        <th> </th>
+                        <th t-foreach="question.labels_ids" t-as="col_label"><span t-field="col_label.value" /></th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr t-foreach="question.labels_ids_2" t-as="row_label">
+                        <th><span t-field="row_label.value" /></th>
+                        <td t-foreach="question.labels_ids" t-as="col_label">
+                            <input t-if="question.matrix_subtype == 'simple'" type="radio" t-att-name="'%s_%s' % (prefix, row_label.id)" t-att-value='col_label.id' />
+                            <t t-if="question.matrix_subtype == 'custom_row'">
+                                <t t-if="col_label.type == 'textbox'">
+                                    <input type="text" class="form-control" t-att-name="'%s_%s_%s' % (prefix, row_label.id, col_label.id)"/>
+                                </t>
+                                <t t-if="col_label.type == 'free_text'">
+                                    <textarea class="form-control" rows="3" t-att-name="'%s_%s_%s' % (prefix, row_label.id, col_label.id)"></textarea>
+                                </t>
+                                <t t-if="col_label.type == 'numerical_box'">
+                                   <input type="number" step="any" class="form-control" t-att-name="'%s_%s_%s' % (prefix, row_label.id, col_label.id)"/>
+                                </t>
+                                <t t-if="col_label.type == 'date'">
+                                    <div class='input-group date'>
+                                        <input type="text" date="true" class="form-control date" t-att-name="'%s_%s_%s' % (prefix, row_label.id, col_label.id)"/>
+                                    </div>
+                                </t>
+                                <t t-if="col_label.type == 'dropdown'">
+                                    <select t-att-name="'%s_%s_%s' % (prefix, row_label.id, col_label.id)" class="form-control" id="seldpbox1">
+                                        <option></option>
+                                        <t t-foreach="col_label.dpvalues" t-as="dpv">
+                                            <option t-att-value="dpv.id"><t t-esc="dpv.name"/></option>
+                                        </t>
+                                    </select> 
+                                </t>
+                                <t t-if="col_label.type == 'checkbox'">
+                                    <input type="checkbox" t-att-name="'%s_%s_%s' % (prefix, row_label.id, col_label.id)" t-att-value='col_label.id' />
+                                </t>
+                            </t>
+                            <input t-if="question.matrix_subtype == 'multiple'" type="checkbox" t-att-name="'%s_%s_%s' % (prefix, row_label.id, col_label.id)" t-att-value='col_label.id' />
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            </xpath>
+        </template>
+
+        <template id="report_survey_answers_document">
+             <t t-call="web.internal_layout">
+                <t t-set="doc" t-value="doc.with_context({'lang':doc.partner_id.lang})" />
+                <div class="page">
+                    <div class="oe_structure"/>
+                    <div class="row mt32 mb32" style="display: inherit;">
+                       <h3 class="text-center"><t t-esc="doc.survey_id.title"/></h3>
+                       <t t-set="questions" t-value="doc.user_input_line_ids.mapped('question_id')"/>
+                       <!-- <h3 class="text-center"><t t-esc="doc."/></h3> -->
+                       <t t-foreach="questions" t-as="qs">
+                            <t t-if="qs.matrix_subtype == 'custom_row'">
+                                <h4 class="text-center mt16 mb16" t-field="qs.question"/>
+                                <table class="table" style="width:100%;">
+                                    <thead>
+                                        <tr style="width:100%;text-align: center">
+                                            <th style="text-align: center">#</th>
+                                            <t t-foreach="qs.labels_ids" t-as="lb">
+                                            <th style="text-align: center"> <span t-field="lb.value"/></th>
+                                            </t>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <t t-foreach="qs.labels_ids_2" t-as="lb2">
+                                            <tr style="text-align: center">
+                                                <td style="text-align: center"><strong t-field="lb2.value"></strong></td>
+                                                <t t-foreach="qs.labels_ids" t-as="lb">
+                                                    <t t-set="flag" t-value="false"/>
+                                                    <t t-foreach="doc.user_input_line_ids" t-as="ans">
+                                                        <t t-if="ans.value_suggested_row.id == lb2.id">
+                                                            <t t-if="ans.value_suggested.id == lb.id">
+                                                                <td class="text-center">
+                                                                    <t t-if="ans.answer_type == 'text'">
+                                                                        <span t-field="ans.value_text"/>
+                                                                    </t>
+                                                                    <t t-if="ans.answer_type == 'number'">
+                                                                        <span t-field="ans.value_number"/>
+                                                                    </t>
+                                                                    <t t-if="ans.answer_type == 'free_text'">
+                                                                        <span t-field="ans.value_free_text"/>
+                                                                    </t>
+                                                                    <t t-if="ans.answer_type == 'suggestion'">
+                                                                        <span class="fa fa-check"/>
+                                                                    </t>
+                                                                    <t t-if="ans.answer_type == 'dropdown'">
+                                                                        <span t-field="ans.value_dropdown"/>
+                                                                    </t>
+                                                                </td>
+                                                                <t t-set="flag" t-value="true"/>
+                                                            </t>
+                                                        </t>
+                                                    </t>
+                                                    <t t-if="not flag">
+                                                        <td style="text-align: center">
+                                                        </td>
+                                                    </t>
+                                                </t>
+                                            </tr>
+                                        </t>
+                                    </tbody>
+                                </table>
+                            </t>
+                       </t>
+                    </div>
+                </div>
+            </t>
+        </template>
+        <template id="report_survey_answers">
+            <t t-call="web.html_container">
+                <t t-foreach="docs" t-as="doc">
+                    <t t-call="custom_matrix_survey.report_survey_answers_document"/>
+                </t>
+            </t>
+        </template>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/custom_matrix_survey/views/survey_views.xml b/custom_matrix_survey/views/survey_views.xml
new file mode 100644
index 0000000..79d47b2
--- /dev/null
+++ b/custom_matrix_survey/views/survey_views.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+   	<record model="ir.ui.view" id="survey_question_custom_form">
+            <field name="name">Form view for survey custom question</field>
+            <field name="model">survey.question</field>
+            <field name="inherit_id" ref="survey.survey_question_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook//page//field[@name='labels_ids']//tree" position="inside">
+                    <field name="type"/>
+                    <field name="dpvalues" widget="many2many_tags" attrs="{'invisible': [('type', '!=', 'dropdown')]}"/>
+                </xpath>
+            </field>
+    </record>
+
+    <record model="ir.ui.view" id="survey_user_input_line_custom_form">
+            <field name="name">survey_user_input_line_custom_form</field>
+            <field name="model">survey.user_input_line</field>
+            <field name="inherit_id" ref="survey.survey_user_input_line_form"/>
+            <field name="arch" type="xml">
+                <field name="value_text" position="after">
+                    <field name="value_dropdown" attrs="{'invisible': [('answer_type','!=','dropdown')]}"/>
+                    <field name="matrix_subtype_id"/>
+                </field>
+                <field name="value_suggested" position="replace">
+                    <field name="value_suggested" colspan='2' attrs="{'invisible': [ ('answer_type','!=','suggestion'), ('matrix_subtype_id', '!=', 'custom_row')]}"/>
+                </field>
+            </field>
+    </record>
+    <report 
+            id="action_view_pdf_answers"
+            string="Answers"
+            model="survey.user_input" 
+            report_type="qweb-pdf"
+            file="custom_matrix_survey.report_survey_answers" 
+            name="custom_matrix_survey.report_survey_answers"
+            print_report_name="'answer - %s' % (object.survey_id.title)"
+        />
+
+    <record model="ir.ui.view" id="survey_user_input_custom_form">
+            <field name="name">survey_user_input_custom_form</field>
+            <field name="model">survey.user_input</field>
+            <field name="inherit_id" ref="survey.survey_user_input_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//form//header//button[@name='action_view_answers']" position="after">
+                    <button name="%(action_view_pdf_answers)d" states="done" string="Print PDF Answers" type="action"  class="oe_highlight" />
+                </xpath>
+            </field>
+    </record>
+</odoo>