From ed93ebc68411b33ab94ef1078d6d730a0ce14852 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 16 Apr 2012 18:37:18 +0530
Subject: [PATCH 1/3] [ADD] added action for Registration menuitem in
 portal_customer_menu.xml file

bzr revid: bde@tinyerp.com-20120416130718-k6sq006qtdvgloaq
---
 addons/portal_customer/portal_customer_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/portal_customer/portal_customer_menu.xml b/addons/portal_customer/portal_customer_menu.xml
index daad23d0ce9..8063c8bc964 100644
--- a/addons/portal_customer/portal_customer_menu.xml
+++ b/addons/portal_customer/portal_customer_menu.xml
@@ -11,7 +11,7 @@
                 <menuitem name="Quotation" id="customer_portal_quotation" parent="customer_portal_track_orders" action="sale.action_order_tree5"/>
                 <menuitem name="Sales Orders" id="customer_portal_sales_orders" parent="customer_portal_track_orders" action="sale.action_order_form"/>
                 <menuitem name="Delivery Orders" id="customer_portal_delivery" parent="customer_portal_track_orders" action="action_picking_tree"/>
-                <menuitem name="Registration" id="customer_portal_registration" parent="customer_portal_track_orders"/>
+                <menuitem name="Registration" id="customer_portal_registration" parent="customer_portal_track_orders" action="event.action_registration"/>
         
             <menuitem name="Invoice and Payments" id="customer_portal_invoice_payements" parent="customer_portal"/>
                 <menuitem name="Invoice" id="customer_portal_invoice" parent="customer_portal_invoice_payements" action="account.action_invoice_tree1"/>

From e25e299ed12291d2afc67e483c3c49dea077a7ad Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 19 Apr 2012 17:21:41 +0530
Subject: [PATCH 2/3] [ADD]: Add Upcomming event, feedback into home dashboard.

bzr revid: atp@tinyerp.com-20120419115141-akp8dd4hcsk0a02p
---
 addons/account/account_invoice_view.xml       | 16 +++++------
 .../board_portal_customer_view.xml            |  6 ++---
 .../board_portal_customer_event_view.xml      |  2 +-
 .../portal_customer_event_view.xml            |  1 +
 .../portal_customer_feedback/__openerp__.py   |  1 +
 .../board_portal_customer_feedback_view.xml   | 27 +++++++++++++++++++
 addons/sale/sale_view.xml                     | 20 +++++++-------
 addons/survey/static/src/css/survey.css       |  4 +--
 8 files changed, 53 insertions(+), 24 deletions(-)
 create mode 100644 addons/portal_customer_feedback/board_portal_customer_feedback_view.xml

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ca8530fb082..ad7b961ed3b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -257,9 +257,9 @@
                     <group colspan="4" col="8">
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                     <field name="number"/>
-                    <field name="type" invisible="1"/>
-                    <field name="currency_id" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
+                    <field name="type" invisible="1" />
+                    <field name="currency_id" width="50" groups="base.group_user"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user ,base.group_user"/>
                     <newline/>
                     <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection" options='{"quick_create": false}'/>
@@ -311,19 +311,19 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company, group_user" />
                             <newline/>
                             <field name="date_due"/>
-                            <field name="user_id"/>
+                            <field name="user_id" groups="base.group_user"/>
                             <newline/>
                             <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
                                 groups="base.group_extended"/>
-                            <field name="origin"/>
-                            <field name="move_id" groups="account.group_account_user"/>
+                            <field name="origin" groups="base.group_user"/>
+                            <field name="move_id" groups="account.group_account_user" />
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
-                        <page string="Payments">
+                        <page string="Payments" groups="base.group_user">
                             <field name="payment_ids" colspan="4" nolabel="1">
                                 <tree string="Payments">
                                     <field name="date"/>
diff --git a/addons/portal_customer/board_portal_customer_view.xml b/addons/portal_customer/board_portal_customer_view.xml
index ebe6c348d76..8ace2d0e380 100644
--- a/addons/portal_customer/board_portal_customer_view.xml
+++ b/addons/portal_customer/board_portal_customer_view.xml
@@ -22,13 +22,13 @@
            <field name="model">board.board</field>
            <field name="type">form</field>
            <field name="arch" type="xml">
-               <form string="Events">
+               <form string="DashBoard">
                    <board style="2-1">
                        <column>
-                           <action name="%(mail.action_mail_my_feeds)d" string="My Wall"/>
+                        <action name="%(board.action_res_widgets_tweets)d" string="Latest News" />
                        </column>
                        <column>
-                           <!--action name="" string="Latest News"/-->
+                         <action name="%(mail.action_mail_my_feeds)d" string="My Wall"/>
                        </column>
                    </board>
                </form>
