From ad3c27b77abff578f93fa77db107a07e37beaac9 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Mon, 23 Apr 2012 18:06:20 +0530 Subject: [PATCH 1/5] [ADD] addedaccess rights inorder to fill survey, and also for creating the project issue and removed domain from Personal Events rule inorder to view all the events bzr revid: bde@tinyerp.com-20120423123620-rrj06svz90bq3tw2 --- .../security/portal_customer_security.xml | 2 +- .../portal_customer_feedback/security/ir.model.access.csv | 2 ++ addons/portal_customer_issue/security/ir.model.access.csv | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/portal_customer_event/security/portal_customer_security.xml b/addons/portal_customer_event/security/portal_customer_security.xml index ae161c8c642..20f42d9204d 100644 --- a/addons/portal_customer_event/security/portal_customer_security.xml +++ b/addons/portal_customer_event/security/portal_customer_security.xml @@ -5,7 +5,7 @@ Personal Events - [('registration_ids.email','=',user.login)] + [] diff --git a/addons/portal_customer_feedback/security/ir.model.access.csv b/addons/portal_customer_feedback/security/ir.model.access.csv index f56702fdc0a..98329217e5f 100644 --- a/addons/portal_customer_feedback/security/ir.model.access.csv +++ b/addons/portal_customer_feedback/security/ir.model.access.csv @@ -8,3 +8,5 @@ access_survey_history,survey_history,survey.model_survey_history,portal_customer 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 +access_ir_attachment,ir.attachment,base.model_ir_attachment,portal_customer.group_sales_portal,1,0,1,0 +access_mail_message,mail.message,mail.model_mail_message,portal_customer.group_sales_portal,1,1,1,0 diff --git a/addons/portal_customer_issue/security/ir.model.access.csv b/addons/portal_customer_issue/security/ir.model.access.csv index 4966a993b3b..8bb2d76538f 100644 --- a/addons/portal_customer_issue/security/ir.model.access.csv +++ b/addons/portal_customer_issue/security/ir.model.access.csv @@ -1,3 +1,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_issues,project_issue,project_issue.model_project_issue,portal_customer.group_sales_portal,1,0,1,0 +access_issues,project_issue,project_issue.model_project_issue,portal_customer.group_sales_portal,1,1,1,0 access_task,tasks,project.model_project_task,portal_customer.group_sales_portal,1,0,0,0 +access_project_task_work,project.task.work,project.model_project_task_work,portal_customer.group_sales_portal,1,0,0,0 +access_project_project,project.project,project.model_project_project,portal_customer.group_sales_portal,1,0,0,0 +access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,portal_customer.group_sales_portal,1,0,0,0 +access_project_task_type,project.task.type,project.model_project_task_type,portal_customer.group_sales_portal,1,0,0,0 From 22a4a4f38191046fd317646fd610e826ec77c8f2 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 24 Apr 2012 11:09:54 +0530 Subject: [PATCH 2/5] [FIX]: Hide Feeds Menu, remove domain force for event, remove tweets widget for latest news. bzr revid: atp@tinyerp.com-20120424053954-hdyd43ra72oiih4a --- addons/mail/mail_thread_view.xml | 2 +- .../portal_customer/board_portal_customer_view.xml | 13 ++----------- addons/portal_customer/portal_customer_menu.xml | 10 ++-------- .../portal_customer_event_view.xml | 2 +- .../security/portal_customer_security.xml | 1 - addons/sale/sale_view.xml | 2 +- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 35508477009..9525045b8aa 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -5,7 +5,7 @@ + web_icon_hover="static/src/img/feeds-hover.png" groups="base.group_user"/> diff --git a/addons/portal_customer/board_portal_customer_view.xml b/addons/portal_customer/board_portal_customer_view.xml index 8ace2d0e380..db6283b47a7 100644 --- a/addons/portal_customer/board_portal_customer_view.xml +++ b/addons/portal_customer/board_portal_customer_view.xml @@ -2,15 +2,6 @@ - My Feeds @@ -25,10 +16,10 @@
- + - +
diff --git a/addons/portal_customer/portal_customer_menu.xml b/addons/portal_customer/portal_customer_menu.xml index e64f9e14ffa..84f628dd1a5 100644 --- a/addons/portal_customer/portal_customer_menu.xml +++ b/addons/portal_customer/portal_customer_menu.xml @@ -5,24 +5,18 @@ - - - - - - - - + + diff --git a/addons/portal_customer_event/portal_customer_event_view.xml b/addons/portal_customer_event/portal_customer_event_view.xml index 65f69741d1b..9ffcb95d9b2 100644 --- a/addons/portal_customer_event/portal_customer_event_view.xml +++ b/addons/portal_customer_event/portal_customer_event_view.xml @@ -3,6 +3,6 @@ - + diff --git a/addons/portal_customer_event/security/portal_customer_security.xml b/addons/portal_customer_event/security/portal_customer_security.xml index ae161c8c642..d08c038bb1f 100644 --- a/addons/portal_customer_event/security/portal_customer_security.xml +++ b/addons/portal_customer_event/security/portal_customer_security.xml @@ -5,7 +5,6 @@ Personal Events - [('registration_ids.email','=',user.login)] diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 2b41b74305c..3518b1a26f1 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -131,7 +131,7 @@ - + From c93f2203b3246c979875de7c6f48a07ef5e014d7 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Tue, 24 Apr 2012 11:14:00 +0530 Subject: [PATCH 3/5] [IMP] improved the functionality inorder to take the customer's individual record in add portal access in case when customer has no contacts bzr revid: bde@tinyerp.com-20120424054400-r18r007yxi1wzydp --- addons/portal/wizard/portal_wizard.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py index e7b89bb0732..2a939608b7f 100644 --- a/addons/portal/wizard/portal_wizard.py +++ b/addons/portal/wizard/portal_wizard.py @@ -91,12 +91,25 @@ class wizard(osv.osv_memory): def _default_user_ids(self, cr, uid, context): """ determine default user_ids from the active records """ def create_user_from_address(address): - return { # a user config based on a contact (address) - 'name': address.name, - 'user_email': extract_email(address.email), - 'lang': address.parent_id and address.parent_id.lang or 'en_US', - 'partner_id': address.parent_id and address.parent_id.id, - } + res = {} + if isinstance(address, int): + res_partner_obj = self.pool.get('res.partner') + address = res_partner_obj.browse(cr, uid, address, context=context) + lang = address.id and address.lang or 'en_US' + partner_id = address.id + + else: + lang = address.parent_id and address.parent_id.lang or 'en_US' + partner_id = address.parent_id and address.parent_id.id + + res = { + 'name': address.name, + 'user_email': extract_email(address.email), + 'lang': lang, + 'partner_id': partner_id, + } + + return res user_ids = [] if context.get('active_model') == 'res.partner': @@ -107,6 +120,8 @@ class wizard(osv.osv_memory): # add one user per contact, or one user if no contact if p.child_ids: user_ids.extend(map(create_user_from_address, p.child_ids)) + elif p.is_company == False and p.customer == True: + user_ids.extend(map(create_user_from_address, [p.id])) else: user_ids.append({'lang': p.lang or 'en_US', 'parent_id': p.id}) From 34db5762e226cc63d4472a6f45e2dd5f5038e9cd Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 24 Apr 2012 12:46:56 +0530 Subject: [PATCH 4/5] [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-customer_portal-atp-hide_fields_issue_claim-nco with some changes bzr revid: atp@tinyerp.com-20120424071656-erhrmsmsqecgpmxh --- addons/crm_claim/crm_claim_view.xml | 6 +++--- addons/project_issue/project_issue_view.xml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index ada4db06237..aec317ea8cf 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -76,8 +76,8 @@ -