From 059332f03faeeb3a72dda637fe5a4fe5c7b24d3e Mon Sep 17 00:00:00 2001
From: "dbr(Open ERP)" <>
Date: Thu, 29 Jul 2010 10:33:44 +0530
Subject: [PATCH 1/6] [MOD] Configuration wizard : changes in wizard view of
 account_journal and BI

bzr revid: vir@tinyerp.com-20100729050344-07ilwpscbcvkpfuu
---
 addons/l10n_ch/account_journal_view.xml | 34 +++++++++++++++----------
 addons/olap/data/olap_cube_view.xml     |  4 +--
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_ch/account_journal_view.xml b/addons/l10n_ch/account_journal_view.xml
index aa5d6c20080..5e681131e9c 100644
--- a/addons/l10n_ch/account_journal_view.xml
+++ b/addons/l10n_ch/account_journal_view.xml
@@ -8,24 +8,32 @@
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Account Journal</attribute>
+                  <attribute name="string">Account Journal Configuration</attribute>
                 </form>
+                <separator string="title" position="attributes">
+                    <attribute name="string">Configure Your Account Journal System</attribute>
+                </separator>
+                <xpath expr="//label[@string='description']"
+                 position="attributes">
+                <attribute name="string">Set accounts on financial journals defined by CamptoCamp l10n_ch module</attribute>
+                <attribute name="width">150</attribute>                
+                </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                          <attribute name='rowspan'>15</attribute>
+                          <attribute name='string'></attribute>
+                </xpath>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0"
-                         string="Set accounts on financial journals defined by CamptoCamp l10n_ch module"/>
-                  <separator colspan="4"/>
-                  <group colspan="4" col="6">
                     <field name="name" select="1"/>
-                  </group>
-                  <separator colspan="4" string="
-                    The accounts linked to the account journals"/>
-                  <field name="default_credit_account_id" select="1"
-                         on_change="on_change_credit(name, default_credit_account_id)"/>
-                  <field name="default_debit_account_id" select="1"
-                         on_change="on_change_debit(name, default_debit_account_id)"/>
+                    <group colspan="4">               
+                        <separator colspan="4" string="The accounts linked to the account journals"/>
+                        <field name="default_credit_account_id" select="1"
+                        on_change="on_change_credit(name, default_credit_account_id)"/>
+                        <field name="default_debit_account_id" select="1"
+                        on_change="on_change_debit(name, default_debit_account_id)"/>
+                    </group>
                 </group>
                 <xpath expr="//button[@name='action_next']" position="attributes">
-                  <attribute name="string">Next</attribute>
+                    <attribute name="string">Next</attribute>
                 </xpath>
               </data>
             </field>
diff --git a/addons/olap/data/olap_cube_view.xml b/addons/olap/data/olap_cube_view.xml
index 706f9093b3f..4ffbab0ff60 100644
--- a/addons/olap/data/olap_cube_view.xml
+++ b/addons/olap/data/olap_cube_view.xml
@@ -76,14 +76,14 @@
 	            <field name="model">olap.parameters.config.wizard</field>
 	            <field name="type">form</field>
 	            <field name="arch" type="xml">
-                <form string="Parameters Configure wizard">
+                <form string="Business Intelligence Server Configuration">
                    <group colspan="4" col="8">
                        <group colspan="3" width="220" height="250">
                            <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
                            <newline/>
                            <label align="0.0" string="This wizard will automatically configure the web client for Business Intelligence." width="200" colspan="2"/>
                        </group>
-                       <separator string="" orientation="vertical" colspan="1" rowspan="12"/>
+                       <!--separator string="" orientation="vertical" colspan="1" rowspan="12"/-->
                        <group colspan="4">
                            <separator string=" Business Intelligence Web Client" colspan="4"/>
                            <field name="host_name" colspan="4"/>

From 32dcf8792ff4574c1220a2a488fa75fe3d82788a Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 29 Jul 2010 11:01:42 +0530
Subject: [PATCH 2/6] [FIX] sale : Make Invoice button set to invisible when
 invoiced.

