[MERGE] lp:openobject-addons

bzr revid: jam@tinyerp.com-20120612050628-2la1082qfg9sb0g5

diff --cc addons/account/board_account_view.xml
Simple merge

diff --cc addons/board/board_mydashboard_view.xml
index dcfa8b7,0000000..adb64cf
mode 100644,000000..100644
--- 1/addons/board/board_mydashboard_view.xml
--- /dev/null
+++ b/addons/board/board_mydashboard_view.xml
@@@ -1,44 -1,0 +1,44 @@@
 +<?xml version="1.0"?>
 +<openerp>
 +     <data>
 +        <!--My Dashboard-->
 +        <record model="ir.ui.view" id="board_my_dash_view">
 +            <field name="name">My Dashboard</field>
 +            <field name="model">board.board</field>
 +            <field name="type">form</field>
 +            <field name="arch" type="xml">
-                 <form string="My Dashboard" layout="manual">
-                     <board style="1-1">
++                <form string="My Dashboard" layout="manual"  version="7.0">
++                    <board style="2-1">
 +                        <column>
 +                        </column>
 +                    </board>
 +                </form>
 +            </field>
 +        </record>
 +        
 +        <!--My Dashboard Action-->
 +        <record model="ir.actions.act_window" id="open_board_my_dash_action">
 +            <field name="name">My Dashboard</field>
 +            <field name="res_model">board.board</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">form</field>
 +            <field name="usage">menu</field>
 +            <field name="view_id" ref="board_my_dash_view"/>
 +            <field name="help">To customize your dashboard. 
 +Go to any view of the OpenERP, apply any of available filters and click to 
 +'Add to Dashboard' through the search options. 
 +Now return to your Dashboard and check if the  board you have just added is 
 +there or not. Drag and Drop to organize them in the sequence you want. 
 +You can Remove any board by clicking cross button. 
 +            </field>
 +        </record> 
 +        
 +        
 +        <!--My Dashboard Menu-->
 +        <menuitem 
 +            id="menu_board_my_dash"
 +            parent="base.menu_reporting_dashboard"
 +            action="open_board_my_dash_action"
 +            sequence="5"/>
 +    </data>
 +</openerp>

diff --cc addons/crm/board_crm_view.xml
index 5ab9ddd,768c014..1b8148f
--- 1/addons/crm/board_crm_view.xml
--- 2/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@@ -80,12 -156,11 +80,12 @@@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                 <form string="Statistics Dashboard" layout="manual">
+                 <form string="Statistics Dashboard" version="7.0">
                      <board style="1-1">
                          <column>
 -                            <action string="Opportunities by Categories" name="%(act_oppor_categ)d"/>
 -                            <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
 +                            <action string="New Leads" name="%(act_crm_tag_tree_view_leads_all)d"/>
 +                            <action string="My Opportunities" name="%(act_my_oppor)d"/>
 +                            <action string="My Next Meetings" name="%(crm_case_confirmed_meet)d"/>
                          </column>
                          <column>
                              <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>

diff --cc addons/document/board_document_view.xml
index 49ab611,635a740..e8fcf60
--- 1/addons/document/board_document_view.xml
--- 2/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@@ -32,15 -29,67 +32,14 @@@
               <field name="res_model">board.board</field>
               <field name="view_type">form</field>
               <field name="view_mode">form</field>
 -
              <field name="view_id" ref="board_document_manager_form"/>
           </record>
- 
 +        
 +         <menuitem id="menu_reports_document"
 +                   parent="base.menu_reporting_dashboard"
 +                   sequence="55"
 +                   action="open_board_document_manager"
 +                   icon="terp-graph"/>
  
 -        <menuitem id="menu_reporting" name="Reporting" sequence="2" parent="knowledge.menu_document"/>
 -         <menuitem
 -            name="Knowledge"
 -            id="menu_reports_document"
 -            parent="base.menu_reporting_dashboard"
 -            sequence="45"
 -            groups="base.group_system"/>
 -
 -
 -         <menuitem
 -            parent="menu_reports_document"
 -            action="open_board_document_manager"
 -            sequence="1"
 -            id="menu_reports_document_manager"
 -            icon="terp-graph"/>
 -
 -        <record model="ir.ui.view" id="board_document_manager_form1">
 -            <field name="name">board.document.manager.form1</field>
 -             <field name="model">board.board</field>
 -             <field name="type">form</field>
 -             <field name="arch" type="xml">
 -                <form string="Document board" layout="manual" version="7.0">
 -                     <board style="2-1">
 -                        <column>
 -                            <action string="Wall of Shame"
 -                                name="%(document.action_view_wall)d"
 -                                view_mode="tree"/>
 -
 -                        </column>
 -                        <column>
 -                            <action string="Files by Users"
 -                                name="%(document.action_view_user_graph)d"
 -                                view_mode="graph,tree"/>
 -
 -                            <action string="Files by Month"
 -                                name="%(document.action_view_files_by_month_graph)d"
 -                                view_mode="graph,tree"/>
 -                        </column>
 -                     </board>
 -                 </form>
 -            </field>
 -        </record>
 -
 -
 -        <record model="ir.actions.act_window" id="open_board_document_manager1">
 -            <field name="name">Statistics by User</field>
 -            <field name="res_model">board.board</field>
 -            <field name="view_type">form</field>
 -            <field name="view_mode">form</field>
 -            <field name="view_id" ref="board_document_manager_form1"/>
 -        </record>
 -
 -        <menuitem
 -            parent="menu_reports_document"
 -            action="open_board_document_manager1"
 -            sequence="1"
 -            id="menu_reports_document_manager1"
 -            icon="terp-graph"/>
       </data>
   </openerp>

diff --cc addons/event/board_association_view.xml
index 936a3fb,6bdea66..a00b4b2
--- 1/addons/event/board_association_view.xml
--- 2/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@@ -48,14 -39,16 +48,14 @@@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                 <form string="Association Dashboard" layout="manual">
+                 <form string="Association Dashboard" version="7.0">
                      <board style="2-1">
                          <column>
 -                            <action string="Next Events"
 -                                name="%(act_event_view)d"
 -                                domain="[('state','not in',('cancel','done'))]"/>
 +                            <action string="Next Events" name="%(act_event_view)d"/>
 +                            <action string="New Registrations" name="%(act_event_view_registration)d"/>
                          </column>
                          <column>
 -                            <action string="Events Filling Status"
 -                                name="%(act_event_reg)d"/>
 +                            <action string="Events Filling By Status" name="%(act_event_reg)d"/>
                          </column>
                      </board>
                  </form>

diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge

diff --cc addons/mrp/board_manufacturing_view.xml
Simple merge

diff --cc addons/project/board_project_view.xml
index 86ae053,df35534..7eccec9
--- 1/addons/project/board_project_view.xml
--- 2/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@@ -71,13 -75,14 +71,13 @@@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                 <form string="My Board" layout="manual">
+                 <form string="My Board" version="7.0">
                      <board style="2-1">
                          <column>
 -                            <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
 -                            <action name="%(action_view_delegate_task_tree)d" string="My Delegated Tasks"/>
 +                            <action name="%(my_open_tasks_action)d" string="My Tasks" creatable="true"/>
                          </column>
                          <column>
 -                            <action name="%(project.action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
 +                            <action name="%(action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
                          </column>
                      </board>
                  </form>

diff --cc addons/purchase/board_purchase_view.xml
Simple merge

diff --cc addons/sale/board_sale_view.xml
Simple merge

diff --cc addons/stock/board_warehouse_view.xml
Simple merge