diff --git a/addons/portal_customer_event/board_portal_customer_event_view.xml b/addons/portal_customer_event/board_portal_customer_event_view.xml
index 32888099092..fe0b52eac02 100644
--- a/addons/portal_customer_event/board_portal_customer_event_view.xml
+++ b/addons/portal_customer_event/board_portal_customer_event_view.xml
@@ -18,7 +18,7 @@
             <field name="inherit_id" ref="portal_customer.board_customer_portal_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <xpath expr="/form/board/column[0]" position="inside">
+            <xpath expr="/form/board/column[1]" position="inside">
                 <action name="%(action_event_view_main)d" string="Upcomming Events"/>
             </xpath>
            </field>
diff --git a/addons/portal_customer_event/portal_customer_event_view.xml b/addons/portal_customer_event/portal_customer_event_view.xml
index a2a79bf1077..65f69741d1b 100644
--- a/addons/portal_customer_event/portal_customer_event_view.xml
+++ b/addons/portal_customer_event/portal_customer_event_view.xml
@@ -3,5 +3,6 @@
     <data>
         <menuitem name="Registration" id="customer_portal_registration" parent="portal_customer.customer_portal_track_orders" action="event.action_registration"/>
         <menuitem name="Events" id="customer_portal_events" parent="portal_customer.customer_portal_services" action="event.action_event_view"  />
+        <menuitem name="Events" id="event.menu_event_event" action="event.action_event_view" parent="base.menu_event_main" groups="base.group_sale_salesman"/>
     </data>
 </openerp>
diff --git a/addons/portal_customer_feedback/__openerp__.py b/addons/portal_customer_feedback/__openerp__.py
index f67ea6cca41..0d890896a07 100644
--- a/addons/portal_customer_feedback/__openerp__.py
+++ b/addons/portal_customer_feedback/__openerp__.py
@@ -32,6 +32,7 @@
     'depends': ['survey','portal_customer'],
     'update_xml': [
         'portal_customer_feedback_view.xml',
+        "board_portal_customer_feedback_view.xml",
         "security/ir.model.access.csv",
     ],
     'installable': True,
diff --git a/addons/portal_customer_feedback/board_portal_customer_feedback_view.xml b/addons/portal_customer_feedback/board_portal_customer_feedback_view.xml
new file mode 100644
index 00000000000..c90c34b3602
--- /dev/null
+++ b/addons/portal_customer_feedback/board_portal_customer_feedback_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    
+     <record model="ir.actions.act_window" id="action_survey_kanban_view">
+           <field name="name">Feedback</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">survey</field>
+           <field name="view_type">tree</field>
+           <field name="view_mode">kanban</field>
+           <field name="view_id" ref="survey.view_survey_kanban"/>
+       </record>
+       
+       <record id="board_customer_portal_inherit_form" model="ir.ui.view">
+           <field name="name">board.customer.portal.inherit.form</field>
+           <field name="model">board.board</field>
+            <field name="inherit_id" ref="portal_customer.board_customer_portal_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <xpath expr="/form/board/column[1]" position="inside">
+                <action name="%(action_survey_kanban_view)d" string="Feedback"/>
+            </xpath>
+           </field>
+       </record>
+      
+    </data>
+</openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fa39793f939..0d3a568afc1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -99,10 +99,10 @@
                 <form string="Sales Order">
                     <group col="6" colspan="4">
                         <group col="4" colspan="4">
-                            <field name="name"/>
-                            <field name="date_order"/>
+                            <field name="name" groups="base.group_user"/>
+                            <field name="date_order" groups="base.group_user"/>
                             <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
-                            <field name="client_order_ref"/>
+                            <field name="client_order_ref" groups="base.group_user"/>
                         </group>
                         <group col="2" colspan="2">
                             <field name="invoiced"/>
@@ -115,7 +115,7 @@
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                            <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting, base.group_user" domain="[('parent_id','!=',False)]" />
                             <newline/>
                             <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">
@@ -197,7 +197,7 @@
                             </group>
                             <group col="17" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
+                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward" />
                                 <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
@@ -215,17 +215,17 @@
                         <page string="Other Information">
                             <group colspan="2" col="2" groups="base.group_extended" name="logistics">
                                 <separator string="Logistic" colspan="2"/>
-                                <field name="incoterm" widget="selection"/>
+                                <field name="incoterm" widget="selection" groups="base.group_user"/>
                                 <field name="picking_policy" required="True"/>
                                 <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
-                                <field name="invoice_quantity" attrs="{'readonly':[('order_policy','in',('prepaid','picking'))]}"/>
+                                <field name="invoice_quantity" attrs="{'readonly':[('order_policy','in',('prepaid','picking'))]}" groups="base.group_user"/>
                             </group>
