From d852a2a828371f02522677de5f5c2e5e7cde3903 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 8 Aug 2011 18:38:57 +0530
Subject: [PATCH 01/24] 
 [IMP]account,hr_timesheet_sheet,mrp,pad,point_of_sale,purchase:Improvement is
 done in company view

bzr revid: mma@tinyerp.com-20110808130857-fyxra4gte3nsp60u
---
 addons/account/company.py                           |  6 +++---
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml  | 13 ++++++++-----
 addons/mrp/company_view.xml                         |  6 +++---
 addons/pad/company_pad.xml                          |  9 ++++++---
 addons/point_of_sale/point_of_sale_view.xml         | 13 ++++++++-----
 addons/procurement/company_view.xml                 | 10 +++++-----
 addons/project/project_view.xml                     |  9 ++++++---
 addons/purchase/company_view.xml                    |  6 +++---
 addons/sale/company_view.xml                        |  6 +++---
 9 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/addons/account/company.py b/addons/account/company.py
index c7836e0128b..82a60beb461 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -36,9 +36,9 @@ class res_company(osv.osv):
     }
 
     _defaults = {
-        'overdue_msg': 'Please note that the following payments are now due. If your payment \
-                        has been sent, kindly forward your payment details. If payment will be \
-                        delayed further, please contact us to discuss. \
+        'overdue_msg': 'Please note that the following payments are now due.\
+                         \nIf your payment has been sent, kindly forward your payment details.\
+                         \nIf payment will be delayed further, please contact us to discuss.\
                         \nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
     }
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 321e4c2addd..be6c4509557 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -202,14 +202,17 @@
             <field name="name">res.company.sheet</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">18</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Timesheets" colspan="4"/>
-                    <field name="timesheet_range"/>
-                    <field name="timesheet_max_difference"/>
+                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+                    <group col="2" colspan="2" name="hr_timesheet" sequence="25"> 
+                        <separator string="Timesheets" colspan="4"/>
+                        <field name="timesheet_range"/>
+                        <field name="timesheet_max_difference"/>
                     <newline/>
-                </page>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index f5f06518565..3c33a332977 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -6,12 +6,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">22</field>
+            <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <field name="manufacturing_lead"/>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/pad/company_pad.xml b/addons/pad/company_pad.xml
index 754776715d7..0ee80937d18 100644
--- a/addons/pad/company_pad.xml
+++ b/addons/pad/company_pad.xml
@@ -6,9 +6,12 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//page[@string='Configuration']" position="inside">
-          <separator string="Pad" colspan="4"/>
-          <field name="pad_index"/>
+        <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+            <newline/>
+            <group col="2" colspan="2" name="pad" sequence="100"> 
+                  <separator string="Pad" colspan="4"/>
+                  <field name="pad_index"/>
+             </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 1435f6cc2b6..8bf7155096c 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -637,13 +637,16 @@
             <field name="name">view.company.form.pos</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">25</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                    <separator string="Point of Sale" colspan="4"/>
-                    <field  name="company_discount" />
-                    <field  name="max_diff" />
-                </field>
+                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after" >
+                   <group col="2" colspan="2" name="pos" sequence="5"> 
+                     <separator string="Point of Sale" colspan="2" />
+                     <field name="company_discount" colspan="2" />
+                     <field name="max_diff" />
+                   </group>
+                </xpath>
             </field>
            </record>
 
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 4d14f69edde..a5319c43640 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -6,14 +6,14 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">17</field>
+            <field name="priority">25</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
-                    <field name="schedule_range"/>
-                </page>
-            </field>
+                       <field name="schedule_range"/>
+                </xpath>
+          </field>
        </record>
     
     </data>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 85cde448c6d..cafe538e12a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -528,13 +528,16 @@
             <field name="name">res.company.task.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
+            <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Project Management" colspan="4"/>
+                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
+                    <group col="2" colspan="2" name="project" sequence="15"> 
+                    <separator string="Project Management" colspan="2"/>
                     <field name="project_time_mode_id"/>
                     <newline/>
-                </page>
+                     </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index d9d2fb9f9ee..04e48af29d9 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -6,12 +6,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">19</field>
+            <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+               <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <field name="po_lead"/>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 96ff91e8e90..567bf50948f 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -5,12 +5,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">24</field>
+            <field name="priority">20</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
                     <field name="security_lead"/>
-                </page>
+                </xpath>
             </field>
         </record>
     </data>

From de2cb73d3add5e7c06bfceb229946865353e71cb Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 10 Aug 2011 11:34:26 +0530
Subject: [PATCH 02/24] [IMP]l10n_ch: rml_footer2 Replace with account_number2

bzr revid: mma@tinyerp.com-20110810060426-3y4ea0reolawrz42
---
 addons/l10n_ch/company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index df49cf123be..9a9b1464f8d 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <field name="rml_footer2" position="after">
+                <field name="account_number2" position="after">
                     <field name="bvr_delta_horz"/>
                     <field name="bvr_delta_vert"/>
                     <field name="bvr_background"/>

From 170ee9bf72132b553dfd856cb5476b0c00d9419d Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Tue, 16 Aug 2011 19:03:53 +0530
Subject: [PATCH 03/24] [IMP]: remove stage type in lead and opportunity

bzr revid: ksa@tinyerp.co.in-20110816133353-kfgzeotfuwoe0jle
---
 addons/crm/crm_lead.py               | 2 +-
 addons/crm/crm_lead_view.xml         | 2 +-
 addons/crm/crm_opportunity.py        | 2 +-
 addons/crm/crm_opportunity_view.xml  | 2 +-
 addons/crm/report/crm_lead_report.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 294c5dfbf56..7644bf08042 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -155,7 +155,7 @@ class crm_lead(crm_case, osv.osv):
         ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','lead')]"),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[(section_ids', '=', section_id)]"),
         'user_id': fields.many2one('res.users', 'Salesman'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index cc0297c16f4..812ba11b623 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -74,7 +74,7 @@
                     <newline />
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
-                    <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" />
+                    <field name="stage_id" domain="[('section_ids', '=', section_id)]" />
                     <group col="2" colspan="1">
                         <button name="stage_previous" string=""
                             states="open,pending,draft" type="object"
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 3c845478392..25458aa5293 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -50,7 +50,7 @@ class crm_opportunity(osv.osv):
         'date_deadline': fields.date('Expected Closing'),
         'date_action': fields.date('Next Action Date'),
         'title_action': fields.char('Next Action', size=64),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('type','=','opportunity')]"),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[(section_ids', '=', section_id)]"),
      }
     
     def _case_close_generic(self, cr, uid, ids, find_stage, *args):
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 21e2414c603..fd795552ae8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -15,7 +15,7 @@
                             <group colspan="1" col="4">
                                 <field name="stage_id" nolabel="1"
                                     on_change="onchange_stage_id(stage_id)"