bzr revid: vra@tinyerp.com-20100729053142-owk0ha5ak5jj9ovt
---
 addons/sale/sale_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ce39930f039..4632812db6a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -163,12 +163,14 @@
                                                 <separator colspan="5" string="States"/>
                                                 <field name="state"/>
                                                 <field name="invoiced"/>
+                                                <group attrs="{'invisible':[('invoiced','=',True)]}">
                                                 <button colspan="1"
                                                     name="create_sale_order_line_invoice"
                                                     states="confirmed"
                                                     string="Create Invoice"
                                                     type="object"
                                                     icon="terp-document-new" />
+                                                 </group>
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">

From 9637ab6a49531f5c8d409f8d75bc33ffe7e9840e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Jul 2010 12:35:49 +0530
Subject: [PATCH 3/6] [ADD]: crm: Added new wizard to merge Opportunity with
 Other Opportunities of the same partner

bzr revid: rpa@tinyerp.com-20100729070549-snt3yy0507xmxtfd
---
 addons/crm/__openerp__.py                     |   1 +
 addons/crm/crm_opportunity_view.xml           |   2 +
 addons/crm/wizard/__init__.py                 |   2 +
 addons/crm/wizard/crm_merge_opportunities.py  | 135 ++++++++++++++++++
 .../wizard/crm_merge_opportunities_view.xml   |  49 +++++++
 5 files changed, 189 insertions(+)
 create mode 100644 addons/crm/wizard/crm_merge_opportunities.py
 create mode 100644 addons/crm/wizard/crm_merge_opportunities_view.xml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 35870801ae6..0b170a85924 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -86,6 +86,7 @@ Create dashboard for CRM that includes:
         'wizard/crm_send_email_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
         'wizard/crm_custom_create_menu_view.xml',
+        'wizard/crm_merge_opportunities_view.xml',
 
         'crm_view.xml',
 
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3ccfb1b1e18..411ae9ec58d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -35,6 +35,8 @@
                             <field name="date_action"/>
                             <field name="title_action"/>
                             <field name="priority" string="Priority"/>
+                            <button string="Merge with Other Opportunity"
+                                name="%(merge_opportunity_act)d" icon="gtk-add" type="action" />
                             <newline/>
                             <field name="type" invisible="1"/>
                         </group>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 8c6a650b8da..70dd08a23cf 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -31,6 +31,8 @@ import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
 
 import crm_custom_create_menu
