From 93a6ebff04c022be656ad3a5c03503696e6807f1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 11:17:35 +0530
Subject: [PATCH 01/56] [Fix] crm: Fix the problem of partner_id

bzr revid: sbh@tinyerp.com-20100309054735-mn8jhzewso7q9fdp
---
 addons/crm/crm_phonecall_view.xml            | 1 -
 addons/crm/wizard/crm_phonecall2phonecall.py | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index cda27442350..53e3aa631d1 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -78,7 +78,6 @@
                         name="%(wizard_crm_phonecall_meeting_set)d"
                         icon="gtk-redo"
                         type="action" />
-                   
                     <field name="partner_phone"/>
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index b6ba9f9b4c3..245c3fecc40 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -46,8 +46,8 @@ class crm_phonecall2phonecall(osv.osv_memory):
         values['user_id']=this.user_id and this.user_id.id
         values['categ_id']=this.category_id and this.category_id.id
         values['section_id']=this.section_id and this.section_id.id or False,
-        values['description']=this.notes 
-        values['partner_id']=this.partner_id
+        values['description']=this.notes or ''
+        values['partner_id']=this.partner_id.id
         values['partner_address_id']=this.address_id.id
         phonecall_proxy = self.pool.get('crm.phonecall')
         phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)  
@@ -75,17 +75,14 @@ class crm_phonecall2phonecall(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         record_id = context and context.get('record_id', False) or False
         res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
-       
         if record_id:
             phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
-            print ":::::::::",phonecall_id.section_id.id
             res['name']=phonecall_id.name
             res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id
             res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id
-            res['notes']=phonecall_id.description and phonecall_id.description
+            res['notes']=phonecall_id.description and phonecall_id.description or ''
             res['category_id']=phonecall_id.categ_id and phonecall_id.categ_id.id
             res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
             res['address_id']=phonecall_id.partner_address_id and phonecall_id.partner_address_id.id
-             
         return res
 crm_phonecall2phonecall()
\ No newline at end of file

From 87bd2e84b4407abfa48e74bfe244b49968e1ee12 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 14:05:43 +0530
Subject: [PATCH 02/56] [Add] crm : Add the wizard of /phonecall2opportunity

bzr revid: sbh@tinyerp.com-20100309083543-uljqipt3i2r8rxzj
---
 addons/crm/__terp__.py                        |   4 +-
 addons/crm/crm_phonecall_view.xml             |   4 +-
 addons/crm/wizard/__init__.py                 |   3 +-
 addons/crm/wizard/phonecall2opportunity.xml   |  32 ++++++
 addons/crm/wizard/phonecall_to_opportunity.py | 106 ++++++++++++++++++
 5 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100644 addons/crm/wizard/phonecall2opportunity.xml
 create mode 100644 addons/crm/wizard/phonecall_to_opportunity.py

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 0189cc11b2c..d1514a658cf 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -62,7 +62,9 @@ between mails and Open ERP.""",
 
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
-        'wizard/lead_to_partner_view.xml',           
+        'wizard/lead_to_partner_view.xml',
+        'wizard/phonecall2partner_view.xml',
+        'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 53e3aa631d1..11516f3af56 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -49,7 +49,7 @@
                 <field name="partner_phone"/>                
                 <field name="user_id"/>
                 <button string="Opportunity" 
-                    name="%(wizard_crm_phonecall_opportunity_set)d"
+                    name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
@@ -82,7 +82,7 @@
                     <field name="duration"/>
                     <field name="section_id" colspan="1" widget="selection" />
                     <button string="Convert to Opportunity"
-                        name="%(wizard_crm_phonecall_opportunity_set)d"
+                        name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
 					<label colspan="6"  string=""/>                                 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 56330ebfd72..6c52d09a558 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -29,7 +29,8 @@ import wizard_history_event
 import crm_phonecall2phonecall
 
 import lead_to_partner
-
+import phonecall2partner
+import phonecall_to_opportunity
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/phonecall2opportunity.xml b/addons/crm/wizard/phonecall2opportunity.xml
new file mode 100644
index 00000000000..607db601433
--- /dev/null
+++ b/addons/crm/wizard/phonecall2opportunity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall2opportunity_view">
+            <field name="name">crm.phonecall2opportunity.form</field>
+            <field name="model">crm.phonecall2opportunity</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Opportunity " col="2">
+                		<field name="name"/>
+						<field name="partner_id" />
+						<newline/>
+						<field name="planned_revenue"/>
+						<field name="probability"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall2opportunity_act">
+            <field name="name">Convert To Opportunity</field>
+            <field name="res_model">crm.phonecall2opportunity</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall2opportunity_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
new file mode 100644
index 00000000000..025399c1040
--- /dev/null
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -0,0 +1,106 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2opportunity(osv.osv_memory):
+    _name = 'crm.phonecall2opportunity'
+    _description = 'Phonecall To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                 if case.state in ['done', 'cancel']:       
+                            raise osv.except_osv(_("Warning"),
+                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
+                 else:
+                     data_obj = self.pool.get('ir.model.data')
+                     result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                     res = data_obj.read(cr, uid, result, ['res_id'])
+                     id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                     id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                     if id2:
+                        id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+                     if id3:
+                        id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+                        opportunity_case_obj = self.pool.get('crm.opportunity')
+                        phonecall_case_obj = self.pool.get('crm.phonecall')
+                        new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                                'name': this.name,
+                                'planned_revenue': this.planned_revenue,
+                                'probability': this.probability,
+                                'partner_id': this.partner_id.id,                 
+                                'section_id': case.section_id.id,
+                                'description': case.description,         
+                                'phonecall_id': case.id,
+                                'priority': case.priority,
+                                'phone': case.partner_phone,
+                            })
+                        new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                        vals = {
+                                'partner_id': this.partner_id.id, 
+                                'opportunity_id' : new_opportunity_id,                
+                                }            
+                        phonecall_case_obj.write(cr, uid, [case.id], vals)
+                        phonecall_case_obj.case_close(cr, uid, [case.id])
+                        phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
+            value = {            
+                'name': _('Opportunity'),
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'crm.opportunity',
+                'res_id': int(new_opportunity_id),
+                'view_id': False,
+                'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'] 
+            }
+            return value
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res['name']=phonecall_id.name
+            res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
+        return res
+crm_phonecall2opportunity()
\ No newline at end of file

From 79b9691bf4ba4ac47895c8975c982fde17224332 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 14:23:54 +0530
Subject: [PATCH 03/56] crm : put comment

bzr revid: sbh@tinyerp.com-20100309085354-xkuql56lbiiw3s9l
---
 addons/crm/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index d1514a658cf..4a88462c98f 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -63,7 +63,7 @@ between mails and Open ERP.""",
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/lead_to_partner_view.xml',
-        'wizard/phonecall2partner_view.xml',
+      #  'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',

From 31487c201e1e84c872388885e83b0715a44e960f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 14:39:07 +0530
Subject: [PATCH 04/56] [IMP]: crm: changes for opening meetings related to
 opportunity

bzr revid: rpa@tinyerp.com-20100309090907-kxbr4h3x2p3yomao
---
 addons/crm/crm_opportunity_menu.xml         |  6 +++---
 addons/crm/wizard/crm_opportunity_wizard.py | 14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index dc7e100152a..49d0452167b 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -8,9 +8,9 @@
             name="Meetings"
             res_model="crm.meeting"
             src_model="crm.opportunity"
-            view_mode="calendar,tree,form"
-            context="{'default_duration': 4.0}"
-            domain="[('user_id','=',uid)]"
+            view_mode="tree,form,calendar,"
+            context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
+            domain="[('user_id','=',uid), ('opportunity_id', '=', active_id)]"
             view_type="form"/>
 
 	 <act_window
diff --git a/addons/crm/wizard/crm_opportunity_wizard.py b/addons/crm/wizard/crm_opportunity_wizard.py
index e2636027c92..d7ec0b72cb6 100644
--- a/addons/crm/wizard/crm_opportunity_wizard.py
+++ b/addons/crm/wizard/crm_opportunity_wizard.py
@@ -154,20 +154,16 @@ class opportunity2meeting(wizard.interface):
         partner_id = opportunity.partner_id and opportunity.partner_id.id or False
         name = opportunity.name
         email = opportunity.email_from
-        section_id = opportunity.section_id and opportunity.section_id.id or False
+        section_id = opportunity.section_id and opportunity.section_id.id or False        
         return {            
             'name': _('Meetings'),
-            'domain' : "[('user_id','=',%s), ('opportunity_id', '=', %s)]"%(uid, data['id']),  
-            'context': {'default_partner_id': partner_id, 
-                        'default_opportunity_id': data['id'], 
-                        'default_section_id': section_id, 
-                        'default_email_from': email, 
-                        'default_state':'open', 'default_name':name},
+            'domain' : "[('user_id','=',%s)]"%(uid),  
+            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},
             'view_type': 'form',
-            'view_mode': 'tree,form,calendar',
+            'view_mode': 'calendar,form,tree',
             'res_model': 'crm.meeting',
             'view_id': False,
-            'views': [(id3, 'tree'), (id2, 'form'), (id1, 'calendar')], 
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
             'type': 'ir.actions.act_window',
             'search_view_id': id['res_id']
             }

From 2feb455905f8e92aff39e0c3120b1f3fd99e44a4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 15:19:39 +0530
Subject: [PATCH 05/56] crm: Add the wizard of phonecall2meeting and improve
 the view of phonecall2phonecall

bzr revid: sbh@tinyerp.com-20100309094939-2w4am787wuls7mj4
---
 addons/crm/__terp__.py                        |  1 +
 addons/crm/crm_phonecall_view.xml             |  4 +-
 addons/crm/wizard/__init__.py                 |  1 +
 addons/crm/wizard/crm_phonecall2phonecall.py  | 63 ++++++++--------
 addons/crm/wizard/crm_phonecall2phonecall.xml |  9 +--
 addons/crm/wizard/phonecall2meeting.py        | 75 +++++++++++++++++++
 addons/crm/wizard/phonecall2meeting.xml       | 25 +++++++
 7 files changed, 138 insertions(+), 40 deletions(-)
 create mode 100644 addons/crm/wizard/phonecall2meeting.py
 create mode 100644 addons/crm/wizard/phonecall2meeting.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 4a88462c98f..88a01d3285b 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -63,6 +63,7 @@ between mails and Open ERP.""",
     'update_xml': [
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/lead_to_partner_view.xml',
+        'wizard/phonecall2meeting.xml',
       #  'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 11516f3af56..38d2b6149e9 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -54,7 +54,7 @@
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                     states="draft,open,pending"
-                    name="%(wizard_crm_phonecall_meeting_set)d"  type="action" />
+                    name="%(phonecall2meeting_act)d"  type="action" />
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
                 <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -75,7 +75,7 @@
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
                     <button string="Schedule a Meeting"
-                        name="%(wizard_crm_phonecall_meeting_set)d"
+                        name="%(phonecall2meeting_act)d"
                         icon="gtk-redo"
                         type="action" />
                     <field name="partner_phone"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 6c52d09a558..d9c1f6b32e9 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -30,6 +30,7 @@ import crm_phonecall2phonecall
 
 import lead_to_partner
 import phonecall2partner
+import phonecall2meeting
 import phonecall_to_opportunity
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index 245c3fecc40..fb7f99f41d2 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -40,37 +40,41 @@ class crm_phonecall2phonecall(osv.osv_memory):
 
     def action_apply(self, cr, uid, ids, context=None):
         this = self.browse(cr, uid, ids)[0]
-        record_id = context and context.get('record_id', False) or False
         values={}
-        values['name']=this.name
-        values['user_id']=this.user_id and this.user_id.id
-        values['categ_id']=this.category_id and this.category_id.id
-        values['section_id']=this.section_id and this.section_id.id or False,
-        values['description']=this.notes or ''
-        values['partner_id']=this.partner_id.id
-        values['partner_address_id']=this.address_id.id
-        phonecall_proxy = self.pool.get('crm.phonecall')
-        phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)  
-        value = {            
-            'name': _('Phone Call'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'crm.phonecall',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'res_id': phonecall_id
-            }
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                values['name']=this.name
+                values['user_id']=this.user_id and this.user_id.id
+                values['categ_id']=case.categ_id and case.categ_id.id or False
+                values['section_id']=case.section_id and case.section_id.id or False,
+                values['description']=case.description or ''
+                values['partner_id']=case.partner_id.id
+                values['partner_address_id']=case.partner_address_id.id
+                values['partner_mobile']=case.partner_mobile or False
+                values['priority']=case.priority
+                values['partner_phone']=case.partner_phone or False
+                values['date']=this.date
+                phonecall_proxy = self.pool.get('crm.phonecall')
+                phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
+                  
+            value = {            
+                'name': _('Phone Call'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'crm.phonecall',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'res_id': phonecall_id
+                }
         return value
 
     _columns = {
-        'name' : fields.char('Name', size=64, required=True, select=1),
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
         'user_id' : fields.many2one('res.users',"Assign To"),
-        'deadline': fields.datetime('Deadline', readonly=True),
-        'category_id' : fields.many2one('crm.case.categ','Category',domain="[('object_id.model', '=', ''crm.phonecall')]"),
+        'date': fields.datetime('Date'),
         'section_id':fields.many2one('crm.case.section','Sales Team'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"),        
-        'notes' : fields.text('Notes'),
+
     }
     def default_get(self, cr, uid, fields, context=None):
         record_id = context and context.get('record_id', False) or False
@@ -78,11 +82,8 @@ class crm_phonecall2phonecall(osv.osv_memory):
         if record_id:
             phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
             res['name']=phonecall_id.name
-            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id
-            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id
-            res['notes']=phonecall_id.description and phonecall_id.description or ''
-            res['category_id']=phonecall_id.categ_id and phonecall_id.categ_id.id
-            res['partner_id']=phonecall_id.partner_id and phonecall_id.partner_id.id
-            res['address_id']=phonecall_id.partner_address_id and phonecall_id.partner_address_id.id
+            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id or False
+            res['date']=phonecall_id.date 
+            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id or False 
         return res
 crm_phonecall2phonecall()
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
index c9a9d37ac9e..421ee7c9748 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.xml
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -6,16 +6,11 @@
             <field name="model">crm.phonecall2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule Other Call " col="2">
+                <form string="Schedule Other Call" col="2">
                 		<field name="name"/>
 						<field name="user_id" />
-						<separator colspan="3" string="Contacts" />
-						<field name="partner_id"/>
-						<field name="address_id"/>
-						<separator colspan="3" string="" />
-						<field name="category_id" domain="[('object_id.model', '=', 'crm.phonecall')]" />
 						<field name="section_id"/>
-						<field name="notes"/>
+						<field name="date" string="Planned Date"/>
                     <group colspan="2" col="2" >
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
diff --git a/addons/crm/wizard/phonecall2meeting.py b/addons/crm/wizard/phonecall2meeting.py
new file mode 100644
index 00000000000..502ad14f702
--- /dev/null
+++ b/addons/crm/wizard/phonecall2meeting.py
@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2meeting(osv.osv_memory):
+    _name = 'crm.phonecall2meeting'
+    _description = 'Phonecall To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def _makeMeeting(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            phonecall_case_obj = self.pool.get('crm.phonecall')                   
+            data_obj = self.pool.get('ir.model.data')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            id = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            phonecall = phonecall_case_obj.browse(cr, uid, record_id, context=context)
+            partner_id = phonecall.partner_id and phonecall.partner_id.id or False
+            name = phonecall.name
+            email = phonecall.email_from
+            section_id = phonecall.section_id and phonecall.section_id.id or False      
+        return {            
+            'name': _('Meetings'),
+            'domain' : "[('user_id','=',%s)]"%(uid), 
+            'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},        
+            'view_type': 'form',
+            'view_mode': 'calendar,form,tree',
+            'res_model': 'crm.meeting',
+            'view_id': False,
+            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+            }
+crm_phonecall2meeting()
\ No newline at end of file
diff --git a/addons/crm/wizard/phonecall2meeting.xml b/addons/crm/wizard/phonecall2meeting.xml
new file mode 100644
index 00000000000..9505845a63a
--- /dev/null
+++ b/addons/crm/wizard/phonecall2meeting.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall2phonecall2meeting_view">
+            <field name="name">crm.phonecall2meeting.form</field>
+            <field name="model">crm.phonecall2meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Meeting ">
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall2meeting_act">
+            <field name="name">Convert To Meeting</field>
+            <field name="res_model">crm.phonecall2meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall2phonecall2meeting_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file

From 45309dff2c4d5d10376cdec38534d3e7f8c0ab37 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 15:28:20 +0530
Subject: [PATCH 06/56] [IMP] crm: improve the view and fix the probelm of
 leadtopartner wizard

bzr revid: sbh@tinyerp.com-20100309095820-aajs2fedvcglyhjw
---
 addons/crm/wizard/crm_phonecall2phonecall.py  | 1 -
 addons/crm/wizard/crm_phonecall2phonecall.xml | 2 +-
 addons/crm/wizard/lead_to_partner.py          | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index fb7f99f41d2..5fcfc9ecb69 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -57,7 +57,6 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 values['date']=this.date
                 phonecall_proxy = self.pool.get('crm.phonecall')
                 phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
-                  
             value = {            
                 'name': _('Phone Call'),
                 'view_type': 'form',
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
index 421ee7c9748..b4911e48b15 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.xml
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -9,8 +9,8 @@
                 <form string="Schedule Other Call" col="2">
                 		<field name="name"/>
 						<field name="user_id" />
-						<field name="section_id"/>
 						<field name="date" string="Planned Date"/>
+						<field name="section_id"/>
                     <group colspan="2" col="2" >
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
index ad42ee951c7..bafb885ba98 100644
--- a/addons/crm/wizard/lead_to_partner.py
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -56,6 +56,7 @@ class crm_lead2partner(osv.osv_memory):
         partner_obj = self.pool.get('res.partner')
         contact_obj = self.pool.get('res.partner.address')
         rec_ids = context and context.get('record_ids',False)
+        value={}
         for case in case_obj.browse(cr, uid, rec_ids):
             if case.partner_id:
                 raise wizard.except_wizard(_('Warning !'),
@@ -71,7 +72,7 @@ class crm_lead2partner(osv.osv_memory):
             partner_id = partner_ids and partner_ids[0] or False
         if not partner_id:
             value = self._make_partner(cr, uid, ids, context)           
-        return value or {}
+        return value 
 
     def _create_partner(self, cr, uid, ids, context):
         case_obj = self.pool.get('crm.lead')

From 4b8f2856ef4f7fb58a202ae0a11c9b97d61ccb40 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 15:35:20 +0530
Subject: [PATCH 07/56] [Fix] crm: Fix the problem of crm_phonecall_wizard

bzr revid: sbh@tinyerp.com-20100309100520-c33ffn4pcc99xh26
---
 addons/crm/wizard/crm_phonecall_wizard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_phonecall_wizard.py b/addons/crm/wizard/crm_phonecall_wizard.py
index 6ac2f30b994..9fcec41936e 100644
--- a/addons/crm/wizard/crm_phonecall_wizard.py
+++ b/addons/crm/wizard/crm_phonecall_wizard.py
@@ -78,15 +78,15 @@ class partner_create(wizard.interface):
         for case in case_obj.browse(cr, uid, data['ids']):
             if data['form']['action'] == 'create':
                 partner_id = partner_obj.create(cr, uid, {
-                    'name': case.partner_name or case.name,
+                    'name': case.partner_contact or case.name,
                     'user_id': case.user_id.id,
                     'comment': case.description,
                 })
                 contact_id = contact_obj.create(cr, uid, {
                     'partner_id': partner_id,
                     'name': case.name,
-                    'phone': case.phone,
-                    'mobile': case.mobile,
+                    'phone': case.partner_phone,
+                    'mobile': case.partner_mobile,
                     'email': case.email_from
                 })
 

From 56f657ec94abc23bb1c22714cca6a80a67de19ca Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Tue, 9 Mar 2010 16:52:51 +0530
Subject: [PATCH 08/56] [IMP, FIX] board_crm: (1) Renamed
 'board_crm_configuration' to 'board_crm'. (2) Rename menu 'Dashboards > CRM
 Configuration' with 'Dashboards > CRM'. (3) Fixed error of field.

bzr revid: uco@tinyerp.co.in-20100309112251-q5z0ikltbxzyvnnw
---
 addons/{board_crm_configuration => board_crm}/__init__.py     | 0
 addons/{board_crm_configuration => board_crm}/__terp__.py     | 4 ++--
 .../{board_crm_configuration => board_crm}/board_crm_demo.xml | 0
 .../board_crm_statistical_view.xml                            | 4 +---
 .../{board_crm_configuration => board_crm}/board_crm_view.xml | 2 +-
 addons/{board_crm_configuration => board_crm}/i18n/ar.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/bg.po      | 0
 .../i18n/board_crm_configuration.pot                          | 0
 addons/{board_crm_configuration => board_crm}/i18n/bs.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ca.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/cs.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/de.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/el.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/es.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/es_AR.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/et.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/fr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/hr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/hu.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/id.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/it.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ko.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/lt.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/nl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/nl_BE.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/pl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/pt.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/pt_BR.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/ro.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/ru.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sk.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sl.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sq.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/sv.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/tlh.po     | 0
 addons/{board_crm_configuration => board_crm}/i18n/tr.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/uk.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/vi.po      | 0
 addons/{board_crm_configuration => board_crm}/i18n/zh_CN.po   | 0
 addons/{board_crm_configuration => board_crm}/i18n/zh_TW.po   | 0
 addons/crm/report/crm_opportunity_report.py                   | 3 ++-
 41 files changed, 6 insertions(+), 7 deletions(-)
 rename addons/{board_crm_configuration => board_crm}/__init__.py (100%)
 rename addons/{board_crm_configuration => board_crm}/__terp__.py (95%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_demo.xml (100%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_statistical_view.xml (96%)
 rename addons/{board_crm_configuration => board_crm}/board_crm_view.xml (98%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ar.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/bg.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/board_crm_configuration.pot (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/bs.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ca.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/cs.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/de.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/el.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/es.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/es_AR.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/et.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/fr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/hr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/hu.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/id.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/it.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ko.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/lt.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/nl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/nl_BE.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pt.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/pt_BR.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ro.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/ru.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sk.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sl.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sq.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/sv.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/tlh.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/tr.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/uk.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/vi.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/zh_CN.po (100%)
 rename addons/{board_crm_configuration => board_crm}/i18n/zh_TW.po (100%)

diff --git a/addons/board_crm_configuration/__init__.py b/addons/board_crm/__init__.py
similarity index 100%
rename from addons/board_crm_configuration/__init__.py
rename to addons/board_crm/__init__.py
diff --git a/addons/board_crm_configuration/__terp__.py b/addons/board_crm/__terp__.py
similarity index 95%
rename from addons/board_crm_configuration/__terp__.py
rename to addons/board_crm/__terp__.py
index 09bd6e25bc1..1742a491009 100644
--- a/addons/board_crm_configuration/__terp__.py
+++ b/addons/board_crm/__terp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Dashboard for CRM Configuration',
+    'name': 'Dashboard for CRM',
     'version': '1.0',
     'category': 'Board/CRM',
     'description': """
@@ -31,7 +31,7 @@ This module implements a dashboard for CRM that includes:
     * My Meetings (list)
     * Sales Pipeline by Stage (graph)
     * My Cases (list)
-    * Jobs Tracking (graph)
+    * Leads of the month by user (list)
     """,
     'author': 'Tiny',
     'depends': ['board', 'crm'],
diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm/board_crm_demo.xml
similarity index 100%
rename from addons/board_crm_configuration/board_crm_demo.xml
rename to addons/board_crm/board_crm_demo.xml
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml
similarity index 96%
rename from addons/board_crm_configuration/board_crm_statistical_view.xml
rename to addons/board_crm/board_crm_statistical_view.xml
index d6dd5b6d65b..9d738721821 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm/board_crm_statistical_view.xml
@@ -12,7 +12,6 @@
                 <graph string="Leads By Stage" type="pie">
                     <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
@@ -25,7 +24,6 @@
                 <graph string="Opportunities" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
-                    <field name="state" group="True"/>
                 </graph>
             </field>
         </record>
@@ -100,7 +98,7 @@
 
 		<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem
-            name="CRM Configuration" parent="base.dashboard"
+            name="CRM" parent="base.dashboard"
             id="menu_board_crm_config"
             groups="crm.group_crm_manager"/>
         <menuitem
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm/board_crm_view.xml
similarity index 98%
rename from addons/board_crm_configuration/board_crm_view.xml
rename to addons/board_crm/board_crm_view.xml
index b111aabc2b2..8905f9d8530 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm/board_crm_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 	<data>
 		<record model="board.note.type" id="note_crm_type">
-			<field name="name">CRM Configuration</field>
+			<field name="name">CRM</field>
 		</record>
 		
 		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
diff --git a/addons/board_crm_configuration/i18n/ar.po b/addons/board_crm/i18n/ar.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ar.po
rename to addons/board_crm/i18n/ar.po
diff --git a/addons/board_crm_configuration/i18n/bg.po b/addons/board_crm/i18n/bg.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bg.po
rename to addons/board_crm/i18n/bg.po
diff --git a/addons/board_crm_configuration/i18n/board_crm_configuration.pot b/addons/board_crm/i18n/board_crm_configuration.pot
similarity index 100%
rename from addons/board_crm_configuration/i18n/board_crm_configuration.pot
rename to addons/board_crm/i18n/board_crm_configuration.pot
diff --git a/addons/board_crm_configuration/i18n/bs.po b/addons/board_crm/i18n/bs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/bs.po
rename to addons/board_crm/i18n/bs.po
diff --git a/addons/board_crm_configuration/i18n/ca.po b/addons/board_crm/i18n/ca.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ca.po
rename to addons/board_crm/i18n/ca.po
diff --git a/addons/board_crm_configuration/i18n/cs.po b/addons/board_crm/i18n/cs.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/cs.po
rename to addons/board_crm/i18n/cs.po
diff --git a/addons/board_crm_configuration/i18n/de.po b/addons/board_crm/i18n/de.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/de.po
rename to addons/board_crm/i18n/de.po
diff --git a/addons/board_crm_configuration/i18n/el.po b/addons/board_crm/i18n/el.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/el.po
rename to addons/board_crm/i18n/el.po
diff --git a/addons/board_crm_configuration/i18n/es.po b/addons/board_crm/i18n/es.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es.po
rename to addons/board_crm/i18n/es.po
diff --git a/addons/board_crm_configuration/i18n/es_AR.po b/addons/board_crm/i18n/es_AR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/es_AR.po
rename to addons/board_crm/i18n/es_AR.po
diff --git a/addons/board_crm_configuration/i18n/et.po b/addons/board_crm/i18n/et.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/et.po
rename to addons/board_crm/i18n/et.po
diff --git a/addons/board_crm_configuration/i18n/fr.po b/addons/board_crm/i18n/fr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/fr.po
rename to addons/board_crm/i18n/fr.po
diff --git a/addons/board_crm_configuration/i18n/hr.po b/addons/board_crm/i18n/hr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hr.po
rename to addons/board_crm/i18n/hr.po
diff --git a/addons/board_crm_configuration/i18n/hu.po b/addons/board_crm/i18n/hu.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/hu.po
rename to addons/board_crm/i18n/hu.po
diff --git a/addons/board_crm_configuration/i18n/id.po b/addons/board_crm/i18n/id.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/id.po
rename to addons/board_crm/i18n/id.po
diff --git a/addons/board_crm_configuration/i18n/it.po b/addons/board_crm/i18n/it.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/it.po
rename to addons/board_crm/i18n/it.po
diff --git a/addons/board_crm_configuration/i18n/ko.po b/addons/board_crm/i18n/ko.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ko.po
rename to addons/board_crm/i18n/ko.po
diff --git a/addons/board_crm_configuration/i18n/lt.po b/addons/board_crm/i18n/lt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/lt.po
rename to addons/board_crm/i18n/lt.po
diff --git a/addons/board_crm_configuration/i18n/nl.po b/addons/board_crm/i18n/nl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl.po
rename to addons/board_crm/i18n/nl.po
diff --git a/addons/board_crm_configuration/i18n/nl_BE.po b/addons/board_crm/i18n/nl_BE.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/nl_BE.po
rename to addons/board_crm/i18n/nl_BE.po
diff --git a/addons/board_crm_configuration/i18n/pl.po b/addons/board_crm/i18n/pl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pl.po
rename to addons/board_crm/i18n/pl.po
diff --git a/addons/board_crm_configuration/i18n/pt.po b/addons/board_crm/i18n/pt.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt.po
rename to addons/board_crm/i18n/pt.po
diff --git a/addons/board_crm_configuration/i18n/pt_BR.po b/addons/board_crm/i18n/pt_BR.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/pt_BR.po
rename to addons/board_crm/i18n/pt_BR.po
diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm/i18n/ro.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ro.po
rename to addons/board_crm/i18n/ro.po
diff --git a/addons/board_crm_configuration/i18n/ru.po b/addons/board_crm/i18n/ru.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/ru.po
rename to addons/board_crm/i18n/ru.po
diff --git a/addons/board_crm_configuration/i18n/sk.po b/addons/board_crm/i18n/sk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sk.po
rename to addons/board_crm/i18n/sk.po
diff --git a/addons/board_crm_configuration/i18n/sl.po b/addons/board_crm/i18n/sl.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sl.po
rename to addons/board_crm/i18n/sl.po
diff --git a/addons/board_crm_configuration/i18n/sq.po b/addons/board_crm/i18n/sq.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sq.po
rename to addons/board_crm/i18n/sq.po
diff --git a/addons/board_crm_configuration/i18n/sv.po b/addons/board_crm/i18n/sv.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/sv.po
rename to addons/board_crm/i18n/sv.po
diff --git a/addons/board_crm_configuration/i18n/tlh.po b/addons/board_crm/i18n/tlh.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tlh.po
rename to addons/board_crm/i18n/tlh.po
diff --git a/addons/board_crm_configuration/i18n/tr.po b/addons/board_crm/i18n/tr.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/tr.po
rename to addons/board_crm/i18n/tr.po
diff --git a/addons/board_crm_configuration/i18n/uk.po b/addons/board_crm/i18n/uk.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/uk.po
rename to addons/board_crm/i18n/uk.po
diff --git a/addons/board_crm_configuration/i18n/vi.po b/addons/board_crm/i18n/vi.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/vi.po
rename to addons/board_crm/i18n/vi.po
diff --git a/addons/board_crm_configuration/i18n/zh_CN.po b/addons/board_crm/i18n/zh_CN.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_CN.po
rename to addons/board_crm/i18n/zh_CN.po
diff --git a/addons/board_crm_configuration/i18n/zh_TW.po b/addons/board_crm/i18n/zh_TW.po
similarity index 100%
rename from addons/board_crm_configuration/i18n/zh_TW.po
rename to addons/board_crm/i18n/zh_TW.po
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
index 5aa2a91e555..d6d3fb8a95b 100644
--- a/addons/crm/report/crm_opportunity_report.py
+++ b/addons/crm/report/crm_opportunity_report.py
@@ -14,7 +14,8 @@ class crm_opportunity_report(osv.osv):
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
         'stage_id':fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),  
-        'company_id': fields.many2one('res.company', 'Company',readonly=True),  
+        'company_id': fields.many2one('res.company', 'Company',readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),  
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'crm_opportunity_report')

From c5ec09bce6d31b3212351b4a933c211bee0e1d40 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 17:00:37 +0530
Subject: [PATCH 09/56] [Add] crm: add the osv_memeory wizard of
 phonecall2partner

bzr revid: sbh@tinyerp.com-20100309113037-nvkzrjny7b69xd53
---
 addons/crm/__terp__.py                       |   2 +-
 addons/crm/crm_phonecall_view.xml            |   2 +-
 addons/crm/wizard/phonecall2partner.py       | 134 +++++++++++++++++++
 addons/crm/wizard/phonecall2partner_view.xml |  67 ++++++++++
 4 files changed, 203 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/wizard/phonecall2partner.py
 create mode 100644 addons/crm/wizard/phonecall2partner_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 88a01d3285b..d0c954248d0 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -64,7 +64,7 @@ between mails and Open ERP.""",
         'wizard/crm_phonecall2phonecall.xml',
         'wizard/lead_to_partner_view.xml',
         'wizard/phonecall2meeting.xml',
-      #  'wizard/phonecall2partner_view.xml',
+        'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 38d2b6149e9..416e0802b92 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -97,7 +97,7 @@
                     <field name="partner_id" />
                     <button string="Create a Partner"
                         icon="terp-crm"
-                        name="%(wizard_crm_phonecall_partner_create)d"
+                        name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
diff --git a/addons/crm/wizard/phonecall2partner.py b/addons/crm/wizard/phonecall2partner.py
new file mode 100644
index 00000000000..7616a52b53d
--- /dev/null
+++ b/addons/crm/wizard/phonecall2partner.py
@@ -0,0 +1,134 @@
+# -*- 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 mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_phonecall2partner(osv.osv_memory):
+    _name = 'crm.phonecall2partner'
+    _description = 'Phone Call to Partner'
+    
+    _columns = {
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
+        'partner_id': fields.many2one('res.partner','Partner'), 
+    }
+    _defaults = {
+        'action': lambda *a:'exist',
+    }
+    
+    def create_partner(self, cr, uid, ids, context):
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr,uid,[('model','=','crm.phonecall2partner'),('name','=','crm.phonecall2partner.view')])
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.phonecall2partner',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        
+    def selectPartner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('record_ids',False)
+        value={}
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if case.partner_id:
+                raise wizard.except_wizard(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_contact or case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        if not partner_id:
+            value = self._make_partner(cr, uid, ids, context)           
+        return value 
+
+    def _create_partner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.phonecall')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        datas = self.browse(cr, uid, ids)[0]
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('record_ids',False)
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if datas.action == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name': case.partner_contact or case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.partner_phone,
+                    'mobile': case.partner_mobile,
+                    'email': case.email_from
+                })
+
+            else:
+                if datas.partner_id:
+                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, ids, context): 
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+    
+crm_phonecall2partner()
+
diff --git a/addons/crm/wizard/phonecall2partner_view.xml b/addons/crm/wizard/phonecall2partner_view.xml
new file mode 100644
index 00000000000..cad1e421406
--- /dev/null
+++ b/addons/crm/wizard/phonecall2partner_view.xml
@@ -0,0 +1,67 @@
+<openerp>
+  	<data>
+  		<record id="view_crm_phonecall2partner_create" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view.create</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_phonecall2partner_create" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.phonecall2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+	   
+	   <record model="ir.values" id="values_crm_phonecall2partner_create">
+            <field name="model_id" ref="crm.model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Create Partner</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_phonecall2partner_create'))" />
+            <field name="key">action</field>
+            <field name="model">crm.phonecall</field>
+        </record>
+	   
+	   <record id="view_crm_phonecall2partner" model="ir.ui.view">
+	      <field name="name">crm.phonecall2partner.view</field>
+	      <field name="model">crm.phonecall2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_phonecall2partner" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.phonecall2partner</field>
+	      <field name="view_id" ref="view_crm_phonecall2partner"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+ 	</data>
+</openerp>

From d99f306b54f808fb0c50878cde1b072a5f350075 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 17:40:57 +0530
Subject: [PATCH 10/56] [Add] crm: add the osv_memory wizard of
 opportunity2partner and fix the waring to all wizard

bzr revid: sbh@tinyerp.com-20100309121057-s6k80t13rb3t98tf
---
 addons/crm/__terp__.py                        |   1 +
 addons/crm/crm_opportunity_view.xml           |   9 +-
 addons/crm/wizard/__init__.py                 |   1 +
 addons/crm/wizard/lead_to_partner.py          |   2 +-
 addons/crm/wizard/opportunity2partner.py      | 133 ++++++++++++++++++
 .../crm/wizard/opportunity2partner_view.xml   |  67 +++++++++
 addons/crm/wizard/phonecall2partner.py        |   2 +-
 7 files changed, 211 insertions(+), 4 deletions(-)
 create mode 100644 addons/crm/wizard/opportunity2partner.py
 create mode 100644 addons/crm/wizard/opportunity2partner_view.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index d0c954248d0..10b9cb4f5e7 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -66,6 +66,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2meeting.xml',
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
+        'wizard/opportunity2partner_view.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9b6e3739dce..26ac48eefaf 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -72,9 +72,14 @@
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
-                    <group col="2" colspan="2">
-                        <separator colspan="2" string="Contacts"/>
+                    <group col="3" colspan="2">
+                        <separator colspan="3" string="Contacts"/>
                         <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+						<button string="Create a Partner"
+                        icon="terp-crm"
+                        name="%(action_crm_opportunity2partner)d"
+                        type="action"
+                        attrs="{'invisible':[('partner_id','!=',False)]}" />
                         <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
                         <field name="email_from" string="Email"/>
                         <field name="phone"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index d9c1f6b32e9..67c86085467 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -32,6 +32,7 @@ import lead_to_partner
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
+import opportunity2partner
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
index bafb885ba98..4d1a3d5468e 100644
--- a/addons/crm/wizard/lead_to_partner.py
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -59,7 +59,7 @@ class crm_lead2partner(osv.osv_memory):
         value={}
         for case in case_obj.browse(cr, uid, rec_ids):
             if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
+                 raise osv.except_osv(_('Warning !'),
                     _('A partner is already defined on this lead.'))
            
             partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
diff --git a/addons/crm/wizard/opportunity2partner.py b/addons/crm/wizard/opportunity2partner.py
new file mode 100644
index 00000000000..308898f71ad
--- /dev/null
+++ b/addons/crm/wizard/opportunity2partner.py
@@ -0,0 +1,133 @@
+# -*- 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 mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_opportunity2partner(osv.osv_memory):
+    _name = 'crm.opportunity2partner'
+    _description = 'Phone Call to Partner'
+    
+    _columns = {
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
+        'partner_id': fields.many2one('res.partner','Partner'), 
+    }
+    _defaults = {
+        'action': lambda *a:'exist',
+    }
+    
+    def create_partner(self, cr, uid, ids, context):
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr,uid,[('model','=','crm.opportunity2partner'),('name','=','crm.opportunity2partner.view')])
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.opportunity2partner',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        
+    def selectPartner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.opportunity')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('record_ids',False)
+        value={}
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if case.partner_id:
+                raise osv.except_osv(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        if not partner_id:
+            value = self._make_partner(cr, uid, ids, context)           
+        return value 
+
+    def _create_partner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.opportunity')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        datas = self.browse(cr, uid, ids)[0]
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('record_ids',False)
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if datas.action == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name':  case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.phone,
+                    'email': case.email_from
+                })
+
+            else:
+                if datas.partner_id:
+                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, ids, context): 
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+    
+crm_opportunity2partner()
+
diff --git a/addons/crm/wizard/opportunity2partner_view.xml b/addons/crm/wizard/opportunity2partner_view.xml
new file mode 100644
index 00000000000..04401bed80d
--- /dev/null
+++ b/addons/crm/wizard/opportunity2partner_view.xml
@@ -0,0 +1,67 @@
+<openerp>
+  	<data>
+  		<record id="view_crm_opportunity2partner_create" model="ir.ui.view">
+	      <field name="name">crm.opportunity2partner.view.create</field>
+	      <field name="model">crm.opportunity2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_opportunity2partner_create" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.opportunity2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+	   
+	   <record model="ir.values" id="values_crm_phonecall2partner_create">
+            <field name="model_id" ref="crm.model_crm_opportunity" />
+            <field name="object" eval="1" />
+            <field name="name">Create Partner</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_opportunity2partner_create'))" />
+            <field name="key">action</field>
+            <field name="model">crm.opportunity</field>
+        </record>
+	   
+	   <record id="view_crm_opportunity2partner" model="ir.ui.view">
+	      <field name="name">crm.opportunity2partner.view</field>
+	      <field name="model">crm.opportunity2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_opportunity2partner" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.opportunity2partner</field>
+	      <field name="view_id" ref="view_crm_opportunity2partner"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/phonecall2partner.py b/addons/crm/wizard/phonecall2partner.py
index 7616a52b53d..295a46f57a4 100644
--- a/addons/crm/wizard/phonecall2partner.py
+++ b/addons/crm/wizard/phonecall2partner.py
@@ -59,7 +59,7 @@ class crm_phonecall2partner(osv.osv_memory):
         value={}
         for case in case_obj.browse(cr, uid, rec_ids):
             if case.partner_id:
-                raise wizard.except_wizard(_('Warning !'),
+                raise osv.except_osv(_('Warning !'),
                     _('A partner is already defined on this lead.'))
            
             partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_contact or case.name)])            

From 42c1d6d634b72435029c8acd032ec1bb3138af7c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 9 Mar 2010 17:59:38 +0530
Subject: [PATCH 11/56] [Add] crm: add the osv_memory wizard of
 opportunity2meeting

bzr revid: sbh@tinyerp.com-20100309122938-x9a2c1hpnj7llqz3
---
 addons/crm/__terp__.py                        |  1 +
 addons/crm/crm_opportunity_view.xml           |  2 +-
 addons/crm/wizard/__init__.py                 |  1 +
 addons/crm/wizard/opportunity2meeting.py      | 78 +++++++++++++++++++
 addons/crm/wizard/opportunity2meeting.xml     | 25 ++++++
 .../crm/wizard/opportunity2partner_view.xml   |  2 +-
 6 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/wizard/opportunity2meeting.py
 create mode 100644 addons/crm/wizard/opportunity2meeting.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 10b9cb4f5e7..3143972509a 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -67,6 +67,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2partner_view.xml',
         'wizard/phonecall2opportunity.xml',
         'wizard/opportunity2partner_view.xml',
+        'wizard/opportunity2meeting.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 26ac48eefaf..32d2a0ac5a9 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -63,7 +63,7 @@
                     </group>
                     <field name="user_id"/>
                     <button string="Schedule Meeting"
-                        name="%(wizard_crm_opportunity_meeting_set)d" icon="gtk-redo" type="action" />
+                        name="%(opportunity2meeting_act)d" icon="gtk-redo" type="action" />
                     <field name="planned_revenue"/>
                     <field name="probability"/>
                     <field name="date_deadline" string="Expected Closing"/>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 67c86085467..017ffe5b744 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -33,6 +33,7 @@ import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
 import opportunity2partner
+import opportunity2meeting
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/opportunity2meeting.py b/addons/crm/wizard/opportunity2meeting.py
new file mode 100644
index 00000000000..52aee7bd331
--- /dev/null
+++ b/addons/crm/wizard/opportunity2meeting.py
@@ -0,0 +1,78 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_opportunity2meeting(osv.osv_memory):
+    _name = 'crm.opportunity2meeting'
+    _description = 'Opportunity To Meeting'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def _makeMeeting(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            opportunity_case_obj = self.pool.get('crm.opportunity')                
+            data_obj = self.pool.get('ir.model.data')
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            id = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            opportunity = opportunity_case_obj.browse(cr, uid, record_id, context=context)
+            partner_id = opportunity.partner_id and opportunity.partner_id.id or False
+            name = opportunity.name
+            email = opportunity.email_from
+            section_id = opportunity.section_id and opportunity.section_id.id or False        
+            return {            
+                'name': _('Meetings'),
+                'domain' : "[('user_id','=',%s)]"%(uid),  
+                'context': {'default_partner_id': partner_id, 'default_section_id': section_id, 'default_email_from': email, 'default_state':'open', 'default_name':name},
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1,'calendar'),(id2,'form'),(id3,'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': id['res_id']
+                }
+        else:
+            return {}
+                
+crm_opportunity2meeting()
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2meeting.xml b/addons/crm/wizard/opportunity2meeting.xml
new file mode 100644
index 00000000000..39a36df4896
--- /dev/null
+++ b/addons/crm/wizard/opportunity2meeting.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="opportunity2meeting_view">
+            <field name="name">crm.opportunity2meeting.form</field>
+            <field name="model">crm.opportunity2meeting</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Convert To Meeting ">
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="opportunity2meeting_act">
+            <field name="name">Convert To Meeting</field>
+            <field name="res_model">crm.opportunity2meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="opportunity2meeting_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2partner_view.xml b/addons/crm/wizard/opportunity2partner_view.xml
index 04401bed80d..8a3e6780b59 100644
--- a/addons/crm/wizard/opportunity2partner_view.xml
+++ b/addons/crm/wizard/opportunity2partner_view.xml
@@ -19,7 +19,7 @@
 	      <field name="name">Create a Partner</field>
 	      <field name="type">ir.actions.act_window</field>
 	      <field name="res_model">crm.opportunity2partner</field>
-	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_id" ref="view_crm_opportunity2partner_create"/>
 	      <field name="view_type">form</field>
 	      <field name="view_mode">form</field>
 	      <field name="target">new</field>

From 7638ef6d8eb75f2e55900a7a43c64570c4b0e02e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 19:43:53 +0530
Subject: [PATCH 12/56] [IMP]: crm: Improvement in mailgateway script for
 history line

bzr revid: rpa@tinyerp.com-20100309141353-fm5iq1h6cu5vgfb6
---
 .../openerp_mailgate/openerp_mailgate.py      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 85f5d24279d..27b84e4941b 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -29,7 +29,14 @@ import os
 import binascii
 import time, socket
 
-email_re = re.compile(r"[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*\.[a-z]{2,3}",  re.VERBOSE)
+email_re = re.compile(r"""
+    ([a-zA-Z][\w\.-]*[a-zA-Z0-9]     # username part
+    @                                # mandatory @ sign
+    [a-zA-Z0-9][\w\.-]*              # domain must start with a letter ... Ged> why do we include a 0-9 then?
+     \.
+     [a-z]{2,3}                      # TLD
+    )
+    """, re.VERBOSE)
 case_re = re.compile(r"\[([0-9]+)\]", re.UNICODE)
 command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE)
 reference_re = re.compile("<.*-tinycrm-(\\d+)@(.*)>", re.UNICODE)
@@ -124,8 +131,8 @@ class rpc_proxy(object):
         self.passwd = passwd
         self.dbname = dbname
 
-    def __call__(self, *request):
-        return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request)
+    def __call__(self, *request, **kwargs):
+        return self.rpc.execute(self.dbname, self.user_id, self.passwd, *request, **kwargs)
 
 class email_parser(object):
     def __init__(self, uid, password, model, email, email_default, dbname, host, port):        
@@ -169,7 +176,6 @@ class email_parser(object):
             'canal_id': self.canal_id, 
             'user_id': False, 
             'description': message['body'], 
-            'history_line': [(0, 0, {'description': message['body'], 'email': msg['From'] })], 
         }
         try:
             data.update(self.partner_get(self._decode_header(msg['From'])))
@@ -179,7 +185,8 @@ class email_parser(object):
 
         try:
             id = self.rpc(self.model, 'create', data)
-            self.rpc(self.model, 'case_open', [id])    
+            self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
+            self.rpc(self.model, 'case_open', [id])
         except Exception, e:
             if getattr(e, 'faultCode', '') and 'AccessError' in e.faultCode:
                 e = '\n\nThe Specified user does not have an access to the CRM case.'
@@ -268,7 +275,6 @@ class email_parser(object):
 
         data = {
             'description': body['body'], 
-            'history_line': [(0, 0, {'description': body['body'], 'email': msg['From']})], 
         }
         act = 'case_pending'
         if 'state' in actions:
@@ -295,6 +301,7 @@ class email_parser(object):
 
         self.rpc(self.model, act, [id])
         self.rpc(self.model, 'write', [id], data)
+        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -324,9 +331,9 @@ class email_parser(object):
         body2 = '\n'.join(map(lambda l: '> '+l, (body or '').split('\n')))
         data = {
             'description':body, 
-            'history_line': [(0, 0, {'description': body, 'email': msg['From'][:84]})], 
         }
         self.rpc(self.model, 'write', [id], data)
+        self.rpc(self.model, 'history', [id], 'send', False, msg['From'], message['body'])
         return id
 
     def msg_test(self, msg, case_str):
@@ -385,7 +392,6 @@ if __name__ == '__main__':
         "This program parse a mail from standard input and communicate "
         "with the Open ERP server for case management in the CRM module.")
     parser.add_option_group(group)
-
     parser.add_option("-u", "--user", dest="userid", help="ID of the user in Open ERP", default=1, type='int')
     parser.add_option("-p", "--password", dest="password", help="Password of the user in Open ERP", default='admin')
     parser.add_option("-e", "--email", dest="email", help="Email address used in the From field of outgoing messages")

From 9d06d1140d344d1def1b1bdf92c01fbf5dd7adbf Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 9 Mar 2010 19:44:54 +0530
Subject: [PATCH 13/56] [IMP]: crm: added function for history from mailgateway

bzr revid: rpa@tinyerp.com-20100309141454-gxonhn0uocr8xrvm
---
 addons/crm/crm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 6cd8952a804..d61eee136d5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -336,6 +336,12 @@ class crm_case(osv.osv):
             if case.email_from:
                 value['email_from'] = case.email_from
         return {'value': value}
+    
+    def history(self, cr, uid, ids, keyword, history=False, email=False, details=None, context={}):
+        cases = self.browse(cr, uid, ids, context=context)
+        return self.__history(cr, uid, cases, keyword=keyword,\
+                               history=history, email=email, details=details,\
+                               context=context)
 
     def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, context={}):
         model_obj = self.pool.get('ir.model')          

From 5324e660c1fed06564e4e143e9c8a14c3df810ba Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 11:17:17 +0530
Subject: [PATCH 14/56] crm: add the missing file and add the wizard of
 opportunity2phonecall

bzr revid: sbh@tinyerp.com-20100310054717-taqd558s8p75hinr
---
 addons/crm/__terp__.py                        |   1 +
 addons/crm/wizard/__init__.py                 |   1 +
 addons/crm/wizard/crm_phonecall2phonecall.xml |  31 ++++
 addons/crm/wizard/lead_to_partner.py          | 143 ++++++++++++++++++
 addons/crm/wizard/lead_to_partner_view.xml    |  67 ++++++++
 addons/crm/wizard/opportunity2meeting.py      |   2 +-
 addons/crm/wizard/opportunity2meeting.xml     |   2 +-
 addons/crm/wizard/opportunity2phonecall.py    | 105 +++++++++++++
 addons/crm/wizard/opportunity2phonecall.xml   |  31 ++++
 9 files changed, 381 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/wizard/crm_phonecall2phonecall.xml
 create mode 100644 addons/crm/wizard/lead_to_partner.py
 create mode 100644 addons/crm/wizard/lead_to_partner_view.xml
 create mode 100644 addons/crm/wizard/opportunity2phonecall.py
 create mode 100644 addons/crm/wizard/opportunity2phonecall.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 3143972509a..3bcfabd6aa9 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -68,6 +68,7 @@ between mails and Open ERP.""",
         'wizard/phonecall2opportunity.xml',
         'wizard/opportunity2partner_view.xml',
         'wizard/opportunity2meeting.xml',
+        'wizard/opportunity2phonecall.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 017ffe5b744..fac5ce98a26 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -34,6 +34,7 @@ import phonecall2meeting
 import phonecall_to_opportunity
 import opportunity2partner
 import opportunity2meeting
+import opportunity2phonecall
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/wizard/crm_phonecall2phonecall.xml b/addons/crm/wizard/crm_phonecall2phonecall.xml
new file mode 100644
index 00000000000..b4911e48b15
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall2phonecall.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="phonecall_to_phonecall_view">
+            <field name="name">crm.phonecall2phonecall.form</field>
+            <field name="model">crm.phonecall2phonecall</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Schedule Other Call" col="2">
+                		<field name="name"/>
+						<field name="user_id" />
+						<field name="date" string="Planned Date"/>
+						<field name="section_id"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="phonecall_to_phonecall_act">
+            <field name="name">Schedule Other Call</field>
+            <field name="res_model">crm.phonecall2phonecall</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="phonecall_to_phonecall_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
new file mode 100644
index 00000000000..4d1a3d5468e
--- /dev/null
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -0,0 +1,143 @@
+# -*- 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 mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_lead2partner(osv.osv_memory):
+    _name = 'crm.lead2partner'
+    _description = 'Lead to Partner'
+    
+    _columns = {
+        'action': fields.selection([('exist','Link to an existing partner'),('create','Create a new partner')],'Action',required=True),
+        'partner_id': fields.many2one('res.partner','Partner'), 
+    }
+    _defaults = {
+        'action': lambda *a:'exist',
+    }
+    
+    def create_partner(self, cr, uid, ids, context):
+        view_obj = self.pool.get('ir.ui.view')
+        view_id = view_obj.search(cr,uid,[('model','=','crm.lead2partner'),('name','=','crm.lead2partner.view')])
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'view_id': view_id or False,
+            'res_model': 'crm.lead2partner',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+        }
+        
+    def selectPartner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        rec_ids = context and context.get('record_ids',False)
+        value={}
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if case.partner_id:
+                 raise osv.except_osv(_('Warning !'),
+                    _('A partner is already defined on this lead.'))
+           
+            partner_ids = partner_obj.search(cr, uid, [('name', '=', case.partner_name or case.name)])            
+            if not partner_ids and case.email_from:
+                address_ids = contact_obj.search(cr, uid, [('email', '=', case.email_from)])
+                if address_ids:
+                    addresses = contact_obj.browse(cr, uid, address_ids)
+                    partner_ids = addresses and [addresses[0].partner_id.id] or False
+
+            partner_id = partner_ids and partner_ids[0] or False
+        if not partner_id:
+            value = self._make_partner(cr, uid, ids, context)           
+        return value 
+
+    def _create_partner(self, cr, uid, ids, context):
+        case_obj = self.pool.get('crm.lead')
+        partner_obj = self.pool.get('res.partner')
+        contact_obj = self.pool.get('res.partner.address')
+        datas = self.browse(cr, uid, ids)[0]
+        partner_ids = []
+        partner_id = False
+        contact_id = False
+        rec_ids = context and context.get('record_ids',False)
+        for case in case_obj.browse(cr, uid, rec_ids):
+            if datas.action == 'create':
+                partner_id = partner_obj.create(cr, uid, {
+                    'name': case.partner_name or case.name,
+                    'user_id': case.user_id.id,
+                    'comment': case.description,
+                })
+                contact_id = contact_obj.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': case.name,
+                    'phone': case.phone,
+                    'mobile': case.mobile,
+                    'email': case.email_from,
+                    'fax': case.fax,
+                    'title': case.title,
+                    'function': case.function and case.function.id or False,
+                    'street': case.street,
+                    'street2': case.street2,
+                    'zip': case.zip,
+                    'city': case.city,
+                    'country_id': case.country_id and case.country_id.id or False,
+                    'state_id': case.state_id and case.state_id.id or False,
+                })
+
+            else:
+                if datas.partner_id:
+                    partner = partner_obj.browse(cr,uid,datas.partner_id.id)
+                    partner_id = partner.id
+                    contact_id = partner.address and partner.address[0].id
+
+            partner_ids.append(partner_id)
+            vals = {}
+            if partner_id:
+                vals.update({'partner_id': partner_id})
+            if contact_id:
+                vals.update({'partner_address_id': contact_id})
+            case_obj.write(cr, uid, [case.id], vals)   
+        return partner_ids
+
+    def _make_partner(self, cr, uid, ids, context): 
+        partner_ids = self._create_partner(cr, uid, ids, context)
+        mod_obj = self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': partner_ids and int(partner_ids[0]) or False,
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'] 
+        }
+        return value
+    
+crm_lead2partner()
+
diff --git a/addons/crm/wizard/lead_to_partner_view.xml b/addons/crm/wizard/lead_to_partner_view.xml
new file mode 100644
index 00000000000..b11b90bb534
--- /dev/null
+++ b/addons/crm/wizard/lead_to_partner_view.xml
@@ -0,0 +1,67 @@
+<openerp>
+  	<data>
+  		<record id="view_crm_lead2partner_create" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view.create</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="create_partner" string="Create Partner" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_lead2partner_create" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner_create"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+	   
+	   <record model="ir.values" id="values_crm_lead2partner_create">
+            <field name="model_id" ref="crm.model_crm_lead" />
+            <field name="object" eval="1" />
+            <field name="name">Create Partner</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_crm_lead2partner_create'))" />
+            <field name="key">action</field>
+            <field name="model">crm.lead</field>
+        </record>
+	   
+	   <record id="view_crm_lead2partner" model="ir.ui.view">
+	      <field name="name">crm.lead2partner.view</field>
+	      <field name="model">crm.lead2partner</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Create a Partner">
+	      		<field name="action"/>
+	      		<group attrs="{'invisible':[('action','!=','exist')]}">
+		            <field name="partner_id"/>
+		        </group>
+	      		<group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="selectPartner" string="Continue" type="object" icon="gtk-ok"/>
+	      		</group>
+	      	</form>
+	      </field>
+	   </record>
+	   <record id="action_crm_lead2partner" model="ir.actions.act_window">
+	      <field name="name">Create a Partner</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2partner</field>
+	      <field name="view_id" ref="view_crm_lead2partner"/>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_ids' : active_ids}</field>
+	   </record>
+ 	</data>
+</openerp>
diff --git a/addons/crm/wizard/opportunity2meeting.py b/addons/crm/wizard/opportunity2meeting.py
index 52aee7bd331..9c0628429df 100644
--- a/addons/crm/wizard/opportunity2meeting.py
+++ b/addons/crm/wizard/opportunity2meeting.py
@@ -38,7 +38,7 @@ class crm_opportunity2meeting(osv.osv_memory):
     def action_cancel(self, cr, uid, ids, context=None):
         return {'type':'ir.actions.act_window_close'}
 
-    def _makeMeeting(self, cr, uid, ids, context=None):
+    def action_makeMeeting(self, cr, uid, ids, context=None):
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('record_id', False) or False
         if record_id:
diff --git a/addons/crm/wizard/opportunity2meeting.xml b/addons/crm/wizard/opportunity2meeting.xml
index 39a36df4896..a8851c53d2c 100644
--- a/addons/crm/wizard/opportunity2meeting.xml
+++ b/addons/crm/wizard/opportunity2meeting.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Convert To Meeting ">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/opportunity2phonecall.py b/addons/crm/wizard/opportunity2phonecall.py
new file mode 100644
index 00000000000..6bebf5da6be
--- /dev/null
+++ b/addons/crm/wizard/opportunity2phonecall.py
@@ -0,0 +1,105 @@
+# -*- 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 mx.DateTime import now
+
+from osv import osv, fields
+import netsvc
+import ir
+import pooler
+from tools.translate import _
+
+class crm_opportunity2phonecall(osv.osv_memory):
+    _name = 'crm.opportunity2phonecall'
+    _description = 'Opportunity to Phonecall'
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
+        'user_id' : fields.many2one('res.users',"Assign To"),
+        'date': fields.datetime('Date' ,required=True),
+        'section_id':fields.many2one('crm.case.section','Sales Team'),
+
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            opportunity = self.pool.get('crm.opportunity').browse(cr, uid, record_id, context=context)
+            res['name']=opportunity.name
+            res['user_id']=opportunity.user_id and opportunity.user_id.id or False
+            res['section_id']=opportunity.section_id and opportunity.section_id.id or False 
+        return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids[0], context=context)
+        mod_obj =self.pool.get('ir.model.data') 
+        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+        res = mod_obj.read(cr, uid, result, ['res_id'])
+        phonecall_case_obj = self.pool.get('crm.phonecall')
+        opportunity_case_obj = self.pool.get('crm.opportunity') 
+        # Select the view
+        record_id = context and context.get('record_id', False) or False
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
+        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+        opportunites = opportunity_case_obj.browse(cr, uid, [record_id])
+        for opportunity in opportunites:            
+            new_case = phonecall_case_obj.create(cr, uid, {
+                    'name' : opportunity.name,
+                    'case_id' : opportunity.id,
+                    'user_id' : this.user_id,
+                    'categ_id' : opportunity.categ_id,
+                    'description' : opportunity.description,
+                    'date' : this.date,
+                    'section_id' : opportunity.section_id and opportunity.section_id.id or False,
+                    'partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
+                    'partner_address_id':opportunity.partner_address_id and opportunity.partner_address_id.id or False,
+                    'description': opportunity.description or '',
+                    'partner_phone' : opportunity.phone or (opportunity.partner_address_id and opportunity.partner_address_id.phone or False),
+                    'partner_mobile' : opportunity.partner_address_id and opportunity.partner_address_id.mobile or False,
+                    'priority': opportunity.priority,
+                    'opportunity_id':opportunity.id
+            }, context=context)
+            vals = {}
+
+            phonecall_case_obj.case_open(cr, uid, [new_case])        
+            
+        value = {            
+            'name': _('Phone Call'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'crm.phonecall',
+            'res_id' : new_case,
+            'views': [(id3,'form'),(id2,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id']
+        }
+        return value
+        
+    
+crm_opportunity2phonecall()   
\ No newline at end of file
diff --git a/addons/crm/wizard/opportunity2phonecall.xml b/addons/crm/wizard/opportunity2phonecall.xml
new file mode 100644
index 00000000000..9f24e5e37be
--- /dev/null
+++ b/addons/crm/wizard/opportunity2phonecall.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="opportunity2phonecall_view">
+            <field name="name">crm.opportunity2phonecall.form</field>
+            <field name="model">crm.opportunity2phonecall</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Schedule Other Call" col="2">
+                		<field name="name"/>
+						<field name="user_id" />
+						<field name="date" string="Planned Date"/>
+						<field name="section_id"/>
+                    <group colspan="2" col="2" >
+                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                    </group>
+                </form>
+            </field>
+        </record>
+ 		<record model="ir.actions.act_window" id="opportunity2phonecall_act">
+            <field name="name">Schedule Other Call</field>
+            <field name="res_model">crm.opportunity2phonecall</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="opportunity2phonecall_view"/>
+            <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+        </record>
+    </data>
+</openerp>   
\ No newline at end of file

From 3f72e8afc50144c8e65b26486d0e86b369fd6aaa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 11:43:42 +0530
Subject: [PATCH 15/56] [Add] crm: add the missing file

bzr revid: sbh@tinyerp.com-20100310061342-g9ktwu597g9i6u2e
---
 addons/crm/wizard/crm_phonecall2phonecall.py | 88 ++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 addons/crm/wizard/crm_phonecall2phonecall.py

diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
new file mode 100644
index 00000000000..5fcfc9ecb69
--- /dev/null
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -0,0 +1,88 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_phonecall2phonecall(osv.osv_memory):
+    _name = 'crm.phonecall2phonecall'
+    _description = 'Phonecall To Phonecall'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        this = self.browse(cr, uid, ids)[0]
+        values={}
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
+                values['name']=this.name
+                values['user_id']=this.user_id and this.user_id.id
+                values['categ_id']=case.categ_id and case.categ_id.id or False
+                values['section_id']=case.section_id and case.section_id.id or False,
+                values['description']=case.description or ''
+                values['partner_id']=case.partner_id.id
+                values['partner_address_id']=case.partner_address_id.id
+                values['partner_mobile']=case.partner_mobile or False
+                values['priority']=case.priority
+                values['partner_phone']=case.partner_phone or False
+                values['date']=this.date
+                phonecall_proxy = self.pool.get('crm.phonecall')
+                phonecall_id = phonecall_proxy.create(cr, uid, values, context=context)
+            value = {            
+                'name': _('Phone Call'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'crm.phonecall',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'res_id': phonecall_id
+                }
+        return value
+
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
+        'user_id' : fields.many2one('res.users',"Assign To"),
+        'date': fields.datetime('Date'),
+        'section_id':fields.many2one('crm.case.section','Sales Team'),
+
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            phonecall_id = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)
+            res['name']=phonecall_id.name
+            res['user_id']=phonecall_id.user_id and phonecall_id.user_id.id or False
+            res['date']=phonecall_id.date 
+            res['section_id']=phonecall_id.section_id and phonecall_id.section_id.id or False 
+        return res
+crm_phonecall2phonecall()
\ No newline at end of file

From 4859b719225a683a1440942b7afba0acf5fcba72 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 11:51:30 +0530
Subject: [PATCH 16/56] [FIX]: crm: solved problem of datetime in crm.py

bzr revid: rpa@tinyerp.com-20100310062130-gocgnacbvmztyw66
---
 addons/crm/crm.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d61eee136d5..1742f4856c2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -19,14 +19,6 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-import base64
-import tools
-import mx.DateTime
-import datetime
-
 from datetime import datetime
 from datetime import timedelta
 from osv import fields
@@ -34,7 +26,12 @@ from osv import orm
 from osv import osv
 from osv.orm import except_orm
 from tools.translate import _
-
+import base64
+import mx.DateTime
+import os
+import re
+import time
+import tools
 
 
 MAX_LEVEL = 15

From 0f0e3ccb96b2c5173c7637906082ccaa057436b4 Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Wed, 10 Mar 2010 11:55:59 +0530
Subject: [PATCH 17/56] [IMP]: crm(lead): Added 2 function fields to compute
 days to Open and days to close the lead

bzr revid: rpa@tinyerp.com-20100310062559-l73a200pue9mezyk
---
 addons/crm/crm_lead.py       | 67 +++++++++++++++++++++++++++++-------
 addons/crm/crm_lead_view.xml |  5 +++
 2 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index da9f2ed7230..6424030dc66 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,28 +19,69 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import fields, osv, orm
+from datetime import datetime, timedelta
 import crm
+import math
 
 class crm_lead(osv.osv):
     _name = "crm.lead"
     _description = "Leads Cases"
     _order = "priority desc, id desc"
-    _inherit = ['res.partner.address','crm.case']
+    _inherit = ['res.partner.address', 'crm.case']
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.lead')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
-        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Lead Name", size=64),
+        'categ_id': fields.many2one('crm.case.categ', 'Lead Source', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
+        'partner_name': fields.char("Lead Name", size=64), 
 
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"),
-        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.lead')]"), 
+        'opportunity_id': fields.many2one('crm.opportunity', 'Opportunity'), 
+
+        'user_id': fields.many2one('res.users', 'Salesman'), 
+        'referred': fields.char('Referred By', size=32), 
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True), 
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True), 
+        }
 
-        'user_id': fields.many2one('res.users', 'Salesman'),
-        'referred': fields.char('Referred By', size=32),
-    }
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 
     }
+
 crm_lead()
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 61763ce41ce..508929c7ec1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -155,6 +155,11 @@
                         <field name="write_date"/>
                         <field name="date_closed"/>
                     </group>
+                    <group colspan="2" col="2">
+                        <separator string="Statistics" colspan="2" col="2"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
+                    </group>
                  </page>
                 </notebook>
             </form>

From a36a2c70c1e4a50cd616f0db05433d213c3e5de5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 12:16:24 +0530
Subject: [PATCH 18/56] [IMP] crm: improve the view of opportunity2phonecall
 and fix the field value in wizard

bzr revid: sbh@tinyerp.com-20100310064624-dlwt4rh32kl2ooqn
---
 addons/crm/crm_opportunity_view.xml         | 2 +-
 addons/crm/wizard/__init__.py               | 3 ++-
 addons/crm/wizard/opportunity2phonecall.py  | 9 ++++-----
 addons/crm/wizard/opportunity2phonecall.xml | 8 +++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 32d2a0ac5a9..d05de45790e 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -68,7 +68,7 @@
                     <field name="probability"/>
                     <field name="date_deadline" string="Expected Closing"/>
                     <button string="Schedule Call"
-                        name="%(wizard_crm_opportunity_reschedule_phone_call)d" icon="gtk-redo" type="action"  />
+                        name="%(opportunity2phonecall_act)d" icon="gtk-redo" type="action"  />
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index fac5ce98a26..72dfccad6de 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -26,9 +26,10 @@ import crm_phonecall_wizard
 import wizard_crm_send_email
 import wizard_crm_new_send_email
 import wizard_history_event
-import crm_phonecall2phonecall
+
 
 import lead_to_partner
+import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
 import phonecall_to_opportunity
diff --git a/addons/crm/wizard/opportunity2phonecall.py b/addons/crm/wizard/opportunity2phonecall.py
index 6bebf5da6be..25ac0d43524 100644
--- a/addons/crm/wizard/opportunity2phonecall.py
+++ b/addons/crm/wizard/opportunity2phonecall.py
@@ -71,15 +71,14 @@ class crm_opportunity2phonecall(osv.osv_memory):
         for opportunity in opportunites:            
             new_case = phonecall_case_obj.create(cr, uid, {
                     'name' : opportunity.name,
-                    'case_id' : opportunity.id,
-                    'user_id' : this.user_id,
-                    'categ_id' : opportunity.categ_id,
-                    'description' : opportunity.description,
+                    'case_id' : opportunity.id ,
+                    'user_id' : this.user_id and this.user_id.id or Flase,
+                    'categ_id' : opportunity.categ_id and opportunity.categ_id.id or Flase,
+                    'description' : opportunity.description or False,
                     'date' : this.date,
                     'section_id' : opportunity.section_id and opportunity.section_id.id or False,
                     'partner_id': opportunity.partner_id and opportunity.partner_id.id or False,
                     'partner_address_id':opportunity.partner_address_id and opportunity.partner_address_id.id or False,
-                    'description': opportunity.description or '',
                     'partner_phone' : opportunity.phone or (opportunity.partner_address_id and opportunity.partner_address_id.phone or False),
                     'partner_mobile' : opportunity.partner_address_id and opportunity.partner_address_id.mobile or False,
                     'priority': opportunity.priority,
diff --git a/addons/crm/wizard/opportunity2phonecall.xml b/addons/crm/wizard/opportunity2phonecall.xml
index 9f24e5e37be..4823e54ce7f 100644
--- a/addons/crm/wizard/opportunity2phonecall.xml
+++ b/addons/crm/wizard/opportunity2phonecall.xml
@@ -6,12 +6,14 @@
             <field name="model">crm.opportunity2phonecall</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Schedule Other Call" col="2">
+                <form string="Schedule Other Call">
+					<group colspan="2" >
                 		<field name="name"/>
+                		<field name="date" string="Planned Date"/>
+                		<newline/>
 						<field name="user_id" />
-						<field name="date" string="Planned Date"/>
 						<field name="section_id"/>
-                    <group colspan="2" col="2" >
+						<label string ="" colspan="2"/>
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
                     </group>

From de122606b07e9f5e8de698a27078a0cc1d0c09e8 Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Wed, 10 Mar 2010 12:44:57 +0530
Subject: [PATCH 19/56] [IMP]: crm(opportunity), project_issue: Added 2
 function fields to compute days to Open and days to close the opportunity and
 issue

bzr revid: rpa@tinyerp.com-20100310071457-78269x47pg5py0fd
---
 addons/crm/crm_opportunity.py               | 48 +++++++++++++++--
 addons/crm/crm_opportunity_view.xml         |  2 +
 addons/project_issue/project_issue.py       | 59 +++++++++++++++++----
 addons/project_issue/project_issue_view.xml |  2 +
 4 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index ea70e850ed8..d2fff629c5a 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from datetime import datetime
 from osv import fields,osv,orm
 import crm
 
@@ -35,6 +36,39 @@ class crm_opportunity(osv.osv):
     _description = "Opportunity Cases"
     _order = "id desc"
     _inherit = 'crm.case'
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.opportunity')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'crm.opportunity')]"),
@@ -52,7 +86,13 @@ class crm_opportunity(osv.osv):
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
-    }
+
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True),
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True),
+       }
+
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
         if not stage_id:
             return {'value':{}}
@@ -64,16 +104,16 @@ class crm_opportunity(osv.osv):
     def stage_next(self, cr, uid, ids, context={}):
         res = super(crm_opportunity, self).stage_next(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
-            if case.stage_id and case.stage_id.on_change:                                
+            if case.stage_id and case.stage_id.on_change:
                 self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
         return res
 
     def stage_previous(self, cr, uid, ids, context={}):
         res = super(crm_opportunity, self).stage_previous(cr, uid, ids, context=context)
         for case in self.browse(cr, uid, ids, context):
-            if case.stage_id and case.stage_id.on_change:                                
+            if case.stage_id and case.stage_id.on_change:
                 self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
-        return res 
+        return res
 
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.opportunity', context=c),
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index d05de45790e..f1faf00ad5d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -117,6 +117,8 @@
                     <group col="2" colspan="2">
                         <separator string="Misc" colspan="2"/>
                         <field name="active"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
                     </group>
                     <separator colspan="4" string="References"/>
                     <field name="ref"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f0441c0263c..cfb6961d112 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -29,8 +29,10 @@ from tools.translate import _
 import tools
 from osv import fields,osv,orm
 from osv.orm import except_orm
+from datetime import datetime, timedelta
 
 from crm import crm
+import time
 
 
 class project_issue(osv.osv):
@@ -38,6 +40,39 @@ class project_issue(osv.osv):
     _description = "Project Issue"
     _order = "priority, id desc"
     _inherit = 'crm.case'
+
+    def _compute_openday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'project.issue')])
+            log_obj = self.pool.get('crm.case.log')
+            hist_id = log_obj.search(cr, uid, [('model_id', '=', model_id[0]), \
+                                                     ('res_id', '=', r.id), \
+                                                     ('name', '=', 'Open')])
+
+            if hist_id:
+                # Considering last log for opening case
+                log = log_obj.browse(cr, uid, hist_id[-1])
+                date_lead_open = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_log_open = datetime.strptime(log.date, "%Y-%m-%d %H:%M:%S")
+                ans = date_lead_open - date_log_open
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
+    def _compute_closeday(self, cr, uid, ids, name, args, context={}):
+        result = {}
+        for r in self.browse(cr, uid, ids , context):
+            result[r.id] = 0
+            if r.date_closed:
+                date_create = datetime.strptime(r.create_date, "%Y-%m-%d %H:%M:%S")
+                date_close = datetime.strptime(r.date_closed, "%Y-%m-%d %H:%M:%S")
+                ans = date_close - date_create
+                duration =  float(ans.days) + (float(ans.seconds) / 86400)
+                result[r.id] = abs(int(duration))
+        return result
+
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
@@ -59,27 +94,31 @@ class project_issue(osv.osv):
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'project_id':fields.many2one('project.project', 'Project'),
-        'duration': fields.float('Duration'),        
+        'duration': fields.float('Duration'),
         'probability': fields.float('Probability (%)'),
-        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]")
+        'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
+        'day_open': fields.function(_compute_openday, string='Days to Open', \
+                                method=True, type="integer", store=True),
+        'day_close': fields.function(_compute_closeday, string='Days to Close', \
+                                method=True, type="integer", store=True),
     }
 
     def _get_project(self, cr, uid, context):
        user = self.pool.get('res.users').browse(cr,uid,uid, context=context)
        if user.context_project_id:
            return user.context_project_id
-       return False  
+       return False
 
     def _convert(self, cr, uid, ids, xml_id, context=None):
         data_obj = self.pool.get('ir.model.data')
-        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)        
+        id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id)
         categ_id = False
         if id2:
-            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id    
+            categ_id = data_obj.browse(cr, uid, id2, context=context).res_id
         if categ_id:
             self.write(cr, uid, ids, {'categ_id': categ_id})
         return True
-   
+
     def convert_to_feature(self, cr, uid, ids, context=None):
         return self._convert(cr, uid, ids, 'feature_request_categ', context=context)
 
@@ -95,10 +134,10 @@ class project_issue(osv.osv):
         return {'value':{'probability':stage.probability}}
 
     _defaults = {
-           'project_id':_get_project,    
-           'probability':lambda *a:0.0,       
-           'planned_cost':lambda *a:0.0,    
-           'planned_revenue':lambda *a:0.0,    
+           'project_id':_get_project,
+           'probability':lambda *a:0.0,
+           'planned_cost':lambda *a:0.0,
+           'planned_revenue':lambda *a:0.0,
           }
 
 project_issue()
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 305db272f4c..8d6bbae0b5a 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -97,6 +97,8 @@
                     <separator colspan="4" string="Dates"/>
                     <field name="create_date"/>
                     <field name="date_closed"/>
+                    <field name="day_open"/>
+                    <field name="day_close"/>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_revenue"/>
                     <field name="planned_cost"/>

From 41901b83ed0623ed07b7bb3497bda0464bb0f85c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 14:19:23 +0530
Subject: [PATCH 20/56] [FIX]: mrp: Fixed problem of mrp root menu

bzr revid: rpa@tinyerp.com-20100310084923-z03xw5tjxczomj8r
---
 addons/mrp/schedulers_all.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/schedulers_all.xml b/addons/mrp/schedulers_all.xml
index 246732cddbe..84d6be3cbd4 100644
--- a/addons/mrp/schedulers_all.xml
+++ b/addons/mrp/schedulers_all.xml
@@ -42,7 +42,7 @@
             <field name="model">mrp.procurement</field>
         </record>
         
-        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="menu_mrp_root" sequence="4"/>
+        <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
         <menuitem action="action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
 		
 	</data>

From d6eb52eb5e65cb7d283a58c8b562c5c1f157332a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 14:20:16 +0530
Subject: [PATCH 21/56] [IMP]: sale: Converted wizards to osv_memory wizards

bzr revid: rpa@tinyerp.com-20100310085016-ww0jyuowcqib3zdd
---
 addons/sale/__terp__.py                       |   6 +-
 addons/sale/sale_view.xml                     |  17 +-
 addons/sale/sale_wizard.xml                   |  18 +-
 addons/sale/wizard/__init__.py                |  11 +-
 addons/sale/wizard/make_invoice_advance.py    | 157 ------------------
 addons/sale/wizard/sale_line_invoice.py       | 100 +++++++++++
 addons/sale/wizard/sale_line_invoice.xml      |  40 +++++
 .../sale/wizard/sale_make_invoice_advance.py  | 154 +++++++++++++++++
 .../sale/wizard/sale_make_invoice_advance.xml |  70 ++++++++
 .../sale/wizard/wizard_sale_line_invoice.py   | 121 --------------
 10 files changed, 396 insertions(+), 298 deletions(-)
 delete mode 100644 addons/sale/wizard/make_invoice_advance.py
 create mode 100644 addons/sale/wizard/sale_line_invoice.py
 create mode 100644 addons/sale/wizard/sale_line_invoice.xml
 create mode 100644 addons/sale/wizard/sale_make_invoice_advance.py
 create mode 100644 addons/sale/wizard/sale_make_invoice_advance.xml
 delete mode 100644 addons/sale/wizard/wizard_sale_line_invoice.py

diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index 70d9f084afb..f08a548fcf7 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -45,6 +45,8 @@
     'depends': ['product', 'stock', 'mrp', 'process'],
     'init_xml': [],
     'update_xml': [
+        'wizard/sale_make_invoice_advance.xml',
+        'wizard/sale_line_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
         'sale_workflow.xml',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index b3cec7496e4..2508ae0d6df 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -149,7 +149,12 @@
                                             <field name="state" select="2"/>
                                             <group col="3" colspan="2">
                                                 <field name="invoiced" select="2"/>
-                                                <button colspan="1" name="%(wizard_sale_order_line_invoice)d" states="confirmed" string="Make Invoice" type="action" icon="gtk-print"/>
+                                                <button colspan="1"
+                                                	name="%(action_view_sale_order_line_make_invoice)d"
+                                                	states="confirmed"
+                                                	string="Make Invoice"
+                                                	type="action"
+                                                	icon="gtk-print" />
                                             </group>
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
@@ -379,8 +384,14 @@
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">
-                                <button name="button_done" states="confirmed,exception" string="Done" type="object" icon="gtk-jump-to"/>
-                                <button name="button_cancel" states="confirmed,exception" string="Cancel" type="object" icon="gtk-cancel" />
+                                <button name="button_done"
+                                	states="confirmed,exception"
+                                	string="Done" type="object"
+                                	icon="gtk-jump-to" />
+                                <button name="button_cancel"
+                                	states="confirmed,exception"
+                                	string="Cancel" type="object"
+                                	icon="gtk-cancel" />
                             </group>
                         </page>
                         <page string="Properties">
diff --git a/addons/sale/sale_wizard.xml b/addons/sale/sale_wizard.xml
index 9df05e8e5dd..c364c419857 100644
--- a/addons/sale/sale_wizard.xml
+++ b/addons/sale/sale_wizard.xml
@@ -10,19 +10,19 @@
             multi="True"
             string="Make invoices"/>
 
-        <wizard
-            id="wizard_sale_order_line_invoice"
-            keyword="client_action_multi"
-            model="sale.order.line"
-            name="sale.order.line.make_invoice"
-            multi="True"
-            string="Make invoices"/>
+<!--        <wizard-->
+<!--            id="wizard_sale_order_line_invoice"-->
+<!--            keyword="client_action_multi"-->
+<!--            model="sale.order.line"-->
+<!--            name="sale.order.line.make_invoice"-->
+<!--            multi="True"-->
+<!--            string="Make invoices"/>-->
 
-        <wizard string="Advance Invoice"
+      <!--   <wizard string="Advance Invoice"
             model="sale.order"
             name="sale.advance_payment_inv"
             id="sale.advance_payment"
-            menu="True"/>
+            menu="True"/> -->
 
     </data>
 </openerp>
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 6141e90b83b..07c5ceea83d 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,12 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-from make_invoice import make_invoice
+#remaining make_invoice
+import sale_line_invoice
+import sale_make_invoice_advance
 
-import wizard_sale_line_invoice
-import make_invoice_advance
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
deleted file mode 100644
index eaa1fc4a14b..00000000000
--- a/addons/sale/wizard/make_invoice_advance.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-from osv import fields, osv
-from tools.translate import _
-
-form = """<?xml version="1.0"?>
-<form string="Advance Payment">
-    <field name="product_id"/>
-    <newline />
-    <field name="qtty"/>
-    <field name="amount"/>
-    <newline />
-</form>
-"""
-fields = {
-        'product_id': {'string':'Product', 'type':'many2one','relation':'product.product','required':True},
-        'amount': {'string':'Unit Price', 'type':'float', 'size':(16,2),'required':True},
-        'qtty': {'string':'Quantity', 'type':'float', 'size':(16,2),'required':True, 'default': lambda *a: 1},
-}
-
-form_msg = """<?xml version="1.0"?>
-<form string="Invoices">
-   <label string="You invoice has been successfully created !"/>
-</form>
-"""
-fields_msg = {}
-
-def _createInvoices(self, cr, uid, data, context={}):
-    list_inv = []
-    pool_obj = pooler.get_pool(cr.dbname)
-    obj_sale = pool_obj.get('sale.order')
-    data_sale = obj_sale.browse(cr,uid,data['ids'])
-    obj_lines = pool_obj.get('account.invoice.line')
-    for sale in data_sale:
-        address_contact = False
-        address_invoice = False
-        create_ids = []
-        ids_inv = []
-        if sale.order_policy == 'postpaid':
-            raise osv.except_osv(
-                _('Error'),
-                _("You cannot make an advance on a sale order that is defined as 'Automatic Invoice after delivery'."))
-        val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
-        line_id =obj_lines.create(cr, uid, {
-            'name': val['value']['name'],
-            'account_id':val['value']['account_id'],
-            'price_unit': data['form']['amount'],
-            'quantity': data['form']['qtty'],
-            'discount': False,
-            'uos_id': val['value']['uos_id'],
-            'product_id':data['form']['product_id'],
-            'invoice_line_tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            'account_analytic_id': sale.project_id and sale.project_id.id or False,
-            'note':'',
-        })
-        create_ids.append(line_id)
-        inv = {
-            'name': sale.name,
-            'origin': sale.name,
-            'type': 'out_invoice',
-            'reference': False,
-            'account_id': sale.partner_id.property_account_receivable.id,
-            'partner_id': sale.partner_id.id,
-            'address_invoice_id':sale.partner_invoice_id.id,
-            'address_contact_id':sale.partner_order_id.id,
-            'invoice_line': [(6,0,create_ids)],
-            'currency_id' :sale.pricelist_id.currency_id.id,
-            'comment': '',
-            'payment_term':sale.payment_term.id,
-            'fiscal_position': sale.partner_id.property_account_position.id
-            }
-        inv_obj = pool_obj.get('account.invoice')
-        inv_id = inv_obj.create(cr, uid, inv)
-
-        for inv in sale.invoice_ids:
-            ids_inv.append(inv.id)
-        ids_inv.append(inv_id)
-        obj_sale.write(cr,uid,sale.id,{'invoice_ids':[(6,0,ids_inv)]})
-        list_inv.append(inv_id)
-#
-# If invoice on picking: add the cost on the SO
-# If not, the advance will be deduced when generating the final invoice
-#
-        if sale.order_policy=='picking':
-            pool_obj.get('sale.order.line').create(cr, uid, {
-                'order_id': sale.id,
-                'name': val['value']['name'],
-                'price_unit': -data['form']['amount'],
-                'product_uom_qty': data['form']['qtty'],
-                'product_uos_qty': data['form']['qtty'],
-                'product_uos': val['value']['uos_id'],
-                'product_uom': val['value']['uos_id'],
-                'product_id':data['form']['product_id'],
-                'discount': False,
-                'tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-            }, context)
-    return {'invoice_ids':list_inv}
-
-class sale_advance_payment(wizard.interface):
-    def _open_invoice(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        mod_obj = pool_obj.get('ir.model.data') 
-        result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])        
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','invoice_form')])
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
-        return {
-            'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
-            'name': 'Invoices',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'views': [(False,'tree'),(resource_id,'form')],
-            'context': "{'type':'out_invoice'}",
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-        }
-
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'form' ,   'arch' : form,'fields' : fields,'state' : [('end','Cancel','gtk-cancel'),('create','Create Advance Invoice','gtk-ok')]}
-        },
-        'create': {
-            'actions': [_createInvoices],
-            'result': {'type' : 'form' ,'arch' : form_msg,'fields' : fields_msg, 'state':[('end','Close','gtk-close'),('open','Open Advance Invoice','gtk-open')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type':'action', 'action':_open_invoice, 'state':'end'}
-        }
-    }
-
-sale_advance_payment("sale.advance_payment_inv")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
new file mode 100644
index 00000000000..7dd7fef78cb
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -0,0 +1,100 @@
+# -*- 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 fields, osv
+from service import web_services
+import wizard
+import netsvc
+import ir
+import pooler
+
+class sale_order_line_make_invoice(osv.osv_memory):
+    _name = "sale.order.line.make.invoice"
+    _description = "Sale OrderLine Make_invoice"
+    _columns = {
+        'grouped': fields.boolean('Group the invoices'),
+    }
+    _default = {
+        'grouped' : lambda *a: False
+               }
+
+    def makeInvoices(self, cr, uid, ids, context):
+        res = False
+        invoices = {}
+
+    #TODO: merge with sale.py/make_invoice
+        def make_invoice(order, lines):
+            a = order.partner_id.property_account_receivable.id
+            if order.partner_id and order.partner_id.property_payment_term.id:
+                pay_term = order.partner_id.property_payment_term.id
+            else:
+                pay_term = False
+            inv = {
+                'name': order.name,
+                'origin': order.name,
+                'type': 'out_invoice',
+                'reference': "P%dSO%d" % (order.partner_id.id, order.id),
+                'account_id': a,
+                'partner_id': order.partner_id.id,
+                'address_invoice_id': order.partner_invoice_id.id,
+                'address_contact_id': order.partner_invoice_id.id,
+                'invoice_line': [(6,0,lines)],
+                'currency_id' : order.pricelist_id.currency_id.id,
+                'comment': order.note,
+                'payment_term': pay_term,
+                'fiscal_position': order.partner_id.property_account_position.id
+            }
+            inv_id = self.pool.get('account.invoice').create(cr, uid, inv)
+            return inv_id
+
+        for line in self.pool.get('sale.order.line').browse(cr,uid,context['active_ids']):
+            if (not line.invoiced) and (line.state not in ('draft','cancel')):
+                if not line.order_id.id in invoices:
+                    invoices[line.order_id.id] = []
+                line_id = self.pool.get('sale.order.line').invoice_line_create(cr, uid,
+                        [line.id])
+                for lid in line_id:
+                    invoices[line.order_id.id].append((line, lid))
+                self.pool.get('sale.order.line').write(cr, uid, [line.id],
+                        {'invoiced': True})
+            flag = True
+            data_sale = self.pool.get('sale.order').browse(cr,uid,line.order_id.id)
+            for line in data_sale.order_line:
+                if not line.invoiced:
+                    flag = False
+                    break
+            if flag:
+                wf_service = netsvc.LocalService('workflow')
+                wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
+                self.pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
+
+        for result in invoices.values():
+            order = result[0][0].order_id
+            il = map(lambda x: x[1], result)
+            res = make_invoice(order, il)
+            cr.execute('INSERT INTO sale_order_invoice_rel \
+                    (order_id,invoice_id) values (%s,%s)', (order.id, res))
+        return {}
+
+
+sale_order_line_make_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
new file mode 100644
index 00000000000..823b5a04662
--- /dev/null
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_order_line_make_invoice" model="ir.ui.view">
+            <field name="name">Sale OrderLine Make Invoice</field>
+            <field name="model">sale.order.line.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Create invoices">
+    			<separator colspan="4" string="Do you really want to create the invoices ?" />
+    			<field name="grouped" />
+             	<separator string="" colspan="6" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="makeInvoices" string="Create Invoices" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_order_line_make_invoice" model="ir.actions.act_window">
+            <field name="name">Make Invoices</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order.line.make.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    		<field name="context">{'record_id' : active_id}</field>
+     	</record>
+
+        <record model="ir.values" id="sale_make_invoice">
+            <field name="model_id" ref="sale.model_sale_order_line" />
+            <field name="object" eval="1" />
+            <field name="name">Make Invoices</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_order_line_make_invoice'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order.line</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
new file mode 100644
index 00000000000..9a079c4f8ec
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -0,0 +1,154 @@
+##############################################################################
+#
+#    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 fields, osv
+from service import web_services
+from tools.translate import _
+import ir
+import netsvc
+import pooler
+import wizard
+
+
+class sale_advance_payment_inv(osv.osv_memory):
+    _name = "sale.advance.payment.inv"
+    _description = "Sale Advance Payment Invoice"
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'amount': fields.float('Unit Price', size=(16, 2), required=True),
+        'qtty': fields.float('Quantity', size=(16, 2), required=True),
+    }
+    _default = {
+        'qtty' : lambda *a: 1
+               }
+    def createInvoices(self, cr, uid, ids, context={}):
+        list_inv = []
+        obj_sale = self.pool.get('sale.order')
+        obj_lines = self.pool.get('account.invoice.line')
+        for sale_adv_obj in self.browse(cr, uid, ids):
+            for sale in obj_sale.browse(cr, uid, context['active_ids']):
+                address_contact = False
+                address_invoice = False
+                create_ids = []
+                ids_inv = []
+                if sale.order_policy == 'postpaid':
+                    raise osv.except_osv(
+                        _('Error'),
+                        _("You cannot make an advance on a sale order \
+                             that is defined as 'Automatic Invoice after delivery'."))
+                val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
+                        uom = False, partner_id = sale.partner_id.id, fposition_id=sale.fiscal_position.id)
+                line_id =obj_lines.create(cr, uid, {
+                    'name': val['value']['name'],
+                    'account_id': val['value']['account_id'],
+                    'price_unit': sale_adv_obj.amount,
+                    'quantity': sale_adv_obj.qtty,
+                    'discount': False,
+                    'uos_id': val['value']['uos_id'],
+                    'product_id': sale_adv_obj.product_id.id,
+                    'invoice_line_tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    'account_analytic_id': sale.project_id.id or False,
+                    #'note':'',
+                })
+                create_ids.append(line_id)
+                inv = {
+                    'name': sale.name,
+                    'origin': sale.name,
+                    'type': 'out_invoice',
+                    'reference': False,
+                    'account_id': sale.partner_id.property_account_receivable.id,
+                    'partner_id': sale.partner_id.id,
+                    'address_invoice_id':sale.partner_invoice_id.id,
+                    'address_contact_id':sale.partner_order_id.id,
+                    'invoice_line': [(6, 0, create_ids)],
+                    'currency_id' :sale.pricelist_id.currency_id.id,
+                    'comment': '',
+                    'payment_term':sale.payment_term.id,
+                    'fiscal_position': sale.partner_id.property_account_position.id
+                    }
+                inv_obj = self.pool.get('account.invoice')
+                inv_id = inv_obj.create(cr, uid, inv)
+
+                for inv in sale.invoice_ids:
+                    ids_inv.append(inv.id)
+                ids_inv.append(inv_id)
+                obj_sale.write(cr, uid, sale.id, {'invoice_ids':[(6, 0, ids_inv)]})
+                list_inv.append(inv_id)
+        #
+        # If invoice on picking: add the cost on the SO
+        # If not, the advance will be deduced when generating the final invoice
+        #
+                if sale.order_policy=='picking':
+                    self.pool.get('sale.order.line').create(cr, uid, {
+                        'order_id': sale.id,
+                        'name': val['value']['name'],
+                        'price_unit': -sale_adv_obj.amount,
+                        'product_uom_qty': sale_adv_obj.qtty,
+                        'product_uos_qty': sale_adv_obj.qtty,
+                        'product_uos': val['value']['uos_id'],
+                        'product_uom': val['value']['uos_id'],
+                        'product_id': sale_adv_obj.product_id.id,
+                        'discount': False,
+                        'tax_id': [(6, 0, val['value']['invoice_line_tax_id'])],
+                    }, context)
+
+        return {#'invoice_ids':list_inv,
+                'name': 'Open Invoice',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'sale.open.invoice',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'context': "{'invoice_ids'=%s}" % (list_inv)
+                }
+
+sale_advance_payment_inv()
+
+class sale_open_invoice(osv.osv_memory):
+    _name = "sale.open.invoice"
+    _description = "Sale Open Invoice"
+    _columns = {
+    }
+
+    def open_invoice(self, cr, uid, ids, context):
+        mod_obj = self.pool.get('ir.model.data')
+        invoices = []
+        #TODO: Can not get invoice ids here
+        for advance_pay in self.browse(cr, uid, ids):
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            model_data_ids = self.pool.get('ir.model.data').search(cr, uid,
+                             [('model', '=', 'ir.ui.view'), ('name', '=', 'invoice_form')])
+            resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids,
+                                            fields=['res_id'])[0]['res_id']
+        return {
+#            'domain': "[('id','in', ["+','.join(map(str, invoices))+"])]", # TODO
+            'name': 'Invoices',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.invoice',
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'context': "{'type':'out_invoice'}",
+            'type': 'ir.actions.act_window',
+            'search_view_id': id['res_id']
+         }
+sale_open_invoice()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
new file mode 100644
index 00000000000..eb333f42b64
--- /dev/null
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_sale_advance_payment_inv" model="ir.ui.view">
+            <field name="name">Sale Advance Payment Invoive</field>
+            <field name="model">sale.advance.payment.inv</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Advance Payment">
+			    <field name="product_id"/>
+			    <newline />
+			    <field name="qtty"/>
+			    <field name="amount"/>
+			    <newline />
+             	<separator string="" colspan="4"/>
+             	<label string=""  colspan="2" />
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="createInvoices" string="Create Advance Invoice" type="object" icon="gtk-ok"/>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
+            <field name="name">Advance Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.advance.payment.inv</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+     		<field name="context">{'record_id' : active_id}</field>
+     	</record>
+
+    	 <record model="ir.values" id="sale_advance_payment_inv1">
+            <field name="model_id" ref="sale.model_sale_order" />
+            <field name="object" eval="1" />
+            <field name="name">Advance Invoice</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_sale_advance_payment_inv'))" />
+            <field name="key">action</field>
+            <field name="model">sale.order</field>
+        </record>
+
+
+    	<record id="view_sale_open_invoice" model="ir.ui.view">
+            <field name="name">Open Invoice</field>
+            <field name="model">sale.open.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+             <form string="Invoices">
+             	<label string="You invoice has been successfully created!" />
+             	 <newline />
+             	<separator string="" colspan="4"/>
+             	<group colspan="4">
+              	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+               	<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
+               	</group>
+             </form>
+            </field>
+		</record>
+
+		<record id="action_view_sale_open_invoice" model="ir.actions.act_window">
+            <field name="name">Open Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.open.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+    </data>
+</openerp>
diff --git a/addons/sale/wizard/wizard_sale_line_invoice.py b/addons/sale/wizard/wizard_sale_line_invoice.py
deleted file mode 100644
index 8e1e49ab22d..00000000000
--- a/addons/sale/wizard/wizard_sale_line_invoice.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import ir
-import pooler
-
-invoice_form = """<?xml version="1.0"?>
-<form string="Create invoices">
-    <separator colspan="4" string="Do you really want to create the invoices ?" />
-    <field name="grouped" />
-</form>
-"""
-
-invoice_fields = {
-    'grouped' : {'string':'Group the invoices', 'type':'boolean', 'default': lambda *a: False}
-}
-
-def _makeInvoices(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    res = False
-    invoices = {}
-
-    #TODO: merge with sale.py/make_invoice
-    def make_invoice(order, lines):
-        a = order.partner_id.property_account_receivable.id
-        if order.partner_id and order.partner_id.property_payment_term.id:
-            pay_term = order.partner_id.property_payment_term.id
-        else:
-            pay_term = False
-        inv = {
-            'name': order.name,
-            'origin': order.name,
-            'type': 'out_invoice',
-            'reference': "P%dSO%d" % (order.partner_id.id, order.id),
-            'account_id': a,
-            'partner_id': order.partner_id.id,
-            'address_invoice_id': order.partner_invoice_id.id,
-            'address_contact_id': order.partner_invoice_id.id,
-            'invoice_line': [(6,0,lines)],
-            'currency_id' : order.pricelist_id.currency_id.id,
-            'comment': order.note,
-            'payment_term': pay_term,
-            'fiscal_position': order.partner_id.property_account_position.id
-        }
-        inv_id = pool.get('account.invoice').create(cr, uid, inv)
-        return inv_id
-
-    for line in pool.get('sale.order.line').browse(cr,uid,data['ids']):
-        if (not line.invoiced) and (line.state not in ('draft','cancel')):
-            if not line.order_id.id in invoices:
-                invoices[line.order_id.id] = []
-            line_id = pool.get('sale.order.line').invoice_line_create(cr, uid,
-                    [line.id])
-            for lid in line_id:
-                invoices[line.order_id.id].append((line, lid))
-            pool.get('sale.order.line').write(cr, uid, [line.id],
-                    {'invoiced': True})
-        flag = True
-        data_sale = pool.get('sale.order').browse(cr,uid,line.order_id.id)
-        for line in data_sale.order_line:
-            if not line.invoiced:
-                flag = False
-                break
-        if flag:
-            wf_service = netsvc.LocalService('workflow')
-            wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
-            pool.get('sale.order').write(cr,uid,[line.order_id.id],{'state' : 'progress'})
-
-    for result in invoices.values():
-        order = result[0][0].order_id
-        il = map(lambda x: x[1], result)
-        res = make_invoice(order, il)
-        cr.execute('INSERT INTO sale_order_invoice_rel \
-                (order_id,invoice_id) values (%s,%s)', (order.id, res))
-    return {}
-
-
-class line_make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': invoice_form,
-                'fields': invoice_fields,
-                'state': [
-                    ('end', 'Cancel'),
-                    ('invoice', 'Create invoices')
-                ]
-            }
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type': 'state', 'state': 'end'}
-        },
-    }
-
-line_make_invoice("sale.order.line.make_invoice")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 1fe8691588ec2723da0af4c7c65abf7db1d131d7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 10 Mar 2010 14:55:11 +0530
Subject: [PATCH 22/56] [IMP]: stock: Improvment in wizards for putting it
 properly on right side, removed _ from function called from button

bzr revid: rpa@tinyerp.com-20100310092511-mmkho4c4w2g2ql7f
---
 addons/stock/__terp__.py                      |  2 +-
 addons/stock/stock_view.xml                   | 25 ++++-----------
 addons/stock/stock_wizard.xml                 | 28 -----------------
 addons/stock/wizard/__init__.py               |  2 +-
 addons/stock/wizard/stock_fill_inventory.py   | 31 ++++++++++---------
 .../wizard/stock_fill_inventory_view.xml      | 12 ++++++-
 .../wizard/stock_inventory_line_split.py      |  2 +-
 .../stock_inventory_line_split_view.xml       |  2 +-
 ...o.py => stock_inventory_set_stock_zero.py} |  0
 ...> stock_inventory_set_stock_zero_view.xml} | 11 +++++++
 .../stock/wizard/stock_invoice_onshipping.py  |  2 +-
 .../wizard/stock_invoice_onshipping_view.xml  | 15 +++++++--
 addons/stock/wizard/stock_location_product.py |  2 +-
 .../wizard/stock_location_product_view.xml    | 12 ++++++-
 14 files changed, 74 insertions(+), 72 deletions(-)
 rename addons/stock/wizard/{inventory_merge_stock_zero.py => stock_inventory_set_stock_zero.py} (100%)
 rename addons/stock/wizard/{inventory_merge_stock_zero_view.xml => stock_inventory_set_stock_zero_view.xml} (68%)

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index ff47ac55d8b..ba5e435fcbb 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -42,7 +42,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
         "stock_data.xml",
-        "wizard/inventory_merge_stock_zero_view.xml",
+        "wizard/stock_inventory_set_stock_zero_view.xml",
         "wizard/stock_fill_inventory_view.xml",
         "wizard/stock_invoice_onshipping_view.xml",
         "wizard/stock_location_product_view.xml",
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6129c345b1c..c112ab44d5e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -33,9 +33,12 @@
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
                     <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
-                    <button name="%(stock.action_view_stock_inventory_line_split)d"
-                     		 				string="Split inventory lines"
-                      		 				type="action" icon="gtk-justify-fill"/>
+                  <!--   <button name="%(split_inventory_lots)d"
+                    	string="Split Inventory Lines" type="action"
+                    	icon="gtk-justify-fill" /> -->
+                    	 <button name="%(stock.action_view_stock_inventory_line_split)d"
+                    		 		string="Split inventory lines"
+                      		 		type="action" icon="gtk-justify-fill"/>
                 </form>
             </field>
         </record>
@@ -110,16 +113,6 @@
                         <button name="action_done" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
                         <button name="action_cancel" states="cancel" string="Set to Draft" type="object" icon="gtk-cancel"/>
                         <button name="action_cancel_inventary" states="draft" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
-                         <group col="4" colspan="2">
-                        	<button name="%(stock.action_view_inventory_merge_stock_zero)d"
-                     		 string="Set Stock to Zero"
-                      		 type="action"/>
-                      		<button name="%(stock.action_view_stock_fill_inventory)d"
-                     		 string="Fill Inventory"
-                      		 type="action"/>
-						</group>
-
-
                     </group>
 
                 </form>
@@ -429,9 +422,6 @@
                     </group>
                     <separator string="Additional Information" colspan="4"/>
                     <field colspan="4" name="comment" nolabel="1"/>
-                    <button name="%(stock.action_view_stock_location_product)d"
-                     		 string="Products by Location"
-                      		 type="action"/>
                 </form>
             </field>
         </record>
@@ -919,9 +909,6 @@
                     <field name="state"/>
                     <button name="%(partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward" help="Validate Picking"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the picking.    Do you want to continue?"/>
-                    <button name="%(wizard_invoice_onshipping)d" states="done" string="Invoice" type="action"
-                    			icon="gtk-execute" help="Create invoice"
-                    			attrs="{'invisible': [('invoice_state', '!=', '2binvoiced')]}" />
                 </tree>
             </field>
         </record>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 88952bdb91e..d562ddfbb9f 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -43,20 +43,6 @@
         name="stock.return.picking"
         string="Return picking"/>
 
-    <wizard
-        id="wizard_invoice_onshipping"
-        keyword="client_action_multi"
-        model="stock.picking"
-        name="stock.invoice_onshipping"
-        string="Create invoice"/>
-
-    <wizard
-        string="Set Stock to 0"
-        model="stock.inventory"
-        name="inventory.merge.stock.zero"
-        keyword="client_action_multi"
-        id="wizard_merge_inventory_zero"/>
-
     <wizard
         string="Merge inventories"
         model="stock.inventory"
@@ -65,19 +51,5 @@
         multi="True"
         id="wizard_merge_inventory"/>
 
-    <wizard
-        string="Fill Inventory"
-        model="stock.inventory"
-        name="stock.fill_inventory"
-        keyword="client_action_multi"
-        id="wizard_fill_inventory"
-    />
-
-    <wizard
-        id="location_product"
-        model="stock.location"
-        name="stock.location.products"
-        string="Products by Location"/>
-
    </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 87f1f30b626..c489f880fdf 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -29,7 +29,7 @@ import wizard_split_lot_line
 import wizard_ups
 import inventory_merge
 
-import inventory_merge_stock_zero
+import stock_inventory_set_stock_zero
 import stock_fill_inventory
 import stock_inventory_line_split
 import stock_invoice_onshipping
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 3de4b9e1aea..246aff9eabf 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -33,25 +33,26 @@ class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
     _description = "Fill Inventory"
     _columns = {
-            'location_id': fields.many2one('stock.location', 'Location', required=True), 
-            'recursive': fields.boolean("Include all childs for the location"), 
+            'location_id': fields.many2one('stock.location', 'Location', required=True),
+            'recursive': fields.boolean("Include all childs for the location"),
             }
 
-    def _fill_inventory(self, cr, uid, ids, context):
+    def fill_inventory(self, cr, uid, ids, context):
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         for fill_inventory in self.browse(cr, uid, ids):
             res = {}
             res_location = {}
             if fill_inventory.recursive :
-                location_ids = location_obj.search(cr, uid, [('location_id', 
+                location_ids = location_obj.search(cr, uid, [('location_id',
                                  'child_of', fill_inventory.location_id.id)])
                 for location in location_ids :
                     res = location_obj._product_get(cr, uid, location)
                     res_location[location] = res
             else:
                 context.update({'compute_child': False})
-                res = location_obj._product_get(cr, uid, fill_inventory.location_id.id, context=context)
+                res = location_obj._product_get(cr, uid,
+                            fill_inventory.location_id.id, context=context)
                 res_location[fill_inventory.location_id.id] = res
 
                 product_ids = []
@@ -61,21 +62,21 @@ class stock_fill_inventory(osv.osv_memory):
                         prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
                         uom = prod.uom_id.id
                         context.update({'uom': uom})
-                        amount = self.pool.get('stock.location')._product_get(cr, uid, 
+                        amount = self.pool.get('stock.location')._product_get(cr, uid,
                                  location, [product_id], context=context)[product_id]
 
                         if(amount):
-                            line_ids=inventory_line_obj.search(cr, uid, 
-                                [('inventory_id', '=', context['active_ids']), 
-                                 ('location_id', '=', location), 
-                                 ('product_id', '=', product_id), 
-                                 ('product_uom', '=', uom), 
+                            line_ids=inventory_line_obj.search(cr, uid,
+                                [('inventory_id', '=', context['active_ids']),
+                                 ('location_id', '=', location),
+                                 ('product_id', '=', product_id),
+                                 ('product_uom', '=', uom),
                                 ('product_qty', '=', amount)])
                             if not len(line_ids):
-                                inventory_line = {'inventory_id': context['active_ids'][0], 
-                                                'location_id': location, 
-                                                'product_id': product_id, 
-                                                'product_uom': uom, 
+                                inventory_line = {'inventory_id': context['active_ids'][0],
+                                                'location_id': location,
+                                                'product_id': product_id,
+                                                'product_uom': uom,
                                                 'product_qty': amount}
                                 inventory_line_obj.create(cr, uid, inventory_line)
                             product_ids.append(product_id)
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index e321300ccf2..5ac6732b533 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -14,7 +14,7 @@
     				<newline/>
         	        <separator string="" colspan="4" />
 					<button special="cancel" string="Cancel" />
-            	    <button name="_fill_inventory" string="Fill Inventory" type="object"/>
+            	    <button name="fill_inventory" string="Fill Inventory" type="object"/>
              </form>
             </field>
 		</record>
@@ -29,5 +29,15 @@
             <field name="context">{'record_id' : active_id}</field>
         </record>
 
+        <record model="ir.values" id="wiki_stock_fill_inventory">
+            <field name="model_id" ref="stock.model_stock_inventory" />
+            <field name="object" eval="1" />
+            <field name="name">Fill Inventory</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_stock_fill_inventory'))" />
+            <field name="key">action</field>
+            <field name="model">stock.inventory</field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 1769385cda7..1723f7b3032 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -49,7 +49,7 @@ inventory lines, make sure the production lot is assigned to this product.'))
             'prefix': _check_production_lot, 
             }
 
-    def _split_lines(self, cr, uid, ids, context):
+    def split_lines(self, cr, uid, ids, context):
         inv_id = context['active_id']
         inv_line_obj = self.pool.get('stock.inventory.line')
         prodlot_obj = self.pool.get('stock.production.lot')
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index cc191105bd6..a2c9f2d065a 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -13,7 +13,7 @@
  					<separator string="" colspan="4" />
         			<label string=""/>
 					<button special="cancel" string="Cancel" icon="gtk-cancel" />
-           	    	<button name="_split_lines" string="Ok" type="object" icon="gtk-ok"/>
+           	    	<button name="split_lines" string="Ok" type="object" icon="gtk-ok"/>
     			</form>
             </field>
 		</record>
diff --git a/addons/stock/wizard/inventory_merge_stock_zero.py b/addons/stock/wizard/stock_inventory_set_stock_zero.py
similarity index 100%
rename from addons/stock/wizard/inventory_merge_stock_zero.py
rename to addons/stock/wizard/stock_inventory_set_stock_zero.py
diff --git a/addons/stock/wizard/inventory_merge_stock_zero_view.xml b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
similarity index 68%
rename from addons/stock/wizard/inventory_merge_stock_zero_view.xml
rename to addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
index d71df8dc4ef..2948b3005ea 100644
--- a/addons/stock/wizard/inventory_merge_stock_zero_view.xml
+++ b/addons/stock/wizard/stock_inventory_set_stock_zero_view.xml
@@ -26,6 +26,17 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+         	<field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+      	 <record model="ir.values" id="wiki_merge_stock_zero">
+            <field name="model_id" ref="stock.model_stock_inventory" />
+            <field name="object" eval="1" />
+            <field name="name">Set Stock to Zero</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_inventory_merge_stock_zero'))" />
+            <field name="key">action</field>
+            <field name="model">stock.inventory</field>
         </record>
         
     </data>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 110a55c6aef..82043fc0532 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -68,7 +68,7 @@ class stock_invoice_onshipping(osv.osv_memory):
             'type': _get_type,
         }
 
-    def _create_invoice(self, cr, uid, ids, context):
+    def create_invoice(self, cr, uid, ids, context):
         result = []
         for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
             if context.get('new_picking', False):
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 77988aab94a..c4bec603120 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -17,18 +17,29 @@
 					<field name="invoice_date" />
 			   	    <separator string="" colspan="4" />
 					<button special="cancel" string="Cancel" />
-			       	<button name="_create_invoice" string="Create Invoices" type="object"/>
+			       	<button name="create_invoice" string="Create Invoices" type="object"/>
              </form>
             </field>
 		</record>
 
 		<record id="action_stock_invoice_onshipping" model="ir.actions.act_window">
-            <field name="name">Stock Invoice Onshipping</field>
+            <field name="name">Create Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.invoice.onshipping</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+        	<field name="context">{'record_id' : active_id}</field>
+    	</record>
+
+     	 <record model="ir.values" id="stock_stock_invoice_onshipping">
+            <field name="model_id" ref="stock.model_stock_picking" />
+            <field name="object" eval="1" />
+            <field name="name">Create Invoice</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_stock_invoice_onshipping'))" />
+            <field name="key">action</field>
+            <field name="model">stock.picking</field>
         </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 6240e34c80d..44f6cb4dc7f 100755
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -36,7 +36,7 @@ class stock_location_product(osv.osv_memory):
                 'to_date': fields.datetime('To'), 
                 }
 
-    def _action_open_window(self, cr, uid, ids, context):
+    def action_open_window(self, cr, uid, ids, context):
         mod_obj = self.pool.get('ir.model.data')
         for location_obj in self.read(cr, uid, ids, ['from_date', 'to_date']):
             result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index 8bafa8f4750..5d54ee874aa 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -17,7 +17,7 @@
         			<separator string="" colspan="4" />
         			<label string=""/>
 					<button special="cancel" string="Cancel" icon="gtk-cancel" />
-           	    	<button name="_action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
+           	    	<button name="action_open_window" string="Open Product" type="object" icon="gtk-ok"/>
     			</form>
             </field>
 		</record>
@@ -29,7 +29,17 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+    		<field name="context">{'record_id' : active_id}</field>
     	</record>
 
+     	 <record model="ir.values" id="stock_location_product">
+            <field name="model_id" ref="stock.model_stock_location" />
+            <field name="object" eval="1" />
+            <field name="name">Products by Location</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_view_stock_location_product'))" />
+            <field name="key">action</field>
+            <field name="model">stock.location</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file

From 65ae50792394464228fd54066cafa56fbfe13dd2 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Wed, 10 Mar 2010 16:23:34 +0530
Subject: [PATCH 23/56] [IMP] document :- docuemnt parent_id retrun False
 instead of None, and improvement in content_index file

bzr revid: ysa@tinyerp.co.in-20100310105334-arawdstqdjeiqmtf
---
 addons/document/content_index.py      | 3 ++-
 addons/document/document_directory.py | 6 +++---
 addons/document/nodes.py              | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 9fc0023e833..9e47621b4c3 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -158,7 +158,8 @@ class contentIndex():
                     os.write(fd, content)
                     os.close(fd)
             
-                fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout
+                #fp = Popen(['file','-b','--mime-type',fname], shell=False, stdout=PIPE).stdout
+                fp = Popen(['file','-b',fname], shell=False, stdout=PIPE).stdout
                 result = fp.read()
                 fp.close()
                 mime2 = result.strip()
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index bcb86d589d2..17c3dfb66d9 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -65,14 +65,14 @@ class document_directory(osv.osv):
         objid=self.pool.get('ir.model.data')
         try:
             mid = objid._get_id(cr, uid, 'document', 'dir_root')
-            return None # TODO: check why not display root dir 
+            return False # TODO: check why not display root dir 
             if not mid:
-                return None
+                return False
         except Exception, e:
             import netsvc
             logger = netsvc.Logger()
             logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e))
-            return None
+            return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
     def _get_def_storage(self,cr,uid,context=None):
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index c6e2f1b10d1..13bd1784562 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -631,6 +631,11 @@ class node_file(node_class):
             the browse object. """
         # this is where storage kicks in..
         stor = self.storage_id
+        if not stor:
+            data_obj = self.context._dirobj.pool.get('ir.model.data')
+            data_id = data_obj._get_id(cr, self.context.uid, 'document', 'storage_db')
+            if data_id:
+                stor = data_obj.browse(cr, self.context.uid, data_id, context=self.context.context).res_id 
         assert stor
         stobj = self.context._dirobj.pool.get('document.storage')
         return stobj.set_data(cr,self.context.uid,stor, self, data, self.context.context, fil_obj)

From a80894f4022f2f8170b9926168d7a64f7ddbb528 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 16:30:44 +0530
Subject: [PATCH 24/56] [Add] crm: Add the osv_memory wizard of
 lead_opportunity and change the name of function

bzr revid: sbh@tinyerp.com-20100310110044-79cyfknveptf6so4
---
 addons/crm/__terp__.py                  | 1 +
 addons/crm/crm_lead_view.xml            | 2 +-
 addons/crm/wizard/__init__.py           | 1 +
 addons/crm/wizard/lead_to_partner.py    | 5 -----
 addons/crm/wizard/phonecall2meeting.py  | 2 +-
 addons/crm/wizard/phonecall2meeting.xml | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 3bcfabd6aa9..851d0a238ad 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -69,6 +69,7 @@ between mails and Open ERP.""",
         'wizard/opportunity2partner_view.xml',
         'wizard/opportunity2meeting.xml',
         'wizard/opportunity2phonecall.xml',
+        'wizard/lead2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 508929c7ec1..f5fb3349705 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(wizard_crm_lead_opportunity_set)d" 
+                            name="%(action_crm_lead2opportunity)d" 
                             string="Convert"
                             help="Convert into Opportunity"
                             icon="gtk-index" 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 72dfccad6de..4155dfa69ea 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -29,6 +29,7 @@ import wizard_history_event
 
 
 import lead_to_partner
+import lead2opportunity
 import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
index 4d1a3d5468e..a7ba5848f05 100644
--- a/addons/crm/wizard/lead_to_partner.py
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -19,12 +19,7 @@
 #
 ##############################################################################
 
-from mx.DateTime import now
-
 from osv import osv, fields
-import netsvc
-import ir
-import pooler
 from tools.translate import _
 
 class crm_lead2partner(osv.osv_memory):
diff --git a/addons/crm/wizard/phonecall2meeting.py b/addons/crm/wizard/phonecall2meeting.py
index 502ad14f702..89c0537aadd 100644
--- a/addons/crm/wizard/phonecall2meeting.py
+++ b/addons/crm/wizard/phonecall2meeting.py
@@ -38,7 +38,7 @@ class crm_phonecall2meeting(osv.osv_memory):
     def action_cancel(self, cr, uid, ids, context=None):
         return {'type':'ir.actions.act_window_close'}
 
-    def _makeMeeting(self, cr, uid, ids, context=None):
+    def action_makeMeeting(self, cr, uid, ids, context=None):
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('record_id', False) or False
         if record_id:
diff --git a/addons/crm/wizard/phonecall2meeting.xml b/addons/crm/wizard/phonecall2meeting.xml
index 9505845a63a..fe90bbe5cd6 100644
--- a/addons/crm/wizard/phonecall2meeting.xml
+++ b/addons/crm/wizard/phonecall2meeting.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Convert To Meeting ">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
                 </form>
             </field>
         </record>

From 579a2589ced3b3caa01845e1ac645d54a86b8c35 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 16:59:36 +0530
Subject: [PATCH 25/56] [Fix] crm: Fix the section_id problem in
 phonecall_to_opportunity and improve the view

bzr revid: sbh@tinyerp.com-20100310112936-ucnz9kfgcjfx4fty
---
 addons/crm/wizard/opportunity2phonecall.py    |  4 ++--
 addons/crm/wizard/opportunity2phonecall.xml   |  2 +-
 addons/crm/wizard/phonecall_to_opportunity.py | 24 ++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/crm/wizard/opportunity2phonecall.py b/addons/crm/wizard/opportunity2phonecall.py
index 25ac0d43524..587a7f2dfa2 100644
--- a/addons/crm/wizard/opportunity2phonecall.py
+++ b/addons/crm/wizard/opportunity2phonecall.py
@@ -72,8 +72,8 @@ class crm_opportunity2phonecall(osv.osv_memory):
             new_case = phonecall_case_obj.create(cr, uid, {
                     'name' : opportunity.name,
                     'case_id' : opportunity.id ,
-                    'user_id' : this.user_id and this.user_id.id or Flase,
-                    'categ_id' : opportunity.categ_id and opportunity.categ_id.id or Flase,
+                    'user_id' : this.user_id and this.user_id.id or False,
+                    'categ_id' : opportunity.categ_id and opportunity.categ_id.id or False,
                     'description' : opportunity.description or False,
                     'date' : this.date,
                     'section_id' : opportunity.section_id and opportunity.section_id.id or False,
diff --git a/addons/crm/wizard/opportunity2phonecall.xml b/addons/crm/wizard/opportunity2phonecall.xml
index 4823e54ce7f..905f761e08a 100644
--- a/addons/crm/wizard/opportunity2phonecall.xml
+++ b/addons/crm/wizard/opportunity2phonecall.xml
@@ -15,7 +15,7 @@
 						<field name="section_id"/>
 						<label string ="" colspan="2"/>
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_apply" type="object" string="Schedule Other Call" icon="gtk-ok" />
                     </group>
                 </form>
             </field>
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
index 025399c1040..004e0c8debc 100644
--- a/addons/crm/wizard/phonecall_to_opportunity.py
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -58,17 +58,19 @@ class crm_phonecall2opportunity(osv.osv_memory):
                         id3 = data_obj.browse(cr, uid, id3, context=context).res_id
                         opportunity_case_obj = self.pool.get('crm.opportunity')
                         phonecall_case_obj = self.pool.get('crm.phonecall')
-                        new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
-                                'name': this.name,
-                                'planned_revenue': this.planned_revenue,
-                                'probability': this.probability,
-                                'partner_id': this.partner_id.id,                 
-                                'section_id': case.section_id.id,
-                                'description': case.description,         
-                                'phonecall_id': case.id,
-                                'priority': case.priority,
-                                'phone': case.partner_phone,
-                            })
+                        for phonecall in phonecall_case_obj.browse(cr, uid, record_id):   
+                            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                                    'name': this.name,
+                                    'case'
+                                    'planned_revenue': this.planned_revenue,
+                                    'probability': this.probability,
+                                    'partner_id': this.partner_id and  this.partner_id.id or False,                 
+                                    'section_id': phonecall.section_id and phonecall.section_id.id or False,
+                                    'description': phonecall.description or False,         
+                                    'phonecall_id': phonecall.id,
+                                    'priority': phonecall.priority,
+                                    'phone': phonecall.partner_phone or False,
+                                })
                         new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
                         vals = {
                                 'partner_id': this.partner_id.id, 

From 6fb04a9673bb3f9cc9f4cdd57eb9dd58557e9865 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 17:09:47 +0530
Subject: [PATCH 26/56] [Fix] crm: Fix the section_id problem in
 phonecall_to_opportunity and improve the view and add the missing file

bzr revid: sbh@tinyerp.com-20100310113947-st57rxcufx8322vd
---
 addons/crm/wizard/lead2opportunity.py  | 117 +++++++++++++++++++++++++
 addons/crm/wizard/lead2opportunity.xml |  36 ++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 addons/crm/wizard/lead2opportunity.py
 create mode 100644 addons/crm/wizard/lead2opportunity.xml

diff --git a/addons/crm/wizard/lead2opportunity.py b/addons/crm/wizard/lead2opportunity.py
new file mode 100644
index 00000000000..ff630419f29
--- /dev/null
+++ b/addons/crm/wizard/lead2opportunity.py
@@ -0,0 +1,117 @@
+# -*- encoding: utf-8 -*-
+############################################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2008-2009 AJM Technologies S.A. (<http://www.ajm.lu). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+############################################################################################
+
+from osv import osv, fields
+import netsvc
+import time
+import tools
+import mx.DateTime
+from tools import config
+from tools.translate import _
+import tools
+
+class crm_lead2opportunity(osv.osv_memory):
+    _name = 'crm.lead2opportunity'
+    _description = 'Lead To Opportunity'
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type':'ir.actions.act_window_close'}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        
+        this = self.browse(cr, uid, ids[0], context=context)
+        value={}
+        record_id = context and context.get('record_id', False) or False
+        if record_id:
+            for case in self.pool.get('crm.lead').browse(cr, uid, record_id, context=context):
+                 if case.state in ['done', 'cancel']:       
+                            raise osv.except_osv(_("Warning"),
+                                                 _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
+                 else:
+                    data_obj = self.pool.get('ir.model.data')
+                    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                    res = data_obj.read(cr, uid, result, ['res_id'])
+                    
+            
+                    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                    id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                    if id2:
+                        id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+                    if id3:
+                        id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            
+                    lead_case_obj = self.pool.get('crm.lead')
+                    opportunity_case_obj =self. pool.get('crm.opportunity')        
+                    new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                            'name': this.name,
+                            'planned_revenue': this.planned_revenue,
+                            'probability': this.probability,
+                            'partner_id': case.partner_id and case.partner_id.id or False ,
+                            'section_id':case.section_id and case.section_id.id or False,
+                            'description':case.description or False,
+                            'date_deadline': case.date_deadline or False,
+                            'partner_address_id':case.partner_address_id and case.partner_address_id.id or False ,
+                            'priority': case.priority,
+                            'phone': case.phone,                
+                            'email_from': case.email_from
+                        })       
+                        
+                    new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                    vals = {
+                            'partner_id': this.partner_id and this.partner_id.id or False,                
+                            }
+                    if not case.opportunity_id:
+                            vals.update({'opportunity_id' : new_opportunity.id})
+            
+                    lead_case_obj.write(cr, uid, [case.id], vals)
+                    lead_case_obj.case_close(cr, uid, [case.id])
+                    opportunity_case_obj.case_open(cr, uid, [new_opportunity_id])
+                    
+            value = {            
+                        'name': _('Opportunity'),
+                        'view_type': 'form',
+                        'view_mode': 'form,tree',
+                        'res_model': 'crm.opportunity',
+                        'res_id': int(new_opportunity_id),
+                        'view_id': False,
+                        'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                        'type': 'ir.actions.act_window',
+                        'search_view_id': res['res_id'] 
+                    }
+        return value
+    _columns = {
+        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
+        'probability': fields.float('Success Probability'),
+        'planned_revenue': fields.float('Expected Revenue'),
+        'partner_id': fields.many2one('res.partner', 'Partner'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        record_id = context and context.get('record_id', False) or False
+        res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
+        if record_id:
+            for lead in self.pool.get('crm.lead').browse(cr, uid, record_id, context=context):
+                res['name']= lead.partner_name
+                res['partner_id']=lead.partner_id and lead.partner_id.id or False
+        return res
+    
+crm_lead2opportunity()
\ No newline at end of file
diff --git a/addons/crm/wizard/lead2opportunity.xml b/addons/crm/wizard/lead2opportunity.xml
new file mode 100644
index 00000000000..c50723de25e
--- /dev/null
+++ b/addons/crm/wizard/lead2opportunity.xml
@@ -0,0 +1,36 @@
+<openerp>
+  	<data>
+
+	    
+	   <record id="action_crm_lead2opportunity" model="ir.actions.act_window">
+	      <field name="name">Create Opportunity</field>
+	      <field name="type">ir.actions.act_window</field>
+	      <field name="res_model">crm.lead2opportunity</field>
+	      <field name="view_type">form</field>
+	      <field name="view_mode">form</field>
+	      <field name="target">new</field>
+	      <field name="context">{'record_id' : active_ids}</field>
+	   </record>
+	    
+  		<record id="view_crm_lead2opportunity_create" model="ir.ui.view">
+	      <field name="name">crm.lead2opportunity.create</field>
+	      <field name="model">crm.lead2opportunity</field>
+	      <field name="type">form</field>
+	      <field name="arch" type="xml">
+	      	<form string="Convert To Opportunity">
+		        <field name="name"/>
+		        <field name="partner_id"/>
+		        <newline/>
+		        <field name="planned_revenue"/>
+		        <field name="probability"/>
+		        <group col="4" colspan="4">
+	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	      			<button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
+	      		</group>
+		    </form>
+	      </field>
+	   </record>
+	   
+	   
+ 	</data>
+</openerp>

From f2d2800ca8e1fa4719498353573732e009570828 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 17:24:30 +0530
Subject: [PATCH 27/56] [IMP] : improve the code of phonecall_to_opportunity

bzr revid: sbh@tinyerp.com-20100310115430-pbc2joqlblua121p
---
 addons/crm/wizard/opportunity2meeting.py      |  1 -
 addons/crm/wizard/phonecall_to_opportunity.py | 47 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/addons/crm/wizard/opportunity2meeting.py b/addons/crm/wizard/opportunity2meeting.py
index 9c0628429df..324b694ac0c 100644
--- a/addons/crm/wizard/opportunity2meeting.py
+++ b/addons/crm/wizard/opportunity2meeting.py
@@ -20,7 +20,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ############################################################################################
-############################################################################################
 
 from osv import osv, fields
 import netsvc
diff --git a/addons/crm/wizard/phonecall_to_opportunity.py b/addons/crm/wizard/phonecall_to_opportunity.py
index 004e0c8debc..f2cd3897fa6 100644
--- a/addons/crm/wizard/phonecall_to_opportunity.py
+++ b/addons/crm/wizard/phonecall_to_opportunity.py
@@ -43,42 +43,41 @@ class crm_phonecall2opportunity(osv.osv_memory):
         record_id = context and context.get('record_id', False) or False
         if record_id:
             for case in self.pool.get('crm.phonecall').browse(cr, uid, [record_id], context=context):
-                 if case.state in ['done', 'cancel']:       
+                if case.state in ['done', 'cancel']:       
                             raise osv.except_osv(_("Warning"),
                                                  _("Closed/Cancelled Phone Call Could not convert into Opportunity"))
-                 else:
-                     data_obj = self.pool.get('ir.model.data')
-                     result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-                     res = data_obj.read(cr, uid, result, ['res_id'])
-                     id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-                     id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-                     if id2:
+                else:
+                    data_obj = self.pool.get('ir.model.data')
+                    result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+                    res = data_obj.read(cr, uid, result, ['res_id'])
+                    id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
+                    id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+                    if id2:
                         id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-                     if id3:
+                    if id3:
                         id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-                        opportunity_case_obj = self.pool.get('crm.opportunity')
-                        phonecall_case_obj = self.pool.get('crm.phonecall')
-                        for phonecall in phonecall_case_obj.browse(cr, uid, record_id):   
-                            new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
+                    opportunity_case_obj = self.pool.get('crm.opportunity')
+                    phonecall_case_obj = self.pool.get('crm.phonecall')
+                           
+                    new_opportunity_id = opportunity_case_obj.create(cr, uid, {            
                                     'name': this.name,
-                                    'case'
                                     'planned_revenue': this.planned_revenue,
                                     'probability': this.probability,
                                     'partner_id': this.partner_id and  this.partner_id.id or False,                 
-                                    'section_id': phonecall.section_id and phonecall.section_id.id or False,
-                                    'description': phonecall.description or False,         
-                                    'phonecall_id': phonecall.id,
-                                    'priority': phonecall.priority,
-                                    'phone': phonecall.partner_phone or False,
+                                    'section_id': case.section_id and case.section_id.id or False,
+                                    'description': case.description or False,         
+                                    'phonecall_id': case.id,
+                                    'priority': case.priority,
+                                    'phone': case.partner_phone or False,
                                 })
-                        new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
-                        vals = {
+                    new_opportunity = opportunity_case_obj.browse(cr, uid, new_opportunity_id)
+                    vals = {
                                 'partner_id': this.partner_id.id, 
                                 'opportunity_id' : new_opportunity_id,                
                                 }            
-                        phonecall_case_obj.write(cr, uid, [case.id], vals)
-                        phonecall_case_obj.case_close(cr, uid, [case.id])
-                        phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
+                    phonecall_case_obj.write(cr, uid, [case.id], vals)
+                    phonecall_case_obj.case_close(cr, uid, [case.id])
+                    phonecall_case_obj.case_open(cr, uid, [new_opportunity_id])
             value = {            
                 'name': _('Opportunity'),
                 'view_type': 'form',

From 874dccea6a8c37afd1941675b2fbde26fc948ea9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 17:34:43 +0530
Subject: [PATCH 28/56] [IMP] : put the comment of wizard file

bzr revid: sbh@tinyerp.com-20100310120443-m0zf9tb3qjkviwnd
---
 addons/crm/__terp__.py       | 6 +++---
 addons/crm/crm_lead_view.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 851d0a238ad..7f6d8c75aaf 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -74,16 +74,16 @@ between mails and Open ERP.""",
         'crm_view.xml',
          
         'crm_action_rule_view.xml', 
-        'crm_lead_wizard.xml', 
+        #'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
         'crm_meeting_wizard.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
-        'crm_phonecall_wizard.xml', 
+        #'crm_phonecall_wizard.xml', 
         'crm_phonecall_view.xml', 
         'crm_phonecall_menu.xml',         
-        'crm_opportunity_wizard.xml', 
+        #'crm_opportunity_wizard.xml', 
         'crm_opportunity_view.xml', 
         'crm_opportunity_menu.xml', 
         'crm_fund_view.xml', 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f5fb3349705..c884ad7afc7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -90,7 +90,7 @@
                         <separator string="Links" colspan="4" col="3"/>
                         <field name="partner_id"/>
                         <button
-                            name="%(wizard_crm_lead_partner_create)d" 
+                            name="%(action_crm_lead2partner)d" 
                             icon="gtk-index" type="action"
                             string="Create"
                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
@@ -190,7 +190,7 @@
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object"  icon="gtk-go-forward"/>
                 <button name="case_close" string="Close" states="open,draft,pending" type="object"  icon="gtk-close"/>
-                <button string="Convert to Opportunity" name="%(wizard_crm_lead_opportunity_set)d" states="draft,open,pending" icon="gtk-index" type="action"/>
+                <button string="Convert to Opportunity" name="%(action_crm_lead2opportunity)d" states="draft,open,pending" icon="gtk-index" type="action"/>
                 <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"  icon="gtk-go-up"/>
                 <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"  icon="gtk-cancel"/>
             </tree>

From 8233a57725615846c87cc11ecc4eaaca3a8e0eff Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Wed, 10 Mar 2010 19:11:56 +0530
Subject: [PATCH 29/56] [IMP]: auction: Converted wizards to osv_memory wizards

bzr revid: rpa@tinyerp.com-20100310134156-965ifa1c3qo9i0a9
---
 addons/auction/__terp__.py                    |  10 ++
 addons/auction/auction.py                     |   8 +-
 addons/auction/auction_view.xml               |   9 +-
 addons/auction/auction_wizard.xml             |  88 +---------
 addons/auction/wizard/__init__.py             |  41 ++---
 addons/auction/wizard/auction_lots_able.py    |  44 +++++
 .../auction/wizard/auction_lots_able_view.xml |  43 +++++
 .../wizard/auction_lots_auction_move.py       |  84 ++++++++++
 .../wizard/auction_lots_auction_move_view.xml |  45 ++++++
 addons/auction/wizard/auction_lots_enable.py  |  47 ++++++
 .../wizard/auction_lots_enable_view.xml       |  45 ++++++
 .../wizard/auction_lots_make_invoice.py       |  93 +++++++++++
 .../wizard/auction_lots_make_invoice_buyer.py | 109 +++++++++++++
 .../auction_lots_make_invoice_buyer_view.xml  |  49 ++++++
 .../wizard/auction_lots_make_invoice_view.xml |  45 ++++++
 .../auction/wizard/auction_lots_sms_send.py   |  67 ++++++++
 .../wizard/auction_lots_sms_send_view.xml     |  49 ++++++
 addons/auction/wizard/auction_pay_buy.py      | 105 ++++++++++++
 .../auction/wizard/auction_pay_buy_view.xml   |  51 ++++++
 addons/auction/wizard/auction_pay_sel.py      |  51 ++++++
 .../auction/wizard/auction_pay_sel_view.xml   |  35 ++++
 ...ard_able_taken.py => auction_payer_sel.py} |  65 ++++----
 .../auction/wizard/auction_payer_sel_view.xml |  55 +++++++
 addons/auction/wizard/auction_taken.py        |  57 +++++++
 addons/auction/wizard/auction_taken_view.xml  |  42 +++++
 .../wizard/auction_wizard_enable_taken.py     |  61 -------
 .../wizard/wizard_auction_invoice_buyer.py    | 111 -------------
 .../auction/wizard/wizard_auction_journal.py  | 105 ------------
 addons/auction/wizard/wizard_emporte.py       |  73 ---------
 addons/auction/wizard/wizard_lot_date_move.py |  96 -----------
 addons/auction/wizard/wizard_lots_pay.py      | 103 ------------
 addons/auction/wizard/wizard_lots_sms.py      | 150 ------------------
 addons/auction/wizard/wizard_pay.py           | 109 -------------
 addons/auction/wizard/wizard_payer.py         |  79 ---------
 34 files changed, 1192 insertions(+), 1032 deletions(-)
 create mode 100644 addons/auction/wizard/auction_lots_able.py
 create mode 100644 addons/auction/wizard/auction_lots_able_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_auction_move.py
 create mode 100644 addons/auction/wizard/auction_lots_auction_move_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_enable.py
 create mode 100644 addons/auction/wizard/auction_lots_enable_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice.py
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_buyer.py
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_make_invoice_view.xml
 create mode 100644 addons/auction/wizard/auction_lots_sms_send.py
 create mode 100644 addons/auction/wizard/auction_lots_sms_send_view.xml
 create mode 100644 addons/auction/wizard/auction_pay_buy.py
 create mode 100644 addons/auction/wizard/auction_pay_buy_view.xml
 create mode 100644 addons/auction/wizard/auction_pay_sel.py
 create mode 100644 addons/auction/wizard/auction_pay_sel_view.xml
 rename addons/auction/wizard/{auction_wizard_able_taken.py => auction_payer_sel.py} (51%)
 create mode 100644 addons/auction/wizard/auction_payer_sel_view.xml
 create mode 100644 addons/auction/wizard/auction_taken.py
 create mode 100644 addons/auction/wizard/auction_taken_view.xml
 delete mode 100644 addons/auction/wizard/auction_wizard_enable_taken.py
 delete mode 100644 addons/auction/wizard/wizard_auction_invoice_buyer.py
 delete mode 100644 addons/auction/wizard/wizard_auction_journal.py
 delete mode 100644 addons/auction/wizard/wizard_emporte.py
 delete mode 100644 addons/auction/wizard/wizard_lot_date_move.py
 delete mode 100644 addons/auction/wizard/wizard_lots_pay.py
 delete mode 100644 addons/auction/wizard/wizard_lots_sms.py
 delete mode 100644 addons/auction/wizard/wizard_pay.py
 delete mode 100644 addons/auction/wizard/wizard_payer.py

diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index 83064640266..c3f9058f070 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -34,6 +34,16 @@
     'init_xml': ['auction_sequence.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/auction_lots_able_view.xml',
+        'wizard/auction_lots_enable_view.xml',
+        'wizard/auction_lots_make_invoice_buyer_view.xml',
+        'wizard/auction_lots_make_invoice_view.xml',
+        'wizard/auction_taken_view.xml',
+        'wizard/auction_lots_auction_move_view.xml',
+        'wizard/auction_pay_buy_view.xml',
+        'wizard/auction_payer_sel_view.xml',
+        'wizard/auction_lots_sms_send_view.xml',
+        
         'auction_view.xml',
         'auction_report.xml',
         'auction_wizard.xml'
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0ece4690d9f..979f2c6cf42 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -478,13 +478,15 @@ class auction_lots(osv.osv):
         result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])]
         return result
 
-    def name_search(self, cr, user, name, args=[], operator='ilike', context={}):
+    def name_search(self, cr, user, name, args=None, operator='ilike', context={}):
+        if not args:
+            args = []
         try:
-            ids = self.search(cr, user, [('obj_num','=',int(name))]+ args)
+            ids = self.search(cr, user, [('obj_num','=',int(name))] + args)
         except:
             ids = []
         if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+ args)
+            ids = self.search(cr, user, [('name',operator,name)] + args)
         return self.name_get(cr, user, ids)
 
     def _sum_taxes_by_type_and_id(self, taxes):
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 2189253f3ce..ee1004ab0f3 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -3,7 +3,8 @@
 <data>
 	<menuitem name="Auction Management" id="auction_menu_root" icon="terp-purchase"/>
 	<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
-
+	<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
+    <menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
 	=======================================================
 	Auction Management/Configuration/artist
 	=======================================================
@@ -203,6 +204,7 @@
 				<field name="lot_est2"/>
 				<field name="product_id"/>
 				<field name="state" readonly="1"/>
+				
 			</form>
 		</field>
 	</record>
@@ -277,7 +279,7 @@
 					<separator string="Description" colspan="4"/>
 					<field name="obj_desc" colspan="4" nolabel="1" select="2"/>
 					<field name="state" colspan="1" select="2"/>
-				 	<group col="4" colspan="2">
+				 	<group col="8" colspan="2">
 				 	   <button name="button_bought" string="Sold" states="draft" type="object" icon="gtk-jump-to"/>
                        <button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
                        <button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
@@ -330,7 +332,6 @@
 							<field name="date"/>
 						</tree>
 					</field>
-
 				</page>
 			<page string="Bids">
 				<field name="bid_lines" colspan="4" nolabel="1" editable="top">
@@ -340,9 +341,7 @@
 							<field name="call"/>
 						</tree>
 					</field>
-
 			</page>
-
 				</notebook>
 			</form>
 		</field>
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index 0a93799cc20..ab1b051add5 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	    <!--<delete model="ir.actions.wizard" search="[('wiz_name','like','auction.lots.')]"/>-->
-
+<!--	Following wizard is remaining to implement in osv_memory-->
+		<!--  
 		<wizard string="Send to website"
 			model="auction.lots"
 			name="auction.lots.send.aie"
@@ -20,45 +20,6 @@
 		multi="1"
 		id="wizard_map_user"/>
 
-		<wizard string="Change Auction Date"
-		 model="auction.lots"
-		 name="auction.lots.auction_move"
-		multi="1"
-		 id="wizard_change_auction"/>
-
-		<!--wizard string="Pay objects of the seller"
-		model="auction.lots"
-		name="auction.pay.sel"
-		id="wizard_lots_pay"/-->
-		<wizard string="Pay objects of the buyer"
-		model="auction.lots"
-		name="auction.pay.buy"
-		id="wizard_pay"/>
-
-		<wizard
-			string="Gestion emporte"
-			model="auction.dates"
-			name="auction.taken"
-			multi="1"
-			id="wizard_emporte"/>
-
-	<menuitem name="Tools Bar Codes"
-		id="auction_outils_menu"
-		parent="auction_menu_root" sequence="5"
-		/>
-
-	<menuitem name="Deliveries Management"
-		action="wizard_emporte"
-		type="wizard"
-		id="menu_wizard_emporte"
-		parent="auction_outils_menu"
-		/>
-
-		<!--wizard string="Cancel payment"
-		model="auction.lots"
-		name="auction.lots.cancel"
-		multi="1"
-		id="wizard_cancel_pay"/-->
 
 		<wizard string="Numerotation (per lot)"
 		model="auction.lots"
@@ -72,56 +33,13 @@
 		 multi="1"
 		id="wizard_numerotate_automatic"/>
 
-		<wizard string="SMS Send"
-		 model="auction.lots"
-		 name="auction.lots.sms_send"
-		multi="1"
- 		id="wizard_sms"/>
-
-		 <!--wizard string="Invoice"
-		 model="auction.lots"
-		 name="auction.lots.invoice"
-		 multi="1"
-		 id="wizard_invoicing"/-->
-
-
-		<wizard string="Invoice Seller objects"
-			model="auction.lots"
-			name="auction.lots.make_invoice"
-		multi="1"
-			id="wizard_invoice"/>
-
-		<wizard string="Invoice Buyer objects"
-			model="auction.lots"
-			name="auction.lots.make_invoice_buyer"
-			id="wizard_invoice_buyer1"/>
-
-		<wizard string="Unmark as taken away"
-			model="auction.lots"
-			name="auction.lots.enable"
-			multi="1"
-			id="auction_wizard_enable_taken"/>
-
-		<wizard string="Mark as taken away"
-			model="auction.lots"
-			name="auction.lots.able"
-			multi="1"
-			id="auction_wizard_able_taken"/>
-
 			<wizard
 			id="auction_catalog_flagy"
 			string="Auction Catalog Flagey"
 			model="auction.dates"
 			name="auction.catalog.flagey"
 			keyword="client_print_multi"/>
-
-<wizard string="Mark as paid for seller"
-			model="auction.lots"
-			name="auction.payer.sel"
-			multi="1"
-			id="auction_wizard_payer_sel"/>
-
-
+ -->
 
 	</data>
 </openerp>
diff --git a/addons/auction/wizard/__init__.py b/addons/auction/wizard/__init__.py
index ec07ef6e04f..b82dcda5307 100644
--- a/addons/auction/wizard/__init__.py
+++ b/addons/auction/wizard/__init__.py
@@ -19,24 +19,27 @@
 #
 ##############################################################################
 
-import wizard_aie_send
-import wizard_aie_send_result
-import wizard_lots_buyer_map
-import wizard_lots_cancel
-import wizard_lots_invoice
-import wizard_lots_numerotate
-import wizard_lots_pay
-import wizard_pay
-import wizard_lots_sms
-import wizard_lot_date_move
-import wizard_auction_journal
-import wizard_auction_invoice_buyer
-import wizard_transfer_unsold_object
-import auction_wizard_enable_taken
-import auction_wizard_able_taken
-import auction_catalog_flagey
-#import wizard_lots_barcode
-import wizard_emporte
-import wizard_payer
+#import wizard_aie_send
+#import wizard_aie_send_result
+#import wizard_lots_buyer_map
+#import wizard_lots_cancel
+#import wizard_lots_invoice
+#import wizard_lots_numerotate
+#import wizard_lots_pay
+#import wizard_pay
+#import wizard_lot_date_move
+#import wizard_transfer_unsold_object
+#import auction_catalog_flagey
+
+import auction_lots_able
+import auction_lots_enable
+import auction_lots_make_invoice_buyer
+import auction_lots_make_invoice
+import auction_taken
+import auction_lots_auction_move
+import auction_pay_buy
+import auction_payer_sel
+import auction_lots_sms_send
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
new file mode 100644
index 00000000000..686d26c0341
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -0,0 +1,44 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_able(osv.osv_memory):
+    
+    _name = "auction.lots.able"
+    _description = "Lots able"
+    
+    def _confirm_able(self, cr, uid, ids, context={}):
+        """
+            This function Update auction lots object and set taken away field true.
+            @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of auction lots able’s IDs.
+        """
+        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'ach_emp':True})
+        return {}
+    
+auction_lots_able()
diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
new file mode 100644
index 00000000000..374390a1404
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_able_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_able" model="ir.ui.view">
+            <field name="name">auction.lots.able.form</field>
+            <field name="model">auction.lots.able</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation set taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-goto-last" string="Able Taken away" name="_confirm_able" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_able" model="ir.actions.act_window">
+            <field name="name">Mark as taken away</field>
+            <field name="res_model">auction.lots.able</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_able"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_able_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Mark as taken away</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_able'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
new file mode 100644
index 00000000000..71e2b16e8e0
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -0,0 +1,84 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_auction_move(osv.osv_memory):
+    
+    _name = "auction.lots.auction.move"
+    _description = "Auction move "
+    _columns= {
+               'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True), 
+               }
+    
+    def _top(self, cr, uid, ids, context={}):
+        refs = self.pool.get('auction.lots')
+        rec_ids = refs.browse(cr, uid, context['active_ids'])
+        for rec in rec_ids:
+            if not rec.auction_id:
+                raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
+        return {}
+    
+    def _auction_move_set(self, cr, uid, ids, context={}):
+        """
+        This Function update auction date on auction lots to given auction date.
+        erase the auction lots's object adjudication price and its buyer and change state to draft.
+        create new entry in auction lot history.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of auction lots auction move’s IDs.
+        """
+        for datas in self.read(cr, uid, ids):
+            if not (datas['auction_id'] and len(context['active_ids'])) :
+                return {}
+            refs = self.pool.get('auction.lots')
+            rec_ids = refs.browse(cr, uid, context['active_ids'])
+            line_ids = self.pool.get('auction.bid_line').search(cr, uid, [('lot_id', 'in', context['active_ids'])])
+        #   pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
+            for rec in rec_ids:
+                new_id = self.pool.get('auction.lot.history').create(cr, uid, {
+                    'auction_id': rec.auction_id.id, 
+                    'lot_id': rec.id, 
+                    'price': rec.obj_ret
+                    })
+                up_auction = self.pool.get('auction.lots').write(cr, uid, [rec.id], {
+                    'auction_id':datas['auction_id'], 
+                    'obj_ret': None, 
+                    'obj_price': None, 
+                    'ach_login': None, 
+                    'ach_uid': None, 
+                    'ach_inv_id': None, 
+                    'sel_inv_id': None, 
+                    'obj_num': None, 
+                    'state': 'draft'})
+            return {}
+
+auction_lots_auction_move()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
new file mode 100644
index 00000000000..394a916c96c
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_auction_move" model="ir.ui.view">
+            <field name="name">auction.lots.auction.move.form</field>
+            <field name="model">auction.lots.auction.move</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Change Auction Date">
+                	<group colspan="4" >
+                		 <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
+              			 <newline/>
+              			 <field name="auction_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-redo" string="Move to Auction date" name="_auction_move_set" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_auction_move" model="ir.actions.act_window">
+            <field name="name">Change Auction Date</field>
+            <field name="res_model">auction.lots.auction.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_auction_move"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_auction_move_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Change Auction Date</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_auction_move'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
new file mode 100644
index 00000000000..9d75ef1a589
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -0,0 +1,47 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_enable(osv.osv_memory):
+   
+    _name = "auction.lots.enable"
+    _description = "Lots Enable"
+    _columns= {
+               'confirm_en':fields.integer('Catalog Number')
+               }
+    
+    def _confirm_enable(self, cr, uid, ids, context={}):
+        """
+        This function Update auction lots object and set taken away field False.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of auction lots enable’s IDs.
+        """
+        self.pool.get('auction.lots').write(cr, uid, context['active_id'], {'ach_emp':False})
+        return {}
+    
+auction_lots_enable()
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
new file mode 100644
index 00000000000..e6a6936c5eb
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_enable_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_enable" model="ir.ui.view">
+            <field name="name">auction.lots.enable.form</field>
+            <field name="model">auction.lots.enable</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Confirm">
+                	<group colspan="4" >
+                		 <separator string="Confirmation enable taken away" colspan="4"/>
+              			 <newline/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="_confirm_enable" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_enable" model="ir.actions.act_window">
+            <field name="name">Unmark as taken away</field>
+            <field name="res_model">auction.lots.enable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_enable"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_enable_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Unmark as taken away</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_enable'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
new file mode 100644
index 00000000000..50177f54203
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -0,0 +1,93 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_make_invoice(osv.osv_memory):
+    
+    def _value_amount(self, cr, uid, context={}):
+        """
+        For Amount default value
+        @return:default auction lots amount value in amount fields. 
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        amount_total=0.0
+        for lot in lots:
+            amount_total+=lot.seller_price
+        return amount_total
+        
+    def _value_object(self, cr, uid, context={}):
+        """
+        For object default value.
+        @return:length of id  in Object field.
+        """
+        object = len(context['active_ids'])
+        return object
+    
+    def _makeInvoices(self, cr, uid, ids, context):
+        """
+        seller invoice :Create an invoice.
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param ids: List of Auction lots make invoice’s IDs
+        @return: dictionary of  account invoice form.
+        """    
+        for data in self.read(cr, uid, ids):
+            order_obj = self.pool.get('auction.lots')
+            mod_obj = self.pool.get('ir.model.data') 
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            newinv = []
+            ids = order_obj.seller_trans_create(cr, uid, context['active_ids'], context)
+            cr.commit()
+            return {
+                'domain': "[('id','in', ["+','.join(map(str, ids))+"])]", 
+                'name': 'Seller invoices', 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'account.invoice', 
+                'view_id': False, 
+                'context': "{'type':'out_refund'}", 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': id['res_id']        
+                }
+            
+    _name = "auction.lots.make.invoice"
+    _description = "Make invoice"
+    _columns= {
+               'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+               'objects':fields.integer('# of objects', required =True, readonly=True), 
+               'number':fields.char('Invoice Number', size=64), 
+              
+               }
+    _defaults={
+               'amount':_value_amount, 
+               'objects':_value_object, 
+               'number':lambda *a: False, 
+               
+               }
+
+auction_lots_make_invoice()
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
new file mode 100644
index 00000000000..b35dc072776
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -0,0 +1,109 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_make_invoice_buyer(osv.osv_memory):
+    
+    def _value_amount(self, cr, uid, context={}):
+        """
+        For Amount default value
+        @return:default auction lots amount value in amount fields. 
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        amount_total=0.0
+        for lot in lots:
+            amount_total+=lot.buyer_price
+        return amount_total
+        
+    def _value_object(self, cr, uid, context={}):
+        """
+        For object default value.
+        @return:length of id  in Object field.
+        """
+        object = len(context['active_ids'])
+        return object
+    
+    def _value_buyer_id(self, cr, uid, context={}):
+        """
+        For default buyer id value
+        @return:auction lots buyer id in buyer id field.
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        for lot in lots:
+            buyer=lot and lot.ach_uid.id or False
+        return buyer  
+
+    def _makeInvoices(self, cr, uid, ids, context):
+        """
+        Create an invoice for selected lots (IDS) to BUYER_ID .
+        @param cr: the current row, from the database cursor.
+        @param uid: the current user’s ID for security checks.
+        @param ids: List of Auction lots make invoice buyer’s IDs
+        @return: dictionary of  account invoice form.
+        """    
+        newinv = []
+        for data in self.read(cr, uid, ids):
+            
+            order_obj = self.pool.get('auction.lots')
+            mod_obj = self.pool.get('ir.model.data') 
+            result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
+            id = mod_obj.read(cr, uid, result, ['res_id'])
+            lots = order_obj.browse(cr, uid, context['active_ids'])
+            invoice_number = data['number']
+            for lot in lots:
+                up_auction = self.pool.get('auction.lots').write(cr, uid, [lot.id], {'ach_uid':data['buyer_id']})
+            ids = order_obj.lots_invoice(cr, uid, context['active_ids'], context, data['number'])
+            cr.commit()
+            return  {
+                'domain': "[('id','in', ["+','.join(map(str, ids))+"])]", 
+                'name': 'Buyer invoices', 
+                'view_type': 'form', 
+                'view_mode': 'tree,form', 
+                'res_model': 'account.invoice', 
+                'view_id': False, 
+                'context': "{'type':'in_refund'}", 
+                'type': 'ir.actions.act_window', 
+                'search_view_id': id['res_id']         
+            }
+            
+    _name = "auction.lots.make.invoice.buyer"
+    _description = "Make invoice buyer "
+    _columns= {
+               'amount': fields.float('Invoiced Amount', required =True, readonly=True), 
+               'objects':fields.integer('# of objects', required =True, readonly=True), 
+               'number':fields.char('Invoice Number', size=64), 
+               'buyer_id':fields.many2one('res.partner', 'Buyer', required=True), 
+               }
+    _defaults={
+               'amount':_value_amount,
+               'objects':_value_object,
+               'number':lambda *a: False,
+               'buyer_id':_value_buyer_id
+               
+               }
+
+auction_lots_make_invoice_buyer()
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
new file mode 100644
index 00000000000..b45d5bdbb1c
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice_buyer" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.buyer.form</field>
+            <field name="model">auction.lots.make.invoice.buyer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number"/>
+                		 <label string="(Keep empty for automatic number)" colspan="2"/>
+                		 <field name="buyer_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_make_invoice_buyer" model="ir.actions.act_window">
+            <field name="name">Invoice Buyer objects</field>
+            <field name="res_model">auction.lots.make.invoice.buyer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_make_invoice_buyer"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_lots_make_invoice_buyer_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Invoice Buyer objects</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_make_invoice_buyer'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+        
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
new file mode 100644
index 00000000000..e629942c5d5
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_make_invoice" model="ir.ui.view">
+            <field name="name">auction.lots.make.invoice.form</field>
+            <field name="model">auction.lots.make.invoice</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Paid">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="objects"/>
+                		 <field name="number" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_make_invoice" model="ir.actions.act_window">
+            <field name="name">Invoice Seller objects</field>
+            <field name="res_model">auction.lots.make.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_make_invoice"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+         <record id="auction_lots_make_invoice_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Invoice Seller objects</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_make_invoice'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
new file mode 100644
index 00000000000..95351c6965a
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -0,0 +1,67 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_lots_sms_send(osv.osv_memory):
+
+    _name = "auction.lots.sms.send"
+    _description = "Sms send "
+    _columns= {
+               'app_id':fields.char('API ID', size=64, required=True), 
+               'user':fields.char('Login', size=64, required=True),
+               'password':fields.char('Password', size=64, required=True),
+               'text':fields.text('SMS Message', required=True)
+               }
+    
+    def _sms_send(self, cr, uid, ids, context):
+        
+        for datas in self.read(cr, uid, ids):
+            lots = self.pool.get('auction.lots').read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
+            print "lots",lots, [l['ach_uid'][0] for l in lots if l['ach_uid']]
+            res = self.pool.get('res.partner').read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
+            
+            nbr = 0
+            for r in res:
+                add = self.pool.get('res.partner').address_get(cr, uid, [r['id']])['default']
+                addr = self.pool.get('res.partner.address').browse(cr, uid, add)
+                to = addr.mobile
+                if to:
+                    tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+                    nbr += 1
+            return {'sms_sent': nbr}
+        
+            if to:
+                tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
+                nbr += 1
+            return {'sms_sent': nbr}
+#      
+auction_lots_sms_send()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
new file mode 100644
index 00000000000..7e57833f72d
--- /dev/null
+++ b/addons/auction/wizard/auction_lots_sms_send_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_lots_sms_send" model="ir.ui.view">
+            <field name="name">auction.lots.sms.send.form</field>
+            <field name="model">auction.lots.sms.send</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="SMS - Gateway: clickatell','Bulk SMS send">
+                	<group colspan="4" >
+                		 <separator string="SMS - Gateway: clickatell','Bulk SMS send" colspan="4"/>
+                		 <field name="app_id"/>
+                		 <newline/>
+                		 <field name="user"/>
+                		 <field name="password"/>
+                		 <newline/>
+                		 <field name="text" colspan="3"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-go-back" string="Send SMS" name="_sms_send" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_lots_sms_send" model="ir.actions.act_window">
+            <field name="name">SMS Send</field>
+            <field name="res_model">auction.lots.sms.send</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_lots_sms_send"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+       <record id="auction_lots_sms_send_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">SMS Send</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_lots_sms_send'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
new file mode 100644
index 00000000000..8e7136b0064
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -0,0 +1,105 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_pay_buy(osv.osv_memory):
+    
+    def _start(self, cr, uid, context):
+        rec = self.pool.get('auction.lots').browse(cr, uid, context['active_ids'], context)
+        amount1 = 0.0
+        for r in rec:
+            amount1+= r.buyer_price
+            if r.is_ok:
+                raise osv.except_osv('Error !', 'Some lots of the selection are already paid.')
+        return amount1
+    
+    def _value_buyer_id(self, cr, uid, context={}):
+        """
+        For default buyer id value
+        @return:auction lots buyer id in buyer id field.
+        """
+        lots= self.pool.get('auction.lots').browse(cr, uid, context['active_ids'])
+        for lot in lots:
+            buyer=lot and lot.ach_uid.id or False
+        return buyer
+    
+    def _pay_and_reconcile(self, cr, uid, ids, context):
+        for datas in self.read(cr, uid, ids):
+            if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
+                rest = datas['total']-(datas['amount'] + datas['amount2'] + datas['amount3'])
+                raise osv.except_osv('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest, 2)))
+    
+            lots = self.pool.get('auction.lots').browse(cr, uid, context['active_ids'], context)
+            ref_bk_s = self.pool.get('account.bank.statement.line')
+    
+            for lot in lots:
+                if datas['buyer_id']:
+                    self.pool.get('auction.lots').write(cr, uid, [lot.id], {'ach_uid':datas['buyer_id']})
+                if not lot.auction_id:
+                    raise osv.except_osv('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
+                self.pool.get('auction.lots').write(cr, uid, [lot.id], {'is_ok':True})
+    
+            for st, stamount in [('statement_id1', 'amount'), ('statement_id2', 'amount2'), ('statement_id3', 'amount3')]:
+                if datas[st]:
+                    new_id = ref_bk_s.create(cr, uid, {
+                        'name':'Buyer:'+ str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name, 
+                        'date': time.strftime('%Y-%m-%d'), 
+                        'partner_id': datas['buyer_id'] or False, 
+                        'type':'customer', 
+                        'statement_id': datas[st], 
+                        'account_id': lot.auction_id.acc_income.id, 
+                        'amount': datas[stamount]
+                        })
+                    for lot in lots:
+                        self.pool.get('auction.lots').write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
+            return {}
+   
+    _name = "auction.pay.buy"
+    _description = "Pay buy"
+    _columns= {
+               'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+               'buyer_id':fields.many2one('res.partner', 'Buyer'), 
+               'statement_id1':fields.many2one('account.bank.statement', 'Statement', required=True), 
+               'amount2': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy']))), 
+               'statement_id2':fields.many2one('account.bank.statement', 'Statement'), 
+               'amount3': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy']))), 
+               'statement_id3':fields.many2one('account.bank.statement', 'Statement'), 
+               'total': fields.float('Amount paid', digits = (16, int(tools.config['price_accuracy'])), readonly =True), 
+               }
+    _defaults={
+               'amount' : _start,
+               'total' : _start,
+               'buyer_id' : _value_buyer_id
+               }
+    
+auction_pay_buy()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
new file mode 100644
index 00000000000..daa0ea2a195
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_buy" model="ir.ui.view">
+            <field name="name">auction.pay.buy.form</field>
+            <field name="model">auction.pay.buy</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay objects">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="statement_id1" domain="[('state','=','draft')]"/>
+                		 <field name="amount2"/>
+                		 <field name="statement_id2"  domain="[('state','=','draft')]"/>
+                		 <field name="amount3"/>
+                		 <field name="statement_id3"  domain="[('state','=','draft')]"/>
+                		 <newline/>
+                		 <field name="buyer_id"/>
+                		 <field name="total"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes"  string="Pay" name="_pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="action_auction_pay_buy" model="ir.actions.act_window">
+            <field name="name">Pay objects of the buyer</field>
+            <field name="res_model">auction.pay.buy</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_pay_buy"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+  		</record>
+  		
+  		 <record id="auction_pay_buy_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Pay objects of the buyer</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_pay_buy'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
new file mode 100644
index 00000000000..2643a565e3e
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -0,0 +1,51 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_pay_sel(osv.osv_memory):
+   
+    _name = "auction.pay.sel"
+    _description = "Pay Invoice"
+    _columns= {
+               'amount': fields.float('Amount paid', digits= (16, int(tools.config['price_accuracy'])), required=True), 
+               'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]), 
+               'journal_id':fields.many2one('account.journal', 'Journal', required=True), 
+               'period_id':fields.many2one('account.period', 'Period', required=True), 
+               }
+    
+    def _pay_and_reconcile(self, cr, uid, ids, context):
+        lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
+        for datas in self.read(cr, uid, ids):
+            account_id = datas.get('writeoff_acc_id', False)
+            period_id = datas.get('period_id', False)
+            journal_id = datas.get('journal_id', False)
+            if lot.sel_inv_id:
+                p = self.pool.get('account.invoice').pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+        #   lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
+            return {}
+    
+auction_pay_sel()
diff --git a/addons/auction/wizard/auction_pay_sel_view.xml b/addons/auction/wizard/auction_pay_sel_view.xml
new file mode 100644
index 00000000000..b96f25032ac
--- /dev/null
+++ b/addons/auction/wizard/auction_pay_sel_view.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_pay_sel" model="ir.ui.view">
+            <field name="name">auction.pay.sel.form</field>
+            <field name="model">auction.pay.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Pay invoice">
+                	<group colspan="4" >
+                		 <field name="amount"/>
+                		 <field name="dest_account_id"/>
+                		 <field name="journal_id"/>
+                		 <field name="period_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-yes" string="Pay" name="_pay_and_reconcile" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="action_auction_pay_sel" model="ir.actions.act_window">
+            <field name="name">Pay objects of the seller</field>
+            <field name="res_model">auction.pay.sel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_pay_sel"/> 
+           <field name="target">new</field>
+  		</record>
+
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_wizard_able_taken.py b/addons/auction/wizard/auction_payer_sel.py
similarity index 51%
rename from addons/auction/wizard/auction_wizard_able_taken.py
rename to addons/auction/wizard/auction_payer_sel.py
index 261cc47c48b..b59cbf591cc 100644
--- a/addons/auction/wizard/auction_wizard_able_taken.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -19,43 +19,42 @@
 #
 ##############################################################################
 
-import wizard
+from osv import fields, osv
+from tools.translate import _
 import netsvc
 import pooler
-take_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Confirmation set taken away" colspan="4"/>
-    <newline/>
-</form>
-"""
+import time
+import tools
+import wizard
 
-take_fields = {
-#   'confirm_en': {'string':'Catalog Number', 'type':'integer'},
-}
-
-def _confirm_able(self,cr,uid,data,context={}):
-    res={}
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':True})
-    return {}
-
-class able_take_away(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {
-                    'type' : 'form',
-                    'arch' : take_form,
-                    'fields' : take_fields,
-                    'state' : [('end', 'Cancel'),('go', 'Able Taken away')]}
-        },
-            'go' : {
-            'actions' : [_confirm_able],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-}
-able_take_away('auction.lots.able')
+class auction_payer(osv.osv_memory):
 
+    _name = "auction.payer"
+    _description = "Auction payer"
+    
+    def _payer(self, cr, uid, ids, context):
+        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'is_ok':True, 'state':'paid'})
+        return {}
+    
+auction_payer()
 
+class auction_payer_sel(osv.osv_memory):
+    """
+    For Mark as payment for seller
+    """
+    _name = "auction.payer.sel"
+    _description = "Auction payment for seller"
+    
+    def _payer_sel(self, cr, uid, ids, context):
+        """
+        This function Update auction lots object and seller paid  true.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of auction payer sel’s IDs.
+        """
+        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'paid_vnd':True})
+        return {}
+    
+auction_payer_sel()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
new file mode 100644
index 00000000000..93fe0ef38b1
--- /dev/null
+++ b/addons/auction/wizard/auction_payer_sel_view.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_payer" model="ir.ui.view">
+            <field name="name">auction.payer.form</field>
+            <field name="model">auction.payer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for buyer">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="2">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon = "gtk-yes"  string="Pay"   name="_payer" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_auction_payer_sel" model="ir.ui.view">
+            <field name="name">auction.payer.sel.form</field>
+            <field name="model">auction.payer.sel</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check payment for seller">
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-yes" string="Pay" name="_payer_sel" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_payer_sel" model="ir.actions.act_window">
+            <field name="name">Mark as paid for seller</field>
+            <field name="res_model">auction.payer.sel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_payer_sel"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id' : active_id}</field>
+        </record>
+        
+        <record id="auction_payer_sel_values" model="ir.values">
+            <field name="model_id" ref="auction.model_auction_lots" />
+            <field name="object" eval="1" />
+            <field name="name">Mark as paid for seller</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_auction_payer_sel'))" />
+            <field name="key">action</field> 
+            <field name="model">auction.lots</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
new file mode 100644
index 00000000000..48a5d8cf6af
--- /dev/null
+++ b/addons/auction/wizard/auction_taken.py
@@ -0,0 +1,57 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class auction_taken(osv.osv_memory):
+    """
+    Auction lots taken.
+    """
+    _name = "auction.taken"
+    _description = "Auction taken"
+    _columns = {
+              'lot_ids':fields.many2many('auction.lots', 'auction_taken_rel', 'taken_id', 'lot_id', 'Lots Emportes'), 
+              
+              }
+    
+    def _to_xml(s):
+        return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
+
+    def _process(self, cr, uid, ids, context):
+          """
+          Update Auction lots state to taken_away.
+          @param cr: the current row, from the database cursor.
+          @param uid: the current user’s ID for security checks.
+          @param ids: List of Auction taken’s IDs
+          @return: dictionary of lot_ids fields with empty list 
+          """
+          for data in self.read(cr, uid, ids): 
+              lot_obj = self.pool.get('auction.lots')
+              if data['lot_ids']:
+                  lot_obj.write(cr, uid, data['lot_ids'], {'state':'taken_away'})
+              return {'lot_ids': []}
+
+auction_taken()
diff --git a/addons/auction/wizard/auction_taken_view.xml b/addons/auction/wizard/auction_taken_view.xml
new file mode 100644
index 00000000000..8ed7f730427
--- /dev/null
+++ b/addons/auction/wizard/auction_taken_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_auction_taken" model="ir.ui.view">
+            <field name="name">auction.taken.form</field>
+            <field name="model">auction.taken</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Mark Lots"> 
+                	<group colspan="4" >
+                		 <label string="Select lots which are Sold" colspan="4"/>
+                		 <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button icon="gtk-ok"  string="OK"  name="_process" type="object" />
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_auction_taken" model="ir.actions.act_window">
+            <field name="name">Gestion emporte</field>
+            <field name="res_model">auction.taken</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_auction_taken"/> 
+           <field name="target">new</field>
+        </record>
+        
+        <!-- <menuitem name="Tools Bar Codes"
+		id="auction_outils_menu"
+		parent="auction_menu_root" sequence="5"
+		/>
+        <menuitem name="Deliveries Management"
+		action="action_auction_taken"
+		id="menu_wizard_emporte"
+		parent="auction_outils_menu"
+		/> -->
+        
+    </data>
+</openerp>
diff --git a/addons/auction/wizard/auction_wizard_enable_taken.py b/addons/auction/wizard/auction_wizard_enable_taken.py
deleted file mode 100644
index 01f54ca28dc..00000000000
--- a/addons/auction/wizard/auction_wizard_enable_taken.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-#field name="confirm_en"/>
-
-take_form = """<?xml version="1.0"?>
-<form title="Confirm">
-    <separator string="Confirmation enable taken away" colspan="4"/>
-    <newline/>
-</form>
-"""
-
-take_fields = {
-    'confirm_en': {'string':'Catalog Number', 'type':'integer'},
-}
-
-def _confirm_enable(self,cr,uid,data,context={}):
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'ach_emp':False})
-    return {}
-
-class enable_take_away(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {
-                    'type' : 'form',
-                    'arch' : take_form,
-                    'fields' : take_fields,
-                    'state' : [ ('end', 'Cancel'),('go', 'Enable Taken away')]}
-        },
-            'go' : {
-            'actions' : [_confirm_enable],
-            'result' : {'type' : 'state', 'state' : 'end'}
-        },
-}
-enable_take_away('auction.lots.enable')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_auction_invoice_buyer.py b/addons/auction/wizard/wizard_auction_invoice_buyer.py
deleted file mode 100644
index 6cf12b5da22..00000000000
--- a/addons/auction/wizard/wizard_auction_invoice_buyer.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="number"/>
-    <label string="(Keep empty for automatic number)" colspan="2"/>
-    <field name="buyer_id"/>
-</form>'''
-
-invoice_fields = {
-    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
-    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
-    'number': {'string':'Invoice Number', 'type':'char'},
-    'buyer_id':{'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'}
-
-}
-
-
-def _values(self,cr,uid, datas,context={}):
-    pool = pooler.get_pool(cr.dbname)
-    lots= pool.get('auction.lots').browse(cr,uid,datas['ids'])
-#   price = 0.0
-    amount_total=0.0
-#   pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
-    for lot in lots:
-        buyer=lot and lot.ach_uid.id or False
-        amount_total+=lot.buyer_price
-#       taxes = lot.product_id.taxes_id
-#       if lot.author_right:
-#           taxes.append(lot.author_right)
-#       if lot.auction_id:
-#           taxes += lot.auction_id.buyer_costs
-#       tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
-#       for t in tax:
-#           amount_total+=t['amount']
-#       amount_total+=lot.obj_price
-    #   up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':datas['form']['buyer_id']})
-    invoice_number = False
-    return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number,'buyer_id':buyer}
-
-
-def _makeInvoices(self, cr, uid, data, context):
-    newinv = []
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('auction.lots')
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-    lots= order_obj.browse(cr,uid,data['ids'])
-    invoice_number=data['form']['number']
-    for lot in lots:
-        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
-    ids = order_obj.lots_invoice(cr, uid, data['ids'],context,data['form']['number'])
-#   ids = order_obj.lots_invoice(cr, uid, data['ids'],context,invoice_number)
-    cr.commit()
-    return {
-        'domain': "[('id','in', ["+','.join(map(str, ids))+"])]",
-        'name': 'Buyer invoices',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.invoice',
-        'view_id': False,
-        'context': "{'type':'in_refund'}",
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']         
-    }
-    return {}
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_values],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
-        },
-        'invoice' : {
-            'actions' : [],
-            'result' : {'type' : 'action',
-                    'action' : _makeInvoices}
-        },
-    }
-make_invoice("auction.lots.make_invoice_buyer")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_auction_journal.py b/addons/auction/wizard/wizard_auction_journal.py
deleted file mode 100644
index 79329592165..00000000000
--- a/addons/auction/wizard/wizard_auction_journal.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-
-
-invoice_form = '''<?xml version="1.0"?>
-<form title="Paid ?">
-    <field name="amount"/>
-    <field name="objects"/>
-    <field name="number" colspan="3"/>
-</form>'''
-
-invoice_fields = {
-    'amount': {'string':'Invoiced Amount', 'type':'float', 'required':True, 'readonly':True},
-    'objects': {'string':'# of objects', 'type':'integer', 'required':True, 'readonly':True},
-    'number': {'string':'Invoice Number', 'type':'integer'},
-}
-
-def _values(self,cr,uid, datas,context={}):
-    lots= pooler.get_pool(cr.dbname).get('auction.lots').browse(cr,uid,datas['ids'])
-#   service = netsvc.LocalService("object_proxy")
-#   lots = service.execute(cr,uid, 'auction.lots', 'read', datas['ids'])
-#   auction = service.execute(cr,uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
-    price = 0.0
-    amount_total=0.0
-    pt_tax=pooler.get_pool(cr.dbname).get('account.tax')
-    for lot in lots:
-    #   taxes = lot.product_id.taxes_id
-    #   if lot.bord_vnd_id.tax_id:
-    #       taxes.append(lot.bord_vnd_id.tax_id)
-    #   if lot.auction_id:
-    #       taxes += lot.auction_id.seller_costs
-    #   tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1)
-    #   for t in tax:
-    #       amount_total+=t['amount']
-    #   amount_total+=lot.obj_price
-        amount_total+=lot.seller_price  
-#TODO: recuperer id next invoice (de la sequence)???
-    invoice_number = False
-    return {'objects':len(datas['ids']), 'amount':amount_total, 'number':invoice_number}
-
-def _makeInvoices(self, cr, uid, data, context):
-
-    pool = pooler.get_pool(cr.dbname)
-    order_obj = pool.get('auction.lots')
-    mod_obj = pool.get('ir.model.data') 
-    result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
-    id = mod_obj.read(cr, uid, result, ['res_id'])
-    newinv = []
-    ids = order_obj.seller_trans_create(cr, uid, data['ids'],context)
-    cr.commit()
-    return {
-        'domain': "[('id','in', ["+','.join(map(str, ids))+"])]",
-        'name': 'Seller invoices',
-        'view_type': 'form',
-        'view_mode': 'tree,form',
-        'res_model': 'account.invoice',
-        'view_id': False,
-        'context': "{'type':'out_refund'}",
-        'type': 'ir.actions.act_window',
-        'search_view_id': id['res_id']        
-    }
-    return {}
-
-class make_invoice(wizard.interface):
-    states = {
-        'init' : {
-            'actions' : [_values],
-            'result' : {'type' : 'form',
-                    'arch' : invoice_form,
-                    'fields' : invoice_fields,
-                    'state' : [('end', 'Cancel'),('invoice', 'Create invoices')]}
-        },
-        'invoice' : {
-            'actions' : [_makeInvoices],
-            'result' : {'type' : 'action',
-                    'action' : _makeInvoices,
-                    'state' : 'end'}
-        },
-    }
-make_invoice("auction.lots.make_invoice")
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_emporte.py b/addons/auction/wizard/wizard_emporte.py
deleted file mode 100644
index 1172404e218..00000000000
--- a/addons/auction/wizard/wizard_emporte.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import pooler
-from tools.misc import UpdateableStr
-
-
-# Dossier
-
-_lot_arch = """<?xml version="1.0"?>
-<form string="Mark Lots" height="500" width="1000">
-    <label string="Select lots which are Sold" colspan="4"/>
-    <field name="lot_ids" nolabel="1" colspan="4" domain="[('state','=','sold')]"/>
-</form>
-"""
-_lot_fields = {
-    'lot_ids': {'string':'Lots Emportes','relation':'auction.lots','type':'many2many'}
-}
-
-def _to_xml(s):
-    return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
-
-def _process(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    lot_obj = pool.get('auction.lots')
-    if data['form']['lot_ids']:
-        lot_obj.write(cr, uid, data['form']['lot_ids'][0][2], {'state':'taken_away'})
-    return {'lot_ids': []}
-
-class wizard_reprint(wizard.interface):
-    states = {
-        'valid': {
-            'actions': [_process],
-            'result': {'type':'state', 'state':'init'}
-        },
-        'init': {
-            'actions': [],
-            'result': {
-                'type':'form', 
-                'arch': _lot_arch,
-                'fields': _lot_fields,
-                'state': [
-                    ('valid','       OK       ')
-                ],
-            }
-        }
-    }
-wizard_reprint('auction.taken')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lot_date_move.py b/addons/auction/wizard/wizard_lot_date_move.py
deleted file mode 100644
index e6e13ea0ab2..00000000000
--- a/addons/auction/wizard/wizard_lot_date_move.py
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-import sql_db
-
-auction_move = '''<?xml version="1.0"?>
-<form string="Change Auction Date">
-    <group col="1" colspan="2">
-    <label string="Warning, this will erase the object adjudication price and its buyer !" colspan="2"/>
-    </group>
-    <newline/>
-    <field name="auction_id"/>
-</form>'''
-
-auction_move_fields = {
-    'auction_id': {'string':'Auction Date', 'type':'many2one', 'required':True, 'relation':'auction.dates'},
-}
-
-#def _auction_move_set(self, uid, datas):
-#   if datas['form']['auction_id']:
-#       cr = sql_db.db.cursor()
-#       cr.execute('update auction_lots set auction_id=%s, obj_price=NULL, ach_login=NULL, ach_uid=NULL, ach_pay_id=NULL, ach_inv_id=NULL, state=%s where id in ('+','.join(map(str, datas['ids']))+')', (str(datas['form']['auction_id']), 'draft'))
-#       cr.execute('delete from auction_bid_line where lot_id in ('+','.join(map(str, datas['ids']))+')')
-#       cr.commit()
-#       cr.close()
-#   return {}
-def _top(self,cr,uid,datas,context={}):
-    refs = pooler.get_pool(cr.dbname).get('auction.lots')
-    rec_ids = refs.browse(cr,uid,datas['ids'])
-    for rec in rec_ids:
-        if not rec.auction_id:
-            raise wizard.except_wizard('Error !','You can not move a lot that has no auction date')
-    return {}
-def _auction_move_set(self,cr,uid,datas,context={}):
-    if not (datas['form']['auction_id'] and len(datas['ids'])) :
-        return {}
-    refs = pooler.get_pool(cr.dbname).get('auction.lots')
-    rec_ids = refs.browse(cr,uid,datas['ids'])
-    
-    line_ids= pooler.get_pool(cr.dbname).get('auction.bid_line').search(cr,uid,[('lot_id','in',datas['ids'])])
-#   pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
-    for rec in rec_ids:
-        new_id=pooler.get_pool(cr.dbname).get('auction.lot.history').create(cr,uid,{
-            'auction_id':rec.auction_id.id,
-            'lot_id':rec.id,
-            'price': rec.obj_ret
-        })
-        up_auction=pooler.get_pool(cr.dbname).get('auction.lots').write(cr,uid,[rec.id],{
-            'auction_id':datas['form']['auction_id'],
-            'obj_ret':None,
-            'obj_price':None,
-            'ach_login':None,
-            'ach_uid':None,
-            'ach_inv_id':None,
-            'sel_inv_id':None,
-            'obj_num':None,
-            'state':'draft'})
-    return {}
-
-class wiz_auc_lots_auction_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_top],
-            'result': {'type': 'form', 'arch':auction_move, 'fields': auction_move_fields, 'state':[('set_date', 'Move to Auction date'),('end','Cancel')]}
-        },
-        'set_date': {
-            'actions': [_auction_move_set],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-
-wiz_auc_lots_auction_move('auction.lots.auction_move')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_pay.py b/addons/auction/wizard/wizard_lots_pay.py
deleted file mode 100644
index a6b8f635ba4..00000000000
--- a/addons/auction/wizard/wizard_lots_pay.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-invoice_form = '''<?xml version="1.0"?>
-<form string="Pay invoice">
-    <field name="amount"/>
-    <field name="dest_account_id"/>
-    <field name="journal_id"/>
-    <field name="period_id"/>
-</form>'''
-
-invoice_fields = {
-    'amount': {'string': 'Amount paid', 'type':'float', 'required':True},
-    'dest_account_id': {'string':'Payment to Account', 'type':'many2one', 'required':True, 'relation':'account.account', 'domain':[('type','=','cash')]},
-    'journal_id': {'string': 'Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
-    'period_id': {'string': 'Period', 'type': 'many2one', 'relation':'account.period', 'required':True},
-}
-#def pay_n_check(self, cr, uid, data, context):
-#
-#   auction = pool.get('auction.lots').browse(cr,uid,data['id'],context)
-#   try:
-#       
-#       for lot in auction:
-#                            
-#           if not lot.auction_id :
-#               raise osv.except_osv("Error","No payment defined for this auction.")
-#           i=1
-#           tot= 0
-#           for payment in auction:
-#               if not payment.journal_id :
-#                   raise osv.except_osv("Error","No journal defined for the payment line %d" % (i,))
-#               if not payment.ach_inv_id.amount :
-#                   raise osv.except_osv("Error","No amount defined for the payment line %d." % (i,))
-#               i+=1
-#               tot+= payment.ach_inv_id.amount
-#           if abs(float(tot)) - abs(float(lot.obj_ret)) > 10**-6:
-#               raise osv.except_osv("Error","The amount paid does not match the total amount")
-#       else:
-#           for lot in auction:
-#              if not lot.journal_id :
-#               raise osv.except_osv("Error","Please choose a journal for the auction ("+lot.name+").")
-#           pool.get('auction.lots').create(cr,uid,{
-#               'auction_id': lot.auction.id,
-#               'journal_id': lot.journal_id,
-#
-#               })
-#   except osv.except_osv, e:
-#       raise wizard.except_wizard(e.name, e.name)
-#   return True
-def _pay_and_reconcile(self, cr, uid, data, context):
-
-    pool = pooler.get_pool(cr.dbname)
-    lot = pool.get('auction.lots').browse(cr,uid,data['id'],context)
-    form = data['form']
-    account_id = form.get('writeoff_acc_id', False)
-    period_id = form.get('period_id', False)
-    journal_id = form.get('journal_id', False)
-    if lot.sel_inv_id:
-        p=pool.get('account.invoice').pay_and_reconcile(['lot.sel_inv_id.id'], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
-#   lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
-    return {}
-
-
-class wiz_auc_lots_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':invoice_form, 'fields': invoice_fields, 'state':[ ('pay','Pay'), ('end','Cancel')]}
-        },
-            'pay': {
-            'actions': [_pay_and_reconcile],
-            'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_lots_pay('auction.pay.sel');
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_lots_sms.py b/addons/auction/wizard/wizard_lots_sms.py
deleted file mode 100644
index dc60a9bd24d..00000000000
--- a/addons/auction/wizard/wizard_lots_sms.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-
-import urllib
-
-sms_send_form = '''<?xml version="1.0"?>
-<form title="%s">
-    <separator string="%s" colspan="4"/>
-    <field name="app_id"/>
-    <newline/>
-    <field name="user"/>
-    <field name="password"/>
-    <newline/>
-    <field name="text" colspan="3"/>
-</form>''' % ('SMS - Gateway: clickatell', 'Bulk SMS send')
-
-sms_send_fields = {
-    'app_id': {'string':'API ID', 'type':'char', 'required':True},
-    'user': {'string':'Login', 'type':'char', 'required':True},
-    'password': {'string':'Password', 'type':'char', 'required':True},
-    'text': {'string':'SMS Message', 'type':'text', 'required':True, 'value':'Les lots [lots] vous ont etes adjuges. -- Rops'}
-}
-##############################################################################
-#
-# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#                    Fabien Pinckaers <fp@tiny.Be>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-sms_send_form = '''<?xml version="1.0"?>
-<form string="%s">
-    <separator string="%s" colspan="4"/>
-    <field name="app_id"/>
-    <newline/>
-    <field name="user"/>
-    <field name="password"/>
-    <newline/>
-    <field name="text" colspan="3"/>
-</form>''' % ('SMS - Gateway: clickatell','Bulk SMS send')
-
-sms_send_fields = {
-    'app_id': {'string':'API ID', 'type':'char', 'required':True},
-    'user': {'string':'Login', 'type':'char', 'required':True},
-    'password': {'string':'Password', 'type':'char', 'required':True},
-    'text': {'string':'SMS Message', 'type':'text', 'required':True}
-}
-
-def _sms_send(self, cr, uid, data, context):
-    service = netsvc.LocalService("object_proxy")
-    lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', data['ids'], ['obj_num','obj_price','ach_uid'])
-    res = service.execute(cr.dbname,uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
-    #res = service.execute(cr.dbname, uid, 'res.partner', 'read', data['ids'], ['gsm'])
-#   service = netsvc.LocalService("object_proxy")
-#   pool=pooler.get_pool(cr.dbname)
-#   lots=pool.get('auction.lots').browse(cr,uid,data['id'],context)
-#   r=lots.ach_uid.id
-    nbr = 0
-    for r in res:
-        to = r['mobile']
-        if to:
-            tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
-            nbr += 1
-    return {'sms_sent': nbr}
-
-    if to:
-        tools.smssend(data['form']['user'], data['form']['password'], data['form']['app_id'], unicode(data['form']['text'], 'utf-8').encode('latin1'), to)
-        nbr += 1
-    return {'sms_sent': nbr}
-#
-#def _sms_send(self, uid, datas):
-#   service = netsvc.LocalService("object_proxy")
-#   pool=pooler.ger_pool(cr.dbname)
-#   lots=pool.get('auction.lots').browse(cr,uid,datas['ids'],context)
-#   #lots = service.execute(uid, 'auction.lots', 'read', datas['ids'], ['obj_num','obj_price','ach_uid'])
-#   #part = service.execute(uid, 'res.partner', 'read', [l['ach_uid'] for l in lots if l['ach_uid']], ['gsm'])
-#   
-#   part =ach_uid.id
-#   part = map(lambda x: (x.id,x.mobile), part)
-#   for l in lots:
-#       part.append(str(l.obj_num)+'-%dEUR' % int(l.obj_price))
-#
-#   for p in part.values():
-#       to = p.mobile
-#       if to:
-#           params = urllib.urlencode({'user': datas['form']['user'], 'password': datas['form']['password'], 'api_id': datas['form']['app_id'], 'text':unicode(datas['form']['text'].replace('[lots]',', '.join(p['lots'])), 'utf-8').encode('latin1'), 'to':to})
-#           f = urllib.urlopen("http://196.7.150.220/http/sendmsg", params)
-#           nbr+=1
-#   return {'sms_sent':nbr}
-
-class lots_sms(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':sms_send_form, 'fields': sms_send_fields, 'state':[('send','Send SMS'), ('end','Cancel')]}
-        },
-        'send': {
-            'actions': [_sms_send],
-            'result': {'type': 'state', 'state':'end'}
-        }
-    }
-lots_sms('auction.lots.sms_send');
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_pay.py b/addons/auction/wizard/wizard_pay.py
deleted file mode 100644
index ff68c2b5b8d..00000000000
--- a/addons/auction/wizard/wizard_pay.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-pay_form = '''<?xml version="1.0"?>
-<form string="Pay objects">
-    <field name="amount"/>
-    <field name="statement_id1" domain="[('state','=','draft')]"/>
-    <field name="amount2"/>
-    <field name="statement_id2"  domain="[('state','=','draft')]"/>
-    <field name="amount3"/>
-    <field name="statement_id3"  domain="[('state','=','draft')]"/>
-    <newline/>
-    <field name="buyer_id"/>
-    <field name="total"/>
-</form>'''
-
-def _start(self,cr,uid,data,context):
-    pool = pooler.get_pool(cr.dbname)
-    rec=pool.get('auction.lots').browse(cr,uid,data['ids'],context)
-    amount1=0.0
-    for r in rec:
-        amount1+=r.buyer_price
-        buyer= r and r.ach_uid.id or False
-        if r.is_ok:
-            raise wizard.except_wizard('Error !', 'Some lots of the selection are already paid.')
-    return {'amount':amount1, 'total':amount1,'buyer_id':buyer}
-
-pay_fields = {
-    'amount': {'string': 'Amount paid', 'type':'float'},
-    'buyer_id': {'string': 'Buyer', 'type': 'many2one', 'relation':'res.partner'},
-    'statement_id1': {'string':'Statement', 'type':'many2one', 'required':True, 'relation':'account.bank.statement'},
-    'amount2': {'string': 'Amount paid', 'type':'float'},
-    'statement_id2': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
-    'amount3': {'string': 'Amount paid', 'type':'float'},
-    'statement_id3': {'string':'Statement', 'type':'many2one', 'relation':'account.bank.statement'},
-    'total': {'string': 'Amount to paid', 'type':'float','readonly':True}
-}
-
-def _pay_and_reconcile(self, cr, uid, data, context):
-    if not abs(data['form']['total'] - (data['form']['amount']+data['form']['amount2']+data['form']['amount3']))<0.01:
-        rest=data['form']['total']-(data['form']['amount']+data['form']['amount2']+data['form']['amount3'])
-        raise wizard.except_wizard('Payment aborted !', 'You should pay all the total: "%.2f" are missing to accomplish the payment.' %(round(rest,2)))
-    
-    pool = pooler.get_pool(cr.dbname)
-    lots = pool.get('auction.lots').browse(cr,uid,data['ids'],context)
-    ref_bk_s=pooler.get_pool(cr.dbname).get('account.bank.statement.line')
-    
-    for lot in lots:
-        if data['form']['buyer_id']:
-            pool.get('auction.lots').write(cr,uid,[lot.id],{'ach_uid':data['form']['buyer_id']})
-        if not lot.auction_id:
-            raise wizard.except_wizard('Error !', 'No auction date for "%s": Please set one.'%(lot.name))
-        pool.get('auction.lots').write(cr,uid,[lot.id],{'is_ok':True})
-    
-    for st,stamount in [('statement_id1','amount'),('statement_id2','amount2'),('statement_id3','amount3')]:
-        if data['form'][st]:
-            new_id=ref_bk_s.create(cr,uid,{
-                'name':'Buyer:'+str(lot.ach_login or '')+', auction:'+ lots[0].auction_id.name,
-                'date': time.strftime('%Y-%m-%d'),
-                'partner_id':data['form']['buyer_id'] or False,
-                'type':'customer',
-                'statement_id':data['form'][st],
-                'account_id':lot.auction_id.acc_income.id,
-                'amount':data['form'][stamount]
-            })
-            for lot in lots:
-                pool.get('auction.lots').write(cr,uid,[lot.id],{'statement_id':[(4,new_id)]})
-    return {}
-
-
-class wiz_auc_lots_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_start],
-            'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
-        },
-        'pay': {
-        'actions': [_pay_and_reconcile],
-        'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_lots_pay('auction.pay.buy')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/auction/wizard/wizard_payer.py b/addons/auction/wizard/wizard_payer.py
deleted file mode 100644
index 6e224fbadad..00000000000
--- a/addons/auction/wizard/wizard_payer.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import netsvc
-import osv
-import time
-import pooler
-
-pay_form = '''<?xml version="1.0"?>
-<form string="Check payment for buyer">
-</form>'''
-pay_fields = {
-}
-
-
-pay_form1 = '''<?xml version="1.0"?>
-<form string="Check payment for seller">
-</form>'''
-pay_fields1 = {
-}
-def _payer(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'is_ok':True, 'state':'paid'})
-    return {}
-
-
-def _payer_sel(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    pool.get('auction.lots').write(cr,uid,data['ids'],{'paid_vnd':True})
-    return {}
-
-
-class wiz_auc_pay(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':pay_form, 'fields': pay_fields, 'state':[('end','Cancel'),('pay','Pay')]}
-        },
-        'pay': {
-        'actions': [_payer],
-        'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_pay('auction.payer')
-
-
-class wiz_auc_pay_sel(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':pay_form1, 'fields': pay_fields1, 'state':[('end','Cancel'),('pay2','Pay')]}
-        },
-        'pay2': {
-        'actions': [_payer_sel],
-        'result': {'type': 'state', 'state':'end'}
-        }}
-wiz_auc_pay_sel('auction.payer.sel')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From d98d3acc469ea63e598b1b2ebb2fcac8418c8241 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Wed, 10 Mar 2010 19:18:09 +0530
Subject: [PATCH 30/56] [IMP]: audittrail: Converted wizards to osv_memory
 wizards

bzr revid: rpa@tinyerp.com-20100310134809-80si1ahbkv8e0izb
---
 addons/audittrail/__terp__.py                 |  1 +
 addons/audittrail/audittrail_view.xml         |  4 +-
 addons/audittrail/wizard/__init__.py          |  2 +-
 .../audittrail/wizard/audittrail_view_log.py  | 72 +++++++++++++++++
 .../wizard/audittrail_view_log_view.xml       | 34 ++++++++
 addons/audittrail/wizard/wizard_view_log.py   | 81 -------------------
 6 files changed, 110 insertions(+), 84 deletions(-)
 create mode 100644 addons/audittrail/wizard/audittrail_view_log.py
 create mode 100644 addons/audittrail/wizard/audittrail_view_log_view.xml
 delete mode 100644 addons/audittrail/wizard/wizard_view_log.py

diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index e7ecd839efb..8718523e7f1 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -31,6 +31,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': [
+        'wizard/audittrail_view_log_view.xml',
         'audittrail_view.xml',
         'security/ir.model.access.csv',
         'security/audittrail_security.xml'
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 98a4ecc00e9..536ca78741e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -124,8 +124,8 @@
 		</record>
 		<menuitem name="Logs" id="menu_action_audittrail_log_tree" action="action_audittrail_log_tree" parent="menu_action_audittrail"/>
 
-		<wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>
-		<menuitem name="View Logs" id="menu_action_log_tree2" action="wizard_audittrail_log" type="wizard" parent="menu_action_audittrail"/>
+		<!--  <wizard string="View log" menu="False" model="audittrail.log" name="audittrail.view.log" id="wizard_audittrail_log"/>-->
+		<menuitem name="View Logs" id="menu_action_log_tree2" action="action_audittrail_view_log"  parent="menu_action_audittrail"/>
 
 </data>
 </openerp>
diff --git a/addons/audittrail/wizard/__init__.py b/addons/audittrail/wizard/__init__.py
index c7b5a20d884..9b2af466a01 100644
--- a/addons/audittrail/wizard/__init__.py
+++ b/addons/audittrail/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import wizard_view_log
+import audittrail_view_log
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
new file mode 100644
index 00000000000..2e170f27200
--- /dev/null
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -0,0 +1,72 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class audittrail_view_log(osv.osv_memory):
+    
+    _name = "audittrail.view.log"
+    _description = "View Log"
+    _columns ={
+               'from':fields.datetime('Log From'),
+               'to':fields.datetime('Log To', required = True)
+               }
+    _defaults = {
+                 'to': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
+             }
+    
+    def log_open_window(self, cr, uid, ids, context):
+        """
+        Open Log  form from given date range..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of audittrail view log’s IDs.
+        @return: Dictionary of  audittrail log form on given date range.
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = act_obj.read(cr, uid, [id])[0]
+        log_obj= self.pool.get(result['res_model'])
+        log_id = log_obj.search(cr, uid, [])
+        log_model=log_obj.read(cr, uid,log_id,['object_id'])  
+        for datas in self.read(cr, uid, ids):     
+            if not datas['from']:
+                if  datas['to'] <> time.strftime("%Y-%m-%d %H:%M:%S"):
+                    result['domain'] = str([('timestamp', '<',datas['to'])])                
+                else:
+                        pass
+            else:
+                result['domain'] = str([('timestamp', '>',datas['from']),('timestamp', '<',datas['to'])])
+        return result
+
+audittrail_view_log()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
new file mode 100644
index 00000000000..87648c7e136
--- /dev/null
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_audittrail_view_log" model="ir.ui.view">
+            <field name="name">audittrail.view.log.form</field>
+            <field name="model">audittrail.view.log</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Audit Logs">
+                	<group colspan="4" >
+                		 <field name="from" colspan="4"/>
+              			 <newline/>
+              			 <field name="to" colspan="4"/>   
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-open" string="Open Logs" name="log_open_window" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_audittrail_view_log" model="ir.actions.act_window">
+            <field name="name">View log</field>
+            <field name="res_model">audittrail.view.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_audittrail_view_log"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/audittrail/wizard/wizard_view_log.py b/addons/audittrail/wizard/wizard_view_log.py
deleted file mode 100644
index 81936bcd54c..00000000000
--- a/addons/audittrail/wizard/wizard_view_log.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-class wizard_view_log(wizard.interface):
-    
-    form1 = '''<?xml version="1.0"?>
-    <form string="Audit Logs">
-        <field name="from" colspan="4"/>
-        <newline/>
-        <field name="to" colspan="4"/>        
-    </form>'''
-    
-    form1_fields = {
-            'from': {
-                'string': 'Log From',
-                'type': 'datetime',
-        
-        },
-             'to': {
-                'string': 'Log To',
-                'type': 'datetime',
-                'default': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
-                'required':True
-        },
-    }
-    
-    
-    def _log_open_window(self, cr, uid, data, context):
-        mod_obj = pooler.get_pool(cr.dbname).get('ir.model.data')
-        act_obj = pooler.get_pool(cr.dbname).get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        result = act_obj.read(cr, uid, [id])[0]
-        log_obj= pooler.get_pool(cr.dbname).get(result['res_model'])
-        log_id = log_obj.search(cr, uid, [])
-        log_model=log_obj.read(cr, uid,log_id,['object_id'])       
-        if not data['form']['from']:
-            if  data['form']['to'] <> time.strftime("%Y-%m-%d %H:%M:%S"):
-                result['domain'] = str([('timestamp', '<',data['form']['to'])])                
-            else:
-                pass
-        else:
-            result['domain'] = str([('timestamp', '>',data['form']['from']),('timestamp', '<',data['form']['to'])])
-            
-        return result
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel'), ('open', 'Open Logs')]}
-        },
-        'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action':_log_open_window, 'state':'end'}
-        }
-    }
-wizard_view_log('audittrail.view.log')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From 52f667cbf8cce95e8c79632ed2f34311d02407bf Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 10:53:02 +0530
Subject: [PATCH 31/56] [IMP]: base_calendar: Converted wizard into osv_memory
 wizard

bzr revid: rpa@tinyerp.com-20100311052302-0eqro8knu4mpjs12
---
 addons/base_calendar/__terp__.py              |  3 +-
 addons/base_calendar/wizard/__init__.py       |  3 +-
 .../wizard/calendar_event_edit_all.py         | 85 +++++++++++++++++++
 .../wizard/calendar_event_edit_all_view.xml   | 41 +++++++++
 .../wizard/wizard_cal_edit_event.py           | 78 -----------------
 5 files changed, 130 insertions(+), 80 deletions(-)
 create mode 100644 addons/base_calendar/wizard/calendar_event_edit_all.py
 create mode 100644 addons/base_calendar/wizard/calendar_event_edit_all_view.xml
 delete mode 100644 addons/base_calendar/wizard/wizard_cal_edit_event.py

diff --git a/addons/base_calendar/__terp__.py b/addons/base_calendar/__terp__.py
index e433fbb7668..ce65e1166c5 100644
--- a/addons/base_calendar/__terp__.py
+++ b/addons/base_calendar/__terp__.py
@@ -40,7 +40,8 @@
                    ], 
     "demo_xml" : [], 
     "update_xml" : [
-                    'security/ir.model.access.csv', 
+                    'security/ir.model.access.csv',
+                    'wizard/calendar_event_edit_all_view.xml',
                     'base_calendar_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
index 60c61475131..38f790bcd42 100644
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/base_calendar/wizard/__init__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import wizard_cal_edit_event
+
+import calendar_event_edit_all
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
new file mode 100644
index 00000000000..0a7fddadb2a
--- /dev/null
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+
+class calendar_event_edit_all(osv.osv_memory):
+    
+    def _default_values(self, cr, uid, context={}):
+            """
+            @Return : Get Default value for Start Date
+            """
+            if context.get('date'):
+                 return context.get('date')
+            else:
+                model = context.get('model')
+                model_obj = self.pool.get(model)
+                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
+                return event['date']
+        
+    def _default_deadline(self, cr, uid, context={}):
+            """
+            @return : Get Default value for End Date
+            """
+            if context.get('date_deadline'):
+                 return context.get('date_deadline')
+            else:
+                model = context.get('model')
+                model_obj = self.pool.get(model)
+                event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
+                return event['date_deadline']
+
+    def _modify_this(self, cr, uid, ids, context=None):
+        """
+        Modify All event for Crm Meeting.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event edit all’s IDs
+        """
+        for datas in self.read(cr, uid, ids):
+            model = context.get('model')
+            model_obj = self.pool.get(model)
+            model_obj.modify_all(cr, uid, [context['active_id']], datas, context)
+            return {}
+    
+    _name = "calendar.event.edit.all"
+    _description = "Calendar Edit all event"
+    _columns ={
+              'name':fields.char('Title', size=64, required=True),
+              'date':fields.datetime('Start Date', required=True),
+              'date_deadline':fields.datetime('End Date', required=True),
+              'location':fields.char('Location', size=124),
+              'alarm_id':fields.many2one('res.alarm', 'Reminder'),
+               }
+    _defaults = {
+                 'date':_default_values,
+                 'date_deadline':_default_deadline
+             }
+    
+calendar_event_edit_all()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
new file mode 100644
index 00000000000..15bd025441a
--- /dev/null
+++ b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_edit_all" model="ir.ui.view">
+            <field name="name">calendar.event.edit.all.form</field>
+            <field name="model">calendar.event.edit.all</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Edit all Occurrences">
+                	<group colspan="4" >
+                		 <separator string="" colspan="4" />
+              			 <newline/>
+              			 <field name='name' colspan="4" />
+              			 <newline />
+              			 <field name='location' colspan="4" />
+              			 <newline />
+              			 <field name='date' />
+              			 <field name='date_deadline' />
+              			 <newline />
+              			 <field name='alarm_id'/>  
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="_Save" name="_modify_this" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_edit_all" model="ir.actions.act_window">
+            <field name="name">Edit all events</field>
+            <field name="res_model">calendar.event.edit.all</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_edit_all"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/base_calendar/wizard/wizard_cal_edit_event.py b/addons/base_calendar/wizard/wizard_cal_edit_event.py
deleted file mode 100644
index 40a658eb431..00000000000
--- a/addons/base_calendar/wizard/wizard_cal_edit_event.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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/>.
-#
-##############################################################################
-
-import wizard
-import pooler
-
-class event_edit_all(wizard.interface):
-    event_form = """<?xml version="1.0"?>
-                <form string="Edit all Occurrences">
-                    <separator string="" colspan="4" />
-                    <newline />
-                    <field name='name' colspan="4" />
-                    <newline />
-                    <field name='location' colspan="4" />
-                    <newline />
-                    <field name='date' />
-                    <field name='date_deadline' />
-                    <newline />
-                    <field name='alarm_id'/>
-                </form>"""
-
-    event_fields = {
-        'name': {'string': 'Title', 'type': 'char', 'size': 64, 'required': True}, 
-        'date': {'string': 'Start Date', 'type': 'datetime', 'required': True}, 
-        'date_deadline': {'string': 'End Date', 'type': 'datetime', 'required': True}, 
-        'location': {'string': 'Location', 'type': 'char', 'size': 124}, 
-        'alarm_id': {'string': 'Reminder', 'type': 'many2one', 'relation': 'res.alarm'}, 
-    }
-    
-    def _default_values(self, cr, uid, data, context=None):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        event = model_obj.read(cr, uid, data['id'], ['name', 'location', 'alarm_id'])
-        event.update({
-                      'date': context.get('date'), 
-                      'date_deadline': context.get('date_deadline')
-                      })
-        return event
-
-    def _modify_this(self, cr, uid, datas, context=None):
-        model = datas.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        model_obj.modify_all(cr, uid, [datas['id']], datas['form'], context)
-        return {}
-
-    states = {
-        'init': {
-            'actions': [_default_values], 
-            'result': {'type': 'form', 'arch': event_form, 'fields': event_fields, 
-                'state': [('end', 'Cancel', 'gtk-cancel'), ('edit', '_Save', 'gtk-save')]}
-        }, 
-        'edit': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _modify_this, 'state': 'end'}
-        }
-    }
-
-event_edit_all('calendar.event.edit.all')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 799cc969db05c34cc3a2471718e99ecfee4e5880 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 10:58:58 +0530
Subject: [PATCH 32/56] [IMP]: crm: changes related to base_calendar wizard
 changes

bzr revid: rpa@tinyerp.com-20100311052858-zel2jtsyeh270cey
---
 addons/crm/__terp__.py                          |  1 -
 addons/crm/crm_meeting_view.xml                 |  2 +-
 addons/crm/crm_meeting_wizard.xml               |  8 --------
 addons/project_caldav/project_caldav_wizard.xml | 13 -------------
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 addons/crm/crm_meeting_wizard.xml

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 994f11f3212..80f0eef8758 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -67,7 +67,6 @@ between mails and Open ERP.""",
         'crm_lead_wizard.xml', 
         'crm_lead_view.xml', 
         'crm_lead_menu.xml', 
-        'crm_meeting_wizard.xml', 
         'crm_meeting_view.xml', 
         'crm_meeting_menu.xml', 
         'crm_phonecall_wizard.xml', 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a1f1cef502e..59bedbb3b6a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -38,7 +38,7 @@
                            <field name="rrule_type" string="Recurrency"
                                 colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
                             <button string="Edit All" help="Edit all Ourrences of recurrent Meeting" attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-                            name="%(wizard_edit_all_events)d" icon="gtk-edit"
+                            name="%(base_calendar.action_calendar_event_edit_all)d" icon="gtk-edit"
                             type="action" context="{'model' : 'crm.meeting', 'date': date, 'date_deadline': date_deadline}" />
                     </group>
 
diff --git a/addons/crm/crm_meeting_wizard.xml b/addons/crm/crm_meeting_wizard.xml
deleted file mode 100644
index 8d6b66b3f2d..00000000000
--- a/addons/crm/crm_meeting_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard string="Edit all events" model="crm.meeting"
-			name="calendar.event.edit.all" id="wizard_edit_all_events"
-			menu="False" />
-	</data>
-</openerp>
diff --git a/addons/project_caldav/project_caldav_wizard.xml b/addons/project_caldav/project_caldav_wizard.xml
index 2bb677eea46..53c78a99bf2 100644
--- a/addons/project_caldav/project_caldav_wizard.xml
+++ b/addons/project_caldav/project_caldav_wizard.xml
@@ -1,18 +1,5 @@
 <openerp>
 	<data>
-		<wizard string="Import .ics File" model="project.task"
-			name="calendar.event.import" id="caldav.wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="project.task" name="calendar.event.subscribe"
-			id="caldav.wizard_cal_event_subscribe" />
-
-		<wizard string="Export .ics File" model="project.task"
-			name="calendar.event.export" id="caldav.wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="project.task"
-			name="calendar.event.edit.this" id="caldav.wizard_edit_this_event"
-			menu="False" />
 
 	</data>
 </openerp>

From 223c30b38a4ff29114bd68e03a404bb88cc4a59e Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 11:10:47 +0530
Subject: [PATCH 33/56] [IMP]: base_report_creator: Converted create menu
 wizard into osv_memory wizard

bzr revid: rpa@tinyerp.com-20100311054047-clk9fldz9ni87gl8
---
 addons/base_report_creator/__terp__.py        |   1 +
 .../base_report_creator_view.xml              |   2 +-
 .../base_report_creator_wizard.xml            |  15 +--
 addons/base_report_creator/wizard/__init__.py |   1 +
 .../wizard/report_menu_create.py              | 101 ++++++++----------
 .../wizard/report_menu_create_view.xml        |  34 ++++++
 6 files changed, 89 insertions(+), 65 deletions(-)
 create mode 100644 addons/base_report_creator/wizard/report_menu_create_view.xml

diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
index 5a78a903a5c..bee7ec57c91 100644
--- a/addons/base_report_creator/__terp__.py
+++ b/addons/base_report_creator/__terp__.py
@@ -37,6 +37,7 @@ the "Dashboard" menu.
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
+        'wizard/report_menu_create_view.xml',
         'base_report_creator_wizard.xml',
         'base_report_creator_view.xml'
     ],
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 30c6b3735a9..1d606b93ec4 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -41,7 +41,7 @@
                     <field name="model_ids" colspan="4" context="{'model_ids':model_ids}"/>
                     <separator string="State"  colspan="4"/>
                     <field name="state"/>
-                    <button string="Create Menu" name="%(wizard_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
+                    <button string="Create Menu" name="%(action_report_menu_create)d" type="action" colspan="2" icon="gtk-justify-fill"/>
                 </page><page string="View parameters">
                     <separator string="Used View" colspan="4"/>
                     <field name="view_type1"/>
diff --git a/addons/base_report_creator/base_report_creator_wizard.xml b/addons/base_report_creator/base_report_creator_wizard.xml
index eb956e89c6d..a8dad6f9b41 100644
--- a/addons/base_report_creator/base_report_creator_wizard.xml
+++ b/addons/base_report_creator/base_report_creator_wizard.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
-	<wizard
-			id="wizard_set_filter_fields"
-			string="Set Filter Fields"
-			name="base_report_creator.report_filter.fields"/>
-	<wizard
-			id="wizard_menu_create"
-			string="Create Menu for Report"
-			name="base_report_creator.report.menu.create"/>
-</data>
+	<data>
+		<wizard id="wizard_set_filter_fields" string="Set Filter Fields"
+			name="base_report_creator.report_filter.fields" />
+
+	</data>
 </openerp>
diff --git a/addons/base_report_creator/wizard/__init__.py b/addons/base_report_creator/wizard/__init__.py
index 8fd4dff283a..945d42586d1 100644
--- a/addons/base_report_creator/wizard/__init__.py
+++ b/addons/base_report_creator/wizard/__init__.py
@@ -22,5 +22,6 @@
 import wiz_set_filter_fields
 import base_report_creator_open
 import report_menu_create
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 5d3cc322a7f..38821a81797 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -20,62 +20,55 @@
 ##############################################################################
 
 
-import time
-import wizard
-import osv
+from osv import fields, osv
+from tools.translate import _
+import netsvc
 import pooler
+import time
+import tools
+import wizard
 
-section_form = '''<?xml version="1.0"?>
-<form string="Create Menu For This Report">
-    <separator string="Menu Information" colspan="4"/>
-    <field name="menu_name"/>
-    <field name="menu_parent_id"/>
-</form>'''
-
-section_fields = {
-    'menu_name': {'string':'Menu Name', 'type':'char', 'required':True, 'size':64},
-    'menu_parent_id': {'string':'Parent Menu', 'type':'many2one', 'relation':'ir.ui.menu', 'required':True},
-}
-
-def report_menu_create(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    board = pool.get('base_report_creator.report').browse(cr, uid, data['id'])
-
-    view = board.view_type1
-    if board.view_type2:
-        view+=','+board.view_type2
-    if board.view_type3:
-        view+=','+board.view_type3
-    action_id = pool.get('ir.actions.act_window').create(cr, uid, {
-        'name': board.name,
-        'view_type':'form',
-        'view_mode':view,
-        'context': "{'report_id':%d}" % (board.id,),
-        'res_model': 'base_report_creator.report'
-    })
-    pool.get('ir.ui.menu').create(cr, uid, {
-        'name': data['form']['menu_name'],
-        'parent_id': data['form']['menu_parent_id'],
-        'icon': 'STOCK_SELECT_COLOR',
-        'action': 'ir.actions.act_window,'+str(action_id)
-    }, context)
-    return {}
-
-class wizard_section_menu_create(wizard.interface):
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type':'form', 'arch':section_form, 'fields':section_fields, 'state':[('end','Cancel'),('create_menu','Create Menu')]}
-        },
-        'create_menu': {
-            'actions': [report_menu_create], 
-            'result': {
-                'type':'state', 
-                'state':'end'
-            }
-        }
-    }
-wizard_section_menu_create('base_report_creator.report.menu.create')
+class report_menu_create(osv.osv_memory):
+    """
+    Create Menu
+    """
+    _name = "report.menu.create"
+    _description = "Menu Create"
+    _columns ={
+              'menu_name':fields.char('Menu Name', size=64, required=True),
+              'menu_parent_id':fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
+               }
+    
+    def report_menu_create(self, cr, uid, ids, context):
+        """
+        Create Menu.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Report Menu Create's IDs
+        """
+        board = self.pool.get('base_report_creator.report').browse(cr, uid, context['active_id'])
+        view = board.view_type1
+        if board.view_type2:
+            view+=','+board.view_type2
+        if board.view_type3:
+            view+=','+board.view_type3
+        action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
+            'name': board.name,
+            'view_type':'form',
+            'view_mode':view,
+            'context': "{'report_id':%d}" % (board.id,),
+            'res_model': 'base_report_creator.report'
+            })
+        for data in self.read(cr, uid, ids):
+            self.pool.get('ir.ui.menu').create(cr, uid, {
+                'name': data['menu_name'],
+                'parent_id': data['menu_parent_id'],
+                'icon': 'STOCK_SELECT_COLOR',
+                'action': 'ir.actions.act_window,'+str(action_id)
+                }, context)
+            return {}
+    
+report_menu_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_creator/wizard/report_menu_create_view.xml b/addons/base_report_creator/wizard/report_menu_create_view.xml
new file mode 100644
index 00000000000..dd8ecb441c4
--- /dev/null
+++ b/addons/base_report_creator/wizard/report_menu_create_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_report_menu_create" model="ir.ui.view">
+            <field name="name">report.menu.create.form</field>
+            <field name="model">report.menu.create</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Create Menu For This Report">
+                	<group colspan="4" >
+                		 <separator string="Menu Information" colspan="4"/>
+              			 <field name="menu_name"/>
+              			 <field name="menu_parent_id"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    	<button  icon="gtk-save" string="Create Menu" name="report_menu_create" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_report_menu_create" model="ir.actions.act_window">
+            <field name="name">Create Menu for Report</field>
+            <field name="res_model">report.menu.create</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_report_menu_create"/> 
+           <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file

From e7fb07589f310a2e1b2d4d8ca8cdea3d7d2a3837 Mon Sep 17 00:00:00 2001
From: "ATP (Open ERP)" <>
Date: Thu, 11 Mar 2010 14:08:18 +0530
Subject: [PATCH 34/56] [IMP]: caldav: converted wizards into osv_memory
 wizards

bzr revid: rpa@tinyerp.com-20100311083818-fp3ve2g95mwa3wxu
---
 addons/caldav/__init__.py                     |  8 +-
 addons/caldav/__terp__.py                     |  4 +-
 addons/caldav/caldav_wizard.xml               | 19 ----
 addons/caldav/wizard/__init__.py              |  7 +-
 addons/caldav/wizard/calendar_event_export.py | 69 +++++++++++++
 .../wizard/calendar_event_export_view.xml     | 49 ++++++++++
 addons/caldav/wizard/calendar_event_import.py | 78 +++++++++++++++
 .../wizard/calendar_event_import_view.xml     | 61 ++++++++++++
 .../caldav/wizard/calendar_event_subscribe.py | 89 +++++++++++++++++
 .../wizard/calendar_event_subscribe_view.xml  | 61 ++++++++++++
 addons/caldav/wizard/wizard_cal_export.py     | 65 -------------
 addons/caldav/wizard/wizard_cal_import.py     | 88 -----------------
 addons/caldav/wizard/wizard_cal_subscribe.py  | 97 -------------------
 13 files changed, 417 insertions(+), 278 deletions(-)
 delete mode 100644 addons/caldav/caldav_wizard.xml
 create mode 100644 addons/caldav/wizard/calendar_event_export.py
 create mode 100644 addons/caldav/wizard/calendar_event_export_view.xml
 create mode 100644 addons/caldav/wizard/calendar_event_import.py
 create mode 100644 addons/caldav/wizard/calendar_event_import_view.xml
 create mode 100644 addons/caldav/wizard/calendar_event_subscribe.py
 create mode 100644 addons/caldav/wizard/calendar_event_subscribe_view.xml
 delete mode 100644 addons/caldav/wizard/wizard_cal_export.py
 delete mode 100644 addons/caldav/wizard/wizard_cal_import.py
 delete mode 100644 addons/caldav/wizard/wizard_cal_subscribe.py

diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
index 19f11301420..a7731ca526a 100644
--- a/addons/caldav/__init__.py
+++ b/addons/caldav/__init__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import caldav
-import caldav_cache
-import caldav_fs
-import caldav_node
-import webdav_server
+#import caldav_cache
+#import caldav_fs
+#import caldav_node
+#import webdav_server
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__terp__.py b/addons/caldav/__terp__.py
index db6e46b1daa..1d25ad8cb77 100644
--- a/addons/caldav/__terp__.py
+++ b/addons/caldav/__terp__.py
@@ -49,7 +49,9 @@
     "demo_xml" : [], 
     "update_xml" : [
                     'security/ir.model.access.csv', 
-                    'caldav_wizard.xml', 
+                    'wizard/calendar_event_export_view.xml',
+                    'wizard/calendar_event_import_view.xml',
+                    'wizard/calendar_event_subscribe_view.xml',
                     'caldav_view.xml'
                     ], 
     "installable" : True, 
diff --git a/addons/caldav/caldav_wizard.xml b/addons/caldav/caldav_wizard.xml
deleted file mode 100644
index eaebba4234a..00000000000
--- a/addons/caldav/caldav_wizard.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-		<wizard string="Import .ics File" model="basic.calendar"
-			name="calendar.event.import" id="wizard_cal_event_import" />
-
-		<wizard string="Subscribe"
-			model="basic.calendar" name="calendar.event.subscribe"
-			id="wizard_cal_event_subscribe" multi="True" />
-
-		<wizard string="Export .ics File" model="basic.calendar"
-			name="calendar.event.export" id="wizard_cal_event_export" />
-
-		<wizard string="Edit this event" model="basic.calendar.event"
-			name="calendar.event.edit.this" id="wizard_edit_this_event"
-			menu="False" />
-
-	</data>
-</openerp>
\ No newline at end of file
diff --git a/addons/caldav/wizard/__init__.py b/addons/caldav/wizard/__init__.py
index 4ab34601a96..1c45cb2a191 100755
--- a/addons/caldav/wizard/__init__.py
+++ b/addons/caldav/wizard/__init__.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import wizard_cal_export
-import wizard_cal_import
-import wizard_cal_subscribe
+import calendar_event_export
+import calendar_event_import
+import calendar_event_subscribe
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
new file mode 100644
index 00000000000..3bee5a5089f
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -0,0 +1,69 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+
+class calendar_event_export(osv.osv_memory):
+    """
+    Export Calendar Event.
+    """
+    def _process_export_ics(self, cr, uid, context):
+        """
+        Get Default value for file_path field.
+        """
+        model = context.get('model', 'basic.calendar')
+        model_obj = self.pool.get(model)
+        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+        #TODO: check why returns wrong value
+        return base64.encodestring(calendar)
+                            
+    def _process_export_ics_name(self, cr, uid, context):
+        """
+        Get Default value for Name field.
+        """
+        model = context.get('model', 'basic.calendar')
+        model_obj = self.pool.get(model)
+        calendar = model_obj.export_cal(cr, uid, context['active_ids'], context)
+        return  'OpenERP %s.ics' % (model_obj._description)
+    
+    _name = "calendar.event.export"
+    _description = "Event Export"
+    _columns = {
+              'file_path':fields.binary('Save ICS file', filters='*.ics', required=True),
+              'name':fields.char('File name', size=34, required=True, help='Save in .ics format')
+               }
+    
+    _defaults={
+               'name':_process_export_ics_name,
+               'file_path':_process_export_ics
+               }
+    
+calendar_event_export()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
new file mode 100644
index 00000000000..0a049e15083
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_export_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_export" model="ir.ui.view">
+            <field name="name">calendar.event.export.form</field>
+            <field name="model">calendar.event.export</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Export ICS">
+                	<group colspan="4" >
+                		 <field name="name"/>
+              			 <field name="file_path" colspan="4" width="300"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_export" model="ir.actions.act_window">
+            <field name="name">Export .ics File</field>
+            <field name="res_model">calendar.event.export</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_export"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+<!--        <record id="action_calendar_event_export_values" model="ir.values">-->
+<!--            <field name="model_id" ref="caldav.model_basic_calendar" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Export .ics File</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_export'))"/>-->
+<!--            <field name="key">action</field> -->
+<!--            <field name="model">basic.calendar</field>-->
+<!--        </record>-->
+
+
+    	<act_window id="action_calendar_event_export_values"
+    		key2="client_action_multi" name="Export .ics File"
+    		res_model="calendar.event.export" src_model="basic.calendar"
+    		view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
new file mode 100644
index 00000000000..ba72e1c8c6d
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -0,0 +1,78 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+
+class calendar_event_import(osv.osv_memory):
+    """
+    Import Calendar Event.
+    """
+    cnt = 0
+    def _process_imp_ics(self, cr, uid, ids, context=None):
+        """
+        Process Import ics File.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event import’s IDs
+        @return: dictionary of calendar evet import  window with Import successful msg.
+        """
+        for data in self.read(cr, uid, ids):
+            model = data.get('model', 'basic.calendar')
+            model_obj = self.pool.get(model)
+            context.update({'model': model})
+            data_obj = self.pool.get('ir.model.data')
+            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_import_display')
+            if id2:
+                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            vals = model_obj.import_cal(cr, uid, data['file_path'], context['active_id'], context)
+            global cnt
+            if vals:
+                cnt = len(vals)
+            value = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'calendar.event.import',
+                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'target': 'new'
+            }
+            return value
+    
+    _name = "calendar.event.import"
+    _description = "Event Import"
+    _columns = {
+                  'file_path': fields.binary('Select ICS file', filters='*.ics', required=True),
+                  'msg': fields.text('', readonly=True),
+               }
+    _defaults={
+               'msg':lambda *a:'Import Sucessful'
+               }
+    
+calendar_event_import()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
new file mode 100644
index 00000000000..1fbd89b2499
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_import" model="ir.ui.view">
+            <field name="name">calendar.event.import.form</field>
+            <field name="model">calendar.event.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import ICS">
+                	<group colspan="4" >
+                		 <separator string="Select ICS file"/>
+              			 <field name="file_path" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Import" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_calendar_event_import_display" model="ir.ui.view">
+            <field name="name">calendar.event.import.form.display</field>
+            <field name="model">calendar.event.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Message">
+                	<group colspan="4" >
+                		  <field name="msg" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4">
+                    	<button  icon="gtk-ok" special="cancel" string="Ok"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_import" model="ir.actions.act_window">
+            <field name="name">Import .ics File</field>
+            <field name="res_model">calendar.event.import</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_import"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <record id="action_calendar_event_import_values" model="ir.values">
+            <field name="model_id" ref="caldav.model_basic_calendar" />
+            <field name="object" eval="1" />
+            <field name="name">Import .ics File</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_import'))"/>
+            <field name="key">action</field> 
+            <field name="model">basic.calendar</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
new file mode 100644
index 00000000000..aa539938877
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -0,0 +1,89 @@
+# -*- 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 fields, osv
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import tools
+import wizard
+import base64
+import urllib
+
+class calendar_event_subscribe(osv.osv_memory):
+    """
+    Subscribe  Calendar Event.
+    """
+    cnt = 0
+    def _process_imp_ics(self, cr, uid, ids, context=None):
+        """
+        process ics file.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of calendar event subscribe’s IDs
+        @return: dictionary of calendar evet subscribe  window with Import successful msg.
+        """
+        global cnt
+        for data in self.read(cr, uid, ids):
+            try:
+                f =  urllib.urlopen(data['url_path'])
+                caldata = f.fp.read()
+                f.close()
+            except Exception,e:
+                raise osv.except_osv(_('Error!'), _('Please provide Proper URL !'))
+            model = data.get('model', 'basic.calendar')
+            model_obj = self.pool.get(model)
+            context.update({'url': data['url_path'],
+                                    'model': data.get('model', 'basic.calendar')})
+            vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), \
+                                            context['active_id'],  context)
+            if vals:
+                cnt = vals['count']
+            data_obj = self.pool.get('ir.model.data')
+            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_subscribe_display')
+            if id2:
+                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+          
+            value = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'calendar.event.subscribe',
+                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+                'type': 'ir.actions.act_window',
+                'target': 'new'
+            }
+            return value
+    
+    _name = "calendar.event.subscribe"
+    _description = "Event subscribe"
+    _columns = {
+                'url_path': fields.char('Provide path for remote calendar', size=124, required=True),
+                'msg': fields.text('', readonly=True),
+               }
+    _defaults={
+               'msg':lambda *a:'Import Sucessful.'
+               }
+    
+calendar_event_subscribe()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
new file mode 100644
index 00000000000..95c06c20f6e
--- /dev/null
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+  		<record id="view_calendar_event_subscribe" model="ir.ui.view">
+            <field name="name">calendar.event.subscribe.form</field>
+            <field name="model">calendar.event.subscribe</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Subscribe to Remote Calendar">
+                	<group colspan="4" >
+                		 <separator string="Provide path for Remote Calendar"/>
+              			  <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4" col="6">
+                    	<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    	<button  icon="gtk-ok"  name="_process_imp_ics"  string="_Subscribe" type="object"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+  		<record id="view_calendar_event_subscribe_display" model="ir.ui.view">
+            <field name="name">calendar.event.subscribe.form.display</field>
+            <field name="model">calendar.event.subscribe</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Message...">
+                	<group colspan="4" >
+                		  <field name="msg" colspan="4" width="300" nolabel="1"/>
+                    </group>
+                       	<separator string="" colspan="4" />
+                    <group colspan="4">
+                    	<button  icon="gtk-ok" special="cancel" string="Ok"/>
+                   </group>
+               </form>
+            </field>
+  		</record>
+  		
+        <record id="action_calendar_event_subscribe" model="ir.actions.act_window">
+            <field name="name">Subscribe</field>
+            <field name="res_model">calendar.event.subscribe</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           <field name="view_id" ref="view_calendar_event_subscribe"/> 
+           <field name="target">new</field>
+           <field name="context">{'record_id':active_id}</field>
+        </record>
+              
+        <record id="action_calendar_event_subscribe_values" model="ir.values">
+            <field name="model_id" ref="caldav.model_basic_calendar" />
+            <field name="object" eval="1" />
+            <field name="name">Subscribe</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_calendar_event_subscribe'))"/>
+            <field name="key">action</field> 
+            <field name="model">basic.calendar</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/caldav/wizard/wizard_cal_export.py b/addons/caldav/wizard/wizard_cal_export.py
deleted file mode 100644
index f7896c738d7..00000000000
--- a/addons/caldav/wizard/wizard_cal_export.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import base64
-import pooler
-
-
-class cal_event_export_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Export ICS">
-        <field name="name"/>
-        <field name="file_path" colspan="4" width="300"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Save ICS file', 
-                'type': 'binary', 
-                'required': True, 
-                'filters': '*.ics'
-                },
-            'name': {
-                    'string': 'File name', 
-                    'type': 'char', 
-                    'size': 34, 
-                    'required': True, 
-                    'help': 'Save in .ics format'}, 
-            }
-    
-    def _process_export_ics(self, cr, uid, data, context):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        calendar = model_obj.export_cal(cr, uid, data['ids'], context)
-        return {'file_path': base64.encodestring(calendar), \
-                            'name': 'OpenERP %s.ics' % (model_obj._description)}
-
-    states = {
-        'init': {
-            'actions': [_process_export_ics], 
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel')]}}, 
-    }
-    
-cal_event_export_wizard('calendar.event.export')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/wizard_cal_import.py b/addons/caldav/wizard/wizard_cal_import.py
deleted file mode 100644
index a5670f545fa..00000000000
--- a/addons/caldav/wizard/wizard_cal_import.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-import wizard
-import pooler
-
-
-class cal_event_import_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Import ICS">
-        <separator string="Select ICS file"/>
-        <field name="file_path" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    form1_fields = {
-            'file_path': {
-                'string': 'Select ICS file', 
-                'type': 'binary', 
-                'required': True, 
-                'filters': '*.ics'
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Import Message">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        context.update({'model': model})
-        vals = model_obj.import_cal(cr, uid, data['form']['file_path'], data['id'], context)
-        global cnt
-        cnt = 0
-        if vals:
-            cnt = len(vals)
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        msg = (cnt and "Imported %s components" % cnt) or 'Import Sucessful' 
-        return {'msg': msg}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Import', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        }, 
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-cal_event_import_wizard('calendar.event.import')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/wizard_cal_subscribe.py b/addons/caldav/wizard/wizard_cal_subscribe.py
deleted file mode 100644
index 709c61d0b25..00000000000
--- a/addons/caldav/wizard/wizard_cal_subscribe.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- 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 tools.translate import _
-import base64
-import pooler
-import urllib
-import wizard
-
-class cal_event_subscribe_wizard(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="Subscribe to Remote Calendar">
-        <separator string="Provide path for Remote Calendar"/>
-        <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
-    </form>'''
-    
-    form1_fields = {
-            'url_path': {
-                'string': 'Provide path for remote calendar', 
-                'type': 'char', 
-                'required': True, 
-                'size': 124
-                }
-            }
-    display = '''<?xml version="1.0"?>
-    <form string="Message...">
-        <field name="msg" colspan="4" width="300" nolabel="1"/>
-    </form>'''
-    
-    display_fields = {
-            'msg': {
-                'string': '', 
-                'type': 'text', 
-                'readonly': True, 
-                }
-            }
-
-    def _process_imp_ics(self, cr, uid, data, context=None):
-        global cnt
-        cnt = 0
-        try:
-            f =  urllib.urlopen(data['form']['url_path'])
-            caldata = f.fp.read()
-            f.close()
-        except Exception,e:
-            raise wizard.except_wizard(_('Error!'), _('Please provide Proper URL !'))
-        model = data.get('model')
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        context.update({'url': data['form']['url_path'],
-                                    'model': data.get('model')})
-        vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), \
-                                            data['id'],  context)
-        if vals:
-            cnt = vals['count']
-        return {}
-    
-    def _result_set(self, cr, uid, data, context=None):
-        return {'msg': 'Import Sucessful.'}
-    
-    states = {
-        'init': {
-            'actions': [], 
-            'result': {'type': 'form', 'arch': form1, 'fields': form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), ('open', '_Subscribe', 'gtk-ok')]}
-        }, 
-        'open': {
-            'actions': [], 
-            'result': {'type': 'action', 'action': _process_imp_ics, 'state': 'display'}
-        },
-       'display': {
-            'actions': [_result_set], 
-            'result': {'type': 'form', 'arch': display, 'fields': display_fields, \
-                       'state': [('end', 'Ok', 'gtk-ok')]}
-        }, 
-    }
-    
-cal_event_subscribe_wizard('calendar.event.subscribe')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 587828161d84b829e03eb312d962b4dd9b40300f Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Thu, 11 Mar 2010 14:19:41 +0530
Subject: [PATCH 35/56] [ADD]:suppot for __openerp__.py or __terp__.py

bzr revid: rvo@tinyerp.co.in-20100311084941-1l92enpyz1a98hrr
---
 bin/addons/__init__.py           | 32 +++++++++++++++++++-------------
 bin/addons/base/module/module.py |  5 ++++-
 bin/addons/module_graph.py       | 13 +++++++++----
 bin/tools/config.py              | 16 ++++++++--------
 bin/tools/misc.py                | 10 ++++++++--
 setup.py                         |  8 ++++++--
 6 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index bdd3da46bbf..4e939bf01dc 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -89,7 +89,7 @@ class Graph(dict):
 
         ## and we update the default values with values from the database
         additional_data.update(dict([(x.pop('name'), x) for x in cr.dictfetchall()]))
-        
+
         for package in self.values():
             for k, v in additional_data[package.name].items():
                 setattr(package, k, v)
@@ -221,7 +221,7 @@ def get_module_as_zip_from_module_directory(module_directory, b64enc=True, src=T
         base = os.path.basename(path)
         for f in tools.osutil.listdir(path, True):
             bf = os.path.basename(f)
-            if not RE_exclude.search(bf) and (src or bf == '__terp__.py' or not bf.endswith('.py')):
+            if not RE_exclude.search(bf) and (src or bf == '__openerp__.py' or bf == '__terp__.py' or not bf.endswith('.py')):
                 archive.write(os.path.join(path, f), os.path.join(base, f))
 
     archname = StringIO()
@@ -298,8 +298,10 @@ def get_modules_with_version():
     modules = get_modules()
     res = {}
     for module in modules:
-        terp = get_module_resource(module, '__terp__.py')
         try:
+            terp = get_module_resource(module, '__openerp__.py')
+            if not os.path.isfile(terp):
+                terp = addons.get_module_resource(module, '__terp__.py')
             info = eval(tools.file_open(terp).read())
             res[module] = "%s.%s" % (release.major_version, info['version'])
         except Exception, e:
@@ -318,13 +320,17 @@ def upgrade_graph(graph, cr, module_list, force=None):
     len_graph = len(graph)
     for module in module_list:
         mod_path = get_module_path(module)
-        terp_file = get_module_resource(module, '__terp__.py')
+        terp_file = get_module_resource(module, '__openerp__.py')
+        if not os.path.isfile(terp_file):
+            terp_file = get_module_resource(module, '__terp__.py')
+
         if not mod_path or not terp_file:
             global not_loaded
             not_loaded.append(module)
             logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: not installable' % (module))
             raise osv.osv.except_osv('Error!',"Module '%s' was not found" % (module,))
 
+
         if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path+'.zip'):
             try:
                 info = eval(tools.file_open(terp_file).read())
@@ -337,7 +343,7 @@ def upgrade_graph(graph, cr, module_list, force=None):
 
     dependencies = dict([(p, deps) for p, deps, data in packages])
     current, later = set([p for p, dep, data in packages]), set()
-    
+
     while packages and current > later:
         package, deps, data = packages[0]
 
@@ -378,7 +384,7 @@ def init_module_objects(cr, module_name, obj_list):
         try:
             result = obj._auto_init(cr, {'module': module_name})
         except Exception, e:
-            raise 
+            raise
         if result:
             todo += result
         if hasattr(obj, 'init'):
@@ -588,7 +594,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
     modobj = None
 
     logger.notifyChannel('init', netsvc.LOG_DEBUG, 'loading %d packages..' % len(graph))
-    
+
     for package in graph:
         logger.notifyChannel('init', netsvc.LOG_INFO, 'module %s: loading objects' % package.name)
         migrations.migrate_module(package, 'pre')
@@ -597,7 +603,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
         if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
             init_module_objects(cr, package.name, modules)
         cr.commit()
-        
+
     for package in graph:
         status['progress'] = (float(statusi)+0.1) / len(graph)
         m = package.name
@@ -698,7 +704,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
     cr = db.cursor()
     if cr:
        cr.execute("SELECT relname FROM pg_class WHERE relkind='r' AND relname='ir_module_module'")
-       if len(cr.fetchall())==0:    
+       if len(cr.fetchall())==0:
            logger.notifyChannel("init", netsvc.LOG_INFO, "init db")
            tools.init_db(cr)
 #           cr.execute("update res_users set password=%s where id=%s",('admin',1))
@@ -706,7 +712,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
            tools.config["init"]["all"] = 1
            tools.config['update']['all'] = 1
            if not tools.config['without_demo']:
-               tools.config["demo"]['all'] = 1 
+               tools.config["demo"]['all'] = 1
     force = []
     if force_demo:
         force.append('demo')
@@ -716,7 +722,6 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         # NOTE: Try to also load the modules that have been marked as uninstallable previously...
         STATES_TO_LOAD = ['installed', 'to upgrade', 'uninstallable']
         graph = create_graph(cr, ['base'], force)
-
         has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
 
         global not_loaded
@@ -761,6 +766,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
             if new_modules_in_graph == 0:
                 # nothing to load
                 break
+
             logger.notifyChannel('init', netsvc.LOG_DEBUG, 'Updating graph with %d more modules' % (len(module_list)))
             r = load_module_graph(cr, graph, status, report=report)
             has_updates = has_updates or r
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index a474866f885..faec4ffa9be 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -65,7 +65,10 @@ class module(osv.osv):
 
     def get_module_info(self, name):
         try:
-            f = tools.file_open(os.path.join(name, '__terp__.py'))
+            terp_file = addons.get_module_resource(name, '__openerp__.py')
+            if not os.path.isfile(terp_file):
+                terp_file = addons.get_module_resource(name, '__terp__.py')
+            f = tools.file_open(terp_file)
             data = f.read()
             info = eval(data)
             if 'version' in info:
diff --git a/bin/addons/module_graph.py b/bin/addons/module_graph.py
index 74d4115a086..e321592ccc7 100755
--- a/bin/addons/module_graph.py
+++ b/bin/addons/module_graph.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -16,7 +16,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -32,7 +32,8 @@ if len(sys.argv) == 2 and (sys.argv[1] in ['-h', '--help']):
 
 modules = sys.argv[1:]
 if not len(modules):
-    modules = map(os.path.dirname, glob.glob(os.path.join('*', '__terp__.py')))
+    modules = map(os.path.dirname, glob.glob(os.path.join('*', '__openerp__.py')))
+    modules += map(os.path.dirname, glob.glob(os.path.join('*', '__terp__.py')))
 
 done = []
 
@@ -40,7 +41,11 @@ print 'digraph G {'
 while len(modules):
     f = modules.pop(0)
     done.append(f)
-    if os.path.isfile(os.path.join(f,"__terp__.py")):
+    terp_file = os.path.join(f,"__openerp__.py")
+    if not os.path.isfile(terp_file):
+        terp_file = os.path.join(f,"__terp__.py")
+
+    if os.path.isfile(terp_file):
         info=eval(file(os.path.join(f,"__terp__.py")).read())
         if info.get('installable', True):
             for name in info['depends']:
diff --git a/bin/tools/config.py b/bin/tools/config.py
index bc4aa98b77e..57f0388a238 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -83,7 +83,7 @@ class configmanager(object):
             'list_db' : True,
             'timezone' : False, # to override the default TZ
         }
-    
+
         self.misc = {}
 
         hasSSL = check_ssl()
@@ -234,7 +234,7 @@ class configmanager(object):
         keys = ['interface', 'port', 'db_name', 'db_user', 'db_password', 'db_host',
                 'db_port', 'list_db', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout',
                 'email_from', 'smtp_server', 'smtp_user', 'smtp_password', 'price_accuracy',
-                'netinterface', 'netport', 'db_maxconn', 'import_partial', 'addons_path', 
+                'netinterface', 'netport', 'db_maxconn', 'import_partial', 'addons_path',
                 'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone',]
 
         if hasSSL:
@@ -278,7 +278,7 @@ class configmanager(object):
         self.options['translate_modules'].sort()
 
         if self.options['timezone']:
-            # If an explicit TZ was provided in the config, make sure it is known  
+            # If an explicit TZ was provided in the config, make sure it is known
             try:
                 import pytz
                 tz = pytz.timezone(self.options['timezone'])
@@ -356,13 +356,13 @@ class configmanager(object):
         for f in os.listdir(res):
             modpath = os.path.join(res, f)
             if os.path.isdir(modpath) and os.path.exists(os.path.join(modpath, '__init__.py')) and \
-            os.path.exists(os.path.join(modpath, '__terp__.py')):
+            ('|', os.path.exists(os.path.join(modpath, '__openerp__.py')), os.path.exists(os.path.join(modpath, '__terp__.py'))):
                 contains_addons = True
                 break
 
         if not contains_addons:
             raise optparse.OptionValueError("option %s: The addons-path %r does not seem to a be a valid Addons Directory!" % (opt, value))
-        
+
         setattr(parser.values, option.dest, res)
 
     def load(self):
@@ -403,7 +403,7 @@ class configmanager(object):
                 p.set('options', opt, loglevelnames.get(self.options[opt], self.options[opt]))
             else:
                 p.set('options', opt, self.options[opt])
-    
+
         for sec in self.misc.keys():
             for opt in self.misc[sec].keys():
                 p.set(sec,opt,self.misc[sec][opt])
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index f105cd81256..b153467a2a9 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -50,13 +50,19 @@ def init_db(cr):
     cr.commit()
 
     for i in addons.get_modules():
-        terp_file = addons.get_module_resource(i, '__terp__.py')
+        terp_file = addons.get_module_resource(i, '__openerp__.py')
         mod_path = addons.get_module_path(i)
         if not mod_path:
             continue
         info = False
+#        if os.path.isfile(terp_file) or os.path.isfile(mod_path+'.zip'):
+#            info = eval(file_open(terp_file).read())
+        if not os.path.isfile(terp_file):
+            terp_file = addons.get_module_resource(i, '__terp__.py')
+
         if os.path.isfile(terp_file) or os.path.isfile(mod_path+'.zip'):
-            info = eval(file_open(terp_file).read())
+                info = eval(file_open(terp_file).read())
+
         if info:
             categs = info.get('category', 'Uncategorized').split('/')
             p_id = None
diff --git a/setup.py b/setup.py
index 9d7a735d2f6..bc2d8b64d3f 100755
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ def check_modules():
 
 def find_addons():
     for root, _, names in os.walk(join('bin', 'addons')):
-        if '__terp__.py' in names:
+        if '__openerp__.py' or '__terp__.py' in names:
             yield basename(root), root
     #look for extra modules
     try:
@@ -86,7 +86,11 @@ def find_addons():
             mname = mname.strip()
             if not mname:
                 continue
-            if os.path.exists(join(empath, mname, '__terp__.py')):
+            terp = join(empath, mname, '__openerp__.py')
+            if not os.path.exists(terp):
+                terp = join(empath, mname, '__terp__.py')
+
+            if os.path.exists(terp):
                 yield mname, join(empath, mname)
             else:
                 print "Module %s specified, but no valid path." % mname

From d217272611da605662aa8df6a6e94271a7cfeba3 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Thu, 11 Mar 2010 14:26:00 +0530
Subject: [PATCH 36/56] [IMP] document :- support indexation of .docx to text
 and PPTX to html

bzr revid: ysa@tinyerp.co.in-20100311085600-4t4gmuzywglpugh0
---
 addons/document/std_index.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index bd61c65e16b..b54ff396480 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -21,7 +21,7 @@
 
 import StringIO
 import odt2txt
-
+from subprocess import Popen, PIPE
 from content_index import indexer, cntIndex
 
 
@@ -50,15 +50,28 @@ class TxtIndex(indexer):
         
 cntIndex.register(TxtIndex())
 
+class PptIndex(indexer):
+    def _getMimeTypes(self):
+        return [ 'application/ms-word']
+    
+    def _getExtensions(self):
+        return ['.ppt','.pptx']
+
+    def _doIndexFile(self,fname):
+        fp = Popen(['ppthtml', fname], shell=False, stdout=PIPE).stdout
+        return _to_unicode( fp.read())
+
+cntIndex.register(PptIndex())
+
 class DocIndex(indexer):
     def _getMimeTypes(self):
         return [ 'application/ms-word']
     
     def _getExtensions(self):
-        return ['.doc']
+        return ['.doc','.docx']
 
     def _doIndexFile(self,fname):
-        fp = Popen(['antiword',fname], shell=False, stdout=PIPE).stdout
+        fp = Popen(['antiword', fname], shell=False, stdout=PIPE).stdout
         return _to_unicode( fp.read())
 
 cntIndex.register(DocIndex())

From f687c22859105bfe605732ad2735eb0f0f15606b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 11 Mar 2010 14:50:06 +0530
Subject: [PATCH 37/56] [Fix] crm: Fix the probelm of section_id in
 crm_phonecall2phonecall

bzr revid: sbh@tinyerp.com-20100311092006-7h0ygtbm89zz056j
---
 addons/crm/wizard/crm_phonecall2phonecall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_phonecall2phonecall.py b/addons/crm/wizard/crm_phonecall2phonecall.py
index 5fcfc9ecb69..557b5da71f5 100644
--- a/addons/crm/wizard/crm_phonecall2phonecall.py
+++ b/addons/crm/wizard/crm_phonecall2phonecall.py
@@ -47,7 +47,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 values['name']=this.name
                 values['user_id']=this.user_id and this.user_id.id
                 values['categ_id']=case.categ_id and case.categ_id.id or False
-                values['section_id']=case.section_id and case.section_id.id or False,
+                values['section_id']=case.section_id and case.section_id.id
                 values['description']=case.description or ''
                 values['partner_id']=case.partner_id.id
                 values['partner_address_id']=case.partner_address_id.id

From 0bba38da702229f6ef6267d66a40fddb29f8fcd3 Mon Sep 17 00:00:00 2001
From: "Ysa (Open ERP)" <ysa@tinyerp.co.in>
Date: Thu, 11 Mar 2010 17:15:01 +0530
Subject: [PATCH 38/56] [IMP] Thuderbird plugin :- removed section_id in plugin
 and create record with different object in crm

bzr revid: ysa@tinyerp.co.in-20100311114501-lhm4923ptbv39r3x
---
 addons/thunderbird/partner/partner.py         |   7 +++++--
 addons/thunderbird/plugin/tiny_plugin-2.0.xpi | Bin 65042 -> 65188 bytes
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index d3aa9020444..3a0fa73abc9 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -83,11 +83,14 @@ class tinythunderbird_partner(osv.osv):
 
     def thunderbird_mailcreate(self,cr,user,vals):
         dictcreate = dict(vals)
+        for val in vals:
+            if val[0] == 'object':
+                object = val[1]
         import email
         header_name = email.Header.decode_header(dictcreate['name'])
         dictcreate['name'] = header_name and header_name[0] and header_name[0][0] 
         add_obj=self.pool.get('res.partner.address')
-        case_pool=self.pool.get('crm.case')
+        case_pool=self.pool.get(object)
         partner_ids=add_obj.search(cr,user,[('email','=',dictcreate['email_from'])])
         partner=add_obj.read(cr,user,partner_ids,['partner_id'])
         if partner:
@@ -95,7 +98,7 @@ class tinythunderbird_partner(osv.osv):
         search_id = self.pool.get('res.request.link').search(cr,user,[('object','=',dictcreate['ref'].split(',')[0])])
         if not search_id:
             create_link_id = self.pool.get('res.request.link').create(cr,user,{'name':dictcreate['ref'].split(',')[0],'object':dictcreate['ref'].split(',')[0]})
-        create_id = self.pool.get('crm.case').create(cr, user, dictcreate)
+        create_id = self.pool.get(object).create(cr, user, dictcreate)
         cases=case_pool.browse(cr,user,[create_id])
         case_pool._history(cr, user, cases, _('Archive'), history=True, email=False)
         return create_id
diff --git a/addons/thunderbird/plugin/tiny_plugin-2.0.xpi b/addons/thunderbird/plugin/tiny_plugin-2.0.xpi
index 7fb57818c1539f3ba560ddd6abbcb8c409888ee0..d48a837cbbdf862348604b4be0901daf71a40cb0 100755
GIT binary patch
delta 53566
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

delta 53420
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


From 3d052f10fdf1761942a795fbee934c0ca3878e82 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 11 Mar 2010 18:37:21 +0530
Subject: [PATCH 39/56] [IMP]: auction: removed _ from function called from
 button

bzr revid: atp@tinyerp.co.in-20100311130721-ytlq6asz1onr9ue5
---
 addons/auction/wizard/auction_lots_able.py                    | 2 +-
 addons/auction/wizard/auction_lots_able_view.xml              | 2 +-
 addons/auction/wizard/auction_lots_auction_move.py            | 2 +-
 addons/auction/wizard/auction_lots_auction_move_view.xml      | 2 +-
 addons/auction/wizard/auction_lots_enable.py                  | 2 +-
 addons/auction/wizard/auction_lots_enable_view.xml            | 2 +-
 addons/auction/wizard/auction_lots_make_invoice.py            | 2 +-
 addons/auction/wizard/auction_lots_make_invoice_buyer.py      | 2 +-
 .../auction/wizard/auction_lots_make_invoice_buyer_view.xml   | 2 +-
 addons/auction/wizard/auction_lots_make_invoice_view.xml      | 2 +-
 addons/auction/wizard/auction_lots_sms_send.py                | 2 +-
 addons/auction/wizard/auction_lots_sms_send_view.xml          | 2 +-
 addons/auction/wizard/auction_pay_buy.py                      | 2 +-
 addons/auction/wizard/auction_pay_buy_view.xml                | 2 +-
 addons/auction/wizard/auction_pay_sel.py                      | 2 +-
 addons/auction/wizard/auction_pay_sel_view.xml                | 2 +-
 addons/auction/wizard/auction_payer_sel.py                    | 4 ++--
 addons/auction/wizard/auction_payer_sel_view.xml              | 4 ++--
 addons/auction/wizard/auction_taken.py                        | 2 +-
 addons/auction/wizard/auction_taken_view.xml                  | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
index 686d26c0341..8ddeeca8055 100644
--- a/addons/auction/wizard/auction_lots_able.py
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -31,7 +31,7 @@ class auction_lots_able(osv.osv_memory):
     _name = "auction.lots.able"
     _description = "Lots able"
     
-    def _confirm_able(self, cr, uid, ids, context={}):
+    def confirm_able(self, cr, uid, ids, context={}):
         """
             This function Update auction lots object and set taken away field true.
             @param cr: the current row, from the database cursor,
diff --git a/addons/auction/wizard/auction_lots_able_view.xml b/addons/auction/wizard/auction_lots_able_view.xml
index 374390a1404..c0ac577a8d7 100644
--- a/addons/auction/wizard/auction_lots_able_view.xml
+++ b/addons/auction/wizard/auction_lots_able_view.xml
@@ -14,7 +14,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-goto-last" string="Able Taken away" name="_confirm_able" type="object"/>
+                    	<button  icon="gtk-goto-last" string="Able Taken away" name="confirm_able" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
index 71e2b16e8e0..28146198b3f 100644
--- a/addons/auction/wizard/auction_lots_auction_move.py
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -43,7 +43,7 @@ class auction_lots_auction_move(osv.osv_memory):
                 raise osv.except_osv('Error !', 'You can not move a lot that has no auction date')
         return {}
     
-    def _auction_move_set(self, cr, uid, ids, context={}):
+    def auction_move_set(self, cr, uid, ids, context={}):
         """
         This Function update auction date on auction lots to given auction date.
         erase the auction lots's object adjudication price and its buyer and change state to draft.
diff --git a/addons/auction/wizard/auction_lots_auction_move_view.xml b/addons/auction/wizard/auction_lots_auction_move_view.xml
index 394a916c96c..0e81697c51b 100644
--- a/addons/auction/wizard/auction_lots_auction_move_view.xml
+++ b/addons/auction/wizard/auction_lots_auction_move_view.xml
@@ -15,7 +15,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-redo" string="Move to Auction date" name="_auction_move_set" type="object"/>
+                    	<button  icon="gtk-redo" string="Move to Auction date" name="auction_move_set" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
index 9d75ef1a589..e8aa5edadf5 100644
--- a/addons/auction/wizard/auction_lots_enable.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -34,7 +34,7 @@ class auction_lots_enable(osv.osv_memory):
                'confirm_en':fields.integer('Catalog Number')
                }
     
-    def _confirm_enable(self, cr, uid, ids, context={}):
+    def confirm_enable(self, cr, uid, ids, context={}):
         """
         This function Update auction lots object and set taken away field False.
         @param cr: the current row, from the database cursor,
diff --git a/addons/auction/wizard/auction_lots_enable_view.xml b/addons/auction/wizard/auction_lots_enable_view.xml
index e6a6936c5eb..ce99308798c 100644
--- a/addons/auction/wizard/auction_lots_enable_view.xml
+++ b/addons/auction/wizard/auction_lots_enable_view.xml
@@ -14,7 +14,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="_confirm_enable" type="object"/>
+                    	<button icon="gtk-goto-last"  string="Enable Taken away" name="confirm_enable" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 50177f54203..693826d71a0 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -47,7 +47,7 @@ class auction_lots_make_invoice(osv.osv_memory):
         object = len(context['active_ids'])
         return object
     
-    def _makeInvoices(self, cr, uid, ids, context):
+    def makeInvoices(self, cr, uid, ids, context):
         """
         seller invoice :Create an invoice.
         @param cr: the current row, from the database cursor.
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index b35dc072776..01eec83efe8 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -57,7 +57,7 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
             buyer=lot and lot.ach_uid.id or False
         return buyer  
 
-    def _makeInvoices(self, cr, uid, ids, context):
+    def makeInvoices(self, cr, uid, ids, context):
         """
         Create an invoice for selected lots (IDS) to BUYER_ID .
         @param cr: the current row, from the database cursor.
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index b45d5bdbb1c..a813ca6c609 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -17,7 +17,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index e629942c5d5..4e06d8e15cc 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -15,7 +15,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Create invoices" name="_makeInvoices" type="object"/>
+                    	<button icon="gtk-ok" string="Create invoices" name="makeInvoices" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
index 95351c6965a..40322cb8b23 100644
--- a/addons/auction/wizard/auction_lots_sms_send.py
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -38,7 +38,7 @@ class auction_lots_sms_send(osv.osv_memory):
                'text':fields.text('SMS Message', required=True)
                }
     
-    def _sms_send(self, cr, uid, ids, context):
+    def sms_send(self, cr, uid, ids, context):
         
         for datas in self.read(cr, uid, ids):
             lots = self.pool.get('auction.lots').read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
diff --git a/addons/auction/wizard/auction_lots_sms_send_view.xml b/addons/auction/wizard/auction_lots_sms_send_view.xml
index 7e57833f72d..b3c49077534 100644
--- a/addons/auction/wizard/auction_lots_sms_send_view.xml
+++ b/addons/auction/wizard/auction_lots_sms_send_view.xml
@@ -19,7 +19,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-go-back" string="Send SMS" name="_sms_send" type="object"/>
+                    	<button icon="gtk-go-back" string="Send SMS" name="sms_send" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index 8e7136b0064..b1d31532939 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -48,7 +48,7 @@ class auction_pay_buy(osv.osv_memory):
             buyer=lot and lot.ach_uid.id or False
         return buyer
     
-    def _pay_and_reconcile(self, cr, uid, ids, context):
+    def pay_and_reconcile(self, cr, uid, ids, context):
         for datas in self.read(cr, uid, ids):
             if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
                 rest = datas['total']-(datas['amount'] + datas['amount2'] + datas['amount3'])
diff --git a/addons/auction/wizard/auction_pay_buy_view.xml b/addons/auction/wizard/auction_pay_buy_view.xml
index daa0ea2a195..dea8600b477 100644
--- a/addons/auction/wizard/auction_pay_buy_view.xml
+++ b/addons/auction/wizard/auction_pay_buy_view.xml
@@ -21,7 +21,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes"  string="Pay" name="_pay_and_reconcile" type="object"/>
+                    	<button icon="gtk-yes"  string="Pay" name="pay_and_reconcile" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 2643a565e3e..ff1e2e781e3 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -37,7 +37,7 @@ class auction_pay_sel(osv.osv_memory):
                'period_id':fields.many2one('account.period', 'Period', required=True), 
                }
     
-    def _pay_and_reconcile(self, cr, uid, ids, context):
+    def pay_and_reconcile(self, cr, uid, ids, context):
         lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
         for datas in self.read(cr, uid, ids):
             account_id = datas.get('writeoff_acc_id', False)
diff --git a/addons/auction/wizard/auction_pay_sel_view.xml b/addons/auction/wizard/auction_pay_sel_view.xml
index b96f25032ac..2570b7a7a0a 100644
--- a/addons/auction/wizard/auction_pay_sel_view.xml
+++ b/addons/auction/wizard/auction_pay_sel_view.xml
@@ -16,7 +16,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-yes" string="Pay" name="_pay_and_reconcile" type="object"/>
+                    	<button icon="gtk-yes" string="Pay" name="pay_and_reconcile" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py
index b59cbf591cc..349f10d4dec 100644
--- a/addons/auction/wizard/auction_payer_sel.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -32,7 +32,7 @@ class auction_payer(osv.osv_memory):
     _name = "auction.payer"
     _description = "Auction payer"
     
-    def _payer(self, cr, uid, ids, context):
+    def payer(self, cr, uid, ids, context):
         self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'is_ok':True, 'state':'paid'})
         return {}
     
@@ -45,7 +45,7 @@ class auction_payer_sel(osv.osv_memory):
     _name = "auction.payer.sel"
     _description = "Auction payment for seller"
     
-    def _payer_sel(self, cr, uid, ids, context):
+    def payer_sel(self, cr, uid, ids, context):
         """
         This function Update auction lots object and seller paid  true.
         @param cr: the current row, from the database cursor,
diff --git a/addons/auction/wizard/auction_payer_sel_view.xml b/addons/auction/wizard/auction_payer_sel_view.xml
index 93fe0ef38b1..9e8ca5ec5d2 100644
--- a/addons/auction/wizard/auction_payer_sel_view.xml
+++ b/addons/auction/wizard/auction_payer_sel_view.xml
@@ -10,7 +10,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="2">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon = "gtk-yes"  string="Pay"   name="_payer" type="object"/>
+                    	<button  icon = "gtk-yes"  string="Pay"   name="payer" type="object"/>
                    </group>
                </form>
             </field>
@@ -25,7 +25,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-yes" string="Pay" name="_payer_sel" type="object"/>
+                    	<button  icon="gtk-yes" string="Pay" name="payer_sel" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
index 48a5d8cf6af..20ac6482317 100644
--- a/addons/auction/wizard/auction_taken.py
+++ b/addons/auction/wizard/auction_taken.py
@@ -40,7 +40,7 @@ class auction_taken(osv.osv_memory):
     def _to_xml(s):
         return s.replace('&','&amp;').replace('<','&lt;').replace('>','&gt;')
 
-    def _process(self, cr, uid, ids, context):
+    def process(self, cr, uid, ids, context):
           """
           Update Auction lots state to taken_away.
           @param cr: the current row, from the database cursor.
diff --git a/addons/auction/wizard/auction_taken_view.xml b/addons/auction/wizard/auction_taken_view.xml
index 8ed7f730427..626caa473ad 100644
--- a/addons/auction/wizard/auction_taken_view.xml
+++ b/addons/auction/wizard/auction_taken_view.xml
@@ -13,7 +13,7 @@
                     </group>
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-ok"  string="OK"  name="_process" type="object" />
+                    	<button icon="gtk-ok"  string="OK"  name="process" type="object" />
                    </group>
                </form>
             </field>

From b7e960c1ee5d2289d300f90a1ce97cfbdc3ca65b Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Thu, 11 Mar 2010 18:55:00 +0530
Subject: [PATCH 40/56] [IMP]: base_calendar: removed _ from function called
 from button

bzr revid: atp@tinyerp.co.in-20100311132500-u20yt7frb0in5bpw
---
 addons/base_calendar/wizard/calendar_event_edit_all.py       | 2 +-
 addons/base_calendar/wizard/calendar_event_edit_all_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index 0a7fddadb2a..d13b6ef8b38 100644
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -53,7 +53,7 @@ class calendar_event_edit_all(osv.osv_memory):
                 event = model_obj.read(cr, uid, context['active_id'], ['name', 'location', 'alarm_id'])
                 return event['date_deadline']
 
-    def _modify_this(self, cr, uid, ids, context=None):
+    def modify_this(self, cr, uid, ids, context=None):
         """
         Modify All event for Crm Meeting.
         @param cr: the current row, from the database cursor,
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
index 15bd025441a..8e406c4d8b0 100644
--- a/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
+++ b/addons/base_calendar/wizard/calendar_event_edit_all_view.xml
@@ -22,7 +22,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button  icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button  icon="gtk-save" string="_Save" name="_modify_this" type="object"/>
+                    	<button  icon="gtk-save" string="_Save" name="modify_this" type="object"/>
                    </group>
                </form>
             </field>

From 771b0336557e7bd351c49bb7323ec6b76b95d07a Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@mga>
Date: Thu, 11 Mar 2010 19:42:46 +0530
Subject: [PATCH 41/56] [IMP]: improvement in trigger server action [ADD]: add
 new server action called copy

bzr revid: mga@mga-20100311141246-vomrixgaz3ajn0ef
---
 bin/addons/base/ir/ir.xml        |  5 ++--
 bin/addons/base/ir/ir_actions.py | 48 ++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index a13764e8733..0c280d2c0b3 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1252,9 +1252,10 @@
                             <newline/>
                             <label colspan="4" string="Access all the fields related to the current object using expression in double brackets, i.e. [[ object.partner_id.name ]]" align="0.0"/>
                         </page>
-                        <page string="Create / Write" attrs="{'invisible':[('state','!=','object_create'),('state','!=','object_write')]}">
+                        <page string="Create / Write / Copy" attrs="{'invisible':[('state','!=','object_create'), ('state','!=','object_write'), ('state','!=','object_copy')]}">
                             <separator colspan="4" string="Fields Mapping"/>
-                               <field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'),('state','!=','trigger'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
+                            <field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'), ('state','!=','trigger'), ('state','!=','object_copy'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
+                            <field name="copy_object" on_change="change_object(copy_object, state)" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'), ('state','!=','trigger'), ('state','!=','object_write'), ('state','!=','object_create'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
                             <field name="fields_lines" nolabel="1" select="2" colspan="4">
                                 <tree string="Field Mappings" editable="top">
                                     <field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 472e4852d4c..ae046adc95d 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -377,16 +377,32 @@ server_object_lines()
 class actions_server(osv.osv):
 
     def _select_signals(self, cr, uid, context={}):
-        cr.execute("select distinct t.signal as key, t.signal || ' - [ ' || w.osv || ' ] ' as val from wkf w, wkf_activity a, wkf_transition t "\
-                        " where w.id = a.wkf_id " \
-                        " and t.act_from = a.id " \
-                        " or t.act_to = a.id and t.signal not in (null, NULL)")
+        cr.execute("select distinct w.osv, t.signal from wkf w, wkf_activity a, wkf_transition t where w.id = a.wkf_id  and t.act_from = a.id  or t.act_to = a.id and t.signal!='' and t.signal not in (null, NULL)")
         result = cr.fetchall() or []
         res = []
         for rs in result:
             if rs[0] is not None and rs[1] is not None:
-                res.append(rs)
+                line = rs[0], "%s - (%s)" % (rs[1], rs[0])
+                res.append(line)
         return res
+    
+    def _select_objects(self, cr, uid, context={}):
+        model_pool = self.pool.get('ir.model')
+        ids = model_pool.search(cr, uid, [('name','not ilike','.')])
+        res = model_pool.read(cr, uid, ids, ['model', 'name'])
+        return [(r['model'], r['name']) for r in res] +  [('','')]
+    
+    def change_object(self, cr, uid, ids, copy_object, state, context={}):
+        if state == 'object_copy':
+            model_pool = self.pool.get('ir.model')
+            model = copy_object.split(',')[0]
+            mid = model_pool.search(cr, uid, [('model','=',model)])
+            return {
+                'value':{'srcmodel_id':mid[0]},
+                'context':context
+            }
+        else:
+            return {}
 
     _name = 'ir.actions.server'
     _table = 'ir_act_server'
@@ -404,6 +420,7 @@ class actions_server(osv.osv):
             ('email','Email'),
             ('sms','SMS'),
             ('object_create','Create Object'),
+            ('object_copy','Copy Object'),
             ('object_write','Write Object'),
             ('other','Multi Actions'),
         ], 'Action Type', required=True, size=32, help="Type of the Action that is to be executed"),
@@ -428,6 +445,7 @@ class actions_server(osv.osv):
         'write_id':fields.char('Write Id', size=256, help="Provide the field name that the record id refers to for the write operation. If it is empty it will refer to the active id of the object."),
         'loop_action':fields.many2one('ir.actions.server', 'Loop Action', help="Select the action that will be executed. Loop action will not be avaliable inside loop."),
         'expression':fields.char('Loop Expression', size=512, help="Enter the field/expression that will return the list. E.g. select the sale order in Object, and you can have loop on the sales order line. Expression = `object.order_line`."),
+        'copy_object': fields.reference('Copy Of', selection=_select_objects, size=256),
     }
     _defaults = {
         'state': lambda *a: 'dummy',
@@ -666,6 +684,26 @@ class actions_server(osv.osv):
                 cr.commit()
                 if action.record_id:
                     self.pool.get(action.model_id.model).write(cr, uid, [context.get('active_id')], {action.record_id.name:res_id})
+            
+            if action.state == 'object_copy':
+                res = {}
+                for exp in action.fields_lines:
+                    euq = exp.value
+                    if exp.type == 'equation':
+                        obj_pool = self.pool.get(action.model_id.model)
+                        obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
+                        expr = eval(euq, {'context':context, 'object': obj, 'time':time})
+                    else:
+                        expr = exp.value
+                    res[exp.col1.name] = expr
+
+                obj_pool = None
+                res_id = False
+                
+                model = action.copy_object.split(',')[0]
+                cid = action.copy_object.split(',')[1]
+                obj_pool = self.pool.get(model)
+                res_id = obj_pool.copy(cr, uid, int(cid), res)
 
         return False
 

From c3cbfa5cdf128fc68aa1001301738a91ea3a846b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 11 Mar 2010 16:45:22 +0100
Subject: [PATCH 42/56] [fix] fix project_issue_report

bzr revid: fp@tinyerp.com-20100311154522-pguaz5ywt10a1zw7
---
 addons/project_issue/report/project_issue_report.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 62481c8e929..2e3bf4b2d58 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -8,10 +8,7 @@ class project_issue_report(osv.osv):
     _columns = {
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),                
-        'probability': fields.float('Avg. Probability', readonly=True),
-        'amount_revenue': fields.float('Est.Revenue', readonly=True),
-        'amount_costs': fields.float('Est.Cost', readonly=True),
-        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
+        'nbr': fields.integer('# of Issues', reaadonly=True),
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
     }
     def init(self, cr):
@@ -28,10 +25,6 @@ class project_issue_report(osv.osv):
                     c.categ_id,
                     c.stage_id,
                     count(*) as nbr,
-                    sum(planned_revenue) as amount_revenue,
-                    sum(planned_cost) as amount_costs,
-                    sum(planned_revenue*probability/100)::decimal(16,2) as amount_revenue_prob,
-                    avg(probability)::decimal(16,2) as probability,
                     to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
                 from
                     project_issue c

From 83f2bb92aa39c01c283975dbbb5cd46af6b2d869 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 11 Mar 2010 17:42:45 +0100
Subject: [PATCH 43/56] improve daily meeting scrum view

bzr revid: fp@tinyerp.com-20100311164245-23x8qph75hjkxuiy
---
 addons/scrum/scrum_view.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 08e663f66af..9fb26f5884e 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -317,8 +317,12 @@
             <field name="arch" type="xml">
                 <search string="Scrum Sprint">
                     <group col="10" colspan="4">
+                        <filter icon="terp-project" string="Daily" domain="[('date','=',time.strftime('%Y-%m-%d'))]" help="Daily Meetings"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="sprint_id" widget="selection"/>
+                        <field name="sprint_id">
+                            <filter icon="terp-project" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
+                        </field>
                         <field name="date"/>
                     </group>
                     <newline/>

From b5927102390a39f070703eb4fa3dcb01d0f899c2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 11 Mar 2010 17:57:01 +0100
Subject: [PATCH 44/56] improve_view

bzr revid: fp@tinyerp.com-20100311165701-75sey409otc9nk0d
---
 addons/scrum/scrum_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 9fb26f5884e..57c97ef6f89 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -289,9 +289,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Sprint">
-                    <field name="name" select="1"/>
-                    <field name="date"/>
-                    <field name="sprint_id"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="date"/>
+                        <field name="sprint_id"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
                             <separator colspan="4" string="What have you accomplished since yesterday ?"/>

From 89689133033f11324c39af728255f72a2ca01475 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 12 Mar 2010 04:51:11 +0000
Subject: [PATCH 45/56] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100312045111-iql88a4wdw4r9way
---
 bin/addons/base/i18n/hr.po |  4 ++--
 bin/addons/base/i18n/it.po | 34 +++++++++++++++++++---------------
 bin/addons/base/i18n/ja.po |  4 ++--
 bin/addons/base/i18n/nb.po |  6 +++---
 bin/addons/base/i18n/sk.po |  2 +-
 bin/addons/base/i18n/sv.po |  4 ++--
 bin/addons/base/i18n/uk.po |  4 ++--
 debian/po/nb.po            |  2 +-
 debian/po/sk.po            |  2 +-
 9 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index c7b458aada5..195bcca96f7 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-10 05:22+0000\n"
+"PO-Revision-Date: 2010-03-11 05:23+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po
index 06b5cc1d49c..acca5687353 100644
--- a/bin/addons/base/i18n/it.po
+++ b/bin/addons/base/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-15 05:46+0000\n"
-"Last-Translator: Luigi Grilli <luigi.grilli@gmail.com>\n"
+"PO-Revision-Date: 2010-03-11 11:29+0000\n"
+"Last-Translator: Maurizio.Colella <m.colella88@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-17 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -3278,7 +3278,7 @@ msgstr "Test"
 #. module: base
 #: field:ir.report.custom.fields,groupby:0
 msgid "Group By"
-msgstr ""
+msgstr "Raggruppa per"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
@@ -3354,7 +3354,7 @@ msgstr ""
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "The name of the group can not start with \"-\""
-msgstr ""
+msgstr "Il nome del gruppo non può iniziare con '-'"
 
 #. module: base
 #: wizard_view:module.upgrade,end:0
@@ -3387,7 +3387,7 @@ msgstr "Sicurezza Gruppi"
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Titolare del conto"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form
@@ -3434,7 +3434,7 @@ msgstr "Nome Menu"
 #. module: base
 #: field:ir.report.custom,title:0
 msgid "Report Title"
-msgstr ""
+msgstr "Titolo del report"
 
 #. module: base
 #: field:ir.report.custom.fields,fontcolor:0
@@ -3763,6 +3763,8 @@ msgstr "Crea / Scrivi"
 #: help:res.partner.category,active:0
 msgid "The active field allows you to hide the category without removing it."
 msgstr ""
+"Il campo attivo ti permette di nascondere la categoria senza doverla "
+"rimuovere."
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -3806,7 +3808,7 @@ msgstr "Oggetti di Lavoro"
 #. module: base
 #: field:wizard.module.lang.export,advice:0
 msgid "Advice"
-msgstr ""
+msgstr "Consiglio"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -3819,6 +3821,8 @@ msgid ""
 "Provide the field name where the record id is stored after the create "
 "operations. If it is empty, you can not track the new record."
 msgstr ""
+"Assegna un nome al campo in cui viene registrato l'identificativo del "
+"record. Se è vuoto, non potrai tracciare il nuovo record"
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
@@ -3862,7 +3866,7 @@ msgstr ""
 #: field:ir.model.fields,state:0
 #: field:ir.model.grid,state:0
 msgid "Manually Created"
-msgstr ""
+msgstr "Creato manualmente"
 
 #. module: base
 #: selection:ir.report.custom.fields,operation:0
@@ -3933,7 +3937,7 @@ msgstr "Firma"
 #. module: base
 #: field:res.partner.category,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Nome Completo"
 
 #. module: base
 #: model:res.country,name:base.mz
@@ -3944,7 +3948,7 @@ msgstr "Mozambico"
 #: model:ir.actions.act_window,name:base.grant_menu_access
 #: model:ir.ui.menu,name:base.menu_grant_menu_access
 msgid "Manage Menus"
-msgstr ""
+msgstr "Gestisci i menu"
 
 #. module: base
 #: field:ir.actions.server,message:0
@@ -4048,7 +4052,7 @@ msgstr "Mongolia"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
 #. module: base
 #: view:res.partner.som:0
@@ -4098,7 +4102,7 @@ msgstr "Formato File"
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr ""
+msgstr "Codice ISO"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_view
@@ -4351,12 +4355,12 @@ msgstr "Email Mittente"
 #. module: base
 #: field:ir.default,field_name:0
 msgid "Object Field"
-msgstr ""
+msgstr "Campo Oggetto"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "Francese (CH) / Français (CH)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 7b220da8981..7edaec05ea2 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-10 05:18+0000\n"
+"PO-Revision-Date: 2010-03-11 05:20+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/nb.po b/bin/addons/base/i18n/nb.po
index 7d583e32255..a1b19f3cefa 100644
--- a/bin/addons/base/i18n/nb.po
+++ b/bin/addons/base/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-10 14:09+0000\n"
-"Last-Translator: Christian Stange <Unknown>\n"
+"PO-Revision-Date: 2010-03-11 05:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sk.po b/bin/addons/base/i18n/sk.po
index 6a09281c581..7bf4bdc7dc6 100644
--- a/bin/addons/base/i18n/sk.po
+++ b/bin/addons/base/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:37+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po
index 038ab651a60..3f0e1872dab 100644
--- a/bin/addons/base/i18n/sv.po
+++ b/bin/addons/base/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-10 17:44+0000\n"
+"PO-Revision-Date: 2010-03-11 05:02+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index f52bd51c2b4..2e9caa02d93 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-03-10 05:23+0000\n"
+"PO-Revision-Date: 2010-03-11 05:11+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 1deda01f096..05f376bee05 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 9be80cc36d3..eea439baae9 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string

From 33aa498fbf54b2a23b429ae5b2441c7a48263012 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 12 Mar 2010 04:51:32 +0000
Subject: [PATCH 46/56] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100312045132-krq0ojl84fymea27
---
 addons/account/i18n/sv.po | 297 ++++++++++++++++++++------------------
 addons/crm/i18n/fi.po     | 228 +++++++++++++++--------------
 addons/project/i18n/sv.po |  22 +--
 3 files changed, 284 insertions(+), 263 deletions(-)

diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 40f40a480df..d0ecd869810 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-10 17:32+0000\n"
+"PO-Revision-Date: 2010-03-11 15:54+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
-"Language-Team: <>\n"
+"Language-Team: <> <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -130,7 +130,7 @@ msgstr "Kvarvarande"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Baskodsbelopp"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -156,7 +156,7 @@ msgstr "Transaktioner"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Koncentration av betalningar"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
@@ -187,7 +187,7 @@ msgstr "Kontoplan"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr ""
+msgstr "Flytta valda rader"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -195,7 +195,7 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Entry label"
-msgstr ""
+msgstr "Uppgiftsetikett"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -355,7 +355,7 @@ msgstr "Debettransaktion"
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr "Objekt"
+msgstr "Objektkonto"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -425,7 +425,7 @@ msgstr "Negativ"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "(Konto/Partner) namn"
+msgstr "(Konto/Företag) namn"
 
 #. module: account
 #: selection:account.move,type:0
@@ -500,7 +500,7 @@ msgstr ""
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Objektposter"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -577,7 +577,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr ""
+msgstr "account.tax"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -616,7 +616,7 @@ msgstr "(Tomt öppnar med aktuella värden)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Fiscal Position Accounts Mapping"
-msgstr ""
+msgstr "Mappning av momsredovisningskonton"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -671,7 +671,7 @@ msgstr "Nettototal:"
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr "Analytiska poster"
+msgstr "Objektposter"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -724,7 +724,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr "Förmodad faktura"
+msgstr "Objektfaktura"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -850,7 +850,7 @@ msgstr "Kontomallar"
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Analytiska konton"
+msgstr "Objektkonton"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
@@ -971,7 +971,7 @@ msgstr "Poster per kontoutdrag"
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr "Förmodad faktura"
+msgstr "Objektfaktura"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -1041,7 +1041,7 @@ msgstr "Barn"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Fiscal Position Taxes Mapping"
-msgstr "Moms"
+msgstr "Mappning av momsredovisningsnummer"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1075,7 +1075,7 @@ msgstr "Huvudsekvens"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr "Skriv ut avstämningsjournal"
+msgstr "Skriv ut objektjournal"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1122,13 +1122,13 @@ msgstr "Intäktskontokategori"
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr "Nytt analytiskt konto"
+msgstr "Nytt objektkonto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Förlaga för momsredovisningsnummer"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1144,7 +1144,7 @@ msgstr "Period från och med"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
@@ -1160,7 +1160,7 @@ msgstr ""
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Förlaga för momsredovisningsnummer"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1236,7 +1236,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Överliggande objektkonto"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1276,7 +1276,7 @@ msgstr "Fast belopp"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Objektkredit"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -1360,7 +1360,7 @@ msgstr "Alla"
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Objektrader"
 
 #. module: account
 #: help:account.tax,type:0
@@ -1490,12 +1490,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "wizard.company.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
 
 #. module: account
 #: field:account.journal,refund_journal:0
@@ -1538,7 +1538,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Förlaga för kontoplan"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1600,7 +1600,7 @@ msgstr "Konto för avstämning"
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Företagsreferense"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
@@ -1895,7 +1895,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Objektrader"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
@@ -1935,7 +1935,7 @@ msgstr "Antal dagar"
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Företagsreferens för denna faktura"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
@@ -1996,7 +1996,7 @@ msgstr "          Startdatum"
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Objektjournalrapport"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2043,7 +2043,7 @@ msgstr ""
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
 #: field:wizard.company.setup,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -2148,7 +2148,7 @@ msgstr "Beräkning"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Objektpost"
 
 #. module: account
 #: view:res.company:0 field:res.company,overdue_msg:0
@@ -2503,7 +2503,7 @@ msgstr ""
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr ""
+msgstr "Från objekt, skapa en faktura"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2625,7 +2625,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic"
-msgstr ""
+msgstr "Objekt"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
@@ -2661,6 +2661,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
+"Denna typ används för att göra åtskillnad mellan typer med specialeffekter i "
+"Open ERP: visa kan inte ha poster, konsoliderade konton som kan ha "
+"underkonton står för flerföretagskonsolideringar, obetalda / förutbetalda "
+"intäkter är för företags konton (på kredit / beräkningar), stängd för "
+"avslutade konton."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
@@ -2680,7 +2685,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "Account Analytic Lines Analysis"
-msgstr ""
+msgstr "Objektradanalys"
 
 #. module: account
 #: rml:account.invoice:0
@@ -2706,12 +2711,12 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_analytic_def_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Analytic Chart of Accounts"
-msgstr ""
+msgstr "Kontoplan för objekt"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Visa objektrader"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
@@ -2742,7 +2747,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "Inverterad objektbalans"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -2790,7 +2795,7 @@ msgstr ""
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr ""
+msgstr "Associerade företag"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -2826,7 +2831,7 @@ msgstr "Kundreferens:"
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Företagsid"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2866,7 +2871,7 @@ msgstr "Med vänlig hälsning."
 #. module: account
 #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
 msgid "Analytic account costs and revenues"
-msgstr ""
+msgstr "Objektkonton kostander och intäkter"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
@@ -2988,12 +2993,12 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Analytic Journal -"
-msgstr ""
+msgstr "Objektjournal"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Debit"
-msgstr ""
+msgstr "Objektdebit"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -3071,7 +3076,7 @@ msgstr "Makulera valda fakturor"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Objektjournal"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -3112,7 +3117,7 @@ msgstr ""
 #: rml:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr ""
+msgstr "Bas"
 
 #. module: account
 #: field:account.model,name:0
@@ -3141,17 +3146,17 @@ msgstr "Godkänna"
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr ""
+msgstr "Radanmärkning"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 msgid "Proposed invoice to be checked, validated and printed"
-msgstr ""
+msgstr "Föreslagen faktura som skall kontrolleras, godkännas och skrivas ut"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
 msgid "account.move.line.select"
-msgstr ""
+msgstr "account.move.line.select"
 
 #. module: account
 #: view:account.account:0
@@ -3169,7 +3174,7 @@ msgstr ""
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: account
 #: model:account.journal,name:account.bank_journal
@@ -3182,7 +3187,7 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date and Period"
-msgstr ""
+msgstr "Per datum och period"
 
 #. module: account
 #: view:account.account:0
@@ -3193,7 +3198,7 @@ msgstr ""
 #: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Anteckningar"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -3210,17 +3215,17 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_tax_form
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Skatter"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr ""
+msgstr "Stäng verksamgetsåret med nya poster"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Medelkurs"
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -3245,7 +3250,7 @@ msgstr ""
 #: rml:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -3295,7 +3300,7 @@ msgstr " avsluta verksamhetsåret och perioderna"
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr ""
+msgstr "30 dagar månadsskiftet"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
@@ -3328,7 +3333,7 @@ msgstr "Källskatt"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_balance_report
 msgid "Analytic Balance"
-msgstr ""
+msgstr "Objektbalans"
 
 #. module: account
 #: view:account.move.line:0
@@ -3338,7 +3343,7 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Väntar"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -3348,7 +3353,7 @@ msgstr "Bankinformation"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -3381,7 +3386,7 @@ msgstr ""
 #: field:account.tax.template,python_compute:0
 #: selection:account.tax.template,type:0
 msgid "Python Code"
-msgstr ""
+msgstr "Pythonkod"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -3408,7 +3413,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import invoice"
-msgstr ""
+msgstr "Importera faktura"
 
 #. module: account
 #: view:account.invoice:0
@@ -3515,7 +3520,7 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Verksamhetsår"
 
 #. module: account
 #: rml:account.overdue:0
@@ -3531,7 +3536,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -3603,7 +3608,7 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr ""
+msgstr "Antal siffror"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -3611,6 +3616,8 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
+"Detta betalningsvillkor kommer användas istället för standard för detta "
+"företag"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,comment:0
@@ -3673,7 +3680,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr ""
+msgstr "3 månader"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
@@ -3747,7 +3754,7 @@ msgstr ""
 #: model:process.node,name:account.process_node_draftinvoices0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr ""
+msgstr "Utkastfakturor"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -3757,12 +3764,12 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Oavstämd"
 
 #. module: account
 #: field:account.account,note:0
@@ -3785,7 +3792,7 @@ msgid ""
 msgstr ""
 "Finansiella och bokförings-modulen som omfattar följande:\n"
 "    Huvudbok och generell bokföring\n"
-"    Kostnad / analytisk bokföring\n"
+"    Kostnad / objektredovisning\n"
 "    Klientbokföring\n"
 "    Moms och skatter\n"
 "    Budget\n"
@@ -3796,23 +3803,23 @@ msgstr ""
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr ""
+msgstr "Början av nummerserie"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Closed"
-msgstr ""
+msgstr "Avslutad"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 msgid "Payment Entries"
-msgstr ""
+msgstr "Betalningsposter"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr ""
+msgstr "Kontot kan antingen vara en basskattekod eller skattekodkonto."
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
@@ -3820,18 +3827,20 @@ msgid ""
 "If no account is specified, the reconciliation will be made using every "
 "accounts that can be reconcilied"
 msgstr ""
+"Om inga konton anges, kommer avstämning göras med hjälp av alla konton som "
+"kan avstämmas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Rapportmeddelande för försenade betalningar"
 
 #. module: account
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "Other"
-msgstr ""
+msgstr "Övrigt"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_general_ledger
@@ -3849,12 +3858,12 @@ msgstr "Kolumner"
 #. module: account
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 msgid "Movement"
-msgstr ""
+msgstr "Rörelse"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Dessa perioder kan överlappa."
 
 #. module: account
 #: help:product.template,property_account_expense:0
@@ -3862,17 +3871,19 @@ msgid ""
 "This account will be used instead of the default one to value outgoing stock "
 "for the current product"
 msgstr ""
+"Detta konto kommer att användas i stället för standardkontot för att värdera "
+"utgående lager för den aktuella produkten"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 msgid "Encode manually the statement"
-msgstr ""
+msgstr "Koda utdraget manuellt"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr ""
+msgstr "Bokföringsjournaler"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3880,27 +3891,27 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Period"
-msgstr ""
+msgstr "Per period"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Lämna tomt för att använda dagens datum"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
-msgstr ""
+msgstr "Största kvantitet"
 
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Periodnamn"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -3909,6 +3920,8 @@ msgid ""
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
 msgstr ""
+"Ger typ av objektjournal. När ett dokument (t.ex. en faktura) måste skapa "
+"objektposter, kommer systemet att söka en matchande journal av samma typ."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3918,7 +3931,7 @@ msgstr "Grupper"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Kod/datum"
 
 #. module: account
 #: field:account.account,active:0
@@ -3934,7 +3947,7 @@ msgstr "Aktiv"
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Import from your bank statements"
-msgstr ""
+msgstr "Importera från dina bankutdrag"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3959,12 +3972,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.vat.declaration,init,based_on:0
 msgid "Base on"
-msgstr ""
+msgstr "Basera på"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Payment"
-msgstr ""
+msgstr "Kontant betalning"
 
 #. module: account
 #: field:account.chart.template,property_account_payable:0
@@ -3995,7 +4008,7 @@ msgstr "Valuta"
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -4235,7 +4248,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account_use_models,create,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4259,12 +4272,12 @@ msgstr "Leverantörsfakturor"
 #: field:account.invoice.line,product_id:0
 #: field:account.move.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account
 #: field:res.partner,credit:0
@@ -4322,7 +4335,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -4350,7 +4363,7 @@ msgstr ""
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
@@ -4366,13 +4379,13 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr ""
+msgstr "Dag i månad"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Rader"
 
 #. module: account
 #: rml:account.overdue:0
@@ -4401,7 +4414,7 @@ msgstr ""
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Nummerserier för verksamhetsåret"
 
 #. module: account
 #: view:account.model.line:0
@@ -4458,7 +4471,7 @@ msgstr ""
 #: view:account.fiscalyear:0
 #: view:account.period:0
 msgid "States"
-msgstr ""
+msgstr "Stater"
 
 #. module: account
 #: view:account.move:0
@@ -4475,17 +4488,17 @@ msgstr ""
 #. module: account
 #: rml:account.general.ledger:0
 msgid "General Ledger -"
-msgstr ""
+msgstr "Huvudbok -"
 
 #. module: account
 #: field:report.hr.timesheet.invoice.journal,quantity:0
 msgid "Quantities"
-msgstr ""
+msgstr "Kvantiteter"
 
 #. module: account
 #: field:account.analytic.account,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -4495,7 +4508,7 @@ msgstr ""
 #: field:account.invoice,amount_total:0
 #: field:account.invoice,check_total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -4533,7 +4546,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr ""
+msgstr "Återbetalning från leverantör"
 
 #. module: account
 #: help:account.model.line,date:0
@@ -4567,7 +4580,7 @@ msgstr ""
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr ""
+msgstr "Bokföringsutdrag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4657,14 +4670,14 @@ msgstr "Importera fakturor från utdrag"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr ""
+msgstr "Verksamhetsår"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4675,12 +4688,12 @@ msgstr "importera från fakturor eller betalningar"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr ""
+msgstr "Avstäm poster"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Change"
-msgstr ""
+msgstr "Byt"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -4690,7 +4703,7 @@ msgstr "Ikon"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
-msgstr ""
+msgstr "Journal - period"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,credit:0
@@ -4716,7 +4729,7 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Ref."
-msgstr ""
+msgstr "Ref."
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
@@ -4726,7 +4739,7 @@ msgstr "Fakturaadress"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Credit"
-msgstr ""
+msgstr "Kreditnota"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -4739,18 +4752,18 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr ""
+msgstr "Preleminära rapporter"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Betalningsdag"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -4783,7 +4796,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.automatic.reconcile,reconcile,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
@@ -4803,7 +4816,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_balance_report
 #: model:ir.ui.menu,name:account.menu_account_balance_report
 msgid "Account Balance"
-msgstr ""
+msgstr "Balansräkning"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
@@ -4814,7 +4827,7 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "Moms:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -4823,7 +4836,7 @@ msgstr ""
 #: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
@@ -4851,12 +4864,12 @@ msgstr ""
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr ""
+msgstr "Godkänn"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
 msgid "Select parent account"
-msgstr ""
+msgstr "Välj överliggande konto"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -4974,7 +4987,7 @@ msgstr "Rapportering"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -5011,7 +5024,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr ""
+msgstr "Dagbok"
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5033,14 +5046,14 @@ msgstr ""
 #: wizard_button:populate_statement_from_inv,go,end:0
 #: wizard_button:populate_statement_from_inv,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Avbryt"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,checktype:0
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Select Date-Period"
-msgstr ""
+msgstr "Välj datum-period"
 
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
@@ -5155,22 +5168,22 @@ msgstr "Fakturarad"
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr ""
+msgstr "Avskrivningsbok"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
 msgid "Full Payment"
-msgstr ""
+msgstr "Full betalning"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr ""
+msgstr "Inköpsjournal"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Kontantkvitton"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -5203,7 +5216,7 @@ msgstr ""
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Betalningar"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -5254,12 +5267,12 @@ msgstr ""
 #: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Utkast"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Paid"
-msgstr ""
+msgstr "Betalad"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
@@ -5275,13 +5288,13 @@ msgstr ""
 #. module: account
 #: wizard_view:account.period.close,init:0
 msgid "Are you sure ?"
-msgstr ""
+msgstr "Är du helt säker?"
 
 #. module: account
 #: rml:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -5307,7 +5320,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: account
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
@@ -5326,7 +5339,7 @@ msgstr "Process för leverantörsfakturering"
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
-msgstr ""
+msgstr "Sida"
 
 #. module: account
 #: view:account.move:0
@@ -5349,7 +5362,7 @@ msgstr ""
 #: rml:account.account.balance:0
 #: rml:account.general.journal:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account
 #: field:account.bank.statement.line,reconcile_amount:0
@@ -5512,7 +5525,7 @@ msgstr ""
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
@@ -5685,7 +5698,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #. module: account
 #: field:product.category,property_account_income_categ:0
@@ -5789,7 +5802,7 @@ msgstr "Verksamhetsår"
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Framtida"
 
 #. module: account
 #: help:account.account.balance.report,checktype,fiscalyear:0
@@ -5900,7 +5913,7 @@ msgstr "Betalningsvillkor"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr ""
+msgstr "Momsredovisningsnummer"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index c3ce5c7b10e..cec43682882 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2009-12-29 09:03+0000\n"
-"Last-Translator: NightSpirit <Unknown>\n"
+"PO-Revision-Date: 2010-03-11 23:55+0000\n"
+"Last-Translator: Mauri Latvala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr ""
+msgstr "Lähetä"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -34,6 +34,7 @@ msgstr ""
 msgid ""
 "Check this if you want the rule to send an email to the responsible person."
 msgstr ""
+"Valitse tämä, jos haluat säännön lähettävän sähköpostia vastuuhenkilölle."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -43,12 +44,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_categ2
 msgid "Cases by section and category2"
-msgstr ""
+msgstr "Tapahtumat osion ja kategoria2:n mukaan"
 
 #. module: crm
 #: wizard_field:crm.lead.partner_create,init,close:0
 msgid "Close Lead"
-msgstr ""
+msgstr "Sulje vihje"
 
 #. module: crm
 #: view:crm.job:0
@@ -56,17 +57,17 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Päivää    "
 
 #. module: crm
 #: help:crm.menu.config_wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Hallinnoi Helpdesk-palvelua."
 
 #. module: crm
 #: view:crm.job:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "Odottavat tehtävät"
 
 #. module: crm
 #: field:crm.case.rule,trg_state_to:0
@@ -81,12 +82,12 @@ msgstr "Suunnitellut kulut"
 #. module: crm
 #: wizard_field:crm.job.partner_create,init,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Sulje tehtäväpyyntö"
 
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Vaiheen nimi"
 
 #. module: crm
 #: view:crm.case:0
@@ -104,18 +105,18 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
-"Kumppanikategoria joka lisätään kumppaneille jotka täsmäävät "
-"segmentointikriterioihin laskennan jälkeen."
+"Kumppanikategoria joka lisätään kumppaneille, jotka täsmäävät "
+"jaotteluominaisuuksiin laskennan jälkeen."
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_hr
 msgid "Human Resources"
-msgstr ""
+msgstr "Henkilöstö resurssit"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
 msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Tapahtumat mahdollisuuksien, kategorian ja tyypin mukaan"
 
 #. module: crm
 #: help:crm.menu.config_wizard,claims:0
@@ -123,6 +124,8 @@ msgid ""
 "Manages the supplier and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Hallinnoi toimittajien ja asiakkaiden reklamaatioita, sisältäen sinun "
+"korjaavat tai estävät toiminnot."
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -153,34 +156,34 @@ msgstr "Varoitus!"
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Ole hyvä ja määritä käyttäjän sähköpostiosoite !"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Campaign"
-msgstr ""
+msgstr "Kampanja"
 
 #. module: crm
 #: view:crm.opportunity:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Etsi mahdollisuuksia"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
 #: view:report.crm.case.section.stage:0
 msgid "Cases by Section and Stage"
-msgstr ""
+msgstr "Tapahtumat osion ja vaiheen mukaan"
 
 #. module: crm
 #: wizard_field:crm.job.meeting_set,init,duration:0
 #: wizard_field:crm.phonecall.meeting_set,init,duration:0
 msgid "Duration (Hours)"
-msgstr ""
+msgstr "Kesto (tunteina)"
 
 #. module: crm
 #: selection:crm.meeting,transparent:0
 msgid "TRANSPARENT"
-msgstr ""
+msgstr "LÄPINÄKYVÄ"
 
 #. module: crm
 #: help:crm.case.rule,server_action_id:0
@@ -213,7 +216,7 @@ msgstr ""
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr ""
+msgstr "Kumppani"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
@@ -223,17 +226,17 @@ msgstr ""
 #: field:crm.case.stage,section_id:0
 #: model:ir.model,name:crm.model_crm_case_section
 msgid "Case Section"
-msgstr "Tapahtuma -osio"
+msgstr "Tapauksen osio"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Proposed Salary"
-msgstr ""
+msgstr "Ehdotettu palkka"
 
 #. module: crm
 #: help:crm.case.section,sequence:0
 msgid "Gives the sequence order when displaying a list of case sections."
-msgstr ""
+msgstr "Antaa jonon järjestyksen, kun näytetään lista tapauksien osioista."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_job_wizard.py:0
@@ -241,12 +244,12 @@ msgstr ""
 #: model:crm.case.categ,name:crm.categ_meet3
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Puhelinsoitto"
 
 #. module: crm
 #: model:ir.model,name:crm.model_report_crm_case_section_stage
 msgid "Cases by section and stage"
-msgstr ""
+msgstr "Tapaukset osion ja vaiheen mukaan"
 
 #. module: crm
 #: field:crm.case.rule,act_mail_to_email:0
@@ -256,7 +259,7 @@ msgstr "Lähetä sähköpostia näihin osoitteisiin"
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "None"
-msgstr "Ei yhtään"
+msgstr "Ei mitään"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -271,7 +274,7 @@ msgstr "Avainsanat joita käytetään viestirungossa"
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Lähetä uusi sähköposti"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -287,17 +290,17 @@ msgstr "Kriteeri"
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sections"
-msgstr ""
+msgstr "Osiot"
 
 #. module: crm
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr ""
+msgstr "Jäljittää tunnistetut liiketoimintamahdollisuudet myyntikanavalle."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Poikkeuspäivät"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -312,7 +315,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job3
 msgid "Second Interview"
-msgstr ""
+msgstr "Toinen haastattelu"
 
 #. module: crm
 #: model:ir.actions.wizard,name:crm.wizard_crm_cal_subscribe
@@ -323,13 +326,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ-act
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ-act
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriat"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varoitus!"
 
 #. module: crm
 #: view:crm.case:0
@@ -349,29 +352,29 @@ msgstr "Segmentointitesti"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Ehdokaskumppani"
 
 #. module: crm
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Kuvauksen tiedot"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Kontaktin nimi"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
 #: selection:crm.phonecall.opportunity_set,create_partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Linkitä olemassa olevaan kumppaniin"
 
 #. module: crm
 #: field:crm.case.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Viivästyksen tyyppi"
 
 #. module: crm
 #: view:crm.claim:0
@@ -381,12 +384,12 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Yhteyshenkilö"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Seuraava haastattelu"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -410,11 +413,14 @@ msgid ""
 "customer. With each commercial opportunity, you can indicate the canall "
 "which is this opportunity source."
 msgstr ""
+"Kanavat kuvaavat erilaisia viestintämuotoja asiakkaan kanssa. Jokaiselle "
+"kaupalliselle mahdollisuudella voit osoittaa kanavan, josta mahdollisuus oli "
+"peräisin."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Rules"
-msgstr ""
+msgstr "Poikkeussäännöt"
 
 #. module: crm
 #: field:crm.menu.config_wizard,opportunity:0
@@ -425,7 +431,7 @@ msgstr "Liiketoimintamahdollisuudet"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim1
 msgid "Accepted as Claim"
-msgstr ""
+msgstr "Hyväksytty vaateena"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -433,14 +439,14 @@ msgid ""
 "The rule use a AND operator. The case must match all non empty fields so "
 "that the rule execute the action described in the 'Actions' tab."
 msgstr ""
-"Sääntö käyttää JA - operaattoria. Tapahtumat täytyy täsmätä kaikkiin "
-"täytettyihin kenttiin jolloin sääntö voi suorittaa toiminnon joka on kuvattu "
+"Sääntö käyttää JA - operaattoria. Tapauksen täytyy sopia kaikkiin "
+"täytettyihin kenttiin, jotta sääntö voi suorittaa toiminnon, joka on kuvattu "
 "\"Toiminnot\" -välilehdellä."
 
 #. module: crm
 #: field:crm.case,history_line:0
 msgid "Communication"
-msgstr ""
+msgstr "Viestintä"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -455,18 +461,18 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Vahvista tapaaminen"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Olemassa oleva asiakas"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
 msgid "Home"
-msgstr ""
+msgstr "Koti"
 
 #. module: crm
 #: field:crm.case,categ_id:0
@@ -478,14 +484,14 @@ msgstr ""
 #: field:report.crm.case.section.categ.stage,categ_id:0
 #: field:report.crm.case.section.stage,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategoria"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_lead_categ_stage
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_categ_stage_tree
 #: view:report.crm.case.section.categ.stage:0
 msgid "Cases by Section, Category and Stage"
-msgstr ""
+msgstr "Tapahtumat osion, kategorian ja vaiheen mukaan"
 
 #. module: crm
 #: help:crm.case.rule,act_mail_to_watchers:0
@@ -523,29 +529,29 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
 
 #. module: crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Virheellinen mallin nimi"
+msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Conditions"
-msgstr ""
+msgstr "Olosuhteet"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
 msgid "Open Cases"
-msgstr "Avoimet Asiat"
+msgstr "Avoimet tapaukset"
 
 #. module: crm
 #: field:crm.case.log,name:0
 #: view:crm.claim:0
 #: view:crm.job:0
 msgid "Status"
-msgstr ""
+msgstr "Tila"
 
 #. module: crm
 #: wizard_view:crm.case.opportunity.partner_opportunity,init:0
@@ -555,7 +561,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
 #: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Luo mahdollisuus"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -563,7 +569,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Elokuu"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -580,12 +586,12 @@ msgstr ""
 #: view:crm.opportunity:0
 #, python-format
 msgid "Escalate"
-msgstr "Kiihdyttää"
+msgstr "Kohota"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Kaikki kokoukset"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -596,7 +602,7 @@ msgstr "Asiakas & Toimittaja Hallinta"
 #: view:crm.email.add.cc:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
 msgid "Add CC"
-msgstr ""
+msgstr "Lisää vastaanottaja"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -604,7 +610,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Kesäkuu"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -614,12 +620,12 @@ msgstr "Oletus (0=ei lainkaan)"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job7
 msgid "Refused by Company"
-msgstr ""
+msgstr "Hylätty yhtiön toimesta"
 
 #. module: crm
 #: field:crm.case,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Suunniteltu tuotto"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -632,7 +638,7 @@ msgstr "Salli Poistaminen"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Lokakuu"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
@@ -647,17 +653,17 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor2
 msgid "New Business"
-msgstr ""
+msgstr "Uusi liiketoimi"
 
 #. module: crm
 #: help:crm.case,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Nämä henkilöt vastaanottavat sähköpostin."
 
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Salli kalenterin näyttäminen"
 
 #. module: crm
 #: view:crm.job:0
@@ -665,13 +671,13 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Tänään   "
 
 #. module: crm
 #: wizard_view:crm.job.reschedule_phone_call,init:0
 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0
 msgid "Phone Call Description"
-msgstr ""
+msgstr "Puhelinsoiton kuvaus"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -700,6 +706,8 @@ msgstr ""
 msgid ""
 "You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"Sinun täytyy määrittää vastuuhenkilö tälle tapaukselle käyttääksesi tätä "
+"toimintoa!"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -719,7 +727,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Työpaikat - Palkkausprosessi"
 
 #. module: crm
 #: view:crm.case:0
@@ -727,7 +735,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Related Cases"
-msgstr ""
+msgstr "Liittyvät tapaukset"
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -735,7 +743,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Syyskuu"
 
 #. module: crm
 #: view:crm.case:0
@@ -745,7 +753,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Communication history"
-msgstr "Kommunikointihistoria"
+msgstr "Viestintähistoria"
 
 #. module: crm
 #: view:crm.claim:0
@@ -760,18 +768,18 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
 msgid "Negotiation/Review"
-msgstr ""
+msgstr "Neuvottelu/Katsaus"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_phonecall_wizard.py:0
 #, python-format
 msgid "A partner is already defined on this phonecall."
-msgstr ""
+msgstr "Kumppani on jo määritetty tälle puhelulle"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr ""
+msgstr "Tapahtumat mahdollisuuksien ja vaiheen mukaan"
 
 #. module: crm
 #: view:crm.claim:0
@@ -786,23 +794,23 @@ msgstr "Kumppanisegmentointirivit"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
 msgid "All Leads"
-msgstr ""
+msgstr "Kaikki vihjeet"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Vihjelomake"
 
 #. module: crm
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "Kumppanisegmentointi"
+msgstr "Kumppanijaottelu"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Sopimus allekirjoitettu"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
@@ -812,7 +820,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_oppor1
 msgid "Existing Business"
-msgstr ""
+msgstr "Olemassa oleva liiketoimi"
 
 #. module: crm
 #: field:crm.case,probability:0
@@ -831,8 +839,6 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by Open ERP about "
 "cases in this section"
 msgstr ""
-"Sähköpostiosoite laitetaan \"Reply-To\" -kenttään kaikissa posteissa jotka "
-"Open ERP on lähettänyt asioissa tässä osiossa."
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -850,7 +856,7 @@ msgstr "Asiasääntö"
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Mahdollisuus"
 
 #. module: crm
 #: view:crm.case:0
@@ -860,12 +866,12 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Emails"
-msgstr ""
+msgstr "Sähköpostit"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisio"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -875,18 +881,18 @@ msgstr "Pysäytä prosessi"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_claim1
 msgid "Factual Claims"
-msgstr ""
+msgstr "Tosiasialliset vaateet"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Etsi puhelut"
 
 #. module: crm
 #: wizard_button:crm.lead.opportunity_set,create_partner,create:0
 #: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
 msgid "Continue"
-msgstr ""
+msgstr "jatka"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -901,13 +907,13 @@ msgstr "Arvo"
 #. module: crm
 #: help:caldav.crm.export,init,name:0
 msgid "Save in .ics format"
-msgstr ""
+msgstr "Tallenna .ics muodossa"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,text:0
 #: wizard_field:crm.send.mail,init,text:0
 msgid "Message"
-msgstr ""
+msgstr "Viesti"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -916,9 +922,9 @@ msgid ""
 "criterions. If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
-"Valitse jos kategoria on rajoitettu kumppaneihin jotka täsmäävät "
-"segmentointi kriterioihin. Jos valittu, poista kategoria kumppaneilta, jotka "
-"eivät täsmää segmentointi kriterioihin."
+"Valitse jos kategoria on rajoitettu jaottelukriteereihin täsmääviin "
+"kumppaneihin. Jos valittu, poista kategoria kumppaneilta, jotka eivät sovi "
+"jaottelukriteereihin."
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -935,13 +941,13 @@ msgstr ""
 #. module: crm
 #: field:crm.case.rule,act_state:0
 msgid "Set state to"
-msgstr "Aseta tilaan"
+msgstr "Aseta tilaksi"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "Email!"
-msgstr ""
+msgstr "Sähköposti!"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead6
@@ -961,7 +967,7 @@ msgstr "Tilojen asemat"
 #. module: crm
 #: field:crm.case.rule,trg_date_type:0
 msgid "Trigger Date"
-msgstr "Ajastuspäivämäärä"
+msgstr "Laukaisupäivämäärä"
 
 #. module: crm
 #: view:crm.case.history:0
@@ -971,7 +977,7 @@ msgstr ""
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
-msgstr ""
+msgstr "Antaa jonon järjestyksen näytettäessä lista tapauksen vaiheista."
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_support3
@@ -979,12 +985,12 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Mahdollisuudet"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr "Segmentoinnin nimi"
+msgstr "Jaottelun nimi"
 
 #. module: crm
 #: field:crm.case.rule,trg_partner_categ_id:0
@@ -1005,7 +1011,7 @@ msgstr "Ostomäärä"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Direction"
-msgstr ""
+msgstr "Suunta"
 
 #. module: crm
 #: help:crm.case,email_cc:0
@@ -1014,6 +1020,8 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Nämä henkilöt saavat jatkossa kopion kumppanin ja käyttäjän välisestä "
+"viestinnästä."
 
 #. module: crm
 #: selection:report.crm.case.section.categ.categ2,month:0
@@ -1021,35 +1029,35 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "March"
-msgstr ""
+msgstr "Maaliskuu"
 
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Server Action to be Triggered"
-msgstr ""
+msgstr "Palvelimen laukaistava toiminto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_rule-act
 #: model:ir.ui.menu,name:crm.menu_crm_case_rule-act
 msgid "Rules"
-msgstr ""
+msgstr "Säännöt"
 
 #. module: crm
 #: wizard_view:crm.job.meeting_set,init:0
 #: wizard_view:crm.phonecall.meeting_set,init:0
 msgid "Plan Meeting"
-msgstr ""
+msgstr "Suunnittele tapaaminen"
 
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Aseta tilaksi"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Vastausosoitetta ei ole määritelty!"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1059,7 +1067,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:crm.wizard_crm_lead_partner_create
 #: model:ir.actions.wizard,name:crm.wizard_crm_phonecall_partner_create
 msgid "Create Partner"
-msgstr ""
+msgstr "Luo kumppani"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 83919b76d38..b384eb26c01 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-10 17:27+0000\n"
+"PO-Revision-Date: 2010-03-11 15:55+0000\n"
 "Last-Translator: Anders Eriksson <ae@mobilasystem.se>\n"
-"Language-Team: <>\n"
+"Language-Team: <> <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -64,7 +64,7 @@ msgstr "Timmar som ska valideras"
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr "Upparbetning"
+msgstr "Upparbetat"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -331,7 +331,7 @@ msgstr "Tilläggsinformation"
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr "Partner"
+msgstr "Företag"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -875,7 +875,7 @@ msgstr "Gantt diagram"
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "Varna partner"
+msgstr "Varna företag"
 
 #. module: project
 #: field:project.project,state:0
@@ -978,7 +978,7 @@ msgstr "Skicka epost till kunden"
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Varna projektledaren"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
@@ -998,7 +998,7 @@ msgstr "Ny title på din egen aktivitet för att bekräfta nedlagt arbete."
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr "Upparbetning (%)"
+msgstr "Upparbetat (%)"
 
 #. module: project
 #: field:project.task,description:0
@@ -1069,7 +1069,7 @@ msgstr "Ny funktion"
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Koda dina arbetstimmar"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
@@ -1115,7 +1115,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Partner Info"
-msgstr "Partnerinfo"
+msgstr "Företagsinfo"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
@@ -1155,7 +1155,7 @@ msgstr "Slutdatum: %(date_stop)s"
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr "Förvantat slut"
+msgstr "Förväntat slutdatum"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0

From 23586fb33171451e8bc2220b57b12102e6dfe259 Mon Sep 17 00:00:00 2001
From: STW <>
Date: Fri, 12 Mar 2010 11:45:00 +0530
Subject: [PATCH 47/56] Code improvement by stephane

bzr revid: hda@tinyerp.com-20100312061500-540cpy0cbcwxmfbq
---
 bin/addons/__init__.py           |  36 ++++++-----
 bin/addons/base/module/module.py |  11 +---
 bin/addons/module_graph.py       |  21 +++---
 bin/tools/config.py              |   8 ++-
 bin/tools/misc.py                | 108 +++++++++++++++----------------
 setup.py                         |   3 +-
 6 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 4e939bf01dc..c5e73e7c709 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -221,7 +221,7 @@ def get_module_as_zip_from_module_directory(module_directory, b64enc=True, src=T
         base = os.path.basename(path)
         for f in tools.osutil.listdir(path, True):
             bf = os.path.basename(f)
-            if not RE_exclude.search(bf) and (src or bf == '__openerp__.py' or bf == '__terp__.py' or not bf.endswith('.py')):
+            if not RE_exclude.search(bf) and (src or bf in ('__openerp__.py', '__terp__.py') or not bf.endswith('.py')):
                 archive.write(os.path.join(path, f), os.path.join(base, f))
 
     archname = StringIO()
@@ -294,15 +294,23 @@ def get_modules():
         plist.extend(listdir(ad))
     return list(set(plist))
 
+def load_information_from_description_file(module):
+    """
+    :param module: The name of the module (sale, purchase, ...)
+    """
+    for filename in ['__openerp__.py', '__terp__.py']:
+        description_file = addons.get_module_resource(module, filename)
+        if os.path.isfile(description_file):
+            return eval(tools.file_open(description_file).read())
+
+    raise Exception('The module %s does not contain a description file: __openerp__.py or __terp__.py (deprecated)')
+
 def get_modules_with_version():
     modules = get_modules()
     res = {}
     for module in modules:
         try:
-            terp = get_module_resource(module, '__openerp__.py')
-            if not os.path.isfile(terp):
-                terp = addons.get_module_resource(module, '__terp__.py')
-            info = eval(tools.file_open(terp).read())
+            info = load_information_from_description_file(module)
             res[module] = "%s.%s" % (release.major_version, info['version'])
         except Exception, e:
             continue
@@ -703,16 +711,14 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
         status = {}
     cr = db.cursor()
     if cr:
-       cr.execute("SELECT relname FROM pg_class WHERE relkind='r' AND relname='ir_module_module'")
-       if len(cr.fetchall())==0:
-           logger.notifyChannel("init", netsvc.LOG_INFO, "init db")
-           tools.init_db(cr)
-#           cr.execute("update res_users set password=%s where id=%s",('admin',1))
-           # in that case, force --init=all
-           tools.config["init"]["all"] = 1
-           tools.config['update']['all'] = 1
-           if not tools.config['without_demo']:
-               tools.config["demo"]['all'] = 1
+        cr.execute("SELECT relname FROM pg_class WHERE relkind='r' AND relname='ir_module_module'")
+        if len(cr.fetchall())==0:
+            logger.notifyChannel("init", netsvc.LOG_INFO, "init db")
+            tools.init_db(cr)
+            tools.config["init"]["all"] = 1
+            tools.config['update']['all'] = 1
+            if not tools.config['without_demo']:
+                tools.config["demo"]['all'] = 1
     force = []
     if force_demo:
         force.append('demo')
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index faec4ffa9be..e11b4964471 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -64,18 +64,13 @@ class module(osv.osv):
     _description = "Module"
 
     def get_module_info(self, name):
+        info = {}
         try:
-            terp_file = addons.get_module_resource(name, '__openerp__.py')
-            if not os.path.isfile(terp_file):
-                terp_file = addons.get_module_resource(name, '__terp__.py')
-            f = tools.file_open(terp_file)
-            data = f.read()
-            info = eval(data)
+            info = addons.load_information_from_description_file(name)
             if 'version' in info:
                 info['version'] = release.major_version + '.' + info['version']
-            f.close()
         except:
-            return {}
+            pass
         return info
 
     def _get_latest_version(self, cr, uid, ids, field_name=None, arg=None, context={}):
diff --git a/bin/addons/module_graph.py b/bin/addons/module_graph.py
index e321592ccc7..edd7f6f947e 100755
--- a/bin/addons/module_graph.py
+++ b/bin/addons/module_graph.py
@@ -41,19 +41,14 @@ print 'digraph G {'
 while len(modules):
     f = modules.pop(0)
     done.append(f)
-    terp_file = os.path.join(f,"__openerp__.py")
-    if not os.path.isfile(terp_file):
-        terp_file = os.path.join(f,"__terp__.py")
-
-    if os.path.isfile(terp_file):
-        info=eval(file(os.path.join(f,"__terp__.py")).read())
-        if info.get('installable', True):
-            for name in info['depends']:
-                if name not in done+modules:
-                    modules.append(name)
-                if not os.path.exists(name):
-                    print '\t%s [color=red]' % (name,)
-                print '\t%s -> %s;' % (f, name)
+    info = addons.load_information_from_description_file(f)
+    if info.get('installable', True):
+        for name in info['depends']:
+            if name not in done+modules:
+                modules.append(name)
+            if not os.path.exists(name):
+                print '\t%s [color=red]' % (name,)
+            print '\t%s -> %s;' % (f, name)
 print '}'
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 57f0388a238..f814c3db6eb 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -352,11 +352,15 @@ class configmanager(object):
         res = os.path.abspath(os.path.expanduser(value))
         if not os.path.exists(res):
             raise optparse.OptionValueError("option %s: no such directory: %r" % (opt, value))
+
         contains_addons = False
         for f in os.listdir(res):
             modpath = os.path.join(res, f)
-            if os.path.isdir(modpath) and os.path.exists(os.path.join(modpath, '__init__.py')) and \
-            ('|', os.path.exists(os.path.join(modpath, '__openerp__.py')), os.path.exists(os.path.join(modpath, '__terp__.py'))):
+            if os.path.isdir(modpath) and \
+               os.path.exists(os.path.join(modpath, '__init__.py')) and \
+               (os.path.exists(os.path.join(modpath, '__openerp__.py')) or \
+                os.path.exists(os.path.join(modpath, '__terp__.py'))):
+
                 contains_addons = True
                 break
 
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index b153467a2a9..284324873de 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -50,69 +50,63 @@ def init_db(cr):
     cr.commit()
 
     for i in addons.get_modules():
-        terp_file = addons.get_module_resource(i, '__openerp__.py')
         mod_path = addons.get_module_path(i)
         if not mod_path:
             continue
-        info = False
-#        if os.path.isfile(terp_file) or os.path.isfile(mod_path+'.zip'):
-#            info = eval(file_open(terp_file).read())
-        if not os.path.isfile(terp_file):
-            terp_file = addons.get_module_resource(i, '__terp__.py')
 
-        if os.path.isfile(terp_file) or os.path.isfile(mod_path+'.zip'):
-                info = eval(file_open(terp_file).read())
+        info = addons.load_information_from_description_file(i)
 
-        if info:
-            categs = info.get('category', 'Uncategorized').split('/')
-            p_id = None
-            while categs:
-                if p_id is not None:
-                    cr.execute('select id \
-                            from ir_module_category \
-                            where name=%s and parent_id=%s', (categs[0], p_id))
-                else:
-                    cr.execute('select id \
-                            from ir_module_category \
-                            where name=%s and parent_id is NULL', (categs[0],))
-                c_id = cr.fetchone()
-                if not c_id:
-                    cr.execute('select nextval(\'ir_module_category_id_seq\')')
-                    c_id = cr.fetchone()[0]
-                    cr.execute('insert into ir_module_category \
-                            (id, name, parent_id) \
-                            values (%s, %s, %s)', (c_id, categs[0], p_id))
-                else:
-                    c_id = c_id[0]
-                p_id = c_id
-                categs = categs[1:]
-
-            active = info.get('active', False)
-            installable = info.get('installable', True)
-            if installable:
-                if active:
-                    state = 'to install'
-                else:
-                    state = 'uninstalled'
+        if not info:
+            continue
+        categs = info.get('category', 'Uncategorized').split('/')
+        p_id = None
+        while categs:
+            if p_id is not None:
+                cr.execute('select id \
+                           from ir_module_category \
+                           where name=%s and parent_id=%s', (categs[0], p_id))
             else:
-                state = 'uninstallable'
-            cr.execute('select nextval(\'ir_module_module_id_seq\')')
-            id = cr.fetchone()[0]
-            cr.execute('insert into ir_module_module \
-                    (id, author, website, name, shortdesc, description, \
-                        category_id, state, certificate) \
-                    values (%s, %s, %s, %s, %s, %s, %s, %s, %s)', (
-                id, info.get('author', ''),
-                info.get('website', ''), i, info.get('name', False),
-                info.get('description', ''), p_id, state, info.get('certificate')))
-            cr.execute('insert into ir_model_data \
-                (name,model,module, res_id, noupdate) values (%s,%s,%s,%s,%s)', (
-                    'module_meta_information', 'ir.module.module', i, id, True))
-            dependencies = info.get('depends', [])
-            for d in dependencies:
-                cr.execute('insert into ir_module_module_dependency \
-                        (module_id,name) values (%s, %s)', (id, d))
-            cr.commit()
+                cr.execute('select id \
+                           from ir_module_category \
+                           where name=%s and parent_id is NULL', (categs[0],))
+            c_id = cr.fetchone()
+            if not c_id:
+                cr.execute('select nextval(\'ir_module_category_id_seq\')')
+                c_id = cr.fetchone()[0]
+                cr.execute('insert into ir_module_category \
+                        (id, name, parent_id) \
+                        values (%s, %s, %s)', (c_id, categs[0], p_id))
+            else:
+                c_id = c_id[0]
+            p_id = c_id
+            categs = categs[1:]
+
+        active = info.get('active', False)
+        installable = info.get('installable', True)
+        if installable:
+            if active:
+                state = 'to install'
+            else:
+                state = 'uninstalled'
+        else:
+            state = 'uninstallable'
+        cr.execute('select nextval(\'ir_module_module_id_seq\')')
+        id = cr.fetchone()[0]
+        cr.execute('insert into ir_module_module \
+                (id, author, website, name, shortdesc, description, \
+                    category_id, state, certificate) \
+                values (%s, %s, %s, %s, %s, %s, %s, %s, %s)', (
+            id, info.get('author', ''),
+            info.get('website', ''), i, info.get('name', False),
+            info.get('description', ''), p_id, state, info.get('certificate')))
+        cr.execute('insert into ir_model_data \
+            (name,model,module, res_id, noupdate) values (%s,%s,%s,%s,%s)', (
+                'module_meta_information', 'ir.module.module', i, id, True))
+        dependencies = info.get('depends', [])
+        for d in dependencies:
+            cr.execute('insert into ir_module_module_dependency \
+                    (module_id,name) values (%s, %s)', (id, d))
+        cr.commit()
 
 def find_in_path(name):
     if os.name == "nt":
diff --git a/setup.py b/setup.py
index bc2d8b64d3f..2e004e713df 100755
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,7 @@ def check_modules():
 
 def find_addons():
     for root, _, names in os.walk(join('bin', 'addons')):
-        if '__openerp__.py' or '__terp__.py' in names:
+        if '__openerp__.py' in names or '__terp__.py' in names:
             yield basename(root), root
     #look for extra modules
     try:
@@ -86,6 +86,7 @@ def find_addons():
             mname = mname.strip()
             if not mname:
                 continue
+
             terp = join(empath, mname, '__openerp__.py')
             if not os.path.exists(terp):
                 terp = join(empath, mname, '__terp__.py')

From 14e0a4ed8900937bc1d5c47da94b35b85d4f0fe5 Mon Sep 17 00:00:00 2001
From: qdp <qdp-launchpad@tinyerp.com>
Date: Fri, 12 Mar 2010 11:14:25 +0100
Subject: [PATCH 48/56] [IMP] account_analytic_plan: improved useability: one
 should be able to use same distribution for a sale and for a purchase => 
 analytic journal on analytic distribution should only be used to add filters,
 it's now not required anymore: if we want to set a distribution as useable
 for all kind of operations we just have to not put any analytic journal on
 it. The anlytic movement is always created with the analytic journal set on
 the financial journal related. TODO: add domains

bzr revid: qdp-launchpad@tinyerp.com-20100312101425-6d73zb8l2ing4dbv
---
 addons/account_analytic_plans/account_analytic_plans.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 51b37fdebb2..0accc1e8b7e 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -85,7 +85,7 @@ class account_analytic_plan_instance(osv.osv):
     _columns={
         'name':fields.char('Analytic Distribution',size=64),
         'code':fields.char('Distribution Code',size=16),
-        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True),
+        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal' ),
         'account_ids':fields.one2many('account.analytic.plan.instance.line','plan_id','Account Id'),
         'account1_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account1 Id'),
         'account2_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account2 Id'),
@@ -284,6 +284,9 @@ class account_move_line(osv.osv):
         super(account_move_line, self).create_analytic_lines(cr, uid, ids, context)
         for line in self.browse(cr, uid, ids, context):
            if line.analytics_id:
+               if not line.journal_id.analytic_journal_id:
+                   raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
+
                toremove = self.pool.get('account.analytic.line').search(cr, uid, [('move_id','=',line.id)], context=context)
                if toremove:
                     line.unlink(cr, uid, toremove, context=context)
@@ -300,7 +303,7 @@ class account_move_line(osv.osv):
                        'amount': amt,
                        'general_account_id': line.account_id.id,
                        'move_id': line.id,
-                       'journal_id': line.analytics_id.journal_id.id,
+                       'journal_id': line.journal_id.analytic_journal_id.id,
                        'ref': line.ref,
                    }
                    ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)

From 4eadbbf6c6b5a6dd3536caf8559e1f9f68abac14 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 12 Mar 2010 13:03:08 +0100
Subject: [PATCH 49/56] [FIX] addons: Show the module without an __openerp__.py
 or __terp__.py file

bzr revid: stephane@openerp.com-20100312120308-eqitcypi771xvos8
---
 bin/addons/__init__.py                                        | 4 ++--
 .../base_quality_interrogation.py                             | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename bin/addons/{quality_integration_server => }/base_quality_interrogation.py (100%)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index c5e73e7c709..b8b44315d1c 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -299,11 +299,11 @@ def load_information_from_description_file(module):
     :param module: The name of the module (sale, purchase, ...)
     """
     for filename in ['__openerp__.py', '__terp__.py']:
-        description_file = addons.get_module_resource(module, filename)
+        description_file = get_module_resource(module, filename)
         if os.path.isfile(description_file):
             return eval(tools.file_open(description_file).read())
 
-    raise Exception('The module %s does not contain a description file: __openerp__.py or __terp__.py (deprecated)')
+    raise Exception('The module %s does not contain a description file: __openerp__.py or __terp__.py (deprecated)' % module)
 
 def get_modules_with_version():
     modules = get_modules()
diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/base_quality_interrogation.py
similarity index 100%
rename from bin/addons/quality_integration_server/base_quality_interrogation.py
rename to bin/addons/base_quality_interrogation.py

From a74a26a113de020ce7ceb94b76bb129c9f4963bb Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 12 Mar 2010 13:31:06 +0100
Subject: [PATCH 50/56] [IMP] addons: create a warning log to inform the
 user/developper that there is a missing description file

bzr revid: stephane@openerp.com-20100312123106-098u2qvczg6zxwjb
---
 bin/addons/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index b8b44315d1c..5a08c21002a 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -41,6 +41,8 @@ import base64
 from zipfile import PyZipFile, ZIP_DEFLATED
 from cStringIO import StringIO
 
+import logging
+
 
 logger = netsvc.Logger()
 
@@ -303,7 +305,8 @@ def load_information_from_description_file(module):
         if os.path.isfile(description_file):
             return eval(tools.file_open(description_file).read())
 
-    raise Exception('The module %s does not contain a description file: __openerp__.py or __terp__.py (deprecated)' % module)
+    logging.warning('The module %s does not contain a description file: __openerp__.py or __terp__.py (deprecated)' % module)
+    return {}
 
 def get_modules_with_version():
     modules = get_modules()

From de5642cd5685d5a968a5cd6315c07b03d03e5503 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 12 Mar 2010 18:33:52 +0530
Subject: [PATCH 51/56] [IMP]: caldav: Improvement in export data for multiple
 vtimezone exported for one timezone

bzr revid: rpa@tinyerp.com-20100312130352-k2hlxmrsivxaa3u8
---
 addons/caldav/caldav.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index ce7bbe62e24..91491dd1688 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -207,6 +207,7 @@ class CalDAV(object):
     def create_ics(self, cr, uid, datas, name, ical, context=None):
         if not datas:
             return
+        timezones = []
         for data in datas:
             tzval = None
             vevent = ical.add(name)
@@ -246,11 +247,12 @@ class CalDAV(object):
                         alarm_obj = self.pool.get('basic.calendar.alarm')
                         vevent = alarm_obj.export_cal(cr, uid, model, \
                                     data[map_field][0], vevent, context=ctx)
-                    elif field == 'vtimezone' and data[map_field]:
+                    elif field == 'vtimezone' and data[map_field] and data[map_field] not in timezones:
                         tzval = data[map_field]
                         tz_obj = self.pool.get('basic.calendar.timezone')
                         ical = tz_obj.export_cal(cr, uid, None, \
                                      data[map_field], ical, context=context)
+                        timezones.append(data[map_field])
                     elif data[map_field]:
                         if map_type in ("char", "text"):
                             if field in ('exdate'):

From bf49970f6226d2cd970caf22381bac2542225727 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Sun, 14 Mar 2010 05:02:43 +0000
Subject: [PATCH 52/56] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100313045129-vc8gn1knpx7y8631
bzr revid: codehost@crowberry-20100314050243-na80o45my6gz29an
---
 addons/account/i18n/oc.po                   |  434 +++---
 addons/account_analytic_analysis/i18n/oc.po |  335 +++++
 addons/account_analytic_plans/i18n/pt_BR.po |   57 +-
 addons/account_anglo_saxon/i18n/oc.po       |   64 +
 addons/account_date_check/i18n/oc.po        |   33 +
 addons/account_followup/i18n/fi.po          |   12 +-
 addons/crm/i18n/fi.po                       |   82 +-
 addons/l10n_chart_uk_minimal/i18n/oc.po     |   92 ++
 addons/l10n_fr/i18n/oc.po                   | 1049 ++++++++++++++
 addons/l10n_lu/i18n/oc.po                   |  126 ++
 addons/mrp_subproduct/i18n/oc.po            |   89 ++
 addons/multi_company/i18n/oc.po             |  192 +++
 addons/olap/i18n/oc.po                      | 1399 +++++++++++++++++++
 addons/olap_crm/i18n/oc.po                  |   31 +
 addons/olap_extract/i18n/oc.po              |   56 +
 15 files changed, 3760 insertions(+), 291 deletions(-)
 create mode 100644 addons/account_analytic_analysis/i18n/oc.po
 create mode 100644 addons/account_anglo_saxon/i18n/oc.po
 create mode 100644 addons/account_date_check/i18n/oc.po
 create mode 100644 addons/l10n_chart_uk_minimal/i18n/oc.po
 create mode 100644 addons/l10n_fr/i18n/oc.po
 create mode 100644 addons/l10n_lu/i18n/oc.po
 create mode 100644 addons/mrp_subproduct/i18n/oc.po
 create mode 100644 addons/multi_company/i18n/oc.po
 create mode 100644 addons/olap/i18n/oc.po
 create mode 100644 addons/olap_crm/i18n/oc.po
 create mode 100644 addons/olap_extract/i18n/oc.po

diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index eaf4de61d34..a2415951ef5 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 15:10+0000\n"
+"PO-Revision-Date: 2010-03-13 10:33+0000\n"
 "Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-14 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -38,37 +38,37 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr ""
+msgstr "picada de las escrituras"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Indiatz lo messatge pels rapòrts de pagament tardièrs."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Confirmar l'estat de borrolhon"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Actius"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom del Modèl invalid per la definicion de l'accion."
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "La devisa utilizada per entrar los relevats"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr ""
+msgstr "Seleccionatz lo Messatge"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Resultat del letratge"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@@ -97,23 +97,23 @@ msgstr ""
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Compte de basa"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "Estatisticas del compte"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "Estampar lo rapòrt de taxas"
 
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Parent"
 
 #. module: account
 #: selection:account.move,type:0
@@ -131,7 +131,7 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Coeficient multiplicador"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -152,17 +152,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr ""
+msgstr "Entradas"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Centralizacion debit"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Confirmar las facturas borrolhon"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -175,17 +175,17 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+msgstr "Total crrdit"
 
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr ""
+msgstr "Plan de comptes"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr ""
+msgstr "Desplaçar la linha seleccionada"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -193,29 +193,29 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Entry label"
-msgstr ""
+msgstr "Libellat de l'escritura"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Modèl d'escritura comptabla"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr ""
+msgstr "Montant total del periòde"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Còde de Calcul (se tipe=còde)"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Linha d'escritura comptabla"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -238,29 +238,29 @@ msgstr ""
 #: field:account.tax.template,amount:0
 #: xsl:account.transfer:0
 msgid "Amount"
-msgstr ""
+msgstr "Montant"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr ""
+msgstr "Grand Libre"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "Taxas provesidors"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr ""
+msgstr "Total debit"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Accounting Entries-"
-msgstr ""
+msgstr "Escrituras comptablas-"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -291,7 +291,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Retard de règlament"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -302,50 +302,50 @@ msgstr ""
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Seleccionatz un periòde"
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Origina"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Nom de la transaccion"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Reference"
-msgstr ""
+msgstr "Referéncia"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Calcul de la soscripcion"
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Account Num."
-msgstr ""
+msgstr "N° del compte"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Dèlta de debit"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Impòstes e taxas"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Debit Trans."
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -353,7 +353,7 @@ msgstr ""
 #: field:account.move.line,analytic_account_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Centre de còstes"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -366,7 +366,7 @@ msgstr ""
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Nom del jornal"
 
 #. module: account
 #: view:account.payment.term:0
@@ -381,18 +381,18 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
 msgid "Total entries"
-msgstr ""
+msgstr "Total de las escrituras"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Font comptable"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Autorizar l'anullacion d'escritura"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
@@ -413,12 +413,12 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "Date:"
-msgstr ""
+msgstr "Data :"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Negative"
-msgstr ""
+msgstr "Negatiu"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -428,7 +428,7 @@ msgstr ""
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Contracte"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -438,7 +438,7 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
@@ -450,7 +450,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Calcul particular"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -467,7 +467,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Rem.(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -476,7 +476,7 @@ msgstr ""
 #: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref."
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -552,7 +552,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr ""
+msgstr "Linha"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -563,7 +563,7 @@ msgstr ""
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Verai"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -585,7 +585,7 @@ msgstr ""
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Mvt"
-msgstr ""
+msgstr "Mvt"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
@@ -619,7 +619,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacte"
 
 #. module: account
 #: selection:account.model.line,date:0
@@ -640,7 +640,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Escompte (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
@@ -674,7 +674,7 @@ msgstr ""
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "mes"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
@@ -684,7 +684,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Entresenhas suplementàrias"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -712,7 +712,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr ""
+msgstr "Ext."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_line_open
@@ -727,7 +727,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Nom del camp"
 
 #. module: account
 #: field:account.tax.code,sign:0
@@ -754,7 +754,7 @@ msgstr ""
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Règlament parcial"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -769,7 +769,7 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estat"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -811,7 +811,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_config_wizard
 msgid "account.config.wizard"
-msgstr ""
+msgstr "account.config.wizard"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
@@ -829,7 +829,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
@@ -864,7 +864,7 @@ msgstr ""
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Data de creacion"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
@@ -874,7 +874,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Requesit"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
@@ -891,7 +891,7 @@ msgstr ""
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Devisa"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -931,7 +931,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantitat"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -939,7 +939,7 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Data de fin"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -989,7 +989,7 @@ msgstr ""
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Total general"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -999,7 +999,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Total net :"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1019,7 +1019,7 @@ msgstr ""
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
@@ -1030,7 +1030,7 @@ msgstr ""
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Enfant"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -1053,7 +1053,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Factura client"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
@@ -1138,7 +1138,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
@@ -1185,7 +1185,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Compte bancari"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -1195,7 +1195,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Importar factura"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
@@ -1235,7 +1235,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Montant"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
@@ -1255,12 +1255,12 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Nom de linha"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Montant fixe"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1288,12 +1288,12 @@ msgstr ""
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Contunhar"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
@@ -1305,7 +1305,7 @@ msgstr ""
 #: field:account.model.line,model_id:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Modèl"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
@@ -1316,12 +1316,12 @@ msgstr ""
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizacion"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Messatge"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1335,7 +1335,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Afichatge"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1343,7 +1343,7 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Totes"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
@@ -1378,7 +1378,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Credit client"
 
 #. module: account
 #: field:account.invoice,tax_line:0
@@ -1388,13 +1388,13 @@ msgstr ""
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Sequéncias"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Tipes de compte"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1416,13 +1416,13 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Jornal"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Comptes enfant"
 
 #. module: account
 #: field:account.account,check_history:0
@@ -1457,7 +1457,7 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr ""
+msgstr "Ajustament"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1479,12 +1479,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "wizard.company.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "account.analytic.line.extended"
 
 #. module: account
 #: field:account.journal,refund_journal:0
@@ -1494,7 +1494,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Produches"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -1504,7 +1504,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -1514,7 +1514,7 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Positiu"
 
 #. module: account
 #: wizard_view:account.general.journal.report,init:0
@@ -1544,7 +1544,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Documents legals"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -1566,12 +1566,12 @@ msgstr ""
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "VAT"
-msgstr ""
+msgstr "TVA"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Compte n°"
 
 #. module: account
 #: view:account.tax:0
@@ -1619,7 +1619,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Data d'escasença"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
@@ -1653,7 +1653,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr ""
+msgstr "Jornals"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -1685,12 +1685,12 @@ msgstr ""
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Account Number"
-msgstr ""
+msgstr "Numèro de compte"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Skip"
-msgstr ""
+msgstr "Sautar"
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -1773,7 +1773,7 @@ msgstr ""
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "per cent"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
@@ -1792,7 +1792,7 @@ msgstr ""
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr ""
+msgstr "Seguent"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -1814,7 +1814,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "a :"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
@@ -1825,7 +1825,7 @@ msgstr ""
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "annada"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1842,12 +1842,12 @@ msgstr ""
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr ""
+msgstr "Estampar"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
 msgid "Start date"
-msgstr ""
+msgstr "Data de començament"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
@@ -1863,7 +1863,7 @@ msgstr ""
 #: field:account.move.reconcile,type:0
 #: xsl:account.transfer:0
 msgid "Type"
-msgstr ""
+msgstr "Tipe"
 
 #. module: account
 #: view:account.journal:0
@@ -1944,22 +1944,22 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Transferiments"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Lit."
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr ""
+msgstr "Plan de compte"
 
 #. module: account
 #: help:account.tax,name:0
@@ -1975,7 +1975,7 @@ msgstr ""
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid per l'arquitectura de la vista"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
@@ -2059,7 +2059,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Opcions"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
@@ -2086,7 +2086,7 @@ msgstr ""
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "jorns"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
@@ -2105,7 +2105,7 @@ msgstr ""
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Devisa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -2132,7 +2132,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "Calcul"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -2153,7 +2153,7 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Montant"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -2189,13 +2189,13 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalh"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Consolidacion"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
@@ -2213,7 +2213,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "TVA :"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2222,7 +2222,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Plan de comptes"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
@@ -2272,7 +2272,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
@@ -2302,7 +2302,7 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -2330,13 +2330,13 @@ msgstr ""
 #: field:account.analytic.line,user_id:0
 #: field:account.journal,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utilizaire"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Modèls de comptes"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2351,7 +2351,7 @@ msgstr ""
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Chèc N°"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
@@ -2382,7 +2382,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Compte n°."
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -2411,7 +2411,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Data de fin"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2484,7 +2484,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "Mode paysage"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -2539,7 +2539,7 @@ msgstr ""
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anullar"
 
 #. module: account
 #: field:account.account.type,name:0
@@ -2561,14 +2561,14 @@ msgstr ""
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "Litigi"
 
 #. module: account
 #: view:account.move.line:0
 #: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr ""
+msgstr "Entresenhas"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_tax_report
@@ -2637,7 +2637,7 @@ msgstr ""
 #. module: account
 #: rml:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "En litigi"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2662,7 +2662,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
 msgid "Power"
-msgstr ""
+msgstr "Poténcia"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
@@ -2672,14 +2672,14 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Prètz"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2708,7 +2708,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "N° de factura"
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -2718,7 +2718,7 @@ msgstr ""
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,finish:0
 msgid "O_k"
-msgstr ""
+msgstr "O_k"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
@@ -2735,7 +2735,7 @@ msgstr ""
 #: field:account.tax,applicable_type:0
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Aplicable ?"
 
 #. module: account
 #: field:account.invoice,reference:0
@@ -2756,7 +2756,7 @@ msgstr ""
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: account
 #: wizard_view:account.move.line.reconcile,init_full:0
@@ -2767,12 +2767,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Direccion d'Analisi"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,init,go:0
 msgid "_Go"
-msgstr ""
+msgstr "A_nar a"
 
 #. module: account
 #: field:res.partner,ref_companies:0
@@ -2782,7 +2782,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr ""
+msgstr "Data"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -2808,7 +2808,7 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Referéncia Client:"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -2825,7 +2825,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "Credit total"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1_new
@@ -2874,7 +2874,7 @@ msgstr ""
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr ""
+msgstr "Compte de taxa"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -2884,7 +2884,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr ""
+msgstr "Nom complet del compte"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -2898,7 +2898,7 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
@@ -2921,7 +2921,7 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "Comptabilitat"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2956,12 +2956,12 @@ msgstr ""
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Letratge"
 
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "Centralizacion"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -2996,7 +2996,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.column,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "Lectura sola"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -3010,13 +3010,13 @@ msgstr ""
 #: selection:account.analytic.journal,type:0
 #: selection:account.journal,type:0
 msgid "Situation"
-msgstr ""
+msgstr "Situacion"
 
 #. module: account
 #: rml:account.invoice:0
 #: xsl:account.transfer:0
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: account
 #: help:account.move.line,move_id:0
@@ -3026,12 +3026,12 @@ msgstr ""
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unitat de mesura"
 
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr ""
+msgstr "Compte clients"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -3044,7 +3044,7 @@ msgstr ""
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
 #: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "Nb. de transaccions"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
@@ -3058,7 +3058,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Jornal analitic"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -3073,7 +3073,7 @@ msgstr ""
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: account
 #: view:account.invoice:0
@@ -3093,13 +3093,13 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
-msgstr ""
+msgstr "De pagar"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr ""
+msgstr "Basa"
 
 #. module: account
 #: field:account.model,name:0
@@ -3110,25 +3110,25 @@ msgstr ""
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Others"
-msgstr ""
+msgstr "Autres"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. module: account
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -3138,7 +3138,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
 msgid "account.move.line.select"
-msgstr ""
+msgstr "account.move.line.select"
 
 #. module: account
 #: view:account.account:0
@@ -3156,7 +3156,7 @@ msgstr ""
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #. module: account
 #: model:account.journal,name:account.bank_journal
@@ -3180,7 +3180,7 @@ msgstr ""
 #: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Nòtas"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -3197,7 +3197,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_tax_form
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Taxas"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
@@ -3232,7 +3232,7 @@ msgstr ""
 #: rml:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "Còde"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
@@ -3244,7 +3244,7 @@ msgstr ""
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr ""
+msgstr "Pas cap"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
@@ -3272,7 +3272,7 @@ msgstr ""
 #: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
-msgstr ""
+msgstr "Nom de la taxa"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
@@ -3303,13 +3303,13 @@ msgstr ""
 #. module: account
 #: field:account.move.line,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Desplaçar"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr ""
+msgstr "Basa de la taxa"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@@ -3320,12 +3320,12 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Debit total"
 
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "En espèra"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -3335,7 +3335,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -3402,7 +3402,7 @@ msgstr ""
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
-msgstr ""
+msgstr "Crear"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
@@ -3418,7 +3418,7 @@ msgstr ""
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr ""
+msgstr "Acorchi"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
@@ -3453,7 +3453,7 @@ msgstr ""
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
-msgstr ""
+msgstr "Tipe de compte"
 
 #. module: account
 #: view:res.partner:0
@@ -3471,7 +3471,7 @@ msgstr ""
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr ""
+msgstr "Compte de client"
 
 #. module: account
 #: wizard_button:account.invoice.pay,addendum,reconcile:0
@@ -3493,7 +3493,7 @@ msgstr ""
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr ""
+msgstr "Enfants consolidats"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,fiscalyear:0
@@ -3502,12 +3502,12 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Exercici fiscal"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Balance :"
-msgstr ""
+msgstr "Balança :"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -3518,7 +3518,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -3528,7 +3528,7 @@ msgstr ""
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr ""
+msgstr "Estampat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
@@ -3549,7 +3549,7 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr ""
+msgstr "Plan comptable"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
@@ -3559,7 +3559,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal code"
-msgstr ""
+msgstr "Jornal"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close,init,close:0
@@ -3580,17 +3580,17 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,manual:0
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "Calcul de las taxas"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr ""
+msgstr "# longor dels comptes"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -3603,7 +3603,7 @@ msgstr ""
 #: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
-msgstr ""
+msgstr "Nom de l'escritura"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -3629,7 +3629,7 @@ msgstr ""
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequéncia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -3660,7 +3660,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr ""
+msgstr "3 meses"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
@@ -3683,7 +3683,7 @@ msgstr ""
 #: selection:account.config.wizard,period:0
 #: field:report.hr.timesheet.invoice.journal,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -3705,7 +3705,7 @@ msgstr ""
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
 msgid "By date"
-msgstr ""
+msgstr "Per data"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_config_wizard_form
@@ -3717,7 +3717,7 @@ msgstr ""
 #: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de començament"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
@@ -3755,7 +3755,7 @@ msgstr ""
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nòta"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -3809,7 +3809,7 @@ msgstr ""
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "Other"
-msgstr ""
+msgstr "Autre"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_general_ledger
@@ -3817,17 +3817,17 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_general_ledger_report
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr ""
+msgstr "Grand libre"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "Colomnas"
 
 #. module: account
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 msgid "Movement"
-msgstr ""
+msgstr "Movement"
 
 #. module: account
 #: help:account.period,special:0
@@ -3868,7 +3868,7 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: field:account.analytic.account,quantity_max:0
@@ -3891,7 +3891,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Gropes"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -3907,7 +3907,7 @@ msgstr ""
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actiu"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -3917,7 +3917,7 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr ""
+msgstr "Proprietats"
 
 #. module: account
 #: view:res.partner:0
@@ -3937,7 +3937,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.vat.declaration,init,based_on:0
 msgid "Base on"
-msgstr ""
+msgstr "Basat sus"
 
 #. module: account
 #: selection:account.move,type:0
@@ -3953,7 +3953,7 @@ msgstr ""
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr ""
+msgstr "Devisa"
 
 #. module: account
 #: field:account.account,credit:0
@@ -3973,7 +3973,7 @@ msgstr ""
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
-msgstr ""
+msgstr "Credit"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -4008,7 +4008,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,amount_taxed:0
 msgid "Taxed Amount"
-msgstr ""
+msgstr "Montant Taxat"
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
new file mode 100644
index 00000000000..6f15877199b
--- /dev/null
+++ b/addons/account_analytic_analysis/i18n/oc.po
@@ -0,0 +1,335 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-12 13:35+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours summary by user"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
+msgid "All Analytic Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
+msgid "My Current Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theorical Revenue"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
+msgid "New Analytic Account"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theorical Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
+msgid "Current Analytic Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_invoiced_date:0
+msgid ""
+"If invoice from the costs, this is the date of the latest work or cost that "
+"have been invoiced."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Utilizaire"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
+msgid "My Pending Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
+msgid "My Uninvoiced Entries"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
+msgid "My Accounts"
+msgstr "Mos comptes"
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"Modify account analytic view to show\n"
+"important data for project manager of services companies.\n"
+"Add menu to show relevant information for each manager."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr "report_account_analytic"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr "Montant facturat"
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
+msgid "Financial Project Management"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
+msgid "Pending Analytic Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr "Compte analitic"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_to_invoice:0
+msgid ""
+"If invoice from analytic account, the remaining amount you can invoice to "
+"the customer based on the total costs."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr "Durada totala"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "All Uninvoiced Entries"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index dcbfd62b49d..3b6b9dc7421 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -7,48 +7,47 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 17:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-03-12 23:52+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-03-14 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr ""
+msgstr "ID Conta4"
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
+"O nome do objeto deve começar com x_ e não conter caracteres especiais!"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
 #: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
 msgid "Crossovered Analytic"
-msgstr ""
+msgstr "Analítico Cruzado"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr ""
+msgstr "ID Conta5"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
 msgid "End Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "Taxa (%)"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -57,82 +56,82 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr ""
+msgstr "Plano analítico"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr ""
+msgstr "Linha Analítica de Instância"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
-msgstr ""
+msgstr "Linhas da Distribuição Analítica"
 
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "Até a Data"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr ""
+msgstr "ID do Plano"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
-msgstr ""
+msgstr "Modelos de distribuição analítica"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr ""
+msgstr "Nome da Conta"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "Linha da Distribuição Analítica"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr ""
+msgstr "Código de Distribuição"
 
 #. module: account_analytic_plans
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr ""
+msgstr "Nome do Plano"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "Data de impressão"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Percentage"
-msgstr ""
+msgstr "Percentual"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,empty_line:0
 msgid "Dont show empty lines"
-msgstr ""
+msgstr "Não mostrar linhas em branco"
 
 #. module: account_analytic_plans
 #: wizard_view:wizard.crossovered.analytic,init:0
 msgid "Select Information"
-msgstr ""
+msgstr "Selecione Informação"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -143,17 +142,17 @@ msgstr ""
 #: field:account.analytic.plan.instance,journal_id:0
 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Diário Analítico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,ref:0
 msgid "Analytic Account Ref."
-msgstr ""
+msgstr "Ref. Conta Analítica"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_anglo_saxon/i18n/oc.po b/addons/account_anglo_saxon/i18n/oc.po
new file mode 100644
index 00000000000..e40b4ff280d
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/oc.po
@@ -0,0 +1,64 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-03-12 13:37+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_date_check/i18n/oc.po b/addons/account_date_check/i18n/oc.po
new file mode 100644
index 00000000000..52b15d9dbcd
--- /dev/null
+++ b/addons/account_date_check/i18n/oc.po
@@ -0,0 +1,33 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-12 13:29+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_date_check
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: account_date_check
+#: field:account.journal,allow_date:0
+msgid "Allows date not in the period"
+msgstr ""
+
+#. module: account_date_check
+#: model:ir.module.module,shortdesc:account_date_check.module_meta_information
+msgid "Account Date check"
+msgstr ""
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index 387bd4b7099..f71e87d5e69 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-02 15:41+0000\n"
-"Last-Translator: smii <Unknown>\n"
+"PO-Revision-Date: 2010-03-12 13:04+0000\n"
+"Last-Translator: Henri Kovalainen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-11 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -83,7 +83,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr "debet"
+msgstr "Debet"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -162,7 +162,7 @@ msgstr "Sähköpostin aihe"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Paid"
-msgstr "Maksu"
+msgstr "Maksettu"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -336,7 +336,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.stat,balance:0
 msgid "Balance"
-msgstr "Balanssi"
+msgstr "Saldo"
 
 #. module: account_followup
 #: help:account_followup.followup.print.all,init,date:0
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index cec43682882..afbf0f90936 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-03-11 23:55+0000\n"
+"PO-Revision-Date: 2010-03-12 20:47+0000\n"
 "Last-Translator: Mauri Latvala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: field:crm.email.add.cc,name:0
 msgid "Send to"
-msgstr "Lähetä"
+msgstr "Vastaanottaja"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -508,7 +508,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(kumppani)t = Kumppanin nimi"
 
 #. module: crm
 #: view:crm.case:0
@@ -1087,7 +1087,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Matkapuhelin"
 
 #. module: crm
 #: field:crm.case.rule,name:0
@@ -1108,12 +1108,12 @@ msgstr "Tapaushistoria"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Nuorempi kehittäjä"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Omat kokoukset"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1123,7 +1123,7 @@ msgstr "Tapahtumakategorian nimi"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Ennaltaehkäisevä"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1143,7 +1143,7 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:0
 #, python-format
 msgid "You can not assign Closed Case."
-msgstr ""
+msgstr "Et voi valita suljettua tapausta"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
@@ -1161,7 +1161,7 @@ msgstr ""
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Kokoukset"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1186,12 +1186,12 @@ msgstr "Määräaika"
 #: wizard_button:caldav.crm.import,init,end:0
 #: wizard_button:caldav.crm.subscribe,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peruuta"
 
 #. module: crm
 #: field:crm.case,category2_id:0
 msgid "Category Name"
-msgstr ""
+msgstr "Kategorian nimi"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1215,12 +1215,12 @@ msgstr "Tapahtuman kategoria"
 #: view:crm.phonecall:0
 #: wizard_field:crm.send.mail,init,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Aihe"
 
 #. module: crm
 #: field:crm.meeting,attendees:0
 msgid "Attendees"
-msgstr ""
+msgstr "Osallistujat"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -1281,7 +1281,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Ehdokas on muuttumassa liiketoimintakumppaniksi"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -1291,24 +1291,24 @@ msgstr ""
 #. module: crm
 #: view:crm.claim:0
 msgid "Pending Claims"
-msgstr ""
+msgstr "Odottavat vaateet"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_stage
 msgid "Cases by Opportunities, Category and Stage"
-msgstr ""
+msgstr "Tapahtumat mahdollisuuden, kategorian ja vaiheen mukaan"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead4
 msgid "Print"
-msgstr ""
+msgstr "Tulosta"
 
 #. module: crm
 #: field:crm.case,som:0
 #: field:crm.case.log,som:0
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Mielentila"
 
 #. module: crm
 #: view:crm.claim:0
@@ -1316,12 +1316,12 @@ msgstr ""
 #: field:report.crm.case.section.categ.categ2,category2_id:0
 #: field:report.crm.case.section.categ2,category2_id:0
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Candidate Refused"
-msgstr ""
+msgstr "Ehdokas kieltäytynyt"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1344,7 +1344,7 @@ msgstr "Segmentoinnit"
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1377,7 +1377,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor6
 msgid "Closed Won"
-msgstr ""
+msgstr "Suljettu voitettuna"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_case_categ_crm_case_opened
@@ -1396,12 +1396,12 @@ msgstr "Avoimet tapahtumat"
 #: field:report.crm.case.section.categ2,stage_id:0
 #: field:report.crm.case.section.stage,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Vaihe"
 
 #. module: crm
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1409,31 +1409,33 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the case "
 "section without removing it."
 msgstr ""
+"Jos aktiivisen kentän arvoksi asetetaan TOSI, sallii se sinun piilottaa "
+"tapauksen osiot poistamatta niitä."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Oppiminen ja koulutus"
 
 #. module: crm
 #: wizard_view:crm.phonecall.opportunity_set,create_partner:0
 #: wizard_view:crm.phonecall.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this phonecall ?"
-msgstr ""
+msgstr "Haluatko varmasti luoda kumppanin tämän puhelun perusteella?"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Vaiheet"
 
 #. module: crm
 #: wizard_field:crm.case.opportunity.partner_opportunity,init,planned_revenue:0
 #: wizard_field:crm.lead.opportunity_set,opportunity,planned_revenue:0
 #: wizard_field:crm.phonecall.opportunity_set,opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Odotettu tuotto"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1445,7 +1447,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Convert to Partner"
-msgstr ""
+msgstr "Muunna kumppaniksi"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_category_act_meetall3
@@ -1461,7 +1463,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You can not delete this case. You should better cancel it."
-msgstr ""
+msgstr "Et voi poistaa tätä kohtaa. Sinun olisi parempi peruuttaa se."
 
 #. module: crm
 #: wizard_button:caldav.crm.subscribe,init,open:0
@@ -1486,7 +1488,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,display:0
 msgid "Message..."
-msgstr ""
+msgstr "Viesti..."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_assign_wizard
@@ -1496,19 +1498,19 @@ msgstr ""
 #. module: crm
 #: view:report.crm.case.section.categ2:0
 msgid "Cases by Section and Category2"
-msgstr ""
+msgstr "Tapahtumat osion ja kategoria2:n mukaan"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "done"
-msgstr ""
+msgstr "valmis"
 
 #. module: crm
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Reminder"
-msgstr ""
+msgstr "Muistutus"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1523,7 +1525,7 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "open"
-msgstr ""
+msgstr "avaa"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_attach:0
@@ -1534,7 +1536,7 @@ msgstr "Muistuta liitteen kanssa"
 #: model:crm.case.categ,name:crm.categ_lead6
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Website"
-msgstr ""
+msgstr "Verkkosivu"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_user:0
@@ -1552,6 +1554,8 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Auttaa sinua organisoimaan palkkausprosessin: arvioinnin, taapaamiset, "
+"sähköpostineuvottelut..."
 
 #. module: crm
 #: view:crm.fundraising:0
@@ -1562,13 +1566,13 @@ msgstr ""
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "draft"
-msgstr ""
+msgstr "luonnos"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_claim5
 #: model:crm.case.stage,name:crm.stage_meet4
 msgid "Awaiting Response"
-msgstr ""
+msgstr "Odottaa vastausta"
 
 #. module: crm
 #: field:crm.case,date:0
diff --git a/addons/l10n_chart_uk_minimal/i18n/oc.po b/addons/l10n_chart_uk_minimal/i18n/oc.po
new file mode 100644
index 00000000000..8095e942a52
--- /dev/null
+++ b/addons/l10n_chart_uk_minimal/i18n/oc.po
@@ -0,0 +1,92 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-12 14:00+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_receivable
+msgid "Receivable"
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: model:ir.module.module,description:l10n_chart_uk_minimal.module_meta_information
+msgid ""
+"This is the base module to manage the accounting chart for United Kingdom in "
+"Open ERP."
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_income
+msgid "Income"
+msgstr "Produches"
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_tax
+msgid "Tax"
+msgstr "Impôts et taxes"
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_cash
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_payable
+msgid "Payable"
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: model:ir.module.module,shortdesc:l10n_chart_uk_minimal.module_meta_information
+msgid "United Kingdom - minimal"
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_expense
+msgid "Expense"
+msgstr "Despensas"
+
+#. module: l10n_chart_uk_minimal
+#: model:account.account.type,name:l10n_chart_uk_minimal.account_type_view
+msgid "View"
+msgstr "Afichatge"
diff --git a/addons/l10n_fr/i18n/oc.po b/addons/l10n_fr/i18n/oc.po
new file mode 100644
index 00000000000..e1cab19a46d
--- /dev/null
+++ b/addons/l10n_fr/i18n/oc.po
@@ -0,0 +1,1049 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-12 14:22+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Redevances de crédit-bail immobilier"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "période du"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Autres réserves"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "ACTIF IMMOBILISÉ"
+msgstr ""
+
+#. module: l10n_fr
+#: model:ir.actions.todo,note:l10n_fr.config_call_account_template_fr_pcg
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Capital [dont versé...]"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Réserves statutaires ou contractuelles"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "nstallations techniques,matériel et outillage"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+#: rml:l10n.fr.cdr:0
+msgid "TOTAL III"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_asset
+msgid "Asset"
+msgstr "Actius"
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_income
+msgid "Income"
+msgstr "Produches"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Charges sociales"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "PRODUITS EXCEPTIONNELS"
+msgstr ""
+
+#. module: l10n_fr
+#: wizard_view:l10n.fr.bilan.report,init:0
+msgid "Select year"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Différences négatives de change"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Autres charges"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+#: rml:l10n.fr.cdr:0
+msgid "Tenue de Compte :"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_payable
+msgid "Payable"
+msgstr "De pagar"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "( IV )"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
+msgid "Hors Euro"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Fonds commercial"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "isponibilités"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "+ IV+ V+ VI"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "De participation"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "TOTAL IV"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "D"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "PROVISIONS"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "vances et acomptes"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Autres dettes"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "articipations"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "atières premières et autres approvisionnements"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "P"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_stocks
+msgid "Actif circulant"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "T"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Dettes fournisseurs et comptes rattachés"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Provisions pour charges"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_dettes
+msgid "Dettes long terme"
+msgstr ""
+
+#. module: l10n_fr
+#: wizard_view:l10n.fr.cdr.report,init:0
+msgid "Select period"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "RÉSERVES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "TOTAL GÉNÉRAL (I + II + III + IV)"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_tax
+msgid "Tax"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Dotations aux amortissements, aux dépréciations et aux provisions"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Achats de matières premières et autres approvisionnements"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Avances et acomptes reçus sur commandes en cours"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Quotes-parts de résultat sur opérations faites en commun (II)"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "VALEURS MOBILIÈRES DE PLACEMENT"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+#: rml:l10n.fr.cdr:0
+msgid "TOTAL I"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Autres intérêts et produits assimilés"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Dettes sur immobilisations et comptes rattachés"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Créances clients et comptes rattachés"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Report à nouveau"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "IMMOBILISATIONS INCORPORELLES"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
+msgid "France"
+msgstr "França"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "rêts"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Sous-total A - Montant net du chiffre d'affaires"
+msgstr ""
+
+#. module: l10n_fr
+#: wizard_button:l10n.fr.bilan.report,init,report:0
+#: wizard_button:l10n.fr.cdr.report,init,report:0
+msgid "Print"
+msgstr "Estampar"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Amortissements et dépréciations"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Net"
+msgstr "Net"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "TOTAL I ( A + B )"
+msgstr "TOTAL I ( A + B )"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "itres immobilisés de l'activité de portefeuille"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "( VI )"
+msgstr "( VI )"
+
+#. module: l10n_fr
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_provision
+msgid "Provisions"
+msgstr "Provisions"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Variation des stocks"
+msgstr ""
+
+#. module: l10n_fr
+#: model:ir.actions.report.xml,name:l10n_fr.l10n_fr_pcg_bilan
+#: model:ir.actions.wizard,name:l10n_fr.wizard_l10n_fr_pcg_bilan_report
+#: rml:l10n.fr.bilan:0
+msgid "Bilan"
+msgstr "Bilanç"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Emprunts obligataires convertibles"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "TOTAL ACTIF ("
+msgstr "TOTAL ACTIU ("
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "CHARGES ( hors taxes )"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Produits nets sur cessions de valeurs mobilières de placement"
+msgstr ""
+
+#. module: l10n_fr
+#: field:l10n.fr.line,report_id:0
+msgid "Report"
+msgstr "Rapòrt"
+
+#. module: l10n_fr
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_commitment
+msgid "Engagements"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Avances et acomptes"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_7
+msgid "TVA sur les encaissements"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Sous-total B"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "C"
+msgstr "C"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "M"
+msgstr "M"
+
+#. module: l10n_fr
+#: model:ir.module.module,description:l10n_fr.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart for France in Open ERP.\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Concessions, brevets, licences,..., droits et valeurs similaires"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Instruments de trésorerie"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Écarts de conversion passif"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_expense
+msgid "Expense"
+msgstr "Despensas"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "ACTIF"
+msgstr "ACTIU"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "DETTES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Sur immobilisations : dotations aux amortissements"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "mmobilisations corporelles en cours"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Autres"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Dotation aux amortissements et aux dépréciations"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "PRODUITS D'EXPLOITATION"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid ""
+"Reprises sur provisions, dépréciations (et amortissements) et transferts de "
+"charges"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "PRODUITS - CHARGES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "RÉSULTAT DE L'EXERCICE [bénéfice ou perte]"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Impôts, taxes et versements assimilés"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "roduits intermédiaires et finis"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "utres"
+msgstr "Autres"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Avances et acomptes versés sur commandes"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "onstructions"
+msgstr "Construccions"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Reprises sur provisions, dépréciations et transferts de charges"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "réances rattachées à des participations"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Dotations aux provisions"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "vous sur votre structure juridique et son fonctionnement comptable."
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Sur opérations en capital"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Charges constatés d'avance"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "TOTAL II"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "CAPITAUX PROPRES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Frais d'établissement"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Charges à répartir sur plusieurs exercices"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Subventions d'exploitation"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Provisions réglementées"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "PRODUITS (hors taxes)"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Écart d'équivalence"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Primes d'émission, de fusion, d'apport"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "utres titres immobilisés"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Réserves réglementées"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "CHARGES D'EXPLOITATION"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "I + II + III + IV + V"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid ""
+"Attention, pour que votre bilan soit correct, vous devez solder les comptes "
+"120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
+"nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Vente de marchandises"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "PRODUITS FINANCIERS"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Frais de recherche et de développement"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Autres titres"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Production vendue [biens et services]"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Actions propres"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "D'autres valeurs mobilières et créances de l'actif immobilisé"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "ACTIF CIRCULANT"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "ACTIF - PASSIF"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "apital souscrit - non appelé"
+msgstr ""
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_l10n_fr_report
+msgid "Report for l10n_fr"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Compte de résultat"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "CRÉANCES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Sur opérations de gestion"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Redevances de crédit-bail mobilier"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Primes de remboursement des emprunts"
+msgstr ""
+
+#. module: l10n_fr
+#: field:l10n.fr.report,code:0
+msgid "Code"
+msgstr "Còde"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Autres produits"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Participation des salariés aux résultats"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Subventions d'investissement"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "STOCK EN COURS"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Autres achats et charges externes"
+msgstr ""
+
+#. module: l10n_fr
+#: wizard_field:l10n.fr.bilan.report,init,fiscalyear:0
+#: wizard_field:l10n.fr.cdr.report,init,fiscalyear:0
+msgid "Fiscal year"
+msgstr "Exercici fiscal"
+
+#. module: l10n_fr
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
+msgid "DOM-TOM"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Intérêts et charges assimilées"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Immobilisations incorporelles en cours"
+msgstr ""
+
+#. module: l10n_fr
+#: wizard_button:l10n.fr.bilan.report,init,end:0
+#: wizard_button:l10n.fr.cdr.report,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+#: rml:l10n.fr.cdr:0
+msgid "au"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Production immobilisée"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Sur actif circulant : dotations aux dépréciations"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_receivable
+msgid "Receivable"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Capital souscrit - appelé , non versé"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+#: rml:l10n.fr.cdr:0
+msgid "( V )"
+msgstr "( V )"
+
+#. module: l10n_fr
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: l10n_fr
+#: field:l10n.fr.line,definition:0
+msgid "Definition"
+msgstr "Definicion"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Différences positives de change"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "errains"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Brut"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_immobilisations
+msgid "Immobilisations"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "PASSIF"
+msgstr "PASSIU"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Écarts de réévaluation"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Production stockée"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+#: rml:l10n.fr.cdr:0
+msgid "Imprimé le :"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Impôts sur les bénéfices"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "TOTAL DES PRODUITS ( I + II + III + IV )"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Salaires et traitements"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+#: rml:l10n.fr.cdr:0
+msgid ")"
+msgstr ")"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Provisions pour risques"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "n-cours de production [biens et services]"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Sur immobilisations : dotations aux dépréciations"
+msgstr ""
+
+#. module: l10n_fr
+#: field:l10n.fr.line,code:0
+msgid "Variable Name"
+msgstr "Nom de la variabla"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "TOTAL CHARGES ( I + II + III"
+msgstr ""
+
+#. module: l10n_fr
+#: model:ir.actions.report.xml,name:l10n_fr.l10n_fr_pcg_cdr
+#: model:ir.actions.wizard,name:l10n_fr.wizard_l10n_fr_pcg_cdr_report
+msgid "Compte de resultat"
+msgstr "Compte de resultat"
+
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_l10n_fr_line
+msgid "Report Lines for l10n_fr"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "A"
+msgstr "A"
+
+#. module: l10n_fr
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_2
+msgid "Zone Euro"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "E"
+msgstr "E"
+
+#. module: l10n_fr
+#: field:l10n.fr.line,name:0
+#: field:l10n.fr.report,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "I"
+msgstr "I"
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_stock
+msgid "Stocks"
+msgstr ""
+
+#. module: l10n_fr
+#: field:l10n.fr.report,line_ids:0
+msgid "Lines"
+msgstr "Linhas"
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_cash
+msgid "Cash"
+msgstr "Liquiditats"
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_special
+msgid "Comptes spéciaux"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Emprunts et dettes financières diverses"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Produits constatés d'avance"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Charges nettes sur cessions de valeurs mobilières de placement"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "archandises"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Emprunts et dettes auprès des établissements de crédit"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_view
+msgid "View"
+msgstr "Afichatge"
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "CHARGES FINANCIÈRES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Quotes-parts de résultat sur opérations faites en commun ( II )"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "IMMOBILISATIONS CORPORELLES"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_6
+msgid "TVA sur le débits"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "Achat de marchandises"
+msgstr ""
+
+#. module: l10n_fr
+#: model:ir.module.module,shortdesc:l10n_fr.module_meta_information
+msgid "France - Plan Comptable Général"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Écarts de conversion actif"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Autres emprunts obligataires"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Réserve légale"
+msgstr ""
+
+#. module: l10n_fr
+#: model:account.account.type,name:l10n_fr.account_type_cloture
+msgid "Cloture"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "IMMOBILISATIONS FINANCIÉRES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.cdr:0
+msgid "CHARGES EXCEPTIONNELLES"
+msgstr ""
+
+#. module: l10n_fr
+#: rml:l10n.fr.bilan:0
+msgid "Dettes fiscales et sociales"
+msgstr ""
diff --git a/addons/l10n_lu/i18n/oc.po b/addons/l10n_lu/i18n/oc.po
new file mode 100644
index 00000000000..5ec333cc9ff
--- /dev/null
+++ b/addons/l10n_lu/i18n/oc.po
@@ -0,0 +1,126 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-12 13:54+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: l10n_lu
+#: wizard_view:l10n_lu.tax.report.wizard,init:0
+msgid "VAT Legal Declaration"
+msgstr ""
+
+#. module: l10n_lu
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_lu
+#: wizard_button:l10n_lu.tax.report.wizard,init,pdf:0
+msgid "Print Taxes Statement"
+msgstr ""
+
+#. module: l10n_lu
+#: wizard_field:l10n_lu.tax.report.wizard,init,tax_code_id:0
+msgid "Company"
+msgstr "Entrepresa"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_income
+msgid "Income"
+msgstr "Produches"
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_moves
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.actions.todo,note:l10n_lu.config_call_account_template
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to "
+"select the company, the chart template, the no. of digits to generate the "
+"code for your accounts and Bank account, currency to create Journals. "
+"Thus,the pure copy of chart Template is generated.\n"
+"This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.actions.report.xml,name:l10n_lu.legal_vat
+msgid "Luxembourg VAT Declaration"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_liability
+msgid "Liability"
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.ui.menu,name:l10n_lu.legal_lu
+msgid "Luxembourg"
+msgstr "Luxemborg"
+
+#. module: l10n_lu
+#: model:ir.actions.wizard,name:l10n_lu.wizard_print_vat
+#: model:ir.ui.menu,name:l10n_lu.legal_lu_vat
+msgid "VAT Declaration"
+msgstr ""
+
+#. module: l10n_lu
+#: wizard_field:l10n_lu.tax.report.wizard,init,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_lu
+#: wizard_button:l10n_lu.tax.report.wizard,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: l10n_lu
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_lu
+#: model:ir.module.module,shortdesc:l10n_lu.module_meta_information
+msgid "Luxembourg - Plan Comptable Minimum Normalise"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_creances
+msgid "Créances"
+msgstr ""
+
+#. module: l10n_lu
+#: model:account.account.type,name:l10n_lu.account_type_root
+msgid "View"
+msgstr "Afichatge"
diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_subproduct/i18n/oc.po
new file mode 100644
index 00000000000..2335a817202
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/oc.po
@@ -0,0 +1,89 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-03-12 13:51+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_subproduct
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: mrp_subproduct
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produch"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Mrp Sub Product"
+msgstr "Components per MRP"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Nomenclatura"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabla"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+msgid "MRP Sub Product"
+msgstr ""
diff --git a/addons/multi_company/i18n/oc.po b/addons/multi_company/i18n/oc.po
new file mode 100644
index 00000000000..49f656d7233
--- /dev/null
+++ b/addons/multi_company/i18n/oc.po
@@ -0,0 +1,192 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-12-08 11:46+0000\n"
+"PO-Revision-Date: 2010-03-12 13:42+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: multi_company
+#: help:multi_company.default,object_id:0
+msgid "Object affect by this rules"
+msgstr ""
+
+#. module: multi_company
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: multi_company
+#: constraint:res.partner:0
+msgid "The VAT doesn't seem to be correct."
+msgstr ""
+
+#. module: multi_company
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: multi_company
+#: model:res.company,overdue_msg:multi_company.res_company_odoo
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
+msgid ""
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,object_id:0
+msgid "Object"
+msgstr "Objècte"
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr "Multisocietat"
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid ""
+"This module add the possibility to easily manage \n"
+"    the default value for each object\n"
+"    "
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Condicion"
+
+#. module: multi_company
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr ""
+
+#. module: multi_company
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invalid per l'arquitectura de la vista"
+
+#. module: multi_company
+#: field:multi_company.default,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: multi_company
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr ""
+
+#. module: multi_company
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: multi_company
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi company"
+msgstr "Multisocietat"
+
+#. module: multi_company
+#: model:ir.model,name:multi_company.model_multi_company_default
+msgid "multi_company.default"
+msgstr "multi_company.default"
+
+#. module: multi_company
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr "Expression"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr ""
+
+#. module: multi_company
+#: field:multi_company.default,sequence:0
+msgid "Sequence"
+msgstr "Sequéncia"
+
+#. module: multi_company
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: multi_company
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: multi_company
+#: help:multi_company.default,expression:0
+msgid "Expression, must be True to match"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
+msgid "Default company per Object"
+msgstr ""
+
+#. module: multi_company
+#: code:addons/multi_company/multi_company.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (còpia)"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "Correspondéncia"
diff --git a/addons/olap/i18n/oc.po b/addons/olap/i18n/oc.po
new file mode 100644
index 00000000000..fc078de73d8
--- /dev/null
+++ b/addons/olap/i18n/oc.po
@@ -0,0 +1,1399 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:24+0000\n"
+"PO-Revision-Date: 2010-03-12 13:48+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr "Amagar"
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr "Ora"
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr "Connexion a una banca de donadas"
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr "MySQL"
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr "Nom del servidor"
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr "Clau primària"
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr "Executar"
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr "D'acòrdi"
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr "Nivèl"
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if                 its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP                 Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection,      "
+"so that you will be able to work on it, and specify a better structure      "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or      "
+"rename tables and columns to simplify end-users interface. The following "
+"database      will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling  this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+"    Base module to manage Olap schemas. Cube designer.\n"
+"    "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/olap_crm/i18n/oc.po b/addons/olap_crm/i18n/oc.po
new file mode 100644
index 00000000000..3b0826e83e5
--- /dev/null
+++ b/addons/olap_crm/i18n/oc.po
@@ -0,0 +1,31 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-12 13:38+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_crm
+#: model:ir.module.module,description:olap_crm.module_meta_information
+msgid ""
+"\n"
+"    Sale module will load the data in olap tables\n"
+"    "
+msgstr ""
+
+#. module: olap_crm
+#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
+msgid "olap_crm"
+msgstr "olap_crm"
diff --git a/addons/olap_extract/i18n/oc.po b/addons/olap_extract/i18n/oc.po
new file mode 100644
index 00000000000..550e53ba6f9
--- /dev/null
+++ b/addons/olap_extract/i18n/oc.po
@@ -0,0 +1,56 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-26 05:29+0000\n"
+"PO-Revision-Date: 2010-03-12 13:38+0000\n"
+"Last-Translator: Cédric VALMARY <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-03-13 04:51+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap_extract
+#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
+msgid "olap_extract"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,ok:0
+msgid "OK"
+msgstr "D'acòrdi"
+
+#. module: olap_extract
+#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
+msgid "Olap Extract"
+msgstr ""
+
+#. module: olap_extract
+#: model:ir.module.module,description:olap_extract.module_meta_information
+msgid ""
+"\n"
+"    Extracts the schema structure.\n"
+"    "
+msgstr ""
+
+#. module: olap_extract
+#: wizard_field:olap.extract.schema,init,module_name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: olap_extract
+#: wizard_button:olap.extract.schema,init,end:0
+msgid "Cancel"
+msgstr "Anullar"
+
+#. module: olap_extract
+#: wizard_view:olap.extract.schema,init:0
+msgid "New Module Name"
+msgstr ""

From 81d69bc2523fe482df695b9f0a441c368d821bb0 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Mon, 15 Mar 2010 10:18:15 +0530
Subject: [PATCH 53/56] [FIX] account_analytic_plan:  product_id_change()
 missing argument

bzr revid: mra@tinyerp.com-20100315044815-q775fcwjvpo2u618
---
 addons/account_analytic_plans/account_analytic_plans.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 0accc1e8b7e..52fc1aa1f9b 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 from lxml import etree
@@ -258,8 +258,8 @@ class account_invoice_line(osv.osv):
         res ['analytics_id']=line.analytics_id and line.analytics_id.id or False
         return res
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None):
-        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
+        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
         if rec and rec.analytics_id:
             res_prod['value'].update({'analytics_id':rec.analytics_id.id})

From 080297c2dc1c07e5d72c787251bd78bb9dd19827 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 15 Mar 2010 11:02:03 +0530
Subject: [PATCH 54/56] [IMP]: base_calendar: Put store=True for vtimezone
 field on event

bzr revid: rpa@tinyerp.com-20100315053203-nqi7vv152rkr6fe5
---
 addons/base_calendar/base_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4d0f85376f3..9835217c0e3 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -775,7 +775,7 @@ rule or repeating pattern for anexception to a recurrence set"),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), 
         'recurrent_uid': fields.integer('Recurrent ID'), 
         'recurrent_id': fields.datetime('Recurrent ID date'), 
-        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, string='Timezone'), 
+        'vtimezone': fields.related('user_id', 'context_tz', type='char', size=24, string='Timezone', store=True), 
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'freq': fields.selection([('None', 'No Repeat'), \
                             ('secondly', 'Secondly'), \

From 5479a4e88e7cf53ff82cbb6e9dbad0199432d23e Mon Sep 17 00:00:00 2001
From: "ksa (Open ERP)" <ksa@tinyerp.co.in>
Date: Mon, 15 Mar 2010 11:31:38 +0530
Subject: [PATCH 55/56] [IMP]: olap: Converted Load column and Query Logs wizrd
  into osv memory wizard

bzr revid: ksa@tinyerp.co.in-20100315060138-l0cygthavv1ht1vs
---
 addons/olap/__terp__.py                       |   4 +-
 addons/olap/data/olap_fact_view.xml           |  10 +-
 addons/olap/data/olap_wizard.xml              |  29 +--
 addons/olap/wizard/__init__.py                |   6 +-
 ...rd_load_columns.py => olap_load_column.py} |  40 ++--
 addons/olap/wizard/olap_load_column_view.xml  |  37 ++++
 addons/olap/wizard/olap_query_logs_clear.py   |  75 +++++++
 .../wizard/olap_query_logs_clear_view.xml     |  45 ++++
 .../wizard/wizard_application_configure.py    | 194 ------------------
 addons/olap/wizard/wizard_clear_logs.py       |  83 --------
 10 files changed, 197 insertions(+), 326 deletions(-)
 rename addons/olap/wizard/{wizard_load_columns.py => olap_load_column.py} (67%)
 create mode 100644 addons/olap/wizard/olap_load_column_view.xml
 create mode 100755 addons/olap/wizard/olap_query_logs_clear.py
 create mode 100644 addons/olap/wizard/olap_query_logs_clear_view.xml
 delete mode 100755 addons/olap/wizard/wizard_application_configure.py
 delete mode 100755 addons/olap/wizard/wizard_clear_logs.py

diff --git a/addons/olap/__terp__.py b/addons/olap/__terp__.py
index 7583de75182..d716fb83ddf 100644
--- a/addons/olap/__terp__.py
+++ b/addons/olap/__terp__.py
@@ -10,8 +10,10 @@
     """,
     "init_xml" :  ["data/olap_data.xml"],
     "update_xml" : [
-        "data/olap_view.xml",
+        "wizard/olap_query_logs_clear_view.xml",
+        "wizard/olap_load_column_view.xml",
         "data/olap_wizard.xml",
+        "data/olap_view.xml",
         "data/olap_cube_view.xml",
         "data/olap_fact_view.xml",
         "data/olap_cube_workflow.xml",
diff --git a/addons/olap/data/olap_fact_view.xml b/addons/olap/data/olap_fact_view.xml
index d46669e2725..74a794d9eee 100755
--- a/addons/olap/data/olap_fact_view.xml
+++ b/addons/olap/data/olap_fact_view.xml
@@ -81,7 +81,7 @@
                 <field name="active"/>
                 <field name="hide"/>
 <!--                <button name="show_col_view" string="Columns" type="object"/>-->
-                <!--<button string="Columns_wiz" name="%(bi_load_column)d" type="action"/>-->
+
                 <button name="hide_col" string="Hide" type="object"/>
                 <button name="show_col" string="Show" type="object"/>
             </tree>
@@ -108,7 +108,7 @@
                         <button name="hide_col" string="Hide" type="object"/>
                         <button name="show_col" string="Show" type="object"/>
                     </tree>
-                </field>            
+                </field>
                 <field name="fact_database_id" select="1" colspan="2"/>
                 <field name="active"/>
                 <field name="hide"/>
@@ -150,7 +150,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_olap_database_columns_tree_m20">
         <field name="name">olap.database.columns.tree.m20</field>
         <field name="model">olap.database.columns</field>
@@ -165,7 +165,7 @@
             </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_olap_database_columns_form">
         <field name="name">olap.database.columns.form</field>
         <field name="model">olap.database.columns</field>
@@ -318,7 +318,7 @@
             <form string="Olap Application Field">
                 <newline/>
                 <field name="name" select="1" colspan="2"/>
-                <field name="field_name" select="1" />              
+                <field name="field_name" select="1" />
                 <field name="table_name" select="1" />
                 <newline/>
                 <field name="is_hidden" select="1" colspan="2"/>
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index c2cda9ef29a..794b7c3681c 100755
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <wizard
             string="Query Builder"
             model="olap.schema"
@@ -9,8 +9,6 @@
             menu= "False"
             multi="True"
             id="bi_conf_cube_query_builder"/>
-        <!--        <menuitem name="Query Builder" action="bi_conf_cube_query_builder" type="wizard"  id="menu_bi_conf_cube_query_builder" sequence="40" parent="menu_bi_conf_tools"/>
-        -->
 
     <wizard
             string="Load Tables"
@@ -28,20 +26,19 @@
             menu= "False"
             multi="True"
             id="bi_menu_olap_load_table"/>
-            
+
         <wizard
             string="Open Configuration"
             model="olap.schema"
             name="olap.load.configuration.table"
             menu= "False"
             multi="True"
-            id="bi_load_configuration_table"/>          
+            id="bi_load_configuration_table"/>
 
         <wizard
             string="Configure from Application"
             model="olap.schema"
             name="olap.application.configuration"
-            menu="False"
             multi="True"
             id="bi_application_configuration"/>
 
@@ -50,24 +47,10 @@
             model="olap.fact.database"
             name="olap.fact.database.test_connection"
             menu="False"
-            id="bi_test_connection"/> 
-
-        <wizard
-            string="Open Columns"
-            model="olap.database.columns"
-            name="olap.load.column"
-            menu= "False"
-            multi="True"
-            id="bi_load_column"/> 
-            
-        <wizard
-            string="Clear Logs"
-            model="olap.query.logs"
-            name="olap.query.logs.clear"
-            menu="True"
-            id="bi_clear_logs"/>    
-        <menuitem name="Clear Logs" action="bi_clear_logs" type="wizard"  id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+            id="bi_test_connection"/>
 
+   <menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
+         id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
 
     </data>
 </openerp>
diff --git a/addons/olap/wizard/__init__.py b/addons/olap/wizard/__init__.py
index a7b3a6af17f..94763698ad2 100755
--- a/addons/olap/wizard/__init__.py
+++ b/addons/olap/wizard/__init__.py
@@ -28,7 +28,7 @@
 import wizard_query_builder
 import wizard_load_data
 import wizard_load_configured_table
-import wizard_clear_logs
-import wizard_application_configure
-import wizard_load_columns
 import wizard_test_connection
+#import wizard_application_configure
+import olap_query_logs_clear
+import olap_load_column
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_load_columns.py b/addons/olap/wizard/olap_load_column.py
similarity index 67%
rename from addons/olap/wizard/wizard_load_columns.py
rename to addons/olap/wizard/olap_load_column.py
index f64a94399b4..e60f0f2bfa6 100755
--- a/addons/olap/wizard/wizard_load_columns.py
+++ b/addons/olap/wizard/olap_load_column.py
@@ -24,17 +24,25 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import time
-
-import wizard
+from osv import fields, osv
+from service import web_services
 import pooler
+import time
+import wizard
 
-class wizard_load_columns(wizard.interface):
-    def _get_table_data(self, cr, uid, data, context={}):
-        pool_obj = pooler.get_pool(cr.dbname)
-        ids_cols=pool_obj.get('olap.database.columns').search(cr, uid, ([('table_id','=',data['id'])]),context={})
-        model_data_ids = pool_obj.get('ir.model.data').search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_olap_database_columns_form')],context={})
-        resource_id = pool_obj.get('ir.model.data').read(cr,uid,model_data_ids,fields=['res_id'])[0]['res_id']
+class olap_load_column(osv.osv_memory):
+    """ Load Database Column """
+    _name = "olap.load.column"
+    _description = "Olap Load Column"
+
+    def get_table_data(self, cr, uid, ids, context={}):
+        ids_cols=self.pool.get('olap.database.columns').search(cr, uid,\
+                             ([('table_id','=',context['active_id'])]),context={})
+        model_data_ids = self.pool.get('ir.model.data').search(cr,uid,\
+                        [('model','=','ir.ui.view'),\
+                    ('name','=','view_olap_database_columns_form')],context={})
+        resource_id = self.pool.get('ir.model.data').read(cr,uid,\
+                                model_data_ids,fields=['res_id'])[0]['res_id']
         return {
             'domain': "[('id','in', ["+','.join(map(str,ids_cols))+"])]",
             'name': 'Database Columns',
@@ -44,12 +52,10 @@ class wizard_load_columns(wizard.interface):
             'views': [(False,'tree'),(resource_id,'form')],
             'type': 'ir.actions.act_window',
         }
-        
-    states = {
-        'init' : {
-            'actions' : [],
-            'result' : {'type' : 'action' ,'action':_get_table_data,'state':'end'}
-        }
-      }
+    _columns = {
 
-wizard_load_columns('olap.load.column')
+            }
+
+olap_load_column()
+
+# vim: ts=4 sts=4 sw=4 si et
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_load_column_view.xml b/addons/olap/wizard/olap_load_column_view.xml
new file mode 100644
index 00000000000..48fd23362de
--- /dev/null
+++ b/addons/olap/wizard/olap_load_column_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_olap_load_column" model="ir.ui.view">
+            <field name="name">Create Logs</field>
+            <field name="model">olap.load.column</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="">
+              	<separator string="                    " colspan="4"/> 
+            	<button name="get_table_data" string="Open" type="object"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_olap_load_column" model="ir.actions.act_window">
+            <field name="name">Open Columns</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.load.column</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="context">{'record_id' : active_id}</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record model="ir.values" id="lap_load_column">
+            <field name="model_id" ref="olap.model_olap_database_columns" />
+            <field name="object" eval="1" />
+            <field name="name">Open Columns</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_olap_load_column'))" />
+            <field name="key">action</field>
+            <field name="model">olap.database.columns</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/olap/wizard/olap_query_logs_clear.py b/addons/olap/wizard/olap_query_logs_clear.py
new file mode 100755
index 00000000000..63f35a382ea
--- /dev/null
+++ b/addons/olap/wizard/olap_query_logs_clear.py
@@ -0,0 +1,75 @@
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from osv import fields, osv
+from service import web_services
+import pooler
+import time
+import wizard
+
+class olap_query_logs_clear(osv.osv_memory):
+    """ Clear the Logs for Given User  """
+    _name = "olap.query.logs.clear"
+    _description = "Olap Query Logs Clear"
+    _columns = {
+        'user_name':fields.char('User',size=64,required=True,readonly=True),
+    }
+
+    def _getdata(self,cr,uid,context={}):
+        user = self.pool.get('res.users').browse(cr,uid,uid)
+        return user.name
+
+    _defaults = {
+        'user_name': _getdata
+            }
+
+    def clear_logs(self,cr,uid,part,context={}):
+        ids = self.pool.get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
+        self.pool.get('olap.query.logs').unlink(cr, uid,ids,context)
+        data_obj = self.pool.get('ir.model.data')
+        id2 = data_obj._get_id(cr, uid, 'olap', 'view_olap_query_logs_clear_msg')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        value = {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'olap.query.logs.clear.msg',
+            'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'target': 'new'
+        }
+        return value
+
+olap_query_logs_clear()
+
+class olap_query_logs_clear_msg(osv.osv_memory):
+    _name = "olap.query.logs.clear.msg"
+    _description = "Olap Query Logs Clear Message"
+    _columns = {
+
+            }
+olap_query_logs_clear_msg()
+# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/olap_query_logs_clear_view.xml b/addons/olap/wizard/olap_query_logs_clear_view.xml
new file mode 100644
index 00000000000..08d93c9410b
--- /dev/null
+++ b/addons/olap/wizard/olap_query_logs_clear_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record id="view_olap_query_logs_clear" model="ir.ui.view">
+            <field name="name">Create Logs</field>
+            <field name="model">olap.query.logs.clear</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string=" To Load Data">
+    			<field name='user_name'/>
+    			<separator string="" colspan="4" />
+    	        <label string="" colspan="2" />
+    	        <group colspan="4">
+        	    <button special="cancel" string="Cancel" />
+            	<button name="clear_logs" string="Clear Logs" type="object"/>
+            	</group>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_view_olap_query_logs_clear" model="ir.actions.act_window">
+            <field name="name">Create Logs </field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">olap.query.logs.clear</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+    	</record>
+
+		<record id="view_olap_query_logs_clear_msg" model="ir.ui.view">
+            <field name="name">Create Logs Message</field>
+            <field name="model">olap.query.logs.clear.msg</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              <form string="Load Data">
+    			<label string="Logs Cleared successfully"/>
+    	        <group colspan="4">
+            	 <button special="cancel" string="Ok" />
+            	</group>
+			</form>
+            </field>
+		</record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/olap/wizard/wizard_application_configure.py b/addons/olap/wizard/wizard_application_configure.py
deleted file mode 100755
index 3dfac9e2974..00000000000
--- a/addons/olap/wizard/wizard_application_configure.py
+++ /dev/null
@@ -1,194 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import time
-
-import wizard
-import pooler
-from osv import osv
-import netsvc
-
-info = '''<?xml version="1.0"?>
-<form string="Auto Configure">
-    <label string="Your database structure (Open ERP) has been sucessfully configured."/>
-</form>'''
-
-form1 = '''<?xml version="1.0"?>
-<form string=" Auto Configure ">
-    <label string="This will Auto Configure Application"/>
-</form>'''
-
-class wizard_application_configure(wizard.interface):
-    
-    def configure_application(self,cr,uid,data,context):
-        
-        vals={}
-        apptabnew_vals={}
-        appfieldnew_vals={}
-        
-        ids=pooler.get_pool(cr.dbname).get('olap.schema').browse(cr,uid,data['id'])
-        
-        if ids.app_detect == "Unknown Application":
-            raise wizard.except_wizard('Warning', 'The Application is Unknown, we can not configure it automatically.')
-
-        else:
-            app_objs = pooler.get_pool(cr.dbname).get('olap.application')
-            app_ids = app_objs.search(cr, uid, [])
-            app_res = app_objs.browse(cr,uid, app_ids)
-            app_id=''
-            for x_app in app_res:
-                  app_id = x_app['id']
-                  
-            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
-            apptab_ids = apptab_objs.search(cr, uid, [])
-            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
-            apptab_name=[]
-            for aptab in apptab_res:
-                apptab_name.append(aptab.name)
-
-            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
-            appfield_ids = appfield_objs.search(cr, uid, [])
-            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
-            appcol_name=[]
-            for apcol in appfield_res:
-                appcol_name.append(apcol.name)
-            
-
-            apptab_objs = pooler.get_pool(cr.dbname).get('olap.application.table')
-            apptab_ids = apptab_objs.search(cr, uid, [])
-            apptab_res = apptab_objs.browse(cr,uid, apptab_ids)
-#            apptab_data_res = apptab_objs.read(cr,uid, apptab_ids,[])[0]
-            
-            apptab_name=[]
-            map_apptab_name_id={}
-            for aptab in apptab_res:
-                apptab_name.append(aptab.name)
-                map_apptab_name_id[aptab.table_name]=aptab
-            
-            appfield_objs = pooler.get_pool(cr.dbname).get('olap.application.field')
-            appfield_ids = appfield_objs.search(cr, uid, [])
-            appfield_res = appfield_objs.browse(cr,uid, appfield_ids)
-            appfield_data_res = appfield_objs.read(cr,uid, appfield_ids,[])
-            
-            appcol_name=[]
-            for apcol in appfield_res:
-                appcol_name.append(apcol.name)
-                
-            id_tables=pooler.get_pool(cr.dbname).get('olap.database.tables').search(cr,uid,[('fact_database_id','=',ids.database_id.id),('table_db_name','not in',['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel'])])
-            tables=pooler.get_pool(cr.dbname).get('olap.database.tables').read(cr,uid,id_tables,[])
-            
-            for tables in tables:
-                if not(tables['table_db_name'].startswith('ir') or tables['table_db_name'].startswith('wkf') or tables['table_db_name'].startswith('res_groups')):
-                    vals={}
-                    if len(apptab_ids)==0 and (tables['table_db_name'] not in apptab_name):
-                        vals['table_name']=tables['table_db_name']
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
-                        vals['is_hidden']=tables['hide']
-                        vals['application_id']=app_id
-                        apptab_new_obj=apptab_objs.create(cr,uid,vals)
-                    else:
-                        if map_apptab_name_id.has_key(tables['table_db_name']):
-                            app_table = map_apptab_name_id[tables['table_db_name']]
-                            if ((app_table['table_name']==tables['table_db_name']) and not (app_table['table_name']==tables['name'])):
-                                vals['name']=aptable_obj.table_name
-                                vals['hide']=aptable_obj.is_hidden
-                                tables_obj_new=apptab_objs.write(cr,uid,tables['id'],vals)
-                        else:
-                            vals['table_name']=tables['table_db_name']
-                            vals['name']=(" ").join(map(lambda x:x.capitalize(),tables['name'].split("_")))
-                            vals['is_hidden']=tables['hide']
-                            vals['application_id']=app_id
-                            apptab_new_obj=apptab_objs.create(cr,uid,vals)
-                    
-            id_columns=pooler.get_pool(cr.dbname).get('olap.database.columns').search(cr,uid,[('table_id','in',id_tables)])
-            columns=pooler.get_pool(cr.dbname).get('olap.database.columns').read(cr,uid,id_columns,[])
-            for columns in columns:
-                vals={}
-                if len(appfield_ids) == 0 and (columns['column_db_name'] not in appcol_name):
-                    vals['field_name']=columns['column_db_name']
-                    vals['table_name']=columns['table_id'][1]
-                    vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                    vals['is_hidden']=columns['hide']
-                    vals['application_id']=x_app['id']                      
-                    appfield_new_obj=appfield_objs.create(cr,uid,vals)
-                else:
-                    if map_apptab_name_id.has_key(columns['table_id'][1]):
-                        table_id_write = map_apptab_name_id[columns['table_id'][1]]
-                        filter_column=filter(lambda x: columns['column_db_name']==x['field_name'] and columns['table_id'][1]==x['table_name'],appfield_data_res)
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                        vals['is_hidden']=columns['hide']
-                        appfield_new_obj=appfield_objs.write(cr,uid,filter_column[0]['id'],vals)
-                    else:
-                        vals['field_name']=columns['column_db_name']
-                        vals['table_name']=columns['table_id'][1]
-                        vals['name']=(" ").join(map(lambda x:x.capitalize(),columns['name'].split("_")))
-                        vals['is_hidden']=columns['hide']
-                        vals['application_id']=x_app['id']                      
-                        appfield_new_obj=appfield_objs.create(cr,uid,vals)
-        
-        
-            database_tables = pooler.get_pool(cr.dbname).get('olap.database.tables')
-            id_tables=database_tables.search(cr,uid,[('fact_database_id','=',ids.database_id.id)])
-            tables=database_tables.read(cr,uid,id_tables,[])
-            make_id=[]
-            for table in tables:
-                vals={}
-                if (table['table_db_name'].startswith('ir') or table['table_db_name'].startswith('wkf')) or (table['table_db_name'].startswith('res_groups')) or (table['table_db_name'] in ['inherit','res_roles','user_rule_group_rel','res_roles_users_rel','group_rule_group_rel']):            
-                    vals['hide']=True
-                    vals['active']=False
-                    make_id.append(table['id'])
-                    database_tables.write(cr,uid,table['id'],vals)
-                    
-            database_columns=pooler.get_pool(cr.dbname).get('olap.database.columns')
-            id_columns=database_columns.search(cr,uid,[('table_id','in',make_id)])
-            columns=database_columns.read(cr,uid,id_columns,[])
-            for col in columns:
-                val={}
-                vals['hide']=True
-                vals['active']=False
-                database_columns.write(cr,uid,col['id'],vals)
-                
-            
-        wf_service = netsvc.LocalService('workflow')
-        wf_service.trg_validate(uid, 'olap.schema', data['id'], 'dbconfigure', cr)
-        return {}
-      
-    
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':{}, 'state':[('configure','Configure'),('end','Cancel')]}
-        },
-        'configure': {
-            'actions': [configure_application],
-            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}   
-        },
-
-      }
-
-
-wizard_application_configure('olap.application.configuration')
-# vim: ts=4 sts=4 sw=4 si et
diff --git a/addons/olap/wizard/wizard_clear_logs.py b/addons/olap/wizard/wizard_clear_logs.py
deleted file mode 100755
index 38b6531485a..00000000000
--- a/addons/olap/wizard/wizard_clear_logs.py
+++ /dev/null
@@ -1,83 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import time
-
-import wizard
-import pooler
-from osv import osv
-
-
-info = '''<?xml version="1.0"?>
-<form string="Load Data">
-    <label string="Logs Cleared successfully"/>
-</form>'''
-
-form1 = '''<?xml version="1.0"?>
-<form string=" To Load Data">
-    <field name='user_name'/>
-</form>'''
-
-field1 = {
- #   'account_id': {'string':"Analytic Account", 'type':'many2one', 'relation':'account.analytic.account', 'required':True, 'domain':"[('type','=','normal')]"},
-    'user_name': {'string':'User', 'type':'char','size':'64', 'required':True, 'readonly':True},
-#    'db_name': {'string':'Database Name', 'type':'char','size':'64', 'required':True, 'readonly':True},
-
-}
-
-def clear_logs(self,cr,uid,part,context={}):
-    ids=pooler.get_pool(cr.dbname).get('olap.query.logs').search(cr,uid,[('user_id','=',uid)])
-    pooler.get_pool(cr.dbname).get('olap.query.logs').unlink(cr, uid,ids,context)
-    return {}
-
-def _getdata(self,cr,uid,part,context={}):
-    ids=pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid)
-    part['form']['user_name']=ids['name']
-#    part['form']['db_name']=lines.database_id.db_name
-    return part['form']
-
-class wizard_clear_logs(wizard.interface):
-
-    states = {
-
-       'init': {
-            'actions': [_getdata],
-            'result': {'type':'form','arch':form1, 'fields':field1, 'state':[('end','Cancel'),('ok','Clear Logs')]}
-        },
-
-        'ok': {
-            'actions': [clear_logs],
-            'result': {'type':'form','arch':info,'fields':{}, 'state':[('end','Ok')]}
-                },
-
-         'info': {
-            'actions': [],
-            'result': {'type':'form', 'arch':info, 'fields':{}, 'state':[('end','Ok')]}
-                },
-
-      }
-
-wizard_clear_logs('olap.query.logs.clear')

From 2de6177884ff2873ece4276a1417e4ff9e9df462 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 15 Mar 2010 11:59:59 +0530
Subject: [PATCH 56/56] [IMP]: olap: Improvement for menu of query logs wizard

bzr revid: rpa@tinyerp.com-20100315062959-5sn2aat89g8xp3i7
---
 addons/olap/data/olap_view.xml   | 4 +++-
 addons/olap/data/olap_wizard.xml | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index ac6b50711e6..35aac4a20c0 100755
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -47,7 +47,9 @@
         id="menu_bi_conf_tools"
         parent="menu_bi_configuration"/>
 
-
+	<menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
+         id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
+         
     <record model="ir.actions.url" id="menu_url_cube_browser">
             <field name="name">name_menu_url_cube_browser</field>
             <field name="url">http://localhost:8080/browser</field>
diff --git a/addons/olap/data/olap_wizard.xml b/addons/olap/data/olap_wizard.xml
index 794b7c3681c..beb3453d224 100755
--- a/addons/olap/data/olap_wizard.xml
+++ b/addons/olap/data/olap_wizard.xml
@@ -49,8 +49,6 @@
             menu="False"
             id="bi_test_connection"/>
 
-   <menuitem name="Clear Logs" action="action_view_olap_query_logs_clear" icon="STOCK_EXECUTE"
-         id="menu_bi_clear_logs" sequence="30" parent="menu_bi_conf_tools"/>
 
     </data>
 </openerp>