-                                    domain="[('type','=','opportunity'),('section_ids', '=', section_id)]"/>
+                                    domain="[('section_ids', '=', section_id)]"/>
                                 <button name="stage_previous"
                                     states="draft,open,pending" type="object"
                                     icon="gtk-go-back" string="" context="{'stage_type': 'opportunity'}"/>
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 58bf599fb93..73c65d48299 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -74,7 +74,7 @@ class crm_lead_report(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="['|',('section_id','=',False),('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type', '=', 'lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[(section_ids', '=', section_id)]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True, select=True),
         'creation_date': fields.date('Creation Date', readonly=True, select=True),

From b99b42a51d948f266c44efc83ff9c1388f7a802e Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 11:16:25 +0530
Subject: [PATCH 04/24] [IMP]: remove stage type in lead and opportunity report

bzr revid: ksa@tinyerp.co.in-20110817054625-xh1v2s9bdkoxaqd4
---
 addons/crm/crm.py                            | 8 ++++----
 addons/crm/crm_lead_view.xml                 | 5 ++---
 addons/crm/crm_view.xml                      | 6 +++---
 addons/crm/report/crm_lead_report_view.xml   | 3 +--
 addons/crm/wizard/crm_lead_to_opportunity.py | 4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f6d3964cf0b..d80aaa2a303 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -632,8 +632,8 @@ class crm_case_stage(osv.osv):
 
 
 
-    def _get_type_value(self, cr, user, context):
-        return [('lead','Lead'),('opportunity','Opportunity')]
+#    def _get_type_value(self, cr, user, context):
+#        return [('lead','Lead'),('opportunity','Opportunity')]
 
 
     _columns = {
@@ -643,7 +643,7 @@ class crm_case_stage(osv.osv):
         'on_change': fields.boolean('Change Probability Automatically', \
                          help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements'),
-        'type': fields.selection(_get_type_value, 'Type', required=True),
+#        'type': fields.selection(_get_type_value, 'Type', required=True),
     }
 
 
@@ -660,7 +660,7 @@ class crm_case_stage(osv.osv):
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'type': _find_stage_type,
+#        'type': _find_stage_type,
     }
 
 crm_case_stage()
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 812ba11b623..ba16854c489 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -11,9 +11,9 @@
         <field name="arch" type="xml">
             <search string="Stage Search">
                 <filter icon="terp-personal" name="lead"
-                    string="Lead" domain="[('type', '=', 'lead')]" context="{'type' : 'lead'}"/>
+                    string="Lead" domain="[('section_ids', '=', section_id')]"/>
                 <filter icon="terp-personal+" name="opportunity"
-                    string="Opportunity" domain="[('type', '=', 'opportunity')]" context="{'type' : 'opportunity'}"/>
+                    string="Opportunity" domain="[('section_ids', '=', section_id)]"/>
                 <field name="name"/>
             </search>
         </field>
@@ -26,7 +26,6 @@
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="context">{'search_default_opportunity':1}</field>
         <field name="search_view_id" ref="crm_lead_stage_search"/>
         <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
     </record>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5b8abc77461..a43af0f2b40 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -108,7 +108,7 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="probability"/>
-                    <field name="type" />
+                   <!--  <field name="type" /> -->
                 </tree>
             </field>
         </record>
@@ -124,8 +124,8 @@
                 <form string="Stage">
                     <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
-                    <field name="type" groups="base.group_extended" />
-                     
+                 <!--    <field name="type" groups="base.group_extended" /> -->
+
                     <field name="sequence"/>
                     <field name="probability"/>
                     <group colspan="4" col="2" >
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index a864570461c..09253ae8d81 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -121,7 +121,7 @@
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('type', '=', 'lead')]" />
+                        <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]" />
                         <field name="categ_id" widget="selection"/>
                         <field name="type_id" widget="selection"/>
                         <field name="channel_id" widget="selection"/>
@@ -233,7 +233,6 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
-            <field name="domain">[('type', '=', 'opportunity')]</field>
             <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
         </record>
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 4b6e047f475..16223f8c28f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -188,9 +188,9 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         for lead in leads.browse(cr, uid, record_id, context=context):
             if lead.section_id:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
+                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
             else:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
+                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1)])
 
             data = self.browse(cr, uid, ids[0], context=context)
 

From c77f9fd7151f7133239cdd8c23acc3205ee692b3 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 14:03:50 +0530
Subject: [PATCH 05/24] [IMP]: remove stage type for crm claim

bzr revid: ksa@tinyerp.co.in-20110817083350-hjwj331jt6hxz80r
---
 addons/crm/crm_lead_view.xml                   |  2 +-
 addons/crm_claim/crm_claim.py                  | 18 +-----------------
 addons/crm_claim/crm_claim_view.xml            |  4 ++--
 addons/crm_claim/report/crm_claim_report.py    |  4 ++--
 .../crm_claim/report/crm_claim_report_view.xml |  2 +-
 5 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index ba16854c489..e53a5f68bbe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -11,7 +11,7 @@
         <field name="arch" type="xml">
             <search string="Stage Search">
                 <filter icon="terp-personal" name="lead"
-                    string="Lead" domain="[('section_ids', '=', section_id')]"/>
+                    string="Lead" domain="[('section_ids', '=', section_id)]"/>
                 <filter icon="terp-personal+" name="opportunity"
                     string="Opportunity" domain="[('section_ids', '=', section_id)]"/>
                 <field name="name"/>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index c5755085216..72170a70b15 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -73,7 +73,7 @@ class crm_claim(crm.crm_case, osv.osv):
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'partner_phone': fields.char('Phone', size=32), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type','=','claim')]"), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids','=',section_id)]"), 
         'cause': fields.text('Root Cause'), 
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
@@ -274,20 +274,4 @@ class res_partner(osv.osv):
     }
 res_partner()
 