+import crm_merge_opportunities
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
new file mode 100644
index 00000000000..a086bae028f
--- /dev/null
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+class crm_merge_opportunity(osv.osv_memory):
+    """Merge two Opportunities"""
+
+    _name = 'crm.merge.opportunity'
+    _description = 'Merge two Opportunities'
+
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            opp = opp_obj.browse(cr, uid, record_id, context=context)
+            if opp.type != 'opportunity':
+                raise osv.except_osv(_('Warning!'), _('Can only perform this Operation for "Opportunities".'))
+            if not opp.partner_id:
+                raise osv.except_osv(_('Warning!'), _('Opportunity must have Partner assigned before merging with other Opportunity.'))
+            #Search for Opportunity for the same partner
+            opp_ids = opp_obj.search(cr, uid, [('partner_id', '=', opp.partner_id.id), ('type', '=', 'opportunity')])
+            if not len(opp_ids) > 1:
+                raise osv.except_osv(_('Warning!'), _("There are no other Opportunities for the partner '%s'.") % (opp.partner_id.name))
+        pass
+
+
+    def action_merge(self, cr, uid, ids, context=None):
+        """
+        This function merges two opportunities
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Phonecall to Opportunity IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Opportunity form
+        """
+        record_id = context and context.get('active_id', False) or False
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            message_obj = self.pool.get('mailgate.message')
+            current_opp = opp_obj.browse(cr, uid, record_id, context=context)
+
+            for this in self.browse(cr, uid, ids, context=context):
+                for opp in this.opportunity_ids:
+                    opp_obj.write(cr, uid, opp.id, {
+                                    'stage_id': opp.stage_id.id or current_opp.stage_id.id or False,
+                                    'priority': opp.priority or current_opp.priority,
+                                    'email_from': opp.email_from or current_opp.email_from,
+                                    'phone': opp.phone or current_opp.phone,
+                                    'section_id': opp.section_id.id or current_opp.section_id.id or False,
+                                    'categ_id': opp.categ_id.id or current_opp.categ_id.id or False,
+                                    'description': (opp.description or '') + '\n' + (current_opp.description or ''),
+                                    'partner_name': opp.partner_name or current_opp.partner_name,
+                                    'title': opp.title.id or current_opp.title.id or False,
+                                    'function': opp.function or current_opp.function,
+                                    'street': opp.street or current_opp.street,
+                                    'street2': opp.street2 or current_opp.street2,
+                                    'zip': opp.zip or current_opp.zip,
+                                    'city': opp.city or current_opp.city,
+                                    'country_id': opp.country_id.id or current_opp.country_id.id or False,
+                                    'state_id': opp.state_id.id or current_opp.state_id.id or False,
+                                    'fax': opp.fax or current_opp.fax,
+                                    'mobile': opp.mobile or current_opp.mobile,
+                                    'email_cc': ','.join(filter(lambda x: x, [opp.email_cc, current_opp.email_cc]))
+                                })
+                    for history in current_opp.message_ids:
+                        if history.history:
+                            new_history = message_obj.copy(cr, uid, history.id, default={'res_id': opp.id})
+                    opp_obj._history(cr, uid, [current_opp], _('Merged into Opportunity: %s') % (opp.id))
+        opp_obj.case_cancel(cr, uid, [record_id])
+
+        return {}
+
+    _columns = {
+        'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        @return : default values of fields.
+        """
+        record_id = context and context.get('active_id', False) or False
+        res = super(crm_merge_opportunity, self).default_get(cr, uid, fields, context=context)
+
+        if record_id:
+            opp_obj = self.pool.get('crm.lead')
+            opp = opp_obj.browse(cr, uid, record_id, context=context)
+            opp_ids = opp_obj.search(cr, uid, [('partner_id', '=', opp.partner_id.id), ('type', '=', 'opportunity')])
+            # Removing current opportunity
+            opp_ids.remove(record_id)
+
+            if 'opportunity_ids' in fields:
+                res.update({'opportunity_ids': opp_ids})
+        return res
+
+crm_merge_opportunity()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
new file mode 100644
index 00000000000..56d336cf629
--- /dev/null
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- Merge Opportunities  -->
+
+        <record model="ir.ui.view" id="merge_opportunity_form">
+            <field name="name">crm.merge.opportunity.form</field>
+            <field name="model">crm.merge.opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Merge Opportunities">
+                    <separator string="Select Opportunities" colspan="4"/>
+                    <field name="opportunity_ids" nolabel="1" colspan="4" width="550" height="300"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4">
+                        <label string="" colspan="2"/>
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_merge" type="object"
+                                string="_Merge" icon="gtk-ok" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <!--  Merge Opportunities action -->
+
+        <record model="ir.actions.act_window" id="merge_opportunity_act">
+            <field name="name">Merge Opportunities</field>
+            <field name="res_model">crm.merge.opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="merge_opportunity_form"/>
+            <field name="target">new</field>
+        </record>
+
+        <!--    This will also come in Leads Form as Lead and Opportunity are same object-->
+        <!-- <record id="merge_opportunity_act_value" model="ir.values">
+            <field name="model_id" ref="model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Merge Opportunities</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('merge_opportunity_act'))"/>
+            <field name="key">action</field>
+            <field name="model">crm.lead</field>
+        </record> -->
+
+    </data>
+</openerp>
\ No newline at end of file

From 44325239683c78cb3376622631bda3ba423f49d3 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 29 Jul 2010 12:37:11 +0530
Subject: [PATCH 4/6] [MOD] Modification in Sale configuration menu items,
 [Remove] res_partner_som object links from
 crm_clain,crm_fundraising,crm_helpdesk

bzr revid: vir@tinyerp.com-20100729070711-vca2ye9f5d5ro4ke
---
 .../base_action_rule_view.xml                 |  8 +++----
 addons/base_calendar/base_calendar_view.xml   |  4 ++--
 addons/crm/crm_lead_view.xml                  |  4 ++--
 addons/crm/crm_meeting_view.xml               |  4 ++--
 addons/crm/crm_view.xml                       | 22 +++++++++----------
 addons/crm_claim/crm_claim.py                 |  6 -----
 addons/crm_claim/report/crm_claim_report.py   |  2 +-
 addons/crm_fundraising/crm_fundraising.py     |  5 -----
 addons/crm_helpdesk/crm_helpdesk.py           |  5 -----
 addons/crm_helpdesk/crm_helpdesk_demo.xml     |  4 ----
 addons/crm_profiling/crm_profiling_view.xml   |  4 ++--
 addons/mail_gateway/mail_gateway_view.xml     |  2 +-
 12 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 62e858a8349..710fc9d0075 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_base_action_rule" name="Action Rule"
+        <menuitem id="base.menu_base_action_rule" name="Automated Actions"
             groups="base.group_extended"
-            parent="base.menu_base_config" sequence="500" />
+            parent="base.menu_base_config" sequence="3" />
 
         <!--
             Action Rule Form View
@@ -105,7 +105,7 @@
 <!-- Action Rule Action -->
 
            <record id="base_action_rule_act" model="ir.actions.act_window">
-            <field name="name">Action Rules</field>
+            <field name="name">Automated Actions</field>
             <field name="res_model">base.action.rule</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -113,7 +113,7 @@
         </record>
 
            <menuitem id="menu_base_action_rule_form"
-               parent="menu_base_action_rule" action="base_action_rule_act" />
+               parent="base.menu_base_action_rule" action="base_action_rule_act" sequence="1"/>
 
 
     </data>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index cb754080c02..2324be6adbd 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -157,7 +157,7 @@
 
         <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_base_config" sequence="15" />
+            parent="base.menu_base_config" sequence="6" />
 
         <!-- Invitation menu -->
 
@@ -201,7 +201,7 @@
             </field>
         </record>
         <record id="action_res_alarm_view" model="ir.actions.act_window">
-            <field name="name">Available Alarms</field>
+            <field name="name">Alarms</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.alarm</field>
             <field name="view_type">form</field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6897a3d1a23..9ddc87b2efd 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -15,7 +15,7 @@
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
         groups="base.group_extended" sequence="0"
-        parent="menu_crm_config_lead" />
+        parent="base.menu_crm_config_lead" />
 
 
         <!--  Resource Type Form View -->
@@ -31,7 +31,7 @@
       <menuitem action="crm_lead_resource_act"
             id="menu_crm_lead_resource_act" name="Lead Sources"
             groups="base.group_extended" sequence="2"
-            parent="menu_crm_config_lead" />
+            parent="base.menu_crm_config_lead" />
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 2c6fbd02cc9..66bbc061009 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -13,8 +13,8 @@
         <field name="context">{'object_id':'crm.meeting'}</field>
     </record>
 
-     <menuitem action="crm_meeting_categ_action" name="Categories"
-        id="menu_crm_case_meeting-act" parent="menu_crm_config_meeting" />
+     <menuitem action="crm_meeting_categ_action" name="Categories of Meeting"
+        id="menu_crm_case_meeting-act" parent="base.menu_calendar_configuration" sequence="1"/>
 
     <!-- CRM Meetings Form View -->
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3fdf9bbd827..41375001257 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,14 +2,14 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_crm_config_sales" name="Sales"
-            parent="base.menu_base_config" sequence="1"/>
+        <!--menuitem id="base.menu_crm_config_sales" name="Sales"
+            parent="base.menu_base_config" sequence="1"/-->
 
-        <menuitem id="menu_crm_config_lead" name="Leads &amp; Opportunities"
-            parent="base.menu_crm_config_sales" sequence="0" groups="base.group_extended"/>
+        <menuitem id="base.menu_crm_config_lead" name="Leads &amp; Opportunities"
+            parent="base.menu_base_config" sequence="2" groups="base.group_extended"/>
 
-        <menuitem id="menu_crm_config_meeting" name="Meeting"
-            parent="base.menu_base_config" sequence="4"/>
+        <!--menuitem id="menu_crm_config_meeting" name="Meeting"
+            parent="base.menu_base_config" sequence="4"/-->
 
         <menuitem id="menu_crm_config_phonecall" name="Phone Call"
             parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
@@ -90,7 +90,7 @@
         
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act" sequence="4"
-            parent="menu_crm_config_lead" />
+            parent="base.menu_crm_config_lead" />
             
 
         <!-- CRM Stage Tree View -->
@@ -180,7 +180,7 @@
         
          <menuitem action="crm_case_categ-act"
             id="menu_crm_case_categ-act" name="Categories"
-            parent="menu_crm_config_lead" sequence="1"/>
+            parent="base.menu_crm_config_lead" sequence="1"/>
 
         <!-- Resource Type of case Tree View -->
 
@@ -334,7 +334,7 @@
         </record>
 
         <record id="crm_segmentation_tree-act" model="ir.actions.act_window">
-            <field name="name">Segmentation</field>
+            <field name="name">Partners Segmentation</field>
             <field name="res_model">crm.segmentation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -342,8 +342,8 @@
 
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
-            groups="base.group_extended" sequence="6"
-            parent="base.menu_config_address_book" />
+            groups="base.group_extended" sequence="2"
+            parent="base.menu_base_action_rule" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 76a6073b58c..905b1bba9ff 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -52,12 +52,6 @@ class crm_claim(osv.osv, crm.crm_case):
                       "canall which is this opportunity source."), 
         'planned_revenue': fields.float('Planned Revenue'), 
         'planned_cost': fields.float('Planned Costs'), 
-        'som': fields.many2one('res.partner.som', 'State of Mind', \
-                        help="The minds states allow to define a value scale "\
-                            "which represents the partner mentality in "\
-                            "relation to our services.The scale has to be "\
-                            "created with a factor for each level from 0 "\
-                            "(Very dissatisfied) to 10 (Extremely satisfied)"), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.claim')]"), 
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 18c6d16ed53..fed4026aa02 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -107,7 +107,7 @@ class crm_claim_report(osv.osv):
                 group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), \
                         c.state, c.user_id,c.section_id, c.stage_id,\
                         c.categ_id,c.partner_id,c.company_id,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
-                        ,c.priority,c.type_id,c.som
+                        ,c.priority,c.type_id
             )""")
 
 crm_claim_report()
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 81e16a47ac3..962fae07fd3 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -75,11 +75,6 @@ class crm_fundraising(osv.osv, crm.crm_case):
                         "modes available with the customer." \
                        " With each commercial opportunity, you can indicate\
                      the canall which is this opportunity source."), 