-                            <group colspan="2" col="2">
+                            <group colspan="2" col="2" groups="base.group_user">
                                 <separator string="References" colspan="2"/>
                                 <field name="user_id"/>
                                 <field groups="base.group_extended" name="origin"/>
                             </group>
-                            <group name="sale_pay" colspan="2" col="2" groups="base.group_extended" >
+                            <group name="sale_pay" colspan="2" col="2" groups="base.group_extended, base.group_user" >
                                 <separator string="Conditions" colspan="2"/>
                                 <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
@@ -234,7 +234,7 @@
                             <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
                             <field colspan="4" name="note" nolabel="1" groups="base.group_sale_notes_subtotal"/>
                         </page>
-                        <page string="History" groups="base.group_extended">
+                        <page string="History" groups="base.group_extended, base.group_user">
                             <separator colspan="4" string="Invoices"/>
                             <field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
                             <separator colspan="4" string="Packings"/>
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index be683a49a96..0102dc1ade6 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -28,8 +28,8 @@
 }
 
 .oe_survey_fill{
-    align: right;
-    position: absolute;
+	align:right;
+	padding: 1px 165px;
 }
 
 .oe_survey_rate{

From 7ed98aa8868999cd2b04a568514351e98fd8b825 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 19 Apr 2012 17:31:24 +0530
Subject: [PATCH 3/3] [REMOVE]: Remove unnecessary portal_customer_lead module

bzr revid: atp@tinyerp.com-20120419120124-kr6vqzr5z6gpn0pr
---
 addons/portal_customer_lead/__init__.py       | 23 ----------
 addons/portal_customer_lead/__openerp__.py    | 43 -------------------
 .../portal_customer_lead_view.xml             |  7 ---
 .../security/ir.model.access.csv              |  2 -
 .../portal_customer_lead_security.xml         | 15 -------
 5 files changed, 90 deletions(-)
 delete mode 100644 addons/portal_customer_lead/__init__.py
 delete mode 100644 addons/portal_customer_lead/__openerp__.py
 delete mode 100644 addons/portal_customer_lead/portal_customer_lead_view.xml
 delete mode 100644 addons/portal_customer_lead/security/ir.model.access.csv
 delete mode 100644 addons/portal_customer_lead/security/portal_customer_lead_security.xml

diff --git a/addons/portal_customer_lead/__init__.py b/addons/portal_customer_lead/__init__.py
deleted file mode 100644
index cb65ea0b3dc..00000000000
--- a/addons/portal_customer_lead/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_customer_lead/__openerp__.py b/addons/portal_customer_lead/__openerp__.py
deleted file mode 100644
index beb03f8e704..00000000000
--- a/addons/portal_customer_lead/__openerp__.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name' : "Customer Portal Claim",
-    'version' : "0.1",
-     'category': 'Tools',
-    'complexity': "easy",
-    'description': """
-    This module add the menu if crm and portal_customer is install.
-    """,
-    'author' : "OpenERP SA",
-    'depends' : ["portal_customer","crm"],    
-    'website': 'http://www.openerp.com',
-    'update_xml': [
-         'security/portal_customer_lead_security.xml',
-        'portal_customer_lead_view.xml',
-        'security/ir.model.access.csv',
-     ],
-    'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_customer_lead/portal_customer_lead_view.xml b/addons/portal_customer_lead/portal_customer_lead_view.xml
deleted file mode 100644
index 83c07b92614..00000000000
--- a/addons/portal_customer_lead/portal_customer_lead_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- See the Customer's leads -->
-        <menuitem name="Leads" id="menu_customer_portal_leads" parent="portal_customer.customer_portal_track_orders" action="crm.crm_case_category_act_leads_all"/>
-    </data>
-</openerp>
diff --git a/addons/portal_customer_lead/security/ir.model.access.csv b/addons/portal_customer_lead/security/ir.model.access.csv
deleted file mode 100644
index 3cf348e7a85..00000000000
--- a/addons/portal_customer_lead/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_portal_crm_lead,portal.crm.lead,crm.model_crm_lead,portal_customer.group_sales_portal,1,0,0,0
diff --git a/addons/portal_customer_lead/security/portal_customer_lead_security.xml b/addons/portal_customer_lead/security/portal_customer_lead_security.xml
deleted file mode 100644
index 0767c8560f7..00000000000
--- a/addons/portal_customer_lead/security/portal_customer_lead_security.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <!-- Creating Portal Group -->
-
-      <record id="portal_customer_lead_rule" model="ir.rule">
-            <field name="name">Personal Lead</field>
-            <field ref="crm.model_crm_lead" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-             <field name="groups" eval="[(4, ref('portal_customer.group_sales_portal'))]"/>
-       </record>        
-        
-    </data>
-</openerp>