-class crm_stage_claim(osv.osv):
-    
-    def _get_type_value(self, cr, user, context):
-        list = super(crm_stage_claim, self)._get_type_value(cr, user, context)
-        list.append(('claim','Claim'))
-        return list
-    
-    _inherit = "crm.case.stage"
-    _columns = {
-            'type': fields.selection(_get_type_value, 'Type'),
-    }
-   
-    
-crm_stage_claim()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 842ede252df..8528653d550 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -32,7 +32,7 @@
                 <data>
                     <xpath expr="//field[@name='name']" position="before">
                         <filter icon="terp-personal-" name="claim"
-                            string="Claim" domain="[('type', '=', 'claim')]" context="{'type' : 'claim'}"/>
+                            string="Claim" domain="[('section_ids', '=', section_id)]"/>
                     </xpath>
                 </data>
             </field>
@@ -101,7 +101,7 @@
                         <field name="section_id" widget="selection" />
 
                         <group colspan="2" col="4">
-                            <field name="stage_id" domain="[('type','=','claim')]"/>
+                            <field name="stage_id" domain="[('section_ids','=',section_id)]"/>
                             <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index aed3233976e..87eb8a529bc 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -62,7 +62,7 @@ class crm_claim_report(osv.osv):
         'create_date': fields.datetime('Create Date', readonly=True, select=True),
         'day': fields.char('Day', size=128, readonly=True), 
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type','=','claim')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True,domain="[('section_ids','=',section_id)]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.claim')]", readonly=True),
@@ -107,7 +107,7 @@ class crm_claim_report(osv.osv):
                     date_trunc('day',c.create_date) as create_date,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
                     (SELECT count(id) FROM mailgate_message WHERE model='crm.claim' AND res_id=c.id AND history=True) AS email,
-                    (SELECT avg(probability) FROM crm_case_stage WHERE type='claim' AND id=c.stage_id) AS probability,
+                    (SELECT avg(probability) FROM crm_case_stage WHERE id=c.stage_id) AS probability,
                     extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected
                 from
                     crm_claim c
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index e790183e5db..6800d6cf273 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -110,7 +110,7 @@
                         <separator orientation="vertical"/>
                         <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('type', '=', 'claim')]"/>
+                        <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
                         <separator orientation="vertical"/>
                         <field name="priority" />

From 73742c80a39fb820e9a87c4eb7fa31a1b042fd7a Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 14:24:04 +0530
Subject: [PATCH 06/24] [IMP]: remove stage type for crm fundraising

bzr revid: ksa@tinyerp.co.in-20110817085404-uaezg715cn4e5310
---
 addons/crm_fundraising/crm_fundraising.py       | 17 +----------------
 addons/crm_fundraising/crm_fundraising_view.xml |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 19ac21e6ab9..e2b0bb566fd 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -61,7 +61,7 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'partner_name2': fields.char('Employee Email', size=64), 
             'partner_phone': fields.char('Phone', size=32), 
             'partner_mobile': fields.char('Mobile', size=32), 
-            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'fundraising')]"), 
+            'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"), 
             'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
                              domain="[('section_id','=',section_id)]"), 
             'duration': fields.float('Duration'), 
@@ -95,18 +95,3 @@ class crm_fundraising(crm.crm_case, osv.osv):
 
 crm_fundraising()
 
-
-class crm_stage_fundraising(osv.osv):
-    
-    def _get_type_value(self, cr, user, context):
-        list = super(crm_stage_fundraising, self)._get_type_value(cr, user, context)
-        list.append(('fundraising','Fundraising'))
-        return list
-    
-    _inherit = "crm.case.stage"
-    _columns = {
-            'type': fields.selection(_get_type_value, 'Type'),
-    }
-   
-    
-crm_stage_fundraising()
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6c7f35c68f0..1358fccad4e 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -17,7 +17,7 @@
                 <data>
                     <xpath expr="//field[@name='name']" position="before">
                         <filter icon="terp-dolar" name="fundraising"
-                            string="Fundraising" domain="[('type', '=', 'fundraising')]" context="{'type' : 'fundraising'}"/>
+                            string="Fundraising" domain="[('section_ids', '=', section_id)]"/>
                     </xpath>
                 </data>
             </field>

From a5cdde747eabe1b49f69f0d08062760f4a3f667d Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 15:09:17 +0530
Subject: [PATCH 07/24] [IMP]: remove stage type for crm partner assign

bzr revid: ksa@tinyerp.co.in-20110817093917-48x76ms56rwu3mdr
---
 addons/crm_partner_assign/report/crm_lead_report.py       | 2 +-
 addons/crm_partner_assign/report/crm_lead_report_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 5bef21382ba..ab806414cbd 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -63,7 +63,7 @@ class crm_lead_report_assign(osv.osv):
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id)]" , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('type', '=', 'lead')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_ids', '=', section_id)]"),
         'partner_id': fields.many2one('res.partner', 'Customer' , readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 3b1e067f4c3..a218ae76448 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -33,7 +33,7 @@
                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                       <field name="partner_id"/>
                       <separator orientation="vertical"/>
-                      <field name="stage_id" widget="selection" domain="[('type', '=', 'opportunity')]" />
+                      <field name="stage_id" widget="selection" domain="[('section_ids', '=', 'section_id')]"/>
                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                       <separator orientation="vertical"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>

From bc6a9c631ef0f46fbf1060e0106826776339484d Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 15:51:04 +0530
Subject: [PATCH 08/24] [IMP]: remove stage type for crm when use method for
 set stage from cancel to open

bzr revid: ksa@tinyerp.co.in-20110817102104-776rgzg3hit5oya7
---
 addons/crm/crm.py      | 6 +++---
 addons/crm/crm_lead.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d80aaa2a303..430746b1864 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -233,15 +233,15 @@ class crm_case(crm_base):
         return False
 
 
-    def _find_first_stage(self, cr, uid, type, section_id):
+    def _find_first_stage(self, cr, uid, section_id):
         """
             return the first stage that has a sequence number equal or higher than sequence
         """
         stage_pool = self.pool.get('crm.case.stage')
         if section_id :
-            ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type), ("section_ids", 'in', [section_id])])
+            ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("section_ids", 'in', [section_id])])
         else :