-            'som': fields.many2one('res.partner.som', 'State of Mind', \
-                         help="The minds states allow to define a value scale which represents" \
-                              "the partner mentality in relation to our services.The scale has" \
-                            "to be created with a factor for each level from 0 \
-                             (Very dissatisfied) to 10 (Extremely satisfied)."), 
             'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index d4a1e9d59fc..9c223c74a54 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -61,11 +61,6 @@ class crm_helpdesk(osv.osv, crm.crm_case):
             'planned_cost': fields.float('Planned Costs'), 
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
             'probability': fields.float('Probability (%)'), 
-            'som': fields.many2one('res.partner.som', 'State of Mind', \
-                            help="The minds states allow to define a value scale which represents" \
-                                "the partner mentality in relation to our services.The scale has" \
-                                "to be created with a factor for each level from 0" \
-                                "(Very dissatisfied) to 10 (Extremely satisfied)."), 
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"), 
diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml
index fd31bb4c8fb..be8da99f140 100644
--- a/addons/crm_helpdesk/crm_helpdesk_demo.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
         <record id="crm_helpdesk_wheretodownloadopenerp0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'E-mail')]"/>
-            <field name="som" ref="base.som_normal"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
@@ -17,7 +16,6 @@
 
         <record id="crm_helpdesk_cannotabletoconnecttoserver0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'website')]"/>
