From fe993bca9cc607df1d2f1d8fa9bc52a9761f8b13 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Mon, 26 Nov 2012 14:36:42 +0100 Subject: [PATCH] [FIX] FIxed several views. bzr revid: vta@openerp.com-20121126133642-bvj4go984ec6acko --- addons/portal/portal_data.xml | 49 ++++++-- addons/portal/portal_view.xml | 40 ++++++- addons/portal_claim/portal_claim_view.xml | 72 +----------- addons/portal_crm/contact.py | 1 - addons/portal_crm/contact_view.xml | 108 +++++++++--------- .../portal_crm/static/src/css/portal_crm.css | 4 +- addons/portal_hr_employees/hr_employee.py | 5 +- .../portal_hr_employees/hr_employee_view.xml | 25 ++-- .../static/src/css/portal_hr_employees.css | 5 +- addons/portal_project/portal_project_view.xml | 18 ++- .../portal_project_issue_view.xml | 5 +- .../security/ir.model.access.csv | 2 +- addons/project/project_view.xml | 20 ++-- addons/project_issue/project_issue_view.xml | 4 +- 14 files changed, 193 insertions(+), 165 deletions(-) diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml index d7550e0f2b4..4305e2d36ed 100644 --- a/addons/portal/portal_data.xml +++ b/addons/portal/portal_data.xml @@ -8,11 +8,28 @@ public - + News - mail.group - - form + mail.wall + mail.group + + +

+ Youd don't have unread company's news. +

+ @@ -21,11 +38,29 @@ public - + Jobs - mail.group + mail.wall + mail.message - form + + +

+ Youd don't have unread job offers. +

+ diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml index 1f291bb920e..313eb1e35af 100644 --- a/addons/portal/portal_view.xml +++ b/addons/portal/portal_view.xml @@ -9,7 +9,7 @@ sequence="20"/> - + @@ -17,9 +17,9 @@ Create menu items that we'll leave empty for now - they'll be filled up by other portal modules. --> - - - + + + @@ -47,7 +47,37 @@ - + Inbox + mail.wall + mail.message + { + 'default_model': 'res.users', + 'default_res_id': uid, + } + + +

+ Good Job! Your inbox is empty. +

+ Your inbox contains private messages or emails sent to you + as well as information related to documents or people you + follow. +

+ + + + diff --git a/addons/portal_claim/portal_claim_view.xml b/addons/portal_claim/portal_claim_view.xml index c7be419b889..cd0e4941286 100644 --- a/addons/portal_claim/portal_claim_view.xml +++ b/addons/portal_claim/portal_claim_view.xml @@ -1,79 +1,13 @@ - - - - CRM Claim Kanban - crm.claim - 20 - - - - - - - - - - - -
-
-
-

-
- -
- -
- -
- -
-