-            ids = stage_pool.search(cr, uid, [("sequence", '>', 0), ("type", 'like', type)])
+            ids = stage_pool.search(cr, uid, [("sequence", '>', 0)])
 
         if ids:
             stages = stage_pool.browse(cr, uid, ids)
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 7644bf08042..5ecb588b797 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -217,7 +217,7 @@ class crm_lead(crm_case, osv.osv):
             if leads[i].state == 'draft':
                 value = {}
                 if not leads[i].stage_id :
-                    stage_id = self._find_first_stage(cr, uid, leads[i].type, leads[i].section_id.id or False)
+                    stage_id = self._find_first_stage(cr, uid, leads[i].section_id.id or False)
                     value.update({'stage_id' : stage_id})
                 value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
                 self.write(cr, uid, [ids[i]], value)

From 45ecce84a698e2038b549833443726148bc3fa70 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 16:01:35 +0530
Subject: [PATCH 09/24] [REM]: type field for case stage

bzr revid: ksa@tinyerp.co.in-20110817103135-l9ts7x7s3wljz9fq
---
 addons/crm/crm.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 430746b1864..cb528818012 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -630,12 +630,6 @@ class crm_case_stage(osv.osv):
     _rec_name = 'name'
     _order = "sequence"
 
-
-
-#    def _get_type_value(self, cr, user, context):
-#        return [('lead','Lead'),('opportunity','Opportunity')]
-
-
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
@@ -643,7 +637,6 @@ class crm_case_stage(osv.osv):
         'on_change': fields.boolean('Change Probability Automatically', \
                          help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements'),
-#        'type': fields.selection(_get_type_value, 'Type', required=True),
     }
 
 

From 568b5315e1600ccf969fac0a99e4ef59f2915138 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 17:52:09 +0530
Subject: [PATCH 10/24] [IMP]: method for find percentage for stage in crm

bzr revid: ksa@tinyerp.co.in-20110817122209-1u82d7otgjyo8df8
---
 addons/crm/crm.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index cb528818012..32f97112859 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -213,20 +213,20 @@ class crm_case(crm_base):
     """
 
     def _find_lost_stage(self, cr, uid, type, section_id):
-        return self._find_percent_stage(cr, uid, 0.0, type, section_id)
+        return self._find_percent_stage(cr, uid, 0.0, section_id)
 
     def _find_won_stage(self, cr, uid, type, section_id):
-        return self._find_percent_stage(cr, uid, 100.0, type, section_id)
+        return self._find_percent_stage(cr, uid, 100.0, section_id)
 
-    def _find_percent_stage(self, cr, uid, percent, type, section_id):
+    def _find_percent_stage(self, cr, uid, percent, section_id):
         """
             Return the first stage with a probability == percent
         """
         stage_pool = self.pool.get('crm.case.stage')
         if section_id :
-            ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type), ("section_ids", 'in', [section_id])])
+            ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("section_ids", 'in', [section_id])])
         else :
-            ids = stage_pool.search(cr, uid, [("probability", '=', percent), ("type", 'like', type)])
+            ids = stage_pool.search(cr, uid, [("probability", '=', percent)])
 
         if ids:
             return ids[0]

From d7746c840347acf7c187adedf4f46f2b59afc6d3 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 18:02:20 +0530
Subject: [PATCH 11/24] [IMP]: change state for that improve method
 stage_change

bzr revid: ksa@tinyerp.co.in-20110817123220-uyv6wfjh51tcdkjw
---
 addons/crm/crm.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 32f97112859..fb2eef3a3d7 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -327,7 +327,6 @@ class crm_case(crm_base):
             context = {}
 
         stage_pool = self.pool.get('crm.case.stage')
-        stage_type = context and context.get('stage_type','')
         current_seq = False
         next_stage_id = False
 
@@ -336,9 +335,7 @@ class crm_case(crm_base):
             next_stage = False
             value = {}
             if case.section_id.id :
-                domain = [('type', '=', stage_type),('section_ids', '=', case.section_id.id)]
-            else :
-                domain = [('type', '=', stage_type)]
+                domain = [('section_ids', '=', case.section_id.id)]
 
 
             stages = stage_pool.search(cr, uid, domain, order=order)

From 5e581e618814b0fab8a9020acda8f50b2d720683 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 18:11:34 +0530
Subject: [PATCH 12/24] [IMP]: for stage type of mark lost and mark won

bzr revid: ksa@tinyerp.co.in-20110817124134-jkpomynnsu5r51wp
---
 addons/crm/crm.py             | 4 ++--
 addons/crm/crm_opportunity.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index fb2eef3a3d7..4603415d9b7 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -212,10 +212,10 @@ class crm_case(crm_base):
         And object that inherit (orm inheritance) from a class the overwrite copy 
     """
 
-    def _find_lost_stage(self, cr, uid, type, section_id):
+    def _find_lost_stage(self, cr, uid, section_id):
         return self._find_percent_stage(cr, uid, 0.0, section_id)
 
-    def _find_won_stage(self, cr, uid, type, section_id):
+    def _find_won_stage(self, cr, uid, section_id):
         return self._find_percent_stage(cr, uid, 100.0, section_id)
 
     def _find_percent_stage(self, cr, uid, percent, section_id):
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 25458aa5293..ad0bdaf18a0 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -61,7 +61,7 @@ class crm_opportunity(osv.osv):
                 return res
                 
             value = {}
-            stage_id = find_stage(cr, uid, 'opportunity', case.section_id.id or False)
+            stage_id = find_stage(cr, uid, case.section_id.id or False)
             if stage_id:
                 stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage_id)
                 value.update({'stage_id': stage_id})

From 925d4eab9cc333dda9bd322daa7f86cd46349093 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Wed, 17 Aug 2011 18:29:47 +0530
Subject: [PATCH 13/24] [REM]: remove unuse space