-            <field name="som" ref="base.som_fury"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="company_id" ref="base.main_company"/>
@@ -31,7 +29,6 @@
 
         <record id="crm_helpdesk_documentationforcrm0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'phone')]"/>
-            <field name="som" ref="base.som_happy"/>
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
@@ -46,7 +43,6 @@
         <record id="crm_helpdesk_howtocreateanewmodule0" model="crm.helpdesk">
             <field model="res.partner.canal" name="canal_id" search="[('name', '=', u'E-mail')]"/>
             <field name="partner_address_id" ref="base.res_partner_address_9"/>
-            <field name="som" ref="base.som_normal"/>
             <field eval="1" name="active"/>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index eeb95d77fc1..e0dbcce05a1 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -16,7 +16,7 @@
           <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_questionnaire"
+        <menuitem parent="base.menu_crm_config_lead" id="menu_segm_questionnaire"
                   action="open_questionnaires" />
 
         <record model="ir.actions.act_window" id="open_questions">
@@ -26,7 +26,7 @@
           <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem parent="base.menu_crm_config_sales" id="menu_segm_answer"
+        <menuitem parent="base.menu_crm_config_lead" id="menu_segm_answer"
                   action="open_questions" />
 
 <!-- Profiling Questionnaire Tree view  -->
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index a9a2d1f96fc..fb70a08efc3 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -177,7 +177,7 @@
             <field name="act_window_id" ref="action_view_mailgate_thread"/>
         </record>
 
