From 52bc357b474f4f094c19f33f941753c788bbddba Mon Sep 17 00:00:00 2001
From: Thibault Francois <tfr@openerp.com>
Date: Thu, 16 Dec 2010 13:02:25 +0100
Subject: [PATCH] [FIX] Cleaning

bzr revid: tfr@openerp.com-20101216120225-vrios8wceyf3cgrd
---
 addons/crm/crm.py             |  2 --
 addons/crm/crm_lead.py        |  1 -
 addons/crm/crm_opportunity.py |  1 -
 addons/crm/i18n/fr.po         | 23 +----------------------
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f3cf7de1dc4..b7ff5a39246 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -97,8 +97,6 @@ class crm_case(object):
             @param ids: List of stage’s IDs
             @stage_id: change state id on run time """
             
-        
-        print "CALL on change ID"
         if not stage_id:
             return {'value':{}}
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 42fccc30246..716c0b1caa0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -391,7 +391,6 @@ class crm_lead(crm_case, osv.osv):
             if case.state in CRM_LEAD_PENDING_STATES:
                 values.update(state=crm.AVAILABLE_STATES[1][0]) #re-open
             res = self.write(cr, uid, [case.id], values, context=context)
-
         return res
 
     def msg_send(self, cr, uid, id, *args, **argv):
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index af9eb79cd52..2af349b827e 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -142,7 +142,6 @@ class crm_opportunity(osv.osv):
         @param ids: List of case's Ids
         @param *args: Give Tuple Value
         """
-        print "open opportunity"
         res = super(crm_opportunity, self).case_open(cr, uid, ids, *args)
         
         return res
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 7aa05da6191..98f8c8d98ff 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm
+#   * crm
 #
 msgid ""
 msgstr ""
@@ -1816,14 +1816,11 @@ msgid "Select stages for this Sales Team"
 msgstr ""
 
 #. module: crm
-<<<<<<< TREE
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
 #, python-format
 msgid "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
-=======
 #: view:board.board:0
 msgid "Opportunities by Stage"
->>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. module: crm
@@ -2356,14 +2353,11 @@ msgid "Busy"
 msgstr "Occupé"
 
 #. module: crm
-<<<<<<< TREE
 #: constraint:ir.model:0
 msgid "The Object name must start with x_ and not contain any special character !"
 msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
 
 #. module: crm
-=======
->>>>>>> MERGE-SOURCE
 #: field:crm.installer,crm_helpdesk:0
 msgid "Helpdesk"
 msgstr "Support"
@@ -3718,13 +3712,8 @@ msgstr "Bulletin d'information"
 #~ msgstr "État du cas"
 #~ msgid "Mail to these emails"
 #~ msgstr "Mail à ces adresses"
-<<<<<<< TREE
-=======
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
-
->>>>>>> MERGE-SOURCE
 #~ msgid "My Histories"
 #~ msgstr "Mon historique"
 #~ msgid "Your action"
@@ -3840,16 +3829,11 @@ msgstr "Bulletin d'information"
 #~ msgstr "Condition sur le cas partenaire"
 #~ msgid "Section Code"
 #~ msgstr "Code de la section"
-<<<<<<< TREE
-=======
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
 #~ "spéciaux !"
-
->>>>>>> MERGE-SOURCE
 #~ msgid "General Description"
 #~ msgstr "Description générale"
 #~ msgid "Mail to partner"
@@ -4456,13 +4440,8 @@ msgstr "Bulletin d'information"
 #~ msgstr "Ajouter CC dans le courriel"
 #~ msgid "Expected Close Date"
 #~ msgstr "Date prévisionelle de clôture"
-<<<<<<< TREE
-=======
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de l'objet invalide dans l'action défini"
-
->>>>>>> MERGE-SOURCE
 #~ msgid "Case Resource Type"
 #~ msgstr "Type de ressouce pour le cas"
 #~ msgid "Other Information"