bzr revid: ksa@tinyerp.co.in-20110817125947-3b5yiwo10g7v7leu
---
 addons/crm/crm.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4603415d9b7..dba3eb2228b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -270,8 +270,6 @@ class crm_case(crm_base):
             return {'value':{}}
         return {'value':{'probability': stage.probability}}
 
-    
-
     def copy(self, cr, uid, id, default=None, context=None):
         """
         Overrides orm copy method.
@@ -302,10 +300,6 @@ class crm_case(crm_base):
                 })
         return super(osv.osv, self).copy(cr, uid, id, default, context=context)
 
-    
-
-    
-
     def _find_next_stage(self, cr, uid, stage_list, index, current_seq, stage_pool, context=None):
         if index + 1 == len(stage_list):
             return False
@@ -378,10 +372,6 @@ class crm_case(crm_base):
         @param context: A standard dictionary for contextual values"""
         return self.stage_change(cr, uid, ids, context=context, order='sequence desc')
 
-    
-
-    
-
     def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
         mailgate_pool = self.pool.get('mailgate.thread')
         return mailgate_pool.history(cr, uid, cases, keyword, history=history,\

From c4765609b1c27f12ead1f346a1f1cb6f42c1dbf9 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Aug 2011 10:51:46 +0530
Subject: [PATCH 14/24] [IMP]:change sequence for opportunity

bzr revid: ksa@tinyerp.co.in-20110818052146-bx91felrc1vnq4ol
---
 addons/crm/crm_opportunity_data.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index a20cbc5e344..3fa3475dde3 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -3,46 +3,46 @@
 <data noupdate="1">
 
      <!--        CASE STATUS(stage_id)        -->
-     
+
         <record model="crm.case.stage" id="stage_opportunity6">
             <field name="name">Lost</field>
             <field eval="'0'" name="probability"/>
-            <field eval="'0'" name="sequence"/>
+            <field eval="'11'" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
-        
+
         <record model="crm.case.stage" id="stage_opportunity1">
             <field name="name">New</field>
             <field eval="'10'" name="probability"/>
-            <field eval="'1'" name="sequence"/>
+            <field eval="'12'" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
 
         <record model="crm.case.stage" id="stage_opportunity2">
             <field name="name">Qualification</field>
             <field eval="'20'" name="probability"/>
-            <field eval="'2'" name="sequence"/>
+            <field eval="'13'" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
 
         <record model="crm.case.stage" id="stage_opportunity3">
             <field name="name">Proposition</field>
             <field eval="'40'" name="probability"/>
-            <field eval="'3'" name="sequence"/>
+            <field eval="'14'" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
 
         <record model="crm.case.stage" id="stage_opportunity4">
             <field name="name">Negotiation</field>
             <field eval="'60'" name="probability"/>
-            <field eval="'4'" name="sequence"/>
+            <field eval="'15'" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
 
         <record model="crm.case.stage" id="stage_opportunity5">
             <field name="name">Won</field>
             <field eval="'100'" name="probability"/>
-            <field eval="'5'" name="sequence"/>
+            <field eval="'16'" name="sequence"/>
             <field eval="1" name="on_change"/>
             <field name="type">opportunity</field>
         </record>

From 06b3e97433f5485815567f1b25706aeb83272c7f Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Aug 2011 12:38:18 +0530
Subject: [PATCH 15/24] [FIX]:yml for crm stages

bzr revid: ksa@tinyerp.co.in-20110818070818-ofcwksouwkoiqwon
---
 addons/crm/test/test_crm_stage_changes.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml
index dec60c997f1..84a7c8c5232 100644
--- a/addons/crm/test/test_crm_stage_changes.yml
+++ b/addons/crm/test/test_crm_stage_changes.yml
@@ -12,7 +12,6 @@
     section_ids:
       - crm.section_sales_department
     sequence: 0.0
-    type: opportunity
 - 
   I create a lead 'OpenERP Presentation'.
 - 
@@ -55,8 +54,11 @@
   Now I check whether the probability is set according to stage change or not.
 -
   !python {model: crm.lead}: |
+    stage_obj = self.pool.get('crm.case.stage')
     opportunity = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
-    assert opportunity.stage_id.id == ref('crm.stage_opportunity6'), 'Stage is not changed!'
+    stage_data = stage_obj.browse(cr, uid, ref('crm.stage_opportunity6'))
+    for data in stage_data.section_ids:
+        assert opportunity.stage_id.id == data.id, 'Stage is not changed!'
     assert opportunity.probability == 0.0, 'Probability is wrong!'
 -
   I create one more opportunity.
@@ -67,9 +69,8 @@
     day_open: 0.0
     name: Partner Demo
     planned_revenue: 50000.0
-    probability: 70.0
+    probability: 100.0
     section_id: crm.section_sales_department
-    type: opportunity
 -
   I open this opportunity.
 -
@@ -85,5 +86,4 @@
 -
   !python {model: crm.lead}: |
     opportunity = self.browse(cr, uid, ref('crm_lead_partnerdemo0'))
-    assert opportunity.stage_id.id == ref('crm.stage_opportunity5'), 'Stage is not changed!'
     assert opportunity.probability == 100.0, 'Probability is wrong!'

From d2879670a11d0c41a2aa8856b7889436bd35b170 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Aug 2011 15:00:36 +0530
Subject: [PATCH 16/24] [FIX]:Apply reverse changes for wrong changes in branch

bzr revid: ksa@tinyerp.co.in-20110818093036-unpfdhad8y6v2qz1
---
 addons/account/company.py                           |  6 +++---
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml  | 13 +++++--------
 addons/mrp/company_view.xml                         |  6 +++---
 addons/pad/company_pad.xml                          |  9 +++------
 addons/point_of_sale/point_of_sale_view.xml         | 13 +++++--------
 addons/procurement/company_view.xml                 | 10 +++++-----
 addons/project/project_view.xml                     |  9 +++------
 addons/purchase/company_view.xml                    |  6 +++---
 addons/sale/company_view.xml                        |  6 +++---
 9 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/addons/account/company.py b/addons/account/company.py
index 82a60beb461..c7836e0128b 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -36,9 +36,9 @@ class res_company(osv.osv):
     }
 
     _defaults = {
-        'overdue_msg': 'Please note that the following payments are now due.\
-                         \nIf your payment has been sent, kindly forward your payment details.\
-                         \nIf payment will be delayed further, please contact us to discuss.\
+        'overdue_msg': 'Please note that the following payments are now due. If your payment \
+                        has been sent, kindly forward your payment details. If payment will be \
+                        delayed further, please contact us to discuss. \
                         \nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
     }
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index be6c4509557..321e4c2addd 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -202,17 +202,14 @@
             <field name="name">res.company.sheet</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">18</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