-        <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
+        <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="4"/>
         <menuitem id="menu_mailgate_message" name="Emails" action="action_view_mailgate_message"
            parent="base.menu_base_config_mail" sequence="5"/>
 

From 931315680fbda61ee20a07df9327f381532a8447 Mon Sep 17 00:00:00 2001
From: "PAP(OpenERP)" <>
Date: Thu, 29 Jul 2010 12:40:03 +0530
Subject: [PATCH 5/6] [FIX] Account: yaml

bzr revid: mra@mra-laptop-20100729071003-9610bmzflwd1tk1c
---
 addons/account/account_view.xml               |  2 +-
 addons/account/invoice.py                     |  2 +-
 .../account/test/account_customer_invoice.yml | 13 +++++
 .../account/test/account_fiscalyear_close.yml | 54 +++++++++----------
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 716369c429b..3ae70200ffb 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -818,7 +818,7 @@
                             <field groups="base.group_extended" name="price_include"/>
                             <field name="type_tax_use"/>
                             <newline/>
-                            <field colspan="4" groups="base.group_extended" name="child_ids"/>
+                            <field colspan="4" groups="base.group_extended" name="child_ids" nolabel="1"/>
                         </page>
                         <page string="Tax Declaration">
                             <separator colspan="4" string="Invoices"/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index ef056e454a9..b15c8667972 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1171,7 +1171,7 @@ class account_invoice(osv.osv):
                    ((move_id, invoice.move_id.id),))
         lines = line.browse(cr, uid, map(lambda x: x[0], cr.fetchall()) )
         for l in lines+invoice.payment_ids:
-            if l.account_id.id==src_account_id:
+            if l.account_id.id == src_account_id:
                 line_ids.append(l.id)
                 total += (l.debit or 0.0) - (l.credit or 0.0)
 
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index 0cbcc0f944d..e5920d0caed 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -32,6 +32,12 @@
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'proforma2'
+-
+  I check that there is no move attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert acc_id.move_id, "Move not created"
 -
   I create invoice by clicking on Create button
 -
@@ -41,6 +47,13 @@
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'open'
+    
+-
+  I check that now there is a move attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert acc_id.move_id, "Move created"
 -
   I create a record for partial payment of 1000 EUR.
 -
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 6a619a8df5c..fa4f24effc1 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -59,33 +59,33 @@
       "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
       })
 
--
-  In order to test Cancel Opening Entries I cancelled the opening entries created for "Fiscal Year 2011"
--
-  !record {model: account.open.closed.fiscalyear, id: account_open_closed_fiscalyear_1}:
-    fyear_id: account.data_fiscalyear
--
-  I clicked on Open button
--
-  !python {model: account.open.closed.fiscalyear}: |
-    self.remove_entries(cr, uid, [ref("account_open_closed_fiscalyear_1")], {"lang":
-      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_open_closed_fy")],
-      "tz": False, "active_id": ref("account.menu_wizard_open_closed_fy"), })
--
-  I check the opening entries By using "Entries by Line wizard"
--
-  !record {model: account.move.journal, id: account_move_journal_2}:
-    journal_id: account.sales_journal
-    period_id: account_period_jan11
-
--
-  I checked the Opening entries are cancelled successfully
--
-  !python {model: account.move.journal}: |
-    self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
-      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
-      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
-      })
+#-
+#  In order to test Cancel Opening Entries I cancelled the opening entries created for "Fiscal Year 2011"
+#-
+#  !record {model: account.open.closed.fiscalyear, id: account_open_closed_fiscalyear_1}:
+#    fyear_id: account.data_fiscalyear
+#-
+#  I clicked on Open button
+#-
+#  !python {model: account.open.closed.fiscalyear}: |
+#    self.remove_entries(cr, uid, [ref("account_open_closed_fiscalyear_1")], {"lang":
+#      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_open_closed_fy")],
+#      "tz": False, "active_id": ref("account.menu_wizard_open_closed_fy"), })
+#-
+#  I check the opening entries By using "Entries by Line wizard"
+#-
+#  !record {model: account.move.journal, id: account_move_journal_2}:
+#    journal_id: account.sales_journal
+#    period_id: account_period_jan11
+#
+#-
+#  I checked the Opening entries are cancelled successfully
+#-
+#  !python {model: account.move.journal}: |
+#    self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
+#      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
+#      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
+#      })
 
 
 

From 725573bf43cfbcbca4eef9d6446fccae468d86df Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 29 Jul 2010 12:47:22 +0530
Subject: [PATCH 6/6] [Fix] stock,purchase: Fix the yml

bzr revid: sbh@tinyerp.com-20100729071722-ny0idi9th0e2if41
---
 addons/purchase/test/procurement_buy.yml | 1 +
 addons/stock/test/stock_test.yml         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml
index 011e70d0cdc..69b4f1d6195 100644
--- a/addons/purchase/test/procurement_buy.yml
+++ b/addons/purchase/test/procurement_buy.yml
@@ -23,6 +23,7 @@
       - delay: 1
         name: base.res_partner_asus
         qty: 5.0
+        min_qty:1.0
 -  
   I create  procurement order.
 - 
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 33b3350d628..442cc8735b9 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -192,7 +192,7 @@
     seller_ids:
       - delay: 1
         name: stock.res_partner_shawtrust0
-        qty: 5.0
+        min_qty: 5.0
     supply_method: buy
     type: product
     uom_id: product.product_uom_unit
@@ -213,7 +213,7 @@
     seller_ids:
       - delay: 1
         name: res_partner_shawtrust0
-        qty: 5.0
+        min_qty: 5.0
     supply_method: buy
     type: product
     uom_id: product.product_uom_unit