-
-
-
-
- Creation: - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- - - - - + Claims crm.claim form - tree,form,kanban,calendar - + tree,form,calendar + {"search_default_user_id":'', "stage_type":'claim', "portal":'True'} current diff --git a/addons/portal_crm/contact.py b/addons/portal_crm/contact.py index c4d4e1d7f8c..132f4db34d5 100644 --- a/addons/portal_crm/contact.py +++ b/addons/portal_crm/contact.py @@ -95,7 +95,6 @@ class crm_contact_us(osv.TransientModel): it is quite complicated to set proper rights for this object. Therefore, user SUPERUSER_ID will perform the creation. """ - print values values['contact_name'] = values['partner_name'] crm_lead.create(cr, SUPERUSER_ID, dict(values,user_id=False), context) diff --git a/addons/portal_crm/contact_view.xml b/addons/portal_crm/contact_view.xml index 0241259a82a..8fa839dda8a 100644 --- a/addons/portal_crm/contact_view.xml +++ b/addons/portal_crm/contact_view.xml @@ -6,57 +6,60 @@ Contact form portal_crm.crm_contact_us -
- -

Contact us

- - - - - - - - -
@@ -68,7 +71,7 @@ 99 -
+
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css index 0589eb92e71..e322f1cb9da 100644 --- a/addons/portal_crm/static/src/css/portal_crm.css +++ b/addons/portal_crm/static/src/css/portal_crm.css @@ -1,8 +1,6 @@ /* Root container */ .openerp .oe_portal_crm_contact { - width: 800px; - margin: auto; - padding: 8px 0 0 0; + min-width: 960px; } /* Contact form section */ diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py index bebcc450b01..94acea8c4aa 100644 --- a/addons/portal_hr_employees/hr_employee.py +++ b/addons/portal_hr_employees/hr_employee.py @@ -21,9 +21,9 @@ from osv import osv, fields -class crm_team(osv.TransientModel): +class crm_contact_us(osv.TransientModel): """ Add employees list to the portal's contact page """ - _name = 'crm.team' + _inherit = 'portal_crm.crm_contact_us' _description = 'Contact form for the portal' _columns = { 'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True), @@ -51,6 +51,7 @@ class hr_employee(osv.osv): _columns = { 'visibility': fields.selection([('public', 'Public'),('private', 'Private')], string='Visibility', help='Employee\'s visibility in the portal\'s contact page'), + 'public_info': fields.text(), } _defaults = { 'visibility': 'private', diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml index f9e69dba71b..0584b6b8a4b 100644 --- a/addons/portal_hr_employees/hr_employee_view.xml +++ b/addons/portal_hr_employees/hr_employee_view.xml @@ -8,8 +8,9 @@ hr.employee - + + @@ -17,7 +18,7 @@ portal_hr_employees_view - crm.team + portal_crm.crm_contact_us
@@ -31,13 +32,14 @@

- () + ()

  • Tel:
  • Mobile:
    • +
@@ -51,15 +53,24 @@ Meet the team - crm.team + portal_crm.crm_contact_us form + tree inline - Here you can see our employees' public profile, if any. - + + crm_contact_us + portal_crm.crm_contact_us + + + + Meet the team + + + + diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css index 5fa658de8c1..da511eaf2c0 100644 --- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css +++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css @@ -3,14 +3,13 @@ width: 100%; } .openerp .oe_portal_crm_contact .oe_portal_crm_team { - padding: 8px 0 0 0; + margin-top: 30px; + padding-top: 30px; } .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details { width: 170px; } .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image { - width: 65px; - height: 65px; } .openerp .oe_employee_vignette ul, .openerp .oe_employee_vignette li { diff --git a/addons/portal_project/portal_project_view.xml b/addons/portal_project/portal_project_view.xml index cfdaa4a602d..b7f3568545b 100644 --- a/addons/portal_project/portal_project_view.xml +++ b/addons/portal_project/portal_project_view.xml @@ -2,8 +2,24 @@ + + Projects + project.project + form + [] + kanban,gantt + + + {} + +

+ Click to start a new project. +

+ + + + action="open_view_project" sequence="10"/> diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml index 52fb2866e59..3de7f1f903e 100644 --- a/addons/portal_project_issue/portal_project_issue_view.xml +++ b/addons/portal_project_issue/portal_project_issue_view.xml @@ -76,14 +76,11 @@

Click to create an issue.

- You can track your claims from this menu and the action we + You can track your issues from this menu and the action we will take.

- - diff --git a/addons/portal_project_issue/security/ir.model.access.csv b/addons/portal_project_issue/security/ir.model.access.csv index 1669c217f54..80a38366b51 100644 --- a/addons/portal_project_issue/security/ir.model.access.csv +++ b/addons/portal_project_issue/security/ir.model.access.csv @@ -1,3 +1,3 @@ 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.group_portal,1,0,1,0 +access_issues,project_issue,project_issue.model_project_issue,portal.group_portal,1,0,0,0 access_case_section,crm_case_section,crm.model_crm_case_section,portal.group_portal,1,0,0,0 diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 49a285ec8ae..a3cf6c4e4c0 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -227,7 +227,7 @@
-
+
í
  • Project Settings
    •  @@ -488,7 +488,7 @@ - + @@ -504,7 +504,7 @@
    -
    +
    í
    - - - - 7 - 7 - 7 +
    + + + + 7 + 7 + 7 +
    diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 037b90e18d7..463cd8c5101 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -249,7 +249,7 @@
    -
    +
    i
    - +