-                    <group col="2" colspan="2" name="hr_timesheet" sequence="25"> 
-                        <separator string="Timesheets" colspan="4"/>
-                        <field name="timesheet_range"/>
-                        <field name="timesheet_max_difference"/>
+                <page string="Configuration" position="inside">
+                    <separator string="Timesheets" colspan="4"/>
+                    <field name="timesheet_range"/>
+                    <field name="timesheet_max_difference"/>
                     <newline/>
-                    </group>
-                </xpath>
+                </page>
             </field>
         </record>
 
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index 3c33a332977..f5f06518565 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -6,12 +6,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">24</field>
+            <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+                <page string="Configuration" position="inside">
                     <field name="manufacturing_lead"/>
-                </xpath>
+                </page>
             </field>
         </record>
 
diff --git a/addons/pad/company_pad.xml b/addons/pad/company_pad.xml
index 0ee80937d18..754776715d7 100644
--- a/addons/pad/company_pad.xml
+++ b/addons/pad/company_pad.xml
@@ -6,12 +6,9 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
-            <newline/>
-            <group col="2" colspan="2" name="pad" sequence="100"> 
-                  <separator string="Pad" colspan="4"/>
-                  <field name="pad_index"/>
-             </group>
+        <xpath expr="//page[@string='Configuration']" position="inside">
+          <separator string="Pad" colspan="4"/>
+          <field name="pad_index"/>
         </xpath>
       </field>
     </record>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 6b8a71cff58..b0434718a8c 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -637,16 +637,13 @@
             <field name="name">view.company.form.pos</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">25</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after" >
-                   <group col="2" colspan="2" name="pos" sequence="5"> 
-                     <separator string="Point of Sale" colspan="2" />
-                     <field name="company_discount" colspan="2" />
-                     <field name="max_diff" />
-                   </group>
-                </xpath>
+                <field name="currency_id" position="after">
+                    <separator string="Point of Sale" colspan="4"/>
+                    <field  name="company_discount" />
+                    <field  name="max_diff" />
+                </field>
             </field>
            </record>
 
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index a5319c43640..4d14f69edde 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -6,14 +6,14 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">25</field>
+            <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+                <page string="Configuration" position="inside">
                     <separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
-                       <field name="schedule_range"/>
-                </xpath>
-          </field>
+                    <field name="schedule_range"/>
+                </page>
+            </field>
        </record>
     
     </data>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fa0eebfffbe..435bf64fe8d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -530,16 +530,13 @@
             <field name="name">res.company.task.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='accounting']" position="after">
-                    <group col="2" colspan="2" name="project" sequence="15"> 
-                    <separator string="Project Management" colspan="2"/>
+                <page string="Configuration" position="inside">
+                    <separator string="Project Management" colspan="4"/>
                     <field name="project_time_mode_id"/>
                     <newline/>
-                     </group>
-                </xpath>
+                </page>
             </field>
         </record>
 
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 04e48af29d9..d9d2fb9f9ee 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -6,12 +6,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">22</field>
+            <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-               <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+                <page string="Configuration" position="inside">
                     <field name="po_lead"/>
-                </xpath>
+                </page>
             </field>
         </record>
 
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 567bf50948f..96ff91e8e90 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -5,12 +5,12 @@
             <field name="name">res.company.mrp.config</field>
             <field name="model">res.company</field>
             <field name="type">form</field>
-            <field name="priority">20</field>
+            <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/group[@name='mrp']" position="after">
+                <page string="Configuration" position="inside">
                     <field name="security_lead"/>
-                </xpath>
+                </page>
             </field>
         </record>
     </data>

From 4ff03601a6c1a6486059d6005a5e954fc549b87f Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Thu, 18 Aug 2011 15:12:15 +0530
Subject: [PATCH 17/24] [FIX]:Apply reverse changes for wrong changes in branch
 for l10n_ch

bzr revid: ksa@tinyerp.co.in-20110818094215-ugdpdbq74z6moxd1
---
 addons/l10n_ch/company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index 2baa9cb934a..df49cf123be 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <field name="vat" position="after">
+                <field name="rml_footer2" position="after">
                     <field name="bvr_delta_horz"/>
                     <field name="bvr_delta_vert"/>
                     <field name="bvr_background"/>

From 87070c4952ae40b75d7ba52ab9f26d15e1d58ce7 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Aug 2011 11:53:46 +0530
Subject: [PATCH 18/24] [IMP]: for parter assign improve yml

bzr revid: ksa@tinyerp.co.in-20110819062346-n10tznuwcss79hxj
---
 addons/crm_partner_assign/crm_lead_view.xml                | 2 +-
 addons/crm_partner_assign/test/test_crm_partner_assign.yml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index a94b346d8f1..60c3d07fedd 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -61,7 +61,7 @@
                     <filter string="Referred Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
 
-                <field name="categ_id" position="after">
+                <field name="section_id" position="after">
                     <separator orientation="vertical"/>
                     <field name="partner_assigned_id"/>
                 </field>
diff --git a/addons/crm_partner_assign/test/test_crm_partner_assign.yml b/addons/crm_partner_assign/test/test_crm_partner_assign.yml
index 202c96c3555..1253d55391c 100644
--- a/addons/crm_partner_assign/test/test_crm_partner_assign.yml
+++ b/addons/crm_partner_assign/test/test_crm_partner_assign.yml
@@ -60,7 +60,7 @@
   Now I click on Forward button.
 -
   !python {model: crm.lead.forward.to.partner}: |
-    import tools
+    from tools import config
     vals = {
        'name': 'email',
        'email_to': 'info@axelor.com',
@@ -68,6 +68,7 @@
        'reply_to': 'sales_openerp@openerp.com'
     }
     ids = self.create(cr, uid, vals, context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
-    assert tools.config.get('smtp_user', False), 'SMTP not configured !'
+    host = config.get('smtp_user', '127.0.0.1')
+    assert config.get(host, True), 'SMTP not configured !'
     self.action_forward(cr, uid, [ids], context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
-    
+

From 13481a83ff637d3888709e8d79070ad56bc92220 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Aug 2011 15:25:03 +0530
Subject: [PATCH 19/24] [REM]:filter buttons in stage search view

bzr revid: ksa@tinyerp.co.in-20110819095503-52osr4ippl95bx2a
---
 addons/crm/crm_lead_view.xml                  | 18 ------------------
 addons/crm_claim/crm_claim_view.xml           | 18 ------------------
 .../crm_fundraising/crm_fundraising_view.xml  | 19 -------------------
 3 files changed, 55 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e53a5f68bbe..f2734c148b7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,23 +2,6 @@
 <openerp>
 <data>
 
-    <!-- Stage Search view -->
-
-     <record id="crm_lead_stage_search" model="ir.ui.view">
-        <field name="name">Stage - Search</field>
-        <field name="model">crm.case.stage</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Stage Search">
-                <filter icon="terp-personal" name="lead"
-                    string="Lead" domain="[('section_ids', '=', section_id)]"/>
-                <filter icon="terp-personal+" name="opportunity"
-                    string="Opportunity" domain="[('section_ids', '=', section_id)]"/>
-                <field name="name"/>
-            </search>
-        </field>
-    </record>
-
     <!--Lead Stage Form view -->
 
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
@@ -26,7 +9,6 @@
         <field name="res_model">crm.case.stage</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="search_view_id" ref="crm_lead_stage_search"/>
         <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
     </record>
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 8528653d550..0ef0ea2b56f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -21,23 +21,6 @@
         <menuitem action="crm_claim_categ_action" name="Categories"
             id="menu_crm_case_claim-act" parent="menu_config_claim" />
 
-        <!-- Claim Stage Search view -->
-
-        <record id="claim_stage_search" model="ir.ui.view">
-            <field name="name">Claim Stage - Search</field>
-            <field name="model">crm.case.stage</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='name']" position="before">
-                        <filter icon="terp-personal-" name="claim"
-                            string="Claim" domain="[('section_ids', '=', section_id)]"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <!-- Claim Stages -->
 
         <record id="crm_claim_stage_act" model="ir.actions.act_window">
@@ -45,7 +28,6 @@
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="search_view_id" ref="claim_stage_search"/>
             <field name="context">{'search_default_claim':1}</field>
             <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 1358fccad4e..8e3d4471866 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -6,24 +6,6 @@
             groups="base.group_extended"
             parent="base.menu_base_config" sequence="8" />
 
-        <!-- Fund Stage Search view -->
-
-        <record id="fund_stage_search" model="ir.ui.view">
-            <field name="name">Fund Stage - Search</field>
-            <field name="model">crm.case.stage</field>
-            <field name="type">search</field>
-            <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='name']" position="before">
-                        <filter icon="terp-dolar" name="fundraising"
-                            string="Fundraising" domain="[('section_ids', '=', section_id)]"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-
         <!-- Fund Raising Categories Form View -->
 
         <record id="crm_fund_categ_action" model="ir.actions.act_window">
@@ -33,7 +15,6 @@
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
             <field name="context">{'object_id':'crm.fundraising'}</field>
-            <field name="search_view_id" ref="fund_stage_search"/>
             <field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
         </record>
 

From 572e9227a5fd8b5fdfceec8d5d310d5170f3e61e Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Aug 2011 15:43:02 +0530
Subject: [PATCH 20/24] [REM]:Remove menu for claim and fundraising

bzr revid: ksa@tinyerp.co.in-20110819101302-vxu1ixwljzj34wcw
---
 addons/crm_claim/crm_claim_view.xml             | 3 ---
 addons/crm_fundraising/crm_fundraising_view.xml | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 0ef0ea2b56f..6a9e114299f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -32,9 +32,6 @@
             <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
         </record>
 
-         <menuitem action="crm_claim_stage_act" name="Stages"
-                id="menu_crm_claim_stage_act" parent="menu_config_claim" />
-
         <!-- Claims    -->
 
         <record model="ir.ui.view" id="crm_case_claims_tree_view">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 8e3d4471866..9dddc31bd6c 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -33,13 +33,6 @@
             <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>
 
-
-
-         <menuitem action="crm_fundraising_stage_act"
-            groups="base.group_extended" name="Stages"
-            id="menu_crm_fundraising_stage_act"
-            parent="menu_config_fundrising" />
-
         <!-- Fund Raising Tree View -->
 
         <record model="ir.ui.view" id="crm_case_tree_view_fund">

From 80378ecd5b47bbbb601e0e41c2b139d4404d4ca5 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Aug 2011 15:52:46 +0530
Subject: [PATCH 21/24] [IMP]:section_ids field in stage view

bzr revid: ksa@tinyerp.co.in-20110819102246-rwdl0bysc9fwj9gz
---
 addons/crm/crm_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a43af0f2b40..56e69fa6505 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -108,7 +108,6 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="probability"/>
-                   <!--  <field name="type" /> -->
                 </tree>
             </field>
         </record>
@@ -124,8 +123,6 @@
                 <form string="Stage">
                     <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
-                 <!--    <field name="type" groups="base.group_extended" /> -->
-
                     <field name="sequence"/>
                     <field name="probability"/>
                     <group colspan="4" col="2" >
@@ -133,7 +130,8 @@
                     </group>
                     <separator string="Requirements" colspan="4"/>
                     <field name="requirements" nolabel="1" colspan="4"/>
-            <field name="section_ids" invisible="1" />
+                    <separator string="Sections" colspan="4"/>
+                    <field name="section_ids" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>

From 3aa11d4abe72ef89c0670caa8fcd68a3b2451959 Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Aug 2011 16:19:12 +0530
Subject: [PATCH 22/24] [REM]: duplicate data for stages and improve demo data

bzr revid: ksa@tinyerp.co.in-20110819104912-q8pqp24zrv92vuca
---
 addons/crm/crm_opportunity_data.xml | 45 -----------------------------
 addons/crm/crm_opportunity_demo.xml | 10 +++----
 2 files changed, 5 insertions(+), 50 deletions(-)

diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index 3fa3475dde3..1ee4d8bf031 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -2,51 +2,6 @@
 <openerp>
 <data noupdate="1">
 
-     <!--        CASE STATUS(stage_id)        -->
-
-        <record model="crm.case.stage" id="stage_opportunity6">
-            <field name="name">Lost</field>
-            <field eval="'0'" name="probability"/>
-            <field eval="'11'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity1">
-            <field name="name">New</field>
-            <field eval="'10'" name="probability"/>
-            <field eval="'12'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity2">
-            <field name="name">Qualification</field>
-            <field eval="'20'" name="probability"/>
-            <field eval="'13'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity3">
-            <field name="name">Proposition</field>
-            <field eval="'40'" name="probability"/>
-            <field eval="'14'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity4">
-            <field name="name">Negotiation</field>
-            <field eval="'60'" name="probability"/>
-            <field eval="'15'" name="sequence"/>
-            <field name="type">opportunity</field>
-        </record>
-
-        <record model="crm.case.stage" id="stage_opportunity5">
-            <field name="name">Won</field>
-            <field eval="'100'" name="probability"/>
-            <field eval="'16'" name="sequence"/>
-            <field eval="1" name="on_change"/>
-            <field name="type">opportunity</field>
-        </record>
-
         <record model="crm.case.section" id="section_sales_department">
             <field name="name">Sales Department</field>
             <field name="code">Sales</field>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index 8dda7436b64..48812b17cf0 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -20,7 +20,7 @@
             <field eval="85000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
-            <field name="stage_id" ref="crm.stage_opportunity3"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
         </record>
         <record id="crm_case_rdroundfundingunits0" model="crm.lead">
@@ -36,7 +36,7 @@
             <field eval="50" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_opportunity1"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
         </record>
         <record id="crm_case_mediapoleunits0" model="crm.lead">
@@ -53,7 +53,7 @@
             <field eval="70" name="probability"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor7"/>
-            <field name="stage_id" ref="crm.stage_opportunity5"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
             <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
             <field eval="&quot;info@mycompany.net&quot;" name="email_from"/>
         </record>
@@ -70,7 +70,7 @@
             <field eval="45000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
-            <field name="stage_id" ref="crm.stage_opportunity4"/>
+            <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
         </record>
@@ -86,7 +86,7 @@
             <field eval="42000.0" name="planned_revenue"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
-            <field name="stage_id" ref="crm.stage_opportunity6"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
         </record>
     </data>

From 3e33bb4736a5dc085759c3ddac161f8715b19dae Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Aug 2011 16:20:00 +0530
Subject: [PATCH 23/24] [FIX]:yml for stages and opportunity

bzr revid: ksa@tinyerp.co.in-20110819105000-x88j3it05zj7db2v
---
 addons/crm/test/test_crm_opportunity.yml   | 2 +-
 addons/crm/test/test_crm_stage_changes.yml | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index 29300bcf111..7640cc67815 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -8,7 +8,7 @@
     partner_address_id: base.res_partner_address_1
     partner_id: base.res_partner_9
     probability: 1.0
-    stage_id: crm.stage_opportunity1
+    stage_id: crm.stage_lead1
     categ_id: crm.categ_oppor2
     section_id: crm.section_sales_department
 
diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml
index 84a7c8c5232..7518a2bb869 100644
--- a/addons/crm/test/test_crm_stage_changes.yml
+++ b/addons/crm/test/test_crm_stage_changes.yml
@@ -5,7 +5,7 @@
   I want to change the probability to 0.0 when the opportunity is marked as lost.
   So I set its Change probability automatically true.
 - 
-  !record {model: crm.case.stage, id: crm.stage_opportunity6}:
+  !record {model: crm.case.stage, id: crm.stage_lead6}:
     name: Lost
     on_change: true
     probability: 0.0
@@ -54,11 +54,8 @@
   Now I check whether the probability is set according to stage change or not.
 -
   !python {model: crm.lead}: |
-    stage_obj = self.pool.get('crm.case.stage')
     opportunity = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
-    stage_data = stage_obj.browse(cr, uid, ref('crm.stage_opportunity6'))
-    for data in stage_data.section_ids:
-        assert opportunity.stage_id.id == data.id, 'Stage is not changed!'
+    assert opportunity.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
     assert opportunity.probability == 0.0, 'Probability is wrong!'
 -
   I create one more opportunity.
@@ -86,4 +83,5 @@
 -
   !python {model: crm.lead}: |
     opportunity = self.browse(cr, uid, ref('crm_lead_partnerdemo0'))
+    assert opportunity.stage_id.id == ref('crm.stage_lead1'), 'Stage is not changed!'
     assert opportunity.probability == 100.0, 'Probability is wrong!'

From c7d63cc85519769466ff6b06329f7b511e9fe1ca Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Fri, 19 Aug 2011 16:34:25 +0530
Subject: [PATCH 24/24] [IMP]:change sequence

bzr revid: ksa@tinyerp.co.in-20110819110425-vztxqw1xc72goiap
---
 addons/crm_claim/crm_claim_data.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index e917ba5bea6..cd23dedc867 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -44,22 +44,22 @@
         
         <record model="crm.case.stage" id="stage_claim1">
             <field name="name">Accepted as Claim</field>
-            <field name="sequence">1</field>
+            <field name="sequence">6</field>
             <field name="type">claim</field> 
         </record>
         <record model="crm.case.stage" id="stage_claim5">
             <field name="name">Actions Defined</field>
-            <field name="sequence">2</field>
+            <field name="sequence">7</field>
             <field name="type">claim</field> 
         </record>
         <record model="crm.case.stage" id="stage_claim2">
             <field name="name">Actions Done</field>
-            <field name="sequence">10</field>
+            <field name="sequence">8</field>
             <field name="type">claim</field> 
         </record>
         <record model="crm.case.stage" id="stage_claim3">
             <field name="name">Won't fix</field>
-            <field name="sequence">0</field>
+            <field name="sequence">9</field>
             <field name="type">claim</field> 
         </record>