From 66ad2b91ccb6f7a23895e89069b6e2f99f9fc2e0 Mon Sep 17 00:00:00 2001
From: rga <rga@rga-desktop>
Date: Wed, 21 Apr 2010 14:23:38 +0530
Subject: [PATCH 001/146] [IMP] Custome filter's fields taranslation

bzr revid: rga@rga-desktop-20100421085338-rdfvzuf8e6p6qhd2
---
 bin/addons/base/ir/ir_actions.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 33be3fe99ee..11421046764 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -191,7 +191,7 @@ class act_window(osv.osv):
                 return s.encode('utf8')
             return s
         for act in self.browse(cr, uid, ids):
-            fields_from_fields_get = self.pool.get(act.res_model).fields_get(cr, uid)
+            fields_from_fields_get = self.pool.get(act.res_model).fields_get(cr, uid,None,context)
             search_view_id = False
             if act.search_view_id:
                 search_view_id = act.search_view_id.id
@@ -387,13 +387,13 @@ class actions_server(osv.osv):
                 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')
@@ -581,10 +581,10 @@ class actions_server(osv.osv):
                     continue
                 if not user:
                     raise osv.except_osv(_('Error'), _("Please specify server option --smtp-from !"))
-                
+
                 subject = self.merge_message(cr, uid, action.subject, action, context)
                 body = self.merge_message(cr, uid, action.message, action, context)
-                
+
                 if tools.email_send(user, [address], subject, body, debug=False, subtype='html') == True:
                     logger.notifyChannel('email', netsvc.LOG_INFO, 'Email successfully send to : %s' % (address))
                 else:
@@ -686,7 +686,7 @@ 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:
@@ -701,7 +701,7 @@ class actions_server(osv.osv):
 
                 obj_pool = None
                 res_id = False
-                
+
                 model = action.copy_object.split(',')[0]
                 cid = action.copy_object.split(',')[1]
                 obj_pool = self.pool.get(model)

From a4f00ad02f34f0b686193f8a9b98f9f482505652 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Tue, 27 Apr 2010 04:37:37 +0100
Subject: [PATCH 002/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100424035246-puymwfu5aglplky7
bzr revid: codehost@crowberry-20100425034524-rd0w39k3yl6o7831
bzr revid: codehost@crowberry-20100426034136-w8abc189egbhv1jz
bzr revid: codehost@crowberry-20100427033737-cm100wwly2ls1v0d
---
 bin/addons/base/i18n/fr.po    | 15 +++++++++------
 bin/addons/base/i18n/hr.po    |  4 ++--
 bin/addons/base/i18n/ja.po    |  4 ++--
 bin/addons/base/i18n/sv.po    |  4 ++--
 bin/addons/base/i18n/uk.po    |  4 ++--
 bin/addons/base/i18n/zh_CN.po |  4 ++--
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/bin/addons/base/i18n/fr.po b/bin/addons/base/i18n/fr.po
index 0de497779d3..03cabe51bc0 100644
--- a/bin/addons/base/i18n/fr.po
+++ b/bin/addons/base/i18n/fr.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-01-21 05:27+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-04-25 04:24+0000\n"
+"Last-Translator: OpenERP Administrators <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-04-17 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-04-26 03:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -614,7 +614,7 @@ msgstr "Vous devrez réinstaller quelques packs de langue."
 #. module: base
 #: field:res.partner.address,mobile:0
 msgid "Mobile"
-msgstr "Téléphone mobile"
+msgstr "Port."
 
 #. module: base
 #: model:res.country,name:base.om
@@ -1121,6 +1121,9 @@ msgid ""
 "consider the present one as void. Do not hesitate to contact our accounting "
 "department at (+32).81.81.37.00."
 msgstr ""
+"Veuillez ne pas prendre en considération ce mail si votre paiement a été "
+"effectué après que nous vous l'ayons adressé. N'hésitez pas à contacter "
+"notre service comptable au (+ 32).81.81.37.00."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -3472,7 +3475,7 @@ msgstr "Configuration de l'action client"
 #: model:ir.ui.menu,name:base.menu_partner_address_form
 #: view:res.partner.address:0
 msgid "Partner Addresses"
-msgstr "Adresses des partenaires"
+msgstr "Carnet d'adresses"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -7421,7 +7424,7 @@ msgstr "Salvador"
 #: field:res.bank,phone:0
 #: field:res.partner.address,phone:0
 msgid "Phone"
-msgstr "Numéro de téléphone"
+msgstr "Tél."
 
 #. module: base
 #: field:res.groups,menu_access:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index b21fdb4e0e9..744feae054f 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-04-22 07:17+0000\n"
+"PO-Revision-Date: 2010-04-26 04:29+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-04-23 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-27 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 8143b581ecd..c24430cf716 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-04-22 07:03+0000\n"
+"PO-Revision-Date: 2010-04-26 04:24+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-04-23 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-27 03:37+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 4faf9f8a2dd..1f14d2aa331 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-04-22 07:34+0000\n"
+"PO-Revision-Date: 2010-04-26 04:22+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-04-23 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-27 03:37+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 87e5fc4ebe7..bcaa2d7cd5b 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-04-22 06:41+0000\n"
+"PO-Revision-Date: 2010-04-26 04:19+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-04-23 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-27 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 7f4eae755c8..7bed00336e1 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-04-22 07:29+0000\n"
+"PO-Revision-Date: 2010-04-26 04:28+0000\n"
 "Last-Translator: OpenERP Administrators <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-04-23 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-27 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 09c6859236341d32816c1cf96ee4a11b579c862d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 27 Apr 2010 10:22:52 +0200
Subject: [PATCH 003/146] [FIX] Integrate the
 load_information_from_description_file function from addons in the
 module_graph script

bzr revid: stephane@openerp.com-20100427082252-bfmb0yt0kwry9y6v
---
 bin/addons/module_graph.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bin/addons/module_graph.py b/bin/addons/module_graph.py
index edd7f6f947e..3eda4299c74 100755
--- a/bin/addons/module_graph.py
+++ b/bin/addons/module_graph.py
@@ -26,6 +26,17 @@ import os
 import sys
 import glob
 
+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 = os.path.join(module, filename)
+        if os.path.isfile(description_file):
+            return eval(file(description_file).read())
+
+    return {}
+
 if len(sys.argv) == 2 and (sys.argv[1] in ['-h', '--help']):
     print >>sys.stderr, 'Usage: module_graph.py [module1 module2 module3]\n\tWhen no module is specified, all modules in current directory are used'
     sys.exit(1)
@@ -41,7 +52,7 @@ print 'digraph G {'
 while len(modules):
     f = modules.pop(0)
     done.append(f)
-    info = addons.load_information_from_description_file(f)
+    info = load_information_from_description_file(f)
     if info.get('installable', True):
         for name in info['depends']:
             if name not in done+modules:

From 7e8edaa93356741bfc0b00494b4e401e9a77cce7 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 27 Apr 2010 14:19:03 +0530
Subject: [PATCH 004/146] [IMP]:base setup modules installation wizard

bzr revid: nch@tinyerp.com-20100427084903-qunvhze3c1xegvwi
---
 addons/base_setup/base_setup_installer.xml | 10 +++++-----
 addons/base_setup/installer.py             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 7a6d61a0e08..e0c35667b63 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -21,15 +21,15 @@
 If you don't think you need any of these right now, you can easily install them later on.</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Generic Modules" colspan="4"/>
+            <separator string="Install Generic Modules" colspan="4"/>
             <field name="crm"/> <field name="sale"/>
             <field name="project"/> <field name="knowledge"/>
             <field name="stock"/> <field name="mrp"/>
             <field name="account"/> <field name="purchase"/>
-            <field name="hr"/> <field name="point_of_sale"/>
-            <field name="marketing"/> <field name="misc_tools"/>
-            <field name="report_designer"/>
-            <separator string="Vertical Modules" colspan="4"/>
+            <field name="hr"/> <field name="point_of_sale" groups="base.group_extended"/>
+            <field name="marketing" groups="base.group_extended"/> <field name="misc_tools"/>
+            <field name="report_designer" groups="base.group_extended"/>
+            <separator string="Install Specific Businesses Modules" colspan="4"/>
             <field name="profile_association"/>
             <field name="profile_training"/>
             <field name="profile_auction"/>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 2c1ba113e47..4b903f4e454 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -69,7 +69,7 @@ class base_setup_installer(osv.osv_memory):
             help="Helps you manage your marketing campaigns step by step."),
         'misc_tools':fields.boolean('Miscellaneous Tools',
             help="Lets you install various interesting but non-essential "
-                 "tools."),
+                 "tools like Survey, Lunch,..."),
         'report_designer':fields.boolean('Advanced Reporting',
             help="Lets you install various tools to simplify and enhance "
                  "OpenERP's report creation."),

From b0d6c3407f5ce2ede848df6549521c4a082c2b6d Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 27 Apr 2010 14:22:53 +0530
Subject: [PATCH 005/146] [IMP]:Human resources modules installation wizard

bzr revid: nch@tinyerp.com-20100427085253-k1kg13k25itlwytz
---
 addons/hr/hr_installer.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index ff6025cda64..4bbafbf9077 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Human Resources Modules Installation</attribute>
+            <attribute name="string">Select Human Resources Modules To Install</attribute>
           </form>
 
           <separator string="title" position="attributes">
@@ -19,7 +19,7 @@
             <attribute name="string">The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Human Resources Management" colspan="4"/>
+            <separator string="Select Human Resources Modules To Install" colspan="4"/>
             <field name="hr_holidays"/>
             <field name="hr_expense"/>
             <field name="hr_recruitment"/>
@@ -28,6 +28,9 @@
             <field name="hr_evaluation"/>
             <field name="hr_attendance"/>
           </group>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+          	<attribute name="string">Configure</attribute>
+          </xpath>
         </data>
       </field>
     </record>

From 15fe913df29513eaa59acad3f7eaafc3086680b6 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 27 Apr 2010 14:28:52 +0530
Subject: [PATCH 006/146] [IMP]:9.Project mgmt module installation wizard

bzr revid: nch@tinyerp.com-20100427085852-b8mfsr6viok59jt1
---
 addons/project/installer.py          | 3 +++
 addons/project/project_installer.xml | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/project/installer.py b/addons/project/installer.py
index 1848d1e300e..dd18a2937a2 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -52,4 +52,7 @@ class project_installer(osv.osv_memory):
             help="Embeds the Getting Things Done concepts into OpenERP's "
                  "project management."),
         }
+    _defaults={
+             'project_crm': True,
+               }
 project_installer()
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index d7ca8c43989..3b6eb103972 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -21,13 +21,13 @@
           </xpath>
           <group colspan="8">
             <separator string="Project Management" colspan="4"/>
-            <field name="project_long_term"/>
+            <field name="project_crm"/>
+            <field name="project_long_term" groups="base.group_extended"/>
             <field name="project_wiki"/>
             <field name="hr_timesheet_sheet"/>
             <field name="hr_timesheet_invoice"/>
-            <field name="account_budget"/>
-            <field name="project_messages"/>
-            <field name="project_crm"/>
+            <field name="account_budget" groups="base.group_extended"/>
+            <field name="project_messages" groups="base.group_extended"/>
             <separator string="Methodologies" colspan="4"/>
             <field name="scrum"/>
             <field name="project_gtd"/>

From abc88397bd9551d71d86c64d652fbc1bbd759a25 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 27 Apr 2010 14:36:38 +0530
Subject: [PATCH 007/146] [IMP]:Company's data wizard

bzr revid: nch@tinyerp.com-20100427090638-5qjx1nl7jpotf5dd
---
 addons/base_setup/base_setup_todo.xml | 53 +++++++++++++++------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 08691e60d35..021e2d10a6c 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -12,31 +12,38 @@
           </form>
 
           <group string="res_config_contents" position="replace">
-            <field name="company_id" invisible="1"/>
+          	<group colspan="4">
+          		<group colspan="2">
+          			<image name="gtk-dialog-info"/>
+          			<label colspan="4" align="0.0" width= "100" string="Information of your company will be used to custiomize your documents like Invoices, Sale Orders,..."/>
+          		</group>
+          		<group colspan="2">
+	            	<field name="company_id" invisible="1"/>
+		            <separator string="Configure Your Company" colspan="4"/>
+		            <field name="name" colspan="4" required="True"/>
+		            <newline/>
+		            <field name="street"/>
+		            <field name="street2"/>
+		            <field name="zip"/>
+		            <field name="city"/>
+		            <field name="country_id"/>
+		            <field name="state_id"/>
+		            <field name="email"/>
+		            <field name="phone"/>
+		            <field name="currency"/>
 
-            <separator string="Configure Your Company" colspan="4"/>
-            <field name="name" colspan="4" required="True"/>
-            <newline/>
-            <field name="street"/>
-            <field name="street2"/>
-            <field name="zip"/>
-            <field name="city"/>
-            <field name="country_id"/>
-            <field name="state_id"/>
-            <field name="email"/>
-            <field name="phone"/>
-            <field name="currency"/>
+		            <separator string="Report Information" colspan="4"/>
+		            <field name="rml_header1" colspan="4"/>
+		            <field name="rml_footer1" colspan="4"/>
+		            <field name="rml_footer2" colspan="4"/>
 
-            <separator string="Report Information" colspan="4"/>
-            <field name="rml_header1" colspan="4"/>
-            <field name="rml_footer1" colspan="4"/>
-            <field name="rml_footer2" colspan="4"/>
-
-            <separator colspan="4"
-                       string="Your Logo - Use a size of about 450x150 pixels."/>
-            <field colspan="4" name="logo" widget="image"
-                   nolabel="1"/>
-          </group>
+		            <separator colspan="4"
+		                       string="Your Logo - Use a size of about 450x150 pixels."/>
+		            <field colspan="4" name="logo" widget="image"
+		                   nolabel="1"/>
+		          </group>
+	        </group>
+	       </group>
 
           <xpath expr='//button[@name="action_skip"]' position='replace'/>
         </data>

From f5f64e4dc6ffee6a96e882de58c5021a10c47024 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 27 Apr 2010 15:47:24 +0530
Subject: [PATCH 008/146] [IMP]:installation done wizard

bzr revid: nch@tinyerp.com-20100427101724-z69y791xfbrfpl58
---
 addons/base_setup/__init__.py         | 22 +++++++++++++++++++---
 addons/base_setup/base_setup_data.xml |  3 ++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index e4a4c3c80d8..23aa4363d7e 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.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/>.
 #
 ##############################################################################
 
@@ -23,8 +23,9 @@ import installer
 import todo
 import wizard
 
-from osv import osv
+from osv import fields, osv
 import netsvc
+from tools.translate import _
 
 class base_setup_config_choice(osv.osv_memory):
     """
@@ -32,6 +33,21 @@ class base_setup_config_choice(osv.osv_memory):
     _name = 'base.setup.config'
     logger = netsvc.Logger()
 
+    def get_users(self, cr, uid, context={}):
+        user_obj = self.pool.get('res.users')
+        user_ids = user_obj.search(cr, uid, [])
+        users = user_obj.browse(cr, uid, user_ids)
+        user_str = '\n'.join(map(lambda x: '    - %s: %s / %s' % (x.name, x.login, x.password), users))
+        return _('The following users have been installed on your database: \n')+ user_str
+
+    _columns = {
+        'installed_users':fields.text('Installed Users')
+        }
+
+    _defaults = {
+        'installed_users':get_users
+        }
+
     def set_default_menu(self, cr, uid, menu, context=None):
         user = self.pool.get('res.users')\
                         .browse(cr, uid, uid, context=context)
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 0feb39bd563..e7ab8698c7e 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -13,8 +13,9 @@
               <separator colspan="4" string="Installation Done"/>
               <label align="0.0" colspan="4"
                      string="Your new database is now fully installed."/>
+              <field name="installed_users" nolabel= "1" colspan="4"/>
               <label align="0.0" colspan="4"
-                     string="You can start configuring the system or connect directly to the database using the default setup."/>
+                     string="You can start configuring the system or connect directly to the database as an administrator."/>
             </group>
           </group>
           <separator string="" colspan="4"/>

From 10a80d7175e80ea7e17cb210d9f542d3be5c7cca Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 27 Apr 2010 18:40:07 +0530
Subject: [PATCH 009/146] [IMP]:made 'installed_users' a readonly field

bzr revid: nch@tinyerp.com-20100427131007-exq1vlq00pjpa59z
---
 addons/base_setup/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 23aa4363d7e..ef4f321942d 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -41,7 +41,7 @@ class base_setup_config_choice(osv.osv_memory):
         return _('The following users have been installed on your database: \n')+ user_str
 
     _columns = {
-        'installed_users':fields.text('Installed Users')
+        'installed_users':fields.text('Installed Users', readonly=True)
         }
 
     _defaults = {

From f695aa4440c15f81626871215226badeac30c677 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 28 Apr 2010 04:43:26 +0100
Subject: [PATCH 010/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100428034326-e3xhdjynkssx4ibd
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 744feae054f..489c37b48f9 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-04-26 04:29+0000\n"
+"PO-Revision-Date: 2010-04-27 04:11+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-04-27 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-04-28 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index c24430cf716..4ecea713060 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-04-26 04:24+0000\n"
+"PO-Revision-Date: 2010-04-27 04:09+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-04-27 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-04-28 03:42+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 1f14d2aa331..bb4efc549a6 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-04-26 04:22+0000\n"
+"PO-Revision-Date: 2010-04-27 04:13+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-04-27 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-04-28 03:43+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 bcaa2d7cd5b..a198f09adfe 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-04-26 04:19+0000\n"
+"PO-Revision-Date: 2010-04-27 04: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-04-27 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-04-28 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 7bed00336e1..8185ceb49d2 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-04-26 04:28+0000\n"
+"PO-Revision-Date: 2010-04-27 04:13+0000\n"
 "Last-Translator: OpenERP Administrators <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-04-27 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-04-28 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 9ad1592d825fa2d52b0732b16d12450d9ddf2ee3 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 28 Apr 2010 12:24:37 +0530
Subject: [PATCH 011/146] [IMP]:purchase modules installation wizard

bzr revid: nch@tinyerp.com-20100428065437-vgs5mghci7eqdp54
---
 addons/purchase/wizard/purchase_installer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 77bbef10453..7f91ec67767 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -11,7 +11,7 @@
 	          <form position="attributes">
 	            <attribute name="string">Purchase Modules Installation</attribute>
 	          </form>
-	
+
 	          <separator string="title" position="attributes">
 	            <attribute name="string"
 	                       >Configure Your Purchase System</attribute>
@@ -42,7 +42,7 @@
 	<record id="purchase_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_purchase_install_module"/>
       <field name="sequence">3</field>
-    
+      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
     </data>
 </openerp>

From 001e560fe5b9edc617b4f698ea2b6523103a9bb6 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 28 Apr 2010 12:41:26 +0530
Subject: [PATCH 012/146] [IMP]:sales configuration wizard

bzr revid: nch@tinyerp.com-20100428071126-hsc08kuyroxz8a09
---
 addons/sale/sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0c5a1252d59..0831e72712b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -532,6 +532,7 @@
         <!-- register configuration wizard -->
         <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo">
             <field name="action_id" ref="action_config_picking_policy"/>
+            <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
         </record>
 
     </data>

From 2a8f6d762c5bf9b617b04393c229b48206be3ff5 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 28 Apr 2010 14:03:41 +0530
Subject: [PATCH 013/146] [IMP]:MRP modules installation wizard

bzr revid: nch@tinyerp.com-20100428083341-h70w1cfg1x77o66k
---
 addons/mrp/mrp_installer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 3e42ec2840e..3c8b62283c0 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -43,6 +43,7 @@
     <record id="mrp_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_mrp_installer"/>
       <field name="sequence">3</field>
+      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
   </data>
 </openerp>

From 33a7b33730ce2641a2190f690585cfda8ffa6084 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 28 Apr 2010 14:58:00 +0530
Subject: [PATCH 014/146] [FIX] _inherits : Relational field if on the view of
 child object,should not raise error

lp bug: https://launchpad.net/bugs/558528 fixed

bzr revid: jvo@tinyerp.com-20100428092800-itjau50duzsbhze9
---
 bin/osv/orm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 062c0bc6f3a..e57f9ce3d87 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -3281,8 +3281,8 @@ class orm(orm_template):
                 del vals[self._inherits[table]]
 
             record_id = tocreate[table].pop('id', None)
-
-            if record_id is None:
+            
+            if record_id is None or not record_id:
                 record_id = self.pool.get(table).create(cr, user, tocreate[table], context=context)
             else:
                 self.pool.get(table).write(cr, user, [record_id], tocreate[table], context=context)

From 08d813934d32f33e4ed14a589eaa972d8813ba7d Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 28 Apr 2010 16:01:09 +0530
Subject: [PATCH 015/146] [IMP]:Auto configure wizard

bzr revid: nch@tinyerp.com-20100428103109-js0p7a78w4382hiq
---
 addons/document_ftp/document_ftp_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index 9cec3715bae..bd7571002fe 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -47,6 +47,7 @@
 
     <record model="ir.actions.todo" id="config_auto_directory">
         <field name="action_id" ref="action_config_auto_directory"/>
+        <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
   </data>
 </openerp>

From 9e940b38590290f0799104c04d420eaf2010a5f1 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Apr 2010 10:23:50 +0530
Subject: [PATCH 016/146] [FIX]: crm_claim: Fixed file names

bzr revid: rpa@tinyerp.com-20100429045350-g08yk79lf37573tt
---
 addons/crm_claim/crm_claim_view.xml  |   4 +-
 addons/crm_claim/crm_claims_view.xml | 294 ---------------------------
 2 files changed, 2 insertions(+), 296 deletions(-)
 delete mode 100644 addons/crm_claim/crm_claims_view.xml

diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ffd0c4943e0..39cc8778e0b 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -184,7 +184,7 @@
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
                                        string="Reply to Last Email"
-                                       name="%(crm.action_crm_send_mail)d"
+                                       name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.claim'}"
                                        icon="gtk-undo" type="action" />
                                </form>
@@ -195,7 +195,7 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
+                               name="%(action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'crm.claim'}"
                                icon="gtk-go-forward" type="action" />
                  </page>
diff --git a/addons/crm_claim/crm_claims_view.xml b/addons/crm_claim/crm_claims_view.xml
deleted file mode 100644
index 39cc8778e0b..00000000000
--- a/addons/crm_claim/crm_claims_view.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <!-- Claims categories  -->
-
-    <record id="crm_claim_categ_action" model="ir.actions.act_window">
-        <field name="name">Claim Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-        <field name="context">{'object_id':'crm.claim'}</field>
-    </record>
-
-    <menuitem action="crm_claim_categ_action"
-        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
-
-    <!-- Claim Stages -->
-
-    <record id="crm_claim_stage_act" model="ir.actions.act_window">
-        <field name="name">Claim Stages</field>
-        <field name="res_model">crm.case.stage</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_stage_tree"/>
-        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-        <field name="context">{'object_id':'crm.claim'}</field>
-    </record>
-
-    <menuitem action="crm_claim_stage_act"
-            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
-
-    <!-- Claim Resource Type -->
-
-    <record id="crm_claim_resource_act" model="ir.actions.act_window">
-        <field name="name">Claim Resource Type</field>
-        <field name="res_model">crm.case.resource.type</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-        <field name="context">{'object_id':'crm.claim'}</field>
-    </record>
-
-    <menuitem action="crm_claim_resource_act"
-            id="menu_crm_claim_stage_act"
-            parent="crm.menu_crm_case_resource_type" />
-
-        <!-- Claims    -->
-
-    <record model="ir.ui.view" id="crm_case_claims_tree_view">
-        <field name="name">CRM - Claims Tree</field>
-        <field name="model">crm.claim</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Claims" colors="blue:state=='pending';black:state=='open';grey:state in ('close', 'cancel')">
-                <field name="id"/>
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="user_id" />
-                <field name="section_id"/>
-                <field name="date" string="Claim Date"/>
-                <field name="date_deadline" string="Deadline"/>
-                <field name="date_closed" string="Closure Date"/>
-                <field name="categ_id" string="Type" select="1"/>
-                <field name="state"/>
-                <button name="case_open" string="Open"
-                    states="draft,pending" type="object"
-                    icon="gtk-go-forward" />
-                <button name="case_pending" string="Pending"
-                    states="draft,open" type="object"
-                    icon="gtk-media-pause" />
-                <button name="case_close" string="Close"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-close" />
-                <button name="case_cancel" string="Cancel"
-                    states="draft,open,pending" type="object"
-                    icon="gtk-cancel" />
-                <button name="case_reset" string="Reset to Draft"
-                    states="done,cancel" type="object" icon="gtk-convert" />
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="crm_case_claims_form_view">
-        <field name="name">CRM - Claims Form</field>
-        <field name="model">crm.claim</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Claims">
-                <group colspan="4" col="4">
-                    <field name="name"/>
-                    <field name="date" string="Date of Claim"/>
-                    <field name="date_deadline" string="Deadline"/>
-                </group>
-                <group colspan="4" col="4">
-
-                <notebook>
-                <page string="Claim Info">
-                    <separator colspan="4" string="Communication"/>
-                    <group colspan="4" col="4">
-                        <field name="partner_id" string="Partner"
-                            on_change="onchange_partner_id(partner_id)" />
-                        <field name="partner_address_id" string="Contact"
-                            on_change="onchange_partner_address_id(partner_address_id, email_from)" />
-                        <field name="partner_phone"/>
-                        <field name="partner_mobile"/>
-                        <field name="email_from"/>
-                    </group>
-                    <separator colspan="4" string="Status and Categorization"/>
-                    <group colspan="4" col="6">
-                        <field name="user_id" string="Responsible"/>
-                        <field name="section_id" widget="selection"/>
-                        <label string="Stage: " align="1.0"/>
-                        <group colspan="1" col="2">
-                            <field name="stage_id" select="1" nolabel="1"/>
-                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                        </group>
-                        <field name="categ_id" select="1" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.claim')]" />
-                        <field name="type_id" string="Type of Action" select="1"
-                            domain="[('object_id.model', '=', 'crm.claim')]" />
-                        <field name="priority"/>
-                    </group>
-                    <separator colspan="4" string="References"/>
-                    <group colspan="4" col="4">
-                        <field name="ref"/>
-                        <field name="ref2"/>
-                    </group>
-                    <separator colspan="4" string="Claim/Action Description"/>
-                    <field name="description" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string=""/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1"/>
-                        <button name="case_close" string="Done"
-                            states="open,draft,pending" type="object"
-                            icon="gtk-jump-to" />
-                        <button name="case_open" string="Open"
-                            states="draft,pending" type="object"
-                            icon="gtk-go-forward" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
-                        <button name="case_pending" string="Pending"
-                            states="draft,open" type="object"
-                            icon="gtk-media-pause" />
-                        <button name="case_reset"
-                            string="Reset to Draft" states="done,cancel"
-                            type="object" icon="gtk-convert" />
-                    </group>
-                </page>
-                <page string="History" groups="base.group_extended">
-                    <field name="id" select="1"/>
-                    <field name="active"/>
-                    <field name="canal_id"/>
-                    <field name="som"/>
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>                            
-                        </form>
-                    </field>
-                </page>
-                <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
-                        <form string="Communication history">
-                            <group col="7" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>
-                                <field name="email_from"/>
-                               <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.claim'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.claim'}"
-                               icon="gtk-go-forward" type="action" />
-                 </page>
-                </notebook>
-
-                </group>
-            </form>
-        </field>
-    </record>
-
-    <!-- Claim Calendar view -->
-
-    <record model="ir.ui.view" id="crm_case_claims_calendar_view">
-        <field name="name">CRM - Claims Calendar</field>
-        <field name="model">crm.claim</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Claims" date_start="date" color="user_id">
-                <field name="name"/>
-                <field name="partner_name"/>
-                <field name="categ_id"/>
-            </calendar>
-        </field>
-    </record>
-
-    <!-- Claim Graph view -->
-
-    <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
-        <field name="name">CRM -Graph</field>
-        <field name="model">crm.claim</field>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-            <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
-                <field name="stage_id"/>
-                <field name="planned_cost" operator="+"/>
-                <field name="planned_revenue" operator="+"/>
-            </graph>
-        </field>
-    </record>
-
-    <!-- Crm claim Search view -->
-
-    <record id="view_crm_case_claims_filter" model="ir.ui.view">
-            <field name="name">CRM - Claims Search</field>
-            <field name="model">crm.claim</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Claims">
-                   <filter icon="gtk-new" string="Current"
-                       domain="[('state','in',('draft', 'open'))]"
-                       separator="1" help="Current Claims" default="1"
-                   />
-                   <filter icon="gtk-execute"
-                       string="In Progress"
-                       domain="[('state','=','open')]"
-                       separator="1" help="In Progress Claims"
-                   />
-                   <filter icon="gtk-media-pause"
-                       string="Pending"
-                       domain="[('state','=','pending')]"
-                       separator="1" help="All pending Claims"
-                   />
-                   <separator orientation="vertical"/>
-                   <field name="name" select='1'/>
-                   <field name="partner_id" select="1"/>
-                   <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
-                               domain="[('user_id','=',uid)]" help="My Claims"
-                               default="1" />
-                           <filter icon="terp-partner"
-                               domain="[('user_id','=', False)]"
-                               help="Unassigned Claims" />
-                   </field>
-                   <field name="section_id" select="1"
-                       widget="selection"
-                       default="context.get('section_id', False)">
-                       <filter icon="terp-crm"
-                           domain="[('section_id','=',context.get('section_id',False))]"
-                           help="My section" />
-                   </field>
-                   <newline/>
-                   <group expand="1" string="Group By..." colspan="10" col="20">
-                       <filter string="Deadline" icon="terp-crm"
-                           domain="[]"
-                           context="{'group_by':'date_deadline'}" />
-                       <filter string="Closure" icon="terp-crm"
-                           domain="[]"
-                           context="{'group_by':'date_closed'}" />
-                   </group>
-               </search>
-           </field>
-        </record>
-
-     </data>
-</openerp>

From 0480627e595cd18f4659e1c36254998de203c5b8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Apr 2010 11:41:26 +0530
Subject: [PATCH 017/146] [ADD]: crm: Added crm installer + minor fix in
 crm_claims

bzr revid: rpa@tinyerp.com-20100429061126-rbrfpl9kmuy775sb
---
 addons/crm/__init__.py              |  1 +
 addons/crm/__openerp__.py           |  1 +
 addons/crm/crm_installer.py         | 45 ++++++++++++++++++++++++++
 addons/crm/crm_installer_view.xml   | 50 +++++++++++++++++++++++++++++
 addons/crm_claim/crm_claim_view.xml |  4 +--
 5 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 addons/crm/crm_installer.py
 create mode 100644 addons/crm/crm_installer_view.xml

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 48d1193129e..ca8cb2d8a4b 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -28,6 +28,7 @@ import crm_opportunity
 import crm_lead
 import crm_phonecall
 
+import crm_installer
 import report
 import wizard
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 22e4f41e872..a25c48e5b03 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -99,6 +99,7 @@ between mails and Open ERP.""",
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
+        'crm_installer_view.xml'
     ],
     'demo_xml': [
         'crm_demo.xml',
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
new file mode 100644
index 00000000000..953dc9f3403
--- /dev/null
+++ b/addons/crm/crm_installer.py
@@ -0,0 +1,45 @@
+# -*- 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 operator import itemgetter
+from osv import fields, osv
+import netsvc
+import os
+import pooler
+import tools
+
+
+class crm_installer(osv.osv_memory):
+    _name = 'crm.installer'
+    _inherit = 'res.config.installer'
+    
+    _columns = {
+        'name': fields.char('Name', size=64), 
+        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 
+        'crm_fundraising': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), 
+        'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), 
+        'sale_crm': fields.boolean('Sale CRM Stuff', help="This module relates sale to opportunity cases in the CRM. We suggest you to install this module if you installed both the sale and the crm modules"), 
+    }
+
+crm_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
new file mode 100644
index 00000000000..0bf21cb97d6
--- /dev/null
+++ b/addons/crm/crm_installer_view.xml
@@ -0,0 +1,50 @@
+<openerp>
+  <data>
+    <record id="view_crm_installer" model="ir.ui.view">
+      <field name="name">crm.installer.view</field>
+      <field name="model">crm.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes">
+            <attribute name="string">CRM Modules Installation</attribute>
+          </form>
+
+          <separator string="title" position="attributes">
+            <attribute name="string"
+                       >Configure Your CRM System</attribute>
+          </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
+          </xpath>
+
+          <group colspan="8">
+            <separator string="Intall Extended modules for CRM" colspan="4"/>
+             <field name="crm_claim"/>
+             <field name="crm_helpdesk"/>
+             <field name="crm_fundraising"/>
+             <field name="crm_caldav"/>
+             <field name="sale_crm"/>
+          </group>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_crm_installer" model="ir.actions.act_window">
+      <field name="name">CRM Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">crm.installer</field>
+      <field name="view_id" ref="view_crm_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="crm_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_crm_installer"/>
+      <field name="sequence">3</field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 39cc8778e0b..ffd0c4943e0 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -184,7 +184,7 @@
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
                                        string="Reply to Last Email"
-                                       name="%(action_crm_send_mail)d"
+                                       name="%(crm.action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.claim'}"
                                        icon="gtk-undo" type="action" />
                                </form>
@@ -195,7 +195,7 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                               name="%(action_crm_send_mail)d"
+                               name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'crm.claim'}"
                                icon="gtk-go-forward" type="action" />
                  </page>

From 3dc031c1d4d5266caf6014f9b2fe59b0723aabed Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 29 Apr 2010 14:16:51 +0530
Subject: [PATCH 018/146] [IMP]:improved purchase,module installer and company
 configuration wizard

bzr revid: nch@tinyerp.com-20100429084651-lgkjw8fy8aej90hh
---
 addons/base_setup/base_setup_installer.xml    | 11 +++++++----
 addons/base_setup/base_setup_todo.xml         | 18 +++++++++++-------
 addons/purchase/wizard/purchase_installer.xml |  6 ++++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e0c35667b63..e9d177c77e4 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -10,9 +10,6 @@
           <form position="attributes">
             <attribute name="string">Base Setup Modules Installation</attribute>
           </form>
-          <separator string="title" position="attributes">
-            <attribute name="string">Install Modules</attribute>
-          </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string"
@@ -20,8 +17,14 @@
 
 If you don't think you need any of these right now, you can easily install them later on.</attribute>
           </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>15</attribute>
+	          	  <attribute name='string'></attribute>
+	      </xpath>
+	      <separator string="title" position="attributes">
+            <attribute name="string">Install Generic Modules</attribute>
+          </separator>
           <group colspan="8">
-            <separator string="Install Generic Modules" colspan="4"/>
             <field name="crm"/> <field name="sale"/>
             <field name="project"/> <field name="knowledge"/>
             <field name="stock"/> <field name="mrp"/>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 021e2d10a6c..2a7699bf1ea 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -10,16 +10,20 @@
           <form position="attributes">
             <attribute name="string">Main Company Setup</attribute>
           </form>
-
+		  <xpath expr="//label[@string='description']" position="attributes">
+	            <attribute name="string">Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...</attribute>
+	      </xpath>
+	      <xpath expr='//separator[@string="title"]' position='attributes'>
+	          	  <attribute name='string'>Configure Your Company</attribute>
+	      </xpath>
+	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>25</attribute>
+	          	  <attribute name='string'></attribute>
+	      </xpath>
           <group string="res_config_contents" position="replace">
-          	<group colspan="4">
-          		<group colspan="2">
-          			<image name="gtk-dialog-info"/>
-          			<label colspan="4" align="0.0" width= "100" string="Information of your company will be used to custiomize your documents like Invoices, Sale Orders,..."/>
-          		</group>
+          	<group colspan="5">
           		<group colspan="2">
 	            	<field name="company_id" invisible="1"/>
-		            <separator string="Configure Your Company" colspan="4"/>
 		            <field name="name" colspan="4" required="True"/>
 		            <newline/>
 		            <field name="street"/>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 7f91ec67767..5725907da28 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -11,7 +11,10 @@
 	          <form position="attributes">
 	            <attribute name="string">Purchase Modules Installation</attribute>
 	          </form>
-
+			  <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>6</attribute>
+	          	  <attribute name='string'></attribute>
+	      		</xpath>
 	          <separator string="title" position="attributes">
 	            <attribute name="string"
 	                       >Configure Your Purchase System</attribute>
@@ -22,7 +25,6 @@
 	          </xpath>
 
                 <group colspan="8">
-                  <separator string="Purchase Application" colspan="4"/>
                   <field name="purchase_requisition"/>
                 </group>
               </data>

From 0b04a19490fe5749e3e16846847e69d4f3c65267 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Apr 2010 17:05:01 +0530
Subject: [PATCH 019/146] [IMP]: crm: Merged crm.opportunity in crm.lead and
 changes related to this merge

bzr revid: rpa@tinyerp.com-20100429113501-sk1qwdn4lbpjkmqj
---
 addons/crm/__init__.py                        |  3 +-
 addons/crm/__openerp__.py                     | 11 ++--
 addons/crm/crm.py                             |  2 +-
 addons/crm/crm_lead.py                        | 11 ++--
 addons/crm/crm_lead_demo.xml                  |  7 +++
 addons/crm/crm_lead_menu.xml                  |  1 +
 addons/crm/crm_lead_view.xml                  |  3 +-
 addons/crm/crm_opportunity.py                 | 10 ++--
 addons/crm/crm_opportunity_data.xml           | 34 +++++------
 addons/crm/crm_opportunity_demo.xml           | 15 +++--
 addons/crm/crm_opportunity_menu.xml           |  7 ++-
 addons/crm/crm_opportunity_view.xml           | 28 ++++-----
 addons/crm/crm_phonecall.py                   |  2 +-
 addons/crm/report/__init__.py                 |  2 +-
 addons/crm/security/ir.model.access.csv       |  4 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  | 57 +++++--------------
 .../wizard/crm_opportunity_to_phonecall.py    |  2 +-
 .../crm/wizard/crm_partner_to_opportunity.py  |  5 +-
 .../wizard/crm_phonecall_to_opportunity.py    |  5 +-
 addons/partner_crm/partner_crm.py             |  2 +-
 addons/sale_crm/wizard/makesale.py            |  4 +-
 21 files changed, 101 insertions(+), 114 deletions(-)

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index ca8cb2d8a4b..de0fac56e29 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -24,8 +24,9 @@ import crm_mailgate
 import crm_action_rule
 import crm_segmentation
 import crm_meeting
-import crm_opportunity
 import crm_lead
+import crm_opportunity
+
 import crm_phonecall
 
 import crm_installer
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index a25c48e5b03..733ba91f356 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -95,7 +95,7 @@ between mails and Open ERP.""",
 
         'report/crm_report_view.xml',
         'report/crm_lead_report_view.xml',
-        'report/crm_opportunity_report_view.xml' ,
+#        'report/crm_opportunity_report_view.xml' ,
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
@@ -108,10 +108,11 @@ between mails and Open ERP.""",
         'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml'
     ],
-    'test': ['test/test_crm_lead.yml',
-            'test/test_crm_meeting.yml', 
-            'test/test_crm_opportunity.yml',
-            'test/test_crm_phonecall.yml', 
+    'test': [
+#            'test/test_crm_lead.yml',
+#            'test/test_crm_meeting.yml', 
+#            'test/test_crm_opportunity.yml',
+#            'test/test_crm_phonecall.yml', 
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 6db616ef945..d51970443f6 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -345,7 +345,7 @@ class crm_case(osv.osv):
                          multi="log_ids", relation="crm.case.log", string="Logs History"), 
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                          domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"), 
+                        ('object_id.model', '=', 'crm.lead')]"), 
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9d50bb0db7b..730f668567e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -109,19 +109,21 @@ class crm_lead(osv.osv):
 
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.opportunity')]"),
+                        ('object_id.model', '=', 'crm.lead')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
         'partner_name': fields.char("Contact Name", size=64),
-
+        'type':fields.selection([
+            ('lead','Lead'),
+            ('opportunity','Opportunity'),
+            
+        ],'Type', help="Type is used to separate Leads and Opportunities"),        
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage', \
                             domain="[('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=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -158,7 +160,6 @@ class crm_lead(osv.osv):
         if data_id:
             view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
         for case in self.browse(cr, uid, ids):
-            context.update({'opportunity_id': case.id})
             context.update({'active_id': case.id})
             if not case.partner_id:
                 data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_partner')
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index bc6638601c2..9e44681327e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -9,6 +9,7 @@
         <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead1"/>
             <field eval="'3'" name="priority"/>
+            <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Luc Latour'" name="name"/>
             <field eval="'open'" name="state"/>
@@ -23,6 +24,7 @@
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead7"/>
             <field eval="'4'" name="priority"/>
+            <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Marc Dufour'" name="name"/>
             <field eval="'open'" name="state"/>
@@ -37,6 +39,7 @@
         <record id="crm_case_developingwebapplications0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead5"/>
             <field eval="'2'" name="priority"/>
+            <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
             <field eval="'Fabien Pinckaers'" name="name"/>
             <field eval="'done'" name="state"/>
@@ -52,6 +55,7 @@
         <record id="crm_case_qrecorp0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead8"/>
             <field eval="'3'" name="priority"/>
+            <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Henry Mc Coy'" name="name"/>
             <field eval="'draft'" name="state"/>
@@ -66,6 +70,7 @@
         <record id="crm_case_itdeveloper0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead4"/>
             <field eval="'3'" name="priority"/>
+            <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Carrie Helle'" name="name"/>
             <field eval="'pending'" name="state"/>
@@ -83,6 +88,7 @@
             <field name="type_id" ref="crm.type_lead3"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="'3'" name="priority"/>
+            <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Tina Pinero'" name="name"/>
             <field eval="'cancel'" name="state"/>
@@ -98,6 +104,7 @@
             <field eval="1" name="active"/>
             <field name="type_id" ref="crm.type_lead8"/>
             <field eval="'3'" name="priority"/>
+            <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="'Wendi Baltz'" name="name"/>
             <field eval="'done'" name="state"/>
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 4d752ca8a9b..3fb91a9aff0 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -6,6 +6,7 @@
         <field name="name">Leads</field>
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
+        <field name="domain">[('type','=','lead')]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f89c558fee4..1c3bd20629d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -97,7 +97,6 @@
                             icon="gtk-index" type="action"
                             string="Create"
                             attrs="{'invisible':[('partner_id','!=',False)]}"/>
-                        <field name="opportunity_id"/>
                     </group>
                     <separator colspan="4" string="Notes"/>
                     <field name="description" nolabel="1" colspan="4"/>
@@ -133,7 +132,7 @@
                             widget="selection" colspan="2" />
                         <field name="categ_id"
                             widget="selection"
-                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
                         <field name="type_id" string="Campaign" select="1"/>
                         <field name="referred"/>
                     </group>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index dfb202dfa0e..ecda7dc54f1 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -37,10 +37,10 @@ AVAILABLE_STATES = [
 class crm_opportunity(osv.osv):
     """ Opportunity Cases """
 
-    _name = "crm.opportunity"
+    _name = "crm.lead"
     _description = "Opportunity Cases"
     _order = "priority,date_action,id desc"
-    _inherit = 'crm.case'
+    _inherit = 'crm.lead'
 
     def case_open(self, cr, uid, ids, *args):
         """
@@ -115,10 +115,10 @@ class crm_opportunity(osv.osv):
     _columns = {
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                      domain="[('section_id','=',section_id),\
-                    ('object_id.model', '=', 'crm.opportunity')]"),
+                    ('object_id.model', '=', 'crm.lead')]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                      domain="[('section_id','=',section_id), \
-                    ('object_id.model', '=', 'crm.opportunity')]"),
+                    ('object_id.model', '=', 'crm.lead')]"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'referred': fields.char('Referred By', size=64),
         'probability': fields.float('Probability (%)'),
@@ -188,7 +188,7 @@ class crm_opportunity(osv.osv):
         return res
 
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.opportunity', context=c),
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
         'state' : 'draft',
     }
diff --git a/addons/crm/crm_opportunity_data.xml b/addons/crm/crm_opportunity_data.xml
index b3780990a13..b6b62628e4b 100644
--- a/addons/crm/crm_opportunity_data.xml
+++ b/addons/crm/crm_opportunity_data.xml
@@ -4,91 +4,91 @@
     <record model="crm.case.categ" id="categ_oppor1">
         <field name="name">Existing Customer</field>
         <field name="section_id" ref="section_sales_department"/>
-      	<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
+      	<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
     </record>
     <record model="crm.case.categ" id="categ_oppor2">
         <field name="name">Self Generated</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
+		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
     </record>    
     <record model="crm.case.categ" id="categ_oppor3">
         <field name="name">Employee</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
+		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
     </record>
     <record model="crm.case.categ" id="categ_oppor4">
         <field name="name">Partner</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
     </record>
     <record model="crm.case.categ" id="categ_oppor5">
         <field name="name">Campaign</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
     </record>    
     <record model="crm.case.categ" id="categ_oppor6">
         <field name="name">Website</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>              
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>              
     </record>    
     <record model="crm.case.categ" id="categ_oppor7">
         <field name="name">Word of mouth</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
+		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
     </record>    
     <record model="crm.case.categ" id="categ_oppor8">
         <field name="name">Other</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>                      
+		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>                      
     </record>    
 
 <!--        CASE STATUS(stage_id)        -->
     <record model="crm.case.stage" id="stage_oppor1">
         <field name="name">Prospecting</field>
         <field name="section_id" ref="section_sales_department"/>
-		<field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>            
+		<field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>            
     </record>
     <record model="crm.case.stage" id="stage_oppor2">
         <field name="name">Needs Analysis</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>    
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>    
     </record>
     <record model="crm.case.stage" id="stage_oppor3">
         <field name="name">Value Proposition</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor4">
         <field name="name">Proposal/Price Quote</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor5">
         <field name="name">Negotiation/Review</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor6">
         <field name="name">Closed Won</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
     </record>
     <record model="crm.case.stage" id="stage_oppor7">
         <field name="name">Closed Lost</field>
         <field name="section_id" ref="section_sales_department"/>
-         <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/> 
+         <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/> 
     </record>
 
 <!--        Case Resource(type_id)        -->
     <record model="crm.case.resource.type" id="type_oppor1">
         <field name="name">Existing Business</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/> 
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/> 
     </record>    
     <record model="crm.case.resource.type" id="type_oppor2">
         <field name="name">New Business</field>
         <field name="section_id" ref="section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>         
+        <field name="object_id" search="[('model','=','crm.lead')]" model="ir.model"/>         
     </record>
 
 </data>
diff --git a/addons/crm/crm_opportunity_demo.xml b/addons/crm/crm_opportunity_demo.xml
index b893d536e44..aa965a07594 100644
--- a/addons/crm/crm_opportunity_demo.xml
+++ b/addons/crm/crm_opportunity_demo.xml
@@ -7,10 +7,11 @@
 
     <!--For Opportunity-->
 
-        <record id="crm_case_construstazunits0" model="crm.opportunity">
+        <record id="crm_case_construstazunits0" model="crm.lead">
             <field eval="60" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_zen"/>
             <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_3"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -22,9 +23,10 @@
             <field name="stage_id" ref="crm.stage_oppor3"/>
             <field eval="&quot;CONS TRUST (AZ) 529701 - 1000 units&quot;" name="name"/>
         </record>
-        <record id="crm_case_rdroundfundingunits0" model="crm.opportunity">
+        <record id="crm_case_rdroundfundingunits0" model="crm.lead">
             <field name="partner_address_id" ref="base.res_partner_address_15"/>
             <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_oppor2"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -37,10 +39,11 @@
             <field name="stage_id" ref="crm.stage_oppor1"/>
             <field eval="&quot;3rd Round Funding - 1000 units &quot;" name="name"/>
         </record>
-        <record id="crm_case_mediapoleunits0" model="crm.opportunity">
+        <record id="crm_case_mediapoleunits0" model="crm.lead">
             <field eval="10" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_3"/>
             <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_8"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -54,10 +57,11 @@
             <field eval="&quot;Mediapole - 5000 units&quot;" name="name"/>
             <field eval="&quot;info@mediapole.net&quot;" name="email_from"/>
         </record>
-        <record id="crm_case_abcfuelcounits0" model="crm.opportunity">
+        <record id="crm_case_abcfuelcounits0" model="crm.lead">
             <field eval="40" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
             <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
             <field name="type_id" ref="crm.type_oppor1"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
@@ -70,10 +74,11 @@
             <field eval="&quot;ABC FUEL CO 829264 - 1000 units &quot;" name="name"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
         </record>
-        <record id="crm_case_dirtminingltdunits0" model="crm.opportunity">
+        <record id="crm_case_dirtminingltdunits0" model="crm.lead">
             <field eval="80" name="probability"/>
             <field name="partner_address_id" ref="base.res_partner_address_wong"/>
             <field eval="1" name="active"/>
+            <field name="type">opportunity</field>
             <field name="partner_id" ref="base.res_partner_maxtor"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 55bf9354287..1616520028e 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -6,7 +6,7 @@
             id="act_crm_opportunity_crm_meeting_new"
             name="Meetings"
             res_model="crm.meeting"
-            src_model="crm.opportunity"
+            src_model="crm.lead"
             view_mode="tree,form,calendar,"
             context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
             domain="[('user_id','=',uid), ('opportunity_id', '=', active_id)]"
@@ -16,7 +16,7 @@
             id="act_crm_opportunity_crm_phonecall_new"
             name="Phone calls"
             res_model="crm.phonecall"
-            src_model="crm.opportunity"
+            src_model="crm.lead"
             view_mode="calendar,tree,form"
             context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
             domain="[('user_id','=',uid),('opportunity_id', '=', active_id)]"
@@ -24,8 +24,9 @@
 
      <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
           <field name="name">Opportunities</field>
-          <field name="res_model">crm.opportunity</field>
+          <field name="res_model">crm.lead</field>
           <field name="view_mode">tree,form,graph</field>
+          <field name="domain">[('type','=','opportunity')]</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4bdc0d90158..cefcfb8dcd6 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -9,8 +9,8 @@
         <field name="res_model">crm.case.categ</field>
         <field name="view_type">form</field>
         <field name="view_id"  ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
-        <field name="context">{'object_id':'crm.opportunity'}</field>
+        <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+        <field name="context">{'object_id':'crm.lead'}</field>
     </record>
 
     <menuitem action="crm_opportunity_categ_action"
@@ -24,8 +24,8 @@
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
              <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
-             <field name="context">{'object_id':'crm.opportunity'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+             <field name="context">{'object_id':'crm.lead'}</field>
         </record>
 
         <menuitem action="crm_opportunity_stage_act"
@@ -39,8 +39,8 @@
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.opportunity')]</field>
-             <field name="context">{'object_id':'crm.opportunity'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+             <field name="context">{'object_id':'crm.lead'}</field>
         </record>
 
         <menuitem action="crm_opportunity_resource_act"
@@ -51,7 +51,7 @@
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">Opportunities</field>
-        <field name="model">crm.opportunity</field>
+        <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
@@ -62,7 +62,7 @@
                         <field name="stage_id" nolabel="1"
                             on_change="onchange_stage_id(stage_id)"
                             widget="selection"
-                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
                         <button name="stage_previous"
                             states="open,pending" type="object"
                             icon="gtk-go-back" string="" />
@@ -103,7 +103,7 @@
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="categ_id" select="1"
                             string="Category" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                            domain="[('object_id.model', '=', 'crm.lead')]" />
                     </group>
 
                     <separator colspan="4" string="Details"/>
@@ -181,7 +181,7 @@
                                    <button colspan="4"
                                        string="Reply to Last Email"
                                        name="%(action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.opportunity'}"
+                                       context="{'mail':'reply', 'model': 'crm.lead'}"
                                        icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
@@ -192,7 +192,7 @@
                            </field>
                            <button colspan="4" string="Send New Email"
                                name="%(action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.opportunity'}"
+                               context="{'mail':'new', 'model': 'crm.lead'}"
                                icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
@@ -204,7 +204,7 @@
 
     <record model="ir.ui.view" id="crm_case_tree_view_oppor">
         <field name="name">Opportunities Tree</field>
-        <field name="model">crm.opportunity</field>
+        <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel','done')">
@@ -245,7 +245,7 @@
 
     <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
         <field name="name">CRM - Opportunity Graph</field>
-        <field name="model">crm.opportunity</field>
+        <field name="model">crm.lead</field>
         <field name="type">graph</field>
         <field name="arch" type="xml">
             <graph string="Opportunity by Categories" type="bar" orientation="horizontal">
@@ -260,7 +260,7 @@
 
     <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
         <field name="name">CRM - Opportunities Search</field>
-        <field name="model">crm.opportunity</field>
+        <field name="model">crm.lead</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index c452e1b5055..68c94522d7b 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -49,7 +49,7 @@ class crm_phonecall(osv.osv):
                          the canall which is this opportunity source."),
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
-        'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
+        'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'),
     }
 
     _defaults = {
diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py
index bfcbba7d875..9603718190f 100644
--- a/addons/crm/report/__init__.py
+++ b/addons/crm/report/__init__.py
@@ -23,7 +23,7 @@
 import crm_report
 import crm_lead_report
 import crm_phonecall_report
-import crm_opportunity_report
+#import crm_opportunity_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 37a36fc5504..8dae83790b3 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -7,11 +7,10 @@
 "access_crm_case","crm.case","model_crm_case","crm.group_crm_manager",1,1,1,1
 "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1
 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1
-"access_crm_opportunity","crm.opportunity","model_crm_opportunity","crm.group_crm_manager",1,1,1,1
 "access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
 "access_crm_case_log","crm.case.log","model_crm_case_log","crm.group_crm_user",1,1,1,1
 "access_crm_case_history","crm.case.history","model_crm_case_history","crm.group_crm_user",1,1,1,1
-"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
+"o","crm.case.section.manager","model_crm_case_section","crm.group_crm_manager",1,1,1,1
 "access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
 "access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1
 "access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1
@@ -25,7 +24,6 @@
 "access_crm_case_report_manager","crm.case.report manager","model_crm_case_report","crm.group_crm_manager",1,1,1,1
 "access_crm_lead_report_user","crm.lead.report","model_crm_lead_report","crm.group_crm_user",1,0,0,0
 "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
-"access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0
 "access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0
 "access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index c8cce059f09..e0d3447b8b5 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -56,7 +56,6 @@ class crm_lead2opportunity(osv.osv_memory):
             return {}
 
         lead_obj = self.pool.get('crm.lead')
-        opp_obj = self. pool.get('crm.opportunity')
         data_obj = self.pool.get('ir.model.data')
         history_obj = self.pool.get('crm.case.history')
         model_obj = self.pool.get('ir.model')
@@ -72,56 +71,29 @@ class crm_lead2opportunity(osv.osv_memory):
             id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
         lead = lead_obj.browse(cr, uid, record_id, context=context)
-        model_ids = model_obj.search(cr, uid, [('model', '=', 'crm.opportunity')])
+        model_ids = model_obj.search(cr, uid, [('model', '=', 'crm.lead')])
 
 
         for this in self.browse(cr, uid, ids, context=context):
-            new_opportunity_id = opp_obj.create(cr, uid, {
-                'name': this.name,
-                'referred': lead.referred,
-                'planned_revenue': this.planned_revenue,
+            vals ={
+                'planned_revenue': this.planned_revenue, 
                 'probability': this.probability,
-                'partner_id': lead.partner_id and lead.partner_id.id or False,
-                'section_id': lead.section_id and lead.section_id.id or False,
-                'description': lead.description or False,
-                'date_deadline': lead.date_deadline or False,
-                'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False ,
-                'priority': lead.priority,
-                'phone': lead.phone,
-                'email_from': lead.email_from
-            })
-            new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
-            vals = {
-                'partner_id': this.partner_id and this.partner_id.id or False,
+                'name': this.name, 
+                'partner_id': this.partner_id.id, 
+                'type': 'opportunity'
             }
-            if not lead.opportunity_id:
-                vals.update({'opportunity_id' : new_opportunity.id})
-
-            model_opportunity_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'crm.opportunity')], context=context)[0]
-
-            for model in ('crm.case.log', 'crm.case.history'):
-                log_proxy = self.pool.get(model)
-                log_ids = log_proxy.search(cr, uid, [('model_id.model', '=', 'crm.lead'),('res_id', '=', lead.id)], context=context)
-                for log_id in log_ids:
-                    log_proxy.copy(cr, uid, log_id, {'model_id':model_opportunity_id}, context=context)
-
-            lead_obj.write(cr, uid, [lead.id], vals)
-            lead_obj.case_close(cr, uid, [lead.id])
             
-            # Copy lead history to opportunity
-            for his_id in lead.history_line:
-                history_ids = history_obj.copy(cr, uid, his_id.id, \
-                                            {'model_id': model_ids[0], \
-                                            'res_id': new_opportunity_id})
-
-            #opp_obj.case_open(cr, uid, [new_opportunity_id])
+            lead_obj.write(cr, uid, lead.id, vals, context=context)
+            
+            lead_obj._history(cr, uid, [lead], _('Opportunity'), details='Converted to Opportunity', context=context)
 
         value = {
             'name': _('Opportunity'), 
             'view_type': 'form', 
             'view_mode': 'form,tree', 
-            'res_model': 'crm.opportunity', 
-            'res_id': int(new_opportunity_id), 
+            'res_model': 'crm.lead', 
+            'domain': [('type', '=', 'opportunity')], 
+            'res_id': int(lead.id), 
             'view_id': False, 
             'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')], 
             'type': 'ir.actions.act_window', 
@@ -170,14 +142,13 @@ Leads Could not convert into Opportunity"))
         """
         lead_obj = self.pool.get('crm.lead')
         rec_ids = context and context.get('active_ids', [])
-        partner_id = context.get('partner_id', False)
         data = context and context.get('active_ids', []) or []
         res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
         for lead in lead_obj.browse(cr, uid, data, context=context):
             if 'name' in fields:
                 res.update({'name': lead.partner_name})
             if 'partner_id' in fields:
-                res.update({'partner_id': partner_id and partner_id[0] or False})
+                res.update({'partner_id': lead.partner_id.id or False})
         return res
 
 crm_lead2opportunity()
@@ -284,7 +255,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         view_id = False
         if data_id:
             view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
-        
+
         context.update({'partner_id': False})
         value = {            
             'name': _('Create Opportunity'), 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index ffe91a927d2..38b4e157f52 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -46,7 +46,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
 
         @return : default values of fields.
         """
-        opp_obj = self.pool.get('crm.opportunity')
+        opp_obj = self.pool.get('crm.lead')
         record_ids = context and context.get('active_ids', []) or []
         res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index fd27477e0c4..9e2847fb200 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -94,7 +94,7 @@ class crm_partner2opportunity(osv.osv_memory):
             categ_obj = self.pool.get('crm.case.categ')
             categ_ids = categ_obj.search(cr, uid, [('name','ilike','Part%')])
 
-            case_obj = self.pool.get('crm.opportunity')
+            case_obj = self.pool.get('crm.lead')
             opp_id = case_obj.create(cr, uid, {
                 'name' : make_opportunity_obj.name,
                 'planned_revenue' : make_opportunity_obj.planned_revenue,
@@ -103,12 +103,13 @@ class crm_partner2opportunity(osv.osv_memory):
                 'partner_address_id' : address['default'],
                 'categ_id' : categ_ids[0],
                 'state' :'draft',
+                'type': 'opportunity'
             })
             value = {
                 'name' : _('Opportunity'),
                 'view_type' : 'form',
                 'view_mode' : 'form,tree',
-                'res_model' : 'crm.opportunity',
+                'res_model' : 'crm.lead',
                 'res_id' : opp_id,
                 'view_id' : False,
                 'views' : [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 5d44ad4b2bf..231b3625722 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -71,7 +71,7 @@ Call Could not convert into Opportunity"))
         """
         record_id = context and context.get('active_id', False) or False
         if record_id:
-            opp_obj = self.pool.get('crm.opportunity')
+            opp_obj = self.pool.get('crm.lead')
             phonecall_obj = self.pool.get('crm.phonecall')
             case = phonecall_obj.browse(cr, uid, record_id, context=context)
             data_obj = self.pool.get('ir.model.data')
@@ -94,6 +94,7 @@ Call Could not convert into Opportunity"))
                                 'description': case.description or False,
                                 'phonecall_id': case.id,
                                 'priority': case.priority,
+                                'type': 'opportunity', 
                                 'phone': case.partner_phone or False,
                             })
                 new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
@@ -109,7 +110,7 @@ Call Could not convert into Opportunity"))
             'name': _('Opportunity'),
             'view_type': 'form',
             'view_mode': 'form,tree',
-            'res_model': 'crm.opportunity',
+            'res_model': 'crm.lead',
             'res_id': int(new_opportunity_id),
             'view_id': False,
             'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_crm/partner_crm.py
index 2162f850115..b2d6d380b44 100644
--- a/addons/partner_crm/partner_crm.py
+++ b/addons/partner_crm/partner_crm.py
@@ -26,7 +26,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     
     _columns = {
-                'opportunity_ids': fields.one2many('crm.opportunity', 'partner_id', 'Opportunities'), 
+                'opportunity_ids': fields.one2many('crm.lead', 'partner_id', 'Opportunities'), 
                 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
                                                      'Meetings'), 
                 'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index c6dc12abf11..780634e62e4 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -57,7 +57,7 @@ sale_fields = {
 class make_sale(wizard.interface):
 
     def _selectPartner(self, cr, uid, data, context):
-        case_obj = pooler.get_pool(cr.dbname).get('crm.opportunity')
+        case_obj = pooler.get_pool(cr.dbname).get('crm.lead')
         case = case_obj.read(cr, uid, data['ids'], ['partner_id'])
         return {'partner_id': case[0]['partner_id']}
 
@@ -66,7 +66,7 @@ class make_sale(wizard.interface):
         mod_obj = pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
         id = mod_obj.read(cr, uid, result, ['res_id'])
-        case_obj = pool.get('crm.opportunity')
+        case_obj = pool.get('crm.lead')
         sale_obj = pool.get('sale.order')
         partner_obj = pool.get('res.partner')
         sale_line_obj = pool.get('sale.order.line')

From d4921f4f8346be593019ae7f528eebe7f8a5e117 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Apr 2010 17:28:05 +0530
Subject: [PATCH 020/146] [IMP]: crm: Minor improvement in lead view domain

bzr revid: rpa@tinyerp.com-20100429115805-qpetlu57j948g7s5
---
 addons/crm/crm_lead_menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 3fb91a9aff0..9e121a1d561 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -6,7 +6,7 @@
         <field name="name">Leads</field>
         <field name="res_model">crm.lead</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('type','=','lead')]</field>
+        <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
     </record>

From f7e79ce200a4b5ef2a9bd36443aed698475c6f22 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Apr 2010 17:29:23 +0530
Subject: [PATCH 021/146] [IMP]: fetchmail, mail_gateway: changes for *
 fetchmail depends on mailgate, * fecthmail does not depends on smtpclient

bzr revid: rpa@tinyerp.com-20100429115923-ng88qf17lpat0viy
---
 addons/fetchmail/__openerp__.py                                 | 2 +-
 addons/mail_gateway/__openerp__.py                              | 2 +-
 addons/{crm => mail_gateway}/scripts/__init__.py                | 0
 .../{crm => mail_gateway}/scripts/openerp_mailgate/__init__.py  | 0
 .../scripts/openerp_mailgate/openerp_mailgate.py                | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/{crm => mail_gateway}/scripts/__init__.py (100%)
 rename addons/{crm => mail_gateway}/scripts/openerp_mailgate/__init__.py (100%)
 rename addons/{crm => mail_gateway}/scripts/openerp_mailgate/openerp_mailgate.py (100%)

diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index fc2b245f11f..f678d52a496 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -24,7 +24,7 @@
 {
     "name" : "Fetchmail Server",
     "version" : "1.0",
-    "depends" : ["base", "smtpclient"],
+    "depends" : ["base", "mail_gateway"],
     "author" : "Tiny",
     "description": """Fetchail: 
     * Fetch email from Pop / IMAP server
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index 13c69301dda..a07a2595db8 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -32,7 +32,7 @@
     * Easy Integration with any Module""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['smtpclient', 'fetchmail'],
+    'depends': ['smtpclient'],
     'init_xml': [],
     'update_xml': [
         
diff --git a/addons/crm/scripts/__init__.py b/addons/mail_gateway/scripts/__init__.py
similarity index 100%
rename from addons/crm/scripts/__init__.py
rename to addons/mail_gateway/scripts/__init__.py
diff --git a/addons/crm/scripts/openerp_mailgate/__init__.py b/addons/mail_gateway/scripts/openerp_mailgate/__init__.py
similarity index 100%
rename from addons/crm/scripts/openerp_mailgate/__init__.py
rename to addons/mail_gateway/scripts/openerp_mailgate/__init__.py
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
similarity index 100%
rename from addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
rename to addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py

From c9720d28f5a9d1ec46f8a01c388b37d36934e52b Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Thu, 29 Apr 2010 17:31:58 +0530
Subject: [PATCH 022/146] [IMP+ADD]:improved ir.rule code, added constraint on
 ir.rule for osv_memory objects

bzr revid: rvo@tinyerp.co.in-20100429120158-rt4p9t1o6kkj78fh
---
 bin/addons/base/ir/ir.xml                    |  81 ++++------
 bin/addons/base/ir/ir_model.py               |  11 +-
 bin/addons/base/ir/ir_rule.py                | 154 +++++++------------
 bin/addons/base/res/res_user.py              |   5 +-
 bin/addons/base/security/base_security.xml   |  19 +--
 bin/addons/base/security/ir.model.access.csv |   2 -
 bin/osv/fields.py                            |   5 +
 bin/osv/orm.py                               |   8 +-
 8 files changed, 110 insertions(+), 175 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 667a77e8a13..664f20abbd3 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1147,67 +1147,48 @@
 
         <!-- Rules -->
 
-        <record id="view_rule_group_form" model="ir.ui.view">
+        <record id="view_rule_form" model="ir.ui.view">
             <field name="name">Record rules</field>
-            <field name="model">ir.rule.group</field>
+            <field name="model">ir.rule</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Record rules">
-                    <field name="model_id" select="1"/>
-                    <field name="global" select="1"/>
-                    <field colspan="4" name="name"/>
-                    <group col="6" colspan="4" expand="1">
-                        <field colspan="6" name="rules" nolabel="1"/>
-                        <label align="0.0" colspan="6" string="The rule is satisfied if all test are True (AND)"/>
-                        <label align="0.0" colspan="6" string="Multiple rules on same objects are joined using operator OR"/>
+                	<label align="0.0" angle="2" colspan="4" string="Rules will be applied on following scenario : "/>
+                	<label align="0.0" angle="2" colspan="4" string="GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"/>
+                	<separator colspan="4"/>
+                	<group col="6" colspan="4">
+	                	<field colspan="4" name="name"/>
+	                    <field name="model_id" select="1"/>
                     </group>
+                    <separator colspan="4" string="Access Rights"/>
+                    <group col="8" colspan="4" expand="1">
+                    	<field name="perm_read"/>
+                    	<field name="perm_write"/>
+                    	<field name="perm_create"/>
+                    	<field name="perm_unlink"/>
+                    </group>
+                    <separator colspan="4" string="Domain Setup"/>
+                    <group colspan="4" expand="1">
+	                    <field name="domain_force" colspan="4"/>
+                    </group>
+                    <separator colspan="4" string="Groups"/>
+                    <group colspan="4" expand="1">
+                        <field name="global" select="1"/>
+	                   	<field name="groups" select="1" nolabel="1" colspan="4"/>
+                   	</group>
                 </form>
             </field>
         </record>
-        <record id="view_rule_group_tree" model="ir.ui.view">
+        <record id="view_rule_tree" model="ir.ui.view">
             <field name="name">Record rules</field>
-            <field name="model">ir.rule.group</field>
+            <field name="model">ir.rule</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Record rules">
                     <field name="model_id"/>
                     <field name="name"/>
                     <field name="global"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_rule_form" model="ir.ui.view">
-            <field name="name">Rule Definition</field>
-            <field name="model">ir.rule</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Test">
-                    <separator colspan="4" string="Simple domain setup"/>
-                    <group col="6" colspan="4">
-                        <field name="field_id"/>
-                        <field name="operator"/>
-                        <field name="operand"/>
-                    </group>
-                    <separator colspan="4" string="Manual domain setup"/>
                     <field name="domain_force"/>
-                    <label colspan="4" string="If you don't force the domain, it will use the simple domain setup"/>
-                    <newline/>
-                    <field name="perm_read"/>
-                    <field name="perm_write"/>
-                    <field name="perm_create"/>
-                    <field name="perm_unlink"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_rule_tree" model="ir.ui.view">
-            <field name="name">Rules</field>
-            <field name="model">ir.rule</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Test">
-                    <field name="domain"/>
                     <field name="perm_read"/>
                     <field name="perm_write"/>
                     <field name="perm_create"/>
@@ -1215,22 +1196,20 @@
                 </tree>
             </field>
         </record>
+
         <record id="action_rule" model="ir.actions.act_window">
             <field name="name">Record Rules</field>
-            <field name="res_model">ir.rule.group</field>
+            <field name="res_model">ir.rule</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="view_rule_group_tree"/>
+            <field name="view_id" ref="view_rule_tree"/>
         </record>
         <menuitem action="action_rule" id="menu_action_rule" parent="base.menu_security"/>
 
-        <record id="property_rule_group" model="ir.rule.group">
+        <record id="property_rule" model="ir.rule">
             <field name="name">Property multi-company</field>
             <field model="ir.model" name="model_id" ref="model_ir_property"/>
             <field eval="True" name="global"/>
-        </record>
-        <record id="property_rule" model="ir.rule">
             <field name="domain_force">['|',('company_id','child_of',user.company_id.id),('company_id','=',False)]</field>
-            <field name="rule_group" ref="property_rule_group"/>
         </record>
 
         <!--server action view-->
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 670fb420bd2..f6412e85b75 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.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/>.
 #
 ##############################################################################
 import logging
@@ -80,7 +80,7 @@ class ir_model(osv.osv):
         if context:
             context.pop('__last_update', None)
         return super(ir_model,self).write(cr, user, ids, vals, context)
-        
+
     def create(self, cr, user, vals, context=None):
         if context and context.get('manual',False):
             vals['state']='manual'
@@ -226,7 +226,7 @@ class ir_model_fields(osv.osv):
         'domain': fields.char('Domain', size=256),
         'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),
         'view_load': fields.boolean('View Auto-Load'),
-        'selectable': fields.boolean('Selectable'),        
+        'selectable': fields.boolean('Selectable'),
     }
     _rec_name='field_description'
     _defaults = {
@@ -278,7 +278,7 @@ class ir_model_fields(osv.osv):
                 self.pool.get(vals['model'])._auto_init(cr, ctx)
 
         return res
-    
+
 ir_model_fields()
 
 class ir_model_access(osv.osv):
@@ -378,6 +378,7 @@ class ir_model_access(osv.osv):
                 'create': _('You can not create this kind of document! (%s)'),
                 'unlink': _('You can not delete this document! (%s)'),
             }
+
             raise except_orm(_('AccessError'), msgs[mode] % model_name )
         return r
 
diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index c4165d1bc93..ae13bb5ccda 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -23,132 +23,94 @@ from osv import fields,osv
 import time
 import tools
 
-
-class ir_rule_group(osv.osv):
-    _name = 'ir.rule.group'
-
-    _columns = {
-        'name': fields.char('Name', size=128, select=1),
-        'model_id': fields.many2one('ir.model', 'Object',select=1, required=True),
-        'global': fields.boolean('Global', select=1, help="Make the rule global, otherwise it needs to be put on a group"),
-        'rules': fields.one2many('ir.rule', 'rule_group', 'Tests', help="The rule is satisfied if at least one test is True"),
-        'groups': fields.many2many('res.groups', 'group_rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
-        'users': fields.many2many('res.users', 'user_rule_group_rel', 'rule_group_id', 'user_id', 'Users'),
-    }
-
-    _order = 'model_id, global DESC'
-
-    _defaults={
-        'global': lambda *a: True,
-    }
-
-ir_rule_group()
-
-
 class ir_rule(osv.osv):
     _name = 'ir.rule'
-    _rec_name = 'field_id'
-
-    def _operand(self,cr,uid,context):
-
-        def get(object, level=3, recur=None, root_tech='', root=''):
-            res = []
-            if not recur:
-                recur = []
-            fields = self.pool.get(object).fields_get(cr,uid)
-            key = fields.keys()
-            key.sort()
-            for k in key:
-
-                if fields[k]['type'] in ('many2one'):
-                    res.append((root_tech+'.'+k+'.id',
-                        root+'/'+fields[k]['string']))
-
-                elif fields[k]['type'] in ('many2many', 'one2many'):
-                    res.append(('\',\'.join(map(lambda x: str(x.id), '+root_tech+'.'+k+'))',
-                        root+'/'+fields[k]['string']))
-
-                else:
-                    res.append((root_tech+'.'+k,
-                        root+'/'+fields[k]['string']))
-
-                if (fields[k]['type'] in recur) and (level>0):
-                    res.extend(get(fields[k]['relation'], level-1,
-                        recur, root_tech+'.'+k, root+'/'+fields[k]['string']))
-
-            return res
-
-        res = [("False", "False"), ("True", "True"), ("user.id", "User")]
-        res += get('res.users', level=1,
-                recur=['many2one'], root_tech='user', root='User')
-        return res
 
     def _domain_force_get(self, cr, uid, ids, field_name, arg, context={}):
         res = {}
         for rule in self.browse(cr, uid, ids, context):
             eval_user_data = {'user': self.pool.get('res.users').browse(cr, 1, uid),
                             'time':time}
-
-            if rule.domain_force:
-                res[rule.id] = eval(rule.domain_force, eval_user_data)
-            else:
-                if rule.operand and rule.operand.startswith('user.') and rule.operand.count('.') > 1:
-                    #Need to check user.field.field1.field2(if field  is False,it will break the chain)
-                    op = rule.operand[5:]
-                    rule.operand = rule.operand[:5+len(op[:op.find('.')])] +' and '+ rule.operand + ' or False'
-                if rule.operator in ('in', 'child_of'):
-                    dom = eval("[('%s', '%s', [%s])]" % (rule.field_id.name, rule.operator,
-                        eval(rule.operand,eval_user_data)), eval_user_data)
-                else:
-                    dom = eval("[('%s', '%s', %s)]" % (rule.field_id.name, rule.operator,
-                        rule.operand), eval_user_data)
-                res[rule.id] = dom
+            res[rule.id] = eval(rule.domain_force, eval_user_data)
         return res
 
+    def _get_value(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        for rule in self.browse(cr, uid, ids, context):
+            if not rule.groups:
+                res[rule.id] = True
+            else:
+                res[rule.id] = False
+        return res
+
+    def _check_model_obj(self, cr, uid, ids, context={}):
+        model_obj = self.pool.get('ir.model')
+        for rule in self.browse(cr, uid, ids, context):
+            model = model_obj.browse(cr, uid, rule.model_id.id, context).model
+            obj = self.pool.get(model)
+            if isinstance(obj, osv.osv_memory):
+                return False
+            return True
+
     _columns = {
-        'field_id': fields.many2one('ir.model.fields', 'Field',domain= "[('model_id','=', parent.model_id)]", select=1),
-        'operator':fields.selection((('=', '='), ('<>', '<>'), ('<=', '<='), ('>=', '>='), ('in', 'in'), ('child_of', 'child_of')), 'Operator'),
-        'operand':fields.selection(_operand,'Operand', size=64),
-        'rule_group': fields.many2one('ir.rule.group', 'Group', select=2, required=True, ondelete="cascade"),
-        'domain_force': fields.char('Force Domain', size=250),
+        'name': fields.char('Name', size=128, select=1),
+        'model_id': fields.many2one('ir.model', 'Object',select=1, required=True),
+        'global': fields.function(_get_value, method=True, string='Global', type='boolean', store=True, help="Make the rule global, otherwise it needs to be put on a group"),
+        'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
+        'domain_force': fields.char('Domain', size=250),
         'domain': fields.function(_domain_force_get, method=True, string='Domain', type='char', size=250),
-        'perm_read': fields.boolean('Read Access'),
-        'perm_write': fields.boolean('Write Access'),
-        'perm_create': fields.boolean('Create Access'),
-        'perm_unlink': fields.boolean('Delete Access')
+        'perm_read': fields.boolean('Apply For Read'),
+        'perm_write': fields.boolean('Apply For Write'),
+        'perm_create': fields.boolean('Apply For Create'),
+        'perm_unlink': fields.boolean('Apply For Delete')
     }
+
+    _order = 'model_id DESC'
+
     _defaults = {
-        'perm_read': lambda *a: True,
-        'perm_write': lambda *a: True,
-        'perm_create': lambda *a: True,
-        'perm_unlink': lambda *a: True,
+        'perm_read': True,
+        'perm_write': True,
+        'perm_create': True,
+        'perm_unlink': True,
+        'global': True,
     }
     _sql_constraints = [
         ('no_access_rights', 'CHECK (perm_read!=False or perm_write!=False or perm_create!=False or perm_unlink!=False)', 'Rule must have atleast one checked access right'),
     ]
+    _constraints = [
+        (_check_model_obj, 'Rules are not supported for osv_memory objects !', ['model_id'])
+    ]
 
-    def onchange_all(self, cr, uid, ids, field_id, operator, operand):
-        if not (field_id or operator or operand):
-            return {}
+    def domain_create(self, cr, uid, rule_ids):
+        dom = ['&'] * (len(rule_ids)-1)
+        for rule in self.browse(cr, uid, rule_ids):
+            dom += rule.domain
+        return dom
 
     def domain_get(self, cr, uid, model_name, mode='read', context={}):
+        group_rule = {}
+        global_rules = []
+
         if uid == 1:
             return [], [], ['"'+self.pool.get(model_name)._table+'"']
-
         cr.execute("""SELECT r.id
                 FROM ir_rule r
-                JOIN (ir_rule_group g
-                    JOIN ir_model m ON (g.model_id = m.id))
-                    ON (g.id = r.rule_group)
+                JOIN ir_model m ON (r.model_id = m.id)
                 WHERE m.model = %s
                 AND r.perm_""" + mode + """
-                AND (g.id IN (SELECT rule_group_id FROM group_rule_group_rel g_rel
+                AND (r.id IN (SELECT rule_group_id FROM rule_group_rel g_rel
                             JOIN res_groups_users_rel u_rel ON (g_rel.group_id = u_rel.gid)
-                            WHERE u_rel.uid = %s) OR g.global)""", (model_name, uid))
+                            WHERE u_rel.uid = %s) OR r.global)""", (model_name, uid))
         ids = map(lambda x: x[0], cr.fetchall())
-        dom = []
         for rule in self.browse(cr, uid, ids):
-            dom += rule.domain
+            for group in rule.groups:
+                group_rule.setdefault(group.id, []).append(rule.id)
+            if not rule.groups:
+              global_rules.append(rule.id)
+        dom = self.domain_create(cr, uid, global_rules)
+        dom += ['|'] * (len(group_rule)-1)
+        for value in group_rule.values():
+            dom += self.domain_create(cr, uid, value)
         d1,d2,tables = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
         return d1, d2, tables
     domain_get = tools.cache()(domain_get)
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index ff61b9ec6fa..fe67848de6a 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -34,7 +34,7 @@ class groups(osv.osv):
     _columns = {
         'name': fields.char('Group Name', size=64, required=True),
         'model_access': fields.one2many('ir.model.access', 'group_id', 'Access Controls'),
-        'rule_groups': fields.many2many('ir.rule.group', 'group_rule_group_rel',
+        'rule_groups': fields.many2many('ir.rule', 'rule_group_rel',
             'group_id', 'rule_group_id', 'Rules', domain="[('global', '<>', True)]"),
         'menu_access': fields.many2many('ir.ui.menu', 'ir_ui_menu_group_rel', 'gid', 'menu_id', 'Access Menu'),
         'comment' : fields.text('Comment',size=250),
@@ -47,7 +47,7 @@ class groups(osv.osv):
         group_name = self.read(cr, uid, [id], ['name'])[0]['name']
         default.update({'name': group_name +' (copy)'})
         return super(groups, self).copy(cr, uid, id, default, context)
-    
+
     def write(self, cr, uid, ids, vals, context=None):
         if 'name' in vals:
             if vals['name'].startswith('-'):
@@ -185,7 +185,6 @@ class users(osv.osv):
         'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),
-        'rules_id': fields.many2many('ir.rule.group', 'user_rule_group_rel', 'user_id', 'rule_group_id', 'Rules'),
         'company_id': fields.many2one('res.company', 'Company', required=True,
             help="The company this user is currently working for."),
         'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index ca1f33aa23e..1059cf4da37 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -72,37 +72,24 @@
     </record>
 
 
-    <record model="ir.rule.group" id="res_partner_address_rule_group">
+    <record model="ir.rule" id="res_partner_address_rule">
         <field name="name">res.partner.address company</field>
         <field name="model_id" ref="model_res_partner_address"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="res_partner_address_comp_rule">
-        <field name="field_id" search="[('model','=','res.partner.address'),('name','=','company_id')]" model="ir.model.fields"/>
-        <field name="rule_group" ref="res_partner_address_rule_group"/>
         <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record model="ir.rule.group" id="res_partner_rule_group">
+    <record model="ir.rule" id="res_partner_rule">
         <field name="name">res.partner company</field>
         <field name="model_id" ref="model_res_partner"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="res_partner_comp_rule">
-        <field name="field_id" search="[('model','=','res.partner'),('name','=','company_id')]" model="ir.model.fields"/>
-        <field name="rule_group" ref="res_partner_rule_group"/>
         <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-
-    <record model="ir.rule.group" id="multi_company_default_rule_group">
+    <record model="ir.rule" id="multi_company_default_rule">
         <field name="name">Multi_company_default company</field>
         <field name="model_id" ref="model_multi_company_default"/>
         <field name="global" eval="True"/>
-    </record>
-    <record model="ir.rule" id="multi_company_default_comp_rule">
-        <field name="field_id" search="[('model','=','multi_company.default'),('name','=','company_id')]" model="ir.model.fields"/>
-        <field name="rule_group" ref="multi_company_default_rule_group"/>
         <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
diff --git a/bin/addons/base/security/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
index bc291af8b33..cf0f73a5cc9 100644
--- a/bin/addons/base/security/ir.model.access.csv
+++ b/bin/addons/base/security/ir.model.access.csv
@@ -23,9 +23,7 @@
 "access_ir_report_custom_group_system","ir_report_custom group_system","model_ir_report_custom",,1,0,0,0
 "access_ir_report_custom_fields_group_system","ir_report_custom_fields group_system","model_ir_report_custom_fields",,1,0,0,0
 "access_ir_rule_group_user","ir_rule group_user","model_ir_rule",,1,0,0,0
-"access_ir_rule_group_group_user","ir_rule_group group_user","model_ir_rule_group",,1,0,0,0
 "access_ir_rule_group_erp_manager","ir_rule group_erp_manager","model_ir_rule","group_erp_manager",1,1,1,1
-"access_ir_rule_group_group_erp_manager","ir_rule_group group_erp_manager","model_ir_rule_group","group_erp_manager",1,1,1,1
 "access_ir_sequence_group_user","ir_sequence group_user","model_ir_sequence",,1,1,1,1
 "access_ir_sequence_type_group_user","ir_sequence_type group_user","model_ir_sequence_type",,1,0,0,0
 "access_ir_translation_group_system","ir_translation group_system","model_ir_translation",,1,1,1,1
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 35ff1667418..71faa9898a5 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -656,6 +656,11 @@ class function(_column):
             self._symbol_f = float._symbol_f
             self._symbol_set = float._symbol_set
 
+        if type == 'boolean':
+            self._symbol_c = boolean._symbol_c
+            self._symbol_f = boolean._symbol_f
+            self._symbol_set = boolean._symbol_set
+
     def digits_change(self, cr):
         if self.digits_compute:
             t = self.digits_compute(cr)
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index e57f9ce3d87..d407ac4d4af 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1725,6 +1725,7 @@ class orm_memory(orm_template):
     def read(self, cr, user, ids, fields_to_read=None, context=None, load='_classic_read'):
         if not context:
             context = {}
+        self.pool.get('ir.model.access').check(cr, user, self._name, 'read', context=context)
         if not fields_to_read:
             fields_to_read = self._columns.keys()
         result = []
@@ -1754,6 +1755,7 @@ class orm_memory(orm_template):
     def write(self, cr, user, ids, vals, context=None):
         if not ids:
             return True
+        self.pool.get('ir.model.access').check(cr, user, self._name, 'write', context=context)
         vals2 = {}
         upd_todo = []
         for field in vals:
@@ -1772,6 +1774,7 @@ class orm_memory(orm_template):
         return id_new
 
     def create(self, cr, user, vals, context=None):
+        self.pool.get('ir.model.access').check(cr, user, self._name, 'create', context=context)
         self.vaccum(cr, user)
         self.next_id += 1
         id_new = self.next_id
@@ -1923,6 +1926,7 @@ class orm_memory(orm_template):
         return res or []
 
     def unlink(self, cr, uid, ids, context=None):
+        self.pool.get('ir.model.access').check(cr, uid, self._name, 'unlink', context=context)
         for id in ids:
             if id in self.datas:
                 del self.datas[id]
@@ -3225,7 +3229,7 @@ class orm(orm_template):
         """
         if not context:
             context = {}
-        self.pool.get('ir.model.access').check(cr, user, self._name, 'create')
+        self.pool.get('ir.model.access').check(cr, user, self._name, 'create', context=context)
 
         default = []
 
@@ -3281,7 +3285,7 @@ class orm(orm_template):
                 del vals[self._inherits[table]]
 
             record_id = tocreate[table].pop('id', None)
-            
+
             if record_id is None or not record_id:
                 record_id = self.pool.get(table).create(cr, user, tocreate[table], context=context)
             else:

From 695a773eba9cb524fe720d1ddd667751c34f3c05 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 29 Apr 2010 19:19:19 +0530
Subject: [PATCH 023/146] [ADD]: mail_gateway: Added thread and message
 objects+views in mailgateway

bzr revid: rpa@tinyerp.com-20100429134919-4fg6bfwa40tka7lb
---
 addons/mail_gateway/__init__.py           |   2 +
 addons/mail_gateway/__openerp__.py        |   2 +-
 addons/mail_gateway/mail_gateway.py       |  72 ++++++++++++
 addons/mail_gateway/mail_gateway_view.xml | 131 ++++++++++++++++++++++
 4 files changed, 206 insertions(+), 1 deletion(-)
 create mode 100644 addons/mail_gateway/mail_gateway.py
 create mode 100644 addons/mail_gateway/mail_gateway_view.xml

diff --git a/addons/mail_gateway/__init__.py b/addons/mail_gateway/__init__.py
index 2aefd8b3c11..7380514e45a 100644
--- a/addons/mail_gateway/__init__.py
+++ b/addons/mail_gateway/__init__.py
@@ -19,5 +19,7 @@
 #
 ##############################################################################
 
+import mail_gateway
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index a07a2595db8..b2d78324fe5 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -35,7 +35,7 @@
     'depends': ['smtpclient'],
     'init_xml': [],
     'update_xml': [
-        
+        "mail_gateway_view.xml"
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
new file mode 100644
index 00000000000..f267337125c
--- /dev/null
+++ b/addons/mail_gateway/mail_gateway.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 osv, fields
+
+from osv import osv
+from osv import fields
+
+
+from osv import osv
+from osv import fields
+
+
+class mailgate_thread(osv.osv):
+    '''
+    Mailgateway Thread
+    '''
+    _name = 'mailgate.thread'
+    _description = 'Mailgateway Thread'
+    
+    _columns = {
+        'name':fields.char('Name', size=64),
+        'message_ids':fields.one2many('mailgate.message', 'thread_id', 'Message'),
+    }
+
+mailgate_thread()
+
+class mailgate_message(osv.osv):
+    '''
+    Mailgateway Message
+    '''
+    _name = 'mailgate.message'
+    _description = 'Mailgateway Message'
+    
+    _columns = {
+        'name':fields.char('Message', size=64, required=True),
+        'thread_id':fields.many2one('mailgate.thread', 'Thread'),
+        'date': fields.datetime('Date'),
+        'model_id': fields.many2one('ir.model', "Model"),
+        'res_id': fields.integer('Resource ID'),
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+        'message': fields.text('Description'),
+        'email_from': fields.char('Email From', size=84),
+        'email_to': fields.char('Email To', size=84),
+        'email_cc': fields.char('Email From', size=84),
+        'email_bcc': fields.char('Email From', size=84),
+        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+    }
+
+mailgate_message()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
new file mode 100644
index 00000000000..253462895da
--- /dev/null
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_maligate_message_form">
+            <field name="name">maligate.message.form</field>
+            <field name="model">maligate.message</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="maligate message">
+                    <field name="name" />
+                    <field name="date" />
+                    <field name="model_id" />
+                    <field name="res_id" />
+                    <field name="user_id" />
+                    <field name="message_id" />
+                    <notebook colspan="4">
+	                    <page>
+	                    	<group col="4" colspan="4">
+	                    		<separator string="Email Details" colspan="4"/>
+			                    <field name="email_from" />
+			                    <field name="email_to" />
+			                    <field name="email_cc" />
+			                    <field name="email_bcc" />
+			               </group>
+		                </page>
+		                <page>
+		                	<separator string="Attachments" colspan="4"/>
+		                    <field name="attachment_ids" nolabel="1" colspan="4" />
+                 		</page>
+	                </notebook>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_mailgate_message_tree">
+            <field name="name">maligate.message.tree</field>
+            <field name="model">maligate.message</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Mailgateway Message">
+                    <field name="name" select="1" />
+                    <field name="date" />
+                </tree>
+            </field>
+        </record>
+        
+        
+        <record model="ir.ui.view" id="view_mailgate_thread_form">
+            <field name="name">mailgate.thread.form</field>
+            <field name="model">mailgate.thread</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Mailgateway Thread">
+                    <field name="name" select="1"/>
+                    <separator string="Messages" colspan="4"/>
+                    <field name="message_ids" nolabel="1" colspan="4">
+                    	<tree string="Mailgateway Message">
+		                    <field name="name" select="1" />
+		                    <field name="date" />
+		                </tree>
+	                    <form string="Maligate Message">
+		                    <field name="name" />
+		                    <field name="date" />
+		                    <field name="model_id" />
+		                    <field name="res_id" />
+		                    <field name="user_id" />
+		                    <field name="message_id" />
+		                    <notebook colspan="4">
+			                    <page string="Email Details">
+			                    	<group col="4" colspan="4">
+			                    		<separator string="Email Details" colspan="4"/>
+					                    <field name="email_from" />
+					                    <field name="email_to" />
+					                    <field name="email_cc" />
+					                    <field name="email_bcc" />
+					               </group>
+				                </page>
+				                <page string="Attachments">
+				                	<separator string="Attachments" colspan="4"/>
+				                    <field name="attachment_ids" nolabel="1" colspan="4" />
+		                 		</page>
+			                </notebook>
+		                </form>
+                    </field>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_mailgate_thread_tree">
+            <field name="name">mailgate.thread.tree</field>
+            <field name="model">mailgate.thread</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Mailgateway Thread">
+                    <field name="name" select="1" />
+                    <field name="message_ids" />
+                </tree>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="action_view_mailgate_thread">
+	        <field name="name">Mailgateway Threads</field>
+	        <field name="res_model">mailgate.thread</field>
+	        <field name="view_mode">tree,form</field>
+	        <field name="view_type">form</field>
+	        <field name="view_id" ref="view_mailgate_thread_tree"/>
+	    </record>
+		
+		<record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view1">
+	        <field name="sequence" eval="1"/>
+	        <field name="view_mode">tree</field>
+	        <field name="view_id" ref="view_mailgate_thread_tree"/>
+	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
+	    </record>
+	    <record model="ir.actions.act_window.view" id="action_view_mailgate_thread_view2">
+	        <field name="sequence" eval="2"/>
+	        <field name="view_mode">form</field>
+	        <field name="view_id" ref="view_mailgate_thread_form"/>
+	        <field name="act_window_id" ref="action_view_mailgate_thread"/>
+	    </record>
+		
+		
+		 <menuitem id="menu_crm_configuration" name="Cases"
+            parent="base.menu_base_config" sequence="0"/>
+            
+        <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
+        	parent="menu_crm_configuration" />
+        	
+      	
+    </data>
+</openerp>

From 7b6827a6b4b88be4401d98627b7b8ed009926f77 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Thu, 29 Apr 2010 19:33:13 +0530
Subject: [PATCH 024/146] bug with field with widget=selection + groups if user
 has no access right

bzr revid: hda@tinyerp.com-20100429140313-cnizdvh7m48m5cme
---
 bin/osv/orm.py | 67 +++++++++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index e57f9ce3d87..af140909664 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1138,7 +1138,17 @@ class orm_template(object):
             if isinstance(s, unicode):
                 return s.encode('utf8')
             return s
-
+        def check_group(node):
+            if node.get('groups'):
+                groups = node.get('groups').split(',')
+                readonly = False
+                access_pool = self.pool.get('ir.model.access')
+                for group in groups:
+                    readonly = readonly or access_pool.check_groups(cr, user, group)
+                if not readonly:
+                    node.set('invisible', '1')
+            del(node.attrib['groups'])
+    
         if node.tag in ('field', 'node', 'arrow'):
             if node.get('object'):
                 attrs = {}
@@ -1185,15 +1195,20 @@ class orm_template(object):
                             }
                     attrs = {'views': views}
                     if node.get('widget') and node.get('widget') == 'selection':
+                        if 'groups' in node.attrib:
+                            check_group(node)
+                        if node.get('invisible'):
+                            attrs['selection'] = []
                         # We can not use the 'string' domain has it is defined according to the record !
-                        dom = []
-                        if column._domain and not isinstance(column._domain, (str, unicode)):
-                            dom = column._domain
-                        dom += eval(node.get('domain','[]'), {'uid':user, 'time':time})
-                        context.update(eval(node.get('context','{}')))
-                        attrs['selection'] = self.pool.get(relation).name_search(cr, user, '', dom, context=context,limit=None)
-                        if (node.get('required') and not int(node.get('required'))) or not column.required:
-                            attrs['selection'].append((False,''))
+                        else:
+                            dom = []
+                            if column._domain and not isinstance(column._domain, (str, unicode)):
+                                dom = column._domain
+                            dom += eval(node.get('domain','[]'), {'uid':user, 'time':time})
+                            context.update(eval(node.get('context','{}')))
+                            attrs['selection'] = self.pool.get(relation)._name_search(cr, user, '', dom, context=context,limit=None,name_get_uid=1)
+                            if (node.get('required') and not int(node.get('required'))) or not column.required:
+                                attrs['selection'].append((False,''))
                 fields[node.get('name')] = attrs
 
         elif node.tag in ('form', 'tree'):
@@ -1207,15 +1222,7 @@ class orm_template(object):
                     fields[node.get(additional_field)] = {}
 
         if 'groups' in node.attrib:
-            if node.get('groups'):
-                groups = node.get('groups').split(',')
-                readonly = False
-                access_pool = self.pool.get('ir.model.access')
-                for group in groups:
-                    readonly = readonly or access_pool.check_groups(cr, user, group)
-                if not readonly:
-                    node.set('invisible', '1')
-            del(node.attrib['groups'])
+            check_group(node)
 
         # translate view
         if ('lang' in context) and not result:
@@ -3649,6 +3656,18 @@ class orm(orm_template):
         return [(r['id'], tools.ustr(r[self._rec_name])) for r in self.read(cr, user, ids,
             [self._rec_name], context, load='_classic_write')]
 
+    def _name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100, name_get_uid=None):
+        if not args:
+            args = []
+        if not context:
+            context = {}
+        args = args[:]
+        if name:
+            args += [(self._rec_name, operator, name)]
+        ids = self.search(cr, user, args, limit=limit, context=context)
+        res = self.name_get(cr, name_get_uid, ids, context)
+        return res
+
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
         """
 
@@ -3664,17 +3683,9 @@ class orm(orm_template):
         This method is equivalent of search() on name + name_get()
 
         """
-        if not args:
-            args = []
-        if not context:
-            context = {}
-        args = args[:]
-        if name:
-            args += [(self._rec_name, operator, name)]
-        ids = self.search(cr, user, args, limit=limit, context=context)
-        res = self.name_get(cr, user, ids, context)
-        return res
 
+        return self._name_search(cr, user, name, args, operator, context, limit, user)
+        
     def copy_data(self, cr, uid, id, default=None, context=None):
         """
         Copy given record's data with all its fields values

From e121a29cba42de2d9538a48b8e2394d8f9958260 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 29 Apr 2010 17:35:12 +0200
Subject: [PATCH 025/146] [IMP] improved the new ir.rule form view + improved
 caching mechanism for ir.rules

bzr revid: odo@openerp.com-20100429153512-6zygzt7900dnygk9
---
 bin/addons/base/ir/ir.xml     | 37 +++++++++++++++++++----------------
 bin/addons/base/ir/ir_rule.py | 33 ++++++++++++++++++-------------
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 664f20abbd3..f28a26103d2 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1153,29 +1153,32 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Record rules">
-                	<label align="0.0" angle="2" colspan="4" string="Rules will be applied on following scenario : "/>
-                	<label align="0.0" angle="2" colspan="4" string="GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"/>
-                	<separator colspan="4"/>
-                	<group col="6" colspan="4">
-	                	<field colspan="4" name="name"/>
-	                    <field name="model_id" select="1"/>
+                    <separator colspan="4" string="Combination of rules"/>
+                    <label align="0.0" angle="2" colspan="4" string="1. Global rules are combined together with a logical AND operator, and with the result of the following steps"/>
+                    <label align="0.0" angle="2" colspan="4" string="2. Group-specific rules are combined together with a logical AND operator"/>
+                    <label align="0.0" angle="2" colspan="4" string="3. If user belongs to several groups, the results from step 2 are combined with logical OR operator"/>
+                    <label align="0.0" angle="2" colspan="4" string="Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 AND GROUP_A_RULE_2) OR (GROUP_B_RULE_1 AND GROUP_B_RULE_2) )"/>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="General"/>
+                        <field colspan="4" name="name"/>
+                        <field name="model_id" select="1"/>
                     </group>
-                    <separator colspan="4" string="Access Rights"/>
-                    <group col="8" colspan="4" expand="1">
-                    	<field name="perm_read"/>
-                    	<field name="perm_write"/>
-                    	<field name="perm_create"/>
-                    	<field name="perm_unlink"/>
+                    <group col="4" colspan="2">
+                        <separator colspan="4" string="Access Rights"/>
+                        <field name="perm_read"/>
+                        <field name="perm_write"/>
+                        <field name="perm_create"/>
+                        <field name="perm_unlink"/>
                     </group>
                     <separator colspan="4" string="Domain Setup"/>
-                    <group colspan="4" expand="1">
-	                    <field name="domain_force" colspan="4"/>
+                    <group colspan="4">
+                        <field name="domain_force" colspan="4"/>
                     </group>
-                    <separator colspan="4" string="Groups"/>
+                    <separator colspan="4" string="Groups (no group = global)"/>
                     <group colspan="4" expand="1">
                         <field name="global" select="1"/>
-	                   	<field name="groups" select="1" nolabel="1" colspan="4"/>
-                   	</group>
+                        <field name="groups" select="1" nolabel="1" colspan="4"/>
+                       </group>
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index ae13bb5ccda..de465fa8025 100644
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -50,12 +50,12 @@ class ir_rule(osv.osv):
             obj = self.pool.get(model)
             if isinstance(obj, osv.osv_memory):
                 return False
-            return True
+        return True
 
     _columns = {
         'name': fields.char('Name', size=128, select=1),
         'model_id': fields.many2one('ir.model', 'Object',select=1, required=True),
-        'global': fields.function(_get_value, method=True, string='Global', type='boolean', store=True, help="Make the rule global, otherwise it needs to be put on a group"),
+        'global': fields.function(_get_value, method=True, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
         'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
         'domain_force': fields.char('Domain', size=250),
         'domain': fields.function(_domain_force_get, method=True, string='Domain', type='char', size=250),
@@ -75,7 +75,7 @@ class ir_rule(osv.osv):
         'global': True,
     }
     _sql_constraints = [
-        ('no_access_rights', 'CHECK (perm_read!=False or perm_write!=False or perm_create!=False or perm_unlink!=False)', 'Rule must have atleast one checked access right'),
+        ('no_access_rights', 'CHECK (perm_read!=False or perm_write!=False or perm_create!=False or perm_unlink!=False)', 'Rule must have at least one checked access right'),
     ]
     _constraints = [
         (_check_model_obj, 'Rules are not supported for osv_memory objects !', ['model_id'])
@@ -87,12 +87,13 @@ class ir_rule(osv.osv):
             dom += rule.domain
         return dom
 
-    def domain_get(self, cr, uid, model_name, mode='read', context={}):
+    @tools.cache()
+    def _compute_domain(self, cr, uid, model_name, mode="read"):
         group_rule = {}
         global_rules = []
 
         if uid == 1:
-            return [], [], ['"'+self.pool.get(model_name)._table+'"']
+            return None
         cr.execute("""SELECT r.id
                 FROM ir_rule r
                 JOIN ir_model m ON (r.model_id = m.id)
@@ -111,28 +112,32 @@ class ir_rule(osv.osv):
         dom += ['|'] * (len(group_rule)-1)
         for value in group_rule.values():
             dom += self.domain_create(cr, uid, value)
-        d1,d2,tables = self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
-        return d1, d2, tables
-    domain_get = tools.cache()(domain_get)
+        return dom
+
+    def domain_get(self, cr, uid, model_name, mode='read', context={}):
+        dom = self._compute_domain(cr, uid, model_name, mode=mode)
+        if dom:
+            return self.pool.get(model_name)._where_calc(cr, uid, dom, active_test=False)
+        return [], [], ['"'+self.pool.get(model_name)._table+'"']
 
     def unlink(self, cr, uid, ids, context=None):
         res = super(ir_rule, self).unlink(cr, uid, ids, context=context)
-        # Restart the cache on the domain_get method of ir.rule
-        self.domain_get.clear_cache(cr.dbname)
+        # Restart the cache on the _compute_domain method of ir.rule
+        self._compute_domain.clear_cache(cr.dbname)
         return res
 
     def create(self, cr, user, vals, context=None):
         res = super(ir_rule, self).create(cr, user, vals, context=context)
-        # Restart the cache on the domain_get method of ir.rule
-        self.domain_get.clear_cache(cr.dbname)
+        # Restart the cache on the _compute_domain method of ir.rule
+        self._compute_domain.clear_cache(cr.dbname)
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context={}
         res = super(ir_rule, self).write(cr, uid, ids, vals, context=context)
-        # Restart the cache on the domain_get method
-        self.domain_get.clear_cache(cr.dbname)
+        # Restart the cache on the _compute_domain method
+        self._compute_domain.clear_cache(cr.dbname)
         return res
 
 ir_rule()

From ff64e31f5bad74c3273638699ae6de73f4edd68f Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 30 Apr 2010 04:50:49 +0100
Subject: [PATCH 026/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100429035230-04t0fhzz45wb0el4
bzr revid: codehost@crowberry-20100430035049-ydjg2lhih85v80i9
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/it.po    | 8 ++++----
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 489c37b48f9..f66421b44ce 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-04-27 04:11+0000\n"
+"PO-Revision-Date: 2010-04-29 04:38+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-04-28 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-04-30 03: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 253250b3ac1..a07603c3142 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-03-31 05:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-04-29 04:41+0000\n"
+"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.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-04-17 03:51+0000\n"
+"X-Launchpad-Export-Date: 2010-04-30 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -422,7 +422,7 @@ msgstr "Colombia"
 #. module: base
 #: view:ir.module.module:0
 msgid "Schedule Upgrade"
-msgstr "Aggiornamento Programmazione"
+msgstr "Pianifica l'aggiornamento"
 
 #. module: base
 #: field:ir.actions.report.custom,report_id:0
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 4ecea713060..b53a444998d 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-04-27 04:09+0000\n"
+"PO-Revision-Date: 2010-04-29 04:36+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-04-28 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-30 03: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 bb4efc549a6..29ddcfda776 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-04-27 04:13+0000\n"
+"PO-Revision-Date: 2010-04-29 04:41+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-04-28 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-04-30 03:50+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 a198f09adfe..65f065c9942 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-04-27 04:11+0000\n"
+"PO-Revision-Date: 2010-04-29 04:39+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-04-28 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-04-30 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 8185ceb49d2..729acf9e52b 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-04-27 04:13+0000\n"
+"PO-Revision-Date: 2010-04-29 04:40+0000\n"
 "Last-Translator: OpenERP Administrators <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-04-28 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-04-30 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From e235786c547dda46f5ed93aba15e1c120dcfc7f0 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 11:43:14 +0530
Subject: [PATCH 027/146] [IMP]:account configuration wizard

bzr revid: nch@tinyerp.com-20100430061314-xpcxye6afshqxg9h
---
 addons/account/account.py                   | 46 -----------------
 addons/account/account_installer.xml        | 29 +++++++++--
 addons/account/account_view.xml             | 43 ----------------
 addons/account/i18n/account.pot             |  4 --
 addons/account/i18n/ar.po                   |  4 --
 addons/account/i18n/bg.po                   |  5 --
 addons/account/i18n/bs.po                   |  5 --
 addons/account/i18n/ca.po                   |  5 --
 addons/account/i18n/cs.po                   |  5 --
 addons/account/i18n/da.po                   |  5 --
 addons/account/i18n/de.po                   |  5 --
 addons/account/i18n/el.po                   |  5 --
 addons/account/i18n/es.po                   |  5 --
 addons/account/i18n/es_AR.po                |  5 --
 addons/account/i18n/es_EC.po                |  5 --
 addons/account/i18n/et.po                   |  5 --
 addons/account/i18n/fa.po                   |  5 --
 addons/account/i18n/fi.po                   |  5 --
 addons/account/i18n/fr.po                   |  5 --
 addons/account/i18n/gl.po                   |  4 --
 addons/account/i18n/gu.po                   |  5 --
 addons/account/i18n/hr.po                   |  5 --
 addons/account/i18n/hu.po                   |  5 --
 addons/account/i18n/id.po                   |  5 --
 addons/account/i18n/it.po                   |  5 --
 addons/account/i18n/kab.po                  |  5 +-
 addons/account/i18n/ko.po                   |  5 --
 addons/account/i18n/lt.po                   |  5 --
 addons/account/i18n/lv.po                   |  5 --
 addons/account/i18n/mn.po                   |  5 --
 addons/account/i18n/nb.po                   |  5 --
 addons/account/i18n/nl.po                   |  5 --
 addons/account/i18n/nl_BE.po                |  5 --
 addons/account/i18n/oc.po                   |  4 --
 addons/account/i18n/pl.po                   |  5 --
 addons/account/i18n/pt.po                   |  5 --
 addons/account/i18n/pt_BR.po                |  5 --
 addons/account/i18n/ro.po                   |  5 --
 addons/account/i18n/ru.po                   |  5 --
 addons/account/i18n/si.po                   |  5 --
 addons/account/i18n/sk.po                   |  5 --
 addons/account/i18n/sl.po                   |  5 --
 addons/account/i18n/sq.po                   |  5 --
 addons/account/i18n/sr.po                   |  5 --
 addons/account/i18n/sv.po                   |  5 --
 addons/account/i18n/te.po                   |  5 --
 addons/account/i18n/th.po                   |  5 --
 addons/account/i18n/tlh.po                  |  5 --
 addons/account/i18n/tr.po                   |  5 --
 addons/account/i18n/uk.po                   |  5 --
 addons/account/i18n/vi.po                   |  5 --
 addons/account/i18n/zh_CN.po                |  5 --
 addons/account/i18n/zh_HK.po                |  5 --
 addons/account/i18n/zh_TW.po                |  5 --
 addons/account/installer.py                 | 57 ++++++++++++++++++---
 addons/account/security/ir.model.access.csv |  2 -
 addons/base_setup/base_setup_todo.xml       |  2 +-
 addons/base_setup/todo.py                   |  6 +--
 58 files changed, 77 insertions(+), 359 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 74531102073..6a96fba8e16 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1763,52 +1763,6 @@ class account_subscription_line(osv.osv):
     _rec_name = 'date'
 account_subscription_line()
 
-
-class account_config_wizard(osv.osv_memory):
-    _name = 'account.config.wizard'
-    _inherit = 'res.config'
-
-    _columns = {
-        'name':fields.char(
-            'Name', required=True, size=64,
-            help="Name of the fiscal year as displayed on screens."),
-        'code':fields.char(
-            'Code', required=True, size=64,
-            help="Name of the fiscal year as displayed in reports."),
-        'date1': fields.date('Start Date', required=True),
-        'date2': fields.date('End Date', required=True),
-        'period':fields.selection([('month','Month'), ('3months','3 Months')],
-                                  'Periods', required=True),
-    }
-    _defaults = {
-        'code': lambda *a: time.strftime('%Y'),
-        'name': lambda *a: time.strftime('%Y'),
-        'date1': lambda *a: time.strftime('%Y-01-01'),
-        'date2': lambda *a: time.strftime('%Y-12-31'),
-        'period':lambda *a:'month',
-    }
-
-    def execute(self, cr, uid, ids, context=None):
-        for res in self.read(cr,uid,ids):
-            if 'date1' in res and 'date2' in res:
-                res_obj = self.pool.get('account.fiscalyear')
-                start_date=res['date1']
-                end_date=res['date2']
-                name=res['name']#DateTime.strptime(start_date, '%Y-%m-%d').strftime('%m.%Y') + '-' + DateTime.strptime(end_date, '%Y-%m-%d').strftime('%m.%Y')
-                vals={
-                    'name':name,
-                    'code':name,
-                    'date_start':start_date,
-                    'date_stop':end_date,
-                }
-                new_id=res_obj.create(cr, uid, vals, context=context)
-                if res['period']=='month':
-                    res_obj.create_period(cr,uid,[new_id])
-                elif res['period']=='3months':
-                    res_obj.create_period3(cr,uid,[new_id])
-account_config_wizard()
-
-
 #  ---------------------------------------------------------------
 #   Account Templates : Account, Tax, Tax Code and chart. + Wizard
 #  ---------------------------------------------------------------
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 4c9742fd127..3cd0495904e 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -18,16 +18,35 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications</attribute>
+            <attribute name="width">150</attribute>
           </xpath>
-
-          <group colspan="8">
-            <separator string="Accounting" colspan="4"/>
-            <field name="charts"/>
-            <field name="account_analytic_default"/>
+		  <xpath expr="//button[@string='Install Modules']" position="attributes">
+                <attribute name="string">Configure</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+              <attribute name='rowspan'>20</attribute>
+              <attribute name='string'></attribute>
+	      </xpath>
+	      <group colspan="8">
+            <field name="charts" colspan="8"/>
             <field name="account_analytic_plans"/>
             <field name="account_payment"/>
             <field name="account_followup"/>
             <field name="account_asset"/>
+             <group colspan="4" attrs="{'invisible':[('charts','=',False)]}">
+            	<separator col="4" colspan="4" string="Bank and Cost Account"/>
+                <field name="account_name" colspan="2"/>
+                <field name="account_type" colspan="2"/>
+                <field name="account_currency" colspan="2" widget="selection"/>
+            </group>
+            <group colspan="4">
+            	<separator col="4" colspan="4" string="Fiscal Year"/>
+                <field name="name"/>
+                <field name="code"/>
+                <field name="date_start" on_change="on_change_start_date(date_start)"/>
+                <field name="date_stop"/>
+                <field name="period" colspan="4"/>
+            </group>
           </group>
         </data>
       </field>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 9ace27294fa..b72c01f9cf7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1445,49 +1445,6 @@
 
         <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All account entries" res_model="account.move.line" src_model="res.partner"/>
 
-
-
-        <!-- configuration wizard view -->
-
-        <record id="view_account_config_wizard_form" model="ir.ui.view">
-            <field name="name">Account Configure wizard</field>
-            <field name="model">account.config.wizard</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.res_config_view_base"/>
-            <field name="arch" type="xml">
-              <data>
-                <form position="attributes">
-                  <attribute name="string">Account Configure</attribute>
-                </form>
-                <group string="res_config_contents" position="replace">
-                    <separator col="4" colspan="4" string="Create a Fiscal Year"/>
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="date1"/>
-                    <field name="date2"/>
-                    <field name="period" colspan="4"/>
-                </group>
-                <xpath expr='//button[@name="action_skip"]' position="replace"/>
-              </data>
-            </field>
-        </record>
-
-        <record id="action_account_config_wizard_form" model="ir.actions.act_window">
-            <field name="name">Account Configure Wizard </field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.config.wizard</field>
-            <field name="view_id" ref="view_account_config_wizard_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <!-- register configuration wizard -->
-        <record id="config_fiscalyear" model="ir.actions.todo">
-            <field name="action_id" ref="action_account_config_wizard_form"/>
-            <field name="restart">onskip</field>
-        </record>
-
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>
             <field name="model">account.addtmpl.wizard</field>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index a777acb9c5c..ef00056ee8e 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -785,10 +785,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index f69b3246eff..e838f3bce27 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -805,10 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 91dfbca2279..56befb5c212 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -819,11 +819,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index d1da22ef906..36cd444b21d 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -816,11 +816,6 @@ msgstr "(Ostaviti prazno za sve otvorene fiskalne godine)"
 msgid "Move Lines"
 msgstr "Retci prijenosa"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 9f2c82ec366..6a5f47dfb24 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -829,11 +829,6 @@ msgstr "(deixar-lo buit per a tots els exercicis fiscals oberts)"
 msgid "Move Lines"
 msgstr "Línies moviment"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.assistent"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 8d393298e01..be9a9612f42 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -809,11 +809,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index 55cb096e90e..e27b080077d 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -811,11 +811,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index e978a71d610..4f9893960bf 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -827,11 +827,6 @@ msgstr "(frei lassen für alle Wirtschaftsjahre)"
 msgid "Move Lines"
 msgstr "Buchungszeilen"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index f2e5ed77ea6..af0ca7265c3 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -829,11 +829,6 @@ msgstr "(Διατηρήστε κενό για όλα τα ανοιχτά λογ
 msgid "Move Lines"
 msgstr "Μετακίνηση Γραμμών"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 0a2b2c626d6..21becbd9c99 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -828,11 +828,6 @@ msgstr "(dejarlo vacío para todos los ejercicios fiscales abiertos)"
 msgid "Move Lines"
 msgstr "Líneas movimiento"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.asistente"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index f578cbc7493..cbdf13eb4b0 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -827,11 +827,6 @@ msgstr "(dejar vacío para todos los ejercicios fiscales abiertos)"
 msgid "Move Lines"
 msgstr "Líneas del movimiento"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "asistente.configuracion.contable"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 0f0f933abdb..bed04b5b069 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -826,11 +826,6 @@ msgstr "(dejarlo vacío para todos los ejercicios fiscales abiertos)"
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index fbe197f9df7..6ecd769ea63 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -807,11 +807,6 @@ msgstr "(Jäta tühjaks kõigi avatud majandusaastate jaoks)"
 msgid "Move Lines"
 msgstr "Liiguta read"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 95af7a94323..3dace56df79 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index b5274399fea..1f1de60a69e 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -826,11 +826,6 @@ msgstr "(Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia)"
 msgid "Move Lines"
 msgstr "Siirron rivit"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index ffb5f882d9b..1785d79bf38 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -1240,11 +1240,6 @@ msgstr "Livre de coûts"
 msgid "Move Lines"
 msgstr "Lignes de mouvements"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 65856053bdd..6bcd627b0bf 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -806,10 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 3a997d3000f..ecd36932d38 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index e6b360683ea..e01b198f2d5 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index c8349d8f0c5..8f70c2fd083 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 1d999f12888..c7c2f143c8b 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 79335be4e75..6007a539d21 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -826,11 +826,6 @@ msgstr "(Lasciare vuoto per tutti gli esercizi fiscali aperti)"
 msgid "Move Lines"
 msgstr "Righe Movimentate"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 67801be10cf..383cf564a8b 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -806,10 +806,7 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
+
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index e97724467c6..4391aa7bb08 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 0adf15c8787..4558f305972 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -809,11 +809,6 @@ msgstr "(palikite tuščią, jei norite visų atvirų fiskalinių metų)"
 msgid "Move Lines"
 msgstr "Didžiosios knygos įrašai"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index e17722af03f..67a585f4a57 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -818,11 +818,6 @@ msgstr "(Atstāt tukšu visiem nenoslēgtajiem fiskālajiem gadiem)"
 msgid "Move Lines"
 msgstr "Grāmatojumu Rindas"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 11bab9eed81..52512785a61 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index e27d8cc9677..1041a90be21 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index ea10f588dc6..ac1f183a5fa 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -827,11 +827,6 @@ msgstr "(laat leeg om alle boekjaren mee te nemen)"
 msgid "Move Lines"
 msgstr "Verplaats boekingsregels"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index c9fda154dab..f298c31854d 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index a322bf511b0..53532fba0ac 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -808,10 +808,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 12e8c9efdf8..354d3ebaa83 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -825,11 +825,6 @@ msgstr "(Pozostaw puste dla wszystkich otwartych lat podatkowych)"
 msgid "Move Lines"
 msgstr "Pozycje zapisów"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 2f23e7ccc7e..1f006f5ba61 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -823,11 +823,6 @@ msgstr "(Manter vazio para todos os anos fiscais aberto)"
 msgid "Move Lines"
 msgstr "Linhas de movimentos"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index deb3ee9afb8..95117f2d96e 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -826,11 +826,6 @@ msgstr "(Manter vazio para todos os anos fiscais abertos)"
 msgid "Move Lines"
 msgstr "Mover Linhas"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 30c07e9f381..d70c8ee4c69 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -827,11 +827,6 @@ msgstr "(Lasaţi necompletat pentru toţi anii fiscali deschişi)"
 msgid "Move Lines"
 msgstr "Linii mişcări"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 9e34bba0b59..7c0acebc4bc 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -820,11 +820,6 @@ msgstr "Оставить пустым для всех открытых фина
 msgid "Move Lines"
 msgstr "Строки финансового документа"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "Мастер конфигурации"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index b717c4bfcec..e7d7718f9e6 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 7d8c17aee9a..cbe99fcfee3 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -809,11 +809,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index ae98b095426..6eb777a8261 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -818,11 +818,6 @@ msgstr "(Prazno za vsa odprta davčna leta)"
 msgid "Move Lines"
 msgstr "Postavke knjižb"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index de0b5913aa6..e82be2f3bc9 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -828,11 +828,6 @@ msgstr "(Mbaje zbrazët për të gjitha vitet fiskale)"
 msgid "Move Lines"
 msgstr "Lëviz Linjat"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 99cda7934ad..c2a3d8276ae 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -809,11 +809,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 5959bd7abbe..085cc58caba 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -815,11 +815,6 @@ msgstr "(tomt för alla öppna verksamhetsår)"
 msgid "Move Lines"
 msgstr "Flytta rader"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "account.config.wizard"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 53daa3531e5..eaa42f35d86 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 3c3e7026dea..320fdc82290 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index dbda43952e8..41390d44aac 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 6f445a81528..a203f350368 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr "Hareket Kalemleri"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index fb52db34f13..02020dd4cb8 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index b83ea120c76..6e5a40ad057 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -817,11 +817,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index f904e3f8d45..5dfad6b78e0 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -808,11 +808,6 @@ msgstr "(留空为所有开启的会计年度)"
 msgid "Move Lines"
 msgstr "凭证明细"
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr "科目.设置.向导"
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index fa207ddcf49..7ca8d6548e9 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -806,11 +806,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index 0b8bfac659b..c73c4d65323 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -805,11 +805,6 @@ msgstr ""
 msgid "Move Lines"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_config_wizard
-msgid "account.config.wizard"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 35a09406891..31618122af8 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -18,8 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from operator import itemgetter
+import time
+import datetime
+from dateutil.relativedelta import relativedelta
 
+from operator import itemgetter
 from osv import fields, osv
 import netsvc
 
@@ -30,10 +33,12 @@ class account_installer(osv.osv_memory):
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
         ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
-        return list(
+        charts = list(
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids)),
                    key=itemgetter(1)))
+        charts.insert(0,('',''))
+        return charts
 
     _columns = {
         # Accounting
@@ -42,9 +47,6 @@ class account_installer(osv.osv_memory):
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "
                  "country."),
-        'account_analytic_default':fields.boolean('Analytic Accounting',
-            help="Automatically selects analytic accounts based on various "
-                 "criteria."),
         'account_analytic_plans':fields.boolean('Multiple Analytic Plans',
             help="Allows invoice lines to impact multiple analytic accounts "
                  "simultaneously."),
@@ -57,16 +59,55 @@ class account_installer(osv.osv_memory):
                  "per-partner policies."),
         'account_asset':fields.boolean('Assets Management',
             help="Enables asset management in the accounting application, "
-                 "including asset categories and usage periods.")
+                 "including asset categories and usage periods."),
+        'name':fields.char('Name', required=True, size=64,
+            help="Name of the fiscal year as displayed on screens."),
+        'code':fields.char('Code', required=True, size=64,
+            help="Name of the fiscal year as displayed in reports."),
+        'date_start': fields.date('Start Date', required=True),
+        'date_stop': fields.date('End Date', required=True),
+        'period':fields.selection([('month','Month'), ('3months','3 Months')],
+                                  'Periods', required=True),
+        'account_name':fields.char('Name', size=128),
+        'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
+        'account_currency':fields.many2one('res.currency', 'Currency')
         }
     _defaults = {
-        'account_analytic_default':True,
+        'code': lambda *a: time.strftime('%Y'),
+        'name': lambda *a: time.strftime('%Y'),
+        'date_start': lambda *a: time.strftime('%Y-01-01'),
+        'date_stop': lambda *a: time.strftime('%Y-12-31'),
+        'period':lambda *a:'month',
+        'account_currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
         }
 
+    def on_change_start_date(self, cr, uid, id, start_date):
+        if start_date:
+            start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")
+            end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1)
+            return {'value':{'date_stop':end_date.strftime('%Y-%m-%d')}}
+        return {}
+
+    def execute(self, cr, uid, ids, context=None):
+        super(account_installer, self).execute(cr, uid, ids, context=context)
+        for res in self.read(cr,uid,ids):
+            if 'date1' in res and 'date2' in res:
+                res_obj = self.pool.get('account.fiscalyear')
+                name = res['name']
+                vals = {'name':res['name'],
+                        'code':res['code'],
+                        'date_start':res['date_start'],
+                        'date_stop':res['date_stop'],
+                       }
+                period_id = res_obj.create(cr, uid, vals, context=context)
+                if res['period'] == 'month':
+                    res_obj.create_period(cr, uid, [period_id])
+                elif res['period'] == '3months':
+                    res_obj.create_period3(cr, uid, [period_id])
+
     def modules_to_install(self, cr, uid, ids, context=None):
         modules = super(account_installer, self).modules_to_install(
             cr, uid, ids, context=context)
-
         chart = self.read(cr, uid, ids, ['charts'],
                           context=context)[0]['charts']
         self.logger.notifyChannel(
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 656e05e2a9b..e1aa3b6510a 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -65,8 +65,6 @@
 "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
-"access_account_config_wizard_account_manager","account.config.wizard account manager","model_account_config_wizard","group_account_manager",1,1,1,1
-"access_account_config_wizard_system_manager","account.config.wizard system manager","model_account_config_wizard","base.group_system",1,1,1,1
 "access_account_add_tmpl_wizard_account_manager","account.addtmpl.wizard account manager","model_account_addtmpl_wizard","group_account_manager",1,1,1,1
 "access_account_add_tmpl_wizard_system_manager","account.addtmpl.wizard system manager","model_account_addtmpl_wizard","base.group_system",1,1,1,1
 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 2a7699bf1ea..3ccba59fca0 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -34,7 +34,7 @@
 		            <field name="state_id"/>
 		            <field name="email"/>
 		            <field name="phone"/>
-		            <field name="currency"/>
+		            <field name="currency" widget="selection"/>
 
 		            <separator string="Report Information" colspan="4"/>
 		            <field name="rml_header1" colspan="4"/>
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index d23ac71d60b..811d6f21bf5 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -48,8 +48,6 @@ class base_setup_company(osv.osv_memory):
             cr, uid, 'res.country.state', context=context)
     def _get_all_countries(self, cr, uid, context=None):
         return self._get_all(cr, uid, 'res.country', context=context)
-    def _get_all_currencies(self, cr, uid, context=None):
-        return self._get_all(cr, uid, 'res.currency', context=context)
 
     def default_get(self, cr, uid, fields_list=None, context=None):
         """ get default company if any, and the various other fields
@@ -90,7 +88,7 @@ class base_setup_company(osv.osv_memory):
         'country_id':fields.selection(_get_all_countries, 'Countries'),
         'email':fields.char('E-mail', size=64),
         'phone':fields.char('Phone', size=64),
-        'currency':fields.selection(_get_all_currencies, 'Currency', required=True),
+        'currency':fields.many2one('res.currency', 'Currency', required=True),
         'rml_header1':fields.char('Report Header', size=200,
             help='''This sentence will appear at the top right corner of your reports.
 We suggest you to put a slogan here:
@@ -112,7 +110,6 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
         if not getattr(payload, 'company_id', None):
             raise ValueError('Case where no default main company is setup '
                              'not handled yet')
-
         company = payload.company_id
         company.write({
             'name':payload.name,
@@ -120,6 +117,7 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
             'rml_footer1':payload.rml_footer1,
             'rml_footer2':payload.rml_footer2,
             'logo':payload.logo,
+            'currency_id':payload.currency.id,
         })
 
         company.partner_id.write({

From 10539da3b281c6d64cf1bf87157958f40869af3e Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 11:52:31 +0530
Subject: [PATCH 028/146] [IMP]:generate chart of account

bzr revid: nch@tinyerp.com-20100430062231-b17mlpwi0xpfejmy
---
 addons/account/account.py       |  1 +
 addons/account/account_view.xml | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 6a96fba8e16..c965d2cd0e5 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2117,6 +2117,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id,
         'chart_template_id': _get_chart,
         'code_digits': lambda *a:6,
+        'seq_journal': True
     }
 
     def execute(self, cr, uid, ids, context=None):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b72c01f9cf7..515049bba15 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1698,11 +1698,19 @@
                 <form position="attributes">
                   <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
                 </form>
+                <separator string="title" position="attributes">
+            	<attribute name="string"
+                       >Generate Chart of Accounts from a Chart Template</attribute>
+          		</separator>
+          		<xpath expr="//label[@string='description']" position="attributes">
+            		<attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
+            		<attribute name="width">150</attribute>
+          		</xpath>
+          		<xpath expr='//separator[@string="vsep"]' position='attributes'>
+              			<attribute name='rowspan'>15</attribute>
+              			<attribute name='string'></attribute>
+	      		</xpath>
                 <group string="res_config_contents" position="replace">
-                  <separator col="4" colspan="4" string="
-                    Generate Chart of Accounts from a Chart Template"/>
-                  <label align="0.0" colspan="4"
-                         string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"/>
                   <field name="company_id"  widget="selection"
                          groups="base.group_multi_company"/>
                   <field name ="code_digits" />

From bc51393019762fdf42ebac1fc27c071c67ccc756 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 12:23:45 +0530
Subject: [PATCH 029/146] [IMP]:mrp config wizard

bzr revid: nch@tinyerp.com-20100430065345-ds8tw73la2h2a92l
---
 addons/base_setup/installer.py | 9 +++++++++
 addons/mrp/mrp_installer.xml   | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 4b903f4e454..d544a5dc091 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -94,5 +94,14 @@ class base_setup_installer(osv.osv_memory):
     _defaults = {
         'crm': True,
         }
+
+    def modules_to_install(self, cr, uid, ids, context=None):
+        modules = super(base_setup_installer, self).modules_to_install(cr, uid, ids, context=context)
+        interface_id = self.pool.get('res.config.view').search(cr, uid, [])
+        interface = self.pool.get('res.config.view').read(cr, uid, interface_id)[0]
+        modules_selected = self.read(cr, uid, ids)[0]
+        if interface.get('view', '') == 'simple' and modules_selected.get('mrp',False):
+            return modules | set(['mrp_jit'])
+        return modules
 base_setup_installer()
 
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 3c8b62283c0..d36093c8dfb 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -12,14 +12,17 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Manufacturing</attribute>
+            <attribute name="string">Manufacturing Resource Planning</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">After having installed the core manufacturing application, you can extend it with a few more depending on the needs of your organization</attribute>
           </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+      			<attribute name='rowspan'>8</attribute>
+      			<attribute name='string'></attribute>
+  		  </xpath>
           <group colspan="8">
-            <separator string="Manufacturing Resource Planning" colspan="4"/>
             <field name="stock_location"/>
             <field name="mrp_jit"/>
             <field name="mrp_operations"/>

From abc477bb44c09e4a4fb9d04b546d417d36e22cd8 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 14:41:25 +0530
Subject: [PATCH 030/146] [IMP]:sale config wizard

bzr revid: nch@tinyerp.com-20100430091125-5lp9wbm9j03ws5fm
---
 addons/sale/sale_view.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0831e72712b..15f8a6fefd3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -502,12 +502,19 @@
                 <form position="attributes">
                   <attribute name="string">Sales Configuration</attribute>
                 </form>
+                <separator string="title" position="attributes">
+            	<attribute name="string"
+                       >Configure Sale Order Logistic</attribute>
+          		</separator>
+          		<xpath expr="//label[@string='description']" position="attributes">
+            		<attribute name="string">Setup your sales workflow and default values.</attribute>
+            		<attribute name="width">100</attribute>
+          		</xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+          			<attribute name='rowspan'>6</attribute>
+          			<attribute name='string'></attribute>
+	      		</xpath>
                 <group string="res_config_contents" position="replace">
-                  <label colspan="4" align="0.0"
-                         string="Setup your sales workflow and default values."/>
-                  <separator colspan="4"
-                       string="Configure Sale Order Logistic"/>
-                  <newline/>
                   <field name="picking_policy" groups="base.group_extended"/>
                   <newline/>
                   <field name="order_policy"/>

From 4042007977caedc8251a54fac1b990fcfbf35628 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 14:59:45 +0530
Subject: [PATCH 031/146] [IMP]:knowledge mgmt ,document ftp config wizard

bzr revid: nch@tinyerp.com-20100430092945-yuryfs3vhzsr3rlc
---
 addons/base_setup/installer.py            | 10 +++++++---
 addons/document_ftp/document_ftp_view.xml | 13 ++++++++++---
 addons/knowledge/knowledge_installer.xml  | 11 +++++++++--
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index d544a5dc091..1fb4a971107 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -100,8 +100,12 @@ class base_setup_installer(osv.osv_memory):
         interface_id = self.pool.get('res.config.view').search(cr, uid, [])
         interface = self.pool.get('res.config.view').read(cr, uid, interface_id)[0]
         modules_selected = self.read(cr, uid, ids)[0]
-        if interface.get('view', '') == 'simple' and modules_selected.get('mrp',False):
-            return modules | set(['mrp_jit'])
-        return modules
+        added_modules = []
+        if interface.get('view', '') == 'simple' :
+            if modules_selected.get('mrp', False):
+                added_modules.append('mrp_jit')
+            if modules_selected.get('knowledge', False):
+                added_modules.append('document_ftp')
+        return modules | set(added_modules)
 base_setup_installer()
 
diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index bd7571002fe..1ea96bab73a 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -24,10 +24,17 @@
             <form position="attributes">
               <attribute name="string">Auto Configure</attribute>
             </form>
+             <separator string="title" position="attributes">
+            	<attribute name="string">FTP Server Configuration</attribute>
+          	</separator>
+          	<xpath expr="//label[@string='description']" position="attributes">
+            <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+  				<attribute name='rowspan'>6</attribute>
+      			<attribute name='string'></attribute>
+	      	</xpath>
             <group string="res_config_contents" position="replace">
-                <separator string="FTP Server Configuration." colspan="4"/>
-                <label align="0.0" colspan="4"
-                       string="Choose the address for the Document Management System's FTP server."/>
                 <field name="host"/>
             </group>
             <xpath expr="//button[@name='action_skip']" position="replace"/>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index cd991ac3459..a3c9437dae1 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -13,14 +13,17 @@
 
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Configure Your Knowledge Management System</attribute>
+                       >Knowledge Management</attribute>
           </separator>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+      				<attribute name='rowspan'>9</attribute>
+          			<attribute name='string'></attribute>
+	      		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">From this screen, you can select various OpenERP applications which will help employees store information, distribute it and share it with one another.</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Knowledge Management" colspan="4"/>
             <field name="document_ftp"/>
             <field name="document_webdav"/>
             <field name="wiki"/>
@@ -28,6 +31,9 @@
             <field name="wiki_faq"/>
             <field name="wiki_quality_manual"/>
           </group>
+         <xpath expr="//button[@string='Install Modules']" position="attributes">
+          	<attribute name="string">Configure</attribute>
+         </xpath>
         </data>
       </field>
     </record>
@@ -45,6 +51,7 @@
     <record id="knowledge_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_knowledge_installer"/>
       <field name="sequence">3</field>
+      <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
   </data>
 </openerp>

From 565250b15036dd7d38d858eb58a833d8f70733f0 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 15:05:45 +0530
Subject: [PATCH 032/146] [IMP]:hr_installer and typo in installer

bzr revid: nch@tinyerp.com-20100430093545-50ejb9o47qlraw45
---
 addons/base_setup/base_setup_installer.xml | 2 +-
 addons/hr/hr_installer.xml                 | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e9d177c77e4..f1c3f0c0b3d 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -32,7 +32,7 @@ If you don't think you need any of these right now, you can easily install them
             <field name="hr"/> <field name="point_of_sale" groups="base.group_extended"/>
             <field name="marketing" groups="base.group_extended"/> <field name="misc_tools"/>
             <field name="report_designer" groups="base.group_extended"/>
-            <separator string="Install Specific Businesses Modules" colspan="4"/>
+            <separator string="Install Specific Business Modules" colspan="4"/>
             <field name="profile_association"/>
             <field name="profile_training"/>
             <field name="profile_auction"/>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 4bbafbf9077..07600ae204a 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -12,14 +12,17 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Configure Human Resources"</attribute>
+            <attribute name="string">Select Human Resources Modules To Install</attribute>
           </separator>
+           <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>8</attribute>
+	          	  <attribute name='string'></attribute>
+	      		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Select Human Resources Modules To Install" colspan="4"/>
             <field name="hr_holidays"/>
             <field name="hr_expense"/>
             <field name="hr_recruitment"/>

From b86c436e97075dd6cdb01d305c5145826368d432 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 15:10:31 +0530
Subject: [PATCH 033/146] [IMP]:profile_tools installer

bzr revid: nch@tinyerp.com-20100430094031-1q8hy0izeq9kbcf5
---
 addons/profile_tools/misc_tools_installer.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 6f4a7aa9e9e..307b5b90a8c 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -10,9 +10,13 @@
           <form position="attributes">
             <attribute name="string">Tools Modules Installation</attribute>
           </form>
+	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
+          	  <attribute name='rowspan'>10</attribute>
+          	  <attribute name='string'></attribute>
+          </xpath>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Select Tools To Install</attribute>
+            <attribute name="string">Tools</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -20,7 +24,6 @@
                        >Here are a few useful applications which, while they don't directly contribute to your business, can improve on it or improve your OpenERP experience</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Tools" colspan="4"/>
             <field name="lunch"/>
             <field name="subscription"/>
             <field name="survey"/>

From e6768813860a3a62dcc44c1f66bebf698cd7c4fd Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 30 Apr 2010 11:42:24 +0200
Subject: [PATCH 034/146] [FIX] base: the search for the res.country.state is
 not case sensitive

bzr revid: stephane@openerp.com-20100430094224-59w78o78347j2hf2
---
 bin/addons/base/res/country.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/country.py b/bin/addons/base/res/country.py
index 272b0257a49..99e12a96f78 100644
--- a/bin/addons/base/res/country.py
+++ b/bin/addons/base/res/country.py
@@ -86,7 +86,7 @@ class CountryState(osv.osv):
             args = []
         if not context:
             context = {}
-        ids = self.search(cr, user, [('code', '=', name)] + args, limit=limit,
+        ids = self.search(cr, user, [('code', 'ilike', name)] + args, limit=limit,
                 context=context)
         if not ids:
             ids = self.search(cr, user, [('name', operator, name)] + args,

From 5a5a73b84da04292933de8280a4e221c6a3028d4 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 15:20:20 +0530
Subject: [PATCH 035/146] association

bzr revid: nch@tinyerp.com-20100430095020-mgndtilsqsa5wm1o
---
 addons/association/profile_association.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 0f376ea4069..827cdb42d18 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -11,6 +11,9 @@
                 <form position="attributes">
                   <attribute name="string">Install Extra Modules</attribute>
                 </form>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='string'></attribute>
+	      		</xpath>
                 <xpath expr="//label[@string='description']"
                        position="attributes">
                   <attribute name="string">Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute>

From 5ade556cc694b101e258e80bc75540a33e54696d Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 15:28:30 +0530
Subject: [PATCH 036/146] [IMP]:profile_manufacturing

bzr revid: nch@tinyerp.com-20100430095830-jhh9gydfkky4jl3d
---
 addons/profile_manufacturing/profile_manufacturing.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index ae659245907..df8c56c77cb 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -11,15 +11,18 @@
                 <form position="attributes">
                   <attribute name="string">Manufacturing Profile: Install Extra Modules</attribute>
                 </form>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  	<attribute name='rowspan'>15</attribute>
+			  		<attribute name='string'></attribute>
+			  	</xpath>
                 <xpath expr="//label[@string='description']"
                        position="attributes">
                   <attribute name="string">Here are a few modules which might be useful along with the rest of the Manufacturing profile. You can also install them the normal way later on, but if you think you'll need them to fit your requirements, you can select them now and they'll be installed immediately.</attribute>
                 </xpath>
                 <separator string="title" position="attributes">
-                  <attribute name="string">Manufacturing Modules</attribute>
+                  <attribute name="string">Stock &amp; Manufacturing</attribute>
                 </separator>
                 <group colspan="8">
-                  <separator string="Stock &amp; Manufacturing" colspan="4"/>
                   <field name="stock_location"/>
                   <field name="mrp_jit"/>
                   <field name="mrp_operation"/>

From 1d9d6af4c4c47f706ad6c1b51bf7cec063d1e693 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Apr 2010 15:28:32 +0530
Subject: [PATCH 037/146] [IMP]: base_action_rule: Added ir.filter in action
 rule

bzr revid: rpa@tinyerp.com-20100430095832-j4oonfeduhbxoe1u
---
 addons/base_action_rule/base_action_rule.py       | 5 ++---
 addons/base_action_rule/base_action_rule_view.xml | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 6eb45172dbc..5d36f49a06e 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -128,9 +128,8 @@ class base_action_rule(osv.osv):
                                 of the persons whom mail is to be sent"),
         'act_mail_body': fields.text('Mail body',help="Content of mail"),
         'regex_name': fields.char('Regular Expression on Model Name', size=128),
-        'server_action_id': fields.many2one('ir.actions.server','Server Action',help="Describes the\
-                                 action name." \
-                                "eg:on which object which action to be taken on basis of which condition"),
+        'server_action_id': fields.many2one('ir.actions.server','Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"),
+        'filter_id':fields.many2one('ir.filters', 'Filter', required=False),
     }
 
     _defaults = {
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 72cf3e5a9fb..9d659a72a87 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -66,6 +66,7 @@
                             <field colspan="4" name="act_email_cc"/>
                             <separator colspan="4" string="Server Action to be Triggered"/>
                             <field name="server_action_id"/>
+                            <field name="filter_id"/>
                         </page>
                         <page string="E-Mail Actions">
                             <separator colspan="4" string="Template of Email to Send"/>

From 03f9187999f74090dd35a9985bebc955ce1faea0 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 15:32:30 +0530
Subject: [PATCH 038/146] [IMP]:project config wizard

bzr revid: nch@tinyerp.com-20100430100230-a3nfrzir53yg6xa1
---
 addons/project/project_installer.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 3b6eb103972..d8a503e00fa 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -13,14 +13,17 @@
 
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Configure Your Project Management</attribute>
+                       >Project Management</attribute>
           </separator>
+           <xpath expr='//separator[@string="vsep"]' position='attributes'>
+          	  <attribute name='rowspan'>10</attribute>
+          	  <attribute name='string'></attribute>
+     		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Project Management" colspan="4"/>
             <field name="project_crm"/>
             <field name="project_long_term" groups="base.group_extended"/>
             <field name="project_wiki"/>

From 6f264bdd33d2da9f34f5223cbaf79a6c327a2cd5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Apr 2010 15:32:40 +0530
Subject: [PATCH 039/146] [IMP]: base_calendar: Added a function that attachs
 .ics file in event envitation mail

bzr revid: rpa@tinyerp.com-20100430100240-9f0228bj3pms215j
---
 addons/base_calendar/base_calendar.py | 66 +++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index f4de02f7025..126d6621d40 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
 from dateutil import parser
 from dateutil import rrule
 from osv import fields, osv
@@ -36,7 +36,7 @@ months = {
     10: "October", 11: "November", 12: "December"
 }
 
-def get_recurrent_dates(rrulestring, exdate, startdate=None):
+def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=""):
     """
     Get recurrent dates based on Rule string considering exdate and start date
     @param rrulestring: Rulestring
@@ -426,6 +426,64 @@ property or property parameter."),
                 self.write(cr, uid, ids, {'state': status})
         return True
 
+    def get_ics_file(self, cr, uid, event_obj, context=None):
+        """
+        Returns iCalendar file for the event invitation
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param event_obj: Event object (browse record)
+        @param context: A standard dictionary for contextual values
+        @return: .ics file content
+        """
+        res = None
+        def ics_datetime(idate, short=False):
+            if short:
+                return date.fromtimestamp(time.mktime(time.strptime(idate, '%Y-%m-%d')))
+            else:
+                return datetime.strptime(idate, '%Y-%m-%d %H:%M:%S')
+        try:
+            import vobject
+        except ImportError:
+            return res
+        cal = vobject.iCalendar()
+        event = cal.add('vevent')
+        event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S'))
+        event.add('dtstart').value = ics_datetime(event_obj.date)
+        event.add('dtend').value = ics_datetime(event_obj.date_deadline)
+        event.add('summary').value = event_obj.name
+        if  event_obj.description:
+            event.add('description').value = event_obj.description
+        if event_obj.location:
+            event.add('location').value = event_obj.location
+        if event_obj.rrule:
+            event.add('rrule').value = event_obj.rrule
+        if event_obj.alarm_id:
+            valarm = event.add('valarm')
+            alarm_object = self.pool.get('res.alarm')
+            alarm_data = alarm_object.read(cr, uid, event_obj.alarm_id.id, context=context)
+            print 'aaaaaaaaaaaaaaaaa', alarm_data, event_obj.alarm_id.id
+            # Compute trigger data
+            interval = alarm_data['trigger_interval']
+            occurs = alarm_data['trigger_occurs']
+            duration = (occurs == 'after' and alarm_data['trigger_duration']) \
+                                            or -(alarm_data['trigger_duration'])
+            related = alarm_data['trigger_related']
+            trigger = valarm.add('TRIGGER')
+            trigger.params['related'] = [related.upper()]
+            if interval == 'days':
+                delta = timedelta(days=duration)
+            if interval == 'hours':
+                delta = timedelta(hours=duration)
+            if interval == 'minutes':
+                delta = timedelta(minutes=duration)
+            trigger.value = delta
+    
+            # Compute other details
+            valarm.add('DESCRIPTION').value = alarm_data['name'] or 'OpenERP'
+        res = cal.serialize()
+        return res
+    
     def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
         """
         Send mail for calendar attendee.
@@ -443,7 +501,7 @@ property or property parameter."),
             res_obj = att.ref
             sub = '[%s Invitation][%d] %s' % (company, att.id, res_obj.name)
             att_infos = []
-            other_invitaion_ids = self.search(cr, uid, [('ref', '=', att.ref._name + ',' + str(att.ref.id))])
+            other_invitaion_ids = self.search(cr, uid, [('ref', '=', res_obj._name + ',' + str(res_obj.id))])
             for att2 in self.browse(cr, uid, other_invitaion_ids):
                 att_infos.append(((att2.user_id and att2.user_id.name) or \
                              (att2.partner_id and att2.partner_id.name) or \
@@ -459,12 +517,14 @@ property or property parameter."),
                         'company': company
             }
             body = html_invitation % body_vals
+            attach = self.get_ics_file(cr, uid, res_obj, context=context)
             if mail_to and email_from:
                 tools.email_send(
                     email_from,
                     mail_to,
                     sub,
                     body,
+                    attach=attach and [('invitation.ics', attach)] or None,
                     subtype='html',
                     reply_to=email_from
                 )

From eb4192f6b0f4aea4a31963206c787a78b95a72a5 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 15:35:46 +0530
Subject: [PATCH 040/146] [IMP]:report designer config wizard

bzr revid: nch@tinyerp.com-20100430100546-b3tx17qfq7tapqte
---
 addons/report_designer/report_designer_installer.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index bbef853ed79..76adb3eddf1 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -10,10 +10,13 @@
           <form position="attributes">
             <attribute name="string">Report Modules Installation</attribute>
           </form>
-
+		  <xpath expr='//separator[@string="vsep"]' position='attributes'>
+          	  	<attribute name='rowspan'>7</attribute>
+		  		<attribute name='string'></attribute>
+		  </xpath>
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Select Reporting Tools To Install</attribute>
+                       >Reporting Tools</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -21,7 +24,6 @@
                        >OpenERP's built-in reporting abilities can be improved even further with some of the following applications</attribute>
           </xpath>
           <group colspan="8">
-            <separator string="Reporting" colspan="4"/>
             <field name="base_report_designer"/>
             <field name="base_report_creator"/>
             <field name="olap"/>

From 3b69c2ce748263bf534543e2fd4a7a50389131c3 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Fri, 30 Apr 2010 15:40:06 +0530
Subject: [PATCH 041/146] [IMP]:service_mgmt installer

bzr revid: nch@tinyerp.com-20100430101006-6dew33g924nle1of
---
 addons/service/service_installer.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/service/service_installer.xml b/addons/service/service_installer.xml
index 059d114a66b..07d9e839376 100644
--- a/addons/service/service_installer.xml
+++ b/addons/service/service_installer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <record id="view_confirm_install_module_form" model="ir.ui.view">
       <field name="name">Service Profile : Install extra modules</field>
       <field name="model">profile.service.config.install_modules_wizard</field>
@@ -12,7 +12,9 @@
           <form position="attributes">
             <attribute name="string">Install Extra Service Profile Modules</attribute>
           </form>
-
+		 <xpath expr='//separator[@string="vsep"]' position='attributes'>
+    	  	  <attribute name='string'></attribute>
+    	 </xpath>
           <separator string="title" position="attributes">
             <attribute name="string">Services Management</attribute>
           </separator>
@@ -42,7 +44,7 @@
         </data>
       </field>
     </record>
-    
+
         <record id="action_config_install_module" model="ir.actions.act_window">
             <field name="name">Service Profile : Install Extra Modules</field>
             <field name="type">ir.actions.act_window</field>

From 809adca7c2f06ce27eea2a578121f9bded3ca53f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 30 Apr 2010 15:55:54 +0530
Subject: [PATCH 042/146] [IMP]: base_calendar: Improvement in isc function for
 attendee

bzr revid: rpa@tinyerp.com-20100430102554-63pkj73y92g2q6y4
---
 addons/base_calendar/base_calendar.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 126d6621d40..c216efa9f0e 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -36,7 +36,7 @@ months = {
     10: "October", 11: "November", 12: "December"
 }
 
-def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=""):
+def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
     """
     Get recurrent dates based on Rule string considering exdate and start date
     @param rrulestring: Rulestring
@@ -56,6 +56,8 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=""):
     for date in exdate:
         datetime_obj = todate(date)
         rset1._exdate.append(datetime_obj)
+    if exrule:
+        rset1.exrule(rrule.rrulestr(str(exrule), dtstart=startdate))
     re_dates = map(lambda x:x.strftime('%Y-%m-%d %H:%M:%S'), rset1._iter())
     return re_dates
 
@@ -458,11 +460,12 @@ property or property parameter."),
             event.add('location').value = event_obj.location
         if event_obj.rrule:
             event.add('rrule').value = event_obj.rrule
+        
         if event_obj.alarm_id:
+            # computes alarm data
             valarm = event.add('valarm')
             alarm_object = self.pool.get('res.alarm')
             alarm_data = alarm_object.read(cr, uid, event_obj.alarm_id.id, context=context)
-            print 'aaaaaaaaaaaaaaaaa', alarm_data, event_obj.alarm_id.id
             # Compute trigger data
             interval = alarm_data['trigger_interval']
             occurs = alarm_data['trigger_occurs']
@@ -481,6 +484,13 @@ property or property parameter."),
     
             # Compute other details
             valarm.add('DESCRIPTION').value = alarm_data['name'] or 'OpenERP'
+        
+        for attendee in event_obj.attendee_ids:
+            attendee_add = event.add('attendee')
+            attendee_add.params['CUTYPE'] = [str(attendee.cutype)]
+            attendee_add.params['ROLE'] = [str(attendee.role)]
+            attendee_add.params['RSVP'] = [str(attendee.rsvp)]
+            attendee_add.value = 'MAILTO:' + attendee.email
         res = cal.serialize()
         return res
     

From eba5bcdc2030bcffaee7d864d5c0e5fd515bc7bf Mon Sep 17 00:00:00 2001
From: "PAP(OpenERP)" <>
Date: Fri, 30 Apr 2010 19:48:10 +0530
Subject: [PATCH 043/146] Improved yml import for recording osv.memory objects

bzr revid: hda@tinyerp.com-20100430141810-pvp1ah28b5j6fsxo
---
 bin/tools/yaml_import.py | 85 ++++++++++++++++++++++++++--------------
 bin/tools/yaml_tag.py    | 39 +++++++++---------
 2 files changed, 74 insertions(+), 50 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 90bece88ee4..ed481b2d0b3 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -256,28 +256,41 @@ class YamlInterpreter(object):
             b = default
         return b 
     
-    def process_record(self, node):
-        record, fields = node.items()[0]
-
-        self.validate_xml_id(record.id)
-        if self.isnoupdate(record) and self.mode != 'init':
-            id = self.pool.get('ir.model.data')._update_dummy(self.cr, self.uid, record.model, self.module, record.id)
-            # check if the resource already existed at the last update
-            if id:
-                self.id_map[record] = int(id)
-                return None
-            else:
-                if not self._coerce_bool(record.forcecreate):
-                    return None
-
+    def create_osv_memory_record(self, record, fields):
         model = self.get_model(record.model)
         record_dict = self._create_record(model, fields)
-        self.logger.debug("RECORD_DICT %s" % record_dict)
-        id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
-                self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode)
-        self.id_map[record.id] = int(id)
-        if config.get('import_partial', False):
-            self.cr.commit()
+        id_new=model.create(self.cr, self.uid, record_dict, context=self.context)
+        self.id_map[record.id] = int(id_new)
+        return record_dict
+    
+    def process_record(self, node):
+        import osv
+        record, fields = node.items()[0]
+        model = self.get_model(record.model)
+        model_bases = model.__class__.__bases__ 
+        if osv.osv.osv_memory in model_bases:
+            record_dict=self.create_osv_memory_record(record, fields)
+        else:
+            self.validate_xml_id(record.id)
+            if self.isnoupdate(record) and self.mode != 'init':
+                id = self.pool.get('ir.model.data')._update_dummy(self.cr, self.uid, record.model, self.module, record.id)
+                # check if the resource already existed at the last update
+                if id:
+                    self.id_map[record] = int(id)
+                    return None
+                else:
+                    if not self._coerce_bool(record.forcecreate):
+                        return None
+    
+            model = self.get_model(record.model)
+            record_dict = self._create_record(model, fields)
+            self.logger.debug("RECORD_DICT %s" % record_dict)
+            if not osv.osv.osv_memory in model_bases:
+                id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
+                        self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode)
+                self.id_map[record.id] = int(id)
+                if config.get('import_partial', False):
+                    self.cr.commit()
     
     def _create_record(self, model, fields):
         record_dict = {}
@@ -390,6 +403,10 @@ class YamlInterpreter(object):
             uid = workflow.uid
         else:
             uid = self.uid
+        self.cr.execute('select distinct signal from wkf_transition')
+        signals=[x['signal'] for x in self.cr.dictfetchall()]
+        if workflow.action not in signals:
+            raise YamlImportException('Incorrect action %s. No such action defined' % workflow.action)
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
     
@@ -528,15 +545,19 @@ class YamlInterpreter(object):
                     'tree_but_open', 'Menuitem', [('ir.ui.menu', int(parent_id))], action, True, True, xml_id=node.id)
 
     def process_act_window(self, node):
+        assert getattr(node, 'id'), "Attribute %s of act_window is empty !" % ('id',)
+        assert getattr(node, 'name'), "Attribute %s of act_window is empty !" % ('name',)
+        assert getattr(node, 'res_model'), "Attribute %s of act_window is empty !" % ('res_model',)
         self.validate_xml_id(node.id)
         view_id = False
         if node.view:
             view_id = self.get_id(node.view)
-        context = eval(node.context, self.eval_context)
-
+        if not node.context:
+            node.context={}
+        context = eval(str(node.context), self.eval_context)
         values = {
             'name': node.name,
-            'type': type or 'ir.actions.act_window',
+            'type': node.type or 'ir.actions.act_window',
             'view_id': view_id,
             'domain': node.domain,
             'context': context,
@@ -566,13 +587,17 @@ class YamlInterpreter(object):
         # TODO add remove ir.model.data
 
     def process_delete(self, node):
-        if len(node.search):
-            ids = self.pool.get(node.model).search(self.cr, self.uid, eval(node.search, self.eval_context))
+        assert getattr(node, 'model'), "Attribute %s of delete tag is empty !" % ('model',)
+        if self.pool.get(node.model):
+            if len(node.search):
+                ids = self.pool.get(node.model).search(self.cr, self.uid, eval(node.search, self.eval_context))
+            else:
+                ids = [self.get_id(node.id)]
+            if len(ids):
+                self.pool.get(node.model).unlink(self.cr, self.uid, ids)
+                self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids)
         else:
-            ids = [self.get_id(node.id)]
-        if len(ids):
-            self.pool.get(node.model).unlink(self.cr, self.uid, ids)
-            self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids)
+            self.logger.log(logging.TEST, "Record not deleted.")
     
     def process_url(self, node):
         self.validate_xml_id(node.id)
@@ -649,6 +674,8 @@ class YamlInterpreter(object):
         """
         Processes a Yaml string. Custom tags are interpreted by 'process_' instance methods.
         """
+        yaml_tag.add_constructors()
+
         is_preceded_by_comment = False
         for node in yaml.load(yaml_string):
             is_preceded_by_comment = self._log(node, is_preceded_by_comment)
diff --git a/bin/tools/yaml_tag.py b/bin/tools/yaml_tag.py
index cdc892d9b80..817f7d55a3c 100644
--- a/bin/tools/yaml_tag.py
+++ b/bin/tools/yaml_tag.py
@@ -48,9 +48,7 @@ class Workflow(YamlTag):
         super(Workflow, self).__init__(**kwargs)
 
 class ActWindow(YamlTag):
-    def __init__(self, model, action, **kwargs):
-        self.model = model
-        self.action = action
+    def __init__(self, **kwargs):
         super(ActWindow, self).__init__(**kwargs)
 
 class Function(YamlTag):
@@ -67,10 +65,7 @@ class Report(YamlTag):
         super(Report, self).__init__(**kwargs)
 
 class Delete(YamlTag):
-    def __init__(self, model, id, search, **kwargs):
-        self.model = model
-        self.id = id
-        self.search = search
+    def __init__(self, **kwargs):
         super(Delete, self).__init__(**kwargs)
 
 class Context(YamlTag):
@@ -156,17 +151,19 @@ def ir_set_constructor(loader, node):
 # Registers constructors for custom tags.
 # Constructors are actually defined globally: do not redefined them in another
 # class/file/package.  This means that module recorder need import this file.
-yaml.add_constructor(u"!assert", assert_constructor)
-yaml.add_constructor(u"!record", record_constructor)
-yaml.add_constructor(u"!python", python_constructor)
-yaml.add_constructor(u"!menuitem", menuitem_constructor)
-yaml.add_constructor(u"!workflow", workflow_constructor)
-yaml.add_constructor(u"!act_window", act_window_constructor)
-yaml.add_constructor(u"!function", function_constructor)
-yaml.add_constructor(u"!report", report_constructor)
-yaml.add_constructor(u"!context", context_constructor)
-yaml.add_constructor(u"!delete", delete_constructor)
-yaml.add_constructor(u"!url", url_constructor)
-yaml.add_constructor(u"!eval", eval_constructor)
-yaml.add_multi_constructor(u"!ref", ref_constructor)
-yaml.add_constructor(u"!ir_set", ir_set_constructor)
+def add_constructors():
+    yaml.add_constructor(u"!assert", assert_constructor)
+    yaml.add_constructor(u"!record", record_constructor)
+    yaml.add_constructor(u"!python", python_constructor)
+    yaml.add_constructor(u"!menuitem", menuitem_constructor)
+    yaml.add_constructor(u"!workflow", workflow_constructor)
+    yaml.add_constructor(u"!act_window", act_window_constructor)
+    yaml.add_constructor(u"!function", function_constructor)
+    yaml.add_constructor(u"!report", report_constructor)
+    yaml.add_constructor(u"!context", context_constructor)
+    yaml.add_constructor(u"!delete", delete_constructor)
+    yaml.add_constructor(u"!url", url_constructor)
+    yaml.add_constructor(u"!eval", eval_constructor)
+    yaml.add_multi_constructor(u"!ref", ref_constructor)
+    yaml.add_constructor(u"!ir_set", ir_set_constructor)
+add_constructors()
\ No newline at end of file

From 9e36298cf02a2a0fba043cdb81888b03b83f155e Mon Sep 17 00:00:00 2001
From: "PAP(OpenERP)" <>
Date: Fri, 30 Apr 2010 19:52:50 +0530
Subject: [PATCH 044/146] Added commmand line arguments to make yml test easier

bzr revid: hda@tinyerp.com-20100430142250-ieb6mzx59wyvl3u9
---
 bin/addons/__init__.py | 18 ++++++++++++++----
 bin/tools/config.py    | 18 +++++++++++++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index b1b140159c1..02803de0d75 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -640,10 +640,20 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
 
     def load_test(cr, module_name, id_map, mode):
         cr.commit()
-        try:
-            _load_data(cr, module_name, id_map, mode, 'test')
-        finally:
-            cr.rollback()
+        if not tools.config.options['test-disable']:
+            try:
+                _load_data(cr, module_name, id_map, mode, 'test')
+            except Exception, e:
+                if tools.config.options['test-continue']:
+                    logger.notifyChannel('ERROR', netsvc.LOG_TEST, str(e))
+                    pass
+                else:
+                    raise Exception
+            finally:
+                if tools.config.options['test-rollback']:
+                    cr.rollback()
+                else:
+                    cr.commit()
 
     def _load_data(cr, module_name, id_map, mode, kind):
         noupdate = (kind == 'demo')
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 8f1f1ca55ea..a92948b8af0 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -82,6 +82,9 @@ class configmanager(object):
             'login_message': False,
             'list_db' : True,
             'timezone' : False, # to override the default TZ
+            'test-disable' : False,
+            'test-rollback' : True,
+            'test-continue' : False
         }
 
         self.misc = {}
@@ -134,7 +137,17 @@ class configmanager(object):
                               default="server.pkey",
                               help="specify the private key file for the SSL connection")
             parser.add_option_group(group)
-
+            
+        # Testing Group
+        group = optparse.OptionGroup(parser, "Testing Configuration")
+        group.add_option("--test-disable", action="store_true", dest="test_disable",
+                         default=False, help="Disable loading test files.")
+        group.add_option("--test-no-rollback", action="store_false", dest="test_rollback",
+                         default=True, help="Don't rollback after running test.")
+        group.add_option("--test-continue", action="store_true", dest="test_continue",
+                         default=False, help="Display exception but then test should continue.")
+        parser.add_option_group(group)
+        
         # Logging Group
         group = optparse.OptionGroup(parser, "Logging Configuration")
         group.add_option("--logfile", dest="logfile", help="file where the server log will be stored")
@@ -274,6 +287,9 @@ class configmanager(object):
 
         self.options['init'] = opt.init and dict.fromkeys(opt.init.split(','), 1) or {}
         self.options["demo"] = not opt.without_demo and self.options['init'] or {}
+        self.options["test-disable"] =  opt.test_disable
+        self.options["test-rollback"] =  opt.test_rollback
+        self.options["test-continue"] =  opt.test_continue
         self.options['update'] = opt.update and dict.fromkeys(opt.update.split(','), 1) or {}
 
         self.options['translate_modules'] = opt.translate_modules and map(lambda m: m.strip(), opt.translate_modules.split(',')) or ['all']

From da17e9c16111f90886f68e1db761e6673b89fa21 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 30 Apr 2010 16:57:54 +0200
Subject: [PATCH 045/146] [FIX] reviewed and improved some naming and
 formatting, plus removed attrs from field if groups disallows showing it

bzr revid: odo@openerp.com-20100430145754-og8gm3dlma5qwm89
---
 bin/osv/orm.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index af140909664..b0ac064e199 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1138,17 +1138,24 @@ class orm_template(object):
             if isinstance(s, unicode):
                 return s.encode('utf8')
             return s
+
+        # return True if node can be displayed to current user
         def check_group(node):
             if node.get('groups'):
                 groups = node.get('groups').split(',')
-                readonly = False
+                can_see = False
                 access_pool = self.pool.get('ir.model.access')
                 for group in groups:
-                    readonly = readonly or access_pool.check_groups(cr, user, group)
-                if not readonly:
+                    can_see = can_see or access_pool.check_groups(cr, user, group)
+                    if can_see:
+                        break
+                if not can_see:
                     node.set('invisible', '1')
+                    if 'attrs' in node.attrib:
+                        del(node.attrib['attrs']) #avoid making field visible later
             del(node.attrib['groups'])
-    
+            return can_see
+
         if node.tag in ('field', 'node', 'arrow'):
             if node.get('object'):
                 attrs = {}
@@ -1195,9 +1202,7 @@ class orm_template(object):
                             }
                     attrs = {'views': views}
                     if node.get('widget') and node.get('widget') == 'selection':
-                        if 'groups' in node.attrib:
-                            check_group(node)
-                        if node.get('invisible'):
+                        if not check_group(node)
                             attrs['selection'] = []
                         # We can not use the 'string' domain has it is defined according to the record !
                         else:
@@ -1206,7 +1211,7 @@ class orm_template(object):
                                 dom = column._domain
                             dom += eval(node.get('domain','[]'), {'uid':user, 'time':time})
                             context.update(eval(node.get('context','{}')))
-                            attrs['selection'] = self.pool.get(relation)._name_search(cr, user, '', dom, context=context,limit=None,name_get_uid=1)
+                            attrs['selection'] = self.pool.get(relation)._name_search(cr, user, '', dom, context=context, limit=None, name_get_uid=1)
                             if (node.get('required') and not int(node.get('required'))) or not column.required:
                                 attrs['selection'].append((False,''))
                 fields[node.get('name')] = attrs
@@ -3656,6 +3661,8 @@ class orm(orm_template):
         return [(r['id'], tools.ustr(r[self._rec_name])) for r in self.read(cr, user, ids,
             [self._rec_name], context, load='_classic_write')]
 
+    # private implementation of name_search, allows passing a dedicated user for the name_get part to
+    # solve some access rights issues
     def _name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100, name_get_uid=None):
         if not args:
             args = []
@@ -3665,7 +3672,7 @@ class orm(orm_template):
         if name:
             args += [(self._rec_name, operator, name)]
         ids = self.search(cr, user, args, limit=limit, context=context)
-        res = self.name_get(cr, name_get_uid, ids, context)
+        res = self.name_get(cr, name_get_uid or user, ids, context)
         return res
 
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
@@ -3683,9 +3690,8 @@ class orm(orm_template):
         This method is equivalent of search() on name + name_get()
 
         """
+        return self._name_search(cr, user, name, args, operator, context, limit)
 
-        return self._name_search(cr, user, name, args, operator, context, limit, user)
-        
     def copy_data(self, cr, uid, id, default=None, context=None):
         """
         Copy given record's data with all its fields values

From a42aaf14cbbafa6433784fae730252732e467d1d Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 3 May 2010 05:03:32 +0100
Subject: [PATCH 046/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100501035453-hziicka4anasmcx3
bzr revid: codehost@crowberry-20100502035702-ng8eqf5j0pzfunju
bzr revid: codehost@crowberry-20100503040332-ejq7bph3qyvydxzn
---
 bin/addons/base/i18n/ca.po    | 34 +++++++++++++++++-----------------
 bin/addons/base/i18n/es.po    | 19 ++++++++++---------
 bin/addons/base/i18n/hr.po    |  4 ++--
 bin/addons/base/i18n/ja.po    |  4 ++--
 bin/addons/base/i18n/sv.po    |  4 ++--
 bin/addons/base/i18n/uk.po    |  4 ++--
 bin/addons/base/i18n/zh_CN.po |  4 ++--
 7 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/bin/addons/base/i18n/ca.po b/bin/addons/base/i18n/ca.po
index e64daf5a6e9..79d255c529b 100644
--- a/bin/addons/base/i18n/ca.po
+++ b/bin/addons/base/i18n/ca.po
@@ -7,14 +7,14 @@ 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-07 05:09+0000\n"
+"PO-Revision-Date: 2010-05-02 05:54+0000\n"
 "Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
 "<jesteve@zikzakmedia.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-04-17 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-05-03 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -109,7 +109,7 @@ msgid ""
 msgstr ""
 "Escolliu entre la \"Interfície simplificada\" o \"Interfície estesa\".\n"
 "Si esteu examinant o utilitzant OpenERP per la primera vegada,\n"
-"us suggerim per utilitzar la interfície simplificada, que té menys\n"
+"us suggerim que utilitzeu la interfície simplificada, que té menys\n"
 "opcions i camps però és més fàcil d'entendre. Més tard podreu\n"
 "canviar a la vista estesa.\n"
 "            "
@@ -388,8 +388,8 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
-"Si marca aquesta opció, quan l'usuari imprimeixi el mateix nom d'adjunt per "
-"segona vegada, tornarà l'informe anterior."
+"Si marqueu aquesta opció, quan l'usuari imprimeixi el mateix nom d'adjunt "
+"per segona vegada, obtindrá l'informe anterior."
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -433,7 +433,7 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"EL codi ISO del país en dos caràcters.\n"
+"EL codi ISO del país de dos caràcters.\n"
 "Podeu utilitzar aquest camp per la cerca ràpida."
 
 #. module: base
@@ -474,7 +474,7 @@ msgstr "Interfície estesa"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr "Els camps personalitzats han de tenir un nom que comença con 'x_'!"
+msgstr "Els camps personalitzats han de tenir un nom que comenci amb 'x_'!"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -913,7 +913,7 @@ msgstr "STOCK_MISSING_IMAGE"
 #. module: base
 #: view:res.users:0
 msgid "Define New Users"
-msgstr "Defineix nous usuaris"
+msgstr "Definiu nous usuaris"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1489,7 +1489,7 @@ msgstr "Menú"
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr "Tasa"
+msgstr "Taxa"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -3124,7 +3124,7 @@ msgid ""
 "any."
 msgstr ""
 "L'usuari intern que s'encarrega de comunicar-se amb aquesta empresa, si "
-"n'hi ha."
+"n'hi hagués."
 
 #. module: base
 #: field:res.partner,parent_id:0
@@ -5073,8 +5073,8 @@ msgstr "Islàndia"
 #: view:res.users:0
 msgid "Roles are used to defined available actions, provided by workflows."
 msgstr ""
-"Els rols s'utilitzen per definir les accions disponibles, de les que "
-"proveeixen els fluxos."
+"Els rols s'utilitzen per definir les accions disponibles dins d'un flux de "
+"treball."
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5437,7 +5437,7 @@ msgstr "Dia de l'any: %(doy)s"
 #. module: base
 #: model:res.country,name:base.nt
 msgid "Neutral Zone"
-msgstr "Zona Neutral"
+msgstr "Zona neutral"
 
 #. module: base
 #: view:ir.model:0
@@ -5828,7 +5828,7 @@ msgstr "Companyia per defecte per objecte"
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Next Configuration Step"
-msgstr "Següent pas configuració"
+msgstr "Següent pas de la configuració"
 
 #. module: base
 #: field:res.groups,comment:0
@@ -6645,8 +6645,8 @@ msgid ""
 "Access all the fields related to the current object using expression in "
 "double brackets, i.e. [[ object.partner_id.name ]]"
 msgstr ""
-"Accedeix a tots els camps relacionats amb l'objecte actual mitjançant una "
-"expressió en claudàtors dobles, per exemple [[ object.partner_id.name ]]"
+"Podeu accedir a tots els camps relacionats amb l'objecte actual mitjançant "
+"una expressió en claudàtors dobles, per exemple [[ object.partner_id.name ]]"
 
 #. module: base
 #: field:res.request.history,body:0
@@ -8088,7 +8088,7 @@ msgstr ""
 #. module: base
 #: wizard_view:module.lang.install,init:0
 msgid "Choose a language to install:"
-msgstr "Selecciona un idioma per instal·lar:"
+msgstr "Seleccioneu un idioma a instal·lar:"
 
 #. module: base
 #: model:res.country,name:base.lk
diff --git a/bin/addons/base/i18n/es.po b/bin/addons/base/i18n/es.po
index 2303ddf769a..5524104bb92 100644
--- a/bin/addons/base/i18n/es.po
+++ b/bin/addons/base/i18n/es.po
@@ -7,14 +7,14 @@ 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-07 05:11+0000\n"
+"PO-Revision-Date: 2010-05-02 05:52+0000\n"
 "Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
 "<jesteve@zikzakmedia.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-04-17 03:52+0000\n"
+"X-Launchpad-Export-Date: 2010-05-03 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
@@ -389,7 +389,7 @@ msgid ""
 "name, it returns the previous report."
 msgstr ""
 "Si marca esta opción, cuando el usuario imprima el mismo nombre de adjunto "
-"por segunda vez, devolverá el informe anterior."
+"por segunda vez, obtendrá el informe anterior."
 
 #. module: base
 #: help:res.lang,iso_code:0
@@ -434,8 +434,8 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"EL código ISO del país en dos caracteres.\n"
-"Puede usar este campo para la búsqueda rápida."
+"EL código ISO del país de dos caracteres.\n"
+"Puede utilizar este campo para la búsqueda rápida."
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
@@ -3127,7 +3127,8 @@ msgid ""
 "The internal user that is in charge of communicating with this partner if "
 "any."
 msgstr ""
-"El usuario interno que se encarga de comunicarse con esta empresa si hay."
+"El usuario interno que se encarga de comunicarse con esta empresa, si los "
+"hubiera."
 
 #. module: base
 #: field:res.partner,parent_id:0
@@ -5076,8 +5077,8 @@ msgstr "Islandia"
 #: view:res.users:0
 msgid "Roles are used to defined available actions, provided by workflows."
 msgstr ""
-"Los roles se utilizan para definir las acciones disponibles, que son "
-"proporcionadas por los flujos."
+"Los roles se utilizan para definir las acciones disponibles dentro de un "
+"flujo de trabajo."
 
 #. module: base
 #: model:res.country,name:base.de
@@ -5830,7 +5831,7 @@ msgstr "Compañía por defecto por objeto"
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Next Configuration Step"
-msgstr "Siguiente paso configuración"
+msgstr "Siguiente paso de la configuración"
 
 #. module: base
 #: field:res.groups,comment:0
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index f66421b44ce..4fb8e0f8249 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-04-29 04:38+0000\n"
+"PO-Revision-Date: 2010-05-02 05:19+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-04-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-05-03 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index b53a444998d..be4a2828ed8 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-04-29 04:36+0000\n"
+"PO-Revision-Date: 2010-05-02 05:13+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-04-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-05-03 04:02+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 29ddcfda776..0e2ae3adae0 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-04-29 04:41+0000\n"
+"PO-Revision-Date: 2010-05-02 05:47+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-04-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-05-03 04:03+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 65f065c9942..d6d7e110aff 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-04-29 04:39+0000\n"
+"PO-Revision-Date: 2010-05-02 05:32+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-04-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-05-03 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 729acf9e52b..a6f9bd69315 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-04-29 04:40+0000\n"
+"PO-Revision-Date: 2010-05-02 05:37+0000\n"
 "Last-Translator: OpenERP Administrators <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-04-30 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-05-03 04:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From fb67b073929a11b87af830ce90d2ca08846ef489 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 12:04:46 +0530
Subject: [PATCH 047/146] [IMP]:mailgateway, crm: Solved problem of duplicate
 menu for Cases

bzr revid: rpa@tinyerp.com-20100503063446-9fioyor34q3wcrlt
---
 addons/crm/crm_view.xml                   | 12 ++++++------
 addons/mail_gateway/mail_gateway_view.xml |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 5c171236836..3f0b42a5122 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="menu_crm_configuration" name="Cases"
+        <menuitem id="base.menu_crm_configuration" name="Cases"
             parent="base.menu_base_config" sequence="0"/>
 
 <!-- Case Sections Form View -->
@@ -117,7 +117,7 @@
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
 
-        <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
+        <menuitem  id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration"/>
 
 
 <!-- Case Categories Form View -->
@@ -157,11 +157,11 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
+        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="base.menu_crm_configuration"/>
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act"
-            parent="crm.menu_crm_configuration" />
+            parent="base.menu_crm_configuration" />
 
 
 <!-- Resource Type of case Tree View -->
@@ -203,7 +203,7 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
         <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-            parent="crm.menu_crm_configuration" />
+            parent="base.menu_crm_configuration" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -662,7 +662,7 @@
         <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
             groups="base.group_extended"
-            parent="crm.menu_crm_configuration" />
+            parent="base.menu_crm_configuration" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 253462895da..e735f75b7f0 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -120,11 +120,11 @@
 	    </record>
 		
 		
-		 <menuitem id="menu_crm_configuration" name="Cases"
+		 <menuitem id="base.menu_crm_configuration" name="Cases"
             parent="base.menu_base_config" sequence="0"/>
-            
+
         <menuitem id="menu_mailgate_thread" name="Mailgateway Threads" action="action_view_mailgate_thread"
-        	parent="menu_crm_configuration" />
+        	parent="base.menu_crm_configuration"  sequence="20"/>
         	
       	
     </data>

From a25cf290ee143129e6b127dc5de43ffcd60b6384 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 12:07:00 +0530
Subject: [PATCH 048/146] [IMP]: crm: Improvement in forward to partner wizard
 as lead and opportunity are now merged in one object

bzr revid: rpa@tinyerp.com-20100503063700-pzej8pgup125rz5u
---
 addons/crm/crm_opportunity_view.xml           |   2 +-
 addons/crm/security/ir.model.access.csv       |   2 +
 addons/crm/wizard/crm_forward_to_partner.py   | 215 +++++-------------
 .../wizard/crm_forward_to_partner_view.xml    |  44 +---
 4 files changed, 65 insertions(+), 198 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 8b07b83e2fd..ec41af2f3e4 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -195,7 +195,7 @@
                                context="{'mail':'new', 'model': 'crm.lead'}"
                                icon="gtk-go-forward" type="action" />
                            <button colspan="2" string="Forward to Partner"
-                               name="%(crm_opportunity_forward_to_partner_act)d"
+                               name="%(crm_lead_forward_to_partner_act)d"
                                icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 8dae83790b3..7c8c393b63f 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -34,3 +34,5 @@
 "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
 "access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1
+"access_crm_installer","crm.installer.rule","model_crm_installer","crm.group_crm_user",1,1,1,1
+"access_crm_lead_forward_to_partner","crm.lead.forward.to.partner","model_crm_lead_forward_to_partner","crm.group_crm_user",2,2,2,2
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 413747739c2..fb85794f64a 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -38,22 +38,23 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     }
 
     def on_change_partner(self, cr, uid, ids, partner_id):
+        if not partner_id:
+            return {'value' : {'email_to' : False, 'address_id': False}}
+
+        addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['contact'])
+        data = {'address_id': addr['contact']}
+        data.update(self.on_change_address(cr, uid, ids, addr['contact'])['value'])
         return {
-            'domain' : {
-                'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]",
+            'value' : data,
+            'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
             }
-        }
 
     def on_change_address(self, cr, uid, ids, address_id):
         email = ''
         if address_id:
             email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
 
-        return {
-            'value' : {
-                'email_to' : email,
-            }
-        }
+        return {'value': {'email_to' : email}}
 
     def action_cancel(self, cr, uid, ids, context=None):
         return {'type' : 'ir.actions.act_window_close'}
@@ -116,33 +117,53 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         lead_proxy = self.pool.get('crm.lead')
 
         lead = lead_proxy.browse(cr, uid, active_ids[0], context=context)
-
-        field_names = [
-            'partner_name', 'title', 'function_name', 'street', 'street2',
-            'zip', 'city', 'country_id', 'state_id', 'email_from',
-            'phone', 'fax', 'mobile'
-        ]
-
         message = []
-
-        for field_name in field_names:
-            field_definition = lead_proxy._columns[field_name]
-            value = None
-
-            if field_definition._type == 'selection':
-                if hasattr(field_definition.selection, '__call__'):
-                    key = field_definition.selection(lead_proxy, cr, uid, context=context)
-                else:
-                    key = field.definition.selection
-                value = dict(key).get(lead[field_name], lead[field_name])
-            elif field_definition._type == 'many2one':
-                if lead[field_name]:
-                    value = lead[field_name].name_get()[0][1]
-            else:
-                value = lead[field_name]
-
-            message.append("%s: %s" % (field_definition.string, value or ''))
-
+        
+        if lead.type == 'lead':
+                field_names = [
+                    'partner_name', 'title', 'function_name', 'street', 'street2',
+                    'zip', 'city', 'country_id', 'state_id', 'email_from',
+                    'phone', 'fax', 'mobile'
+                ]
+        
+                for field_name in field_names:
+                    print field_name
+                    field_definition = lead_proxy._columns[field_name]
+                    value = None
+        
+                    if field_definition._type == 'selection':
+                        if hasattr(field_definition.selection, '__call__'):
+                            key = field_definition.selection(lead_proxy, cr, uid, context=context)
+                        else:
+                            key = field.definition.selection
+                        value = dict(key).get(lead[field_name], lead[field_name])
+                    elif field_definition._type == 'many2one':
+                        print '>>>>>>>>>>>', lead[field_name], field_name
+                        if lead[field_name]:
+                            value = lead[field_name].name_get()[0][1]
+                    else:
+                        value = lead[field_name]
+        
+                    message.append("%s: %s" % (field_definition.string, value or ''))
+        elif lead.type == 'opportunity':
+            pa = lead.partner_address_id
+            message = [
+            "Partner: %s" % (lead.partner_id.name_get()[0][1]),
+            "Contact: %s" % (pa.name or ''),
+            "Title: %s" % (pa.title or ''),
+            "Function: %s" % (pa.function and pa.function.name_get()[0][1] or ''),
+            "Street: %s" % (pa.street or ''),
+            "Street2: %s" % (pa.street2 or ''),
+            "Zip: %s" % (pa.zip or ''),
+            "City: %s" % (pa.city or ''),
+            "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''),
+            "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''),
+            "Email: %s" % (pa.email or ''),
+            "Phone: %s" % (pa.phone or ''),
+            "Fax: %s" % (pa.fax or ''),
+            "Mobile: %s" % (pa.mobile or ''),
+            ]
+        
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         email_from = ''
         if user.address_id and user.address_id.email:
@@ -150,7 +171,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
 
         res = {
             'email_from' : email_from,
-            'subject' : '[Lead-Forward:%06d] %s' % (lead.id, lead.name),
+            'subject' : '[%s-Forward:%06d] %s' % (lead.type.title(), lead.id, lead.name),
             'message' : "\n".join(message + ['---']),
         }
 
@@ -158,128 +179,4 @@ class crm_lead_forward_to_partner(osv.osv_memory):
 
 crm_lead_forward_to_partner()
 
-class crm_opportunity_forward_to_partner(osv.osv_memory):
-    _name = 'crm.opportunity.forward.to.partner'
-
-    _columns = {
-        'partner_id' : fields.many2one('res.partner', 'Partner'),
-        'address_id' : fields.many2one('res.partner.address', 'Address'),
-        'email_from' : fields.char('From', required=True, size=128),
-        'email_to' : fields.char('To', required=True, size=128),
-        'subject' : fields.char('Subject', required=True, size=128),
-        'message' : fields.text('Message', required=True),
-    }
-
-    def on_change_partner(self, cr, uid, ids, partner_id):
-        return {
-            'domain' : {
-                'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]",
-            }
-        }
-
-    def on_change_address(self, cr, uid, ids, address_id):
-        email = ''
-        if address_id:
-            email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
-
-        return {
-            'value' : {
-                'email_to' : email,
-            }
-        }
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type' : 'ir.actions.act_window_close'}
-
-    def action_forward(self, cr, uid, ids, context=None):
-        """
-        Forward the opportunity to a partner
-        """
-        if context is None:
-            context = {}
-
-        res_id = context.get('active_id', False)
-
-        if not res_id:
-            return {}
-
-        this = self.browse(cr, uid, ids[0], context=context)
-
-        hist_obj = self.pool.get('crm.case.history')
-        smtp_pool = self.pool.get('email.smtpclient')
-        case_pool = self.pool.get('crm.opportunity')
-        case = case_pool.browse(cr, uid, res_id, context=context)
-
-        emails = [this.email_to]
-        body = case_pool.format_body(this.message)
-        email_from = this.email_from or False
-        case_pool._history(cr, uid, [case], _('Forward'), history=True, email=this.email_to, details=body, email_from=email_from)
-
-        flag = False
-        if case.section_id and case.section_id.server_id:
-            flag = smtp_pool.send_email(
-                cr=cr,
-                uid=uid,
-                server_id=case.section_id.server_id.id,
-                emailto=emails,
-                subject=this.subject,
-                body="<pre>%s</pre>" % body,
-            )
-        else:
-            flag = tools.email_send(
-                email_from,
-                emails,
-                this.subject,
-                body,
-            )
-
-        return {}
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        if context is None:
-            context = {}
-
-        active_ids = context.get('active_ids')
-        if not active_ids:
-            return {}
-
-        opportunity_proxy = self.pool.get('crm.opportunity')
-
-        opportunity = opportunity_proxy.browse(cr, uid, active_ids[0], context=context)
-
-        pa = opportunity.partner_address_id
-        message = [
-            "Partner: %s" % (opportunity.partner_id.name_get()[0][1]),
-            "Contact: %s" % (pa.name),
-            "Title: %s" % (pa.title),
-            "Function: %s" % (pa.function and pa.function.name_get()[0][1] or ''),
-            "Street: %s" % (pa.street),
-            "Street2: %s" % (pa.street2),
-            "Zip: %s" % (pa.zip),
-            "City: %s" % (pa.city),
-            "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''),
-            "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''),
-            "Email: %s" % (pa.email),
-            "Phone: %s" % (pa.phone),
-            "Fax: %s" % (pa.fax),
-            "Mobile: %s" % (pa.mobile),
-        ]
-
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        email_from = ''
-        if user.address_id and user.address_id.email:
-            email_from = "%s <%s>" % (user.name, user.address_id.email)
-
-        res = {
-            'email_from' : email_from,
-            'subject' : '[Opportunity-Forward:%06d] %s' % (opportunity.id, opportunity.name),
-            'message' : "\n".join(message + ['---']),
-        }
-
-        return res
-
-crm_opportunity_forward_to_partner()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index 8f238333a29..0bf04ac15d0 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -8,16 +8,17 @@
             <field name="arch" type="xml">
                 <form string="Forward to Partner">
                     <separator string="User" colspan="4" />
-                    <field name="email_from" colspan="4" />
+                    <field name="email_from" colspan="2" />
 
                     <separator string="Destination" colspan="4" />
-                    <field name="partner_id" on_change="on_change_partner(partner_id)" colspan="4" />
-                    <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="4" />
-                    <field name="email_to" colspan="4" />
+                    <field name="partner_id" on_change="on_change_partner(partner_id)" colspan="2" />
+                    <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
+                    <field name="email_to" colspan="2" />
 
                     <separator string="Email" colspan="4" />
                     <field name="subject" colspan="4" />
-                    <field name="message" colspan="4" />
+                    <separator string="Mesage body" colspan="4" />
+                    <field name="message" colspan="4" nolabel="1"/>
                     <separator string="" colspan="4" />
                     <group colspan="4" col="2">
                         <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
@@ -35,38 +36,5 @@
             <field name="target">new</field>
         </record>
 
-        <record model="ir.ui.view" id="crm_opportunity_forward_to_partner_form">
-            <field name="name">crm_opportunity_forward_to_partner</field>
-            <field name="model">crm.opportunity.forward.to.partner</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Forward to Partner">
-                    <separator string="User" colspan="4" />
-                    <field name="email_from" colspan="4" />
-
-                    <separator string="Destination" colspan="4" />
-                    <field name="partner_id" on_change="on_change_partner(partner_id)" colspan="4" />
-                    <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="4" />
-                    <field name="email_to" colspan="4" />
-
-                    <separator string="Email" colspan="4" />
-                    <field name="subject" colspan="4" />
-                    <field name="message" colspan="4" />
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="2">
-                        <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
-                        <button name="action_forward" string="Forward" icon="gtk-go-forward" type="object" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="crm_opportunity_forward_to_partner_act">
-            <field name="name">Forward to Partner</field>
-            <field name="res_model">crm.opportunity.forward.to.partner</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
     </data>
 </openerp>

From f341e4dda793d88e36ed6501df1099103bbc3454 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 12:14:17 +0530
Subject: [PATCH 049/146] [IMP]: crm: Improvement in lead demo, corrected lead
 and partner name by swapping their values

bzr revid: rpa@tinyerp.com-20100503064417-hk6sgad0ovh8bjfk
---
 addons/crm/crm_lead_demo.xml | 28 ++++++++++++++--------------
 addons/crm/crm_lead_view.xml |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 9e44681327e..5336f52a000 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -11,14 +11,14 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Luc Latour'" name="name"/>
+            <field eval="'Luc Latour'" name="partner_name"/>
             <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(726) 782-0636'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="'The Oil Company'" name="partner_name"/>
+            <field eval="'The Oil Company'" name="name"/>
             <field eval="'(769) 703-274'" name="phone"/>
         </record>
         <record id="crm_case_electonicgoodsdealer0" model="crm.lead">
@@ -26,14 +26,14 @@
             <field eval="'4'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Marc Dufour'" name="name"/>
+            <field eval="'Marc Dufour'" name="partner_name"/>
             <field eval="'open'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(392) 895-7917'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor2"/>
             <field name="stage_id" ref="crm.stage_lead2"/>
-            <field eval="'Le Club SARL'" name="partner_name"/>
+            <field eval="'Le Club SARL'" name="name"/>
             <field eval="'(956) 293-2595'" name="phone"/>
         </record>
         <record id="crm_case_developingwebapplications0" model="crm.lead">
@@ -41,14 +41,14 @@
             <field eval="'2'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_demo"/>
-            <field eval="'Fabien Pinckaers'" name="name"/>
+            <field eval="'Fabien Pinckaers'" name="partner_name"/>
             <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(820) 167-3208'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
-            <field eval="'TheKompany'" name="partner_name"/>
+            <field eval="'TheKompany'" name="name"/>
             <field eval="'(079) 681-2139'" name="phone"/>
             <field eval="'contact@tecsas.fr'" name="email_from"/>
         </record>
@@ -57,14 +57,14 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Henry Mc Coy'" name="name"/>
+            <field eval="'Henry Mc Coy'" name="partner_name"/>
             <field eval="'draft'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(077) 582-4035'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="'The Gas Company'" name="partner_name"/>
+            <field eval="'The Gas Company'" name="name"/>
             <field eval="'(514) 698-4118'" name="phone"/>
         </record>
         <record id="crm_case_itdeveloper0" model="crm.lead">
@@ -72,14 +72,14 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Carrie Helle'" name="name"/>
+            <field eval="'Carrie Helle'" name="partner_name"/>
             <field eval="'pending'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor6"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
-            <field eval="'Stonage IT'" name="partner_name"/>
+            <field eval="'Stonage IT'" name="name"/>
             <field eval="'(855) 924-4364'" name="phone"/>
         </record>
         <record id="crm_case_mgroperations0" model="crm.lead">
@@ -90,13 +90,13 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Tina Pinero'" name="name"/>
+            <field eval="'Tina Pinero'" name="partner_name"/>
             <field eval="'cancel'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(468) 017-2684'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor8"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
-            <field eval="'Opensides SPRL'" name="partner_name"/>
+            <field eval="'Opensides SPRL'" name="name"/>
             <field eval="'(373) 907-1009'" name="phone"/>
             <field eval="'info@opensides.be'" name="email_from"/>
         </record>
@@ -106,13 +106,13 @@
             <field eval="'3'" name="priority"/>
             <field name="type">lead</field>
             <field name="user_id" ref="base.user_root"/>
-            <field eval="'Wendi Baltz'" name="name"/>
+            <field eval="'Wendi Baltz'" name="partner_name"/>
             <field eval="'done'" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="'(463) 014-1208'" name="mobile"/>
             <field name="categ_id" ref="crm.categ_oppor4"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
-            <field eval="'Gardner Group'" name="partner_name"/>
+            <field eval="'Gardner Group'" name="name"/>
             <field eval="'(282) 603-7489'" name="phone"/>
         </record>
     </data>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1c3bd20629d..00cd31820b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -40,7 +40,7 @@
         <field name="arch" type="xml">
             <form string="Leads Form">
                 <group colspan="4" col="7">
-                    <field name="name" required="1"/>
+                    <field name="name" required="1" string="Name"/>
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button

From c89de179f5c7c4efbd2020bc490fdfd3fa47c14a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 12:43:08 +0530
Subject: [PATCH 050/146] [IMP]: crm: Improvement in add cc wizard, improved
 view

bzr revid: rpa@tinyerp.com-20100503071308-t2rr2xc1z5ykssqz
---
 addons/crm/wizard/crm_email_add_cc.py       | 5 ++++-
 addons/crm/wizard/crm_email_add_cc_view.xml | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_email_add_cc.py b/addons/crm/wizard/crm_email_add_cc.py
index 9af1b5eda5d..f3a10b36ef2 100644
--- a/addons/crm/wizard/crm_email_add_cc.py
+++ b/addons/crm/wizard/crm_email_add_cc.py
@@ -51,7 +51,7 @@ class crm_email_add_cc_wizard(osv.osv_memory):
         email = False
         if partner:
             addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
-            if addr:
+            if addr and addr['contact']:
                 email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
         elif user:
             addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
@@ -101,6 +101,9 @@ class crm_email_add_cc_wizard(osv.osv_memory):
             raise osv.except_osv(_('Email Fail!'), ("Lastest Email is not sent successfully"))
         return {}
 
+    def action_cancel(self, cr, uid, ids, context=None):
+        return {'type' : 'ir.actions.act_window_close'}
+
 crm_email_add_cc_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_email_add_cc_view.xml b/addons/crm/wizard/crm_email_add_cc_view.xml
index 7c6ea96df23..b017c9d9901 100644
--- a/addons/crm/wizard/crm_email_add_cc_view.xml
+++ b/addons/crm/wizard/crm_email_add_cc_view.xml
@@ -8,7 +8,8 @@
             <field name="model">crm.email.add.cc</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Forward">
+                <form string="Send mail to CC">
+                	<separator colspan="4" string="Send mail to CC" />
                     <field name="name" width="200" />
                     <field name="subject" colspan="4" />
                     <separator colspan="4" string="" />
@@ -26,7 +27,8 @@
                     </group>
                     <field colspan="4" name="email" attrs="{ 'required' : [('name','=','email')]}" />
                     <separator colspan="4" string="" />
-                    <group col="1" colspan="4">
+                    <group col="2" colspan="4">
+                        <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
                         <button name="add_cc" string="_Forward" type="object" icon="gtk-ok" />
                     </group>
                 </form>

From 2d8f54048162a78f5a43ba340eb459f947c8a4be Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 12:48:00 +0530
Subject: [PATCH 051/146] [IMP]: crm: Minor improvement in opportunity view

bzr revid: rpa@tinyerp.com-20100503071800-rqcl9m9x9pfs1d57
---
 addons/crm/crm_opportunity_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index ec41af2f3e4..f43eeda67a3 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -86,7 +86,7 @@
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
-                    <group col="3" colspan="2">
+                    <group col="4" colspan="2">
                         <separator colspan="4" string="Contacts"/>
                         <field name="partner_id" select="1"
                             on_change="onchange_partner_id(partner_id, email_from)"

From 250f8a700badd53daa330e846640e0fc0b5fb6ca Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 13:00:34 +0530
Subject: [PATCH 052/146] [IMP]: crm: Improved phonecall views, for incomming
 phonecalls state buttons are not needed

bzr revid: rpa@tinyerp.com-20100503073034-3vgimed2m0utzge9
---
 addons/crm/crm_phonecall_menu.xml |  2 +-
 addons/crm/crm_phonecall_view.xml | 58 +++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 176e5aed7bc..b32a780c4ce 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -76,7 +76,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_phone_form_view"/>
+        <field name="view_id" ref="crm_case_incomming_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index e5d6c7565df..601eb3f88b3 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -137,7 +137,65 @@
             </form>
         </field>
     </record>
+	
+	<!--Inbound Phonecalls Form View -->
 
+	<record model="ir.ui.view" id="crm_case_incomming_phone_form_view">
+        <field name="name">CRM - Inbound Phone Call Form</field>
+        <field name="model">crm.phonecall</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Phone Call">
+                <group colspan="4" col="7">
+                    <field name="name" string="Call Summary"/>
+                    <field name="date" string="Planned Date"/>
+                    <field name="user_id"/>
+                    <button string="Schedule a Meeting"
+                        name="action_make_meeting"
+                        icon="gtk-redo"
+                        type="object" />
+
+                    <field name="partner_phone"/>
+                    <field name="duration"/>
+                    <field name="section_id" colspan="1" widget="selection" />
+                    <button string="Convert to Opportunity"
+                        name="%(phonecall2opportunity_act)d"
+                        icon="gtk-index" type="action"
+                        attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                    <label colspan="6"  string=""/>
+                    <button string="Schedule Other Call"
+                     icon="gtk-redo"
+                    name="%(phonecall_to_phonecall_act)d"
+                    type="action"  />
+
+                </group>
+                <group col="3" colspan="2">
+                    <separator colspan="3" string="Contacts" />
+                    <field name="partner_id"
+                        on_change="onchange_partner_id(partner_id, email_from)" />
+                    <button string="Create a Partner"
+                        icon="terp-crm"
+                        name="%(action_crm_phonecall2partner)d"
+                        type="action"
+                        attrs="{'invisible':[('partner_id','!=',False)]}" />
+                    <newline/>
+                    <field name="partner_address_id" string="Contact"
+                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                    <newline/>
+                    <field name="partner_mobile" />
+                </group>
+                <group col="2" colspan="2">
+                    <separator colspan="2" string="Categorization" />
+                    <field name="priority"/>
+                    <field name="opportunity_id"/>
+                </group>
+                <separator string="Description" colspan="4" />
+                <field name="description" nolabel="1" colspan="4" />
+                <separator colspan="4" />
+            </form>
+        </field>
+    </record>
+    
 <!-- Phonecalls Calendar View -->
 
     <record model="ir.ui.view" id="crm_case_phone_calendar_view">

From 56936a1b0a4a85342c8c122a064d62b46ed93dc8 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 3 May 2010 15:58:01 +0530
Subject: [PATCH 053/146] [IMP]:account installer

bzr revid: nch@tinyerp.com-20100503102801-p7fxk407o5s1ymyj
---
 addons/account/account_installer.xml | 15 ++++++++-------
 addons/account/installer.py          | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 3cd0495904e..5eec07067ef 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -29,10 +29,13 @@
 	      </xpath>
 	      <group colspan="8">
             <field name="charts" colspan="8"/>
-            <field name="account_analytic_plans"/>
-            <field name="account_payment"/>
-            <field name="account_followup"/>
-            <field name="account_asset"/>
+            <group colspan="4" groups="base.group_extended">
+            	<separator col="4" colspan="4" string="Install Extra Account Module"/>
+            	<field name="account_analytic_plans"/>
+            	<field name="account_payment"/>
+            	<field name="account_followup"/>
+            	<field name="account_asset"/>
+            </group>
              <group colspan="4" attrs="{'invisible':[('charts','=',False)]}">
             	<separator col="4" colspan="4" string="Bank and Cost Account"/>
                 <field name="account_name" colspan="2"/>
@@ -40,9 +43,7 @@
                 <field name="account_currency" colspan="2" widget="selection"/>
             </group>
             <group colspan="4">
-            	<separator col="4" colspan="4" string="Fiscal Year"/>
-                <field name="name"/>
-                <field name="code"/>
+            	<separator col="4" colspan="4" string="Configure Fiscal Year"/>
                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                 <field name="date_stop"/>
                 <field name="period" colspan="4"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 31618122af8..ca62f758788 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -60,21 +60,15 @@ class account_installer(osv.osv_memory):
         'account_asset':fields.boolean('Assets Management',
             help="Enables asset management in the accounting application, "
                  "including asset categories and usage periods."),
-        'name':fields.char('Name', required=True, size=64,
-            help="Name of the fiscal year as displayed on screens."),
-        'code':fields.char('Code', required=True, size=64,
-            help="Name of the fiscal year as displayed in reports."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
-        'period':fields.selection([('month','Month'), ('3months','3 Months')],
+        'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
                                   'Periods', required=True),
         'account_name':fields.char('Name', size=128),
         'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
         'account_currency':fields.many2one('res.currency', 'Currency')
         }
     _defaults = {
-        'code': lambda *a: time.strftime('%Y'),
-        'name': lambda *a: time.strftime('%Y'),
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
         'period':lambda *a:'month',
@@ -91,11 +85,14 @@ class account_installer(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         super(account_installer, self).execute(cr, uid, ids, context=context)
         for res in self.read(cr,uid,ids):
-            if 'date1' in res and 'date2' in res:
+            if 'date_start' in res and 'date_stop' in res:
+                name = res['date_start'][:4]
+                if int(name) != int(res['date_stop'][:4]):
+                    name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
+                    code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
                 res_obj = self.pool.get('account.fiscalyear')
-                name = res['name']
-                vals = {'name':res['name'],
-                        'code':res['code'],
+                vals = {'name':name,
+                        'code':code,
                         'date_start':res['date_start'],
                         'date_stop':res['date_stop'],
                        }

From 8c6721d3aba1d24eb2d8e9534af3bf5ef5ba70b3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 16:05:45 +0530
Subject: [PATCH 054/146] [IMP]: crm: Removed print

bzr revid: rpa@tinyerp.com-20100503103545-h5f8g583ceamhsvu
---
 addons/crm/wizard/crm_forward_to_partner.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index fb85794f64a..797373437ce 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -127,7 +127,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                 ]
         
                 for field_name in field_names:
-                    print field_name
                     field_definition = lead_proxy._columns[field_name]
                     value = None
         
@@ -138,7 +137,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                             key = field.definition.selection
                         value = dict(key).get(lead[field_name], lead[field_name])
                     elif field_definition._type == 'many2one':
-                        print '>>>>>>>>>>>', lead[field_name], field_name
                         if lead[field_name]:
                             value = lead[field_name].name_get()[0][1]
                     else:

From ee4052bc1adbc7d65075b79001880f6857392724 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 18:00:48 +0530
Subject: [PATCH 055/146] [IMP]: crm: Major changes in crm * Removed crm.case *
 Inherited other cases from mailgate.thread * Changes in lead and opportunity:
 Removed dependency from crm.case and added for mailgate.thread * still lot of
 things to fix(TODO): meeting, phonecall/reports

bzr revid: rpa@tinyerp.com-20100503123048-642v3gt4gorubmrs
---
 addons/crm/__init__.py                        |   2 +-
 addons/crm/__openerp__.py                     |  10 +-
 addons/crm/crm.py                             | 497 ------------------
 addons/crm/crm_action_rule.py                 |  26 +-
 addons/crm/crm_lead.py                        | 190 ++++++-
 addons/crm/crm_lead_view.xml                  |  10 +-
 addons/crm/crm_mailgate.py                    |   4 +-
 addons/crm/crm_meeting.py                     |  14 +-
 addons/crm/crm_meeting_menu.xml               |   2 +-
 addons/crm/crm_opportunity.py                 | 145 ++---
 addons/crm/crm_opportunity_view.xml           |   2 +-
 addons/crm/crm_phonecall.py                   |  10 +-
 addons/crm/crm_view.xml                       |  19 +-
 .../crm/process/crm_configuration_process.xml |   8 +-
 addons/crm/report/__init__.py                 |   2 +-
 addons/crm/report/crm_lead_report.py          |   2 +-
 addons/crm/report/crm_phonecall_report.py     |   2 +-
 addons/crm/security/ir.model.access.csv       |   2 -
 .../wizard/crm_opportunity_to_phonecall.py    |   2 +-
 addons/crm/wizard/crm_send_email.py           |  18 +-
 addons/crm_claim/crm_claim.py                 |   2 +-
 addons/crm_fundraising/crm_fundraising.py     |   2 +-
 addons/crm_helpdesk/crm_helpdesk.py           |   2 +-
 addons/mail_gateway/mail_gateway.py           | 103 +++-
 24 files changed, 402 insertions(+), 674 deletions(-)

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index de0fac56e29..2d340e7bfc5 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -30,7 +30,7 @@ import crm_opportunity
 import crm_phonecall
 
 import crm_installer
-import report
+#import report
 import wizard
 
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 733ba91f356..2b4f827b6df 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -91,12 +91,12 @@ between mails and Open ERP.""",
         'crm_opportunity_menu.xml',
         
         'security/crm_security.xml',
-        'security/ir.model.access.csv',
+#        'security/ir.model.access.csv',
 
-        'report/crm_report_view.xml',
-        'report/crm_lead_report_view.xml',
-#        'report/crm_opportunity_report_view.xml' ,
-        'report/crm_phonecall_report_view.xml',
+##        'report/crm_report_view.xml',
+#        'report/crm_lead_report_view.xml',
+##        'report/crm_opportunity_report_view.xml' ,
+#        'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
         'crm_installer_view.xml'
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 9d0473c1f1e..2e95ffff8ec 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -241,503 +241,6 @@ def _links_get(self, cr, uid, context=None):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-class crm_case(osv.osv):
-    """ CRM Case """
-
-    _name = "crm.case"
-    _description = "Case"
-
-    def _email_last(self, cursor, user, ids, name, arg, context=None):
-        """Return last email from History
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-        res = {}
-        for case in self.browse(cursor, user, ids):
-            if case.history_line:
-                res[case.id] = case.history_line[0].description
-            else:
-                res[case.id] = False
-        return res
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        """Overrides orm copy method
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-        if not context:
-            context = {}
-        if not default:
-            default = {}
-        default.update({'state': 'draft', 'id': False})
-        return super(crm_case, self).copy(cr, uid, id, default, context)
-
-    def _get_log_ids(self, cr, uid, ids, field_names, arg, context=None):
-        """Gets id for case log from history of particular case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Case IDs
-        @param context: A standard dictionary for contextual values
-        @return:Dictionary of History Ids
-        """
-        if not context:
-            context = {}
-
-        result = {}
-        history_obj = False
-        model_obj = self.pool.get('ir.model')
-
-        if 'history_line' in field_names:
-            history_obj = self.pool.get('crm.case.history')
-            name = 'history_line'
-
-        if 'log_ids' in field_names:
-            history_obj = self.pool.get('crm.case.log')
-            name = 'log_ids'
-
-        if not history_obj:
-            return result
-
-        for case in self.browse(cr, uid, ids, context):
-            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            history_ids = history_obj.search(cr, uid, [('model_id', '=', model_ids[0]), \
-                                         ('res_id', '=', case.id)])
-            if history_ids:
-                result[case.id] = {name: history_ids}
-            else:
-                result[case.id] = {name: []}
-
-        return result
-
-    _columns = {
-        'id': fields.integer('ID', readonly=True), 
-        'name': fields.char('Description', size=1024, required=True), 
-        'active': fields.boolean('Active', help="If the active field is set to\
-                     true, it will allow you to hide the case without removing it."), 
-        'description': fields.text('Description'), 
-        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                        select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'), 
-        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
-                             will receive a copy of the future" \
-                            " communication between partner and users by email"), 
-        'probability': fields.float('Probability'), 
-        'email_last': fields.function(_email_last, method=True, 
-            string='Latest E-Mail', type='text'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"), 
-        'create_date': fields.datetime('Creation Date' , readonly=True), 
-        'write_date': fields.datetime('Update Date' , readonly=True), 
-        'date_deadline': fields.date('Deadline'), 
-        'user_id': fields.many2one('res.users', 'Responsible'), 
-        'history_line': fields.function(_get_log_ids, method=True, type='one2many', \
-                         multi="history_line", relation="crm.case.history", string="Communication"), 
-        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', \
-                         multi="log_ids", relation="crm.case.log", string="Logs History"), 
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.lead')]"), 
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 
-                                  help='The state is set to \'Draft\', when a case is created.\
-                                  \nIf the case is in progress the state is set to \'Open\'.\
-                                  \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\'.'), 
-        'company_id': fields.many2one('res.company', 'Company'), 
-    }
-    def _get_default_partner_address(self, cr, uid, context):
-        """Gives id of default address for current user
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        if not context.get('portal', False):
-            return False
-        return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
-
-    def _get_default_partner(self, cr, uid, context):
-        """Gives id of partner for current user
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        if not context.get('portal', False):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        if not user.address_id:
-            return False
-        return user.address_id.partner_id.id
-
-    def _get_default_email(self, cr, uid, context):
-        """Gives default email address for current user
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        if not context.get('portal', False):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        if not user.address_id:
-            return False
-        return user.address_id.email
-
-    def _get_default_user(self, cr, uid, context):
-        """Gives current user id
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        if context.get('portal', False):
-            return False
-        return uid
-
-    def _get_section(self, cr, uid, context):
-        """Gives section id for current User
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.context_section_id.id or False
-
-    _defaults = {
-        'active': lambda *a: 1, 
-        'user_id': _get_default_user, 
-        'partner_id': _get_default_partner, 
-        'partner_address_id': _get_default_partner_address, 
-        'email_from': _get_default_email, 
-        'state': lambda *a: 'draft', 
-        'section_id': _get_section, 
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
-    }
-
-    _order = 'date_deadline desc, create_date desc,id desc'
-
-    def unlink(self, cr, uid, ids, context=None):
-        """Overrides orm unlink method
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values
-        """
-        if not context:
-            context = {}
-        
-        hist_obj = self.pool.get('crm.case.history') 
-        log_obj = self.pool.get('crm.case.log')
-
-        for case in self.browse(cr, uid, ids, context):
-            if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
-                raise osv.except_osv(_('Warning !'), 
-                    _('You can not delete this case. You should better cancel it.'))
-
-            # Also removing history and logs 
-            history_ids = map(lambda x: x.id, case.history_line)
-            log_ids = map(lambda x: x.id, case.log_ids)
-            hist_obj.unlink(cr, uid, history_ids, context=context)
-            log_obj.unlink(cr, uid, log_ids, context=context)
-        return super(crm_case, self).unlink(cr, uid, ids, context)
-
-    def stage_next(self, cr, uid, ids, context=None):
-        """This function computes next stage for case from its current stage
-             using available stage for that case type 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        s = self.get_stage_dict(cr, uid, ids, context=context)
-        for case in self.browse(cr, uid, ids, context):
-            section = (case.section_id.id or False)
-            if section in s:
-                st = case.stage_id.id  or False
-                if st in s[section]:
-                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
-        return True
-
-    def get_stage_dict(self, cr, uid, ids, context=None):
-        """This function gives dictionary for stage according to stage levels
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        sid = self.pool.get('crm.case.stage').search(cr, uid, \
-                            [('object_id.model', '=', self._name)], context=context)
-        s = {}
-        previous = {}
-        for stage in self.pool.get('crm.case.stage').browse(cr, uid, sid, context=context):
-            section = stage.section_id.id or False
-            s.setdefault(section, {})
-            s[section][previous.get(section, False)] = stage.id
-            previous[section] = stage.id
-        return s
-
-    def stage_previous(self, cr, uid, ids, context=None):
-        """This function computes previous stage for case from its current stage
-             using available stage for that case type 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        s = self.get_stage_dict(cr, uid, ids, context=context)
-        for case in self.browse(cr, uid, ids, context):
-            section = (case.section_id.id or False)
-
-            if section in s:
-                st = case.stage_id.id or False
-                s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
-                if st in s[section]:
-                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
-        return True
-
-    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param cases: a browse record list
-        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
-        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
-        @param email: Email address if any
-        @param details: Details of case history if any 
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        # The mailgate sends the ids of the cases and not the object list
-        if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
-            cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
-
-        model_obj = self.pool.get('ir.model')
-        obj = self.pool.get('crm.case.log')
-        for case in cases:
-            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            data = {
-                'name': keyword,
-                'user_id': uid,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'model_id' : model_ids and model_ids[0] or False,
-                'res_id': case.id,
-                'section_id': case.section_id.id,
-                'message_id':message_id
-            }
-
-            if history:
-                obj = self.pool.get('crm.case.history')
-                data['description'] = details or case.description
-                data['email_to'] = email or \
-                        (case.section_id and case.section_id.reply_to) or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
-                data['email_from'] = email_from or \
-                        (case.section_id and case.section_id.reply_to) or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
-            res = obj.create(cr, uid, data, context)
-        return True
-    
-    _history = __history
-    history = __history
-
-    def create(self, cr, uid, *args, **argv):
-        """Overrides orm create method
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param *args: Tuple Value for additional Params
-        @param **argv: Dictionay of Keyword Params
-        """
-        res = super(crm_case, self).create(cr, uid, *args, **argv)
-        cases = self.browse(cr, uid, [res])
-        cases[0].state # to fill the browse record cache
-        self._action(cr, uid, cases, 'draft')
-        return res
-
-    def add_reply(self, cursor, user, ids, context=None):
-        """This function finds last email and gives its description value for reply mail
-        @param self: The object pointer
-        @param cursor: the current row, from the database cursor,
-        @param user: the current user’s ID for security checks
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values
-        """
-        for case in self.browse(cursor, user, ids, context=context):
-            if case.email_last:
-                description = case.email_last
-                self.write(cursor, user, case.id, {
-                    'description': '> ' + description.replace('\n', '\n> '), 
-                    }, context=context)
-        return True
-
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """This function returns value of partner address based on partner
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param part: Partner's id
-        @email: Partner's email ID 
-        """
-        if not part:
-            return {'value': {'partner_address_id': False, 
-                            'email_from': False, 
-                            }}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-        data = {'partner_address_id': addr['contact']}
-        data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
-
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """This function returns value of partner email based on Partner Address
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param add: Id of Partner's address
-        @email: Partner's email ID 
-        """
-        if not add:
-            return {'value': {'email_from': False}}
-        address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        return {'value': {'email_from': address.email}}
-
-    def case_close(self, cr, uid, ids, *args):
-        """Closes Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.__history(cr, uid, cases, _('Close'))
-        self.write(cr, uid, ids, {'state': 'done',
-                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
-                                  'probability' : 100.0})
-        #
-        # We use the cache of cases to keep the old case state
-        #
-        self._action(cr, uid, cases, 'done')
-        return True
-
-    def case_escalate(self, cr, uid, ids, *args):
-        """Escalates case to top level
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            data = {'active': True, 'user_id': False}
-
-            if case.section_id.parent_id:
-                data['section_id'] = case.section_id.parent_id.id
-                if case.section_id.parent_id.user_id:
-                    data['user_id'] = case.section_id.parent_id.user_id.id
-            else:
-                raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
-            self.write(cr, uid, [case.id], data)
-        cases = self.browse(cr, uid, ids)
-        self.__history(cr, uid, cases, _('Escalate'))
-        self._action(cr, uid, cases, 'escalate')
-        return True
-
-    def case_open(self, cr, uid, ids, *args):
-        """Opens Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        self.__history(cr, uid, cases, _('Open'))
-
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            self.write(cr, uid, case.id, data)
-        self._action(cr, uid, cases, 'open')
-        return True
-
-    def case_cancel(self, cr, uid, ids, *args):
-        """Cancels Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.__history(cr, uid, cases, _('Cancel'))
-        self.write(cr, uid, ids, {'state': 'cancel',
-                                  'active': True,
-                                  'probability' : 0.0})
-        self._action(cr, uid, cases, 'cancel')
-        return True
-
-    def case_pending(self, cr, uid, ids, *args):
-        """Marks case as pending
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.__history(cr, uid, cases, _('Pending'))
-        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
-        self._action(cr, uid, cases, 'pending')
-        return True
-
-    def case_reset(self, cr, uid, ids, *args):
-        """Resets case as draft
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self.__history(cr, uid, cases, _('Draft'))
-        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
-        self._action(cr, uid, cases, 'draft')
-        return True
-
-crm_case()
-
 
 class crm_case_log(osv.osv):
     """ Case Communication History """
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 78fc7e3bd8c..47e02b9308f 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -37,7 +37,7 @@ import crm
 class case(osv.osv):
     """ Case """
 
-    _inherit = 'crm.case'
+    _inherit = 'mailgate.thread'
     _description = 'case'
 
     _columns = {
@@ -89,7 +89,7 @@ class case(osv.osv):
                 attach_to_send = None
 
                 if attach:
-                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', 'crm.case'), ('res_id', '=', case.id)])
+                    attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', 'mailgate.thread'), ('res_id', '=', case.id)])
                     attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname','datas'])
                     attach_to_send = map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send)
 
@@ -195,16 +195,18 @@ class base_action_rule(osv.osv):
             ok = ok and (not action.trg_section_id or action.trg_section_id.id==obj.section_id.id)
         if hasattr(obj, 'categ_id'):
             ok = ok and (not action.trg_categ_id or action.trg_categ_id.id==obj.categ_id.id)
-        if hasattr(obj, 'history_line'):
-            ok = ok and (not action.trg_max_history or action.trg_max_history<=(len(obj.history_line)+1))
-            reg_history = action.regex_history
-            result_history = True
-            if reg_history:
-                ptrn = re.compile(str(reg_history))
-                if obj.history_line:
-                    _result = ptrn.search(str(obj.history_line[0].description))
-                    if not _result:
-                        result_history = False
+
+#    TODO: history_line is removed
+#        if hasattr(obj, 'history_line'):
+#            ok = ok and (not action.trg_max_history or action.trg_max_history<=(len(obj.history_line)+1))
+#            reg_history = action.regex_history
+#            result_history = True
+#            if reg_history:
+#                ptrn = re.compile(str(reg_history))
+#                if obj.history_line:
+#                    _result = ptrn.search(str(obj.history_line[0].description))
+#                    if not _result:
+#                        result_history = False
             regex_h = not reg_history or result_history
             ok = ok and regex_h
         return ok
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 730f668567e..db01e94ccc6 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -33,7 +33,7 @@ class crm_lead(osv.osv):
     _name = "crm.lead"
     _description = "Leads Cases"
     _order = "priority, id desc"
-    _inherit = ['res.partner.address', 'crm.case']
+    _inherit = ['res.partner.address', 'mailgate.thread']
 
     def case_open(self, cr, uid, ids, *args):
         """
@@ -106,7 +106,19 @@ class crm_lead(osv.osv):
         return res
 
     _columns = {
-
+        # From crm.case
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                        select=True, help='Sales team to which Case belongs to.\
+                             Define Responsible user and Email account for mail gateway.'), 
+        'create_date': fields.datetime('Creation Date' , readonly=True),
+        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+                             will receive a copy of the future" \
+                            " communication between partner and users by email"),
+        'description': fields.text('Description'), 
+        'write_date': fields.datetime('Update Date' , readonly=True), 
+        
+        # Lead fields 
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
@@ -139,7 +151,69 @@ class crm_lead(osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
+    def stage_next(self, cr, uid, ids, context=None):
+        """This function computes next stage for case from its current stage
+             using available stage for that case type 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
 
+        s = self.get_stage_dict(cr, uid, ids, context=context)
+        for case in self.browse(cr, uid, ids, context):
+            section = (case.section_id.id or False)
+            if section in s:
+                st = case.stage_id.id  or False
+                if st in s[section]:
+                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
+        return True
+
+    def get_stage_dict(self, cr, uid, ids, context=None):
+        """This function gives dictionary for stage according to stage levels
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        sid = self.pool.get('crm.case.stage').search(cr, uid, \
+                            [('object_id.model', '=', self._name)], context=context)
+        s = {}
+        previous = {}
+        for stage in self.pool.get('crm.case.stage').browse(cr, uid, sid, context=context):
+            section = stage.section_id.id or False
+            s.setdefault(section, {})
+            s[section][previous.get(section, False)] = stage.id
+            previous[section] = stage.id
+        return s
+
+    def stage_previous(self, cr, uid, ids, context=None):
+        """This function computes previous stage for case from its current stage
+             using available stage for that case type 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        s = self.get_stage_dict(cr, uid, ids, context=context)
+        for case in self.browse(cr, uid, ids, context):
+            section = (case.section_id.id or False)
+
+            if section in s:
+                st = case.stage_id.id or False
+                s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
+                if st in s[section]:
+                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
+        return True
+    
     def convert_opportunity(self, cr, uid, ids, context=None):
         """ Precomputation for converting lead to opportunity
         @param cr: the current row, from the database cursor,
@@ -193,6 +267,118 @@ class crm_lead(osv.osv):
                         'nodestroy': True
                         }
         return value
+    
+    # From crm.case
+    
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Close'))
+        self.write(cr, uid, ids, {'state': 'done',
+                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                  })
+        #
+        # We use the cache of cases to keep the old case state
+        #
+        self._action(cr, uid, cases, 'done')
+        return True
+
+    def case_escalate(self, cr, uid, ids, *args):
+        """Escalates case to top level
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'active': True, 'user_id': False}
+
+            if case.section_id.parent_id:
+                data['section_id'] = case.section_id.parent_id.id
+                if case.section_id.parent_id.user_id:
+                    data['user_id'] = case.section_id.parent_id.user_id.id
+            else:
+                raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
+            self.write(cr, uid, [case.id], data)
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, _('Escalate'))
+        self._action(cr, uid, cases, 'escalate')
+        return True
+
+    def case_open(self, cr, uid, ids, *args):
+        """Opens Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, _('Open'))
+
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            self.write(cr, uid, case.id, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel',
+                                  'active': True})
+        self._action(cr, uid, cases, 'cancel')
+        return True
+
+    def case_pending(self, cr, uid, ids, *args):
+        """Marks case as pending
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Pending'))
+        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._action(cr, uid, cases, 'pending')
+        return True
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Draft'))
+        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
+        self._action(cr, uid, cases, 'draft')
+        return True
+        
 
 crm_lead()
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 00cd31820b5..d29460915c0 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -40,7 +40,7 @@
         <field name="arch" type="xml">
             <form string="Leads Form">
                 <group colspan="4" col="7">
-                    <field name="name" required="1" string="Name"/>
+                    <field name="name" required="1"/>
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
@@ -48,8 +48,7 @@
                          string="Convert"
                          help="Convert to Opportunity"
                          icon="gtk-index"   
-                         type="object"
-                         attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
+                         type="object"/>
                     <newline />
                     <field name="section_id" colspan="1"
                         widget="selection" />
@@ -153,7 +152,8 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                    <!-- TODO-->
+                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
@@ -179,7 +179,7 @@
                             <field name="email_to"/>
                             <field name="description"/>
                         </tree>
-                    </field>
+                    </field> 
                     <button colspan="2" string="Send New Email"
                         name="%(action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py
index fdb3c397f7b..00fa761f51d 100644
--- a/addons/crm/crm_mailgate.py
+++ b/addons/crm/crm_mailgate.py
@@ -38,8 +38,8 @@ from tools import command_re
 class crm_cases(osv.osv):
     """ crm cases """
 
-    _name = "crm.case"
-    _inherit = "crm.case"    
+    _name = "mailgate.thread"
+    _inherit = "mailgate.thread"    
 
     def message_new(self, cr, uid, msg, context):
         """
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 6979f3e5eee..2cf0edd8a7e 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -26,10 +26,6 @@ from datetime import datetime, timedelta
 from tools.translate import _
 from base_calendar import base_calendar
 
-class crm_opportunity(osv.osv):
-    _name = 'crm.opportunity'
-crm_opportunity()
-
 
 class crm_phonecall(osv.osv):
     """ CRM Phonecall """
@@ -43,14 +39,20 @@ class crm_meeting(osv.osv):
     _name = 'crm.meeting'
     _description = "Meeting Cases"
     _order = "id desc"
-    _inherit = ["crm.case", "calendar.event"]
+    _inherit = ["mailgate.thread", "calendar.event"]
 
     _columns = {
+        # From crm.case
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                        select=True, help='Sales team to which Case belongs to.\
+                             Define Responsible user and Email account for mail gateway.'), 
+        # Meeting fields
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
                         domain="[('object_id.model', '=', 'crm.meeting')]", \
             ),
         'phonecall_id': fields.many2one ('crm.phonecall', 'Phonecall'),
-        'opportunity_id': fields.many2one ('crm.opportunity', 'Opportunity'),
+        'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
         'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
                                  'event_id', 'attendee_id', 'Attendees'),
         'date_closed': fields.datetime('Closed', readonly=True),
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3f680b61f15..3fd8a37d05e 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -47,7 +47,7 @@
         id="crm_case_categ_meet_case"
         name="Schedule a Meeting"
         res_model="crm.meeting"
-        src_model="crm.case"
+        src_model="mailgate.thread"
         view_mode="calendar,tree,form,gantt"
         context="{'default_case_id': active_id, 'default_duration': 4.0}"
         />
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index ecda7dc54f1..e527042b0e5 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -55,78 +55,16 @@ class crm_opportunity(osv.osv):
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
-    def _compute_day(self, cr, uid, ids, fields, args, context={}):
-        """
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Openday’s IDs
-        @return: difference between current date and log date
-        @param context: A standard dictionary for contextual values
-        """
-        cal_obj = self.pool.get('resource.calendar')
-        res_obj = self.pool.get('resource.resource')
-
-        res = {}
-        for opportunity in self.browse(cr, uid, ids , context):
-            for field in fields:
-                res[opportunity.id] = {}
-                duration = 0
-                ans = False
-                if field == 'day_open':
-                    if opportunity.date_open:
-                        date_create = datetime.strptime(opportunity.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_open = datetime.strptime(opportunity.date_open, "%Y-%m-%d %H:%M:%S")
-                        ans = date_open - date_create
-                        date_until = opportunity.date_open
-                elif field == 'day_close':
-                    if opportunity.date_closed:
-                        date_create = datetime.strptime(opportunity.create_date, "%Y-%m-%d %H:%M:%S")
-                        date_close = datetime.strptime(opportunity.date_closed, "%Y-%m-%d %H:%M:%S")
-                        date_until = opportunity.date_closed
-                        ans = date_close - date_create
-                if ans:
-                    resource_id = False
-                    if opportunity.user_id:
-                        resource_ids = res_obj.search(cr, uid, [('user_id','=',opportunity.user_id.id)])
-                        if resource_ids and len(resource_ids):
-                            resource_id = resource_ids[0]
-
-                    duration = float(ans.days)
-                    if opportunity.section_id and opportunity.section_id.resource_calendar_id:
-                        duration =  float(ans.days) * 24                        
-                        new_dates = cal_obj.interval_get(cr,
-                            uid,
-                            opportunity.section_id.resource_calendar_id and opportunity.section_id.resource_calendar_id.id or False,
-                            mx.DateTime.strptime(opportunity.create_date, '%Y-%m-%d %H:%M:%S'),
-                            duration,
-                            resource=resource_id
-                        )
-                        no_days = []
-                        date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
-                        for in_time, out_time in new_dates:
-                            if in_time.date not in no_days:
-                                no_days.append(in_time.date)
-                            if out_time > date_until:
-                                break
-                        duration =  len(no_days)
-                res[opportunity.id][field] = abs(int(duration))
-        return res
-
     _columns = {
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                     domain="[('section_id','=',section_id),\
-                    ('object_id.model', '=', 'crm.lead')]"),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', \
-                     domain="[('section_id','=',section_id), \
-                    ('object_id.model', '=', 'crm.lead')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'referred': fields.char('Referred By', size=64),
+        # From crm.case
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+
+        # Opportunity fields
         'probability': fields.float('Probability (%)'),
         'planned_revenue': fields.float('Expected Revenue'),
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
         'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'user_id': fields.many2one('res.users', 'Salesman'),
         'phone': fields.char("Phone", size=64),
         'date_deadline': fields.date('Expected Closing'),
         'date_action': fields.date('Next Action'),
@@ -136,12 +74,44 @@ class crm_opportunity(osv.osv):
                                   \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\'.'),
 
-        'date_open': fields.datetime('Opened', readonly=True),
-        'day_open': fields.function(_compute_day, string='Days to Open', \
-                                method=True, multi='day_open', type="float", store=True),
-        'day_close': fields.function(_compute_day, string='Days to Close', \
-                                method=True, multi='day_close', type="float", store=True),
          }
+    
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Close'))
+        self.write(cr, uid, ids, {'state': 'done',
+                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                  'probability' : 100.0})
+        #
+        # We use the cache of cases to keep the old case state
+        #
+        self._action(cr, uid, cases, 'done')
+        return True
+    
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel',
+                                  'active': True,
+                                  'probability' : 0.0})
+        self._action(cr, uid, cases, 'cancel')
+        return True
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
 
@@ -157,35 +127,7 @@ class crm_opportunity(osv.osv):
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
         if not stage.on_change:
             return {'value':{}}
-        return {'value':{'probability':stage.probability}}
-
-    def stage_next(self, cr, uid, ids, context={}):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of stage next’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        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:
-                self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
-        return res
-
-    def stage_previous(self, cr, uid, ids, context={}):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of stage previous’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        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:
-                self.write(cr, uid, [case.id], {'probability': case.stage_id.probability})
-        return res
+        return {'value':{'probability': stage.probability}}
 
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
@@ -246,3 +188,4 @@ class crm_opportunity(osv.osv):
 
 crm_opportunity()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index f43eeda67a3..3d81a17d7e0 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -165,7 +165,7 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 68c94522d7b..77fc1662576 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -30,9 +30,17 @@ class crm_phonecall(osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall Cases"
     _order = "id desc"
-    _inherit = 'crm.case'
+    _inherit = 'mailgate.thread'
 
     _columns = {
+        # From crm.case
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                        select=True, help='Sales team to which Case belongs to.\
+                             Define Responsible user and Email account for mail gateway.'), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        
+        # phonecall fields
         'duration': fields.float('Duration'),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="[('section_id','=',section_id),\
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3f0b42a5122..e6da8228ea6 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -256,7 +256,7 @@
 
         <record id="crm_case_calendar-view" model="ir.ui.view">
             <field name="name">crm.case.calendar</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="create_date"
@@ -273,7 +273,7 @@
 
         <record id="crm_case_tree-view" model="ir.ui.view">
             <field name="name">crm.case.tree</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:date_deadline&lt;current_date and state=='open';black:state in ('draft', 'cancel','done','pending')" string="Cases">
@@ -311,7 +311,7 @@
 
         <record id="crm_case-view" model="ir.ui.view">
             <field name="name">crm.case.form</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">form</field>
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
@@ -392,7 +392,8 @@
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>
-                           <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                            <!-- TODO-->
+                           <!-- <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                                <form string="Communication history">
                                    <group col="7" colspan="4">
                                        <field name="date"/>
@@ -416,7 +417,7 @@
                                    <field name="email_to"/>
                                    <field name="date"/>
                                </tree>
-                           </field>
+                           </field> -->
                            <button colspan="4" string="Send New Email"
                                name="%(action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'crm.case'}"
@@ -431,7 +432,7 @@
 
         <record id="view_crm_case_filter" model="ir.ui.view">
             <field name="name">crm.case.select</field>
-            <field name="model">crm.case</field>
+            <field name="model">mailgate.thread</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Case">
@@ -463,7 +464,7 @@
 
         <record id="crm_case_categ0-act" model="ir.actions.act_window">
             <field name="name">Cases</field>
-            <field name="res_model">crm.case</field>
+            <field name="res_model">mailgate.thread</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_tree-view"/>
             <field name="search_view_id" ref="view_crm_case_filter"/>
@@ -471,7 +472,7 @@
 
         <record id="crm_case_categ0-act_open" model="ir.actions.act_window">
             <field name="name">Open Cases</field>
-            <field name="res_model">crm.case</field>
+            <field name="res_model">mailgate.thread</field>
             <field name="view_type">form</field>
             <field name="domain">
                 [('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
@@ -481,7 +482,7 @@
 
         <record id="crm_case_section_open_act" model="ir.actions.act_window">
             <field name="name">Cases</field>
-            <field name="res_model">crm.case</field>
+            <field name="res_model">mailgate.thread</field>
             <field name="domain">[('section_id','child_of',[active_id])]</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
diff --git a/addons/crm/process/crm_configuration_process.xml b/addons/crm/process/crm_configuration_process.xml
index e2c6b7514be..146d76cc8d2 100644
--- a/addons/crm/process/crm_configuration_process.xml
+++ b/addons/crm/process/crm_configuration_process.xml
@@ -8,7 +8,7 @@
 
         <record id="process_process_contractprocess0" model="process.process">
 			<field eval="1" name="active"/>
-			<field name="model_id" ref="crm.model_crm_case"/>
+			<field name="model_id" ref="mail_gateway.model_mailgate_thread"/>
 			<field eval="&quot;&quot;&quot;Contract&quot;&quot;&quot;" name="name"/>
 		</record>
 
@@ -17,7 +17,7 @@
 		-->
 
 		<record id="process_node_leads0" model="process.node">
-			<field name="model_id" ref="crm.model_crm_case"/>
+			<field name="model_id" ref="mail_gateway.model_mailgate_thread"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Leads&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Very first contact with new prospect&quot;&quot;&quot;" name="note"/>
@@ -37,7 +37,7 @@
 		</record>
 
 		<record id="process_node_opportunities0" model="process.node">
-			<field name="model_id" ref="crm.model_crm_case"/>
+			<field name="model_id" ref="mail_gateway.model_mailgate_thread"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Opportunities&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;When a real project/opportunity is detected&quot;&quot;&quot;" name="note"/>
@@ -47,7 +47,7 @@
 		</record>
 
 		<record id="process_node_meeting0" model="process.node">
-			<field name="model_id" ref="crm.model_crm_case"/>
+			<field name="model_id" ref="mail_gateway.model_mailgate_thread"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 			<field eval="&quot;&quot;&quot;Meeting&quot;&quot;&quot;" name="name"/>
 			<field eval="&quot;&quot;&quot;Schedule a normal or phone meeting&quot;&quot;&quot;" name="note"/>
diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py
index 9603718190f..11f9ae5b3ad 100644
--- a/addons/crm/report/__init__.py
+++ b/addons/crm/report/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 #import report_businessopp
-import crm_report
+#import crm_report
 import crm_lead_report
 import crm_phonecall_report
 #import crm_opportunity_report
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index d400700c0b5..0d09185dec8 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -34,7 +34,7 @@ class crm_lead_report(osv.osv):
     """ CRM Lead Report """
     _name = "crm.lead.report"
     _auto = False
-    _inherit = "crm.case.report"
+#    _inherit = "crm.case.report"
     _description = "CRM Lead Report"
 
     _columns = {
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 40b34779aba..ad9591188e8 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -28,7 +28,7 @@ class crm_phonecall_report(osv.osv):
     _name = "crm.phonecall.report"
     _description = "Phone calls by user and section"
     _auto = False
-    _inherit = "crm.case.report"
+#    _inherit = "crm.case.report"
 
     _columns = {
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 7c8c393b63f..62d069c3004 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -3,8 +3,6 @@
 "access_crm_segmentation_line","crm.segmentation.line","model_crm_segmentation_line","crm.group_crm_manager",1,1,1,1
 "access_crm_case_section","crm.case.section","model_crm_case_section","crm.group_crm_user",1,0,0,0
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","crm.group_crm_user",1,0,0,0
-"access_crm_case_manger","crm.case manager","model_crm_case","crm.group_crm_user",1,1,1,1
-"access_crm_case","crm.case","model_crm_case","crm.group_crm_manager",1,1,1,1
 "access_crm_meeting","crm.meeting","model_crm_meeting","crm.group_crm_manager",1,1,1,1
 "access_crm_lead","crm.lead","model_crm_lead","crm.group_crm_manager",1,1,1,1
 "access_crm_phonecall","crm.phonecall","model_crm_phonecall","crm.group_crm_manager",1,1,1,1
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 38b4e157f52..948d8219ec2 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -84,7 +84,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
         record_ids = context and context.get('active_ids', []) or []
 
         phonecall_obj = self.pool.get('crm.phonecall')
-        opp_obj = self.pool.get('crm.opportunity')
+        opp_obj = self.pool.get('crm.lead')
         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'])
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index b0d20cd6e55..8e38babbfa8 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -55,7 +55,7 @@ class crm_send_new_email(osv.osv_memory):
         """ This sends an email to ALL the addresses of the selected partners.
         """
 
-        hist_obj = self.pool.get('crm.case.history')
+        hist_obj = self.pool.get('mailgate.message')
         smtp_pool = self.pool.get('email.smtpclient')
 
         if not context:
@@ -76,14 +76,14 @@ class crm_send_new_email(osv.osv_memory):
             
             case = case_pool.browse(cr, uid, res_id)
             if context.get('mail', 'new') == 'new':
-                if len(case.history_line):
-                    message_id = case.history_line[0].message_id
+                if len(case.message_ids):
+                    message_id = case.message_ids[0].message_id
             else:
                 hist = hist_obj.browse(cr, uid, res_id)
                 message_id = hist.message_id
-                model = hist.log_id.model_id.model
+                model = hist.model_id.model
                 model_pool = self.pool.get(model)
-                case = model_pool.browse(cr, uid, hist.log_id.res_id)
+                case = model_pool.browse(cr, uid, hist.res_id)
             emails = [data['email_to']] + (data['email_cc'] or '').split(',')
             emails = filter(None, emails)
             body = data['text']
@@ -179,15 +179,15 @@ class crm_send_new_email(osv.osv_memory):
         """
         This function gets default values for reply mail
         """
-        hist_obj = self.pool.get('crm.case.history')
+        hist_obj = self.pool.get('mailgate.message')
         res_ids = context and context.get('active_ids', []) or []
 
         include_original = context and context.get('include_original', False) or False
         res = {}
-        for hist in hist_obj.browse(cr, uid, res_ids):
-            model = hist.log_id.model_id.model
+        for hist in hist_obj.browse(cr, uid, res_ids, context=context):
+            model = hist.model_id.model
             model_pool = self.pool.get(model)
-            case = model_pool.browse(cr, uid, hist.log_id.res_id)
+            case = model_pool.browse(cr, uid, hist.res_id)
             if 'email_to' in fields:
                 res.update({'email_to': case.email_from or hist.email_from or False})
             if 'email_from' in fields:
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index a2a2652ff23..1eb557cdebd 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -29,7 +29,7 @@ class crm_claim(osv.osv):
     _name = "crm.claim"
     _description = "Claim Cases"
     _order = "id desc"
-    _inherit = 'crm.case'
+    _inherit = 'mailgate.thread'
     _columns = {
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 30c413076ea..850e088d6b6 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -28,7 +28,7 @@ class crm_fundraising(osv.osv):
     _name = "crm.fundraising"
     _description = "Fund Raising Cases"
     _order = "id desc"
-    _inherit ='crm.case'
+    _inherit ='mailgate.thread'
 
     _columns = {
             'date_closed': fields.datetime('Closed', readonly=True), 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index fda251d16ac..a467e80fefb 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -30,7 +30,7 @@ class crm_helpdesk(osv.osv):
     _name = "crm.helpdesk"
     _description = "Helpdesk Cases"
     _order = "id desc"
-    _inherit = 'crm.case'
+    _inherit = 'mailgate.thread'
 
     _columns = {
             'date_closed': fields.datetime('Closed', readonly=True), 
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index f267337125c..0d9941b283c 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -20,13 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
-
-from osv import osv
-from osv import fields
-
-
-from osv import osv
-from osv import fields
+import time
 
 
 class mailgate_thread(osv.osv):
@@ -36,10 +30,100 @@ class mailgate_thread(osv.osv):
     _name = 'mailgate.thread'
     _description = 'Mailgateway Thread'
     
+    def _get_log_ids(self, cr, uid, ids, field_names, arg, context=None):
+        """Gets id for case log from history of particular case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Case IDs
+        @param context: A standard dictionary for contextual values
+        @return:Dictionary of History Ids
+        """
+        if not context:
+            context = {}
+
+        result = {}
+        domain = []
+        history_obj = False
+        model_obj = self.pool.get('ir.model')
+        history_obj = self.pool.get('mailgate.message')
+
+        if 'message_ids' in field_names:
+            name = 'message_ids'
+            domain += [('email_to', '!=', False)]
+            
+        if 'log_ids' in field_names:
+            name = 'log_ids'
+            domain += [('email_to', '=', False)]
+        
+        model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
+        domain +=  [('model_id', '=', model_ids[0])]
+        for case in self.browse(cr, uid, ids, context):
+            domain1 =  domain + [('res_id', '=', case.id)]
+            history_ids = history_obj.search(cr, uid, domain1, context=context)
+            if history_ids:
+                result[case.id] = {name: history_ids}
+            else:
+                result[case.id] = {name: []}
+        return result
+
     _columns = {
         'name':fields.char('Name', size=64),
-        'message_ids':fields.one2many('mailgate.message', 'thread_id', 'Message'),
+#        'message_ids':fields.one2many('mailgate.message', 'thread_id', 'Message'),
+        'message_ids': fields.function(_get_log_ids, method=True, type='one2many', \
+                         multi="message_ids", relation="mailgate.message", string="Messages"), 
+        'log_ids': fields.function(_get_log_ids, method=True, type='one2many', \
+                         multi="log_ids", relation="mailgate.message", string="Logs"),
     }
+    
+    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param cases: a browse record list
+        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
+        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
+        @param email: Email address if any
+        @param details: Details of case history if any 
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        # The mailgate sends the ids of the cases and not the object list
+        if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
+            cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
+
+        model_obj = self.pool.get('ir.model')
+        
+        obj = self.pool.get('mailgate.message')
+        for case in cases:
+            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
+            data = {
+                'name': keyword,
+                'user_id': uid,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'model_id' : model_ids and model_ids[0] or False,
+                'res_id': case.id,
+                'section_id': case.section_id.id,
+                'message_id':message_id
+            }
+
+            if history:
+                data['description'] = details or case.description
+                data['email_to'] = email or \
+                        (case.section_id and case.section_id.reply_to) or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
+                data['email_from'] = email_from or \
+                        (case.section_id and case.section_id.reply_to) or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
+            res = obj.create(cr, uid, data, context)
+        return True
+    
+    _history = __history
+    history = __history
 
 mailgate_thread()
 
@@ -51,7 +135,7 @@ class mailgate_message(osv.osv):
     _description = 'Mailgateway Message'
     
     _columns = {
-        'name':fields.char('Message', size=64, required=True),
+        'name':fields.char('Message', size=64),
         'thread_id':fields.many2one('mailgate.thread', 'Thread'),
         'date': fields.datetime('Date'),
         'model_id': fields.many2one('ir.model', "Model"),
@@ -63,6 +147,7 @@ class mailgate_message(osv.osv):
         'email_cc': fields.char('Email From', size=84),
         'email_bcc': fields.char('Email From', size=84),
         'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email Server.", select=True),
+        'description': fields.text('Description'), 
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
     }
 

From 8ecd574c3a85125f860749416d27663990b54c95 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 18:29:01 +0530
Subject: [PATCH 056/146] [IMP]: crm: Improvement in meeting for removing
 dependency from crm.case

bzr revid: rpa@tinyerp.com-20100503125901-of7z6oa4oannqg39
---
 addons/base_calendar/base_calendar.py |  6 +-
 addons/crm/crm_meeting.py             | 86 +++++++++++++++++++++++++--
 addons/crm/crm_meeting_view.xml       |  5 +-
 3 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index d1367e63225..ceb6d729aeb 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1101,7 +1101,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
         'end_date': fields.date('Repeat Until'), 
         'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel',\
                                  'event_id', 'attendee_id', 'Attendees'),
-        'allday': fields.boolean('All Day')
+        'allday': fields.boolean('All Day'), 
+        'active': fields.boolean('Active', help="If the active field is set to \
+                    true, it will allow you to hide the event alarm information without removing it.")
     }
 
     _defaults = {
@@ -1110,6 +1112,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
          'freq': lambda *x: 'None', 
          'select1': lambda *x: 'date', 
          'interval': lambda *x: 1, 
+         'active': lambda *x: 1, 
     }
     
     def open_event(self, cr, uid, ids, context=None):
@@ -1404,6 +1407,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             event_id = base_calendar_id2real_id(event_id)
             if not event_id in new_ids:
                 new_ids.append(event_id)
+        
         res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
         if vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'):
             alarm_obj = self.pool.get('res.alarm')
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 2cf0edd8a7e..0788656095e 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -19,12 +19,11 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-import crm
-from datetime import datetime, timedelta
-from datetime import datetime, timedelta
-from tools.translate import _
 from base_calendar import base_calendar
+from datetime import datetime, timedelta
+from osv import fields, osv
+from tools.translate import _
+import time
 
 
 class crm_phonecall(osv.osv):
@@ -43,10 +42,15 @@ class crm_meeting(osv.osv):
 
     _columns = {
         # From crm.case
+        'name': fields.char('Summary', size=124, required=True), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."),
+        
         # Meeting fields
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
                         domain="[('object_id.model', '=', 'crm.meeting')]", \
@@ -108,7 +112,79 @@ class crm_meeting(osv.osv):
                     }
 
         return value
+    
+    # From crm.case
+    
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Close'))
+        self.write(cr, uid, ids, {'state': 'done',
+                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                  })
+        #
+        # We use the cache of cases to keep the old case state
+        #
+        self._action(cr, uid, cases, 'done')
+        return True
 
+    def case_open(self, cr, uid, ids, *args):
+        """Opens Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, _('Open'))
+
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            self.write(cr, uid, case.id, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel',
+                                  'active': True})
+        self._action(cr, uid, cases, 'cancel')
+        return True
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Draft'))
+        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
+        self._action(cr, uid, cases, 'draft')
+        return True
+    
 crm_meeting()
 
 class calendar_attendee(osv.osv):
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 4c4856f46b0..429bfa39368 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -132,6 +132,9 @@
                         <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
+						<button name="case_reset" string="Reset to Unconfirmed"
+                            states="open,done,cancel" type="object"
+                            icon="gtk-convert" />
                         <button name="case_open" string="Confirm"
                             states="draft" type="object"
                             icon="gtk-go-forward" />
@@ -214,7 +217,7 @@
                 <field name="date" string="Meeting Date" />
                 <field name="duration" />
                 <field name="user_id" />
-                <field name="state" invisible="1"/>
+                <field name="state"/>
             </tree>
         </field>
     </record>

From 1d805efd99a4fc1dfe287b03fa07f97a55afa389 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 3 May 2010 19:11:42 +0530
Subject: [PATCH 057/146] [IMP]: crm: Improvement in phonecall for removing
 dependencies from crm.case

bzr revid: rpa@tinyerp.com-20100503134142-rs6l6uf2xspd9j4k
---
 addons/crm/crm_meeting.py           |   4 +
 addons/crm/crm_phonecall.py         | 151 +++++++++++++++++++++++-----
 addons/mail_gateway/mail_gateway.py |   3 +-
 3 files changed, 130 insertions(+), 28 deletions(-)

diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 0788656095e..86ddeba4129 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -25,6 +25,10 @@ from osv import fields, osv
 from tools.translate import _
 import time
 
+class crm_lead(osv.osv):
+    """ CRM Leads """
+    _name = 'crm.lead'
+crm_lead()
 
 class crm_phonecall(osv.osv):
     """ CRM Phonecall """
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 77fc1662576..07311814e26 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -39,31 +39,128 @@ class crm_phonecall(osv.osv):
                              Define Responsible user and Email account for mail gateway.'), 
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"),
+        'description': fields.text('Description'),  
+        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \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\'.'), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."),
         
         # phonecall fields
-        'duration': fields.float('Duration'),
+        'duration': fields.float('Duration'), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]"),
-        'partner_phone': fields.char('Phone', size=32),
-        'partner_contact': fields.related('partner_address_id', 'name',\
-                                 type="char", string="Contact", size=128),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+                        ('object_id.model', '=', 'crm.phonecall')]"), 
+        'partner_phone': fields.char('Phone', size=32), 
+        'partner_contact': fields.related('partner_address_id', 'name', \
+                                 type="char", string="Contact", size=128), 
+        'partner_mobile': fields.char('Mobile', size=32), 
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel', \
                         help="The channels represent the different communication\
                          modes available with the customer." \
                         " With each commercial opportunity, you can indicate\
-                         the canall which is this opportunity source."),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'date': fields.datetime('Date'),
-        'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'),
+                         the canall which is this opportunity source."), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'date': fields.datetime('Date'), 
+        'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'), 
     }
 
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+        'state': lambda *a: 'draft', 
     }
+    
+    # From crm.case
+    
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Close'))
+        self.write(cr, uid, ids, {'state': 'done',
+                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                  })
+        #
+        # We use the cache of cases to keep the old case state
+        #
+        self._action(cr, uid, cases, 'done')
+        return True
+
+    def case_open(self, cr, uid, ids, *args):
+        """Opens Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, _('Open'))
+
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            self.write(cr, uid, case.id, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+    
+    def case_pending(self, cr, uid, ids, *args):
+        """Marks case as pending
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Pending'))
+        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._action(cr, uid, cases, 'pending')
+        return True
+
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel',
+                                  'active': True})
+        self._action(cr, uid, cases, 'cancel')
+        return True
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Draft'))
+        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
+        self._action(cr, uid, cases, 'draft')
+        return True
 
     def action_make_meeting(self, cr, uid, ids, context=None):
         """
@@ -94,23 +191,23 @@ class crm_phonecall(osv.osv):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
             context = {
-                        'default_phonecall_id': phonecall.id,
-                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False,
-                        'default_email': phonecall.email_from ,
+                        'default_phonecall_id': phonecall.id, 
+                        'default_partner_id': phonecall.partner_id and phonecall.partner_id.id or False, 
+                        'default_email': phonecall.email_from , 
                         'default_name': phonecall.name
                     }
 
             value = {
-                'name': _('Meetings'),
-                'domain' : "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                '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': res['res_id'],
+                'name': _('Meetings'), 
+                'domain' : "[('user_id','=',%s)]" % (uid), 
+                'context': context, 
+                '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': res['res_id'], 
                 'nodestroy': True
                 }
 
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 0d9941b283c..2f95393c40b 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -68,7 +68,8 @@ class mailgate_thread(osv.osv):
         return result
 
     _columns = {
-        'name':fields.char('Name', size=64),
+        'name':fields.char('Name', size=64), 
+        'active': fields.boolean('Active'), 
 #        'message_ids':fields.one2many('mailgate.message', 'thread_id', 'Message'),
         'message_ids': fields.function(_get_log_ids, method=True, type='one2many', \
                          multi="message_ids", relation="mailgate.message", string="Messages"), 

From e2f40f8300033045ec915030b08da086a626e18d Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Mon, 3 May 2010 19:14:14 +0530
Subject: [PATCH 058/146] [Add]: warning starting server with '-u XXX' or '-i
 XXX' where XXX is not a valid module name or 'all'

bzr revid: rvo@tinyerp.co.in-20100503134414-ma87k4htpifi00tz
---
 bin/addons/__init__.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 02803de0d75..53fe7068aa5 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -767,6 +767,15 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
     return has_updates
 
 def load_modules(db, force_demo=False, status=None, update_module=False):
+
+    def check_module_name(cr, mods, state):
+        for mod in mods:
+            id = modobj.search(cr, 1, ['&', ('state', '=', state), ('name', '=', mod)])
+            if id:
+                getattr(modobj, states[state])(cr, 1, id)
+            elif mod != 'all':
+                logger.notifyChannel('init', netsvc.LOG_WARNING, 'module %s: invalid module name!' % (mod))
+
     if not status:
         status = {}
     cr = db.cursor()
@@ -797,21 +806,16 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
             return
         if update_module:
             modobj = pool.get('ir.module.module')
+            states = {'installed': 'button_upgrade', 'uninstalled': 'button_install'}
             logger.notifyChannel('init', netsvc.LOG_INFO, 'updating modules list')
             if ('base' in tools.config['init']) or ('base' in tools.config['update']):
                 modobj.update_list(cr, 1)
 
             mods = [k for k in tools.config['init'] if tools.config['init'][k]]
-            if mods:
-                ids = modobj.search(cr, 1, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
-                if ids:
-                    modobj.button_install(cr, 1, ids)
+            check_module_name(cr, mods, 'uninstalled')
 
             mods = [k for k in tools.config['update'] if tools.config['update'][k]]
-            if mods:
-                ids = modobj.search(cr, 1, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
-                if ids:
-                    modobj.button_upgrade(cr, 1, ids)
+            check_module_name(cr, mods, 'installed')
 
             cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
 

From 0fb50cd625e30eee277d16b4c4a4413c7a79049a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 May 2010 00:05:19 +0100
Subject: [PATCH 059/146] [FIX] restore proper exception context and logging
 for test-continue

bzr revid: odo@openerp.com-20100503230519-vc4bxt8y2j87p5qf
---
 bin/addons/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/__init__.py b/bin/addons/__init__.py
index 53fe7068aa5..82761d647bd 100644
--- a/bin/addons/__init__.py
+++ b/bin/addons/__init__.py
@@ -645,10 +645,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, **kwargs):
                 _load_data(cr, module_name, id_map, mode, 'test')
             except Exception, e:
                 if tools.config.options['test-continue']:
-                    logger.notifyChannel('ERROR', netsvc.LOG_TEST, str(e))
+                    logger.notifyChannel('ERROR', netsvc.LOG_TEST, e)
                     pass
                 else:
-                    raise Exception
+                    raise
             finally:
                 if tools.config.options['test-rollback']:
                     cr.rollback()

From e05850f9e1a2a186155d8016b54b4394e5897dad Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 May 2010 00:35:16 +0100
Subject: [PATCH 060/146] [FIX] removed use of magic methods/attributes, plus
 some useless code duplication

bzr revid: odo@openerp.com-20100503233516-85tk5wr61ip2agw5
---
 bin/tools/yaml_import.py | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index ed481b2d0b3..108a5ff0d32 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -254,21 +254,20 @@ class YamlInterpreter(object):
             b = bool(value)
         else:
             b = default
-        return b 
-    
+        return b
+
     def create_osv_memory_record(self, record, fields):
         model = self.get_model(record.model)
         record_dict = self._create_record(model, fields)
         id_new=model.create(self.cr, self.uid, record_dict, context=self.context)
         self.id_map[record.id] = int(id_new)
         return record_dict
-    
+
     def process_record(self, node):
         import osv
         record, fields = node.items()[0]
         model = self.get_model(record.model)
-        model_bases = model.__class__.__bases__ 
-        if osv.osv.osv_memory in model_bases:
+        if isinstance(model, osv.osv.osv_memory):
             record_dict=self.create_osv_memory_record(record, fields)
         else:
             self.validate_xml_id(record.id)
@@ -281,24 +280,22 @@ class YamlInterpreter(object):
                 else:
                     if not self._coerce_bool(record.forcecreate):
                         return None
-    
-            model = self.get_model(record.model)
+
             record_dict = self._create_record(model, fields)
             self.logger.debug("RECORD_DICT %s" % record_dict)
-            if not osv.osv.osv_memory in model_bases:
-                id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
-                        self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode)
-                self.id_map[record.id] = int(id)
-                if config.get('import_partial', False):
-                    self.cr.commit()
-    
+            id = self.pool.get('ir.model.data')._update(self.cr, self.uid, record.model, \
+                    self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode)
+            self.id_map[record.id] = int(id)
+            if config.get('import_partial'):
+                self.cr.commit()
+
     def _create_record(self, model, fields):
         record_dict = {}
         for field_name, expression in fields.items():
             field_value = self._eval_field(model, field_name, expression)
             record_dict[field_name] = field_value
-        return record_dict        
-    
+        return record_dict
+
     def process_ref(self, node, column=None):
         if node.search:
             if node.model:
@@ -320,10 +317,10 @@ class YamlInterpreter(object):
         else:
             value = None
         return value
-    
+
     def process_eval(self, node):
         return eval(node.expression, self.eval_context)
-    
+
     def _eval_field(self, model, field_name, expression):
         # TODO this should be refactored as something like model.get_field() in bin/osv
         if field_name in model._columns:

From 900c2ef4409df0f739e0dc610e49c746ed508e86 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 4 May 2010 00:42:46 +0100
Subject: [PATCH 061/146] [FIX] orm/selection widget: fixed leftover typos

bzr revid: odo@openerp.com-20100503234246-9otvvfnedcfqp453
---
 bin/osv/orm.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 4afd731dd4e..c5019c729ed 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1153,8 +1153,10 @@ class orm_template(object):
                     node.set('invisible', '1')
                     if 'attrs' in node.attrib:
                         del(node.attrib['attrs']) #avoid making field visible later
-            del(node.attrib['groups'])
-            return can_see
+                del(node.attrib['groups'])
+                return can_see
+            else:
+                return True
 
         if node.tag in ('field', 'node', 'arrow'):
             if node.get('object'):
@@ -1202,7 +1204,7 @@ class orm_template(object):
                             }
                     attrs = {'views': views}
                     if node.get('widget') and node.get('widget') == 'selection':
-                        if not check_group(node)
+                        if not check_group(node):
                             attrs['selection'] = []
                         # We can not use the 'string' domain has it is defined according to the record !
                         else:

From b6a864759ad660cc695473c2ec40d437c5e148e9 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 4 May 2010 11:20:54 +0530
Subject: [PATCH 062/146] [IMP,FIX]: crm: Some fixes and improvement in
 phonecall views

bzr revid: rpa@tinyerp.com-20100504055054-d17sua7z4i282vvt
---
 addons/crm/crm_phonecall_menu.xml |  4 ++--
 addons/crm/crm_phonecall_view.xml | 31 +++++++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index b32a780c4ce..916cd5f64f3 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -62,7 +62,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_tree_view"/>
+        <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
 
@@ -76,7 +76,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming0">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_incomming_phone_form_view"/>
+        <field name="view_id" ref="crm_case_inbound_phone_form_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
 
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 601eb3f88b3..064a4fe2634 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -53,7 +53,7 @@
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                     states="draft,open,pending"
-                     name="action_make_meeting" type="action" />
+                     name="action_make_meeting" type="object" />
                 <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"/>
@@ -140,7 +140,7 @@
 	
 	<!--Inbound Phonecalls Form View -->
 
-	<record model="ir.ui.view" id="crm_case_incomming_phone_form_view">
+	<record model="ir.ui.view" id="crm_case_inbound_phone_form_view">
         <field name="name">CRM - Inbound Phone Call Form</field>
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
@@ -196,6 +196,33 @@
         </field>
     </record>
     
+    <!--Inbound Phonecalls Tree View -->
+    
+    <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
+        <field name="name">CRM - Inbound Phone Calls Tree</field>
+        <field name="model">crm.phonecall</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)">
+                <field name="date" string="Date"/>
+                <field name="name" string="Call Summary"/>
+                <field name="partner_id" string="Partner"/>
+                <field name="partner_contact"/>
+                <field name="partner_phone"/>
+                <field name="user_id"/>
+                <field name="state" invisible="1"/>
+                <button string="Opportunity"
+                    name="%(phonecall2opportunity_act)d"
+                    states="draft,open,pending"
+                    icon="gtk-convert"
+                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                <button string="Meeting"
+                    states="draft,open,pending" icon="gtk-redo"
+                     name="action_make_meeting" type="object" />
+            </tree>
+        </field>
+    </record>
+
 <!-- Phonecalls Calendar View -->
 
     <record model="ir.ui.view" id="crm_case_phone_calendar_view">

From 606302220e9f59cdbd49b7b1bcb82fff02d7be25 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 4 May 2010 13:03:13 +0530
Subject: [PATCH 063/146] [IMP]: crm, mail_gateway: added onchange function

bzr revid: rpa@tinyerp.com-20100504073313-379imtld17i3pb3q
---
 addons/crm/crm_phonecall.py         |  3 ++-
 addons/mail_gateway/mail_gateway.py | 32 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 07311814e26..ae0cbae0d88 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -40,7 +40,8 @@ class crm_phonecall(osv.osv):
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"),
+                                 domain="[('partner_id','=',partner_id)]"), 
+        'company_id': fields.many2one('res.company', 'Company'), 
         'description': fields.text('Description'),  
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 2f95393c40b..3d9b9971a47 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -125,7 +125,39 @@ class mailgate_thread(osv.osv):
     
     _history = __history
     history = __history
+    
+    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+        """This function returns value of partner address based on partner
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param part: Partner's id
+        @email: Partner's email ID 
+        """
+        if not part:
+            return {'value': {'partner_address_id': False, 
+                            'email_from': False, 
+                            }}
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
+        data = {'partner_address_id': addr['contact']}
+        data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+        return {'value': data}
 
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        """This function returns value of partner email based on Partner Address
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param add: Id of Partner's address
+        @email: Partner's email ID 
+        """
+        if not add:
+            return {'value': {'email_from': False}}
+        address = self.pool.get('res.partner.address').browse(cr, uid, add)
+        return {'value': {'email_from': address.email}}
+    
 mailgate_thread()
 
 class mailgate_message(osv.osv):

From af7a13580592d77d636868833b31ccbf6764da39 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 5 May 2010 04:47:40 +0100
Subject: [PATCH 064/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100505034740-gryudstp2nvot7d2
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 4fb8e0f8249..5d0cf33b263 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-05-02 05:19+0000\n"
+"PO-Revision-Date: 2010-05-03 14:18+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-05-03 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index be4a2828ed8..915a0dbb692 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-05-02 05:13+0000\n"
+"PO-Revision-Date: 2010-05-03 14:46+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-05-03 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+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 0e2ae3adae0..471b33dab46 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-05-02 05:47+0000\n"
+"PO-Revision-Date: 2010-05-03 14:48+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-05-03 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+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 d6d7e110aff..6badbbdeaac 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-05-02 05:32+0000\n"
+"PO-Revision-Date: 2010-05-03 14:29+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-05-03 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index a6f9bd69315..106f1cfe8d3 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-05-02 05:37+0000\n"
+"PO-Revision-Date: 2010-05-03 14:47+0000\n"
 "Last-Translator: OpenERP Administrators <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-05-03 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 60f1981def2ffbdfc6ac94e8b0a1cd4dba2161da Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Tue, 4 May 2010 12:59:58 +0200
Subject: [PATCH 065/146] [REF] res.company: Typo fix and review the code

bzr revid: stephane@openerp.com-20100504105958-p5lpknbqrobfrtkm
---
 bin/addons/base/base_update.xml    |  2 +-
 bin/addons/base/res/res_company.py | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 17952ea0146..994992b69c0 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -78,7 +78,7 @@
                 <form string="Users">
                     <notebook colspan="4">
                         <page string="Current Activity">
-                            <field name="company_id" widget="selection" readonly="0" context="{'user_prefence':True}"/>
+                            <field name="company_id" widget="selection" readonly="0" context="{'user_preference':True}"/>
                             <newline/>
                             <separator colspan="4" string="Preferences"/>
                         </page>
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index ea64aa5eb16..c3024d52b1a 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -88,14 +88,16 @@ class res_company(osv.osv):
         'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users')
     }
 
-    def search(self, cr, user, args, offset=0, limit=None, order=None,
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False):
-        if context and context.has_key('user_prefence') and context['user_prefence']:
-            cmp_ids = []
-            data_user = self.pool.get('res.users').browse(cr, user, [user], context=context)
-            map(lambda x: cmp_ids.append(x.id), data_user[0].company_ids)
-            return [data_user[0].company_id.id] + cmp_ids
-        return super(res_company, self).search(cr, user, args, offset=offset, limit=limit, order=order,
+
+        user_preference = context and context.get('user_preference', False) or False
+        if user_preference:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            cmp_ids = list(set([user.company_id.id] + [cmp.id for cmp in user.company_ids]))
+
+            return cmp_ids
+        return super(res_company, self).search(cr, uid, args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
     def _company_default_get(self, cr, uid, object=False, field=False, context=None):

From 6f53850e7d95daf5cf33a38473d730a863690800 Mon Sep 17 00:00:00 2001
From: Quality Team <>
Date: Tue, 4 May 2010 16:46:42 +0200
Subject: [PATCH 066/146] [FIX] Rewrite the field.property engine to work as
 expected (value per         company)

bzr revid: stephane@openerp.com-20100504144642-piruhn25d8qyxiof
---
 bin/addons/base/res/ir_property.py |  43 +++++----
 bin/addons/base/res/res_company.py |   6 +-
 bin/osv/fields.py                  | 135 +++++++++++++++--------------
 bin/osv/orm.py                     |  34 ++++++--
 4 files changed, 123 insertions(+), 95 deletions(-)

diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py
index b02ba593a02..c7673bf4b26 100644
--- a/bin/addons/base/res/ir_property.py
+++ b/bin/addons/base/res/ir_property.py
@@ -20,36 +20,41 @@
 ##############################################################################
 
 from osv import osv,fields
-
+from operator import attrgetter
 # -------------------------------------------------------------------------
 # Properties
 # -------------------------------------------------------------------------
 
-def _models_get(self, cr, uid, context={}):
-    obj = self.pool.get('ir.model.fields')
-    ids = obj.search(cr, uid, [('view_load','=',1)])
-    res = []
-    done = {}
-    for o in obj.browse(cr, uid, ids, context=context):
-        if o.model_id.id not in done:
-            res.append( [o.model_id.model, o.model_id.name])
-            done[o.model_id.id] = True
-    return res
-
 class ir_property(osv.osv):
     _name = 'ir.property'
+
+    def _models_field_get(self, cr, uid, field_key, field_value, context=None):
+        get = attrgetter(field_key, field_value)
+
+        obj = self.pool.get('ir.model.fields')
+        ids = obj.search(cr, uid, [('view_load','=',1)], context=context)
+        res = set()
+        for o in obj.browse(cr, uid, ids, context=context):
+            res.add(get(o))
+        return res
+
+    def _models_get(self, cr, uid, context=None):
+        return self._models_field_get(cr, uid, 'model_id.model', 'model_id.name',
+                                     context)
+
+    def _models_get2(self, cr, uid, context=None):
+        return self._models_field_get(cr, uid, 'relation', 'relation', context)
+
+
     _columns = {
         'name': fields.char('Name', size=128),
-        'value': fields.char('Value', size=128),
-        'res_id': fields.reference('Resource', selection=_models_get, size=128),
+        'value': fields.reference('Value', selection=_models_get2, size=128),
+#        'value': fields.char('Value', size=128),
+        'res_id': fields.reference('Resource', selection=_models_get, size=128,
+                                   help="If not set, act as default property"),
         'company_id': fields.many2one('res.company', 'Company'),
         'fields_id': fields.many2one('ir.model.fields', 'Fields', ondelete='cascade', required=True)
     }
-    def unlink(self, cr, uid, ids, context={}):
-        if ids:
-            cr.execute('DELETE FROM ir_model_fields WHERE id IN (SELECT fields_id FROM ir_property WHERE (fields_id IS NOT NULL) AND (id = ANY  (%s)))', (ids,))
-        res = super(ir_property, self).unlink(cr, uid, ids, context)
-        return res
 
     def get(self, cr, uid, name, model, res_id=False, context={}):
         cr.execute('select id from ir_model_fields where name=%s and model=%s', (name, model))
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index c3024d52b1a..6a64d5700b7 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -109,11 +109,9 @@ class res_company(osv.osv):
         proxy = self.pool.get('multi_company.default')
         args = [
             ('object_id.model', '=', object),
+            ('field_id', '=', field),
         ]
-        if field:
-            args.append(('field_id.name','=',field))
-        else:
-            args.append(('field_id','=',False))
+
         ids = proxy.search(cr, uid, args, context=context)
         for rule in proxy.browse(cr, uid, ids, context):
             user = self.pool.get('res.users').browse(cr, uid, uid)
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 71faa9898a5..be1f5c2baac 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -873,87 +873,93 @@ class serialized(_column):
 
 class property(function):
 
-    def _fnct_write(self, obj, cr, uid, id, prop, id_val, val, context=None):
-        if not context:
+    def _get_domain(self, obj, cr, uid, prop_name, context=None):
+        def_id = self._field_get(cr, uid, obj._name, prop_name)
+
+        company = obj.pool.get('res.company')
+        cid = company._company_default_get(cr, uid, obj._name, def_id,
+                                           context=context)
+
+        domain = ['&', ('fields_id', '=', def_id),
+                '|', ('company_id', '=', cid), ('company_id', '=', False)]
+        return domain
+
+    def _get_default(self, obj, cr, uid, prop_name, context=None):
+        prop = obj.pool.get('ir.property')
+        domain = self._get_domain(obj, cr, uid, prop_name, context)
+        ids = prop.search(cr, uid, domain, order='company_id', context=context)
+        if not ids:
+            return False
+        return prop.browse(cr, uid, ids[0], context).value
+
+    def _get_by_id(self, obj, cr, uid, prop_name, ids, context=None):
+        prop = obj.pool.get('ir.property')
+        vids = [obj._name + ',' + str(oid) for oid in  ids]
+
+        domain = [('res_id', 'in', vids)] + \
+                  self._get_domain(obj, cr, uid, prop_name, context)
+
+        return prop.search(cr, uid, domain, context=context)
+
+    def _fnct_write(self, obj, cr, uid, id, prop_name, id_val, obj_dest, context=None):
+        if context is None:
             context = {}
-        (obj_dest,) = val
-        definition_id = self._field_get(cr, uid, obj._name, prop)
 
-        property = obj.pool.get('ir.property')
-        nid = property.search(cr, uid, [('fields_id', '=', definition_id),
-            ('res_id', '=', obj._name+','+str(id))])
-        while len(nid):
-            cr.execute('DELETE FROM ir_property WHERE id=%s', (nid.pop(),))
+        nids = self._get_by_id(obj, cr, uid, prop_name, [id], context)
+        if nids:
+            cr.execute('DELETE FROM ir_property WHERE id IN %s', (tuple(nids),))
 
-        nid = property.search(cr, uid, [('fields_id', '=', definition_id),
-            ('res_id', '=', False)])
-        default_val = False
-        if nid:
-            default_val = property.browse(cr, uid, nid[0], context).value
+        default_val = self._get_default(obj, cr, uid, prop_name, context)
+        id_val = "%s,%d" % (obj_dest, id_val)
 
-        company_id = obj.pool.get('res.company')._company_default_get(cr, uid, obj._name, prop, context=context)
-        res = False
-        if val[0]:
-            newval = (id_val and obj_dest+','+str(id_val)) or False
-        else:
-            newval = id_val or False
-        if (newval != default_val) and newval:
-            propdef = obj.pool.get('ir.model.fields').browse(cr, uid,
-                    definition_id, context=context)
-            res = property.create(cr, uid, {
+        if id_val and id_val != default_val:
+            def_id = self._field_get(cr, uid, obj._name, prop_name)
+            company = obj.pool.get('res.company')
+            cid = company._company_default_get(cr, uid, obj._name, def_id,
+                                               context=context)
+            propdef = obj.pool.get('ir.model.fields').browse(cr, uid, def_id,
+                                                             context=context)
+            prop = obj.pool.get('ir.property')
+            return prop.create(cr, uid, {
                 'name': propdef.name,
-                'value': newval,
+                'value': id_val,
                 'res_id': obj._name+','+str(id),
-                'company_id': company_id,
-                'fields_id': definition_id
-            }, context=context)
-        return res
+                'company_id': cid,
+                'fields_id': def_id,
+                #'type': self._type,
+                }, context=context)
+        return False
 
-    def _fnct_read(self, obj, cr, uid, ids, prop, val, context=None):
-        if not context:
+
+    def _fnct_read(self, obj, cr, uid, ids, prop_name, obj_dest, context=None):
+        from orm import browse_record
+        if context is None:
             context = {}
+
         property = obj.pool.get('ir.property')
-        definition_id = self._field_get(cr, uid, obj._name, prop)
 
-        nid = property.search(cr, uid, [('fields_id', '=', definition_id),
-            ('res_id', '=', False)])
-        default_val = False
-        if nid:
-            d = property.browse(cr, uid, nid[0], context).value
-            default_val = (d and int(d.split(',')[1])) or False
+        default_val = self._get_default(obj, cr, uid, prop_name, context)
+        if isinstance(default_val, browse_record):
+            default_val = default_val.id
+        else:
+            default_val = False
 
-        vids = [obj._name + ',' + str(id) for id in  ids]
-        nids = property.search(cr, uid, [('fields_id', '=', definition_id),
-            ('res_id', 'in', vids)])
+        nids = self._get_by_id(obj, cr, uid, prop_name, ids, context)
 
         res = {}
         for id in ids:
             res[id] = default_val
         for prop in property.browse(cr, uid, nids):
-            if prop.value.find(',') >= 0:
-                res[int(prop.res_id.id)] = (prop.value and \
-                        int(prop.value.split(',')[1])) or False
-            else:
-                res[int(prop.res_id.id)] = prop.value or ''
-
-        if self._obj:
-            obj = obj.pool.get(self._obj)
-            to_check = res.values()
-            if default_val and default_val not in to_check:
-                to_check += [default_val]
-            existing_ids = obj.search(cr, uid, [('id', 'in', to_check)])
-            for id, res_id in res.items():
-                if res_id not in existing_ids:
-                    cr.execute('DELETE FROM ir_property WHERE value=%s', ((obj._name+','+str(res_id)),))
-                    res[id] = default_val
-            names = dict(obj.name_get(cr, uid, existing_ids, context))
-            for r in res.keys():
-                if res[r] and res[r] in names:
-                    res[r] = (res[r], names[res[r]])
-                else:
-                    res[r] = False
+            value = prop.value
+            if isinstance(value, browse_record):
+                if not value.exists():
+                    cr.execute('DELETE FROM ir_property WHERE id=%s', (prop.id,))
+                    continue
+                value = value.id
+            res[prop.res_id.id] = value or False
         return res
 
+
     def _field_get(self, cr, uid, model_name, prop):
         if not self.field_id.get(cr.dbname):
             cr.execute('SELECT id \
@@ -964,9 +970,10 @@ class property(function):
         return self.field_id[cr.dbname]
 
     def __init__(self, obj_prop, **args):
+        #assert obj_prop
         self.field_id = {}
         function.__init__(self, self._fnct_read, False, self._fnct_write,
-                (obj_prop, ), **args)
+                          obj_prop, **args)
 
     def restart(self):
         self.field_id = {}
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index c5019c729ed..161364a13bc 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -170,6 +170,7 @@ class browse_record(object):
     def __getitem__(self, name):
         if name == 'id':
             return self._id
+
         if name not in self._data[self._id]:
             # build the list of fields we will fetch
 
@@ -179,10 +180,12 @@ class browse_record(object):
             elif name in self._table._inherit_fields:
                 col = self._table._inherit_fields[name][2]
             elif hasattr(self._table, str(name)):
-                if isinstance(getattr(self._table, name), (types.MethodType, types.LambdaType, types.FunctionType)):
-                    return lambda *args, **argv: getattr(self._table, name)(self._cr, self._uid, [self._id], *args, **argv)
+                attr = getattr(self._table, name)
+
+                if isinstance(attr, (types.MethodType, types.LambdaType, types.FunctionType)):
+                    return lambda *args, **argv: attr(self._cr, self._uid, [self._id], *args, **argv)
                 else:
-                    return getattr(self._table, name)
+                    return attr
             else:
                 self.logger.notifyChannel("browse_record", netsvc.LOG_WARNING,
                     "Field '%s' does not exist in object '%s': \n%s" % (
@@ -250,6 +253,8 @@ class browse_record(object):
                                         context=self._context,
                                         list_class=self._list_class,
                                         fields_process=self._fields_process)
+                                else:
+                                    new_data[n] = ids2
                             else:
                                 new_data[n] = browse_null()
                         else:
@@ -271,6 +276,7 @@ class browse_record(object):
                     else:
                         new_data[n] = data[n]
                 self._data[data['id']].update(new_data)
+        
         if not name in self._data[self._id]:
             #how did this happen?
             self.logger.notifyChannel("browse_record", netsvc.LOG_ERROR,
@@ -299,9 +305,13 @@ class browse_record(object):
         return "browse_record(%s, %d)" % (self._table_name, self._id)
 
     def __eq__(self, other):
+        if not isinstance(other, browse_record):
+            return False
         return (self._table_name, self._id) == (other._table_name, other._id)
 
     def __ne__(self, other):
+        if not isinstance(other, browse_record):
+            return True
         return (self._table_name, self._id) != (other._table_name, other._id)
 
     # we need to define __unicode__ even though we've already defined __str__
@@ -2583,8 +2593,13 @@ class orm(orm_template):
                 if nid:
                     prop_value = property_obj.browse(cr, uid, nid[0],
                             context=context).value
-                    value[f] = (prop_value and int(prop_value.split(',')[1])) \
-                            or False
+                    if prop_value:
+                        if isinstance(prop_value, (browse_record, browse_null)):
+                            value[f] = prop_value.id
+                        else:
+                            value[f] = int(prop_value.rsplit(',', 1)[1])
+                    else:
+                        value[f] = False
 
         # get the default values set by the user and override the default
         # values defined in the object
@@ -3802,9 +3817,12 @@ class orm(orm_template):
             trans_obj.create(cr, uid, record, context)
         return new_id
 
-    def exists(self, cr, uid, id, context=None):
-        cr.execute('SELECT count(1) FROM "%s" where id=%%s' % (self._table,), (id,))
-        return bool(cr.fetchone()[0])
+    def exists(self, cr, uid, ids, context=None):
+        if type(ids) in (int,long):
+            ids = [ids]
+        query = 'SELECT count(1) FROM "%s"' % (self._table)
+        cr.execute(query + "WHERE ID IN %s", (tuple(ids),))
+        return cr.fetchone()[0] == len(ids)
 
     def check_recursion(self, cr, uid, ids, parent=None):
         """

From 79876515235ee2736d5d1e3f3a6f80c16d5bde1b Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 5 May 2010 10:23:49 +0530
Subject: [PATCH 067/146] [IMP]:usabiliy improvemetns

bzr revid: nch@tinyerp.com-20100505045349-ssq1racv9tvzc22h
---
 addons/account/account.py                     |  6 +-
 addons/account/account_installer.xml          | 37 ++++++++--
 addons/account/account_view.xml               |  6 +-
 addons/account/installer.py                   | 73 +++++++++++++++++--
 addons/association/profile_association.xml    | 11 +++
 addons/base_setup/__init__.py                 |  1 +
 addons/base_setup/__openerp__.py              |  2 +-
 addons/base_setup/base_setup_installer.xml    | 13 +++-
 addons/hr/hr_installer.xml                    | 11 +++
 addons/knowledge/knowledge_installer.xml      | 12 +++
 addons/mrp/mrp_installer.xml                  | 12 +++
 .../profile_accounting/profile_accounting.xml | 11 +++
 .../profile_manufacturing.xml                 | 11 +++
 addons/profile_tools/misc_tools_installer.xml | 11 +++
 addons/project/project_installer.xml          | 11 +++
 addons/purchase/wizard/purchase_installer.xml | 11 +++
 .../report_designer_installer.xml             | 11 +++
 addons/service/service_installer.xml          | 11 +++
 18 files changed, 245 insertions(+), 16 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index c965d2cd0e5..0241cbe5ffa 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2390,10 +2390,14 @@ class account_bank_accounts_wizard(osv.osv_memory):
     _name='account.bank.accounts.wizard'
 
     _columns = {
-        'acc_no':fields.many2one('res.partner.bank','Account No.',required=True),
+        'acc_name':fields.char('Account Name.', size=64, required=True),
         'bank_account_id':fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
         'currency_id':fields.many2one('res.currency', 'Currency'),
+        'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
     }
+    _defaults = {
+        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        }
 
 account_bank_accounts_wizard()
 
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 5eec07067ef..89921af9790 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -17,7 +17,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications</attribute>
+            <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications. Select one of the country specific chart of account or select 'configurable chart of account' to configure  your own chart of account.</attribute>
             <attribute name="width">150</attribute>
           </xpath>
 		  <xpath expr="//button[@string='Install Modules']" position="attributes">
@@ -36,11 +36,24 @@
             	<field name="account_followup"/>
             	<field name="account_asset"/>
             </group>
-             <group colspan="4" attrs="{'invisible':[('charts','=',False)]}">
+            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+            	<field name="sale_tax" colspan="2"/>
+            	<field name="purchase_tax" colspan="2"/>
+            </group>
+             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
             	<separator col="4" colspan="4" string="Bank and Cost Account"/>
-                <field name="account_name" colspan="2"/>
-                <field name="account_type" colspan="2"/>
-                <field name="account_currency" colspan="2" widget="selection"/>
+            	 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+            	 	<form string="Bank Information">
+                      <field name="acc_name"/>
+                      <field name="account_type"/>
+                      <field name="currency_id"/>
+                    </form>
+                    <tree editable="bottom" string="Bank Information">
+                      <field name="acc_name"/>
+                      <field name="account_type"/>
+                      <field name="currency_id"/>
+                    </tree>
+                  </field>
             </group>
             <group colspan="4">
             	<separator col="4" colspan="4" string="Configure Fiscal Year"/>
@@ -66,6 +79,20 @@
     <record id="account_installer_todo" model="ir.actions.todo">
       <field name="action_id" ref="action_account_installer"/>
       <field name="sequence">3</field>
+      <field name="restart">onskip</field>
     </record>
+
+    <record id="account_ir_actions_todo_tree" model="ir.ui.view">
+        <field name="model">ir.actions.todo</field>
+        <field name="name">account_installer_action_replace</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+  		<field name="arch" type="xml">
+  		  <xpath expr="//button[@string='Launch']" position="replace">
+        	<button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      </xpath>
+        </field>
+	</record>
+
   </data>
 </openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 515049bba15..cf9069f9be4 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1719,11 +1719,13 @@
                   <field colspan="4" mode="tree" name="bank_accounts_id"
                          nolabel="1" widget="one2many_list">
                     <form string="Bank Information">
-                      <field name="acc_no"/>
+                      <field name="acc_name"/>
+                      <field name="account_type"/>
                       <field name="currency_id"/>
                     </form>
                     <tree editable="bottom" string="Bank Information">
-                      <field name="acc_no"/>
+                      <field name="acc_name"/>
+                      <field name="account_type"/>
                       <field name="currency_id"/>
                     </tree>
                   </field>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index ca62f758788..e10bbae21b7 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -37,9 +37,20 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids)),
                    key=itemgetter(1)))
-        charts.insert(0,('',''))
+        charts.insert(0,('configurable','Configurable Chart of Account'))
         return charts
 
+#    def default_get(self, cr, uid, fields_list=None, context=None):
+#         ''' set default accounts'''
+#         defaults = super(account_installer, self)\
+#         .default_get(cr, uid, fields_list=fields_list, context=context)
+#         account = self.pool.get('account.bank.accounts.wizard')
+#         ids = []
+#         for acc in ('Current','Deposit'):
+#             ids.append(account.create(cr, uid, {'acc_name':acc,'account_type':'cash','bank_account_id':self}))
+#         defaults.update({'bank_accounts_id':[(6,0,ids)]})
+#         return defaults
+
     _columns = {
         # Accounting
         'charts':fields.selection(_get_charts, 'Chart of Accounts',
@@ -64,15 +75,16 @@ class account_installer(osv.osv_memory):
         'date_stop': fields.date('End Date', required=True),
         'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
                                   'Periods', required=True),
-        'account_name':fields.char('Name', size=128),
-        'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
-        'account_currency':fields.many2one('res.currency', 'Currency')
+        'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
+        'sale_tax':fields.float('Sale Tax(%)'),
+        'purchase_tax':fields.float('Purchase Tax(%)')
         }
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-01-01'),
         'date_stop': lambda *a: time.strftime('%Y-12-31'),
         'period':lambda *a:'month',
-        'account_currency': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        'sale_tax':lambda *a:0.0,
+        'purchase_tax':lambda *a:0.0,
         }
 
     def on_change_start_date(self, cr, uid, id, start_date):
@@ -84,9 +96,43 @@ class account_installer(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         super(account_installer, self).execute(cr, uid, ids, context=context)
+        record = self.browse(cr, uid, ids, context=context)[0]
         for res in self.read(cr,uid,ids):
+            if record.charts == 'configurable':
+                obj_acc = self.pool.get('account.account')
+                obj_tax = self.pool.get('account.tax')
+                user_type = self.pool.get('account.account.type')
+                obj_product = self.pool.get('product.product')
+                ir_values = self.pool.get('ir.values')
+                u_type_id = user_type.search(cr, uid,[('name','ilike','view')])[0]
+                company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+                vals = {'name': company.name or '',
+                        'currency_id': company.currency_id.id or False,
+                        'code': 0 or '',
+                        'type': 'view',
+                        'user_type': u_type_id,
+                        'company_id': company.id }
+                main_account = obj_acc.create(cr, uid, vals)
+                for val in record.bank_accounts_id:
+                    vals = {'name': val.acc_name or '',
+                        'currency_id': val.currency_id.id or False,
+                        'code': val.acc_name or '',
+                        'type': 'view',
+                        'user_type': u_type_id,
+                        'parent_id':main_account,
+                        'company_id': company.id }
+                    obj_acc.create(cr, uid, vals)
+
+                sales_tax = obj_tax.create(cr, uid,{'name':'sale Tax','amount':res.get('sale_tax',0.0)})
+                purchase_tax = obj_tax.create(cr, uid,{'name':'purchase Tax','amount':res.get('purchase_tax',0.0)})
+                product_ids = obj_product.search(cr,uid, [])
+                for product in obj_product.browse(cr, uid, product_ids):
+                    obj_product.write(cr, uid, product.id, {'taxes_id':[(6,0,[sales_tax])],'supplier_taxes_id':[(6,0,[purchase_tax])]})
+                for name, value in [('taxes_id',sales_tax),('supplier_taxes_id',purchase_tax)]:
+                    ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value])
+
             if 'date_start' in res and 'date_stop' in res:
-                name = res['date_start'][:4]
+                name = code = res['date_start'][:4]
                 if int(name) != int(res['date_stop'][:4]):
                     name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
                     code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
@@ -114,3 +160,18 @@ class account_installer(osv.osv_memory):
 
 
 account_installer()
+
+class account_bank_accounts_wizard(osv.osv_memory):
+    _name='account.bank.accounts.wizard'
+
+    _columns = {
+        'acc_name':fields.char('Account Name.', size=64, required=True),
+        'bank_account_id':fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
+        'currency_id':fields.many2one('res.currency', 'Currency'),
+        'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
+    }
+    _defaults = {
+        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
+        }
+
+account_bank_accounts_wizard()
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 827cdb42d18..0d0a65b3644 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -48,5 +48,16 @@
         <field name="action_id" ref="action_config_install_module"/>
         <field name="sequence">3</field>
       </record>
+       <record id="association_ir_actions_todo_tree" model="ir.ui.view">
+        <field name="model">ir.actions.todo</field>
+        <field name="name">association_installer_action_replace</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+  		<field name="arch" type="xml">
+  		 <xpath expr="//button[@string='Launch']" position="replace">
+        	<button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      		</xpath>
+      	</field>
+		</record>
     </data>
 </openerp>
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index ef4f321942d..cda3e40111b 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -21,6 +21,7 @@
 
 import installer
 import todo
+import gtk_contact_form
 import wizard
 
 from osv import fields, osv
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index c6dd64d7bcc..ee0cc6a8f56 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -43,7 +43,7 @@
     'init_xml': ['base_setup_data.xml'],
     'update_xml': ['security/ir.model.access.csv',
                    'base_setup_installer.xml',
-                   'base_setup_todo.xml',],
+                   'base_setup_todo.xml','gtk_contact_form.xml'],
     'demo_xml': ['base_setup_demo.xml'],
     'installable': True,
     'active': True,
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index f1c3f0c0b3d..cc5afdd6f25 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -13,7 +13,7 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string"
-                       >Now that OpenERP is installed, we have selected applications commonly useful to users which you can install directly, as well as sets of applications for more specific types or groups of businesses (the vertical modules).
+                       >Now that OpenERP is installed, We have selected applications commonly useful to users which you can install directly, as well as sets of applications for more specific types or groups of businesses (the vertical modules).
 
 If you don't think you need any of these right now, you can easily install them later on.</attribute>
           </xpath>
@@ -56,5 +56,16 @@ If you don't think you need any of these right now, you can easily install them
         <field name="action_id" ref="action_base_setup_installer"/>
         <field name="sequence">2</field>
     </record>
+   <record id="base_setup_ir_actions_todo_tree" model="ir.ui.view">
+        <field name="model">ir.actions.todo</field>
+        <field name="name">base_setup_installer_action_replace</field>
+        <field name="type">tree</field>
+        <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+  		<field name="arch" type="xml">
+  		 <xpath expr="//button[@string='Launch']" position="replace">
+        	<button name="%(action_base_setup_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      		</xpath>
+      	</field>
+		</record>
   </data>
 </openerp>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 07600ae204a..a19476e1f19 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -52,5 +52,16 @@
       <field name="action_id" ref="action_hr_installer"/>
       <field name="sequence">3</field>
     </record>
+   <record id="hr_ir_actions_todo_tree" model="ir.ui.view">
+    <field name="model">ir.actions.todo</field>
+    <field name="name">hr_installer_action_replace</field>
+    <field name="type">tree</field>
+    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+	<field name="arch" type="xml">
+  		 <xpath expr="//button[@string='Launch']" position="replace">
+        	<button name="%(action_hr_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      		</xpath>
+      	</field>
+	</record>
   </data>
 </openerp>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index a3c9437dae1..30ac565addb 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -53,5 +53,17 @@
       <field name="sequence">3</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
+
+    <record id="knowledge_ir_actions_todo_tree" model="ir.ui.view">
+    <field name="model">ir.actions.todo</field>
+    <field name="name">knowledge_installer_action_replace</field>
+    <field name="type">tree</field>
+    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+	<field name="arch" type="xml">
+	 <xpath expr="//button[@string='Launch']" position="replace">
+        <button name="%(action_knowledge_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      </xpath>
+    </field>
+	</record>
   </data>
 </openerp>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index d36093c8dfb..d40eb453570 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -48,5 +48,17 @@
       <field name="sequence">3</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
+
+   <record id="mrp_ir_actions_todo_tree" model="ir.ui.view">
+    <field name="model">ir.actions.todo</field>
+    <field name="name">mrp_installer_action_replace</field>
+    <field name="type">tree</field>
+    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+    <field name="arch" type="xml">
+	 <xpath expr="//button[@string='Launch']" position="replace">
+        	<button name="%(action_mrp_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+  		</xpath>
+  	</field>
+	</record>
   </data>
 </openerp>
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index bf1ba9fdf24..d54aaaf1e5b 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -48,5 +48,16 @@
           <field name="action_id" ref="action_config_install_module"/>
           <field name="sequence">3</field>
         </record>
+       <record id="accounting_ir_actions_todo_tree" model="ir.ui.view">
+		    <field name="model">ir.actions.todo</field>
+		    <field name="name">accounting_installer_action_replace</field>
+		    <field name="type">tree</field>
+		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+			<field name="arch" type="xml">
+	 			<xpath expr="//button[@string='Launch']" position="replace">
+        			<button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+  				</xpath>
+  			</field>
+	</record>
     </data>
 </openerp>
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index df8c56c77cb..bbbc64af57a 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -55,5 +55,16 @@
         <field name="action_id" ref="action_config_install_module"/>
         <field name="sequence">3</field>
       </record>
+      <record id="manufacturing_ir_actions_todo_tree" model="ir.ui.view">
+		    <field name="model">ir.actions.todo</field>
+		    <field name="name">manufacturing_installer_action_replace</field>
+		    <field name="type">tree</field>
+		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+			<field name="arch" type="xml">
+	 			<xpath expr="//button[@string='Launch']" position="replace">
+        			<button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+  				</xpath>
+  			</field>
+	</record>
     </data>
 </openerp>
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 307b5b90a8c..277ec90b81c 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -47,5 +47,16 @@
       <field name="action_id" ref="action_misc_tools_installer"/>
       <field name="sequence">3</field>
     </record>
+    <record id="misc_ir_actions_todo_tree" model="ir.ui.view">
+		    <field name="model">ir.actions.todo</field>
+		    <field name="name">misc_installer_action_replace</field>
+		    <field name="type">tree</field>
+		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+			<field name="arch" type="xml">
+	 			<xpath expr="//button[@string='Launch']" position="replace">
+        			<button name="%(action_misc_tools_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+  				</xpath>
+  			</field>
+	</record>
   </data>
 </openerp>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index d8a503e00fa..cbdd18ae29f 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -53,5 +53,16 @@
       <field name="action_id" ref="action_project_installer"/>
       <field name="sequence">3</field>
     </record>
+     <record id="project_ir_actions_todo_tree" model="ir.ui.view">
+		    <field name="model">ir.actions.todo</field>
+		    <field name="name">project_installer_action_replace</field>
+		    <field name="type">tree</field>
+		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+		    <field name="arch" type="xml">
+				<xpath expr="//button[@string='Launch']" position="replace">
+        			<button name="%(action_project_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+  				</xpath>
+  			</field>
+	</record>
   </data>
 </openerp>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 5725907da28..0916977e62a 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -46,5 +46,16 @@
       <field name="sequence">3</field>
       <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/>
     </record>
+	<record id="purchase_ir_actions_todo_tree" model="ir.ui.view">
+		    <field name="model">ir.actions.todo</field>
+		    <field name="name">purchase_installer_action_replace</field>
+		    <field name="type">tree</field>
+		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+			<field name="arch" type="xml">
+	 			<xpath expr="//button[@string='Launch']" position="replace">
+        			<button name="%(action_purchase_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      			</xpath>
+    		</field>
+	</record>
     </data>
 </openerp>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 76adb3eddf1..89d655de0b2 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -46,5 +46,16 @@
       <field name="action_id" ref="action_report_designer_installer"/>
       <field name="sequence">3</field>
     </record>
+   <record id="report_designer_ir_actions_todo_tree" model="ir.ui.view">
+		    <field name="model">ir.actions.todo</field>
+		    <field name="name">report_designer_installer_action_replace</field>
+		    <field name="type">tree</field>
+		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+			<field name="arch" type="xml">
+	 			<xpath expr="//button[@string='Launch']" position="replace">
+        			<button name="%(action_report_designer_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      			</xpath>
+    		</field>
+	</record>
   </data>
 </openerp>
diff --git a/addons/service/service_installer.xml b/addons/service/service_installer.xml
index 07d9e839376..98b1eab4bce 100644
--- a/addons/service/service_installer.xml
+++ b/addons/service/service_installer.xml
@@ -60,5 +60,16 @@
         <field name="action_id" ref="action_config_install_module"/>
         <field name="sequence">3</field>
       </record>
+      <record id="service_ir_actions_todo_tree" model="ir.ui.view">
+		    <field name="model">ir.actions.todo</field>
+		    <field name="name">service_installer_action_replace</field>
+		    <field name="type">tree</field>
+		    <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
+			<field name="arch" type="xml">
+	 			<xpath expr="//button[@string='Launch']" position="replace">
+        			<button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+      			</xpath>
+    		</field>
+	</record>
     </data>
 </openerp>

From c5f337997d2c742d53e1530f559aea2a56ea559e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 5 May 2010 12:51:54 +0530
Subject: [PATCH 068/146] [IMP]: crm(reports): Improvements in reports, *
 Removed crm.case.report * Changes in lead and phonecall reports, made
 independent from crm.case.report

bzr revid: rpa@tinyerp.com-20100505072154-y2xd7zlhmqzb5dor
---
 addons/crm/__init__.py                        |   2 +-
 addons/crm/__openerp__.py                     |   6 +-
 addons/crm/crm_view.xml                       |   6 +-
 addons/crm/report/__init__.py                 |   3 -
 addons/crm/report/crm_lead_report.py          |  64 +++++-
 addons/crm/report/crm_lead_report_view.xml    | 187 +++++++++++++++---
 addons/crm/report/crm_opportunity_report.py   | 100 ----------
 .../report/crm_opportunity_report_view.xml    | 122 ------------
 addons/crm/report/crm_phonecall_report.py     |  63 +++++-
 .../crm/report/crm_phonecall_report_view.xml  | 122 ++++++++++--
 addons/crm/report/crm_report_view.xml         |   2 +-
 11 files changed, 403 insertions(+), 274 deletions(-)
 delete mode 100644 addons/crm/report/crm_opportunity_report.py
 delete mode 100644 addons/crm/report/crm_opportunity_report_view.xml

diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index 2d340e7bfc5..de0fac56e29 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -30,7 +30,7 @@ import crm_opportunity
 import crm_phonecall
 
 import crm_installer
-#import report
+import report
 import wizard
 
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 2b4f827b6df..e2ea825c63c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -93,10 +93,8 @@ between mails and Open ERP.""",
         'security/crm_security.xml',
 #        'security/ir.model.access.csv',
 
-##        'report/crm_report_view.xml',
-#        'report/crm_lead_report_view.xml',
-##        'report/crm_opportunity_report_view.xml' ,
-#        'report/crm_phonecall_report_view.xml',
+        'report/crm_lead_report_view.xml',
+        'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
         'crm_installer_view.xml'
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index e6da8228ea6..85347103f5d 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -4,7 +4,10 @@
         <menuitem id="base.menu_crm_configuration" name="Cases"
             parent="base.menu_base_config" sequence="0"/>
 
-<!-- Case Sections Form View -->
+        <menuitem id="base.next_id_64" name="Reporting"
+        	parent="base.menu_base_partner" sequence="8" />
+
+        <!-- Case Sections Form View -->
 
         <record id="crm_case_section_view_form" model="ir.ui.view">
             <field name="name">crm.case.section.form</field>
@@ -430,6 +433,7 @@
 
 <!-- Case Search View  -->
 
+		
         <record id="view_crm_case_filter" model="ir.ui.view">
             <field name="name">crm.case.select</field>
             <field name="model">mailgate.thread</field>
diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py
index 11f9ae5b3ad..0ce743bc859 100644
--- a/addons/crm/report/__init__.py
+++ b/addons/crm/report/__init__.py
@@ -19,11 +19,8 @@
 #
 ##############################################################################
 
-#import report_businessopp
-#import crm_report
 import crm_lead_report
 import crm_phonecall_report
-#import crm_opportunity_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 0d09185dec8..2c0fa8c8fc6 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -34,10 +34,62 @@ class crm_lead_report(osv.osv):
     """ CRM Lead Report """
     _name = "crm.lead.report"
     _auto = False
-#    _inherit = "crm.case.report"
     _description = "CRM Lead Report"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr)) * 100
+
+                res[case.id] = perc_state
+            else:
+                model_name = self._name.split('report.')
+                if len(model_name) < 2:
+                    res[case.id] = 0.0
+                else:
+                    model_name = model_name[1]
+
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
+                    logs = cr.fetchone()[0]
+
+                    avg_ans = logs / case.nbr
+                    res[case.id] = avg_ans
+
+        return res
 
     _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True), 
         'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
                          domain="[('section_id','=',section_id),\
@@ -46,7 +98,12 @@ class crm_lead_report(osv.osv):
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]", 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), 
+        'type':fields.selection([
+            ('lead','Lead'),
+            ('opportunity','Opportunity'),
+            
+        ],'Type', help="Type is used to separate Leads and Opportunities"),
     }
     def init(self, cr):
 
@@ -66,6 +123,7 @@ class crm_lead_report(osv.osv):
                     c.state as state,
                     c.user_id,
                     c.stage_id,
+                    c.type as type,
                     c.company_id,
                     c.section_id,
                     c.categ_id,
@@ -79,7 +137,7 @@ class crm_lead_report(osv.osv):
                 from
                     crm_lead c
                 group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
-                     c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id
+                     c.state, c.user_id,c.section_id,c.stage_id,categ_id,c.partner_id,c.company_id, c.type
                      ,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
             )""")
 
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index d6502c190d9..0c6e935050c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -17,11 +17,12 @@
     			<field name="company_id" invisible="1"/>
 				<field name="partner_id" invisible="1"/>
 				<field name="day" invisible="1"/>
-				<field name="nbr" string="#Leads" sum="#Leads"/>
+				<field name="nbr" string="#Leads" sum="#Leads" attrs="{'string': 'type'=='opportunity' and '#opp' or '#lead'}"/>
                 <field name="delay_close" sum='Avg Closing Delay'/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="categ_id" invisible="1"/>
+                <field name="type" invisible="1"/>
              </tree>
             </field>
         </record>
@@ -31,13 +32,18 @@
         <record id="view_report_crm_lead_form" model="ir.ui.view">
             <field name="name">crm.lead.report.form</field>
             <field name="model">crm.lead.report</field>
-            <field name="inherit_id" ref="view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="nbr" position="after">
+                <form string="Cases">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="user_id" select="1"/>
+					<field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
                     <field name="delay_close"/>
                     <field name="stage_id"/>
-                </field>
+                    <field name="state" select="1"/>
+                </form>
             </field>
         </record>
 
@@ -57,28 +63,135 @@
         </record>
 
 <!-- Leads by user and section Search View -->
-
-        <record id="view_report_crm_lead_filter" model="ir.ui.view">
+		
+		<record id="view_report_crm_lead_filter" model="ir.ui.view">
             <field name="name">crm.lead.report.select</field>
             <field name="model">crm.lead.report</field>
-            <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            <data>
-                <xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
-                <group>
-            	    <separator orientation="vertical"/>
-            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-	            </group>
-            	</xpath>
-			<xpath
-				expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-				position='after'>
-				<filter string="Stage" icon="terp-sale" domain="[]"
-					context="{'group_by':'stage_id'}" />
-			</xpath>
-			</data>
+                <search string="Search">
+                  <group col="16" colspan="8">
+                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"/>-->
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
+                   			domain="[('month','=',time.strftime('%%m'))]" />-->
+                       <filter string="This Month" icon="terp-hr" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+
+                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<separator orientation="vertical" />
+                        <filter icon="terp-hr"
+                    		string="Draft"
+                    		domain="[('state','=','draft')]"/>
+					   <filter icon="terp-hr"
+                    		string="Open"
+                    		domain="[('state','=','open')]"/>
+					   <filter icon="terp-hr"
+                    		string="Pending"
+                    		domain="[('state','=','pending')]"/>
+
+                   		<separator orientation="vertical" />
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			widget="selection"
+                   			context="{'invisible_section': False}">
+
+                   			<filter icon="terp-crm"
+                   				context="{'invisible_section': False}"
+                   				domain="[('section_id.user_id','=',uid)]"
+                   				help="My section" />
+
+                   		</field>
+                   		<field name="company_id" widget="selection">
+                           <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id.company_id','=',uid)]"
+                        help="My company"/>
+                        </field>
+
+                      	<field name="user_id" select="1" widget="selection">
+	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+               			</field>
+                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+                   		<group>
+		            	    <separator orientation="vertical"/>
+		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+			            </group>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+                        	
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+
+						<filter string="Stage" icon="terp-sale" domain="[]"
+							context="{'group_by':'stage_id'}" />
+					
+                        <filter string="Category" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
+               </search>
+            </field>
+        </record>
+
+<!--	 Opportunity tree view  -->
+
+	<record id="view_report_crm_opportunity_tree" model="ir.ui.view">
+            <field name="name">crm.lead.report.tree</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+            <tree string="Opportunities">
+				<field name="name" invisible="1"/>
+				<field name="month" invisible="1"/>
+				<field name="section_id" invisible="1"/>
+				<field name="user_id" invisible="1"/>
+    			<field name="company_id" invisible="1"/>
+				<field name="partner_id" invisible="1"/>
+				<field name="day" invisible="1"/>
+				<field name="nbr" string="#Opportunities" sum="#Opportunities"/>
+                <field name="delay_close" sum='Avg Closing Delay'/>
+                <field name="state"  invisible="1"/>
+                <field name="stage_id"  invisible="1"/>
+                <field name="categ_id" invisible="1"/>
+                <field name="type" invisible="1"/>
+             </tree>
             </field>
         </record>
 
@@ -90,8 +203,8 @@
             <field name="view_type">form</field>
             <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_mode">tree,graph</field>
+            <field name="domain">[('type', '=', 'lead')]</field>
             <field name="search_view_id" ref="view_report_crm_lead_filter"/>
-
         </record>
 
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
@@ -107,10 +220,38 @@
             <field name="view_id" ref="view_report_crm_lead_graph"/>
             <field name="act_window_id" ref="action_report_crm_lead"/>
        </record>
+	
+	<record id="action_report_crm_opportunity" model="ir.actions.act_window">
+            <field name="name">Opportunities</field>
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="domain">[('type', '=', 'opportunity')]</field>
+            <field name="search_view_id" ref="view_report_crm_lead_filter"/>
+        </record>
 
+       <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_opportunity_tree"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity"/>
+       </record>
+
+       <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_lead_graph"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity"/>
+       </record>
+	
        <menuitem name="Leads" id="menu_report_crm_leads_tree"
            groups="base.group_extended"
            parent="base.next_id_64" action="action_report_crm_lead" />
 
+		<menuitem name="Opportunities" id="menu_report_crm_opportunities_tree"
+           groups="base.group_extended"
+           parent="base.next_id_64" action="action_report_crm_opportunity" />
+
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_opportunity_report.py b/addons/crm/report/crm_opportunity_report.py
deleted file mode 100644
index a3af4be8b7c..00000000000
--- a/addons/crm/report/crm_opportunity_report.py
+++ /dev/null
@@ -1,100 +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 osv import fields,osv
-import tools
-
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
-
-class crm_opportunity_report(osv.osv):
-    """ CRM Opportunity Report """
-    _name = "crm.opportunity.report"
-    _auto = False
-    _inherit = "crm.case.report"
-    _description = "CRM Opportunity Report"
-    _columns = {
-        'probability': fields.float('Avg. Probability', readonly=True,group_operator='avg'),
-        'amount_revenue': fields.float('Est.Revenue', readonly=True),
-        'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True),
-        'delay_close': fields.float('Delay to close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
-        '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),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-    }
-
-    def init(self, cr):
-        """ Display Est.Revenue , Average Probability ,Est.Revenue Probability
-            @param cr: the current row, from the database cursor
-        """
-
-        tools.drop_view_if_exists(cr, 'crm_opportunity_report')
-        cr.execute("""
-            create or replace view crm_opportunity_report as (
-                select
-                    min(c.id) as id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as day,
-                    c.state as state,
-                    c.user_id,
-                    c.section_id,
-                    c.categ_id,
-                    c.stage_id,
-                    c.partner_id,
-                    c.company_id,
-                    count(*) as nbr,
-                    0 as avg_answers,
-                    0.0 as perc_done,
-                    0.0 as perc_cancel,
-                    date_trunc('day',c.create_date) as create_date,
-                    sum(planned_revenue) as amount_revenue,
-                    sum((planned_revenue*probability)/100.0)::decimal(16,2) as amount_revenue_prob,
-                    avg(probability)::decimal(16,2) as probability,
-                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close
-                from
-                    crm_opportunity c
-                group by
-                    to_char(c.create_date, 'YYYY'),
-                    to_char(c.create_date, 'MM'),
-                    to_char(c.create_date, 'YYYY-MM-DD'),
-                    c.state,
-                    c.user_id,
-                    c.section_id,
-                    c.stage_id,
-                    c.categ_id,
-                    c.partner_id,
-                    company_id,
-                    create_date
-            )""")
-
-crm_opportunity_report()
diff --git a/addons/crm/report/crm_opportunity_report_view.xml b/addons/crm/report/crm_opportunity_report_view.xml
deleted file mode 100644
index 29a66b838f0..00000000000
--- a/addons/crm/report/crm_opportunity_report_view.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-<!-- Opportunities by user and section Tree View  -->
-
-        <record id="view_report_crm_opportunity_tree" model="ir.ui.view">
-            <field name="name">crm.opportunity.report.tree</field>
-            <field name="model">crm.opportunity.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-            	<tree string="Opportunities">
-	              	<field name="name"  invisible="1"/>
-					<field name="month"  invisible="1"/>
-					<field name="section_id"  invisible="1"/>
-                    <field name="user_id"  invisible="1"/>
-                    <field name="company_id"  invisible="1"/>
-					<field name="partner_id"  invisible="1"/>
-                	<field name="nbr" string="#Opportunities" sum="#Opportunities"/>
-                    <field name="amount_revenue"  sum="Total Revenue"/>
-                    <field name="probability" widget="progressbar" avg="Probability"/>
-                    <field name="amount_revenue_prob" sum="Est. Rev*Prob"/>
-                    <field name="delay_close" avg="Avg Closing Delay"/>
-                    <field name="state" invisible="1"/>
-                    <field name="stage_id"  invisible="1"/>
-                    <field name="categ_id" invisible="1"/>
-                    <field name="day" invisible="1"/>
-               </tree>
-            </field>
-        </record>
-
-<!-- Opportunities by user and section Form View  -->
-
-        <record id="view_report_crm_opportunity_form" model="ir.ui.view">
-            <field name="name">crm.opportunity.report.form</field>
-            <field name="model">crm.opportunity.report</field>
-            <field name="inherit_id" ref="view_crm_case_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <field name="nbr" position="after">
-                    <field name="delay_close"/>
-                    <field name="amount_revenue"/>
-                    <field name="amount_costs"/>
-                    <field name="amount_revenue_prob"/>
-                    <field name="probability"/>
-                </field>
-            </field>
-        </record>
-
-<!-- Opportunities by user and section Graph View  -->
-
-        <record id="view_report_crm_opportunity_graph" model="ir.ui.view">
-            <field name="name">crm.opportunity.report.graph</field>
-            <field name="model">crm.opportunity.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Opportunity" type="bar">
-                    <field name="state"/>
-                    <field name="nbr" operator="+"/>
-                    <field group="True" name="user_id"/>
-                </graph>
-            </field>
-        </record>
-
-<!-- Opportunities by user and section Search View  -->
-
-        <record id="view_report_crm_opportunity_filter" model="ir.ui.view">
-            <field name="name">crm.opportunity.report.select</field>
-            <field name="model">crm.opportunity.report</field>
-            <field name="inherit_id" ref="view_crm_case_filter"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-            <data>
-                 <xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
-                 <group>
-            	    <separator orientation="vertical"/>
-            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-	               </group>
-            	</xpath>
-				<xpath
-					expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-					position='after'>
-					<filter string="Stage" icon="terp-sale" domain="[]"
-						context="{'group_by':'stage_id'}" />
-					<separator orientation="vertical" />
-					<filter string="Partner" icon="terp-partner"
-						domain="[]" context="{'group_by':'partner_id'}" />
-				</xpath>
-			 </data>
-            </field>
-        </record>
-
-<!-- Opportunities by user and section Action  -->
-
-        <record id="action_report_crm_opportunity" model="ir.actions.act_window">
-            <field name="name">Opportunities</field>
-            <field name="res_model">crm.opportunity.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
-            <field name="search_view_id" ref="view_report_crm_opportunity_filter"/>
-        </record>
-          <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_report_crm_opportunity_tree"/>
-            <field name="act_window_id" ref="action_report_crm_opportunity"/>
-        </record>
-        <record model="ir.actions.act_window.view" id="action_report_crm_opportunity_graph">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_report_crm_opportunity_graph"/>
-            <field name="act_window_id" ref="action_report_crm_opportunity"/>
-        </record>
-
-        <menuitem name="Opportunities"
-            action="action_report_crm_opportunity"
-            id="menu_report_crm_opportunity_tree" parent="base.next_id_64" />
-
-    </data>
-</openerp>
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index ad9591188e8..c1954f8607f 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -22,15 +22,76 @@
 from osv import fields,osv
 import tools
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
+
+
 class crm_phonecall_report(osv.osv):
     """ Phone calls by user and section """
 
     _name = "crm.phonecall.report"
     _description = "Phone calls by user and section"
     _auto = False
-#    _inherit = "crm.case.report"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr)) * 100
+
+                res[case.id] = perc_state
+            else:
+                model_name = self._name.split('report.')
+                if len(model_name) < 2:
+                    res[case.id] = 0.0
+                else:
+                    model_name = model_name[1]
+
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
+                    logs = cr.fetchone()[0]
+
+                    avg_ans = logs / case.nbr
+                    res[case.id] = avg_ans
+
+        return res
 
     _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True), 
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="[('section_id','=',section_id),\
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 698a9b88fa3..83c76578afe 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -30,15 +30,20 @@
         <record id="view_report_crm_phonecall_form" model="ir.ui.view">
             <field name="name">crm.phonecall.report.form</field>
             <field name="model">crm.phonecall.report</field>
-            <field name="inherit_id" ref="view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="nbr" position="after">
-                    <field name="delay_close"/>
+                <form string="Cases">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="user_id" select="1"/>
+					<field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
+                     <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
-                </field>
+                    <field name="state" select="1"/>
+                </form>
             </field>
         </record>
 
@@ -58,21 +63,108 @@
         </record>
 
 <!-- Phone calls by user and section Search View -->
-
-        <record id="view_report_crm_phonecall_filter" model="ir.ui.view">
+	
+	<record id="view_report_crm_phonecall_filter" model="ir.ui.view">
             <field name="name">crm.phonecall.report.select</field>
             <field name="model">crm.phonecall.report</field>
-            <field name="inherit_id" ref="view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-             <data>
-                 <xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
-                 <group>
-            	    <separator orientation="vertical"/>
-	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-	             </group>
-            	</xpath>
-              </data>
+                <search string="Search">
+                  <group col="16" colspan="8">
+                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"/>-->
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
+                   			domain="[('month','=',time.strftime('%%m'))]" />-->
+                       <filter string="This Month" icon="terp-hr" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+
+                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<separator orientation="vertical" />
+                        <filter icon="terp-hr"
+                    		string="Draft"
+                    		domain="[('state','=','draft')]"/>
+					   <filter icon="terp-hr"
+                    		string="Open"
+                    		domain="[('state','=','open')]"/>
+					   <filter icon="terp-hr"
+                    		string="Pending"
+                    		domain="[('state','=','pending')]"/>
+
+                   		<separator orientation="vertical" />
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			widget="selection"
+                   			context="{'invisible_section': False}">
+
+                   			<filter icon="terp-crm"
+                   				context="{'invisible_section': False}"
+                   				domain="[('section_id.user_id','=',uid)]"
+                   				help="My section" />
+
+                   		</field>
+                   		<field name="company_id" widget="selection">
+                           <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id.company_id','=',uid)]"
+                        help="My company"/>
+                        </field>
+
+                      	<field name="user_id" select="1" widget="selection">
+	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+               			</field>
+                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+                    	<group>
+		            	    <separator orientation="vertical"/>
+			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+			             </group>
+	             
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
+               </search>
             </field>
         </record>
 
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
index 814b056dbf1..c58367ae85d 100644
--- a/addons/crm/report/crm_report_view.xml
+++ b/addons/crm/report/crm_report_view.xml
@@ -56,7 +56,7 @@
 
 <!-- CRM Case Report Search View -->
 
-        <record id="view_crm_case_filter" model="ir.ui.view">
+        <record id="view_crm_report_filter" model="ir.ui.view">
             <field name="name">crm.case.report.select</field>
             <field name="model">crm.case.report</field>
             <field name="type">search</field>

From aa7188f0b749403cece5172a6ae26b8fb6b4dadf Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 5 May 2010 14:48:51 +0530
Subject: [PATCH 069/146] [ADD,IMP]:gtk contact form

bzr revid: nch@tinyerp.com-20100505091851-lzrd2piensdct79k
---
 addons/account/account_installer.xml   |  2 +-
 addons/base_setup/gtk_contact_form.py  | 75 ++++++++++++++++++++++++
 addons/base_setup/gtk_contact_form.xml | 81 ++++++++++++++++++++++++++
 3 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 addons/base_setup/gtk_contact_form.py
 create mode 100644 addons/base_setup/gtk_contact_form.xml

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 89921af9790..b644b814756 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -28,7 +28,7 @@
               <attribute name='string'></attribute>
 	      </xpath>
 	      <group colspan="8">
-            <field name="charts" colspan="8"/>
+            <field name="charts"/>
             <group colspan="4" groups="base.group_extended">
             	<separator col="4" colspan="4" string="Install Extra Account Module"/>
             	<field name="account_analytic_plans"/>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
new file mode 100644
index 00000000000..c05c3866b97
--- /dev/null
+++ b/addons/base_setup/gtk_contact_form.py
@@ -0,0 +1,75 @@
+# -*- 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 operator import itemgetter
+
+from osv import osv, fields
+import netsvc
+import tools
+
+class base_gtkcontactform(osv.osv_memory):
+    """
+    """
+    _name = 'base.gtkcontactform'
+    _inherit = 'res.config'
+    logger = netsvc.Logger()
+
+    def default_get(self, cr, uid, fields_list=None, context=None):
+         ''' set email and phone number selected in the previous company information
+             form '''
+         defaults = super(base_gtkcontactform, self)\
+         .default_get(cr, uid, fields_list=fields_list, context=context)
+         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
+         company = self.pool.get('base.setup.company').read(cr, uid, company_id)[0]
+         defaults.update({'email':company.get('email',''),
+                          'phone': company.get('phone','')})
+         return defaults
+
+    _columns = {
+             'name':fields.char('Your Name', size=64, required=True),
+             'job':fields.char('Job Title', size=64,),
+             'email':fields.char('E-mail', size=64, required=True),
+             'phone':fields.char('Phone', size=64, required=True),
+             'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
+             'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
+                                          ('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),
+                                          ('entertainment','Entertainment'),('environmental','Environmental'),('finance','Finance'),('government','Government'),('healthcare','Healthcare'),('hospitality','Hospitality'),
+                                          ('insurance','Insurance'),('machinery','Machinery'),('manufacturing','Manufacturing'),('media','Media'),('notforprofit','Not For Profit'),
+                                          ('recreation','Recreation'),('retail','Retail'),('shipping','Shipping'),('technology','Technology'),('telecommunications','Telecommunications'),
+                                          ('transportation','Transportation'),('utilities','Utilities'),('other','Other'),
+                                          ], 'Industry', size=32),
+             'use_openerp':fields.boolean('We plan to use OpenERP'),
+             'already_using_openerp':fields.boolean('Already using OpenERP'),
+             'sell_openerp':fields.boolean('Plan to sell OpenERP'),
+             'already_selling__openerp':fields.boolean('Already selling OpenERP'),
+
+             'features':fields.boolean('The features of OpenERP'),
+             'saas':fields.boolean('OpenERP Online Solutions (SaaS)'),
+             'partners_program':fields.boolean('OpenERP Partners Program (for integrators)'),
+             'support':fields.boolean('Support and Maintenance Solutions'),
+             'training':fields.boolean('OpenERP Training Program'),
+             'other':fields.boolean('Other'),
+             'ebook':fields.boolean('ebook'),
+             'updates':fields.boolean('updates'),
+             }
+    def execute(self, cr, uid, ids, context=None):
+         pass
+
+base_gtkcontactform()
\ No newline at end of file
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
new file mode 100644
index 00000000000..b220db020c6
--- /dev/null
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -0,0 +1,81 @@
+<openerp>
+  <data>
+    <record id="view_base_setup_contact" model="ir.ui.view">
+      <field name="name">Contact information</field>
+      <field name="model">base.gtkcontactform</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_view_base"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes">
+            <attribute name="string">Contact Information</attribute>
+          </form>
+		  <xpath expr="//label[@string='description']" position="attributes">
+	            <attribute name="string">Information about you and the company you are related too. The Basic information related to the company has already been collected and some more information required by you to fill.</attribute>
+	      </xpath>
+	      <xpath expr='//separator[@string="title"]' position='attributes'>
+	          	  <attribute name='string'>About You</attribute>
+	          	  <attribute name='colspan'>4</attribute>
+	      </xpath>
+	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>22</attribute>
+	          	  <attribute name='string'></attribute>
+	      </xpath>
+          <group string="res_config_contents" position="replace">
+          	<group colspan="4">
+          		<group colspan="2">
+	            	<field name="name" colspan="2" required="True"/>
+	            	<field name="job" colspan="2"/>
+		            <field name="email" colspan="2"/>
+		            <field name="phone" colspan="2"/>
+		            <field name="total_employees" colspan="2"/>
+		            <field name="industry" colspan="2"/>
+		        </group>
+		        <newline/>
+		        <group colspan="4">
+		            <separator string="Your projects with OpenERP" colspan="4"/>
+		            <field name="use_openerp" colspan="1"/>
+		            <field name="already_using_openerp" colspan="1"/>
+		            <field name="sell_openerp" colspan="1"/>
+		            <field name="already_selling__openerp" colspan="1"/>
+		       </group>
+		       <group colspan="4">
+		            <separator colspan="4" string="You would like to know more about"/>
+		            <field name="features" colspan="1"/>
+		            <field name="saas" colspan="1"/>
+		            <field name="partners_program" colspan="1"/>
+		            <field name="support" colspan="1"/>
+		            <field name="training" colspan="1"/>
+		            <field name="other" colspan="1"/>
+		       </group>
+			 <group colspan="2">
+		       		<separator colspan="4" string="Do You Need Them ?"/>
+		            <field name="ebook" nolabel="1" colspan="1"/>
+		            <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="1"/>
+		            <newline/>
+		            <field name="updates" nolabel="1" colspan="1"/>
+		            <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="1"/>
+	        	</group>
+	       </group>
+	       </group>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_base_contact" model="ir.actions.act_window">
+      <field name="name">Setup contact information</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">base.gtkcontactform</field>
+      <field name="view_id" ref="view_base_setup_contact"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="base_setup_contact_todo" model="ir.actions.todo">
+        <field name="action_id" ref="action_base_contact"/>
+        <field name="sequence">1</field>
+        <field name="restart">onskip</field>
+    </record>
+  </data>
+</openerp>

From 1a8baa044a9a88e645c42f282821ae99203dbd19 Mon Sep 17 00:00:00 2001
From: Quality Team <>
Date: Wed, 5 May 2010 12:02:41 +0200
Subject: [PATCH 070/146] [IMP] Add the capabilities to store a datetime, date,
 integer, float and char in a field.property

lp bug: https://launchpad.net/bugs/562356 fixed

bzr revid: stephane@openerp.com-20100505100241-o5w0twdccrs7ppx2
---
 bin/addons/base/__terp__.py                   |   2 +-
 .../1.2/pre-10-ir_property_rename_column.py   |  20 +++
 bin/addons/base/res/ir_property.py            | 131 ++++++++++++++++--
 bin/addons/base/res/ir_property_view.xml      |   8 +-
 bin/osv/fields.py                             |  31 ++---
 bin/osv/orm.py                                |  21 ++-
 6 files changed, 166 insertions(+), 47 deletions(-)
 create mode 100644 bin/addons/base/migrations/1.2/pre-10-ir_property_rename_column.py

diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index 3f50b319692..d0dc9b68dd3 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -22,7 +22,7 @@
 
 {
     'name': 'Base',
-    'version': '1.1',
+    'version': '1.2',
     'category': 'Generic Modules/Base',
     'description': """The kernel of OpenERP, needed for all installation.""",
     'author': 'Tiny',
diff --git a/bin/addons/base/migrations/1.2/pre-10-ir_property_rename_column.py b/bin/addons/base/migrations/1.2/pre-10-ir_property_rename_column.py
new file mode 100644
index 00000000000..8c79e735c30
--- /dev/null
+++ b/bin/addons/base/migrations/1.2/pre-10-ir_property_rename_column.py
@@ -0,0 +1,20 @@
+# -*- coding: utf8 -*-
+
+__name__ = "ir.property: Rename column value to value_reference"
+
+def migrate(cr, version):
+    rename_column(cr, 'ir_property', 'value', 'value_reference')
+
+def column_exists(cr, table, column):
+    cr.execute("SELECT count(1)"
+               "  FROM pg_class c, pg_attribute a"
+               " WHERE c.relname=%s"
+               "   AND c.oid=a.attrelid"
+               "   AND a.attname=%s",
+               (table, column))
+    return cr.fetchone()[0] != 0
+
+def rename_column(cr, table, old, new):
+    if column_exists(cr, table, old) and not column_exists(cr, table, new):
+        cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO "%s"' % (table, old, new))
+
diff --git a/bin/addons/base/res/ir_property.py b/bin/addons/base/res/ir_property.py
index c7673bf4b26..40df4b2ec2a 100644
--- a/bin/addons/base/res/ir_property.py
+++ b/bin/addons/base/res/ir_property.py
@@ -21,6 +21,7 @@
 
 from osv import osv,fields
 from operator import attrgetter
+import time
 # -------------------------------------------------------------------------
 # Properties
 # -------------------------------------------------------------------------
@@ -48,24 +49,130 @@ class ir_property(osv.osv):
 
     _columns = {
         'name': fields.char('Name', size=128),
-        'value': fields.reference('Value', selection=_models_get2, size=128),
-#        'value': fields.char('Value', size=128),
+
         'res_id': fields.reference('Resource', selection=_models_get, size=128,
                                    help="If not set, act as default property"),
         'company_id': fields.many2one('res.company', 'Company'),
-        'fields_id': fields.many2one('ir.model.fields', 'Fields', ondelete='cascade', required=True)
+        'fields_id': fields.many2one('ir.model.fields', 'Fields', ondelete='cascade', required=True),
+
+        'value_float' : fields.float('Value'),
+        'value_integer' : fields.integer_big('Value'), # will contain (int, bigint)
+        'value_text' : fields.text('Value'), # will contain (char, text)
+        'value_binary' : fields.binary('Value'),
+        'value_reference': fields.reference('Value', selection=_models_get2, size=128),
+        'value_datetime' : fields.datetime('Value'),
+
+        'type' : fields.selection([('char', 'Char'),
+                                   ('float', 'Float'),
+                                   ('integer', 'Integer'),
+                                   ('integer_big', 'Integer Big'),
+                                   ('text', 'Text'),
+                                   ('binary', 'Binary'),
+                                   ('many2one', 'Many2One'),
+                                   ('date', 'Date'),
+                                   ('datetime', 'DateTime'),
+                                  ],
+                                  'Type',
+                                  required=True,
+                                  select=1),
     }
 
-    def get(self, cr, uid, name, model, res_id=False, context={}):
-        cr.execute('select id from ir_model_fields where name=%s and model=%s', (name, model))
-        res = cr.fetchone()
-        if res:
-            ucid = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-            nid = self.search(cr, uid, [('fields_id','=',res[0]),('res_id','=',res_id),('company_id','=',ucid)])
-            if nid:
-                d = self.browse(cr, uid, nid[0], context).value
-                return (d and int(d.split(',')[1])) or False
+    _defaults = {
+        'type': 'many2one',
+    }
+
+    def _update_values(self, cr, uid, ids, values):
+        value = values.pop('value', None)
+        if not value:
+            return values
+        type_ = values.get('type', 'many2one')
+        type2field = {
+            'char': 'value_text',
+            'float': 'value_float',
+            'integer': 'value_integer',
+            'integer_big': 'value_integer',
+            'text': 'value_text',
+            'binary': 'value_binary',
+            'many2one': 'value_reference',
+            'date' : 'value_datetime',
+            'datetime' : 'value_datetime',
+        }
+        field = type2field.get(type_)
+        if not field:
+            raise osv.except_osv('Error', 'Invalid type')
+
+        if field == 'value_reference':
+            if isinstance(value, osv.orm.browse_record):
+                value = '%s,%d' % (value._name, value.id)
+            elif isinstance(value, (int, long)):
+                field_id = values.get('fields_id')
+                if not field_id:
+                    if not ids:
+                        raise ValueError()
+                    field_id = self.browse(cr, uid, ids[0]).fields_id
+                else:
+                    field_id = self.pool.get('ir.model.fields').browse(cr, uid, field_id)
+
+                value = '%s,%d' % (field_id.relation, value)
+
+        values[field] = value
+        return values
+
+
+    def write(self, cr, uid, ids, values, context=None):
+        return super(ir_property, self).write(cr, uid, ids, self._update_values(cr, uid, ids, values), context=context)
+
+    def create(self, cr, uid, values, context=None):
+        return super(ir_property, self).create(cr, uid, self._update_values(cr, uid, None, values), context=context)
+
+    def get_by_id(self, cr, uid, record_ids, context=None):
+        if isinstance(record_ids, (int, long)):
+            record_ids = [record_ids]
+
+        if not record_ids:
+            return False
+
+        record = self.browse(cr, uid, record_ids[0], context=context)
+
+        if record.type in ('char', 'text'):
+            return record.value_text
+        elif record.type == 'float':
+            return record.value_float
+        elif record.type in ('integer', 'integer_big'):
+            return record.value_integer
+        elif record.type == 'binary':
+            return record.value_binary
+        elif record.type == 'many2one':
+            return record.value_reference
+        elif record.type == 'datetime':
+            return record.value_datetime
+        elif record.type == 'date':
+            return time.strftime('%Y-%m-%d', time.strptime(record.value_datetime, '%Y-%m-%d %H:%M:%S'))
+
         return False
+
+    def get(self, cr, uid, name, model, res_id=False, context=None):
+        domain = self._get_domain(cr, uid, name, model, context=context)
+        if domain is not None:
+            domain = [('res_id', '=', res_id)] + domain
+            nid = self.search(cr, uid, domain, context=context)
+            return self.get_by_id(cr, uid, nid, context=context)
+        return False
+
+    def _get_domain(self, cr, uid, prop_name, model, context=None):
+        cr.execute('select id from ir_model_fields where name=%s and model=%s', (prop_name, model))
+        res = cr.fetchone()
+        if not res:
+            return None
+
+        company = self.pool.get('res.company')
+        cid = company._company_default_get(cr, uid, model, res[0],
+                                           context=context)
+
+        domain = ['&', ('fields_id', '=', res[0]),
+                '|', ('company_id', '=', cid), ('company_id', '=', False)]
+        return domain
+
 ir_property()
 
 
diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index 3a2f56170fa..a4dac386148 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -29,7 +29,13 @@
                     <field name="name" select="1"/>
                     <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field colspan="4" name="fields_id" select="1"/>
-                    <field colspan="4" name="value"/>
+                    <field colspan="4" name="type"/>
+                    <field colspan="4" name="value_integer" />
+                    <field colspan="4" name="value_float" />
+                    <field colspan="4" name="value_datetime" />
+                    <field colspan="4" name="value_text" />
+                    <field colspan="4" name="value_reference" />
+                    <field colspan="4" name="value_binary" />
                     <field colspan="4" name="res_id" groups="base.group_extended"/>
                 </form>
             </field>
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index be1f5c2baac..a38301ba184 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -873,33 +873,25 @@ class serialized(_column):
 
 class property(function):
 
-    def _get_domain(self, obj, cr, uid, prop_name, context=None):
-        def_id = self._field_get(cr, uid, obj._name, prop_name)
-
-        company = obj.pool.get('res.company')
-        cid = company._company_default_get(cr, uid, obj._name, def_id,
-                                           context=context)
-
-        domain = ['&', ('fields_id', '=', def_id),
-                '|', ('company_id', '=', cid), ('company_id', '=', False)]
-        return domain
-
     def _get_default(self, obj, cr, uid, prop_name, context=None):
         prop = obj.pool.get('ir.property')
-        domain = self._get_domain(obj, cr, uid, prop_name, context)
+        domain = prop._get_domain(cr, uid, prop_name, obj._name, context)
         ids = prop.search(cr, uid, domain, order='company_id', context=context)
         if not ids:
             return False
-        return prop.browse(cr, uid, ids[0], context).value
+        return prop.get_by_id(cr, uid, ids, context=context) 
 
     def _get_by_id(self, obj, cr, uid, prop_name, ids, context=None):
         prop = obj.pool.get('ir.property')
         vids = [obj._name + ',' + str(oid) for oid in  ids]
 
-        domain = [('res_id', 'in', vids)] + \
-                  self._get_domain(obj, cr, uid, prop_name, context)
+        domain = prop._get_domain(cr, uid, prop_name, obj._name, context)
+        if domain is not None:
+            domain = [('res_id', 'in', vids)] + domain
+            return prop.search(cr, uid, domain, context=context)
+        else:
+            return []
 
-        return prop.search(cr, uid, domain, context=context)
 
     def _fnct_write(self, obj, cr, uid, id, prop_name, id_val, obj_dest, context=None):
         if context is None:
@@ -910,7 +902,6 @@ class property(function):
             cr.execute('DELETE FROM ir_property WHERE id IN %s', (tuple(nids),))
 
         default_val = self._get_default(obj, cr, uid, prop_name, context)
-        id_val = "%s,%d" % (obj_dest, id_val)
 
         if id_val and id_val != default_val:
             def_id = self._field_get(cr, uid, obj._name, prop_name)
@@ -926,7 +917,7 @@ class property(function):
                 'res_id': obj._name+','+str(id),
                 'company_id': cid,
                 'fields_id': def_id,
-                #'type': self._type,
+                'type': self._type,
                 }, context=context)
         return False
 
@@ -950,7 +941,7 @@ class property(function):
         for id in ids:
             res[id] = default_val
         for prop in property.browse(cr, uid, nids):
-            value = prop.value
+            value = prop.get_by_id(context=context)
             if isinstance(value, browse_record):
                 if not value.exists():
                     cr.execute('DELETE FROM ir_property WHERE id=%s', (prop.id,))
@@ -970,7 +961,7 @@ class property(function):
         return self.field_id[cr.dbname]
 
     def __init__(self, obj_prop, **args):
-        #assert obj_prop
+        # TODO remove obj_prop parameter (use many2one type)
         self.field_id = {}
         function.__init__(self, self._fnct_read, False, self._fnct_write,
                           obj_prop, **args)
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 161364a13bc..133f6cdda68 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2587,19 +2587,14 @@ class orm(orm_template):
                     or False
             if isinstance(fld_def, fields.property):
                 property_obj = self.pool.get('ir.property')
-                definition_id = fld_def._field_get(cr, uid, self._name, f)
-                nid = property_obj.search(cr, uid, [('fields_id', '=',
-                    definition_id), ('res_id', '=', False)])
-                if nid:
-                    prop_value = property_obj.browse(cr, uid, nid[0],
-                            context=context).value
-                    if prop_value:
-                        if isinstance(prop_value, (browse_record, browse_null)):
-                            value[f] = prop_value.id
-                        else:
-                            value[f] = int(prop_value.rsplit(',', 1)[1])
+                prop_value = property_obj.get(cr, uid, f, self._name, context=context)
+                if prop_value:
+                    if isinstance(prop_value, (browse_record, browse_null)):
+                        value[f] = prop_value.id
                     else:
-                        value[f] = False
+                        value[f] = prop_value
+                else:
+                    value[f] = False
 
         # get the default values set by the user and override the default
         # values defined in the object
@@ -2991,7 +2986,7 @@ class orm(orm_template):
 
         properties = self.pool.get('ir.property')
         domain = [('res_id', '=', False),
-                  ('value', 'in', ['%s,%s' % (self._name, i) for i in ids]),
+                  ('value_reference', 'in', ['%s,%s' % (self._name, i) for i in ids]),
                  ]
         if properties.search(cr, uid, domain, context=context):
             raise except_orm(_('Error'), _('Unable to delete this document because it is used as a default property'))

From 4e353a80609baa3276921b28400291e80929f423 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 5 May 2010 15:34:34 +0530
Subject: [PATCH 071/146] [IMP]: crm: Improvement in send mail view

bzr revid: rpa@tinyerp.com-20100505100434-6x1rlc6lkb9r8m3b
---
 addons/crm/wizard/crm_send_email_view.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 49758245eb0..98a2e1a0b75 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -10,6 +10,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send New Mail" col="2">
+                	<separator string="Send New Mail" colspan="2"/>
                     <field name="email_from" />
                     <field name="email_to"  />
                     <field name="email_cc" />
@@ -21,12 +22,15 @@
                         <page string="Attachments">
                             <field name="doc1" filename="doc1_fname"/>
                             <field name="doc1_fname" invisible="1" />
+                            <newline/>
                             <field name="doc2" filename="doc2_fname" />
                             <field name="doc2_fname" invisible="1" />
+                            <newline/>
                             <field name="doc3" filename="doc3_fname" />
                             <field name="doc3_fname" invisible="1" />
                         </page>
                     </notebook>
+                    <separator string="" colspan="2"/>
                     <group colspan="2" col="4" >
                         <field name="state" />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />

From 3301cca6b13d2f9ff974d1628d6cb33668ada92b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 5 May 2010 15:56:27 +0530
Subject: [PATCH 072/146] [REM]: crm: Removed crm.case from res.request.link

bzr revid: rpa@tinyerp.com-20100505102627-2d5cvjnvlu72om51
---
 addons/crm/crm_data.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 6dd53747c54..cfff95888cc 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -2,11 +2,6 @@
 <openerp>
     <data>
         
-        <record id="req_link_case" model="res.request.link">
-            <field name="name">Case</field>
-            <field name="object">crm.case</field>
-        </record>
-        
         <record id="event_type_case_create" model="res.partner.event.type">
             <field name="name">CRM: Create Case</field>
             <field name="key">crm_case_draft</field>

From a606f0d030b87014b1a113a7311d8584a885f902 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 5 May 2010 16:04:09 +0530
Subject: [PATCH 073/146] [IMP] Project modules usability improvements

bzr revid: vir@tinyerp.com-20100505103409-9vba04hdvjwfah91
---
 addons/project/project.py                     | 1 +
 addons/project/project_view.xml               | 9 +++++----
 addons/project/report/project_report.py       | 2 +-
 addons/project/report/project_report_view.xml | 3 ++-
 addons/scrum/scrum.py                         | 2 +-
 addons/scrum/scrum_view.xml                   | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 727f210a488..c7a1a8ae054 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -139,6 +139,7 @@ class project(osv.osv):
         'active': lambda *a: True,
         'priority': lambda *a: 1,
         'sequence': lambda *a: 10,
+        'warn_manager': lambda *a: True,
     }
     def _check_dates(self, cr, uid, ids):
          leave = self.read(cr, uid, ids[0],['date_start','date'])
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 196b70eceb1..38a059cb352 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,7 +110,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
+                       <filter icon="terp-project" string="Open" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
                        <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
@@ -136,7 +136,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree string="Projects">
+                <tree colors="red:date&lt;current_date and state in ('open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
@@ -238,7 +238,7 @@
                         <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                         <field name="total_hours" widget="float_time"/>
                         <field name="date_deadline"/>
-                        <field name="user_id" select="1"/>
+                        <field name="user_id" select="1" widget="selection"/>
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -589,8 +589,8 @@
             <field name="arch" type="xml">
                 <tree string="Messages">
                     <field name="subject" select="1"/>
-                    <field name="user_id" select="1"/>
                     <field name="project_id" select="1"/>
+                    <field name="user_id" select="1"/>
                     <field name="date" select="1"/>
                 </tree>
             </field>
@@ -639,5 +639,6 @@
 
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
+		<act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.message" src_model="project.project"/>
     </data>
 </openerp>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index e4cd21f0b48..e099b4544aa 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -84,7 +84,7 @@ class report_project_task_user(osv.osv):
                     t.project_id,
                     t.state,
                     t.priority,
-                    t.name,
+                    t.name as name,
                     t.company_id,
                     t.partner_id,
                     t.type,
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9ee400e6472..a4a072849b9 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -9,7 +9,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Tasks">
-                	<field name="name" invisible="1"/>
+                	<field name="name" />
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
@@ -123,6 +123,7 @@
                         <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" />
                         <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
                         <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
+                        <filter string="Task" icon="terp-project" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index 915332f7f7d..7595a8a5a28 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -97,7 +97,7 @@ class scrum_sprint(osv.osv):
         'date_stop': fields.date('Ending Date', required=True),
         'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)]),
         'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True),
-        'scrum_master_id': fields.many2one('res.users', 'Scrum Master', required=True),
+        'scrum_master_id': fields.many2one('res.users', 'Scrum Manager', required=True),
         'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'),
         'review': fields.text('Sprint Review'),
         'retrospective': fields.text('Sprint Retrospective'),
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 329a77bc56d..39f8bfc75db 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -65,7 +65,7 @@
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/>
                         <field name="user_id" select="1"/>
-                        <field name="sequence"/>
+                        <field name="sequence" groups="base.group_extended"/>
            			    <field name="date"/>
                         <field name="active" select="1"/>
                         <group colspan="6" col="8">

From f2c30ef17719839ebe223092851703de3168639e Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Wed, 5 May 2010 13:20:07 +0200
Subject: [PATCH 074/146] [FIX] ir_property: Improve the layout of the form
 view

bzr revid: stephane@openerp.com-20100505112007-rvxomqlha4f7uw1u
---
 bin/addons/base/res/ir_property_view.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index a4dac386148..e2a98f30445 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -30,12 +30,24 @@
                     <field name="company_id" select="1" groups="base.group_multi_company"/>
                     <field colspan="4" name="fields_id" select="1"/>
                     <field colspan="4" name="type"/>
-                    <field colspan="4" name="value_integer" />
-                    <field colspan="4" name="value_float" />
-                    <field colspan="4" name="value_datetime" />
-                    <field colspan="4" name="value_text" />
-                    <field colspan="4" name="value_reference" />
-                    <field colspan="4" name="value_binary" />
+                    <group colspan="4" attrs="{'invisible' : [('type', 'not in', ('integer', 'integer_big'))]}">
+                        <field colspan="4" name="value_integer" widget="integer"/>
+                    </group>
+                    <group colspan="4" attrs="{'invisible' : [('type', '!=', 'float')]}">
+                        <field colspan="4" name="value_float" />
+                    </group>
+                    <group colspan="4" attrs="{'invisible' : [('type', 'not in', ('date', 'datetime'))]}">
+                        <field colspan="4" name="value_datetime" />
+                    </group>
+                    <group colspan="4" attrs="{'invisible' : [('type', 'not in', ('char', 'text'))]}">
+                        <field colspan="4" name="value_text" />
+                    </group>
+                    <group colspan="4" attrs="{'invisible' : [('type', '!=', 'many2one')]}">
+                        <field colspan="4" name="value_reference" />
+                    </group>
+                    <group colspan="4" attrs="{'invisible' : [('type', '!=', 'binary')]}">
+                        <field colspan="4" name="value_binary" />
+                    </group>
                     <field colspan="4" name="res_id" groups="base.group_extended"/>
                 </form>
             </field>

From 59da752714820d0a0a55074e4e28e1d846ad002e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 5 May 2010 17:25:13 +0530
Subject: [PATCH 075/146] [IMP]: crm, mail_gateway: Added new python class
 crm_case to handle all common functions related to case and removed that
 functions in particular objects

bzr revid: rpa@tinyerp.com-20100505115513-fy2vbtqn887615q3
---
 addons/crm/crm.py                   | 317 +++++++++++++++++++++++++++-
 addons/crm/crm_lead.py              | 221 +++----------------
 addons/crm/crm_meeting.py           |  79 +------
 addons/crm/crm_opportunity.py       |  63 ++----
 addons/crm/crm_phonecall.py         |  84 ++------
 addons/mail_gateway/mail_gateway.py |  82 -------
 6 files changed, 387 insertions(+), 459 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 2e95ffff8ec..47eb59dca3b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -45,6 +45,322 @@ AVAILABLE_PRIORITIES = [
     ('5', 'Lowest'), 
 ]
 
+class crm_case(object):
+    """A simple python class to be used for common functions """
+
+    def _get_default_partner_address(self, cr, uid, context):
+        """Gives id of default address for current user
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        if not context.get('portal', False):
+            return False
+        return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
+
+    def _get_default_partner(self, cr, uid, context):
+        """Gives id of partner for current user
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        if not context.get('portal', False):
+            return False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.address_id:
+            return False
+        return user.address_id.partner_id.id
+
+    def _get_default_email(self, cr, uid, context):
+        """Gives default email address for current user
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        if not context.get('portal', False):
+            return False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.address_id:
+            return False
+        return user.address_id.email
+
+    def _get_default_user(self, cr, uid, context):
+        """Gives current user id
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        if context.get('portal', False):
+            return False
+        return uid
+
+    def _get_section(self, cr, uid, context):
+        """Gives section id for current User
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param context: A standard dictionary for contextual values
+        """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.context_section_id.id or False
+    
+    def stage_next(self, cr, uid, ids, context=None):
+        """This function computes next stage for case from its current stage
+             using available stage for that case type 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        s = self.get_stage_dict(cr, uid, ids, context=context)
+        for case in self.browse(cr, uid, ids, context):
+            section = (case.section_id.id or False)
+            if section in s:
+                st = case.stage_id.id  or False
+                if st in s[section]:
+                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
+        return True
+
+    def get_stage_dict(self, cr, uid, ids, context=None):
+        """This function gives dictionary for stage according to stage levels
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        sid = self.pool.get('crm.case.stage').search(cr, uid, \
+                            [('object_id.model', '=', self._name)], context=context)
+        s = {}
+        previous = {}
+        for stage in self.pool.get('crm.case.stage').browse(cr, uid, sid, context=context):
+            section = stage.section_id.id or False
+            s.setdefault(section, {})
+            s[section][previous.get(section, False)] = stage.id
+            previous[section] = stage.id
+        return s
+
+    def stage_previous(self, cr, uid, ids, context=None):
+        """This function computes previous stage for case from its current stage
+             using available stage for that case type 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        s = self.get_stage_dict(cr, uid, ids, context=context)
+        for case in self.browse(cr, uid, ids, context):
+            section = (case.section_id.id or False)
+
+            if section in s:
+                st = case.stage_id.id or False
+                s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
+                if st in s[section]:
+                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
+        return True
+
+    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param cases: a browse record list
+        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
+        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
+        @param email: Email address if any
+        @param details: Details of case history if any 
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        # The mailgate sends the ids of the cases and not the object list
+        if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
+            cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
+
+        model_obj = self.pool.get('ir.model')
+        
+        obj = self.pool.get('mailgate.message')
+        for case in cases:
+            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
+            data = {
+                'name': keyword,
+                'user_id': uid,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'model_id' : model_ids and model_ids[0] or False,
+                'res_id': case.id,
+                'section_id': case.section_id.id,
+                'message_id':message_id
+            }
+
+            if history:
+                data['description'] = details or case.description
+                data['email_to'] = email or \
+                        (case.section_id and case.section_id.reply_to) or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
+                data['email_from'] = email_from or \
+                        (case.section_id and case.section_id.reply_to) or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
+            res = obj.create(cr, uid, data, context)
+        return True
+    
+    _history = __history
+    history = __history
+    
+    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+        """This function returns value of partner address based on partner
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param part: Partner's id
+        @email: Partner's email ID 
+        """
+        if not part:
+            return {'value': {'partner_address_id': False, 
+                            'email_from': False, 
+                            }}
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
+        data = {'partner_address_id': addr['contact']}
+        data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+        return {'value': data}
+
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        """This function returns value of partner email based on Partner Address
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param add: Id of Partner's address
+        @email: Partner's email ID 
+        """
+        if not add:
+            return {'value': {'email_from': False}}
+        address = self.pool.get('res.partner.address').browse(cr, uid, add)
+        return {'value': {'email_from': address.email}}
+
+    def case_open(self, cr, uid, ids, *args):
+        """Opens Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, _('Open'))
+        for case in cases:
+            data = {'state': 'open', 'active': True}
+            if not case.user_id:
+                data['user_id'] = uid
+            self.write(cr, uid, case.id, data)
+        self._action(cr, uid, cases, 'open')
+        return True
+
+    def case_close(self, cr, uid, ids, *args):
+        """Closes Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Close'))
+        self.write(cr, uid, ids, {'state': 'done',
+                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
+                                  })
+        #
+        # We use the cache of cases to keep the old case state
+        #
+        self._action(cr, uid, cases, 'done')
+        return True
+
+    def case_escalate(self, cr, uid, ids, *args):
+        """Escalates case to top level
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        for case in cases:
+            data = {'active': True, 'user_id': False}
+
+            if case.section_id.parent_id:
+                data['section_id'] = case.section_id.parent_id.id
+                if case.section_id.parent_id.user_id:
+                    data['user_id'] = case.section_id.parent_id.user_id.id
+            else:
+                raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
+            self.write(cr, uid, [case.id], data)
+        cases = self.browse(cr, uid, ids)
+        self._history(cr, uid, cases, _('Escalate'))
+        self._action(cr, uid, cases, 'escalate')
+        return True
+    
+    def case_cancel(self, cr, uid, ids, *args):
+        """Cancels Case
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Cancel'))
+        self.write(cr, uid, ids, {'state': 'cancel',
+                                  'active': True})
+        self._action(cr, uid, cases, 'cancel')
+        return True
+
+    def case_pending(self, cr, uid, ids, *args):
+        """Marks case as pending
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Pending'))
+        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
+        self._action(cr, uid, cases, 'pending')
+        return True
+
+    def case_reset(self, cr, uid, ids, *args):
+        """Resets case as draft
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        cases = self.browse(cr, uid, ids)
+        cases[0].state # to fill the browse record cache
+        self._history(cr, uid, cases, _('Draft'))
+        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
+        self._action(cr, uid, cases, 'draft')
+        return True
+        
+
 class crm_case_section(osv.osv):
     """Sales Team"""
 
@@ -67,7 +383,6 @@ class crm_case_section(osv.osv):
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
         'server_id':fields.many2one('email.smtpclient', 'Server ID'),
         'note': fields.text('Description'),
-        
     }
 
     _defaults = {
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index db01e94ccc6..8c8e8cca564 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -26,8 +26,9 @@ import math
 import time
 import mx.DateTime
 from tools.translate import _
+from crm import crm_case
 
-class crm_lead(osv.osv):
+class crm_lead(osv.osv, crm_case):
     """ CRM Lead Case """
 
     _name = "crm.lead"
@@ -35,19 +36,6 @@ class crm_lead(osv.osv):
     _order = "priority, id desc"
     _inherit = ['res.partner.address', 'mailgate.thread']
 
-    def case_open(self, cr, uid, ids, *args):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-
-        res = super(crm_lead, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
-        return res
-
     def _compute_day(self, cr, uid, ids, fields, args, context={}):
         """
         @param cr: the current row, from the database cursor,
@@ -117,7 +105,7 @@ class crm_lead(osv.osv):
                             " communication between partner and users by email"),
         'description': fields.text('Description'), 
         'write_date': fields.datetime('Update Date' , readonly=True), 
-        
+
         # Lead fields 
         'categ_id': fields.many2one('crm.case.categ', 'Lead Source', \
                         domain="[('section_id','=',section_id),\
@@ -143,77 +131,48 @@ class crm_lead(osv.osv):
                                 method=True, multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="float", store=True),
-        'function_name': fields.char('Function', size=64),
+        'function_name': fields.char('Function', size=64), 
+        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \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\'.'), 
         }
 
     _defaults = {
+        'active': lambda *a: 1, 
+        'user_id': crm_case._get_default_user, 
+        'email_from': crm_case._get_default_email, 
+        'state': lambda *a: 'draft', 
+        'section_id': crm_case._get_section, 
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
-    def stage_next(self, cr, uid, ids, context=None):
-        """This function computes next stage for case from its current stage
-             using available stage for that case type 
+    def case_open(self, cr, uid, ids, *args):
+        """Overrides cancel for crm_case for setting Open Date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        s = self.get_stage_dict(cr, uid, ids, context=context)
-        for case in self.browse(cr, uid, ids, context):
-            section = (case.section_id.id or False)
-            if section in s:
-                st = case.stage_id.id  or False
-                if st in s[section]:
-                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
-        return True
-
-    def get_stage_dict(self, cr, uid, ids, context=None):
-        """This function gives dictionary for stage according to stage levels
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        sid = self.pool.get('crm.case.stage').search(cr, uid, \
-                            [('object_id.model', '=', self._name)], context=context)
-        s = {}
-        previous = {}
-        for stage in self.pool.get('crm.case.stage').browse(cr, uid, sid, context=context):
-            section = stage.section_id.id or False
-            s.setdefault(section, {})
-            s[section][previous.get(section, False)] = stage.id
-            previous[section] = stage.id
-        return s
-
-    def stage_previous(self, cr, uid, ids, context=None):
-        """This function computes previous stage for case from its current stage
-             using available stage for that case type 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        s = self.get_stage_dict(cr, uid, ids, context=context)
-        for case in self.browse(cr, uid, ids, context):
-            section = (case.section_id.id or False)
-
-            if section in s:
-                st = case.stage_id.id or False
-                s[section] = dict([(v, k) for (k, v) in s[section].iteritems()])
-                if st in s[section]:
-                    self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
-        return True
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+        res = super(crm_lead, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
     
+    def case_close(self, cr, uid, ids, *args):
+        """Overrides close for crm_case for setting close date
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case Ids
+        @param *args: Tuple Value for additional Params
+        """
+        res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
+        self.write(cr, uid, ids, {'date_close': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
+
     def convert_opportunity(self, cr, uid, ids, context=None):
         """ Precomputation for converting lead to opportunity
         @param cr: the current row, from the database cursor,
@@ -267,118 +226,6 @@ class crm_lead(osv.osv):
                         'nodestroy': True
                         }
         return value
-    
-    # From crm.case
-    
-    def case_close(self, cr, uid, ids, *args):
-        """Closes Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Close'))
-        self.write(cr, uid, ids, {'state': 'done',
-                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
-                                  })
-        #
-        # We use the cache of cases to keep the old case state
-        #
-        self._action(cr, uid, cases, 'done')
-        return True
-
-    def case_escalate(self, cr, uid, ids, *args):
-        """Escalates case to top level
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        for case in cases:
-            data = {'active': True, 'user_id': False}
-
-            if case.section_id.parent_id:
-                data['section_id'] = case.section_id.parent_id.id
-                if case.section_id.parent_id.user_id:
-                    data['user_id'] = case.section_id.parent_id.user_id.id
-            else:
-                raise osv.except_osv(_('Error !'), _('You can not escalate this case.\nYou are already at the top level.'))
-            self.write(cr, uid, [case.id], data)
-        cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Escalate'))
-        self._action(cr, uid, cases, 'escalate')
-        return True
-
-    def case_open(self, cr, uid, ids, *args):
-        """Opens Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Open'))
-
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            self.write(cr, uid, case.id, data)
-        self._action(cr, uid, cases, 'open')
-        return True
-
-    def case_cancel(self, cr, uid, ids, *args):
-        """Cancels Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Cancel'))
-        self.write(cr, uid, ids, {'state': 'cancel',
-                                  'active': True})
-        self._action(cr, uid, cases, 'cancel')
-        return True
-
-    def case_pending(self, cr, uid, ids, *args):
-        """Marks case as pending
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Pending'))
-        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
-        self._action(cr, uid, cases, 'pending')
-        return True
-
-    def case_reset(self, cr, uid, ids, *args):
-        """Resets case as draft
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Draft'))
-        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
-        self._action(cr, uid, cases, 'draft')
-        return True
-        
 
 crm_lead()
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 86ddeba4129..38cfba16a6b 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -20,23 +20,24 @@
 ##############################################################################
 
 from base_calendar import base_calendar
+from crm import crm_case
 from datetime import datetime, timedelta
 from osv import fields, osv
 from tools.translate import _
 import time
 
-class crm_lead(osv.osv):
+class crm_lead(osv.osv, crm_case):
     """ CRM Leads """
     _name = 'crm.lead'
 crm_lead()
 
-class crm_phonecall(osv.osv):
+class crm_phonecall(osv.osv, crm_case):
     """ CRM Phonecall """
     _name = 'crm.phonecall'
 crm_phonecall()
 
 
-class crm_meeting(osv.osv):
+class crm_meeting(osv.osv, crm_case):
     """ CRM Meeting Cases """
 
     _name = 'crm.meeting'
@@ -117,78 +118,6 @@ class crm_meeting(osv.osv):
 
         return value
     
-    # From crm.case
-    
-    def case_close(self, cr, uid, ids, *args):
-        """Closes Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Close'))
-        self.write(cr, uid, ids, {'state': 'done',
-                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
-                                  })
-        #
-        # We use the cache of cases to keep the old case state
-        #
-        self._action(cr, uid, cases, 'done')
-        return True
-
-    def case_open(self, cr, uid, ids, *args):
-        """Opens Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Open'))
-
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            self.write(cr, uid, case.id, data)
-        self._action(cr, uid, cases, 'open')
-        return True
-
-    def case_cancel(self, cr, uid, ids, *args):
-        """Cancels Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Cancel'))
-        self.write(cr, uid, ids, {'state': 'cancel',
-                                  'active': True})
-        self._action(cr, uid, cases, 'cancel')
-        return True
-
-    def case_reset(self, cr, uid, ids, *args):
-        """Resets case as draft
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Draft'))
-        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
-        self._action(cr, uid, cases, 'draft')
-        return True
-    
 crm_meeting()
 
 class calendar_attendee(osv.osv):
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index e527042b0e5..eb015359566 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -42,19 +42,6 @@ class crm_opportunity(osv.osv):
     _order = "priority,date_action,id desc"
     _inherit = 'crm.lead'
 
-    def case_open(self, cr, uid, ids, *args):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-
-        res = super(crm_opportunity, self).case_open(cr, uid, ids, *args)
-        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
-        return res
-
     _columns = {
         # From crm.case
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
@@ -68,50 +55,43 @@ class crm_opportunity(osv.osv):
         'phone': fields.char("Phone", size=64),
         'date_deadline': fields.date('Expected Closing'),
         'date_action': fields.date('Next Action'),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
-                                  help='The state is set to \'Draft\', when a case is created.\
-                                  \nIf the case is in progress the state is set to \'Open\'.\
-                                  \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\'.'),
-
          }
     
     def case_close(self, cr, uid, ids, *args):
-        """Closes Case
+        """Overrides close for crm_case for setting probability and close date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Close'))
-        self.write(cr, uid, ids, {'state': 'done',
-                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
-                                  'probability' : 100.0})
-        #
-        # We use the cache of cases to keep the old case state
-        #
-        self._action(cr, uid, cases, 'done')
-        return True
-    
+        res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
+        self.write(cr, uid, ids, {'probability' : 100.0, 'date_close': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
+
     def case_cancel(self, cr, uid, ids, *args):
-        """Cancels Case
+        """Overrides cancel for crm_case for setting probability
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Cancel'))
-        self.write(cr, uid, ids, {'state': 'cancel',
-                                  'active': True,
-                                  'probability' : 0.0})
-        self._action(cr, uid, cases, 'cancel')
-        return True
+        res = super(crm_opportunity, self).case_cancel(cr, uid, ids, args)
+        self.write(cr, uid, ids, {'probability' : 0.0})
+        return res
+    
+    def case_open(self, cr, uid, ids, *args):
+        """Overrides cancel for crm_case for setting Open Date
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
+        """
+        res = super(crm_opportunity, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
 
@@ -132,7 +112,6 @@ class crm_opportunity(osv.osv):
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-        'state' : 'draft',
     }
 
     def action_makeMeeting(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index ae0cbae0d88..3dc652da7fc 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -19,12 +19,13 @@
 #
 ##############################################################################
 
+from crm import crm_case
 from osv import fields, osv
 from tools.translate import _
 import crm
 import time
 
-class crm_phonecall(osv.osv):
+class crm_phonecall(osv.osv, crm_case):
     """ Phonecall Cases """
 
     _name = "crm.phonecall"
@@ -79,89 +80,28 @@ class crm_phonecall(osv.osv):
     # From crm.case
     
     def case_close(self, cr, uid, ids, *args):
-        """Closes Case
+        """Overrides close for crm_case for setting close date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Close'))
-        self.write(cr, uid, ids, {'state': 'done',
-                                  'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'),
-                                  })
-        #
-        # We use the cache of cases to keep the old case state
-        #
-        self._action(cr, uid, cases, 'done')
-        return True
+        res = super(crm_phonecall, self).case_close(cr, uid, ids, args)
+        self.write(cr, uid, ids, {'date_close': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
 
     def case_open(self, cr, uid, ids, *args):
-        """Opens Case
+        """Overrides cancel for crm_case for setting Open Date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
+        @param ids: List of case's Ids
+        @param *args: Give Tuple Value
         """
-        cases = self.browse(cr, uid, ids)
-        self._history(cr, uid, cases, _('Open'))
-
-        for case in cases:
-            data = {'state': 'open', 'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            self.write(cr, uid, case.id, data)
-        self._action(cr, uid, cases, 'open')
-        return True
-    
-    def case_pending(self, cr, uid, ids, *args):
-        """Marks case as pending
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Pending'))
-        self.write(cr, uid, ids, {'state': 'pending', 'active': True})
-        self._action(cr, uid, cases, 'pending')
-        return True
-
-    def case_cancel(self, cr, uid, ids, *args):
-        """Cancels Case
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Cancel'))
-        self.write(cr, uid, ids, {'state': 'cancel',
-                                  'active': True})
-        self._action(cr, uid, cases, 'cancel')
-        return True
-
-    def case_reset(self, cr, uid, ids, *args):
-        """Resets case as draft
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
-        """
-        cases = self.browse(cr, uid, ids)
-        cases[0].state # to fill the browse record cache
-        self._history(cr, uid, cases, _('Draft'))
-        self.write(cr, uid, ids, {'state': 'draft', 'active': True})
-        self._action(cr, uid, cases, 'draft')
-        return True
+        res = super(crm_phonecall, self).case_open(cr, uid, ids, *args)
+        self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
+        return res
 
     def action_make_meeting(self, cr, uid, ids, context=None):
         """
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 3d9b9971a47..764a1d00353 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -70,94 +70,12 @@ class mailgate_thread(osv.osv):
     _columns = {
         'name':fields.char('Name', size=64), 
         'active': fields.boolean('Active'), 
-#        'message_ids':fields.one2many('mailgate.message', 'thread_id', 'Message'),
         'message_ids': fields.function(_get_log_ids, method=True, type='one2many', \
                          multi="message_ids", relation="mailgate.message", string="Messages"), 
         'log_ids': fields.function(_get_log_ids, method=True, type='one2many', \
                          multi="log_ids", relation="mailgate.message", string="Logs"),
     }
     
-    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param cases: a browse record list
-        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
-        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
-        @param email: Email address if any
-        @param details: Details of case history if any 
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        # The mailgate sends the ids of the cases and not the object list
-        if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
-            cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
-
-        model_obj = self.pool.get('ir.model')
-        
-        obj = self.pool.get('mailgate.message')
-        for case in cases:
-            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            data = {
-                'name': keyword,
-                'user_id': uid,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'model_id' : model_ids and model_ids[0] or False,
-                'res_id': case.id,
-                'section_id': case.section_id.id,
-                'message_id':message_id
-            }
-
-            if history:
-                data['description'] = details or case.description
-                data['email_to'] = email or \
-                        (case.section_id and case.section_id.reply_to) or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
-                data['email_from'] = email_from or \
-                        (case.section_id and case.section_id.reply_to) or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
-            res = obj.create(cr, uid, data, context)
-        return True
-    
-    _history = __history
-    history = __history
-    
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """This function returns value of partner address based on partner
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param part: Partner's id
-        @email: Partner's email ID 
-        """
-        if not part:
-            return {'value': {'partner_address_id': False, 
-                            'email_from': False, 
-                            }}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-        data = {'partner_address_id': addr['contact']}
-        data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
-
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """This function returns value of partner email based on Partner Address
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case IDs
-        @param add: Id of Partner's address
-        @email: Partner's email ID 
-        """
-        if not add:
-            return {'value': {'email_from': False}}
-        address = self.pool.get('res.partner.address').browse(cr, uid, add)
-        return {'value': {'email_from': address.email}}
-    
 mailgate_thread()
 
 class mailgate_message(osv.osv):

From a139623586429f0afb8c271ed4482f568ae8418c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 5 May 2010 18:32:55 +0530
Subject: [PATCH 076/146] [IMP]: crm: Minor improvement in lead and phonecall

bzr revid: rpa@tinyerp.com-20100505130255-zwkdnvpel8sda1wa
---
 addons/crm/crm_lead_view.xml      |  2 +-
 addons/crm/crm_phonecall.py       | 19 ++++++++++---------
 addons/crm/crm_phonecall_view.xml |  6 ++++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d29460915c0..6dca97098df 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -40,7 +40,7 @@
         <field name="arch" type="xml">
             <form string="Leads Form">
                 <group colspan="4" col="7">
-                    <field name="name" required="1"/>
+                    <field name="name" required="1" string="Name"/>
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 3dc652da7fc..cb65363d81a 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -78,7 +78,16 @@ class crm_phonecall(osv.osv, crm_case):
     }
     
     # From crm.case
-    
+
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+        res = super(crm_phonecall, self).onchange_partner_address_id(cr, uid, ids, add, email)
+        res.setdefault('value', {})
+        if add:
+            address = self.pool.get('res.partner.address').browse(cr, uid, add)
+            res['value']['partner_phone'] = address.phone
+            res['value']['partner_mobile'] = address.mobile
+        return res
+
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting close date
         @param self: The object pointer
@@ -154,14 +163,6 @@ class crm_phonecall(osv.osv, crm_case):
 
         return value
 
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        res = super(crm_phonecall, self).onchange_partner_address_id(cr, uid, ids, add, email)
-        res.setdefault('value', {})
-        if add:
-            address = self.pool.get('res.partner.address').browse(cr, uid, add)
-            res['value']['partner_phone'] = address.mobile
-            res['value']['partner_mobile'] = address.phone
-        return res
 crm_phonecall()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 064a4fe2634..a8941ccce6f 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -72,7 +72,7 @@
         <field name="arch" type="xml">
             <form string="Phone Call">
                 <group colspan="4" col="7">
-                    <field name="name" string="Call Summary"/>
+                    <field name="name" string="Summary"/>
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
                     <button string="Schedule a Meeting"
@@ -147,7 +147,7 @@
         <field name="arch" type="xml">
             <form string="Phone Call">
                 <group colspan="4" col="7">
-                    <field name="name" string="Call Summary"/>
+                    <field name="name" string="Summary"/>
                     <field name="date" string="Planned Date"/>
                     <field name="user_id"/>
                     <button string="Schedule a Meeting"
@@ -182,6 +182,8 @@
                     <field name="partner_address_id" string="Contact"
                         on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                     <newline/>
+                    <field name="partner_phone" />
+                    <newline/>
                     <field name="partner_mobile" />
                 </group>
                 <group col="2" colspan="2">

From e29aba7f5e5c56635bf858bb84e744ea45ba81d6 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 5 May 2010 19:03:42 +0530
Subject: [PATCH 077/146] [IMP]:account configurable wizards & gtk contact form

bzr revid: nch@tinyerp.com-20100505133342-93xtgruyggc0jc6f
---
 addons/account/account_installer.xml       |  2 +-
 addons/base_setup/base_setup_installer.xml |  1 -
 addons/base_setup/base_setup_todo.xml      |  2 +-
 addons/base_setup/gtk_contact_form.py      | 25 +++++++++++++++++++++-
 addons/base_setup/gtk_contact_form.xml     |  4 +++-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index b644b814756..e14e256b397 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -17,7 +17,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications. Select one of the country specific chart of account or select 'configurable chart of account' to configure  your own chart of account.</attribute>
+            <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
             <attribute name="width">150</attribute>
           </xpath>
 		  <xpath expr="//button[@string='Install Modules']" position="attributes">
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index cc5afdd6f25..03d64eaa16e 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -18,7 +18,6 @@
 If you don't think you need any of these right now, you can easily install them later on.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>15</attribute>
 	          	  <attribute name='string'></attribute>
 	      </xpath>
 	      <separator string="title" position="attributes">
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 3ccba59fca0..eb108aef229 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -17,7 +17,7 @@
 	          	  <attribute name='string'>Configure Your Company</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>25</attribute>
+	          	  <attribute name='rowspan'>23</attribute>
 	          	  <attribute name='string'></attribute>
 	      </xpath>
           <group string="res_config_contents" position="replace">
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index c05c3866b97..25324050d8e 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -23,6 +23,7 @@ from operator import itemgetter
 from osv import osv, fields
 import netsvc
 import tools
+from tools import misc
 
 class base_gtkcontactform(osv.osv_memory):
     """
@@ -68,8 +69,30 @@ class base_gtkcontactform(osv.osv_memory):
              'other':fields.boolean('Other'),
              'ebook':fields.boolean('ebook'),
              'updates':fields.boolean('updates'),
+             'note':fields.text('Note'),
              }
     def execute(self, cr, uid, ids, context=None):
-         pass
+        company_id = self.pool.get('base.setup.company').search(cr, uid, [])
+        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id)[0]
+        country1 = ''
+        if company_data.get('country_id', False):
+            country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'])['name']
+        for res in self.read(cr, uid, ids):
+            email = res.get('email','')
+            result = "\ncompany: "+ str(company_data.get('name',''))
+            result += "\nname: " + str(res.get('name',''))
+            result += "\nphone: " + str(res.get('phone',''))
+            result += "\ncity: " + str(company_data.get('city',''))
+            result += "\ncountry: " + str(country)
+            result += "\nindustry: " + str(res.get('industry', ''))
+            result += "\ntotal_employees: " + str(res.get('total_employees', ''))
+            result += "\nplan_use: " +  str(res.get('use_openerp', False))
+            result += "\nsell_openerp: " + str(res.get('sell_openerp', False))
+            result += "\nebook: " + str(res.get('ebook',False))
+            result += "\nnote: " + str(res.get('note',''))
+            result += "\ngtk: " + str(True)
+        misc.upload_data(email, result, type='SURVEY')
+
+
 
 base_gtkcontactform()
\ No newline at end of file
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index b220db020c6..ffae67adcf5 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -18,7 +18,7 @@
 	          	  <attribute name='colspan'>4</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>22</attribute>
+	          	  <attribute name='rowspan'>27</attribute>
 	          	  <attribute name='string'></attribute>
 	      </xpath>
           <group string="res_config_contents" position="replace">
@@ -47,6 +47,8 @@
 		            <field name="support" colspan="1"/>
 		            <field name="training" colspan="1"/>
 		            <field name="other" colspan="1"/>
+		            <separator colspan="4" string="Notes"/>
+		            <field name="note" colspan="4" nolabel="1"/>
 		       </group>
 			 <group colspan="2">
 		       		<separator colspan="4" string="Do You Need Them ?"/>

From 4fea1a68bfcd81c3d7d19609d70cc0a377b4ffd9 Mon Sep 17 00:00:00 2001
From: "HDA (OpenERP)" <hda@tinyerp.com>
Date: Wed, 5 May 2010 19:44:09 +0530
Subject: [PATCH 078/146] usability improvements for sale

bzr revid: hda@tinyerp.com-20100505141409-poxp9cpb0nopjbvc
---
 .../account_analytic_default_view.xml                    | 6 ++++--
 addons/crm/crm_meeting_menu.xml                          | 6 ++++++
 addons/crm/crm_opportunity_view.xml                      | 7 +++----
 addons/crm/crm_view.xml                                  | 8 ++++----
 addons/document/document_view.xml                        | 3 ++-
 addons/mrp/wizard/make_procurement_view.xml              | 3 ++-
 addons/product/product_view.xml                          | 6 ++++++
 addons/product/product_wizard.xml                        | 3 ++-
 addons/purchase/purchase_view.xml                        | 3 ++-
 addons/sale/sale_view.xml                                | 2 +-
 addons/sale_crm/sale_crm_view.xml                        | 2 +-
 addons/stock/report/report_stock_view.xml                | 9 ++++++---
 addons/stock/stock_view.xml                              | 3 ++-
 13 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index ebf304100fd..b94afdc9292 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -54,7 +54,8 @@
             id="analytic_rule_action_partner"
             res_model="account.analytic.default"
             src_model="res.partner"
-            domain="[('partner_id','=',active_id)]"/>
+            domain="[('partner_id','=',active_id)]"
+            groups="base.group_extended"/>
         <act_window
             name="Analytic Rules"
             id="analytic_rule_action_user"
@@ -66,7 +67,8 @@
             res_model="account.analytic.default"
             id="analytic_rule_action_product"
             src_model="product.product"
-            domain="[('product_id','=',active_id)]"/>
+            domain="[('product_id','=',active_id)]"
+            groups="base.group_extended"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3f680b61f15..7dcb0ec3ec8 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -121,6 +121,12 @@
     	action="crm_case_categ_meet" parent="menu_meeting_sale"
     	sequence="1" />
 
+	<record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
+        <field name="name">Calendar</field>
+        <field name="resource">ir.ui.menu</field>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+	</record>
     <record id="action_view_attendee_form" model="ir.actions.act_window">
 	 	<field name="name">Meeting Invitations</field>
 	 	<field name="type">ir.actions.act_window</field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4bdc0d90158..076919d5fb3 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -101,7 +101,7 @@
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Categorization"/>
                         <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1"
+                        <field name="categ_id" select="1" groups="base.group_extended"
                             string="Category" widget="selection"
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
                     </group>
@@ -221,7 +221,7 @@
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
                 <field name="date_action"/>
-                <field name="section_id"/>
+                <field name="section_id" groups="base.group_extended"/>
                 <field name="user_id"/>
                 <field name="priority"/>
                 <field name="state"/>
@@ -285,7 +285,6 @@
                 />
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>
-                <field name="partner_id"/>
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
@@ -315,7 +314,7 @@
                     <filter string="Partner" icon="terp-crm" domain="[]"
                         context="{'group_by':'partner_id'}" />
                     <filter string="Salesman" icon="terp-crm"
-                        domain="[]" context="{'group_by':'user_id'}" />
+                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
                     <separator orientation="vertical" />
                     <filter string="Creation" icon="terp-project"
                         domain="[]" context="{'group_by':'create_date'}" />
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 31d82cd94fb..9dab0e4af89 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem id="menu_crm_configuration" name="Cases"
-            parent="base.menu_base_config" sequence="0"/>
+            parent="base.menu_base_config" sequence="0" groups="base.group_extended"/>
 
 <!-- Case Sections Form View -->
 
@@ -115,7 +115,7 @@
             <field name="view_id" ref="crm_case_stage_tree"/>
         </record>
 
-        <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
+        <menuitem  id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration" groups="base.group_extended"/>
 
 
 <!-- Case Categories Form View -->
@@ -155,7 +155,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
+        <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration" groups="base.group_extended"/>
 
         <menuitem action="crm_case_section_act"
             id="menu_crm_case_section_act"
@@ -201,7 +201,7 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
         <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-            parent="crm.menu_crm_configuration" />
+            parent="crm.menu_crm_configuration" groups="base.group_extended" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 0185f9fe444..c7cfe3fc2e3 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -317,7 +317,8 @@
     <act_window domain="[('partner_id', '=', active_id)]"
         id="act_res_partner_document" name="Related Documents"
         res_model="ir.attachment"
-        src_model="res.partner"/>
+        src_model="res.partner"
+        groups="base.group_extended"/>
 
     <act_window domain="[('parent_id', '=', active_id)]"
         id="zoom_directory" name="Related Documents"
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp/wizard/make_procurement_view.xml
index c60f2818ab2..e98f1c013a0 100644
--- a/addons/mrp/wizard/make_procurement_view.xml
+++ b/addons/mrp/wizard/make_procurement_view.xml
@@ -33,7 +33,8 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
-            id="act_make_procurement"/>
+            id="act_make_procurement"
+            groups="base.group_extended"/>
 
     </data>
 </openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b9858e19eaf..24976a71533 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -607,6 +607,12 @@
             <field name="view_id" ref="product_template_tree_view"/>
         </record>
 
+		<record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
+            <field name="name">Products</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="res_id" ref="product.menu_products"/>
+        </record>
         <!--
         <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products" sequence="2"
                   groups="product.group_product_variant" />
diff --git a/addons/product/product_wizard.xml b/addons/product/product_wizard.xml
index f226cd4e543..bd1567fb1d1 100644
--- a/addons/product/product_wizard.xml
+++ b/addons/product/product_wizard.xml
@@ -6,6 +6,7 @@
 			 string="Price List"
 			 model="product.product"
 			 name="product.price_list"
-			 keyword="client_print_multi"/>
+			 keyword="client_print_multi"
+			 groups="base.group_extended"/>
 	</data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c301116db2a..839dc4306fa 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -289,7 +289,8 @@
             id="action_purchase_line_product_tree"
             name="Product purchases"
             res_model="purchase.order.line"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="base.group_extended"/>
 <!--
 	<record model="ir.values" id="action_merge_purchase_order">
                 <field name="object" eval="1" />
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 15f8a6fefd3..3db8c67281b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -486,7 +486,7 @@
 
         <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_sale_order" name="Sales" res_model="sale.order" src_model="res.partner"/>
 
-        <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
+        <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product" groups="base.group_extended"/>
 
         <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/>
         <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 24912052190..f8242c18fbb 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -34,7 +34,7 @@
         <field name="inherit_id" ref="sale.view_sales_order_filter"/>
         <field name="arch" type="xml">
             <field name="date_order" position="after">
-                <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
+                <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section" groups="base.group_extended">
                     <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             groups="base.group_extended"
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index f2606e764b4..8ee15e1093d 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -105,21 +105,24 @@
             id="act_stock_product_location_open"
             name="Stock by Location"
             res_model="stock.location"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="base.group_extended"/>
 
         <act_window
             domain="[('location_id', 'child_of', [active_id])]"
             id="act_stock_location_2_stock_report_prodlots"
             name="Stock by Lots"
             res_model="stock.report.prodlots"
-            src_model="stock.location"/>
+            src_model="stock.location"
+            />
 
         <act_window
             domain="[('product_id','=',active_id)]"
             id="act_product_product_2_stock_report_prodlots"
             name="Stock by Lots"
             res_model="stock.report.prodlots"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="base.group_extended"/>
 
         <act_window
             domain="[('prodlot_id', '=', active_id)]"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ee0dfa9cd13..ceac7a8e603 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1590,7 +1590,8 @@
             id="act_product_stock_move_futur_open"
             name="Future Stock Moves"
             res_model="stock.move"
-            src_model="product.product"/>
+            src_model="product.product"
+            groups="base.group_extended"/>
 
         <record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>

From 6c9331f6eadea303a313a4cfda56ee69cf22be2f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 12:06:38 +0530
Subject: [PATCH 079/146] [REM]: crm: Removed crm.case report files

bzr revid: rpa@tinyerp.com-20100506063638-e8tgtbvrk0rp5qqs
---
 addons/crm/report/crm_report.py       | 176 -------------------
 addons/crm/report/crm_report_view.xml | 235 --------------------------
 2 files changed, 411 deletions(-)
 delete mode 100644 addons/crm/report/crm_report.py
 delete mode 100644 addons/crm/report/crm_report_view.xml

diff --git a/addons/crm/report/crm_report.py b/addons/crm/report/crm_report.py
deleted file mode 100644
index f2b3a48d339..00000000000
--- a/addons/crm/report/crm_report.py
+++ /dev/null
@@ -1,176 +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 osv import fields, osv
-import tools
-
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
-AVAILABLE_PRIORITIES = [
-    ('5', 'Lowest'),
-    ('4', 'Low'),
-    ('3', 'Normal'),
-    ('2', 'High'),
-    ('1', 'Highest')
-]
-
-class crm_case_report(osv.osv):
-    """ Cases and section """
-
-    _name = "crm.case.report"
-    _description = "Cases and section"
-    _auto = False
-
-    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of case and section Data’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        res = {}
-        state_perc = 0.0
-        avg_ans = 0.0
-
-        for case in self.browse(cr, uid, ids, context):
-            if field_name != 'avg_answers':
-                state = field_name[5:]
-                cr.execute("select count(*) from crm_opportunity where \
-                    section_id =%s and state='%s'"%(case.section_id.id, state))
-                state_cases = cr.fetchone()[0]
-                perc_state = (state_cases / float(case.nbr)) * 100
-
-                res[case.id] = perc_state
-            else:
-                model_name = self._name.split('report.')
-                if len(model_name) < 2:
-                    res[case.id] = 0.0
-                else:
-                    model_name = model_name[1]
-
-                    cr.execute("select count(*) from crm_case_log l, ir_model m \
-                         where l.model_id=m.id and m.model = '%s'" , model_name)
-                    logs = cr.fetchone()[0]
-
-                    avg_ans = logs / case.nbr
-                    res[case.id] = avg_ans
-
-        return res
-
-    _columns = {
-        'name': fields.char('Year', size=64, required=False, readonly=True),
-        'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
-        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
-        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
-        'month':fields.selection([('01', 'January'), ('02', 'February'), \
-                                  ('03', 'March'), ('04', 'April'),\
-                                  ('05', 'May'), ('06', 'June'), \
-                                  ('07', 'July'), ('08', 'August'),\
-                                  ('09', 'September'), ('10', 'October'),\
-                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'create_date': fields.datetime('Create Date', readonly=True),
-        'day': fields.char('Day', size=128, readonly=True)
-    }
-
-    _order = 'name desc, user_id'
-
-    def init(self, cr):
-
-        """ @param cr: the current row, from the database cursor """
-
-        tools.drop_view_if_exists(cr, 'crm_case_report')
-        cr.execute("""
-            create or replace view crm_case_report as (
-                select
-                    min(c.id) as id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as day,
-                    c.state,
-                    c.user_id,
-                    c.section_id,
-                    c.company_id,
-                    count(*) as nbr,
-                    c.create_date as create_date
-                from
-                    crm_case c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),
-                         c.state, c.user_id,c.section_id,c.company_id
-                         ,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
-            )""")
-
-crm_case_report()
-
-
-class report_crm_case_service_dashboard(osv.osv):
-    """ Report of Closed and Open CRM Cases within past 15 days """
-
-    _name = "report.crm.case.service.dashboard"
-    _description = "Report of Closed and Open CRM Cases within past 15 days"
-    _auto = False
-    _columns = {
-        'date_deadline': fields.datetime('Deadline', readonly=True),
-        'name': fields.char('Description', size=64, readonly=True),
-        'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
-        'create_date' : fields.datetime('Create Date', readonly=True)
-    }
-
-    _order = 'create_date'
-
-    def init(self, cr):
-
-        """ @param cr: the current row, from the database cursor """
-
-        cr.execute("""create or replace view report_crm_case_service_dashboard as (
-            select
-                cse.id as id, cse.date_deadline as date_deadline,
-                cse.name as name, cse.user_id as user_id,
-                cse.state as state,
-                cse.create_date as create_date
-            from
-                crm_case cse
-            where
-                (cse.state='done')
-                OR
-
-                ((to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') <= CURRENT_DATE)
-                    AND
-                (to_date(to_char(cse.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15))
-                    AND
-                    cse.state='open')
-            )""")
-
-report_crm_case_service_dashboard()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml
deleted file mode 100644
index c58367ae85d..00000000000
--- a/addons/crm/report/crm_report_view.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-<!-- CRM Case Report Tree View -->
-
-        <record id="view_crm_case_tree" model="ir.ui.view">
-            <field name="name">crm.case.report.tree</field>
-            <field name="model">crm.case.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Cases">
-                    <field name="name" />
-                    <field name="month"/>
-                    <field name="user_id"/>
-                    <field name="company_id"/>
- 					<field name="section_id"/>
-                    <field name="nbr"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-<!-- CRM Case Report Form View -->
-
-        <record id="view_crm_case_form" model="ir.ui.view">
-            <field name="name">crm.case.report.form</field>
-            <field name="model">>crm.case.report</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Cases">
-                    <field name="name" select="1"/>
-                    <field name="month" select="1"/>
-                    <field name="user_id" select="1"/>
-					<field name="section_id" select="1"/>
-                    <field name="nbr" select="1"/>
-                    <field name="state" select="1"/>
-                </form>
-            </field>
-        </record>
-
-<!-- CRM Case Report Graph View -->
-
-        <record id="view_crm_case_graph" model="ir.ui.view">
-            <field name="name">crm.case.report</field>
-            <field name="model">crm.case.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Cases by User and Section" type="bar">
-                    <field name="state"/>
-                    <field name="nbr" operator="+"/>
-                    <field group="True" name="user_id"/>
-                </graph>
-            </field>
-        </record>
-
-<!-- CRM Case Report Search View -->
-
-        <record id="view_crm_report_filter" model="ir.ui.view">
-            <field name="name">crm.case.report.select</field>
-            <field name="model">crm.case.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search">
-                  <group col="16" colspan="8">
-                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
-                   			domain="[('name','=',time.localtime()[0])]"/>-->
-                   		<filter string="This Year" icon="terp-hr"
-                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-
-                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
-                   			domain="[('month','=',time.strftime('%%m'))]" />-->
-                       <filter string="This Month" icon="terp-hr" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-
-                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
-
-                   		<separator orientation="vertical" />
-                        <filter icon="terp-hr"
-                    		string="Draft"
-                    		domain="[('state','=','draft')]"/>
-					   <filter icon="terp-hr"
-                    		string="Open"
-                    		domain="[('state','=','open')]"/>
-					   <filter icon="terp-hr"
-                    		string="Pending"
-                    		domain="[('state','=','pending')]"/>
-
-                   		<separator orientation="vertical" />
-                   		<field name="section_id"
-                   			default="context.get('section_id', False)"
-                   			widget="selection"
-                   			context="{'invisible_section': False}">
-
-                   			<filter icon="terp-crm"
-                   				context="{'invisible_section': False}"
-                   				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
-
-                   		</field>
-                   		<field name="company_id" widget="selection">
-                           <filter icon="terp-crm"
-                        context="{'invisible_section': False}"
-                        domain="[('section_id.user_id.company_id','=',uid)]"
-                        help="My company"/>
-                        </field>
-
-                      	<field name="user_id" select="1" widget="selection">
-	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
-               			</field>
-                   </group>
-                   <newline/>
-                   <group  expand="0" string="Extended options..." colspan="10" col="12">
-                         <filter icon="terp-sale"
-                    		string="Done"
-                    		domain="[('state','=','done')]"/>
-
-                    	<filter icon="terp-sale"
-                    		string="Cancel"
-                    		domain="[('state','=','cancel')]"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="User" name="User" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-sale"
-                        	domain="[]"
-                        	context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'state'}" />
-
-                        <filter string="Category" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'categ_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'day'}"/>
-
-                        <filter string="Month" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'month'}" />
-
-                        <filter string="Year" icon="terp-sale"
-                        	domain="[]" context="{'group_by':'name'}" />
-
-                  </group>
-               </search>
-            </field>
-        </record>
-
-	    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
-
-<!-- CRM Case Report Action -->
-
-        <record id="action_report_crm_case_tree" model="ir.actions.act_window">
-            <field name="name">Cases</field>
-            <field name="res_model">crm.case.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="search_view_id" ref="view_crm_case_filter"/>
-        </record>
-
-        <act_window domain="[('user_id', '=', active_id)]"
-        	id="act_res_users_2_report_crm_case_user" name="Monthly cases"
-        	res_model="crm.case.report" src_model="res.users" />
-
-        <act_window domain="[('section_id', '=', active_id)]"
-        	id="act_crm_case_section_2_report_crm_case_user"
-        	name="Monthly cases by user" res_model="crm.case.report"
-        	src_model="crm.case.section" />
-
-        <act_window domain="[('section_id', '=', active_id)]"
-        	id="act_crm_case_section_2_report_crm_case_categ"
-        	name="Monthly cases by Sales Team" res_model="crm.case.report"
-        	src_model="crm.case.section" />
-
-<!-- Closed & Open CRM Case view for Random Activities dashboard Tree View -->
-
-        <record id="board_view_crm_case_open_dashboard_tree" model="ir.ui.view">
-            <field name="name">report.crm.case.service.dashboard.tree</field>
-            <field name="model">report.crm.case.service.dashboard</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="CRM Cases">
-                	<field name="create_date" select="1"/>
-                    <field name="date_deadline"/>
-                    <field name="name" select="1"/>
-                    <field name="user_id" select="2"/>
-                    <field name="state" />
-                </tree>
-            </field>
-        </record>
-
-        <record id="board_view_crm_case_done_dashboard_tree" model="ir.ui.view">
-            <field name="name">report.crm.case.service.dashboard.tree</field>
-            <field name="model">report.crm.case.service.dashboard</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="CRM Cases">
-                    <field name="name"/>
-                    <field name="user_id" select="2"/>
-                    <field name="state" />
-                </tree>
-            </field>
-        </record>
-
-<!-- Closed & Open CRM Case view for Random Activities dashboard Action -->
-
-        <record id="action_view_closed_crm_case_dashboard" model="ir.actions.act_window">
-	    	<field name="name">Closed CRM Cases Within Past 15 Days</field>
-	    	<field name="res_model">report.crm.case.service.dashboard</field>
-	    	<field name="view_type">form</field>
-	    	<field name="view_mode">tree,form</field>
-	    	<field name="view_id" ref="board_view_crm_case_done_dashboard_tree"/>
-	    	<field name="domain">[('state','=','done')]</field>
-    	</record>
-
-    	<record id="action_view_open_crm_case_dashboard" model="ir.actions.act_window">
-	    	<field name="name">Open CRM Cases Within Past 15 Days</field>
-	    	<field name="res_model">report.crm.case.service.dashboard</field>
-	    	<field name="view_type">form</field>
-	    	<field name="view_mode">tree,form</field>
-	    	<field name="view_id" ref="board_view_crm_case_open_dashboard_tree"/>
-	    	<field name="domain">[('state','=','open')]</field>
-    	</record>
-
-    </data>
-</openerp>

From a77041f56b57564fd1f308d8e90283d864b42844 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 12:14:00 +0530
Subject: [PATCH 080/146] [IMP,FIX]: crm_claim: Improvement in claims for
 inheriting python class crm case from crm + Improvement in reports, Added
 missing fields

bzr revid: rpa@tinyerp.com-20100506064400-fws6rmpe6f860enb
---
 addons/crm_claim/__openerp__.py               |   4 +-
 addons/crm_claim/crm_claim.py                 |  76 ++++++---
 addons/crm_claim/crm_claim_view.xml           |   2 +-
 addons/crm_claim/report/crm_claim_report.py   |  61 ++++++-
 .../report/crm_claim_report_view.xml          | 152 ++++++++++++++----
 5 files changed, 235 insertions(+), 60 deletions(-)

diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 32a9319b75e..6ad4af16266 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -40,8 +40,8 @@
     ],
     'demo_xml': [
         'crm_claim_demo.xml',
-        'test/test_crm_claim.yml'
-    ],
+    ], 
+    'test': ['test/test_crm_claim.yml'], 
     'installable': True,
     'active': False,
 }
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 1eb557cdebd..e0044d8ecaa 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,7 +22,7 @@
 from osv import fields, osv
 from crm import crm
 
-class crm_claim(osv.osv):
+class crm_claim(osv.osv, crm.crm_case):
     """
     Crm claim
     """
@@ -31,41 +31,71 @@ class crm_claim(osv.osv):
     _order = "id desc"
     _inherit = 'mailgate.thread'
     _columns = {
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'date': fields.datetime('Date'),
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel',\
+        'id': fields.integer('ID', readonly=True), 
+        'name': fields.char('Name', size=128, required=True), 
+        'description': fields.text('Description'), 
+        'create_date': fields.datetime('Creation Date' , readonly=True), 
+        'write_date': fields.datetime('Update Date' , readonly=True), 
+        'date_deadline': fields.date('Deadline'), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'date': fields.datetime('Date'), 
+        'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
+        'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel', \
                      help="The channels represent the different communication\
                       modes available with the customer." \
                      " With each commercial opportunity, you can indicate the\
-                      canall which is this opportunity source."),
-        'planned_revenue': fields.float('Planned Revenue'),
-        'planned_cost': fields.float('Planned Costs'),
+                      canall which is this opportunity source."), 
+        'planned_revenue': fields.float('Planned Revenue'), 
+        'planned_cost': fields.float('Planned Costs'), 
         'som': fields.many2one('res.partner.som', 'State of Mind', \
                         help="The minds states allow to define a value scale which represents" \
                               "the partner mentality in relation to our services.The scale has" \
                               "to be created with a factor for each level from 0 (Very dissatisfied) \
-                              to 10 (Extremely satisfied)."),
-        'categ_id': fields.many2one('crm.case.categ', 'Category',\
+                              to 10 (Extremely satisfied)."), 
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.claim')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
-        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type',\
+                            ('object_id.model', '=', 'crm.claim')]"), 
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Claim Type', \
                          domain="[('section_id','=',section_id),\
-                         ('object_id.model', '=', 'crm.claim')]"),
-
-        'partner_name': fields.char("Employee's Name", size=64),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'partner_phone': fields.char('Phone', size=32),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage',\
+                         ('object_id.model', '=', 'crm.claim')]"), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                        select=True, help='Sales team to which Case belongs to.\
+                             Define Responsible user and Email account for mail gateway.'), 
+        'company_id': fields.many2one('res.company', 'Company'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+                             will receive a copy of the future" \
+                            " communication between partner and users by email"), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+        'partner_name': fields.char("Employee's Name", size=64), 
+        'partner_mobile': fields.char('Mobile', size=32), 
+        'partner_phone': fields.char('Phone', size=32), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                          domain="[('section_id','=',section_id),\
-                         ('object_id.model', '=', 'crm.claim')]"),
-        'probability': fields.float('Probability (%)'),
+                         ('object_id.model', '=', 'crm.claim')]"), 
+        'probability': fields.float('Probability (%)'), 
+        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \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\'.'), 
     }
 
     _defaults = {
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'active': lambda *a: 1, 
+        'user_id': crm.crm_case._get_default_user, 
+        'partner_id': crm.crm_case._get_default_partner, 
+        'partner_address_id': crm.crm_case._get_default_partner_address, 
+        'email_from':crm.crm_case. _get_default_email, 
+        'state': lambda *a: 'draft', 
+        'section_id':crm.crm_case. _get_section, 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
     }
 
 crm_claim()
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ffd0c4943e0..837987e661a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -169,7 +169,7 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 04f00f4a95e..16ff5be0d3a 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -23,16 +23,75 @@ from osv import fields,osv
 import tools
 from crm.report import crm_report
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
 
 class crm_claim_report(osv.osv):
     """ CRM Claim Report"""
 
     _name = "crm.claim.report"
     _auto = False
-    _inherit = "crm.case.report"
     _description = "CRM Claim Report"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr)) * 100
+
+                res[case.id] = perc_state
+            else:
+                model_name = self._name.split('report.')
+                if len(model_name) < 2:
+                    res[case.id] = 0.0
+                else:
+                    model_name = model_name[1]
+
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
+                    logs = cr.fetchone()[0]
+
+                    avg_ans = logs / case.nbr
+                    res[case.id] = avg_ans
+
+        return res
 
     _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True), 
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
                         domain="[('section_id','=',section_id),\
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index fb4b0af3287..ae4f248c0a9 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -33,16 +33,21 @@
         <record id="view_report_crm_claim_form" model="ir.ui.view">
             <field name="name">crm.claim.report.form</field>
             <field name="model">crm.claim.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="nbr" position="after">
+				<form string="Cases">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="user_id" select="1"/>
+					<field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
                     <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_costs"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
-                </field>
+                    <field name="state" select="1"/>
+                </form>
             </field>
         </record>
 
@@ -62,40 +67,121 @@
         </record>
 
 <!-- CRM Claim Report Search View -->
-
-        <record id="view_report_crm_claim_filter" model="ir.ui.view">
+		
+		<record id="view_report_crm_claim_filter" model="ir.ui.view">
             <field name="name">crm.claim.report.select</field>
             <field name="model">crm.claim.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            <data>
-            	<xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
-            	<group>
-            	    <separator orientation="vertical"/>
-            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-	                <separator orientation="vertical"/>
-	                <field name="priority" />
-	                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                </group>
-            	</xpath>
-             <xpath
-                 expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="State"]'
-                 position='after'>
-                 <filter string="Stage" icon="terp-sale" domain="[]"
-                     context="{'group_by':'stage_id'}" />
-             </xpath>
-             <xpath
-                 expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]'
-                 position='after'>
-                 <separator orientation="vertical"/>
-                 <filter string="Priority" icon="terp-sale" domain="[]"
-                     context="{'group_by':'priority'}" />
-                 <filter string="Type" icon="terp-sale" domain="[]"
-                     context="{'group_by':'type_id'}" />
-             </xpath>
-             </data>
+                <search string="Search">
+                  <group col="16" colspan="8">
+                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"/>-->
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
+                   			domain="[('month','=',time.strftime('%%m'))]" />-->
+                       <filter string="This Month" icon="terp-hr" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+
+                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<separator orientation="vertical" />
+                        <filter icon="terp-hr"
+                    		string="Draft"
+                    		domain="[('state','=','draft')]"/>
+					   <filter icon="terp-hr"
+                    		string="Open"
+                    		domain="[('state','=','open')]"/>
+					   <filter icon="terp-hr"
+                    		string="Pending"
+                    		domain="[('state','=','pending')]"/>
+
+                   		<separator orientation="vertical" />
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			widget="selection"
+                   			context="{'invisible_section': False}">
+
+                   			<filter icon="terp-crm"
+                   				context="{'invisible_section': False}"
+                   				domain="[('section_id.user_id','=',uid)]"
+                   				help="My section" />
+
+                   		</field>
+                   		<field name="company_id" widget="selection">
+                           <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id.company_id','=',uid)]"
+                        help="My company"/>
+                        </field>
+
+                      	<field name="user_id" select="1" widget="selection">
+	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+               			</field>
+                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+
+                    	<group>
+		            	    <separator orientation="vertical"/>
+		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+			                <separator orientation="vertical"/>
+			                <field name="priority" />
+			                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+		                </group>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+						
+						<filter string="Stage" icon="terp-sale" domain="[]"
+		                     context="{'group_by':'stage_id'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+						
+						<separator orientation="vertical"/>
+		                 <filter string="Priority" icon="terp-sale" domain="[]"
+		                     context="{'group_by':'priority'}" />
+		                 <filter string="Type" icon="terp-sale" domain="[]"
+		                     context="{'group_by':'type_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
+               </search>
             </field>
         </record>
 

From 15c36ff8a7d45fef0f40d2c8c4b665fd2107b440 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 12:39:27 +0530
Subject: [PATCH 081/146] [IMP,FIX]: crm_fundraising: Improvement in
 fundraising for inheriting python class crm case from crm + Improvement in
 reports, Added missing fields + Fixed demo data

bzr revid: rpa@tinyerp.com-20100506070927-3yaaon8bi5ncdc2s
---
 addons/crm_fundraising/__openerp__.py         |  37 +++---
 addons/crm_fundraising/crm_fundraising.py     |  42 +++++-
 .../crm_fundraising/crm_fundraising_view.xml  |   2 +-
 .../report/crm_fundraising_report.py          |  61 ++++++++-
 .../report/crm_fundraising_report_view.xml    | 121 ++++++++++++++++--
 addons/crm_fundraising/test/test_crm_fund.yml |   4 +-
 6 files changed, 225 insertions(+), 42 deletions(-)

diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index 292325f1084..5c0c7907c3d 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -21,28 +21,29 @@
 
 
 {
-    'name': 'CRM Fundraising',
-    'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
-    'description': """Fundraising""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['crm'],
+    'name': 'CRM Fundraising', 
+    'version': '1.0', 
+    'category': 'Generic Modules/CRM & SRM', 
+    'description': """Fundraising""", 
+    'author': 'Tiny', 
+    'website': 'http://www.openerp.com', 
+    'depends': ['crm'], 
     'init_xml': [
-         'crm_fundraising_data.xml',
-    ],
+         'crm_fundraising_data.xml', 
+    ], 
 
     'update_xml': [
-        'crm_fundraising_view.xml',
-        'crm_fundraising_menu.xml',
-        'security/ir.model.access.csv',
-        'report/crm_fundraising_report_view.xml',
-    ],
+        'crm_fundraising_view.xml', 
+        'crm_fundraising_menu.xml', 
+        'security/ir.model.access.csv', 
+        'report/crm_fundraising_report_view.xml', 
+    ], 
     'demo_xml': [
-        'crm_fundraising_demo.xml',
-    ],
-    'installable': True,
-    'active': False,
+        'crm_fundraising_demo.xml', 
+    ], 
+    'test': ['test/test_crm_fund.yml'], 
+    'installable': True, 
+    'active': False, 
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 850e088d6b6..3790985075c 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -22,7 +22,7 @@
 from osv import fields, osv, orm
 from crm import crm
 
-class crm_fundraising(osv.osv):
+class crm_fundraising(osv.osv, crm.crm_case):
     """ Fund Raising Cases """
 
     _name = "crm.fundraising"
@@ -31,6 +31,23 @@ class crm_fundraising(osv.osv):
     _inherit ='mailgate.thread'
 
     _columns = {
+            'name': fields.char('Name', size=128, required=True), 
+            'description': fields.text('Description'), 
+            'create_date': fields.datetime('Creation Date' , readonly=True), 
+            'write_date': fields.datetime('Update Date' , readonly=True), 
+            'date_deadline': fields.date('Deadline'), 
+            'user_id': fields.many2one('res.users', 'Responsible'), 
+            'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                            select=True, help='Sales team to which Case belongs to.\
+                                 Define Responsible user and Email account for mail gateway.'), 
+            'company_id': fields.many2one('res.company', 'Company'), 
+            'partner_id': fields.many2one('res.partner', 'Partner'), 
+            'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+            'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+                                 will receive a copy of the future" \
+                                " communication between partner and users by email"), 
+            'email_from': fields.char('Email', size=128, help="These people will receive email."), 
             'date_closed': fields.datetime('Closed', readonly=True), 
             'date': fields.datetime('Date'), 
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
@@ -63,13 +80,26 @@ class crm_fundraising(osv.osv):
                               "the partner mentality in relation to our services.The scale has" \
                             "to be created with a factor for each level from 0 \
                              (Very dissatisfied) to 10 (Extremely satisfied)."), 
+            'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \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\'.'), 
         }
 
     _defaults = {
-                 'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
-                 'probability':lambda *a:0.0, 
-                 'planned_cost':lambda *a:0.0, 
-                 'planned_revenue':lambda *a:0.0, 
-    }
+            'active': lambda *a: 1, 
+            'user_id': crm.crm_case._get_default_user, 
+            'partner_id': crm.crm_case._get_default_partner, 
+            'partner_address_id': crm.crm_case._get_default_partner_address, 
+            'email_from': crm.crm_case. _get_default_email, 
+            'state': lambda *a: 'draft', 
+            'section_id': crm.crm_case. _get_section, 
+            'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), 
+            'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
+            'probability': lambda *a:0.0, 
+            'planned_cost': lambda *a:0.0, 
+            'planned_revenue': lambda *a:0.0, 
+            }
 
 crm_fundraising()
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 70cc477af98..af6c37a7041 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -182,7 +182,7 @@
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
-                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                        <form string="Communication history">
                             <group col="7" colspan="4">
                                 <field name="date"/>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report.py b/addons/crm_fundraising/report/crm_fundraising_report.py
index af867ea0008..5c19689257c 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report.py
+++ b/addons/crm_fundraising/report/crm_fundraising_report.py
@@ -22,16 +22,75 @@
 from osv import fields,osv
 import tools
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
 
 class crm_fundraising_report(osv.osv):
     """CRM Fundraising Report"""
 
     _name = "crm.fundraising.report"
     _auto = False
-    _inherit = "crm.case.report"
     _description = "CRM Fundraising Report"
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr)) * 100
+
+                res[case.id] = perc_state
+            else:
+                model_name = self._name.split('report.')
+                if len(model_name) < 2:
+                    res[case.id] = 0.0
+                else:
+                    model_name = model_name[1]
+
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
+                    logs = cr.fetchone()[0]
+
+                    avg_ans = logs / case.nbr
+                    res[case.id] = avg_ans
+
+        return res
 
     _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                     domain="[('section_id','=',section_id),\
                     ('object_id.model', '=', 'crm.fundraising')]"),
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index dc759d0bf1c..fad9c7eb93d 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -33,15 +33,20 @@
         <record id="view_report_crm_fundraising_form" model="ir.ui.view">
             <field name="name">crm.fundraising.report.form</field>
             <field name="model">crm.fundraising.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="nbr" position="after">
+            	<form string="Cases">
+                    <field name="name" select="1"/>
+                    <field name="month" select="1"/>
+                    <field name="user_id" select="1"/>
+					<field name="section_id" select="1"/>
+                    <field name="nbr" select="1"/>
                     <field name="delay_close"/>
                     <field name="amount_revenue"/>
                     <field name="amount_revenue_prob"/>
                     <field name="probability"/>
-                </field>
+                    <field name="state" select="1"/>
+                </form>
             </field>
         </record>
 
@@ -62,20 +67,108 @@
 
 <!-- Fundraising by user and section Search View-->
 
-        <record id="view_report_crm_fundraising_filter" model="ir.ui.view">
-            <field name="name">crm.fundraising.report.select</field>
+		<record id="view_report_crm_fundraising_filter" model="ir.ui.view">
+            <field name="name">crm.fundraising.report.selectt</field>
             <field name="model">crm.fundraising.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            <data>
-            	<xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
-            	<group>
-            	    <separator orientation="vertical"/>
-	                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-	             </group>
-            	</xpath>
-                </data>
+                <search string="Search">
+                  <group col="16" colspan="8">
+                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"/>-->
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
+                   			domain="[('month','=',time.strftime('%%m'))]" />-->
+                       <filter string="This Month" icon="terp-hr" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+
+                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<separator orientation="vertical" />
+                        <filter icon="terp-hr"
+                    		string="Draft"
+                    		domain="[('state','=','draft')]"/>
+					   <filter icon="terp-hr"
+                    		string="Open"
+                    		domain="[('state','=','open')]"/>
+					   <filter icon="terp-hr"
+                    		string="Pending"
+                    		domain="[('state','=','pending')]"/>
+
+                   		<separator orientation="vertical" />
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			widget="selection"
+                   			context="{'invisible_section': False}">
+
+                   			<filter icon="terp-crm"
+                   				context="{'invisible_section': False}"
+                   				domain="[('section_id.user_id','=',uid)]"
+                   				help="My section" />
+
+                   		</field>
+                   		<field name="company_id" widget="selection">
+                           <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id.company_id','=',uid)]"
+                        help="My company"/>
+                        </field>
+
+                      	<field name="user_id" select="1" widget="selection">
+	            			<filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+               			</field>
+                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
+                    	
+                    	<group>
+		            	    <separator orientation="vertical"/>
+			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+			             </group>
+
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
+               </search>
             </field>
         </record>
 
diff --git a/addons/crm_fundraising/test/test_crm_fund.yml b/addons/crm_fundraising/test/test_crm_fund.yml
index 4bcacbe148e..e310dfa4d47 100644
--- a/addons/crm_fundraising/test/test_crm_fund.yml
+++ b/addons/crm_fundraising/test/test_crm_fund.yml
@@ -7,14 +7,14 @@
   I make payment by Cheque so I make sure that the mode on fund is selected as cheque
 - 
   !record {model: crm.fundraising, id: crm_fundraising_donationforbookstopoorschoolchildren0}:
-    categ_id: crm.categ_fund2
+    categ_id: crm_fundraising.categ_fund2
     email_from: info@balmerinc.be
     name: Donation for books to poor school children
     partner_address_id: base.res_partner_address_1
     partner_id: base.res_partner_9
     planned_cost: 500000.0
     section_id: crm.section_sales_department
-    type_id: crm.type_fund2
+    type_id: crm_fundraising.type_fund2
 - |
   I check that the Funds  is in 'draft' state.
 -

From 75e1ae7cbb81ff7a7596138fb6a90a058a166bd8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 13:01:09 +0530
Subject: [PATCH 082/146] [IMP]: crm_helpdesk: Improvement in helpdesk for
 inheriting python class crm case from crm + Improvement in reports, Added
 missing fields

bzr revid: rpa@tinyerp.com-20100506073109-2ce22j3x0auri0l1
---
 addons/crm_helpdesk/__openerp__.py            | 39 ++++++------
 addons/crm_helpdesk/crm_helpdesk.py           | 44 ++++++++++---
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  3 +-
 .../report/crm_helpdesk_report.py             | 62 ++++++++++++++++++-
 .../report/crm_helpdesk_report_view.xml       | 19 +++---
 5 files changed, 130 insertions(+), 37 deletions(-)

diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index 93bb5af70c9..b8d2409fcb2 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -21,29 +21,28 @@
 
 
 {
-    'name': 'CRM Helpdesk',
-    'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
-    'description': """Helpdesk Management""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['crm'],
+    'name': 'CRM Helpdesk', 
+    'version': '1.0', 
+    'category': 'Generic Modules/CRM & SRM', 
+    'description': """Helpdesk Management""", 
+    'author': 'Tiny', 
+    'website': 'http://www.openerp.com', 
+    'depends': ['crm'], 
     'init_xml': [
-         'crm_helpdesk_data.xml',
-    ],
-
+         'crm_helpdesk_data.xml', 
+    ], 
     'update_xml': [
-        'crm_helpdesk_view.xml',
-        'crm_helpdesk_menu.xml',
-        'security/ir.model.access.csv',
-        'report/crm_helpdesk_report_view.xml',
-    ],
+        'crm_helpdesk_view.xml', 
+        'crm_helpdesk_menu.xml', 
+        'security/ir.model.access.csv', 
+        'report/crm_helpdesk_report_view.xml', 
+    ], 
     'demo_xml': [
-        'crm_helpdesk_demo.xml',
-        'test/test_crm_helpdesk.yml'
-    ],
-    'installable': True,
-    'active': False,
+        'crm_helpdesk_demo.xml', 
+    ], 
+    'test': ['test/test_crm_helpdesk.yml'], 
+    'installable': True, 
+    'active': False, 
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index a467e80fefb..f304cd860a0 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -19,12 +19,10 @@
 #
 ##############################################################################
 
-from osv import fields
-from osv import orm
-from osv import osv
 from crm import crm
+from osv import fields, osv
 
-class crm_helpdesk(osv.osv):
+class crm_helpdesk(osv.osv, crm.crm_case):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
@@ -33,7 +31,25 @@ class crm_helpdesk(osv.osv):
     _inherit = 'mailgate.thread'
 
     _columns = {
+            'id': fields.integer('ID', readonly=True), 
+            'name': fields.char('Name', size=128, required=True), 
+            'description': fields.text('Description'), 
+            'create_date': fields.datetime('Creation Date' , readonly=True), 
+            'write_date': fields.datetime('Update Date' , readonly=True), 
+            'date_deadline': fields.date('Deadline'), 
+            'user_id': fields.many2one('res.users', 'Responsible'), 
+            'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                            select=True, help='Sales team to which Case belongs to.\
+                                 Define Responsible user and Email account for mail gateway.'), 
+            'company_id': fields.many2one('res.company', 'Company'), 
             'date_closed': fields.datetime('Closed', readonly=True), 
+            'partner_id': fields.many2one('res.partner', 'Partner'), 
+            'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+            'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+                                 will receive a copy of the future" \
+                                " communication between partner and users by email"), 
+            'email_from': fields.char('Email', size=128, help="These people will receive email."), 
             'date': fields.datetime('Date'), 
             'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
             'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
@@ -53,13 +69,25 @@ class crm_helpdesk(osv.osv):
                                 (Very dissatisfied) to 10 (Extremely satisfied)."), 
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.helpdesk')]"),
-            'duration': fields.float('Duration'),
+                            ('object_id.model', '=', 'crm.helpdesk')]"), 
+            'duration': fields.float('Duration'), 
+            'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \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\'.'), 
     }
 
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'active': lambda *a: 1, 
+        'user_id': crm.crm_case._get_default_user, 
+        'partner_id': crm.crm_case._get_default_partner, 
+        'partner_address_id': crm.crm_case._get_default_partner_address, 
+        'email_from': crm.crm_case. _get_default_email, 
+        'state': lambda *a: 'draft', 
+        'section_id': crm.crm_case. _get_section, 
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), 
+        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
     }
 
 crm_helpdesk()
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 15f00e66cf5..03f3d989da1 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -112,7 +112,7 @@
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="CC"/>
                        </group>
-                       <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                       <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                            <form string="Communication history">
                                <group col="7" colspan="4">
                                    <field name="date"/>
@@ -163,6 +163,7 @@
                 <field name="date_deadline"/>
                 <field name="user_id"/>
                 <field name="section_id"/>
+                <field name="priority"/>
                 <field name="state"/>
                 <button name="case_close" string="Done"
                     states="open,draft,pending" type="object"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 9884b7cd584..cf2578ddfaf 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -23,15 +23,75 @@ from osv import fields,osv
 import tools
 
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
+
 class crm_helpdesk_report(osv.osv):
     """ Helpdesk report after Sales Services """
 
     _name = "crm.helpdesk.report"
     _description = "Helpdesk report after Sales Services"
     _auto = False
-    _inherit = "crm.case.report"
+
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr)) * 100
+
+                res[case.id] = perc_state
+            else:
+                model_name = self._name.split('report.')
+                if len(model_name) < 2:
+                    res[case.id] = 0.0
+                else:
+                    model_name = model_name[1]
+
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
+                    logs = cr.fetchone()[0]
+
+                    avg_ans = logs / case.nbr
+                    res[case.id] = avg_ans
+
+        return res
 
     _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True), 
         'delay_close': fields.char('Delay to close', size=20, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 39101be2449..a8857c0d557 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -30,15 +30,20 @@
         <record id="view_report_crm_helpdesk_form" model="ir.ui.view">
             <field name="name">crm.helpdesk.report.form</field>
             <field name="model">crm.helpdesk.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="nbr" position="after">
-                    <field name="delay_close"/>
-                    <field name="amount_revenue"/>
-                    <field name="amount_revenue_prob"/>
-                    <field name="probability"/>
-                </field>
+                <form string="Cases">
+					<field name="name" select="1"/>
+					<field name="month" select="1"/>
+					<field name="user_id" select="1"/>
+					<field name="section_id" select="1"/>
+					<field name="nbr" select="1"/>
+					<field name="delay_close"/>
+					<field name="amount_revenue"/>
+					<field name="amount_revenue_prob"/>
+					<field name="probability"/>
+					<field name="state" select="1"/>
+                </form>
             </field>
         </record>
 

From e56d5b74dc6506c7159c100ed61ef86d338dd754 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 6 May 2010 14:12:59 +0530
Subject: [PATCH 083/146] [IMP]:gtk contact &set configurable chart of account

bzr revid: nch@tinyerp.com-20100506084259-5keaef3ns222kxws
---
 addons/account/installer.py            | 1 +
 addons/base_setup/gtk_contact_form.py  | 2 --
 addons/base_setup/gtk_contact_form.xml | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index e10bbae21b7..2dd8c11cba5 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -85,6 +85,7 @@ class account_installer(osv.osv_memory):
         'period':lambda *a:'month',
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
+        'charts':'configurable',
         }
 
     def on_change_start_date(self, cr, uid, id, start_date):
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index 112d66d2919..03fd0822b8e 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -69,7 +69,6 @@ class base_gtkcontactform(osv.osv_memory):
              'other':fields.boolean('Other'),
              'ebook':fields.boolean('ebook'),
              'updates':fields.boolean('updates'),
-             #'note':fields.text('Note'),
              }
     def execute(self, cr, uid, ids, context=None):
         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
@@ -89,7 +88,6 @@ class base_gtkcontactform(osv.osv_memory):
             result += "\nplan_use: " +  str(res.get('use_openerp', False))
             result += "\nsell_openerp: " + str(res.get('sell_openerp', False))
             result += "\nebook: " + str(res.get('ebook',False))
-            result += "\nnote: " + str(res.get('note',''))
             result += "\ngtk: " + str(True)
         misc.upload_data(email, result, type='SURVEY')
 
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index ab0c2dfe8ab..b220db020c6 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -18,7 +18,7 @@
 	          	  <attribute name='colspan'>4</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>24</attribute>
+	          	  <attribute name='rowspan'>22</attribute>
 	          	  <attribute name='string'></attribute>
 	      </xpath>
           <group string="res_config_contents" position="replace">

From 28c787901db8ae97b30d532da839c9036cdedc86 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 14:15:15 +0530
Subject: [PATCH 084/146] [FIX]: crm_claim: Minor fix in crm claims

bzr revid: rpa@tinyerp.com-20100506084515-49l8f2uke2yfa151
---
 addons/crm_claim/report/crm_claim_report.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 16ff5be0d3a..5be9d3c163b 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -21,7 +21,6 @@
 
 from osv import fields,osv
 import tools
-from crm.report import crm_report
 
 AVAILABLE_STATES = [
     ('draft','Draft'),
@@ -31,6 +30,15 @@ AVAILABLE_STATES = [
     ('pending','Pending')
 ]
 
+AVAILABLE_PRIORITIES = [
+    ('5', 'Lowest'),
+    ('4', 'Low'),
+    ('3', 'Normal'),
+    ('2', 'High'),
+    ('1', 'Highest')
+]
+
+
 class crm_claim_report(osv.osv):
     """ CRM Claim Report"""
 
@@ -101,7 +109,7 @@ class crm_claim_report(osv.osv):
                         ('object_id.model', '=', 'crm.claim')]", readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'priority': fields.selection(crm_report.AVAILABLE_PRIORITIES, 'Priority'),
+        'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'type_id': fields.many2one('crm.case.resource.type', 'Claim Type',\
                          domain="[('section_id','=',section_id),\
                          ('object_id.model', '=', 'crm.claim')]"),

From 8bf3c56fc7496cda613b3b1e8108d492f0cc8252 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 14:39:16 +0530
Subject: [PATCH 085/146] [REM]: base_calendar: Removed code that parse the
 email to find a Yes/No/May be

bzr revid: rpa@tinyerp.com-20100506090916-ttzg5n4rv34j0m9p
---
 addons/base_calendar/base_calendar.py | 59 ---------------------------
 1 file changed, 59 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index ceb6d729aeb..b2e57662cea 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -178,28 +178,12 @@ html_invitation = """
                 </div>
                 </td>
             </tr>
-            <tr valign="top">
-                <td><b>Are you coming?</b></td>
-                <td><b>:</b></td>
-                <td colspan="3">
-                <UL>
-                    <LI>YES</LI>
-                    <LI>NO</LI>
-                    <LI>MAYBE</LI>
-                </UL>
-                </td>
-            </tr>
         </table>
         </td>
     </tr>
 </table>
 <table border="0" cellspacing="10" cellpadding="0" width="100%%"
     style="font-family: Arial, Sans-serif; font-size: 14">
-    <tr>
-        <td width="100%%"><b>Note:</b> If you are interested please reply this
-        mail and keep only your response from options <i>YES, NO</i>
-        and <i>MAYBE</i>.</td>
-    </tr>
     <tr>
         <td width="100%%">From:</td>
     </tr>
@@ -385,49 +369,6 @@ property or property parameter."),
         'state': lambda *x: 'needs-action', 
     }
 
-    response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
-
-    def msg_new(self, cr, uid, msg):
-        """ 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks, 
-        """
-        return False
-
-    def msg_act_get(self, msg):
-        """
-        Get Message.
-        @param self: The object pointer
-        @return: dictionary of actions which contain state field value.
-        """
-
-        mailgate_obj = self.pool.get('mail.gateway')
-        body = mailgate_obj.msg_body_get(msg)
-        actions = {}
-        res = self.response_re.findall(body['body'])
-        if res:
-            actions['state'] = res[0]
-        return actions
-
-    def msg_update(self, cr, uid, ids, msg, data={}, default_act='None'):
-        """
-        Update msg state which may be accepted.declined.tentative.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs.
-        @param context: A standard dictionary for contextual values
-        @return: True
-        """
-        msg_actions = self.msg_act_get(msg)
-        if msg_actions.get('state'):
-            if msg_actions['state'] in ['YES', 'NO', 'MAYBE']:
-                mapping = {'YES': 'accepted', 'NO': 'declined', 'MAYBE': 'tentative'}
-                status = mapping[msg_actions['state']]
-                print 'Got response for invitation id: %s as %s' % (ids, status)
-                self.write(cr, uid, ids, {'state': status})
-        return True
-
     def get_ics_file(self, cr, uid, event_obj, context=None):
         """
         Returns iCalendar file for the event invitation

From c8587f2e63169475cae5ec62d304df1e8132357a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 14:44:53 +0530
Subject: [PATCH 086/146] [FIX]: crm_profiling: Fixed problem of menu reference

bzr revid: rpa@tinyerp.com-20100506091453-7218o3u628cfrgs9
---
 addons/crm_profiling/crm_profiling_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index da91dcd7107..040dff1ff38 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -15,7 +15,7 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree,form</field>
         </record>
-        <menuitem parent="crm.menu_crm_configuration" id="menu_segm_questionnaire"
+        <menuitem parent="base.menu_crm_configuration" id="menu_segm_questionnaire"
                   action="open_questionnaires" />
 
 
@@ -25,7 +25,7 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree,form</field>
         </record>
-        <menuitem parent="crm.menu_crm_configuration" id="menu_segm_answer"
+        <menuitem parent="base.menu_crm_configuration" id="menu_segm_answer"
                   action="open_questions" />
 
 <!-- Profiling Questionnaire Tree view  -->

From c98956e5804c4012f64c7efda9943b473a13905b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 14:58:08 +0530
Subject: [PATCH 087/146] [FIX]: crm: Fixed wrong field name

bzr revid: rpa@tinyerp.com-20100506092808-m1ge5j7qvz7j5o7b
---
 addons/crm/crm_lead.py        | 4 ++--
 addons/crm/crm_opportunity.py | 2 +-
 addons/crm/crm_phonecall.py   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 8c8e8cca564..522c3cfc667 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -169,8 +169,8 @@ class crm_lead(osv.osv, crm_case):
         @param ids: List of case Ids
         @param *args: Tuple Value for additional Params
         """
-        res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
-        self.write(cr, uid, ids, {'date_close': time.strftime('%Y-%m-%d %H:%M:%S')})
+        res = super(crm_lead, self).case_close(cr, uid, ids, args)
+        self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
     def convert_opportunity(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index eb015359566..0128ffd51bd 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -66,7 +66,7 @@ class crm_opportunity(osv.osv):
         @param *args: Tuple Value for additional Params
         """
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
-        self.write(cr, uid, ids, {'probability' : 100.0, 'date_close': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'probability' : 100.0, 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
     def case_cancel(self, cr, uid, ids, *args):
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index cb65363d81a..49a5e366ede 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -97,7 +97,7 @@ class crm_phonecall(osv.osv, crm_case):
         @param *args: Tuple Value for additional Params
         """
         res = super(crm_phonecall, self).case_close(cr, uid, ids, args)
-        self.write(cr, uid, ids, {'date_close': time.strftime('%Y-%m-%d %H:%M:%S')})
+        self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
     def case_open(self, cr, uid, ids, *args):

From 1bfc05b14250bca269b87d99e58e20bb6efd31d6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 15:03:59 +0530
Subject: [PATCH 088/146] [FIX,IMP]: sale_crm: Fixes according to changes in
 crm for removing crm.case

bzr revid: rpa@tinyerp.com-20100506093359-33ylk7katdaa35yx
---
 addons/sale_crm/__openerp__.py               | 2 +-
 addons/sale_crm/process/sale_crm_process.xml | 2 +-
 addons/sale_crm/sale_crm_view.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 045afbbd82c..9464db91b6f 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Sale CRM Stuff',
+    'name': 'Creates Sale orders from Opportunity',
     'version': '1.0',
     'category': 'Generic Modules/Sales & Purchases',
     'description': """
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 1b469b32d46..5dea1efd563 100644
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -18,7 +18,7 @@
         </record>
 
         <record id="process_node_crmopportunity0" model="process.node">
-            <field name="model_id" ref="crm.model_crm_case"/>
+            <field name="model_id" ref="mail_gateway.model_mailgate_thread"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;CRM Opportunity&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The CRM Opportunity can lead to a quotation.&quot;&quot;&quot;" name="note"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 24912052190..4147101773b 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -4,7 +4,7 @@
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">CRM - Opportunities - Quote Inherit</field>
-        <field name="model">crm.opportunity</field>
+        <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
         <field name="arch" type="xml">

From ea8d26dc1ec926b897431a3ffbde779f7a569558 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 15:24:00 +0530
Subject: [PATCH 089/146] [IMP,FIX]: partner_crm: Improvement and fixes for
 changes in crm for removing crm.case and merged lead and opportunity

bzr revid: rpa@tinyerp.com-20100506095400-xpk2nwfmx6q8m0y8
---
 addons/partner_crm/partner_crm.py               | 2 +-
 addons/partner_crm/partner_crm_view.xml         | 2 +-
 addons/partner_crm/security/ir.model.access.csv | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_crm/partner_crm.py
index b2d6d380b44..2f5101871fe 100644
--- a/addons/partner_crm/partner_crm.py
+++ b/addons/partner_crm/partner_crm.py
@@ -26,7 +26,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     
     _columns = {
-                'opportunity_ids': fields.one2many('crm.lead', 'partner_id', 'Opportunities'), 
+                'opportunity_ids': fields.one2many('crm.lead', 'partner_id', 'Opportunities', domain=[('type', '=', 'opportunity')]), 
                 'meeting_ids': fields.one2many('crm.meeting', 'partner_id',\
                                                      'Meetings'), 
                 'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id', 'Phonecalls'), 
diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_crm/partner_crm_view.xml
index ab75f5c58ed..7fbebdd84d8 100644
--- a/addons/partner_crm/partner_crm_view.xml
+++ b/addons/partner_crm/partner_crm_view.xml
@@ -13,7 +13,7 @@
                 <notebook position="inside">
                 	<page string="Other Info">
                 		<group col="2" colspan="4">							
-							<field name="opportunity_ids" colspan="4" nolabel="1" />							
+							<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]" />							
 							<field name="meeting_ids" colspan="4" nolabel="1" />							
 							<field name="phonecall_ids" colspan="4" nolabel="1" />
                 		</group>
diff --git a/addons/partner_crm/security/ir.model.access.csv b/addons/partner_crm/security/ir.model.access.csv
index 3278d468265..1ebd2924293 100644
--- a/addons/partner_crm/security/ir.model.access.csv
+++ b/addons/partner_crm/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_opportunity_partner","crm.opportunity","crm.model_crm_opportunity","base.group_user",1,0,0,0
 "access_crm_meeting_partner_manager","crm.meeting","crm.model_crm_meeting","base.group_partner_manager",1,0,0,0
 "access_crm_meeting_user","crm.meeting","crm.model_crm_meeting","base.group_user",1,0,0,0
 "access_crm_phonecall_partner_manager","crm.phonecall","crm.model_crm_phonecall","base.group_partner_manager",1,0,0,0

From 8cd78c3f418250b5af55efb57762ebb677b9758d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 15:30:33 +0530
Subject: [PATCH 090/146] [IMP]: board_crm: Improvement in board_crm according
 to new changes in crm

bzr revid: rpa@tinyerp.com-20100506100033-evbgdpznn88xpkx9
---
 .../board_crm/board_crm_statistical_view.xml  |  4 ++--
 addons/board_crm/board_crm_view.xml           | 19 ++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/addons/board_crm/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml
index 9a43e4e96c2..002bd48448f 100644
--- a/addons/board_crm/board_crm_statistical_view.xml
+++ b/addons/board_crm/board_crm_statistical_view.xml
@@ -18,7 +18,7 @@
 
         <record model="ir.ui.view" id="view_crm_opportunity_categ_graph">
             <field name="name">report.crm.opportunity.categ.graph</field>
-            <field name="model">crm.opportunity.report</field>
+            <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Opportunity by Sections and Categories" type="bar" orientation="horizontal">
@@ -30,7 +30,7 @@
 
         <act_window name="Opportunities By Categories"
             domain="[('state','!=','done'),('state','!=','cancel')]"
-            res_model="crm.opportunity.report"
+            res_model="crm.lead.report"
             view_type="form"
             view_mode="graph,tree,form"
             view_id="view_crm_opportunity_categ_graph"
diff --git a/addons/board_crm/board_crm_view.xml b/addons/board_crm/board_crm_view.xml
index a0a816320df..0bbdbe12588 100644
--- a/addons/board_crm/board_crm_view.xml
+++ b/addons/board_crm/board_crm_view.xml
@@ -6,7 +6,7 @@
 		</record>
 		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
 			<field name="name">crm.opportunity.user.graph1</field>
-			<field name="model">crm.opportunity.report</field>
+			<field name="model">crm.lead.report</field>
 			<field name="type">graph</field>
 			<field name="arch" type="xml">
 				<graph string="Opportunities by User and Section" type="pie">
@@ -29,12 +29,7 @@
 			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
 			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
-		<act_window name="My Cases"
-				domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
-				res_model="crm.case"
-				view_type="form"
-				view_mode="tree,form"
-				id="act_my_cases"/>
+
 		<record model="ir.actions.act_window" id="act_my_leads_stage">
 			<field name="res_model">crm.lead.report</field>
 			<field name="view_type">form</field>
@@ -44,11 +39,11 @@
 		</record>
 
 		<record model="ir.actions.act_window" id="act_sales_pipeline">
-			<field name="res_model">crm.opportunity.report</field>
+			<field name="res_model">crm.lead.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">graph,tree,form</field>
 			<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
-			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel'),('type', '=', 'opportunity')]</field>
 		</record>
 
 		<record model="ir.ui.view" id="board_crm_form">
@@ -73,12 +68,6 @@
 								height="150"
 								colspan="4"/>
 
-							<action
-								string="My Cases"
-								name="%(act_my_cases)d"
-								colspan="4"
-								height="200"/>
-
 						</child1>
 
 						<child2>

From 1e407d5f2d7c2c9ba938e60d7fa2b13b440ff03e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 15:57:00 +0530
Subject: [PATCH 091/146] [FIX,IMP]: crm: Fixes and improvement in yml tests +
 security csv

bzr revid: rpa@tinyerp.com-20100506102700-9ksfm283t33q8m05
---
 addons/crm/__openerp__.py                | 116 +++++++++++------------
 addons/crm/crm_phonecall.py              |   9 +-
 addons/crm/security/ir.model.access.csv  |   3 -
 addons/crm/test/test_crm_lead.yml        |   3 +-
 addons/crm/test/test_crm_opportunity.yml |   8 +-
 5 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index e2ea825c63c..e3c3fd8f8c8 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Customer & Supplier Relationship Management',
-    'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
+    'name': 'Customer & Supplier Relationship Management', 
+    'version': '1.0', 
+    'category': 'Generic Modules/CRM & SRM', 
     'description': """The generic Open ERP Customer Relationship Management
 system enables a group of people to intelligently and efficiently manage
 leads, opportunities, meeting, phonecall etc.
@@ -41,79 +41,79 @@ appropriate staff, and making sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and Open ERP.""",
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
+between mails and Open ERP.""", 
+    'author': 'Tiny', 
+    'website': 'http://www.openerp.com', 
     'depends': [
         'base', 
-        'base_action_rule',
-        'process',
-        'mail_gateway',
-        'base_calendar',
-        'resource',
-    ],
+        'base_action_rule', 
+        'process', 
+        'mail_gateway', 
+        'base_calendar', 
+        'resource', 
+    ], 
     'init_xml': [
-        'crm_data.xml',
-        'crm_meeting_data.xml',
-        'crm_lead_data.xml',
-        'crm_meeting_data.xml',
-        'crm_opportunity_data.xml',
-        'crm_phonecall_data.xml',
-    ],
+        'crm_data.xml', 
+        'crm_meeting_data.xml', 
+        'crm_lead_data.xml', 
+        'crm_meeting_data.xml', 
+        'crm_opportunity_data.xml', 
+        'crm_phonecall_data.xml', 
+    ], 
 
     'update_xml': [
-        'wizard/crm_lead_to_partner_view.xml',
-        'wizard/crm_lead_to_opportunity_view.xml',
+        'wizard/crm_lead_to_partner_view.xml', 
+        'wizard/crm_lead_to_opportunity_view.xml', 
 
-        'wizard/crm_phonecall_to_phonecall_view.xml',
-        'wizard/crm_phonecall_to_partner_view.xml',
-        'wizard/crm_phonecall_to_opportunity_view.xml',
+        'wizard/crm_phonecall_to_phonecall_view.xml', 
+        'wizard/crm_phonecall_to_partner_view.xml', 
+        'wizard/crm_phonecall_to_opportunity_view.xml', 
 
-        'wizard/crm_opportunity_to_phonecall_view.xml',
-        'wizard/crm_partner_to_opportunity_view.xml',
+        'wizard/crm_opportunity_to_phonecall_view.xml', 
+        'wizard/crm_partner_to_opportunity_view.xml', 
 
-        'wizard/crm_forward_to_partner_view.xml',
-        'wizard/crm_send_email_view.xml',
-        'wizard/crm_email_add_cc_view.xml',
-        'crm_view.xml',
+        'wizard/crm_forward_to_partner_view.xml', 
+        'wizard/crm_send_email_view.xml', 
+        'wizard/crm_email_add_cc_view.xml', 
+        'crm_view.xml', 
 
-        'crm_action_rule_view.xml',
-        'crm_lead_view.xml',
-        'crm_lead_menu.xml',
+        'crm_action_rule_view.xml', 
+        'crm_lead_view.xml', 
+        'crm_lead_menu.xml', 
         
-        'crm_meeting_view.xml',
-        'crm_meeting_menu.xml',
+        'crm_meeting_view.xml', 
+        'crm_meeting_menu.xml', 
         
-        'crm_phonecall_view.xml',
-        'crm_phonecall_menu.xml',
+        'crm_phonecall_view.xml', 
+        'crm_phonecall_menu.xml', 
         
-        'crm_opportunity_view.xml',
-        'crm_opportunity_menu.xml',
+        'crm_opportunity_view.xml', 
+        'crm_opportunity_menu.xml', 
         
-        'security/crm_security.xml',
-#        'security/ir.model.access.csv',
+        'security/crm_security.xml', 
+        'security/ir.model.access.csv', 
 
-        'report/crm_lead_report_view.xml',
-        'report/crm_phonecall_report_view.xml',
+        'report/crm_lead_report_view.xml', 
+        'report/crm_phonecall_report_view.xml', 
 
-        'process/crm_configuration_process.xml',
+        'process/crm_configuration_process.xml', 
         'crm_installer_view.xml'
-    ],
+    ], 
     'demo_xml': [
-        'crm_demo.xml',
-        'crm_lead_demo.xml',
-        'crm_meeting_demo.xml',
-        'crm_opportunity_demo.xml',
+        'crm_demo.xml', 
+        'crm_lead_demo.xml', 
+        'crm_meeting_demo.xml', 
+        'crm_opportunity_demo.xml', 
         'crm_phonecall_demo.xml'
-    ],
+    ], 
     'test': [
-#            'test/test_crm_lead.yml',
-#            'test/test_crm_meeting.yml', 
-#            'test/test_crm_opportunity.yml',
-#            'test/test_crm_phonecall.yml', 
-             ],
-    'installable': True,
-    'active': False,
-    'certificate': '0079056041421',
+            'test/test_crm_lead.yml', 
+            'test/test_crm_meeting.yml', 
+            'test/test_crm_opportunity.yml', 
+            'test/test_crm_phonecall.yml', 
+             ], 
+    'installable': True, 
+    'active': False, 
+    'certificate': '0079056041421', 
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 49a5e366ede..bb8e60d1fb1 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -43,14 +43,17 @@ class crm_phonecall(osv.osv, crm_case):
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
         'company_id': fields.many2one('res.company', 'Company'), 
-        'description': fields.text('Description'),  
+        'description': fields.text('Description'), 
         'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \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\'.'), 
-        'email_from': fields.char('Email', size=128, help="These people will receive email."),
-        
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.phonecall')]"), 
+        'date_open': fields.datetime('Opened', readonly=True),
         # phonecall fields
         'duration': fields.float('Duration'), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 62d069c3004..a4650b1b866 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -18,11 +18,8 @@
 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
 "access_crm_case_resource_type_manager","crm_case_resource_type manager","model_crm_case_resource_type","crm.group_crm_manager",1,1,1,1
-"access_crm_case_report_user","crm.case.report","model_crm_case_report","crm.group_crm_user",1,0,0,0
-"access_crm_case_report_manager","crm.case.report manager","model_crm_case_report","crm.group_crm_manager",1,1,1,1
 "access_crm_lead_report_user","crm.lead.report","model_crm_lead_report","crm.group_crm_user",1,0,0,0
 "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0
-"access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0
 "access_crm_lead2partner","crm.lead2partner","model_crm_lead2partner","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity","crm.lead2opportunity","model_crm_lead2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_opportunity2phonecall","crm.opportunity2phonecall","model_crm_opportunity2phonecall","crm.group_crm_user",1,1,1,1
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 22fdfffca1b..0a051d2310d 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -88,8 +88,7 @@
 -  
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref("crm_lead_newcustomer0"))
-    print "lead",  lead.partner_name
-    obj_opportunity = self.pool.get('crm.opportunity')
+    obj_opportunity = self.pool.get('crm.lead')
     ids = obj_opportunity.search(cr, uid, [('name', '=', lead.partner_name)])
     opportunity = obj_opportunity.browse(cr, uid, ids)[0]
     assert lead.partner_name == opportunity.partner_id.name
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index d7118dd0c90..e3a4f28cb5e 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -2,7 +2,7 @@
    I start by creating a new Opportunity. And I select partner for opportunity.
    I can see that after selecting partner his contact and email is automatically filled.
 -
-   !record {model: crm.opportunity, id: crm_opportunity_abcfuelcounits0}:
+   !record {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
     email_from: info@balmerinc.be
     name: 'ABC FUEL CO 829264 - 10002 units '
     partner_address_id: base.res_partner_address_1
@@ -15,19 +15,19 @@
 -  |
    I check that the opportunity is in 'New' state.
 -
-   !assert {model: crm.opportunity, id: crm_opportunity_abcfuelcounits0}:
+   !assert {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
      - state == "draft"
 -  |  
    I open opportunity by click on "Open" button,
 -
-   !python {model: crm.opportunity}: |
+   !python {model: crm.lead}: |
     self.case_open(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
 
 -  |
    I schedule Meeting on this current opportunity by clicking on "schedule
    Meeting".
 -
-   !python {model: crm.opportunity}: |
+   !python {model: crm.lead}: |
     self.action_makeMeeting(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
     
 -  |

From f998ca47aeb2a64f0c9ea95b9cf0805b0e1482ad Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 6 May 2010 17:04:17 +0530
Subject: [PATCH 092/146] [imp]:installation Done wizard

bzr revid: nch@tinyerp.com-20100506113417-amny4wxhd1un1fkq
---
 addons/base_setup/base_setup_data.xml | 41 ++++++++++++++-------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index e7ab8698c7e..e06facce0e8 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -6,26 +6,27 @@
       <field name="model">base.setup.config</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Setup">
-          <group colspan="4">
-            <image name="gtk-dialog-info"/>
-            <group colspan="2" col="4">
-              <separator colspan="4" string="Installation Done"/>
-              <label align="0.0" colspan="4"
-                     string="Your new database is now fully installed."/>
-              <field name="installed_users" nolabel= "1" colspan="4"/>
-              <label align="0.0" colspan="4"
-                     string="You can start configuring the system or connect directly to the database as an administrator."/>
-            </group>
-          </group>
-          <separator string="" colspan="4"/>
-          <button name="menu" icon="gtk-ok" type="object"
-                  string="Use Directly"/>
-          <button name="config" icon="gtk-go-forward" type="object"
-                  string="Start Configuration"/>
-        </form>
-      </field>
-    </record>
+      <form string="Setup">
+      <group colspan="4" col="8">
+      	<group width="150">
+      		<image name="gtk-dialog-info"/>
+      	</group>
+      	<group>
+      		<separator string="Installation Done" colspan="8"/>
+      		<label align="0.0" string="Your new database is now fully installed." colspan="8"/>
+       		<field name="installed_users" nolabel= "1" colspan="8"/>
+       		<label align="0.0" colspan="8"	string="You can start configuring the system or connect directly to the database as an administrator."/>
+        </group>
+      </group>
+      <group colspan="8" col="8">
+    		<separator string="" colspan="8"/>
+    		<label string="" colspan="6"/>
+			<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
+			<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
+      </group>
+    </form>
+   </field>
+  </record>
 
     <record id="action_base_setup" model="ir.actions.act_window">
       <field name="name">Setup</field>

From 60c59e5b0d20252d0f86b7cb067707fbe242c28c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 6 May 2010 19:14:29 +0530
Subject: [PATCH 093/146] [IMP]: crm: Usability Improvements:  * schedule
 meeting - remove domain to view all meetings before planning a new meeting  *
 recurrent rule : should be hide  * Out Bound Phone: put TODO instead of Open 
 * After rescheduling phone call, search view is improved

bzr revid: rpa@tinyerp.com-20100506134429-w6jupregsj9qif3m
---
 addons/crm/crm_lead.py                          | 2 +-
 addons/crm/crm_lead_view.xml                    | 2 +-
 addons/crm/crm_meeting_view.xml                 | 2 +-
 addons/crm/crm_opportunity.py                   | 1 -
 addons/crm/crm_phonecall.py                     | 8 +++++++-
 addons/crm/wizard/crm_lead_to_opportunity.py    | 2 +-
 addons/crm/wizard/crm_lead_to_partner.py        | 1 +
 addons/crm/wizard/crm_lead_to_partner_view.xml  | 2 +-
 addons/crm/wizard/crm_phonecall_to_phonecall.py | 3 ++-
 9 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 522c3cfc667..a24143488ad 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -113,7 +113,7 @@ class crm_lead(osv.osv, crm_case):
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
-        'partner_name': fields.char("Contact Name", size=64),
+        'partner_name': fields.char("Partner Name", size=64),
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6dca97098df..4bb6a2ef678 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -68,7 +68,7 @@
                 <page string="Lead">
                     <group colspan="2" col="4">
                         <separator string="Contact" colspan="4" col="4"/>
-                        <field name="partner_name" string="Contact Name" colspan="4"/>
+                        <field name="partner_name" string="Partner Name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
                         <field name="function_name" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 429bfa39368..75243f506be 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -119,7 +119,7 @@
                             <separator colspan="2" string="Visibility"/>
                             <field name="class" string="Privacy"/>
                             <field name="show_as" string="Show time as" groups="base.group_extended"/>
-                            <field name="rrule" groups="base.group_extended" />
+                            <field name="rrule" invisible="1" />
                             <field name="recurrent_id" invisible="1"/>
                             <field name="recurrent_uid" invisible="1"/>
                         </group>
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 0128ffd51bd..22eb2e62d0d 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -152,7 +152,6 @@ class crm_opportunity(osv.osv):
             }
             value = {
                 'name': _('Meetings'),
-                'domain': "[('user_id','=',%s),('opportunity_id','=',%s)]" % (uid,opp.id),
                 'context': context,
                 'view_type': 'form',
                 'view_mode': 'calendar,form,tree',
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index bb8e60d1fb1..ccfd02b6309 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -44,7 +44,13 @@ class crm_phonecall(osv.osv, crm_case):
                                  domain="[('partner_id','=',partner_id)]"), 
         'company_id': fields.many2one('res.company', 'Company'), 
         'description': fields.text('Description'), 
-        'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
+        'state': fields.selection([
+                                    ('draft', 'Draft'), 
+                                    ('open', 'Todo'), 
+                                    ('cancel', 'Cancelled'), 
+                                    ('done', 'Closed'), 
+                                    ('pending', 'Pending'),
+                                ], 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e0d3447b8b5..f4cecbe508f 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -146,7 +146,7 @@ Leads Could not convert into Opportunity"))
         res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
         for lead in lead_obj.browse(cr, uid, data, context=context):
             if 'name' in fields:
-                res.update({'name': lead.partner_name})
+                res.update({'name': lead.name})
             if 'partner_id' in fields:
                 res.update({'partner_id': lead.partner_id.id or False})
         return res
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 267c3296844..a824f279e28 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -86,6 +86,7 @@ class crm_lead2partner(osv.osv_memory):
                 res.update({'partner_id': partner_id})
             if 'action' in fields:
                 res.update({'action': partner_id and 'exist' or 'create'})
+
         return res
     
     def open_create_partner(self, cr, uid, ids, context=None):
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index 53d4f1b5476..ee6c1522e22 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -46,7 +46,7 @@
        <act_window id="action_crm_lead2partner"
             key2="client_action_multi" name="Create a Partner"
             res_model="crm.lead2partner" src_model="crm.lead"
-            view_id="view_crm_lead2partner_create"
+            view_id="view_crm_lead2partner_create" 
             view_mode="form" target="new" view_type="form" />
 
      </data>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index 9eb243603e9..9b9464eea3d 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -93,7 +93,8 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 'view_id': False,
                 'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
                 'type': 'ir.actions.act_window',
-                'res_id': phonecall_id
+                'res_id': phonecall_id, 
+                'search_view_id': res['res_id']
                 }
         return res
 

From a278c1f5d024c63d80e5c1ea733bd0c59222f641 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Fri, 7 May 2010 05:02:41 +0100
Subject: [PATCH 094/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100506040342-tsc4nnunicvyommo
bzr revid: codehost@crowberry-20100507040241-rzkw5vmms32t1l3q
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 debian/po/cs.po               | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 5d0cf33b263..bb79c90852d 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-05-03 14:18+0000\n"
+"PO-Revision-Date: 2010-05-06 04:37+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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-07 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 915a0dbb692..d04e86ad4d3 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-05-03 14:46+0000\n"
+"PO-Revision-Date: 2010-05-06 04:36+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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-07 04:02+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 471b33dab46..cf89b1b61d9 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-05-03 14:48+0000\n"
+"PO-Revision-Date: 2010-05-06 04:38+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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-07 04:02+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 6badbbdeaac..afa3de370ea 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-05-03 14:29+0000\n"
+"PO-Revision-Date: 2010-05-06 04:38+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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-07 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 106f1cfe8d3..6699f6e1f8f 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-05-03 14:47+0000\n"
+"PO-Revision-Date: 2010-05-06 04:38+0000\n"
 "Last-Translator: OpenERP Administrators <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-05-05 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-05-07 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/debian/po/cs.po b/debian/po/cs.po
index f6d691faf4c..c0f45698dba 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
 "POT-Creation-Date: 2009-08-24 22:41+0300\n"
-"PO-Revision-Date: 2009-11-26 07:45+0000\n"
-"Last-Translator: Vitezslav Kotrla <vitezslav.kotrla@gmail.com>\n"
+"PO-Revision-Date: 2010-05-06 04:36+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.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-04-17 03:53+0000\n"
+"X-Launchpad-Export-Date: 2010-05-07 04:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Type: string
 #. Description
 #: ../openerp-server.templates:1001
 msgid "Dedicated system account for the Open ERP server:"
-msgstr "Vyhrazený systémový účet, pod kterým bude běžet Open ERP server:"
+msgstr "Vyhrazený systémový účet, pod kterým poběží Open ERP server:"
 
 #. Type: string
 #. Description

From fea00d94296fd6d0511e5165e070c4acc61acab0 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 7 May 2010 15:50:02 +0200
Subject: [PATCH 095/146] [FIX]orm: invisible fields with widget=selection must
 have at least the default value into the selection

lp bug: https://launchpad.net/bugs/575748 fixed

bzr revid: chs@openerp.com-20100507135002-78s6p0rwccu1vrdd
---
 bin/osv/orm.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 133f6cdda68..6a96f22ff40 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1153,12 +1153,8 @@ class orm_template(object):
         def check_group(node):
             if node.get('groups'):
                 groups = node.get('groups').split(',')
-                can_see = False
                 access_pool = self.pool.get('ir.model.access')
-                for group in groups:
-                    can_see = can_see or access_pool.check_groups(cr, user, group)
-                    if can_see:
-                        break
+                can_see = any(access_pool.check_groups(cr, user, group) for group in groups)
                 if not can_see:
                     node.set('invisible', '1')
                     if 'attrs' in node.attrib:
@@ -1199,7 +1195,8 @@ class orm_template(object):
                     column = False
 
                 if column:
-                    relation = column._obj
+                    relation = self.pool.get(column._obj)
+
                     childs = False
                     views = {}
                     for f in node:
@@ -1207,7 +1204,7 @@ class orm_template(object):
                             node.remove(f)
                             ctx = context.copy()
                             ctx['base_model_name'] = self._name
-                            xarch, xfields = self.pool.get(relation).__view_look_dom_arch(cr, user, f, view_id, ctx)
+                            xarch, xfields = relation.__view_look_dom_arch(cr, user, f, view_id, ctx)
                             views[str(f.tag)] = {
                                 'arch': xarch,
                                 'fields': xfields
@@ -1215,7 +1212,13 @@ class orm_template(object):
                     attrs = {'views': views}
                     if node.get('widget') and node.get('widget') == 'selection':
                         if not check_group(node):
-                            attrs['selection'] = []
+                            # the field is just invisible. default value must be in the selection
+                            name = node.get('name')
+                            default = self.default_get(cr, user, [name], context=context).get(name)
+                            if default:
+                                attrs['selection'] = relation.name_get(cr, 1, default, context=context)
+                            else:
+                                attrs['selection'] = []
                         # We can not use the 'string' domain has it is defined according to the record !
                         else:
                             dom = []
@@ -1223,7 +1226,7 @@ class orm_template(object):
                                 dom = column._domain
                             dom += eval(node.get('domain','[]'), {'uid':user, 'time':time})
                             context.update(eval(node.get('context','{}')))
-                            attrs['selection'] = self.pool.get(relation)._name_search(cr, user, '', dom, context=context, limit=None, name_get_uid=1)
+                            attrs['selection'] = relation._name_search(cr, user, '', dom, context=context, limit=None, name_get_uid=1)
                             if (node.get('required') and not int(node.get('required'))) or not column.required:
                                 attrs['selection'].append((False,''))
                 fields[node.get('name')] = attrs

From 588679134e2302e5b824655b6364798743aed501 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 7 May 2010 16:20:25 +0200
Subject: [PATCH 096/146] [IMP] users: add constraint on company

bzr revid: chs@openerp.com-20100507142025-g5p6vwunthtrdm4q
---
 bin/addons/base/base_data.xml              |  9 ++++++++-
 bin/addons/base/res/res_user.py            | 17 ++++++++++++++++-
 bin/addons/base/security/base_security.xml | 12 ------------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 411a40571d9..ca211b4a6d5 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1046,9 +1046,16 @@
             <test expr="currency_id.code == 'eur'.upper()"/>
             <test expr="name">OpenERP S.A.</test>
         </assert>
-        <record id="user_admin" model="res.users">
+
+        <record model="res.users" id="base.user_root">
+            <field name="signature">Administrator</field>
+            <field name="address_id" ref="main_address"/>
             <field name="company_id" ref="main_company"/>
+            <field name="company_ids" eval="[(4, ref('main_company'))]"/>
+            <field name="action_id" ref="action_menu_admin"/>
+            <field name="menu_id" ref="action_menu_admin"/>
         </record>
+
         <record id="main_partner" model="res.partner">
             <field name="company_id" ref="main_company"/>
         </record>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index fe67848de6a..341680a23ac 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -210,6 +210,14 @@ class users(osv.osv):
                 result = map(override_password, result)
         return result
 
+
+    def _check_company(self, cr, uid, ids, context=None):
+        return all(this.company_id in this.company_ids for this in self.browse(cr, uid, ids, context))
+
+    _constraints = [
+        (_check_company, 'The chosen company is not in the allowed companies', ['company_id', 'company_ids']),
+    ]
+
     _sql_constraints = [
         ('login_key', 'UNIQUE (login)',  _('You can not have two users with the same login !'))
     ]
@@ -225,13 +233,19 @@ class users(osv.osv):
         ids = self.pool.get('ir.ui.menu').search(cr, uid, [('usage','=','menu')])
         return ids and ids[0] or False
 
-    def _get_company(self,cr, uid, context={}, uid2=False):
+    def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
             uid2 = uid
         user = self.pool.get('res.users').read(cr, uid, uid2, ['company_id'], context)
         company_id = user.get('company_id', False)
         return company_id and company_id[0] or False
 
+    def _get_companies(self, cr, uid, context=None):
+        c = self._get_company(cr, uid, context)
+        if c:
+            return [c]
+        return False
+
     def _get_menu(self,cr, uid, context={}):
         ids = self.pool.get('ir.actions.act_window').search(cr, uid, [('usage','=','menu')])
         return ids and ids[0] or False
@@ -247,6 +261,7 @@ class users(osv.osv):
         'menu_id': _get_menu,
         'action_id': _get_menu,
         'company_id': _get_company,
+        'company_ids': _get_companies,
         'groups_id': _get_group,
         'address_id': False,
     }
diff --git a/bin/addons/base/security/base_security.xml b/bin/addons/base/security/base_security.xml
index 1059cf4da37..ba5ea19a6c8 100644
--- a/bin/addons/base/security/base_security.xml
+++ b/bin/addons/base/security/base_security.xml
@@ -29,18 +29,6 @@
         <field name="name">Useability / No One</field>
     </record>
 
-<!--
- Users
--->
-    <record model="res.users" id="base.user_root">
-        <field name="signature">Administrator</field>
-        <field name="address_id" ref="main_address"/>
-        <field name="company_id" ref="main_company"/>
-        <field name="action_id" ref="action_menu_admin"/>
-        <field name="menu_id" ref="action_menu_admin"/>
-    </record>
-
-
     <!-- Set accesses to menu -->
     <record model="ir.ui.menu" id="base.menu_administration">
         <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>

From 06fc5d044ae3b6fead721de48e8b79e20746f3e5 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 10 May 2010 05:17:35 +0100
Subject: [PATCH 097/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100508040441-r9t4df5jqzdlvz1v
bzr revid: codehost@crowberry-20100510041735-7t4pk39t2xknzuw4
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index bb79c90852d..f7b0aedf294 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-05-06 04:37+0000\n"
+"PO-Revision-Date: 2010-05-10 03:56+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-05-07 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index d04e86ad4d3..49d9e44349e 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-05-06 04:36+0000\n"
+"PO-Revision-Date: 2010-05-10 03:55+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-05-07 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+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 cf89b1b61d9..2cff8bb8fb9 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-05-06 04:38+0000\n"
+"PO-Revision-Date: 2010-05-10 03:54+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-05-07 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+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 afa3de370ea..52ab660bb1f 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-05-06 04:38+0000\n"
+"PO-Revision-Date: 2010-05-10 03:57+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-05-07 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 6699f6e1f8f..28a775138c4 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-05-06 04:38+0000\n"
+"PO-Revision-Date: 2010-05-10 03:56+0000\n"
 "Last-Translator: OpenERP Administrators <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-05-07 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From 84d8d9e1f54f56996f3b4ca6e0769236e5d86d2d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 May 2010 10:50:57 +0530
Subject: [PATCH 098/146] [IMP]: Improvement in views for log name

bzr revid: rpa@tinyerp.com-20100510052057-6s0c3c6zugcli36w
---
 addons/crm/crm_opportunity_view.xml             |  7 ++++++-
 addons/crm_claim/crm_claim_view.xml             |  9 +++++++--
 addons/crm_fundraising/crm_fundraising_view.xml |  7 ++++++-
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 17 +++++++++++------
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3d81a17d7e0..3c3e76f89ac 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -153,7 +153,12 @@
                     <field name="ref"/>
                     <field name="ref2"/>
                     <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
+                    	 <tree string="Logs">
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </tree>
+                        <form string="Logs">
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 837987e661a..76ea81ca2ce 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -157,11 +157,16 @@
                     <field name="create_date"/>
                     <field name="date_closed"/>
                     <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
+                        <tree string="Logs">
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </tree>
+                        <form string="Logs">
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
-                            <field name="user_id"/>                            
+                            <field name="user_id"/>
                         </form>
                     </field>
                 </page>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index af6c37a7041..f826cadfb8e 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -170,7 +170,12 @@
                     <field name="ref2" colspan="4"/>
 
                     <field name="log_ids" nolabel="1" colspan="4">
-                        <form string="Actions">
+                        <tree string="Logs">
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </tree>
+                        <form string="Logs">
                             <separator string="Action Information" colspan="4"/>
                             <field name="name" colspan="4"/>
                             <field name="date"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 03f3d989da1..33fc24b1548 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -100,12 +100,17 @@
                         <field colspan="4" name="ref"/>
                         <field colspan="4" name="ref2"/>
                         <field colspan="4" name="log_ids" nolabel="1">
-                            <form string="Actions">
-                                <separator colspan="4" string="Action Information"/>
-                                <field colspan="4" name="name"/>
-                                <field name="date"/>
-                                <field name="user_id"/>
-                            </form>
+                            <tree string="Logs">
+	                            <field name="name" colspan="4"/>
+	                            <field name="date"/>
+	                            <field name="user_id"/>
+	                        </tree>
+	                        <form string="Logs">
+	                            <separator string="Action Information" colspan="4"/>
+	                            <field name="name" colspan="4"/>
+	                            <field name="date"/>
+	                            <field name="user_id"/>
+	                        </form>
                         </field>
                     </page>
                     <page string="Emails" groups="base.group_extended">

From 175db1efdbea0d6863be63ae427a2893bb68dd37 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 10 May 2010 11:16:20 +0530
Subject: [PATCH 099/146] [IMP,MOD] Usability changes in stock module

bzr revid: vir@tinyerp.com-20100510054620-33vdfnz6exvr91ll
---
 addons/delivery/delivery_view.xml             |  8 ++-
 addons/mrp/mrp_view.xml                       |  2 +-
 addons/product/product.py                     |  8 +--
 .../report/report_stock_picking_view.xml      |  2 +-
 addons/stock/stock.py                         |  2 +-
 addons/stock/stock_demo.xml                   |  2 +-
 addons/stock/stock_report.xml                 |  2 +-
 addons/stock/stock_view.xml                   | 69 +++++++++++--------
 8 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 16f4a61ed1e..a80b8946bd5 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -61,14 +61,16 @@
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
                     <field name="carrier_id" select="1"/>
-                    <field name="sequence" select="1"/>
+                    <field name="sequence" groups="base.group_extended" select="1"/>
                     <notebook colspan="4">
                         <page string="Grid definition">
                             <field colspan="4" name="line_ids" nolabel="1" select="1"/>
                         </page>
                         <page string="Destination">
-                            <field colspan="4" name="country_ids"/>
-                            <field colspan="4" name="state_ids"/>
+                        	<separator colspan="4" string="Countries"/>
+                            <field colspan="4" name="country_ids" nolabel="1"/>
+                            <separator colspan="4" string="States"/>
+                            <field colspan="4" name="state_ids" nolabel="1"/>
                             <field name="zip_from"/>
                             <field name="zip_to"/>
                         </page>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5b8b7c41084..673332a1d3f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -953,7 +953,7 @@
                         <field name="name" select="1" />
                         <field name="warehouse_id" select="1" widget="selection"/>
                         <field name="location_id" select="1" />
-                        <field name="company_id" select="1" widget="selection"/>
+<!--                        <field name="company_id" select="1" widget="selection"/>-->
                         <field name="product_id" select="1"/>
                     </group>
                     <newline/>
diff --git a/addons/product/product.py b/addons/product/product.py
index b21ebe5ee3a..e8a226597e7 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -210,11 +210,11 @@ class product_category(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'),
     }
-    
+
     _defaults = {
         'type' : lambda *a : 'normal',
     }
-    
+
     _order = "sequence"
     def _check_recursion(self, cr, uid, ids):
         level = 100
@@ -274,7 +274,7 @@ class product_template(osv.osv):
         'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
         'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
-        'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
+        'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
         'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
             help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM.'),
@@ -551,7 +551,7 @@ class product_product(osv.osv):
                 price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id
                 res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id,
                     context['currency_id'], res[product.id],context=context)
-                
+
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index 5d54634d72b..d4116313a7e 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -63,7 +63,7 @@
 						<field name="partner_id"/>
 						<field name="reference" />
 						<field name="origin" />
-						<field name="type" />
+						<field name="type" groups="base.group_extended"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="5">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d28effc83c0..94b56079527 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -491,7 +491,7 @@ class stock_picking(osv.osv):
         'date_done': fields.datetime('Date Done', help="Date of completion"),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
-        'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+        'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True),
         'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index de4eccdde55..4f14834a648 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -186,7 +186,7 @@
 
         <!--  Multi Company -->
 
-         <record id="res_partner_tinyshop0" model="res.partner">
+        <record id="res_partner_tinyshop0" model="res.partner">
             <field eval="0" name="customer"/>
             <field eval="0" name="supplier"/>
             <field eval="1" name="active"/>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 7b8d9eb13b3..60de8d1f74f 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -4,7 +4,7 @@
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
         <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
-        <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml"/>
+        <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
         <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/>
         <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/>
     </data>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ceac7a8e603..05fe10fe98e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -54,6 +54,11 @@
                         <field name="date" select="1" />
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="4" col="4">
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
                 </search>
 
             </field>
@@ -403,7 +408,7 @@
                     <field name="account_id" select="1" groups="base.group_extended"/>
                     <field name="location_id"/>
                     <field name="address_id" context="{'contact_display':'partner'}"/>
-                    <field name="icon"/>
+                    <field name="icon" groups="base.group_extended"/>
                     <newline/>
                     <group col="2" colspan="2" groups="base.group_extended">
                         <separator string="Chained Locations" colspan="2"/>
@@ -487,7 +492,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_location_tree"/>
         </record>
-        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" sequence="20"/>
+        <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended" sequence="20"/>
 
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>
@@ -576,7 +581,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
@@ -594,10 +599,10 @@
                 <form string="Picking list">
                     <group colspan="4" col="6">
                         <field name="name" select="1" readonly="1"/>
-                        <field name="address_id" select="1" context="{'contact_display' : 'partner'}"/>
+<!--                        <field name="address_id" select="1" context="{'contact_display' : 'partner'}" groups="base.group_extended"/>-->
                         <field name="origin"/>
-                        <field name="backorder_id" readonly="1"/>
-                        <field name="date" />
+                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>
+                        <field name="date"/>
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@@ -727,7 +732,7 @@
                 <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id" select="1"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date" select="1"/>
                     <field name="min_date" select="1"/>
@@ -747,7 +752,7 @@
                         <field name="name" select="1" readonly="1"/>
                         <field name="address_id" select="1"/>
                         <field name="origin"/>
-                        <field name="backorder_id" readonly="1"/>
+                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>
                         <field name="date" />
                         <field name="min_date" select="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@@ -904,7 +909,7 @@
                 <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
@@ -1029,13 +1034,14 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
-                        <field name="company_id" select="1" widget="selection"/>
+<!--                        <field name="company_id" select="1" widget="selection"/>-->
                    </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
                     </group>
                 </search>
             </field>
@@ -1078,11 +1084,11 @@
                 <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
                     <field name="address_id"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
-                    <field name="invoice_state"/>
+                    <field name="invoice_state" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
@@ -1097,10 +1103,11 @@
                 <form string="Input Picking List">
                     <group colspan="4" col="6">
                         <field name="name" readonly="1" select="1"/>
-                        <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}"/>
+                        <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" />
                         <field name="origin"/>
-                        <field name="backorder_id" readonly="1"/>
+                        <field name="backorder_id" readonly="1" groups="base.group_extended"/>
                         <field name="date"/>
+                        <field name="type"/>
                         <field name="min_date" readonly="1"/>
                         <field name="invoice_state" string="Invoice Control"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@@ -1111,7 +1118,7 @@
                                 <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
-                                    <field name="product_uom"/>
+                                    <field name="product_uom" string="Product Unit of Measure"/>
                                     <field name="location_dest_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="state"/>
@@ -1194,8 +1201,8 @@
                 <search string="Input Picking List">
                     <group col="8" colspan="4">
                         <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
-                        <separator orientation="vertical"/>
-                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
+                        <separator orientation="vertical" />
+                        <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
@@ -1203,8 +1210,13 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
+                    	<filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
                     </group>
                 </search>
@@ -1257,8 +1269,10 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
-                        <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+						<filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
+                        <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
                     </group>
                 </search>
@@ -1275,7 +1289,7 @@
             <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" groups="base.group_extended" sequence="2"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
@@ -1314,8 +1328,8 @@
                                 <field name="name"/>
                                 <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                <field name="product_uom"/>
-                                <field name="product_uos"/>
+                                <field name="product_uom" string="Unit Of Measure"/>
+                                <field name="product_uos" groups="base.group_extended"/>
                             </group>
 
                             <group colspan="2" col="2">
@@ -1368,7 +1382,6 @@
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
                         <filter icon="terp-stock" string="Available" domain="[('state','=','done')]" help="Done"/>
-                        <filter icon="terp-stock" string="Available" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future"/>
                         <separator orientation="vertical"/>
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
@@ -1376,10 +1389,12 @@
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
+                    	<filter icon="terp-stock" string="Inventory" domain="[]" context="{'group_by':'name'}" />
+                    	<filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
+                        <filter string="Source Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
+                        <filter string="Dest. Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-                        <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/>
-                        <filter string="Destination Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
                     </group>
                 </search>
             </field>
@@ -1414,7 +1429,7 @@
                     <field name="product_uom" string="UOM"/>
                     <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
-                    <field name="backorder_id"/>
+                    <field name="backorder_id" groups="base.group_extended"/>
                     <field name="state"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/>
                     <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>

From 97f1dd1dece7d8a1265a6c227f257c2080e4a657 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 10 May 2010 11:26:10 +0530
Subject: [PATCH 100/146] [IMP]:gk contact form

bzr revid: nch@tinyerp.com-20100510055610-42b6m381dmai1vln
---
 addons/base_setup/gtk_contact_form.xml | 46 ++++++++++++--------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index b220db020c6..c4fe08207dd 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -14,7 +14,7 @@
 	            <attribute name="string">Information about you and the company you are related too. The Basic information related to the company has already been collected and some more information required by you to fill.</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="title"]' position='attributes'>
-	          	  <attribute name='string'>About You</attribute>
+	          	  <attribute name='string'>Do You Need Them ?</attribute>
 	          	  <attribute name='colspan'>4</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
@@ -22,8 +22,15 @@
 	          	  <attribute name='string'></attribute>
 	      </xpath>
           <group string="res_config_contents" position="replace">
-          	<group colspan="4">
-          		<group colspan="2">
+          	<group colspan="4" height="450" width="600">
+          	 	<group colspan="4">
+		            <field name="ebook" nolabel="1"/>
+		            <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/>
+		            <field name="updates" nolabel="1"/>
+		            <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/>
+		       </group>
+          		<group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
+          		 	<separator colspan="4" string="About You"/>
 	            	<field name="name" colspan="2" required="True"/>
 	            	<field name="job" colspan="2"/>
 		            <field name="email" colspan="2"/>
@@ -31,31 +38,20 @@
 		            <field name="total_employees" colspan="2"/>
 		            <field name="industry" colspan="2"/>
 		        </group>
-		        <newline/>
-		        <group colspan="4">
+		        <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
 		            <separator string="Your projects with OpenERP" colspan="4"/>
-		            <field name="use_openerp" colspan="1"/>
-		            <field name="already_using_openerp" colspan="1"/>
-		            <field name="sell_openerp" colspan="1"/>
-		            <field name="already_selling__openerp" colspan="1"/>
-		       </group>
-		       <group colspan="4">
+		            <field name="use_openerp" align="0.0"  colspan="1"/>
+		            <field name="already_using_openerp" align="0.0"  colspan="1"/>
+		            <field name="sell_openerp" align="0.0"  colspan="1"/>
+		            <field name="already_selling__openerp" align="0.0" colspan="1"/>
 		            <separator colspan="4" string="You would like to know more about"/>
-		            <field name="features" colspan="1"/>
-		            <field name="saas" colspan="1"/>
-		            <field name="partners_program" colspan="1"/>
-		            <field name="support" colspan="1"/>
-		            <field name="training" colspan="1"/>
-		            <field name="other" colspan="1"/>
+		            <field name="features" align="0.0" colspan="1"/>
+		            <field name="training" align="0.0" colspan="1"/>
+		            <field name="saas" align="0.0" colspan="1"/>
+		            <field name="support" align="0.0" colspan="1"/>
+		            <field name="partners_program" align="0.0" colspan="1"/>
+		            <field name="other" align="0.0" colspan="1"/>
 		       </group>
-			 <group colspan="2">
-		       		<separator colspan="4" string="Do You Need Them ?"/>
-		            <field name="ebook" nolabel="1" colspan="1"/>
-		            <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="1"/>
-		            <newline/>
-		            <field name="updates" nolabel="1" colspan="1"/>
-		            <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="1"/>
-	        	</group>
 	       </group>
 	       </group>
         </data>

From 4dc71f9289dcb4dc6e8415ea384b32b1b4513781 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 10 May 2010 12:36:07 +0530
Subject: [PATCH 101/146] [IMP]:onchange for progress bar

bzr revid: nch@tinyerp.com-20100510070607-aavusx9nv7vgybia
---
 addons/base_setup/base_setup_installer.xml | 20 ++++++++++----------
 addons/base_setup/installer.py             |  5 +++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 155e934de5f..5419e5d6590 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -24,17 +24,17 @@ If you don't think you need any of these right now, you can easily install them
             <attribute name="string">Install Generic Modules</attribute>
           </separator>
           <group colspan="8">
-            <field name="crm"/> <field name="sale"/>
-            <field name="project"/> <field name="knowledge"/>
-            <field name="stock"/> <field name="mrp"/>
-            <field name="account"/> <field name="purchase"/>
-            <field name="hr"/> <field name="point_of_sale" groups="base.group_extended"/>
-            <field name="marketing" groups="base.group_extended"/> <field name="misc_tools"/>
-            <field name="report_designer" groups="base.group_extended"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)" groups="base.group_extended"/>
+            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)" groups="base.group_extended"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
             <separator string="Install Specific Business Modules" colspan="4"/>
-            <field name="profile_association"/>
-            <field name="profile_auction"/>
-            <field name="profile_bookstore"/>
+            <field name="profile_association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="profile_auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
+            <field name="profile_bookstore" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/>
           </group>
         </data>
       </field>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index e38e2009e75..5b6bd4107f0 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -91,6 +91,11 @@ class base_setup_installer(osv.osv_memory):
         'crm': True,
         }
 
+
+    def onchange_moduleselection(self, cr, uid, ids, *args):
+        progress = self._progress(cr, uid) - (2.5 * len(filter(lambda x: x==1, args)))
+        return {'value':{'progress':progress}}
+
     def modules_to_install(self, cr, uid, ids, context=None):
         modules = super(base_setup_installer, self).modules_to_install(cr, uid, ids, context=context)
         interface_id = self.pool.get('res.config.view').search(cr, uid, [])

From 0b3051c1706d8aae0358bf76a2ad6279f3cee9b2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 May 2010 12:37:03 +0530
Subject: [PATCH 102/146] [IMP]: crm: Usability Improvements in search views
 and filters

bzr revid: rpa@tinyerp.com-20100510070703-15tllshsqgyguq82
---
 addons/crm/crm_lead_menu.xml                  |  5 ++
 addons/crm/crm_lead_view.xml                  |  4 +-
 addons/crm/crm_meeting.py                     |  6 +-
 addons/crm/crm_meeting_menu.xml               | 86 ++-----------------
 addons/crm/crm_meeting_view.xml               | 24 +++++-
 addons/crm/crm_opportunity_menu.xml           |  6 ++
 addons/crm/crm_opportunity_view.xml           |  4 +-
 addons/crm/crm_phonecall.py                   |  1 +
 addons/crm/crm_phonecall_view.xml             |  2 +-
 .../wizard/crm_phonecall_to_opportunity.py    |  1 -
 addons/crm_claim/crm_claim_view.xml           |  4 +-
 addons/crm_fundraising/crm_fundraising.py     |  1 +
 .../crm_fundraising/crm_fundraising_menu.xml  |  1 +
 .../crm_fundraising/crm_fundraising_view.xml  | 37 +++++---
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  2 +-
 15 files changed, 80 insertions(+), 104 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 9e121a1d561..d4d182a2dc5 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,13 +9,16 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
+        <field name="context">{'search_default_current':1}</field>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
@@ -25,6 +28,8 @@
 
     <menuitem id="base.menu_sales" name="Sales"
         parent="base.menu_base_partner" sequence="1" />
+        
+
     <menuitem parent="base.menu_sales" name="Leads"
         groups="base.group_extended"
         id="menu_crm_case_categ0_act_leads"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4bb6a2ef678..b6d8ae2ed51 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -270,7 +270,7 @@
             <search string="Search Leads">
                 <filter icon="terp-project"
                     string="Current"
-                    default="1"
+                    default="1" name="current"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
                     string="Open"
@@ -313,7 +313,7 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="14">
+                <group expand="0" string="Group By..." colspan="14">
                     <filter string="Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="State" icon="terp-crm" domain="[]" context="{'group_by':'state'}"/>
                     <filter string="Source" icon="terp-crm" domain="[]" context="{'group_by':'categ_id'}"/>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 38cfba16a6b..30baebaec53 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -55,7 +55,8 @@ class crm_meeting(osv.osv, crm_case):
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
-        
+        'id': fields.integer('ID'),
+
         # Meeting fields
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Type', \
                         domain="[('object_id.model', '=', 'crm.meeting')]", \
@@ -74,7 +75,8 @@ class crm_meeting(osv.osv, crm_case):
     }
 
     _defaults = {
-        'state': lambda *a: 'draft',
+        'state': lambda *a: 'draft', 
+        'active': lambda *a: 1, 
     }
 
     def open_meeting(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3fd8a37d05e..562274ee301 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -12,7 +12,6 @@
         domain="[('partner_id', '=', active_id)]"
     />
 
-
     <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">
         <field name="context" eval="{'default_state':'draft'}"/>
     </record>
@@ -24,18 +23,21 @@
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_partner">
         <field name="sequence" eval="2"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_partner">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
+
 	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
         <field name="sequence" eval="3"/>
         <field name="view_mode">gantt</field>
@@ -43,68 +45,36 @@
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
 
-	<act_window
-        id="crm_case_categ_meet_case"
-        name="Schedule a Meeting"
-        res_model="crm.meeting"
-        src_model="mailgate.thread"
-        view_mode="calendar,tree,form,gantt"
-        context="{'default_case_id': active_id, 'default_duration': 4.0}"
-        />
-
-    <record model="ir.actions.act_window" id="crm_case_categ_meet_case">
-        <field name="context" eval="{'default_state':'draft'}"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_case">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet_case">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_meet_case">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_case">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_categ_meet_case"/>
-    </record>
-
     <record model="ir.actions.act_window" id="crm_case_categ_meet">
+        <field name="name">Meetings</field>
         <field name="res_model">crm.meeting</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
+        <field name="context">{'search_default_current':1}</field>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
         <field name="view_mode">calendar</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_meet">
         <field name="sequence" eval="2"/>
         <field name="view_mode">tree</field>
         <field name="view_id" ref="crm_case_tree_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_form__meet">
         <field name="sequence" eval="3"/>
         <field name="view_mode">form</field>
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet"/>
     </record>
+
     <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet">
         <field name="sequence" eval="1"/>
         <field name="view_mode">gantt</field>
@@ -136,43 +106,5 @@
 			name="Meeting Invitations" parent="crm.menu_meeting_sale"
 			sequence="10" action="action_view_attendee_form" />
 
-
-    <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
-        <field name="name">Next Meetings</field>
-        <field name="res_model">crm.meeting</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar,form,gantt</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="domain"
-        	eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]" />
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_meetall3">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_meetall3">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
-
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_view_meetall3">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">gantt</field>
-        <field name="view_id" ref="crm_case_gantt_view_meet"/>
-        <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
-    </record>
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 75243f506be..14693086e4a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -263,12 +263,12 @@
         <field name="arch" type="xml">
                 <search string="Search Meetings">
                        <group col="12" colspan="4">
-                           <filter icon="terp-crm" string="My Meetings"
+                       		<filter icon="terp-project" name="current" string="Current"
+	                           domain="[('state','in',('draft', 'open'))]"
+	                           help="Current Meetings"/>
+                           <filter icon="terp-partner" string="My Meetings"
                                domain="[('user_id','=',uid)]"
                                help="My Meetings" />
-                           <filter icon="terp-crm" name="current" string="Current"
-                           domain="[('state','in',('draft', 'open'))]"
-                           help="Current Meetings"/>
                            <separator orientation="vertical"/>
                            <field name="name" select="1" string="Subject"/>
                            <field name="partner_id" select="1" />
@@ -280,6 +280,22 @@
                            </field>
                            <field name="user_id" select="1" widget="selection"/>
                        </group>
+                       <newline/>
+						<group expand="0" string="Group By..." colspan="16">
+							<filter string="Date" icon="terp-project"
+						        domain="[]" context="{'group_by':'date'}" />
+						    <filter string="Privacy" icon="terp-crm"
+						        domain="[]" context="{'group_by':'class'}" />
+						    <separator orientation="vertical" />
+						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						        context="{'group_by':'user_id'}" />
+						    <filter string="Partner" icon="terp-partner" domain="[]"
+						        context="{'group_by':'partner_id'}" />
+						    <separator orientation="vertical" />
+						    <filter string="State" icon="terp-crm" domain="[]"
+						        context="{'group_by':'state'}" />
+						    <separator orientation="vertical" />
+						</group>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 1616520028e..cfce1a6aa9a 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -27,29 +27,35 @@
           <field name="res_model">crm.lead</field>
           <field name="view_mode">tree,form,graph</field>
           <field name="domain">[('type','=','opportunity')]</field>
+          <field name="context">{'search_default_current':1}</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
      </record>
+
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
           <field name="sequence" eval="1"/>
           <field name="view_mode">tree</field>
           <field name="view_id" ref="crm_case_tree_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
+
      <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_oppor11">
           <field name="sequence" eval="2"/>
           <field name="view_mode">form</field>
           <field name="view_id" ref="crm_case_form_view_oppor"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
+
      <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_oppor11">
           <field name="sequence" eval="4"/>
           <field name="view_mode">graph</field>
           <field name="view_id" ref="crm_case_graph_view_opportunity"/>
           <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
      </record>
+
      <menuitem id="base.menu_sales" name="Sales"
      	parent="base.menu_base_partner" sequence="1" />
+
      <menuitem name="Opportunities" id="menu_crm_case_opp"
      	parent="base.menu_sales" action="crm_case_category_act_oppor11"
      	sequence="2" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3c3e76f89ac..3e7d6ac119b 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -274,7 +274,7 @@
             <search string="Search Opportunities">
                 <filter icon="terp-project"
                     string="Current"
-                    default="1"
+                    name="current"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-project"
                     string="Open"
@@ -311,7 +311,7 @@
                         help="My section" />
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="16">
+                <group expand="0" string="Group By..." colspan="16">
                     <filter string="Stage" icon="terp-crm" domain="[]"
                         context="{'group_by':'stage_id'}" />
                     <filter string="Priority" icon="terp-crm" domain="[]"
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index ccfd02b6309..96232677cc0 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -84,6 +84,7 @@ class crm_phonecall(osv.osv, crm_case):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0], 
         'state': lambda *a: 'draft', 
+        'active': lambda *a: 1, 
     }
     
     # From crm.case
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a8941ccce6f..e11ef95e442 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -277,7 +277,7 @@
                        help="My section" />
                </field>
                <newline/>
-               <group expand="1" string="Group By..." colspan="4">
+               <group expand="0" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"
                        context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-crm"
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 231b3625722..453a4098926 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -97,7 +97,6 @@ Call Could not convert into Opportunity"))
                                 'type': 'opportunity', 
                                 'phone': case.partner_phone or False,
                             })
-                new_opportunity = opp_obj.browse(cr, uid, new_opportunity_id)
                 vals = {
                             'partner_id': this.partner_id.id,
                             'opportunity_id' : new_opportunity_id,
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 76ea81ca2ce..2b9148083b3 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -251,7 +251,7 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                    <filter icon="gtk-new" string="Current"
-                       domain="[('state','in',('draft', 'open'))]"
+                       domain="[('state','in',('draft', 'open'))]" name="current"
                        separator="1" help="Current Claims" default="1"
                    />
                    <filter icon="gtk-execute"
@@ -283,7 +283,7 @@
                            help="My section" />
                    </field>
                    <newline/>
-                   <group expand="1" string="Group By..." colspan="10" col="20">
+                   <group expand="0" string="Group By..." colspan="10" col="20">
                        <filter string="Deadline" icon="terp-crm"
                            domain="[]"
                            context="{'group_by':'date_deadline'}" />
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 3790985075c..adc34900a89 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -31,6 +31,7 @@ class crm_fundraising(osv.osv, crm.crm_case):
     _inherit ='mailgate.thread'
 
     _columns = {
+            'id': fields.integer('ID'), 
             'name': fields.char('Name', size=128, required=True), 
             'description': fields.text('Description'), 
             'create_date': fields.datetime('Creation Date' , readonly=True), 
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index eab0603c446..9a8d6dee46f 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -12,6 +12,7 @@
         <field name="name">Funds</field>
         <field name="res_model">crm.fundraising</field>
         <field name="view_mode">tree,form,graph</field>
+        <field name="context">{"search_default_current":1}</field>
         <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
         <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
     </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index f826cadfb8e..963526e148f 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -60,7 +60,6 @@
         <field name="arch" type="xml">
             <tree string="Funds Tree"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="id" />
                 <field name="name" string="Fund Description" />
                 <field name="categ_id" />
                 <field name="type_id" string="Payment Mode" />
@@ -68,6 +67,7 @@
                 <field name="probability" />
                 <field name="user_id" />
                 <field name="state" />
+                <field name="partner_id" invisible="1"/>
                 <button name="case_close" string="Done"
                     states="open,draft,pending" type="object"
                     icon="gtk-close" />
@@ -261,23 +261,23 @@
             <field name="arch" type="xml">
                 <search string="Search Funds">
                    <group col='6' colspan='4'>
+                       <filter icon="gtk-new" string="Current"
+                           domain="[('state','in',('draft', 'open'))]" name="current"
+                           help="Current Funds" />
+                       <filter icon="gtk-yes" string="Open"
+                           domain="[('state','=','open')]"
+                           help="Open Funds" />
+                       <filter icon="gtk-media-pause"
+                           string="Pending"
+                           domain="[('state','=','pending')]"
+                           help="Pending Funds" />
+                       <separator orientation="vertical" />
                        <filter icon="terp-partner" string="My Funds"
                            default="1" domain="[('user_id','=',uid)]"
                            separator="1"
                            help="Funds Related to Current User"
                            />
                        <separator orientation="vertical" />
-                       <filter icon="gtk-new" string="Current Funds"
-                           domain="[('state','in',('draft', 'open'))]"
-                           help="Current Funds" />
-                       <filter icon="gtk-yes" string="Open Funds"
-                           domain="[('state','=','open')]"
-                           help="Open Funds" />
-                       <filter icon="gtk-media-pause"
-                           string="Pending Funds"
-                           domain="[('state','=','pending')]"
-                           help="Pending Funds" />
-                       <separator orientation="vertical" />
                        <field name="state" select="1" />
                        <field name="name" select='1'
                            string="Fund Description" />
@@ -293,6 +293,19 @@
                                help="My section" />
                        </field>
                    </group>
+                   <newline/>
+                   <group expand="0" string="Group By..." colspan="10" col="20">
+                       <filter string="Partner" icon="terp-partner"
+                           domain="[]"
+                           context="{'group_by':'partner_id'}" />
+                       <filter string="Responsible" icon="terp-crm"
+                           domain="[]"
+                           context="{'group_by':'user_id'}" />
+                       <separator orientation="vertical" />
+                       <filter string="Type" icon="terp-project"
+                           domain="[]"
+                           context="{'group_by':'type_id'}" />
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 33fc24b1548..b37ea9597bf 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -240,7 +240,7 @@
                         help="My section" />
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="12" col="20">
+                <group expand="0" string="Group By..." colspan="12" col="20">
                     <filter string="Customer" icon="terp-crm"
                         domain="[]" context="{'group_by':'partner_id'}" />
                     <filter string="State" icon="terp-crm" domain="[]"

From 0bddb27f00a8542563e4ba14bfdaabff765cd241 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 May 2010 12:56:27 +0530
Subject: [PATCH 103/146] [IMP]: crm: Improvement in reports for expand=1

bzr revid: rpa@tinyerp.com-20100510072627-l08kqaajk49w27np
---
 addons/crm/report/crm_lead_report_view.xml                    | 2 +-
 addons/crm/report/crm_phonecall_report_view.xml               | 2 +-
 addons/crm_claim/report/crm_claim_report_view.xml             | 2 +-
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0c6e935050c..78a5ffa34c8 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -119,7 +119,7 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                   <group  expand="1" string="Extended options..." colspan="10" col="12">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 83c76578afe..72bc4847608 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -119,7 +119,7 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                   <group  expand="1" string="Extended options..." colspan="10" col="12">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index ae4f248c0a9..6f906f3d21f 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -123,7 +123,7 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                   <group  expand="1" string="Extended options..." colspan="10" col="12">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index fad9c7eb93d..73f35ddba50 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -122,7 +122,7 @@
                			</field>
                    </group>
                    <newline/>
-                   <group  expand="0" string="Extended options..." colspan="10" col="12">
+                   <group  expand="1" string="Extended options..." colspan="10" col="12">
                          <filter icon="terp-sale"
                     		string="Done"
                     		domain="[('state','=','done')]"/>

From ca68b04782a0addae943b3b376d057006ac396cf Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 10 May 2010 13:32:33 +0530
Subject: [PATCH 104/146] [IMP]:improve account installer

bzr revid: nch@tinyerp.com-20100510080233-40pl984m3701qtud
---
 addons/account/account_installer.xml       | 26 +++++++++++++---------
 addons/base_setup/base_setup_installer.xml |  3 +++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index e14e256b397..c6c9a15262b 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -24,18 +24,16 @@
                 <attribute name="string">Configure</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-              <attribute name='rowspan'>20</attribute>
+              <attribute name='rowspan'>23</attribute>
+              <attribute name='string'></attribute>
+	      </xpath>
+	       <xpath expr='//group[@string="progress"]' position='attributes'>
+              <attribute name='width'>190</attribute>
               <attribute name='string'></attribute>
 	      </xpath>
 	      <group colspan="8">
+	      <group colspan="4" height="450" width="600">
             <field name="charts"/>
-            <group colspan="4" groups="base.group_extended">
-            	<separator col="4" colspan="4" string="Install Extra Account Module"/>
-            	<field name="account_analytic_plans"/>
-            	<field name="account_payment"/>
-            	<field name="account_followup"/>
-            	<field name="account_asset"/>
-            </group>
             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
             	<field name="sale_tax" colspan="2"/>
             	<field name="purchase_tax" colspan="2"/>
@@ -46,12 +44,12 @@
             	 	<form string="Bank Information">
                       <field name="acc_name"/>
                       <field name="account_type"/>
-                      <field name="currency_id"/>
+                      <field name="currency_id" widget="selection"/>
                     </form>
                     <tree editable="bottom" string="Bank Information">
                       <field name="acc_name"/>
                       <field name="account_type"/>
-                      <field name="currency_id"/>
+                      <field name="currency_id" widget="selection"/>
                     </tree>
                   </field>
             </group>
@@ -61,6 +59,14 @@
                 <field name="date_stop"/>
                 <field name="period" colspan="4"/>
             </group>
+            <group colspan="4" groups="base.group_extended">
+            	<separator col="4" colspan="4" string="Install Extra Account Module"/>
+            	<field name="account_analytic_plans"/>
+            	<field name="account_payment"/>
+            	<field name="account_followup"/>
+            	<field name="account_asset"/>
+            </group>
+          </group>
           </group>
         </data>
       </field>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 5419e5d6590..ba6b21d1268 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -20,6 +20,9 @@ If you don't think you need any of these right now, you can easily install them
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
 	          	  <attribute name='string'></attribute>
 	      </xpath>
+	      <xpath expr='//group[@string="progress"]' position='attributes'>
+              <attribute name='string'></attribute>
+	      </xpath>
 	      <separator string="title" position="attributes">
             <attribute name="string">Install Generic Modules</attribute>
           </separator>

From c3a9e1c4ddf5a96e2a6fe3e80481d924cda68a4d Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 10 May 2010 14:23:14 +0530
Subject: [PATCH 105/146] [FIX]:index error

bzr revid: nch@tinyerp.com-20100510085314-mnlun73asrm5tt10
---
 addons/base_setup/gtk_contact_form.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index 03fd0822b8e..6c576adf971 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -72,7 +72,8 @@ class base_gtkcontactform(osv.osv_memory):
              }
     def execute(self, cr, uid, ids, context=None):
         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
-        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id)[0]
+        company_data = self.pool.get('base.setup.company').read(cr, uid, company_id)
+        company_data = company_data and company_data[0]
         country1 = ''
         if company_data.get('country_id', False):
             country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'])['name']

From bd868903fa2b7c4ba736995ad156024be4397d55 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 10 May 2010 15:26:58 +0530
Subject: [PATCH 106/146] [IMP]:base installer,account

bzr revid: nch@tinyerp.com-20100510095658-y5512gbr530rsmmw
---
 addons/account/account_installer.xml | 4 ++--
 addons/account/account_view.xml      | 6 +++---
 addons/account/installer.py          | 5 ++---
 addons/base_setup/installer.py       | 2 ++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index c6c9a15262b..59c1240843b 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -34,11 +34,11 @@
 	      <group colspan="8">
 	      <group colspan="4" height="450" width="600">
             <field name="charts"/>
-            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+            <group colspan="4" attrs="{'invisible':[('charts','!=','l10n_chart_configurable')]}">
             	<field name="sale_tax" colspan="2"/>
             	<field name="purchase_tax" colspan="2"/>
             </group>
-             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+             <group colspan="4" attrs="{'invisible':[('charts','!=','l10n_chart_configurable')]}">
             	<separator col="4" colspan="4" string="Bank and Cost Account"/>
             	 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
             	 	<form string="Bank Information">
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index cf9069f9be4..38b628ab594 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1712,7 +1712,7 @@
 	      		</xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="company_id"  widget="selection"
-                         groups="base.group_multi_company"/>
+                         />
                   <field name ="code_digits" />
                   <field name="chart_template_id"/>
                   <field name ="seq_journal" />
@@ -1721,12 +1721,12 @@
                     <form string="Bank Information">
                       <field name="acc_name"/>
                       <field name="account_type"/>
-                      <field name="currency_id"/>
+                      <field name="currency_id" widget="selection"/>
                     </form>
                     <tree editable="bottom" string="Bank Information">
                       <field name="acc_name"/>
                       <field name="account_type"/>
-                      <field name="currency_id"/>
+                      <field name="currency_id" widget="selection"/>
                     </tree>
                   </field>
                 </group>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 2dd8c11cba5..760518f9006 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -37,7 +37,6 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids)),
                    key=itemgetter(1)))
-        charts.insert(0,('configurable','Configurable Chart of Account'))
         return charts
 
 #    def default_get(self, cr, uid, fields_list=None, context=None):
@@ -85,7 +84,7 @@ class account_installer(osv.osv_memory):
         'period':lambda *a:'month',
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
-        'charts':'configurable',
+        'charts':'l10n_chart_configurable',
         }
 
     def on_change_start_date(self, cr, uid, id, start_date):
@@ -99,7 +98,7 @@ class account_installer(osv.osv_memory):
         super(account_installer, self).execute(cr, uid, ids, context=context)
         record = self.browse(cr, uid, ids, context=context)[0]
         for res in self.read(cr,uid,ids):
-            if record.charts == 'configurable':
+            if record.charts == 'l10n_chart_configurable':
                 obj_acc = self.pool.get('account.account')
                 obj_tax = self.pool.get('account.tax')
                 user_type = self.pool.get('account.account.type')
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 5b6bd4107f0..13b37c67e1f 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -94,6 +94,8 @@ class base_setup_installer(osv.osv_memory):
 
     def onchange_moduleselection(self, cr, uid, ids, *args):
         progress = self._progress(cr, uid) - (2.5 * len(filter(lambda x: x==1, args)))
+        if progress <= 5.0:
+            progress = 5.0
         return {'value':{'progress':progress}}
 
     def modules_to_install(self, cr, uid, ids, context=None):

From 1d2bc8f950bf7f7372b32d2cbcd56e8cbf9ef98f Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 10 May 2010 16:29:04 +0530
Subject: [PATCH 107/146] [IMP] stock : Usability improvements

bzr revid: vir@tinyerp.com-20100510105904-gnyqwhy6l5re26a0
---
 addons/stock/stock_view.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 05fe10fe98e..5081491c6d2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,10 +3,10 @@
     <data>
         <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
-        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
+        <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="4"/>
         <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/>
-        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/>
+        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="3"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -180,7 +180,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_tracking_tree"/>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="base.group_extended"
             parent="menu_traceability"/>
@@ -1301,7 +1301,7 @@
                     <field name="name" string="Move Name"/>
                     <field name="product_id"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                    <field name="product_uom" string="UOM"/>
+                    <field name="product_uom" string="Unit Of Measure"/>
                     <field name="picking_id" select="1"/>
                     <field name="prodlot_id" groups="base.group_extended"/>
                     <field name="location_id"/>
@@ -1328,14 +1328,14 @@
                                 <field name="name"/>
                                 <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                <field name="product_uom" string="Unit Of Measure"/>
-                                <field name="product_uos" groups="base.group_extended"/>
+                                <field name="product_uom" string="Unit Of Measure" widget="selection"/>
+                                <field name="product_uos" groups="base.group_extended" />
                             </group>
 
                             <group colspan="2" col="2">
                                 <separator string="Locations &amp; Picking" colspan="2" />
-                                <field name="location_id" select="1"/>
-                                <field name="location_dest_id" select="1"/>
+                                <field name="location_id" select="1" widget="selection"/>
+                                <field name="location_dest_id" select="1" widget="selection"/>
                                 <field name="picking_id"/>
                                 <field name="address_id" context="{'contact_display':'partner'}"/>
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
@@ -1381,11 +1381,11 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group col="8" colspan="4">
-                        <filter icon="terp-stock" string="Available" domain="[('state','=','done')]" help="Done"/>
+                        <filter icon="terp-stock" string="Available" name="Available" domain="[('state','=','assigned')]" help="Available"/>
                         <separator orientation="vertical"/>
+                        <field name="product_id"/>
                         <field name="location_id"/>
                         <field name="location_dest_id"/>
-                        <field name="product_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
@@ -1407,6 +1407,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_move_search"/>
+            <field name="context">{'search_default_Available':1}</field>
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
 
@@ -1426,7 +1427,7 @@
                     <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty" />
-                    <field name="product_uom" string="UOM"/>
+                    <field name="product_uom" string="Uint Of Measure"/>
                     <field name="prodlot_id" string="Lot" groups="base.group_extended"/>
                     <field name="date_planned"/>
                     <field name="backorder_id" groups="base.group_extended"/>

From 751866c912ffd6a866731f488e29bb890524810c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 May 2010 17:33:37 +0530
Subject: [PATCH 108/146] [IMP]: crm: Improvement in forward to partner wizard,
 made changes for merging add cc wizard into it <still to be improved>

bzr revid: rpa@tinyerp.com-20100510120337-wgqua4edkkmmbvpa
---
 addons/crm/wizard/crm_forward_to_partner.py   | 171 ++++++++++++------
 .../wizard/crm_forward_to_partner_view.xml    |  19 +-
 addons/mail_gateway/mail_gateway.py           |   5 +-
 3 files changed, 132 insertions(+), 63 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 797373437ce..257f4b36312 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -29,13 +29,69 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     _name = 'crm.lead.forward.to.partner'
 
     _columns = {
-        'partner_id' : fields.many2one('res.partner', 'Partner'),
-        'address_id' : fields.many2one('res.partner.address', 'Address'),
-        'email_from' : fields.char('From', required=True, size=128),
-        'email_to' : fields.char('To', required=True, size=128),
-        'subject' : fields.char('Subject', required=True, size=128),
+        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), \
+                         ('email', 'Email Address')], 'Send to', required=True), 
+        'user_id': fields.many2one('res.users', "User"), 
+        'partner_id' : fields.many2one('res.partner', 'Partner'), 
+        'address_id' : fields.many2one('res.partner.address', 'Address'), 
+        'email_from' : fields.char('From', required=True, size=128), 
+        'email_to' : fields.char('To', required=True, size=128), 
+        'subject' : fields.char('Subject', required=True, size=128), 
         'message' : fields.text('Message', required=True),
+        'history': fields.selection([('whole', 'Whole'), ('latest', 'Latest')], 'Send history', required=True), 
     }
+    
+    def get_whole_history(self, cr, uid, ids, context=None):
+        whole = []
+        for hist_id in ids:
+            whole.append(self.get_latest_history(cr, uid, hist_id, context=context))
+        whole = '\n\n'.join(whole)
+        return whole or ''
+    
+    def get_latest_history(self, cr, uid, id, context=None):
+        log_pool = self.pool.get('mailgate.message')
+        hist = log_pool.browse(cr, uid, id, context=context)
+        header = '-------- Original Message --------'
+        sender = 'From: %s' %(hist.email_from or '')
+        to = 'To: %s' % (hist.email_to or '')
+        sentdate = 'Date: %s' % (hist.date)
+        desc = '\n%s'%(hist.description)
+        original = [header, sender, to, sentdate, desc]
+        original = '\n'.join(original)
+        return original
+    
+    def on_change_email(self, cr, uid, ids, user, partner):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Mail’s IDs
+        """
+        if (not partner and not user):
+            return {'value': {'email_to': False}}
+        email = False
+        if partner:
+            addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
+            if addr and addr['contact']:
+                email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
+        elif user:
+            addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
+            if addr:
+                email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
+        return {'value': {'email_to': email}}
+
+    def on_change_history(self, cr, uid, ids, history, context=None):
+        #TODO: ids and context are not comming
+        res = False
+        if history == 'whole' and ids: #Remove second condition:
+            #TODO: get whole history ids for current Case object
+            msg_val = self.get_whole_history(cr, uid, ids, context=context)
+            res = {'value': {'message' : msg_val}}
+        if history == 'latest' and ids: #Remove second condition
+            #TODO: get Latest history id for current Case object
+            msg_val = self.get_latest_history(cr, uid, ids, context=context)
+            res = {'value': {'message' : msg_val}}
+        return res
 
     def on_change_partner(self, cr, uid, ids, partner_id):
         if not partner_id:
@@ -45,7 +101,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         data = {'address_id': addr['contact']}
         data.update(self.on_change_address(cr, uid, ids, addr['contact'])['value'])
         return {
-            'value' : data,
+            'value' : data, 
             'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
             }
 
@@ -53,7 +109,6 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         email = ''
         if address_id:
             email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
-
         return {'value': {'email_to' : email}}
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -67,15 +122,16 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             context = {}
 
         res_id = context.get('active_id', False)
-
-        if not res_id:
+        
+        model = context.get('active_model', False)
+        if not res_id or not model:
             return {}
 
         this = self.browse(cr, uid, ids[0], context=context)
 
         hist_obj = self.pool.get('crm.case.history')
         smtp_pool = self.pool.get('email.smtpclient')
-        case_pool = self.pool.get('crm.lead')
+        case_pool = self.pool.get(model)
         case = case_pool.browse(cr, uid, res_id, context=context)
 
         emails = [this.email_to]
@@ -86,43 +142,30 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         flag = False
         if case.section_id and case.section_id.server_id:
             flag = smtp_pool.send_email(
-                cr=cr,
-                uid=uid,
-                server_id=case.section_id.server_id.id,
-                emailto=emails,
-                subject=this.subject,
-                body="<pre>%s</pre>" % body,
+                cr=cr, 
+                uid=uid, 
+                server_id=case.section_id.server_id.id, 
+                emailto=emails, 
+                subject=this.subject, 
+                body="<pre>%s</pre>" % body, 
             )
         else:
             flag = tools.email_send(
-                email_from,
-                emails,
-                this.subject,
-                body,
+                email_from, 
+                emails, 
+                this.subject, 
+                body, 
             )
-
+        case_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ', ' + this.email_to or this.email_to})
         return {}
 
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        if context is None:
-            context = {}
-
-        active_ids = context.get('active_ids')
-        if not active_ids:
-            return {}
-
-        lead_proxy = self.pool.get('crm.lead')
-
-        lead = lead_proxy.browse(cr, uid, active_ids[0], context=context)
+    def get_lead_details(self, cr, uid, lead, context=None):
         message = []
-        
+        lead_proxy = self.pool.get('crm.lead')
         if lead.type == 'lead':
                 field_names = [
-                    'partner_name', 'title', 'function_name', 'street', 'street2',
-                    'zip', 'city', 'country_id', 'state_id', 'email_from',
+                    'partner_name', 'title', 'function_name', 'street', 'street2', 
+                    'zip', 'city', 'country_id', 'state_id', 'email_from', 
                     'phone', 'fax', 'mobile'
                 ]
         
@@ -146,31 +189,49 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         elif lead.type == 'opportunity':
             pa = lead.partner_address_id
             message = [
-            "Partner: %s" % (lead.partner_id.name_get()[0][1]),
-            "Contact: %s" % (pa.name or ''),
-            "Title: %s" % (pa.title or ''),
-            "Function: %s" % (pa.function and pa.function.name_get()[0][1] or ''),
-            "Street: %s" % (pa.street or ''),
-            "Street2: %s" % (pa.street2 or ''),
-            "Zip: %s" % (pa.zip or ''),
-            "City: %s" % (pa.city or ''),
-            "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''),
-            "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''),
-            "Email: %s" % (pa.email or ''),
-            "Phone: %s" % (pa.phone or ''),
-            "Fax: %s" % (pa.fax or ''),
-            "Mobile: %s" % (pa.mobile or ''),
+            "Partner: %s" % (lead.partner_id.name_get()[0][1]), 
+            "Contact: %s" % (pa.name or ''), 
+            "Title: %s" % (pa.title or ''), 
+            "Function: %s" % (pa.function and pa.function.name_get()[0][1] or ''), 
+            "Street: %s" % (pa.street or ''), 
+            "Street2: %s" % (pa.street2 or ''), 
+            "Zip: %s" % (pa.zip or ''), 
+            "City: %s" % (pa.city or ''), 
+            "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''), 
+            "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''), 
+            "Email: %s" % (pa.email or ''), 
+            "Phone: %s" % (pa.phone or ''), 
+            "Fax: %s" % (pa.fax or ''), 
+            "Mobile: %s" % (pa.mobile or ''), 
             ]
+        return "\n".join(message + ['---'])
+        
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        """
+        if context is None:
+            context = {}
+
+        active_ids = context.get('active_ids')
+        if not active_ids:
+            return {}
+
+        lead_proxy = self.pool.get('crm.lead')
+        lead = lead_proxy.browse(cr, uid, active_ids[0], context=context)
+        message = False
         
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         email_from = ''
         if user.address_id and user.address_id.email:
             email_from = "%s <%s>" % (user.name, user.address_id.email)
+        
+        message = self.get_lead_details(cr, uid, lead, context=context)
 
         res = {
-            'email_from' : email_from,
-            'subject' : '[%s-Forward:%06d] %s' % (lead.type.title(), lead.id, lead.name),
-            'message' : "\n".join(message + ['---']),
+            'email_from' : email_from, 
+            'subject' : '[%s-Forward:%06d] %s' % (lead.type.title(), lead.id, lead.name), 
+            'message' : message, 
         }
 
         return res
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index 0bf04ac15d0..a4ecdb922f6 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -9,12 +9,19 @@
                 <form string="Forward to Partner">
                     <separator string="User" colspan="4" />
                     <field name="email_from" colspan="2" />
-
-                    <separator string="Destination" colspan="4" />
-                    <field name="partner_id" on_change="on_change_partner(partner_id)" colspan="2" />
-                    <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
-                    <field name="email_to" colspan="2" />
-
+                    <field name="history" colspan="2" on_change="on_change_history(history)"/>
+                    <separator string="Send to" colspan="4" />
+                    <field name="name" colspan="2" />
+					<group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
+                        <field name="user_id"
+                            attrs="{ 'required' : [('name','=','user')]}"
+                            on_change="on_change_email(user_id, partner_id)" />
+                    </group>
+                    <group col="4" colspan="4" attrs="{'invisible' : [('name','!=','partner')]}">
+	                    <field name="partner_id" attrs="{'required' : [('name','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
+	                    <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
+					</group>
+					<field colspan="4" name="email_to" attrs="{ 'required' : [('name','=','email')]}" />
                     <separator string="Email" colspan="4" />
                     <field name="subject" colspan="4" />
                     <separator string="Mesage body" colspan="4" />
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 764a1d00353..249116881e4 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -59,7 +59,7 @@ class mailgate_thread(osv.osv):
         model_ids = model_obj.search(cr, uid, [('model', '=', self._name)])
         domain +=  [('model_id', '=', model_ids[0])]
         for case in self.browse(cr, uid, ids, context):
-            domain1 =  domain + [('res_id', '=', case.id)]
+            domain1 = domain + [('res_id', '=', case.id)]
             history_ids = history_obj.search(cr, uid, domain1, context=context)
             if history_ids:
                 result[case.id] = {name: history_ids}
@@ -84,7 +84,8 @@ class mailgate_message(osv.osv):
     '''
     _name = 'mailgate.message'
     _description = 'Mailgateway Message'
-    
+    _order = 'date desc'
+
     _columns = {
         'name':fields.char('Message', size=64),
         'thread_id':fields.many2one('mailgate.thread', 'Thread'),

From 3221692ea41bfe71297974f690d0534789582582 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 May 2010 17:58:28 +0530
Subject: [PATCH 109/146] [IMP]: crm: lead to opportunity wizard: made partner
 field invisible if we skip create partner

bzr revid: rpa@tinyerp.com-20100510122828-dq66bgcqycvge466
---
 addons/crm/wizard/crm_lead_to_opportunity_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 229b54e09fe..25d9017c8cb 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -10,7 +10,9 @@
           <field name="arch" type="xml">
               <form string="Convert To Opportunity">
                 <field name="name"/>
-                <field name="partner_id"/>
+                <group attrs="{'invisible':[('partner_id','=',False)]}" col="2" colspan="2">
+                	<field name="partner_id"/>
+                </group>
                 <newline/>
                 <field name="planned_revenue"/>
                 <field name="probability"/>

From 220d5b2f37d648bb1b8fbd4ad25b5ac2581cf270 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Mon, 10 May 2010 18:29:15 +0530
Subject: [PATCH 110/146] [IMP]: usability of HR

bzr revid: rvo@tinyerp.co.in-20100510125915-dqiyo6eeuygftuhc
---
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         | 32 ++++++----
 addons/hr_attendance/hr_attendance_view.xml   |  7 +-
 .../wizard/hr_attendance_bymonth_view.xml     |  2 +-
 .../wizard/hr_attendance_byweek_view.xml      |  2 +-
 .../wizard/hr_attendance_error_view.xml       |  2 +-
 .../wizard/hr_attendance_sign_in_out_view.xml |  2 +-
 addons/hr_contract/hr_contract_view.xml       | 64 ++++++++++++-------
 addons/hr_evaluation/hr_evaluation_view.xml   | 37 +++++++++--
 .../report/hr_evaluation_report_view.xml      |  4 +-
 .../wizard/hr_evaluation_mail_view.xml        |  4 +-
 addons/hr_expense/hr_expense_view.xml         | 28 ++++----
 .../report/hr_expense_report_view.xml         |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       |  3 +-
 addons/hr_holidays/hr_holidays_wizard.xml     |  4 +-
 .../report/hr_holidays_report_view.xml        |  1 +
 .../hr_holidays_summary_department_view.xml   |  9 +--
 .../hr_holidays_summary_employees_view.xml    |  2 +-
 addons/hr_recruitment/hr_recruitment.py       |  8 +++
 addons/hr_recruitment/hr_recruitment_menu.xml |  3 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 34 +++++-----
 .../report/hr_recruitment_report_view.xml     |  4 +-
 addons/hr_timesheet/hr_timesheet_report.xml   |  4 +-
 .../hr_timesheet_print_employee_view.xml      |  7 +-
 .../wizard/hr_timesheet_print_users_view.xml  |  2 +-
 .../wizard/hr_timesheet_sign_in_out_view.xml  |  1 +
 .../hr_timesheet_invoice_report.xml           |  4 +-
 .../hr_timesheet_invoice_report_view.xml      | 26 +++++++-
 .../hr_timesheet_analytic_profit_view.xml     |  4 +-
 ...heet_invoice_analytic_cost_ledger_view.xml |  2 +-
 .../hr_timesheet_sheet_view.xml               |  6 +-
 31 files changed, 200 insertions(+), 114 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index a66951e9f45..977cc22f005 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -73,7 +73,7 @@
         </record>
 
        <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_root" sequence="5"/>
 
         <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e04cf1aaad..47efc17825e 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
-        <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
+        <menuitem id="menu_hr_human_resources" sequence="2" name="Human Resources" parent="menu_hr_root"/>
         <menuitem
             id="menu_hr_configuration"
             name="Configuration"
@@ -58,7 +58,7 @@
                             <group col="2" colspan="2">
                                 <separator string="Status" colspan="2"/>
                                 <field name="gender"/>
-                                <field name="marital"/>
+                                <field name="marital" widget="selection"/>
                                 <field name="country_id"/>
                                 <field name="birthday"/>
                             </group>
@@ -103,7 +103,7 @@
                     <newline />
                     <group expand="1" string="Group By..." colspan="11" col="11">
                         <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical" />
                         <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
                         <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
@@ -141,13 +141,15 @@
         <menuitem
             action="open_view_employee_list_my"
             id="menu_open_view_employee_list_my"
-            parent="menu_hr_human_resources"/>
+            sequence="3"
+            parent="menu_hr_root"/>
+
 
         <!--
         =======================
         Employee marital status
-        =======================
-        -->
+        =======================     -->
+
         <record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
             <field name="name">hr.hr.employee.marital.status</field>
             <field name="model">hr.employee.marital.status</field>
@@ -172,6 +174,7 @@
             id="hr_menu_marital_status"
             parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
 
+
         <!--
         =======================
         Employee architecture
@@ -257,9 +260,10 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="open_view_categ_form" 
-            id="menu_view_employee_category_form" 
-            parent="menu_view_employee_category_configuration_form" sequence="1"/>
+        <menuitem action="open_view_categ_form"
+            id="menu_view_employee_category_form"
+            parent="menu_view_employee_category_configuration_form" sequence="1"
+            groups="base.group_extended"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -287,8 +291,8 @@
             <field eval="True" name="object"/>
         </record>
 
-        <menuitem 
-            action="open_view_categ_tree" 
+        <menuitem
+            action="open_view_categ_tree"
             groups="base.group_extended"
             id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
 
@@ -375,9 +379,9 @@
             name="Recruitment"
             id="base.menu_crm_case_job_req_main"
             parent="menu_hr_root"/>
-        <menuitem 
-            parent="base.menu_crm_case_job_req_main" 
-            id="menu_hr_job" 
+        <menuitem
+            parent="base.menu_crm_case_job_req_main"
+            id="menu_hr_job"
             action="action_hr_job" sequence="2"/>
 
     </data>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index cc2bfd97efe..2ea2d325867 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -56,18 +56,19 @@
                     <field name="action" select="1" />
                     <newline/>
                     <group expand="1" string="Group By..." colspan="11" col="11">
-                        <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
+                        <filter name="employee" string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/>
                     </group>
                 </search>
             </field>
         </record>
-        
+
         <record id="open_view_attendance" model="ir.actions.act_window">
             <field name="name">Attendances</field>
             <field name="res_model">hr.attendance</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{"search_default_employee":1}</field>
             <field name="search_view_id" ref="view_hr_attendance_filter" />
         </record>
 
@@ -76,7 +77,7 @@
         <menuitem
            id="menu_hr_time_tracking"
            name="Time Tracking"
-           parent="hr.menu_hr_root" sequence="5"/>
+           parent="hr.menu_hr_root" sequence="7"/>
         <menuitem action="open_view_attendance" id="menu_open_view_attendance"
             parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
 
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 89272706eee..725ce7b5004 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -16,7 +16,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object"  icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 618217a1a66..220ceef2e48 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -17,7 +17,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object"  icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 16769f66df0..3061c263687 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -19,7 +19,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 62cffa720a9..d5253dffa25 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -46,7 +46,7 @@
 
         <menuitem action="action_hr_attendance_sigh_in_out"
         	id="menu_hr_attendance_sigh_in_out"
-        	parent="menu_hr_time_tracking" groups="group_hr_attendance" />
+        	parent="menu_hr_time_tracking" groups="base.group_extended" />
 
        <record id="view_hr_attendance_so_ask" model="ir.ui.view">
             <field name="name">hr.sign.in.out.ask.form</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 7578d66e98b..9951a9e3982 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -21,7 +21,7 @@
             <field name="arch" type="xml">
                 <form string="Wage Type">
                     <field colspan="4" name="name"/>
-                    <field name="period_id"/>
+                    <field name="period_id" widget="selection"/>
                     <field name="type"/>
                     <separator colspan="4" string="Hourly cost computation"/>
                     <field name="factor_type"/>
@@ -70,7 +70,7 @@
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Contracts">
-                        <field colspan="4" name="contract_ids" nolabel="1">
+                        <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
                             <tree string="Contracts">
                                 <field name="name"/>
                                 <field name="job_id"/>
@@ -133,14 +133,24 @@
             </field>
         </record>
 
-        <record id="hr_contract_type_view_form" model="ir.ui.view">
-            <field name="name">hr.contract.type.view.form</field>
-            <field name="model">hr.contract.type</field>
-            <field name="type">form</field>
+		<record id="hr_contract_view_search" model="ir.ui.view">
+            <field name="name">hr.contract.view.search</field>
+            <field name="model">hr.contract</field>
+            <field name="type">search</field>
             <field name="arch" type="xml">
-                <form string="Contract Type">
-                    <field colspan="4" name="name" select="1"/>
-                </form>
+                <search string="Search Contract">
+                   <group col='15' colspan='4'>
+                   		<field name="name"/>
+                      	<field name="employee_id"/>
+                      	<field name="department_id"/>
+                       	<field name="date_start"/>
+                       	<field name="date_end"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
+                    </group>
+               </search>
             </field>
         </record>
 
@@ -180,17 +190,6 @@
             </field>
         </record>
 
-        <record id="hr_contract_type_view_tree" model="ir.ui.view">
-            <field name="name">hr.contract.type.view.tree</field>
-            <field name="model">hr.contract.type</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Contract Type">
-                    <field colspan="4" name="name"/>
-                </tree>
-            </field>
-        </record>
-
         <record id="hr_contract_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.view.tree</field>
             <field name="model">hr.contract</field>
@@ -216,9 +215,30 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
+            <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 
+		<record id="hr_contract_type_view_form" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.form</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Contract Type">
+                    <field colspan="4" name="name" select="1"/>
+                </form>
+            </field>
+        </record>
 
+		 <record id="hr_contract_type_view_tree" model="ir.ui.view">
+            <field name="name">hr.contract.type.view.tree</field>
+            <field name="model">hr.contract.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Contract Type">
+                    <field colspan="4" name="name"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_hr_contract_type" model="ir.actions.act_window">
             <field name="name">Contract Types</field>
             <field name="res_model">hr.contract.type</field>
@@ -227,8 +247,8 @@
         </record>
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/>
 
-        <menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
+        <!--<menuitem  id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/> -->
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
 		<act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cff66266686..e2b1532d17f 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -1,6 +1,25 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
+
+    	<record id="view_hr_evaluation_plan_search" model="ir.ui.view">
+            <field name="name">hr_evaluation.plan.search</field>
+            <field name="model">hr_evaluation.plan</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Evaluation Plan">
+                   <group col='15' colspan='4'>
+                       <field name="name"/>
+                       <field name="company_id" widget="selection"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_hr_evaluation_plan_form">
             <field name="name">hr_evaluation.plan.form</field>
             <field name="model">hr_evaluation.plan</field>
@@ -42,7 +61,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/>
+        <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
 
        <menuitem
             name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/>
@@ -169,19 +188,23 @@
                     <button name="button_plan_in_progress"
                             string="Start Evaluation"
                             states="draft"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-execute"/>
                     <button name="button_final_validation"
                             string="Final Validation"
                             states="wait"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-execute"/>
                     <button name="button_done"
                             string="Done"
                             states="progress"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-jump-to"/>
                     <button name="button_cancel"
                             string="Cancel"
                             states="draft,wait,progress"
-                            type="object"/>
+                            type="object"
+                            icon="gtk-cancel"/>
                     </group>
               </form>
             </field>
@@ -279,7 +302,7 @@
                         <field name="date_deadline"/>
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
-                        <field name="user_id"/>
+                        <field name="user_id" string="Interviewer"/>
                     </group>
                     <newline/>
                     <separator string="State" colspan="4"/>
@@ -328,7 +351,7 @@
                         <filter icon="terp-stock" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
                         <field name="user_to_review_id" widget="selection"/>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id" string="Interviewer" widget="selection"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 0417fb0ffd2..0dacc90c53c 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -112,8 +112,8 @@
         <field name="search_view_id" ref="view_evaluation_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/>
-    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+    <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index fff55095712..3769efcdfa8 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -10,8 +10,8 @@
              	<form string="Evaluation Reminders">
 			    	<field name="evaluation_id"/>
 			    	<newline/>
-			    	<button special="cancel" string="Cancel" />
-              		<button name="send_mail" string="Send Mail" type="object"/>
+			    	<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+              		<button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/>
              	</form>
             </field>
 		</record>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 292cbf6f027..cb74901fc4e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -30,8 +30,8 @@
                     <field name="date"/>
                     <field name="employee_id"/>
                     <field name="department_id" groups="base.group_extended"/>
-                    <field name="name"/>
                     <field name="ref"/>
+                    <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
                     <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
@@ -49,8 +49,8 @@
                     <field name="date"/>
                     <field name="employee_id"/>
                     <field name="department_id" groups="base.group_extended"/>
-                    <field name="name"/>
                     <field name="ref"/>
+                    <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
                     <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
@@ -68,8 +68,7 @@
                     <group colspan="4" col="6">
                         <field name="employee_id" select="1"/>
                         <field name="name" select="1"/>
-                        <field name="employee_id" select="1"/>
-                        <field name="ref"/>
+                        <field name="ref" groups="base.group_extended"/>
                         <field name="date" select="1"/>
                         <field name="amount"/>
                         <field name="currency_id"/>
@@ -82,7 +81,7 @@
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
                                     <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
-                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
+                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
                                     <field name="name" select="1"/>
                                     <field name="date_value" select="1"/>
                                     <field name="unit_quantity"/>
@@ -133,6 +132,12 @@
                         domain="[('state','=','draft')]"
                         string="Draft"
                         help="Draft Expense"/>
+                	  <filter
+                        icon="terp-hr"
+                        string="My Expenses"
+                        default="1"
+                        domain="[('user_id','=',uid)]"/>
+                      <separator orientation="vertical"/>
                       <filter
                         icon="terp-hr"
                         domain="[('state','=','confirm')]"
@@ -146,12 +151,7 @@
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
-                      <field name="user_id" select="1" widget="selection">
-                          <filter
-                            icon="gtk-execute"
-                            help="My Expenses"
-                            default="1"
-                            domain="[('user_id','=',uid)]"/>
+                      <field name="user_id" select="1" widget="selection" string="User">
                         <filter icon="terp-hr"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
@@ -161,9 +161,9 @@
                 <newline />
                 <group expand="1" string="Group By..." colspan="11" col="11">
                     <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                    <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
                 </group>
                 </search>
             </field>
@@ -176,7 +176,7 @@
             <field name="search_view_id" ref="view_hr_expense_filter"/>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="6"
+        <menuitem id="next_id_49" name="Expenses" sequence="8"
            parent="hr.menu_hr_root"/>
 
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses"
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 972557edd0c..c376df3e4d7 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -137,8 +137,8 @@
         <field name="search_view_id" ref="view_hr_expense_report_search"/>
     </record>
 
-    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/>
-    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+    <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+    <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d5e0602e5bb..5004635f59c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -198,7 +198,8 @@
         <menuitem
             name="Holidays Management"
             parent="hr.menu_hr_root"
-            id="menu_open_ask_holidays"/>
+            id="menu_open_ask_holidays"
+            sequence="9"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Requests</field>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 244668ec719..c2873ed9ace 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -5,12 +5,12 @@
             id="hr.menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="10" />
      <menuitem
             id="menu_hr_reporting_holidays"
             name="Holidays"
             parent="hr.menu_hr_reporting"
-            sequence="3" />
+            sequence="6" />
 	<!--<wizard string="Holidays by Departement"
 		  name="hr.holidays.summary"
 		  id="holidays_summary"/>-->
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e9e0e6aae36..a5502b9450d 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -67,6 +67,7 @@
                         default="1"
                         domain="[('user_id','=',uid)]"/>
                 </field>
+                <field name="date"/>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index fabc11d6021..01d3f4372ce 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.holidays.summary.dept</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Holidays by Departement">
+			<form string="Holidays by Department">
 			    <group col="4" colspan="6">
 				    <field name="date_from"/>
 				    <newline/>
@@ -18,14 +18,14 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
         </record>
 
         <record id="action_hr_holidays_summary_dept" model="ir.actions.act_window">
-            <field name="name">Holidays by Departement</field>
+            <field name="name">Holidays by Department</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.dept</field>
             <field name="view_type">form</field>
@@ -34,10 +34,11 @@
         </record>
 
 		<menuitem
-	        name="Leaves by Departement"
+	        name="Leaves by Department"
 	        parent="menu_hr_reporting_holidays"
 	        action="action_hr_holidays_summary_dept"
 	        id="menu_account_central_journal"
+	        groups="base.group_extended"
 	        icon="STOCK_PRINT"/>
 
 	</data>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 0957083a136..ce87b1172b1 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -18,7 +18,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
 	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+						<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7ea4f52a392..fe0e7f2dde1 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -62,6 +62,14 @@ class hr_applicant(osv.osv):
         'response' : fields.integer("Response"),
     }
 
+    def onchange_job(self,cr, uid, ids, job, context={}):
+        result = {}
+        if job:
+            job_obj = self.pool.get('hr.job')
+            result['department_id'] = job_obj.browse(cr, uid, job).department_id.id
+            return {'value': result}
+        return {'value': {'department_id': []}}
+
     def stage_previous(self, cr, uid, ids, context=None):
         """This function computes previous stage for case from its current stage
              using available stage for that case type
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index ba3278b3c66..760c7f08f2f 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -37,7 +37,8 @@
      <menuitem
         name="Recruitment"
         id="base.menu_crm_case_job_req_main"
-        parent="base.menu_hr"/>
+        parent="base.menu_hr"
+        sequence="1"/>
 
  <!--
         ALL JOBS REQUESTS
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index beb9467814c..461b10181b7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -69,27 +69,27 @@
         <field name="arch" type="xml">
             <form string="Jobs - Recruitment Form">
                 <group colspan="4" col="8">
-                    <field name="name" string="Subject"/>
-                    <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="stage_id" nolabel="1"/>
+                     <group colspan="3" col="6">
+                        <field name="name" string="Subject"/>
+                        <field name="stage_id"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
-                    <field name="user_id"/>
-                    <button string="Schedule a Phone Call"
-                        name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action"
-						icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/>
                     <newline/>
-                    <field name="partner_name"/>
-                    <field name="job_id"/>
-                    <field name="department_id" widget="selection"/>
-                    <button name="action_makeMeeting" type="object"
-                        string="Schedule Meeting" icon="terp-hr" />
-                    <button name="action_print_survey" string="Print Interview" type="object"
-                        icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                </group>
+                    <group colspan="3" col="6">
+	                  	<field name="partner_name"/>
+	                   	<field name="job_id" on_change="onchange_job(job_id)"/>
+	                   	<button string="Schedule a Phone Call" name="223" icon="gtk-redo" type="action"/>
+                     </group>
+                    <newline/>
+                    <group colspan="3" col="6">
+                        <field name="user_id"/>
+                        <field name="department_id" widget="selection"/>
+                        <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/>
+                    </group>
+                    <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+            	</group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="2" colspan="2">
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 83f7d2b7602..ec7f08bbbe0 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -139,8 +139,8 @@
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_hr_recruitment_report_search"/>
     </record>
-	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
-    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/>
+	<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
+    <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
 
 </data>
 </openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 6fa7185c7e9..f161c8c07f9 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -5,12 +5,12 @@
             id="hr.menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="10" />
          <menuitem
             id="menu_hr_reporting_timesheet"
             name="Timesheet"
             parent="hr.menu_hr_reporting"
-            sequence="1" />
+            sequence="4" />
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
 
         <!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index a3b53a05d22..d6c7398864a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
@@ -34,7 +34,7 @@
         <menuitem action="action_hr_timesheet_employee"
         	id="menu_hr_timesheet_employee"
         	parent="menu_hr_reporting_timesheet"
-        	groups="hr.group_hr_manager" />
+        	groups="base.group_extended"/>
 
 
       <!-- Print My Timesheet -->
@@ -47,11 +47,10 @@
                 	<group colspan="4" >
 	                	<field name="month" />
 	                	<field name="year" />
-	                	<field name="user_id" colspan="3" readonly="1" />
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 4e12f4f2333..de834621c23 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -16,7 +16,7 @@
                 	</group>
                     <group colspan="4" col="6">
                     	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-print" string="Print" name="print_report" type="object"/>
+                    	<button icon="gtk-yes" string="Print" name="print_report" type="object"/>
                    </group>
                </form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 487208bfbf6..6f6ce56b091 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -52,6 +52,7 @@
 
         <menuitem action="action_hr_timesheet_sign_in"
         	id="menu_hr_timesheet_sign_in"
+        	groups="base.group_extended"
         	parent="hr_attendance.menu_hr_time_tracking"
         	/>
 
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index f2d9f5a8c4a..a801e21082b 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -5,12 +5,12 @@
             id="hr.menu_hr_reporting"
             name="Reporting"
             parent="hr.menu_hr_root"
-            sequence="40" />
+            sequence="10" />
         <menuitem
             id="menu_hr_reporting_timesheet_invoice"
             name="Timesheet Invoice"
             parent="hr.menu_hr_reporting"
-            sequence="2" />
+            sequence="5" />
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
 
         <!--<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>-->
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 4de60162d1a..cb6c8d5771c 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -441,6 +441,30 @@
 
         <!-- Random Timesheet Lines of random activities -->
 
+		<record id="view_random_timesheet_lines_search" model="ir.ui.view">
+            <field name="name">random.timesheet.lines.search</field>
+            <field name="model">random.timesheet.lines</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Timesheet Lines">
+                   <group col='15' colspan='4'>
+                    	<field name="date"/>
+                    	<field name="user_id" widget="selection"/>
+                    	<field name="product_id" widget="selection"/>
+                    	<field name="analytic_account_id" widget="selection"/>
+                    	<field name="general_account_id" widget="selection"/>
+                   </group>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/>
+                        <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/>
+                   		<filter string="General Account" icon="terp-project" domain="[]" context="{'group_by':'general_account_id'}"/>
+                   </group>
+               </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_random_timesheet_lines_tree">
             <field name="name">random.timesheet.lines.tree</field>
             <field name="model">random.timesheet.lines</field>
@@ -448,7 +472,7 @@
             <field name="arch" type="xml">
                 <tree string="Random Timesheets Lines">
                     <field name="date" select="1"/>
-                    <field name="user_id" />
+                    <field name="user_id"/>
                     <field name="name" select="1"/>
                     <field name="quantity" />
                     <field name="product_id" select="1"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index f79cae2eef8..b68112a5a38 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -17,7 +17,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
@@ -34,7 +34,7 @@
 
        	<menuitem action="action_hr_timesheet_analytic_profit"
         	id="menu_hr_timesheet_analytic_profit"
-        	parent="menu_hr_reporting_timesheet_invoice" groups="hr.group_hr_manager" />
+        	parent="menu_hr_reporting_timesheet_invoice" groups="base.group_extended"/>
 
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
index c8f9806a309..ea14e52ed52 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -15,7 +15,7 @@
 				<separator colspan="4"/>
 			    <group col="2" colspan="4">
             		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
+					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1a8b110d690..eae4e8e1e9a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -114,7 +114,7 @@
                             </group>
 
                             <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
-                                <tree string="Attendances">
+                                <tree string="Attendances" editable="bottom">
                                     <field name="name"/>
                                     <field name="action"/>
                                     <field invisible="1" name="employee_id"/>
@@ -192,7 +192,7 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
-                        <filter icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" />
+                        <filter name="my_timesheet" icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" />
                         <separator orientation="vertical"/>
                         <filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
@@ -220,8 +220,10 @@
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
+            <field name="context">{'search_default_my_timesheet':1}</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
+
         <!--Time Tracking menu in project Management-->
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
           <menuitem

From ba6b04d599cb2d645f21f08a31159e4c8f162bab Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 10 May 2010 18:37:29 +0530
Subject: [PATCH 111/146] [IMP]: crm: Improvements in tooltips

bzr revid: rpa@tinyerp.com-20100510130729-ncctg8dtzper8zhz
---
 addons/base_action_rule/base_action_rule.py | 155 ++++++++++----------
 addons/crm/crm_action_rule.py               |   4 +-
 addons/crm/crm_lead.py                      |   6 +-
 addons/crm_claim/crm_claim.py               |   4 +-
 addons/crm_fundraising/crm_fundraising.py   |   4 +-
 addons/crm_helpdesk/crm_helpdesk.py         |   8 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml   |   1 +
 7 files changed, 89 insertions(+), 93 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 5d36f49a06e..b6032731fbd 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -60,7 +60,7 @@ class base_action_rule(osv.osv):
             @param uid: the current user’s ID for security checks,
             @param context: A standard dictionary for contextual values """
 
-        return [('','')]
+        return [('', '')]
   
     def priority_get(self, cr, uid, context={}):
         """ Get Priority
@@ -69,78 +69,75 @@ class base_action_rule(osv.osv):
             @param uid: the current user’s ID for security checks,
             @param context: A standard dictionary for contextual values """
 
-        return [('','')]
+        return [('', '')]
 
     _columns = {
-        'name': fields.many2one('ir.model', 'Model', required=True),
-        'max_level': fields.integer('Max Level', help='Specifies maximum level.'),
-        'create_date': fields.datetime('Create Date', readonly=1),
+        'name': fields.many2one('ir.model', 'Model', required=True), 
+        'max_level': fields.integer('Max Level', help='Specifies maximum level.'), 
+        'create_date': fields.datetime('Create Date', readonly=1), 
         'active': fields.boolean('Active', help="If the active field is set to true,\
-                     it will allow you to hide the rule without removing it."),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when\
-                     displaying a list of rules."),
-
+ it will allow you to hide the rule without removing it."), 
+        'sequence': fields.integer('Sequence', help="Gives the sequence order \
+when displaying a list of rules."), 
         'trg_date_type':  fields.selection([
-            ('none','None'),
-            ('create','Creation Date'),
-            ('action_last','Last Action Date'),
-            ('date','Date'),
-            ('deadline', 'Deadline'),
-            ], 'Trigger Date', size=16),
-        'trg_date_range': fields.integer('Delay after trigger date',help="Delay After Trigger Date,\
-                             specifies you can put a negative number " \
-                             "if you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."),
-        'trg_date_range_type': fields.selection([('minutes', 'Minutes'),('hour','Hours'),\
-                                ('day','Days'),('month','Months')], 'Delay type'),
+            ('none', 'None'), 
+            ('create', 'Creation Date'), 
+            ('action_last', 'Last Action Date'), 
+            ('date', 'Date'), 
+            ('deadline', 'Deadline'), 
+            ], 'Trigger Date', size=16), 
+        'trg_date_range': fields.integer('Delay after trigger date', \
+                                         help="Delay After Trigger Date,\
+specifies you can put a negative number. If you need a delay before the \
+trigger date, like sending a reminder 15 minutes before a meeting."), 
+        'trg_date_range_type': fields.selection([('minutes', 'Minutes'), ('hour', 'Hours'), \
+                                ('day', 'Days'), ('month', 'Months')], 'Delay type'), 
 
 
-        'trg_user_id':  fields.many2one('res.users', 'Responsible'),
+        'trg_user_id':  fields.many2one('res.users', 'Responsible'), 
 
-        'trg_partner_id': fields.many2one('res.partner', 'Partner'),
-        'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'),
-        'trg_state_from': fields.selection(_state_get, 'State', size=16),
-        'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16),
-        'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'),
-        'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'),
+        'trg_partner_id': fields.many2one('res.partner', 'Partner'), 
+        'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'), 
+        'trg_state_from': fields.selection(_state_get, 'State', size=16), 
+        'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), 
+        'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'), 
+        'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'), 
 
-        'act_method': fields.char('Call Object Method', size=64),
-        'act_user_id': fields.many2one('res.users', 'Set responsible to'),
-        'act_state': fields.selection(_state_get, 'Set state to', size=16),
-        'act_priority': fields.selection(_priority_get, 'Set priority to'),
-        'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="These people\
-                         will receive a copy of the future communication between partner and users by email"),
-
-        'act_remind_partner': fields.boolean('Remind Partner', help="Check this if\
-                         you want the rule to send a reminder by email to the partner."),
-        'act_remind_user': fields.boolean('Remind responsible', help="Check this if \
-                        you want the rule to send a reminder by email to the user."),
-        'act_reply_to': fields.char('Reply-To', size=64),
-        'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if\
-                         you want that all documents attached to the object be attached \
-                        to the reminder email sent."),
-
-        'act_mail_to_user': fields.boolean('Mail to responsible',help="Check this if \
-                            you want the rule to send an email to the responsible person."),
-        'act_mail_to_watchers': fields.boolean('Mail to watchers (CC)',help="Check this\
-                                 if you want the rule to mark CC(mail to any other person\
-                                  defined in actions)."),
-        'act_mail_to_email': fields.char('Mail to these emails', size=128,help="Email-id \
-                                of the persons whom mail is to be sent"),
-        'act_mail_body': fields.text('Mail body',help="Content of mail"),
-        'regex_name': fields.char('Regular Expression on Model Name', size=128),
-        'server_action_id': fields.many2one('ir.actions.server','Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"),
-        'filter_id':fields.many2one('ir.filters', 'Filter', required=False),
+        'act_method': fields.char('Call Object Method', size=64), 
+        'act_user_id': fields.many2one('res.users', 'Set responsible to'), 
+        'act_state': fields.selection(_state_get, 'Set state to', size=16), 
+        'act_priority': fields.selection(_priority_get, 'Set priority to'), 
+        'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="\
+These people will receive a copy of the future communication between partner \
+and users by email"), 
+        'act_remind_partner': fields.boolean('Remind Partner', help="Check \
+this if you want the rule to send a reminder by email to the partner."), 
+        'act_remind_user': fields.boolean('Remind responsible', help="Check \
+this if you want the rule to send a reminder by email to the user."), 
+        'act_reply_to': fields.char('Reply-To', size=64), 
+        'act_remind_attach': fields.boolean('Remind with attachment', help="Check this if you want that all documents attached to the object be attached to the reminder email sent."), 
+        'act_mail_to_user': fields.boolean('Mail to responsible', help="Check\
+ this if you want the rule to send an email to the responsible person."), 
+        'act_mail_to_watchers': fields.boolean('Mail to watchers (CC)', 
+                                                help="Check this if you want \
+the rule to mark CC(mail to any other person defined in actions)."), 
+        'act_mail_to_email': fields.char('Mail to these emails', size=128, \
+        help="Email-id of the persons whom mail is to be sent"), 
+        'act_mail_body': fields.text('Mail body', help="Content of mail"), 
+        'regex_name': fields.char('Regular Expression on Model Name', size=128), 
+        'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"), 
+        'filter_id':fields.many2one('ir.filters', 'Filter', required=False), 
     }
 
     _defaults = {
-        'active': lambda *a: True,
-        'max_level': lambda *a: 15,
-        'trg_date_type': lambda *a: 'none',
-        'trg_date_range_type': lambda *a: 'day',
-        'act_mail_to_user': lambda *a: 0,
-        'act_remind_partner': lambda *a: 0,
-        'act_remind_user': lambda *a: 0,
-        'act_mail_to_watchers': lambda *a: 0,
+        'active': lambda *a: True, 
+        'max_level': lambda *a: 15, 
+        'trg_date_type': lambda *a: 'none', 
+        'trg_date_range_type': lambda *a: 'day', 
+        'act_mail_to_user': lambda *a: 0, 
+        'act_remind_partner': lambda *a: 0, 
+        'act_remind_user': lambda *a: 0, 
+        'act_mail_to_watchers': lambda *a: 0, 
     }
 
     def format_body(self, body):
@@ -154,22 +151,22 @@ class base_action_rule(osv.osv):
             @param self: The object pointer """
 
         data = {
-            'object_id': obj.id,
-            'object_subject': hasattr(obj, 'name') and obj.name or False,
-            'object_date': hasattr(obj, 'date') and obj.date or False,
-            'object_description': hasattr(obj, 'description') and obj.description or False,
-            'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/',
+            'object_id': obj.id, 
+            'object_subject': hasattr(obj, 'name') and obj.name or False, 
+            'object_date': hasattr(obj, 'date') and obj.date or False, 
+            'object_description': hasattr(obj, 'description') and obj.description or False, 
+            'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/', 
             'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \
-                                    obj.user_id.address_id and obj.user_id.address_id.email) or '/',
+                                    obj.user_id.address_id and obj.user_id.address_id.email) or '/', 
             'object_user_phone': hasattr(obj, 'user_id') and (obj.user_id and\
-                                     obj.user_id.address_id and obj.user_id.address_id.phone) or '/',
-            'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/',
+                                     obj.user_id.address_id and obj.user_id.address_id.phone) or '/', 
+            'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/', 
             'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
-                                         obj.partner_address_id.email) or '/',
+                                         obj.partner_address_id.email) or '/', 
         }
         return self.format_body(body % data)
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from',False), context={}):
+    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context={}):
         """ send email
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -188,7 +185,7 @@ class base_action_rule(osv.osv):
         emailfrom = tools.ustr(emailfrom)
         reply_to = emailfrom
         if not emailfrom:
-            raise osv.except_osv(_('Error!'),
+            raise osv.except_osv(_('Error!'), 
                     _("No E-Mail ID Found for your Company address!"))
         return tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, openobject_id=str(obj.id))
 
@@ -243,7 +240,7 @@ class base_action_rule(osv.osv):
             @param context: A standard dictionary for contextual values """
 
         if action.server_action_id:
-            context.update({'active_id':obj.id,'active_ids':[obj.id]})
+            context.update({'active_id':obj.id, 'active_ids':[obj.id]})
             self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context)
         write = {}
         if hasattr(obj, 'user_id') and action.act_user_id:
@@ -322,10 +319,10 @@ class base_action_rule(osv.osv):
                     base = mx.DateTime.strptime(obj.date, '%Y-%m-%d %H:%M:%S')
                 if base:
                     fnct = {
-                        'minutes': lambda interval: mx.DateTime.RelativeDateTime(minutes=interval),
-                        'day': lambda interval: mx.DateTime.RelativeDateTime(days=interval),
-                        'hour': lambda interval: mx.DateTime.RelativeDateTime(hours=interval),
-                        'month': lambda interval: mx.DateTime.RelativeDateTime(months=interval),
+                        'minutes': lambda interval: mx.DateTime.RelativeDateTime(minutes=interval), 
+                        'day': lambda interval: mx.DateTime.RelativeDateTime(days=interval), 
+                        'hour': lambda interval: mx.DateTime.RelativeDateTime(hours=interval), 
+                        'month': lambda interval: mx.DateTime.RelativeDateTime(months=interval), 
                     }
                     d = base + fnct[action.trg_date_range_type](action.trg_date_range)
                     dt = d.strftime('%Y-%m-%d %H:%M:%S')
@@ -367,7 +364,7 @@ class base_action_rule(osv.osv):
         return True
 
     _constraints = [
-        (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']),
+        (_check_mail, 'Error: The mail is not well formated', ['act_mail_body']), 
     ]
 
 base_action_rule()
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 47e02b9308f..82c60e64f23 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -160,8 +160,8 @@ class base_action_rule(osv.osv):
         'regex_history' : fields.char('Regular Expression on Case History', size=128),
         'act_section_id': fields.many2one('crm.case.section', 'Set Team to'),
         'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
-        'act_mail_to_partner': fields.boolean('Mail to partner',help="Check this \
-                                if you want the rule to send an email to the partner."),
+        'act_mail_to_partner': fields.boolean('Mail to partner',help="Check \
+this if you want the rule to send an email to the partner."),
     }
     
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a24143488ad..0b970da2bca 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -100,9 +100,9 @@ class crm_lead(osv.osv, crm_case):
                         select=True, help='Sales team to which Case belongs to.\
                              Define Responsible user and Email account for mail gateway.'), 
         'create_date': fields.datetime('Creation Date' , readonly=True),
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
-                             will receive a copy of the future" \
-                            " communication between partner and users by email"),
+        'email_cc': fields.text('Watchers Emails', size=252 , help="These \
+people will receive a copy of the future communication between partner \
+and users by email"),
         'description': fields.text('Description'), 
         'write_date': fields.datetime('Update Date' , readonly=True), 
 
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index e0044d8ecaa..63e785978a9 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -69,8 +69,8 @@ class crm_claim(osv.osv, crm.crm_case):
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
         'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
-                             will receive a copy of the future" \
-                            " communication between partner and users by email"), 
+ will receive a copy of the future" \
+" communication between partner and users by email"), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'partner_name': fields.char("Employee's Name", size=64), 
         'partner_mobile': fields.char('Mobile', size=32), 
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index adc34900a89..98bd7446068 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -46,8 +46,8 @@ class crm_fundraising(osv.osv, crm.crm_case):
             'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
             'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
-                                 will receive a copy of the future" \
-                                " communication between partner and users by email"), 
+ will receive a copy of the future" \
+" communication between partner and users by email"), 
             'email_from': fields.char('Email', size=128, help="These people will receive email."), 
             'date_closed': fields.datetime('Closed', readonly=True), 
             'date': fields.datetime('Date'), 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index f304cd860a0..ad2c6cbe858 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -47,17 +47,15 @@ class crm_helpdesk(osv.osv, crm.crm_case):
             'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
             'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
-                                 will receive a copy of the future" \
-                                " communication between partner and users by email"), 
+ will receive a copy of the future" \
+" communication between partner and users by email"), 
             'email_from': fields.char('Email', size=128, help="These people will receive email."), 
             'date': fields.datetime('Date'), 
             'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
             'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
             'canal_id': fields.many2one('res.partner.canal', 'Channel', \
                             help="The channels represent the different communication \
-                             modes available with the customer." \
-                            " With each commercial opportunity, you can indicate\
-                             the canall which is this opportunity source."), 
+ modes available with the customer."), 
             'planned_revenue': fields.float('Planned Revenue'), 
             'planned_cost': fields.float('Planned Costs'), 
             'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index b37ea9597bf..7bfb2d0a89c 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -90,6 +90,7 @@
                         <field name="id" select="1"/>
                         <field name="active"/>
                         <field name="categ_id"/>
+                        <field name="canal_id"/>
                         <field name="som"/>
                         <separator colspan="4" string="Dates"/>
                         <field name="create_date"/>

From de0f1d786380a43a96af7ea46a3eef1a45cabf65 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 10 May 2010 20:32:49 +0200
Subject: [PATCH 112/146] [FIX] multi-company

bzr revid: fp@tinyerp.com-20100510183249-s1k1c0o1umdh2m6r
---
 bin/addons/base/res/res_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 341680a23ac..1542b58935c 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -212,7 +212,7 @@ class users(osv.osv):
 
 
     def _check_company(self, cr, uid, ids, context=None):
-        return all(this.company_id in this.company_ids for this in self.browse(cr, uid, ids, context))
+        return all(((this.company_id in this.company_ids) or not this.company_ids) for this in self.browse(cr, uid, ids, context))
 
     _constraints = [
         (_check_company, 'The chosen company is not in the allowed companies', ['company_id', 'company_ids']),

From b3fbffbcfba2e02584021c7c9b09b793a77b01e5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 11 May 2010 14:29:48 +0530
Subject: [PATCH 113/146] [IMP]: base_action_rule: Improvement in view, Added
 missing changes back

bzr revid: rpa@tinyerp.com-20100511085948-qkgstav1qlouh84y
---
 addons/base_action_rule/base_action_rule.py   | 36 +++++--------
 .../base_action_rule_view.xml                 | 53 ++++++++++---------
 addons/crm/crm_action_rule_view.xml           | 12 +++++
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index b6032731fbd..a1213dd7542 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -44,15 +44,6 @@ class base_action_rule(osv.osv):
         return self.state_get(cr, uid, context=context)
 
    
-    def _priority_get(self, cr, uid, context={}):
-        """ Get Priority
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
-
-        return self.priority_get(cr, uid, context=context)
-
     def state_get(self, cr, uid, context={}):
         """ Get State
             @param self: The object pointer
@@ -72,7 +63,7 @@ class base_action_rule(osv.osv):
         return [('', '')]
 
     _columns = {
-        'name': fields.many2one('ir.model', 'Model', required=True), 
+        'name': fields.many2one('ir.model', 'Object', required=True), 
         'max_level': fields.integer('Max Level', help='Specifies maximum level.'), 
         'create_date': fields.datetime('Create Date', readonly=1), 
         'active': fields.boolean('Active', help="If the active field is set to true,\
@@ -100,13 +91,10 @@ trigger date, like sending a reminder 15 minutes before a meeting."),
         'trg_partner_categ_id': fields.many2one('res.partner.category', 'Partner Category'), 
         'trg_state_from': fields.selection(_state_get, 'State', size=16), 
         'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16), 
-        'trg_priority_from': fields.selection(_priority_get, 'Minimum Priority'), 
-        'trg_priority_to': fields.selection(_priority_get, 'Maximum Priority'), 
 
         'act_method': fields.char('Call Object Method', size=64), 
         'act_user_id': fields.many2one('res.users', 'Set responsible to'), 
         'act_state': fields.selection(_state_get, 'Set state to', size=16), 
-        'act_priority': fields.selection(_priority_get, 'Set priority to'), 
         'act_email_cc': fields.char('Add watchers (Cc)', size=250, help="\
 These people will receive a copy of the future communication between partner \
 and users by email"), 
@@ -127,6 +115,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         'regex_name': fields.char('Regular Expression on Model Name', size=128), 
         'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"), 
         'filter_id':fields.many2one('ir.filters', 'Filter', required=False), 
+        'domain':fields.char('Domain', size=124, required=False, readonly=False),
     }
 
     _defaults = {
@@ -138,8 +127,11 @@ the rule to mark CC(mail to any other person defined in actions)."),
         'act_remind_partner': lambda *a: 0, 
         'act_remind_user': lambda *a: 0, 
         'act_mail_to_watchers': lambda *a: 0, 
+        'domain': lambda *a: '[]'
     }
-
+    
+    _order = 'sequence'
+    
     def format_body(self, body):
         """ Foramat Action rule's body
             @param self: The object pointer """
@@ -198,6 +190,10 @@ the rule to mark CC(mail to any other person defined in actions)."),
             @param context: A standard dictionary for contextual values """
 
         ok = True
+        if eval(action.domain):
+            obj_ids = obj._table.search(cr, uid, eval(action.domain), context=context)
+            if not obj.id in obj_ids:
+                ok = False
         if hasattr(obj, 'user_id'):
             ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id)
         if hasattr(obj, 'partner_id'):
@@ -215,10 +211,6 @@ the rule to mark CC(mail to any other person defined in actions)."),
         if state_to:
             ok = ok and (not action.trg_state_to or action.trg_state_to==state_to)
 
-        if hasattr(obj, 'priority'):
-            ok = ok and (not action.trg_priority_from or action.trg_priority_from>=obj.priority)
-            ok = ok and (not action.trg_priority_to or action.trg_priority_to<=obj.priority)
-
         reg_name = action.regex_name
         result_name = True
         if reg_name:
@@ -256,10 +248,6 @@ the rule to mark CC(mail to any other person defined in actions)."),
             obj.categ_id = action.act_categ_id
             write['categ_id'] = action.act_categ_id.id
 
-        if hasattr(obj, 'priority') and action.act_priority:
-            obj.priority = action.act_priority
-            write['priority'] = action.act_priority
-
         model_obj.write(cr, uid, [obj.id], write, context)
 
         if hasattr(model_obj, 'remind_user') and action.act_remind_user:
@@ -294,7 +282,9 @@ the rule to mark CC(mail to any other person defined in actions)."),
 
         if not scrit:
             scrit = []
-        for action in self.browse(cr, uid, ids):
+        cr.execute("select id from base_action_rule order by sequence")
+        rule_ids = map(lambda x: x[0], cr.fetchall())
+        for action in self.browse(cr, uid, rule_ids):
             level = action.max_level
             if not level:
                 break
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 9d659a72a87..ce07647dc92 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -16,7 +16,9 @@
                 <form string="Action Rule">
                     <field name="name" select="1"/>
                     <field name="active"/>
+                    <field name="sequence"/>
                     <field name="max_level" />
+                    <field name="domain" colspan="4"/>
                     <notebook colspan="4">
                         <page string="Conditions">
                             <group col="2" colspan="2" name="model">
@@ -34,46 +36,46 @@
                                 <field name="trg_state_from"/>
                                 <field name="trg_state_to"/>
                             </group>
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Conditions on Priority Range"/>
-                                <field name="trg_priority_from"/>
-                                <field name="trg_priority_to"/>
-                            </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Conditions on Timing"/>
                                 <field name="trg_date_type"/>
-                                <label align="1.0" string="Delay After Trigger Date:"/>
-                                <group col="2" colspan="1">
-                                    <field name="trg_date_range" nolabel="1"/>
+                                <group col="3" colspan="2" attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
+                                    <field name="trg_date_range" string="Delay After Trigger Date"/>
                                     <field name="trg_date_range_type" nolabel="1"/>
-                                </group>
+	                            </group>
                             </group>
                             <separator colspan="4" string="Note"/>
-                            <label align="0.0"  string="The rule use a AND operator. The model must match all non empty fields so that the rule execute the action described in the 'Actions' tab." colspan="4"/>
+                            <label align="0.0" colspan="4" width="900"
+                            	string="The rule use a AND operator. The model must match all non empty fields so that the rule execute the action described in the 'Actions' tab." />
                         </page>
                         <page string="Actions">
                             <separator colspan="4" string="Fields to Change"/>
                             <field name="act_user_id"/>
                             <field name="act_state"/>
-                            <field name="act_priority"/>
-                            <separator colspan="4" string="E-Mail Reminders (includes the content of the object)"/>
-                            <field name="act_remind_partner"/>
-                            <field name="act_remind_attach"/>
-                            <field name="act_remind_user"/>
-                            <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                                <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
-                            </group>
-                            <field colspan="4" name="act_email_cc"/>
                             <separator colspan="4" string="Server Action to be Triggered"/>
                             <field name="server_action_id"/>
                             <field name="filter_id"/>
                         </page>
                         <page string="E-Mail Actions">
-                            <separator colspan="4" string="Template of Email to Send"/>
-                            <field name="act_mail_to_user"/>
-                            <field name="act_mail_to_watchers"/>
-                            <field colspan="4" name="act_mail_to_email"/>
-                            <field colspan="4" name="act_mail_body" attrs="{'required':[('act_remind_user','=',True)]}"/>
+<!--                        	<group col="4" colspan="2">-->
+	                            <separator colspan="4" string="Template of Email to Send"/>
+	                            <field name="act_mail_to_watchers"/>
+	                            <field name="act_mail_to_user"/>
+	                            <field colspan="4" name="act_mail_to_email"/>
+<!--	                        </group>-->
+<!--	                        <group col="4" colspan="2">-->
+	                            <separator colspan="4" string="E-Mail Reminders (includes the content of the object)"/>
+	                            <field name="act_remind_partner"/>
+	                            <field name="act_remind_attach"/>
+	                            <field name="act_remind_user"/>
+	                            <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
+	                                <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
+	                            </group>
+	                            <field colspan="4" name="act_email_cc"/>
+<!--	                        </group>-->
+                            <separator colspan="4" string="Mail Body"/>
+                            <field colspan="4" name="act_mail_body" height="250"
+                            	nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
                             <separator colspan="4" string="Special Keywords to Be Used in The Body"/>
                             <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
                             <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
@@ -84,7 +86,6 @@
                             <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
                             <label align="0.0" string="%%(object_user_email)s = Responsible email" colspan="2"/>
                             <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
-                            <label align="0.0" string="%% = The &apos;%%&apos; Character" colspan="2"/>
                         </page>
                     </notebook>
                 </form>
@@ -100,7 +101,9 @@
             <field name="arch" type="xml">
                 <tree string="Action Rule">
                     <field name="name" colspan="4"/>
+                    <field name="sequence"/>
                     <field name="max_level"/>
+                    <field name="domain"/>
                 </tree>
             </field>
            </record>
diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml
index 6211714232c..96f8d2f04bf 100644
--- a/addons/crm/crm_action_rule_view.xml
+++ b/addons/crm/crm_action_rule_view.xml
@@ -43,9 +43,21 @@
                 <field name="act_user_id" position="after">
                     <field name="act_section_id"/>
                     <field name="act_categ_id"/>
+                </field>
+            </field>
+       </record>
+       
+       <record id="view_base_action_rule_line_form4" model="ir.ui.view">
+            <field name="name">base.action.rule.form4.inherit</field>
+            <field name="model">base.action.rule</field>
+            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="act_mail_to_watchers" position="before">
                     <field name="act_mail_to_partner"/>
                 </field>
             </field>
        </record>
+
     </data>
 </openerp>

From b16cec65d225cfde7d1e00f11c72266682ccd3c6 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 11 May 2010 15:10:59 +0530
Subject: [PATCH 114/146] [ADD,IMP]:account chart for configurable chart and
 improvements

bzr revid: nch@tinyerp.com-20100511094059-oiz2eyhw54su4lus
---
 addons/account/account_installer.xml          |   8 +-
 addons/account/configurable_account_chart.xml | 516 ++++++++++++++++++
 addons/account/installer.py                   | 309 +++++++++--
 addons/base_setup/__init__.py                 |  17 +-
 addons/base_setup/base_setup_data.xml         |  10 +-
 addons/base_setup/base_setup_installer.xml    |   4 +-
 addons/base_setup/gtk_contact_form.py         |  10 +-
 addons/hr/hr_installer.xml                    |   1 -
 addons/knowledge/knowledge_installer.xml      |   5 +-
 addons/mrp/mrp_installer.xml                  |   1 -
 .../profile_accounting/profile_accounting.xml |   3 +
 addons/profile_tools/misc_tools_installer.xml |   1 -
 addons/project/project_installer.xml          |   1 -
 addons/purchase/wizard/purchase_installer.xml |   1 -
 .../report_designer_installer.xml             |   1 -
 addons/sale/sale_view.xml                     |   1 -
 addons/thunderbird/thunderbird_installer.xml  |  11 +-
 17 files changed, 830 insertions(+), 70 deletions(-)
 create mode 100644 addons/account/configurable_account_chart.xml

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 59c1240843b..f67946ff7a2 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -26,19 +26,15 @@
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>23</attribute>
               <attribute name='string'></attribute>
-	      </xpath>
-	       <xpath expr='//group[@string="progress"]' position='attributes'>
-              <attribute name='width'>190</attribute>
-              <attribute name='string'></attribute>
 	      </xpath>
 	      <group colspan="8">
 	      <group colspan="4" height="450" width="600">
             <field name="charts"/>
-            <group colspan="4" attrs="{'invisible':[('charts','!=','l10n_chart_configurable')]}">
+            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
             	<field name="sale_tax" colspan="2"/>
             	<field name="purchase_tax" colspan="2"/>
             </group>
-             <group colspan="4" attrs="{'invisible':[('charts','!=','l10n_chart_configurable')]}">
+             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
             	<separator col="4" colspan="4" string="Bank and Cost Account"/>
             	 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
             	 	<form string="Bank Information">
diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
new file mode 100644
index 00000000000..a6b271bedcb
--- /dev/null
+++ b/addons/account/configurable_account_chart.xml
@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+		 <!-- Types -->
+	 <record model="account.account.type" id="conf_account_type_receivable" >
+	      <field name="name">Receivable</field>
+	      <field name="code">receivable</field>
+	      <field name="close_method">unreconciled</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_payable" >
+	      <field name="name">Payable</field>
+	      <field name="code">payable</field>
+	      <field name="close_method">unreconciled</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_view">
+	      <field name="name">View</field>
+	      <field name="code">view</field>
+	      <field name="close_method">none</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_income" >
+	      <field name="name">Income</field>
+	      <field name="code">income</field>
+	      <field name="close_method">none</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_expense">
+	      <field name="name">Expense</field>
+	      <field name="code">expense</field>
+	      <field name="close_method">none</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_tax">
+	      <field name="name">Tax</field>
+	      <field name="code">tax</field>
+	      <field name="close_method">unreconciled</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_cash">
+	      <field name="name">Cash</field>
+	      <field name="code">cash</field>
+	      <field name="close_method">balance</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_asset">
+	      <field name="name">Asset</field>
+	      <field name="code">asset</field>
+	      <field name="close_method">balance</field>
+	    </record>
+
+	    <record model="account.account.type" id="conf_account_type_equity">
+	      <field name="name">Equity</field>
+	      <field name="code">equity</field>
+	      <field name="close_method">balance</field>
+	    </record>
+
+	     <record model="account.account.type" id="conf_account_type_bnk">
+	      <field name="name">Bank</field>
+	      <field name="code">bank</field>
+	      <field name="close_method">balance</field>
+	    </record>
+	     <record model="account.account.type" id="conf_account_type_chk">
+	      <field name="name">Check</field>
+	      <field name="code">check</field>
+	      <field name="close_method">balance</field>
+	    </record>
+
+
+
+        <!-- Account Templates-->
+        <record id="conf_chart0" model="account.account.template">
+            <field name="code">0</field>
+            <field name="name">Configurable Account Chart</field>
+            <field eval="0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <!-- Balance Sheet -->
+
+        <record id="conf_bal" model="account.account.template">
+        	<field name="code">1</field>
+            <field name="name">Balance Sheet</field>
+            <field ref="conf_chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_fas" model="account.account.template">
+        	<field name="code">10</field>
+            <field name="name">Fixed Assets</field>
+            <field ref="conf_bal" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_xfa" model="account.account.template">
+        	<field name="code">100</field>
+            <field name="name">Fixed Asset Account</field>
+            <field ref="conf_fas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_asset"/>
+        </record>
+
+        <record id="conf_nca" model="account.account.template">
+        	<field name="code">11</field>
+            <field name="name">Net Current Assets</field>
+            <field ref="conf_bal" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_cas" model="account.account.template">
+        	<field name="code">110</field>
+            <field name="name">Current Assets</field>
+	        <field ref="conf_nca" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_stk" model="account.account.template">
+            <field name="code">1101</field>
+            <field name="name">Purchased Stocks</field>
+            <field ref="conf_cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_asset"/>
+        </record>
+
+        <record id="conf_a_recv" model="account.account.template">
+            <field name="code">1102</field>
+            <field name="name">Debtors</field>
+            <field ref="conf_cas" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="conf_account_type_receivable"/>
+        </record>
+
+        <!-- <record id="account.property_account_receivable" model="ir.property">
+            <field eval="'account.account,'+str(a_recv)" name="value"/>
+        </record> -->
+
+        <record id="conf_ova" model="account.account.template">
+        	<field name="code">1103</field>
+            <field name="name">Output VAT</field>
+            <field ref="conf_cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_tax"/>
+        </record>
+
+        <record id="conf_bnk" model="account.account.template">
+        	<field name="code">1104</field>
+            <field name="name">Bank Current Account</field>
+            <field ref="conf_cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_cash"/>
+        </record>
+
+        <record id="conf_cash" model="account.account.template">
+            <field name="code">1105</field>
+            <field name="name">Cash</field>
+            <field ref="conf_cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_cash"/>
+        </record>
+
+        <record id="conf_cli" model="account.account.template">
+        	<field name="code">111</field>
+            <field name="name">Current Liabilities</field>
+            <field ref="conf_nca" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_a_pay" model="account.account.template">
+            <field name="code">1111</field>
+            <field name="name">Creditors</field>
+            <field ref="conf_cli" name="parent_id"/>
+            <field name="type">payable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="conf_account_type_payable"/>
+        </record>
+
+        <!-- <record id="account.property_account_payable" model="ir.property">
+            <field eval="'account.account,'+str(a_pay)" name="value"/>
+        </record>-->
+
+        <record id="conf_iva" model="account.account.template">
+        	<field name="code">1112</field>
+            <field name="name">Input VAT</field>
+            <field ref="conf_cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_tax"/>
+        </record>
+
+        <!-- Profit and Loss -->
+
+        <record id="conf_gpf" model="account.account.template">
+        	<field name="code">2</field>
+            <field name="name">Profit and Loss</field>
+            <field ref="conf_chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_rev" model="account.account.template">
+			<field name="code">20</field>
+            <field name="name">Revenue</field>
+            <field ref="conf_gpf" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_a_sale" model="account.account.template">
+            <field name="code">200</field>
+            <field name="name">Product Sales</field>
+            <field ref="conf_rev" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_income"/>
+        </record>
+
+        <!-- <record id="account.property_account_income_categ" model="ir.property">
+            <field eval="'account.account,'+str(a_sale)" name="value"/>
+        </record> -->
+
+        <record id="conf_cos" model="account.account.template">
+        	<field name="code">21</field>
+            <field name="name">Cost of Sales</field>
+            <field ref="conf_gpf" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_cog" model="account.account.template">
+            <field name="code">210</field>
+            <field name="name">Cost of Goods Sold</field>
+            <field ref="conf_cos" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_expense"/>
+        </record>
+
+        <record id="conf_ovr" model="account.account.template">
+        	<field name="code">22</field>
+            <field name="name">Overheads</field>
+            <field ref="conf_gpf" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="conf_account_type_view"/>
+        </record>
+
+        <record id="conf_a_expense" model="account.account.template">
+            <field name="code">220</field>
+            <field name="name">Expenses</field>
+            <field ref="conf_ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="conf_account_type_expense"/>
+        </record>
+
+        <!-- <record id="account.property_account_expense_categ" model="ir.property">
+            <field eval="'account.account,'+str(a_expense)" name="value"/>
+        </record> -->
+
+        <!-- Taxes -->
+          <!-- VAT Code Definitions -->
+
+        <!-- Invoiced VAT -->
+
+        <!-- Input VAT -->
+
+        <record id="vat_code_chart_root" model="account.tax.code.template">
+            <field name="name">Plan Fees </field>
+        </record>
+
+        <record id="vat_code_balance_net" model="account.tax.code.template">
+            <field name="name">VAT Balance to Pay</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+        </record>
+
+        <record id="vat_code_input" model="account.tax.code.template">
+            <field name="name">Input VAT</field>
+            <field name="parent_id" ref="vat_code_balance_net"/>
+            <field eval="-1" name="sign"/>
+        </record>
+
+        <record id="vat_code_input_S" model="account.tax.code.template">
+            <field name="name">Input VAT Rate S (15%)</field>
+            <field name="parent_id" ref="vat_code_input"/>
+        </record>
+
+        <record id="vat_code_input_R" model="account.tax.code.template">
+            <field name="name">Input VAT Rate R (5%)</field>
+            <field name="parent_id" ref="vat_code_input"/>
+        </record>
+
+        <!-- Output VAT -->
+
+        <record id="vat_code_output" model="account.tax.code.template">
+            <field name="name">Output VAT</field>
+            <field name="parent_id" ref="vat_code_balance_net"/>
+        </record>
+
+        <record id="vat_code_output_S" model="account.tax.code.template">
+            <field name="name">Output VAT Rate S (15%)</field>
+            <field name="parent_id" ref="vat_code_output"/>
+        </record>
+
+        <record id="vat_code_output_R" model="account.tax.code.template">
+            <field name="name">Output VAT Rate R (5%)</field>
+            <field name="parent_id" ref="vat_code_output"/>
+        </record>
+
+        <!-- Invoiced Base of VAT -->
+
+        <!-- Purchases -->
+
+        <record id="vat_code_base_net" model="account.tax.code.template">
+            <field name="name">Tax Bases</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+        </record>
+
+        <record id="vat_code_base_purchases" model="account.tax.code.template">
+            <field name="name">Taxable Purchases Base</field>
+            <field name="parent_id" ref="vat_code_base_net"/>
+        </record>
+
+        <record id="vat_code_purch_S" model="account.tax.code.template">
+            <field name="name">Taxable Purchases Rated S (15%)</field>
+            <field name="parent_id" ref="vat_code_base_purchases"/>
+        </record>
+
+        <record id="vat_code_purch_R" model="account.tax.code.template">
+            <field name="name">Taxable Purchases Rated R (5%)</field>
+            <field name="parent_id" ref="vat_code_base_purchases"/>
+        </record>
+
+        <record id="vat_code_purch_Z" model="account.tax.code.template">
+            <field name="name">Taxable Purchases Rated Z (0%)</field>
+            <field name="parent_id" ref="vat_code_base_purchases"/>
+        </record>
+
+        <record id="vat_code_purch_X" model="account.tax.code.template">
+            <field name="name">Taxable Purchases Type X (Exempt)</field>
+            <field name="parent_id" ref="vat_code_base_purchases"/>
+        </record>
+
+        <record id="vat_code_purch_O" model="account.tax.code.template">
+            <field name="name">Taxable Purchases Type O (Out of scope)</field>
+            <field name="parent_id" ref="vat_code_base_purchases"/>
+        </record>
+
+        <!-- Sales -->
+
+        <record id="vat_code_base_sales" model="account.tax.code.template">
+            <field name="name">Base of Taxable Sales</field>
+            <field name="parent_id" ref="vat_code_base_net"/>
+        </record>
+
+        <record id="vat_code_sales_S" model="account.tax.code.template">
+            <field name="name">Taxable Sales Rated S (15%)</field>
+            <field name="parent_id" ref="vat_code_base_sales"/>
+        </record>
+
+        <record id="vat_code_sales_R" model="account.tax.code.template">
+            <field name="name">Taxable Sales Rated R (5%)</field>
+            <field name="parent_id" ref="vat_code_base_sales"/>
+        </record>
+
+        <record id="vat_code_sales_Z" model="account.tax.code.template">
+            <field name="name">Taxable Sales Rated Z (0%)</field>
+            <field name="parent_id" ref="vat_code_base_sales"/>
+        </record>
+
+        <record id="vat_code_sales_X" model="account.tax.code.template">
+            <field name="name">Taxable Sales Type X (Exempt)</field>
+            <field name="parent_id" ref="vat_code_base_sales"/>
+        </record>
+
+        <record id="vat_code_sales_O" model="account.tax.code.template">
+            <field name="name">Taxable Sales Type O (Out of scope)</field>
+            <field name="parent_id" ref="vat_code_base_sales"/>
+        </record>
+
+	    <record id="configurable_chart_template" model="account.chart.template">
+            <field name="name">Configurable Account Chart Template</field>
+            <field name="account_root_id" ref="conf_chart0"/>
+            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
+          	<field name="bank_account_view_id" ref="conf_bnk"/>
+            <field name="property_account_receivable" ref="conf_a_recv"/>
+            <field name="property_account_payable" ref="conf_a_pay"/>
+            <field name="property_account_expense_categ" ref="conf_a_expense"/>
+            <field name="property_account_income_categ" ref="conf_a_sale"/>
+        </record>
+
+	 <!-- VAT Codes -->
+        <!-- Purchases + Input VAT -->
+
+        <record id="ivats" model="account.tax.template">
+       	 	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">IVAT S</field>
+            <field eval="0.15" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
+            <field name="base_code_id" ref="vat_code_purch_S"/>
+            <field name="tax_code_id" ref="vat_code_input_S"/>
+            <field name="ref_base_code_id" ref="vat_code_purch_S"/>
+            <field name="ref_tax_code_id" ref="vat_code_input_S"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="ivatr" model="account.tax.template">
+       		<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">IVAT R</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_iva"/>
+            <field name="account_paid_id" ref="conf_iva"/>
+            <field name="base_code_id" ref="vat_code_purch_R"/>
+            <field name="tax_code_id" ref="vat_code_input_R"/>
+            <field name="ref_base_code_id" ref="vat_code_purch_R"/>
+            <field name="ref_tax_code_id" ref="vat_code_input_R"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="ivatz" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">IVAT Z</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_purch_Z"/>
+            <field name="ref_base_code_id" ref="vat_code_purch_Z"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="ivatx" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">IVAT X</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_purch_X"/>
+            <field name="ref_base_code_id" ref="vat_code_purch_X"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="ivato" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">IVAT O</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_purch_O"/>
+            <field name="ref_base_code_id" ref="vat_code_purch_O"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- Sales + Output VAT -->
+
+        <record id="ovats" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">OVAT S</field>
+            <field eval="0.15" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_ova"/>
+            <field name="account_paid_id" ref="conf_ova"/>
+            <field name="base_code_id" ref="vat_code_sales_S"/>
+            <field name="tax_code_id" ref="vat_code_output_S"/>
+            <field name="ref_base_code_id" ref="vat_code_sales_S"/>
+            <field name="ref_tax_code_id" ref="vat_code_output_S"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="ovatr" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">OVAT R</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="conf_ova"/>
+            <field name="account_paid_id" ref="conf_ova"/>
+            <field name="base_code_id" ref="vat_code_sales_R"/>
+            <field name="tax_code_id" ref="vat_code_output_R"/>
+            <field name="ref_base_code_id" ref="vat_code_sales_R"/>
+            <field name="ref_tax_code_id" ref="vat_code_output_R"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="ovatz" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">OVAT Z</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_sales_Z"/>
+            <field name="ref_base_code_id" ref="vat_code_sales_Z"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="ovatx" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">OVAT X</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_sales_X"/>
+            <field name="ref_base_code_id" ref="vat_code_sales_X"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="ovato" model="account.tax.template">
+        	<field name="chart_template_id" ref="configurable_chart_template"/>
+            <field name="name">OVAT O</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_sales_O"/>
+            <field name="ref_base_code_id" ref="vat_code_sales_O"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 760518f9006..fd0d3836581 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -21,10 +21,12 @@
 import time
 import datetime
 from dateutil.relativedelta import relativedelta
-
+from tools.translate import _
 from operator import itemgetter
 from osv import fields, osv
 import netsvc
+import tools
+from os.path import join as opj
 
 class account_installer(osv.osv_memory):
     _name = 'account.installer'
@@ -37,19 +39,9 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids)),
                    key=itemgetter(1)))
+        charts.insert(0,('configurable','Configurable Chart of Account'))
         return charts
 
-#    def default_get(self, cr, uid, fields_list=None, context=None):
-#         ''' set default accounts'''
-#         defaults = super(account_installer, self)\
-#         .default_get(cr, uid, fields_list=fields_list, context=context)
-#         account = self.pool.get('account.bank.accounts.wizard')
-#         ids = []
-#         for acc in ('Current','Deposit'):
-#             ids.append(account.create(cr, uid, {'acc_name':acc,'account_type':'cash','bank_account_id':self}))
-#         defaults.update({'bank_accounts_id':[(6,0,ids)]})
-#         return defaults
-
     _columns = {
         # Accounting
         'charts':fields.selection(_get_charts, 'Chart of Accounts',
@@ -84,7 +76,7 @@ class account_installer(osv.osv_memory):
         'period':lambda *a:'month',
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
-        'charts':'l10n_chart_configurable',
+        'charts':'configurable',
         }
 
     def on_change_start_date(self, cr, uid, id, start_date):
@@ -94,37 +86,280 @@ class account_installer(osv.osv_memory):
             return {'value':{'date_stop':end_date.strftime('%Y-%m-%d')}}
         return {}
 
+    def generate_configurable_chart(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        obj_multi = self.pool.get('account.chart.template').browse(cr,uid, id)
+
+        obj_acc = self.pool.get('account.account')
+        obj_acc_tax = self.pool.get('account.tax')
+        obj_journal = self.pool.get('account.journal')
+        obj_sequence = self.pool.get('ir.sequence')
+        obj_acc_template = self.pool.get('account.account.template')
+        obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
+        obj_fiscal_position = self.pool.get('account.fiscal.position')
+        company_id = self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id
+        seq_journal = True
+
+        # Creating Account
+        obj_acc_root = obj_multi.account_root_id
+        tax_code_root_id = obj_multi.tax_code_root_id.id
+
+        #new code
+        acc_template_ref = {}
+        tax_template_ref = {}
+        tax_code_template_ref = {}
+        todo_dict = {}
+
+        #create all the tax code
+        children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
+        children_tax_code_template.sort()
+        for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template):
+            vals={
+                'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name,
+                'code': tax_code_template.code,
+                'info': tax_code_template.info,
+                'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
+                'company_id': company_id.id,
+                'sign': tax_code_template.sign,
+            }
+            new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals)
+            #recording the new tax code to do the mapping
+            tax_code_template_ref[tax_code_template.id] = new_tax_code
+
+        #create all the tax
+        for tax in obj_multi.tax_template_ids:
+            #create it
+            vals_tax = {
+                'name':tax.name,
+                'sequence': tax.sequence,
+                'amount':tax.amount,
+                'type':tax.type,
+                'applicable_type': tax.applicable_type,
+                'domain':tax.domain,
+                'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
+                'child_depend': tax.child_depend,
+                'python_compute': tax.python_compute,
+                'python_compute_inv': tax.python_compute_inv,
+                'python_applicable': tax.python_applicable,
+                'tax_group':tax.tax_group,
+                'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
+                'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
+                'base_sign': tax.base_sign,
+                'tax_sign': tax.tax_sign,
+                'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
+                'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
+                'ref_base_sign': tax.ref_base_sign,
+                'ref_tax_sign': tax.ref_tax_sign,
+                'include_base_amount': tax.include_base_amount,
+                'description':tax.description,
+                'company_id': company_id.id,
+                'type_tax_use': tax.type_tax_use
+            }
+            new_tax = obj_acc_tax.create(cr,uid,vals_tax)
+            #as the accounts have not been created yet, we have to wait before filling these fields
+            todo_dict[new_tax] = {
+                'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
+                'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
+            }
+            tax_template_ref[tax.id] = new_tax
+
+        #deactivate the parent_store functionnality on account_account for rapidity purpose
+        self.pool._init = True
+
+        children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
+        children_acc_template.sort()
+        for account_template in obj_acc_template.browse(cr, uid, children_acc_template):
+            tax_ids = []
+            for tax in account_template.tax_ids:
+                tax_ids.append(tax_template_ref[tax.id])
+            #create the account_account
+
+            dig = 6
+            code_main = account_template.code and len(account_template.code) or 0
+            code_acc = account_template.code or ''
+            if code_main>0 and code_main<=dig and account_template.type != 'view':
+                code_acc=str(code_acc) + (str('0'*(dig-code_main)))
+            vals={
+                'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name,
+                #'sign': account_template.sign,
+                'currency_id': account_template.currency_id and account_template.currency_id.id or False,
+                'code': code_acc,
+                'type': account_template.type,
+                'user_type': account_template.user_type and account_template.user_type.id or False,
+                'reconcile': account_template.reconcile,
+                'shortcut': account_template.shortcut,
+                'note': account_template.note,
+                'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
+                'tax_ids': [(6,0,tax_ids)],
+                'company_id': company_id.id,
+            }
+            new_account = obj_acc.create(cr,uid,vals)
+            acc_template_ref[account_template.id] = new_account
+            if account_template.name == 'Bank Current Account':
+                cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
+                cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id']
+
+                bank_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_bnk')
+                bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'])[0]['res_id']
+
+                check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk')
+                check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'])[0]['res_id']
+
+                record = self.browse(cr, uid, ids, context=context)[0]
+                code_cnt = 1
+                for val in record.bank_accounts_id:
+                    if val.account_type == 'cash':type = cash_type_id
+                    elif val.account_type == 'bank':type = bank_type_id
+                    else:type = check_type_id
+                    vals = {'name': val.acc_name or '',
+                        'currency_id': val.currency_id.id or False,
+                        'code': str(110400 + code_cnt),
+                        'type': 'other',
+                        'user_type': type,
+                        'parent_id':new_account,
+                        'company_id': company_id.id }
+                    obj_acc.create(cr, uid, vals)
+                    code_cnt += 1
+
+        #reactivate the parent_store functionnality on account_account
+        self.pool._init = False
+        self.pool.get('account.account')._parent_store_compute(cr)
+
+        for key,value in todo_dict.items():
+            if value['account_collected_id'] or value['account_paid_id']:
+                obj_acc_tax.write(cr, uid, [key], {
+                    'account_collected_id': acc_template_ref[value['account_collected_id']],
+                    'account_paid_id': acc_template_ref[value['account_paid_id']],
+                })
+
+        # Creating Journals
+        vals_journal={}
+        view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0]
+        seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
+
+        if seq_journal:
+            seq_id_sale = obj_sequence.search(cr,uid,[('name','=','Sale Journal')])[0]
+            seq_id_purchase = obj_sequence.search(cr,uid,[('name','=','Purchase Journal')])[0]
+        else:
+            seq_id_sale = seq_id
+            seq_id_purchase = seq_id
+
+        vals_journal['view_id'] = view_id
+
+        #Sales Journal
+        vals_journal['name'] = _('Sales Journal')
+        vals_journal['type'] = 'sale'
+        vals_journal['code'] = _('SAJ')
+        vals_journal['sequence_id'] = seq_id_sale
+
+        if obj_multi.property_account_receivable:
+            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
+            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
+
+        obj_journal.create(cr,uid,vals_journal)
+
+        # Purchase Journal
+        vals_journal['name'] = _('Purchase Journal')
+        vals_journal['type'] = 'purchase'
+        vals_journal['code'] = _('EXJ')
+        vals_journal['sequence_id'] = seq_id_purchase
+
+        if obj_multi.property_account_payable:
+            vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
+            vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
+
+        obj_journal.create(cr,uid,vals_journal)
+
+        # Bank Journals
+        view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Cash Journal View')])[0]
+        view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Multi-Currency Cash Journal View')])[0]
+        ref_acc_bank = obj_multi.bank_account_view_id
+
+
+        #create the properties
+        property_obj = self.pool.get('ir.property')
+        fields_obj = self.pool.get('ir.model.fields')
+
+        todo_list = [
+            ('property_account_receivable','res.partner','account.account'),
+            ('property_account_payable','res.partner','account.account'),
+            ('property_account_expense_categ','product.category','account.account'),
+            ('property_account_income_categ','product.category','account.account'),
+            ('property_account_expense','product.template','account.account'),
+            ('property_account_income','product.template','account.account')
+        ]
+        for record in todo_list:
+            r = []
+            r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id.id)])
+            account = getattr(obj_multi, record[0])
+            field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])])
+            vals = {
+                'name': record[0],
+                'company_id': company_id.id,
+                'fields_id': field[0],
+                'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
+            }
+            if r:
+                #the property exist: modify it
+                property_obj.write(cr, uid, r, vals)
+            else:
+                #create the property
+                property_obj.create(cr, uid, vals)
+
+        fp_ids = obj_fiscal_position_template.search(cr, uid,[('chart_template_id', '=', obj_multi.id)])
+
+        if fp_ids:
+            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
+
+                vals_fp = {
+                           'company_id' : company_id.id,
+                           'name' : position.name,
+                           }
+                new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
+
+                obj_tax_fp = self.pool.get('account.fiscal.position.tax')
+                obj_ac_fp = self.pool.get('account.fiscal.position.account')
+
+                for tax in position.tax_ids:
+                    vals_tax = {
+                                'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
+                                'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                                'position_id' : new_fp,
+                                }
+                    obj_tax_fp.create(cr, uid, vals_tax)
+
+                for acc in position.account_ids:
+                    vals_acc = {
+                                'account_src_id' : acc_template_ref[acc.account_src_id.id],
+                                'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
+                                'position_id' : new_fp,
+                                }
+                    obj_ac_fp.create(cr, uid, vals_acc)
+
     def execute(self, cr, uid, ids, context=None):
         super(account_installer, self).execute(cr, uid, ids, context=context)
         record = self.browse(cr, uid, ids, context=context)[0]
         for res in self.read(cr,uid,ids):
-            if record.charts == 'l10n_chart_configurable':
-                obj_acc = self.pool.get('account.account')
+            if record.charts == 'configurable':
+                fp = tools.file_open(opj('account','configurable_account_chart.xml'))
+                tools.convert_xml_import(cr, 'account', fp, {}, 'init',True, None)
+                fp.close()
+                self.generate_configurable_chart(cr, uid, ids, context=context)
                 obj_tax = self.pool.get('account.tax')
-                user_type = self.pool.get('account.account.type')
                 obj_product = self.pool.get('product.product')
                 ir_values = self.pool.get('ir.values')
-                u_type_id = user_type.search(cr, uid,[('name','ilike','view')])[0]
-                company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
-                vals = {'name': company.name or '',
-                        'currency_id': company.currency_id.id or False,
-                        'code': 0 or '',
-                        'type': 'view',
-                        'user_type': u_type_id,
-                        'company_id': company.id }
-                main_account = obj_acc.create(cr, uid, vals)
-                for val in record.bank_accounts_id:
-                    vals = {'name': val.acc_name or '',
-                        'currency_id': val.currency_id.id or False,
-                        'code': val.acc_name or '',
-                        'type': 'view',
-                        'user_type': u_type_id,
-                        'parent_id':main_account,
-                        'company_id': company.id }
-                    obj_acc.create(cr, uid, vals)
-
-                sales_tax = obj_tax.create(cr, uid,{'name':'sale Tax','amount':res.get('sale_tax',0.0)})
-                purchase_tax = obj_tax.create(cr, uid,{'name':'purchase Tax','amount':res.get('purchase_tax',0.0)})
+                s_tax = (res.get('sale_tax',0.0))/100
+                p_tax = (res.get('purchase_tax',0.0))/100
+                sales_tax = obj_tax.create(cr, uid,
+                                           {'name':'(%s)'%(s_tax*100),
+                                            'amount':s_tax
+                                            })
+                purchase_tax = obj_tax.create(cr, uid,
+                                            {'name':'(%s)'%(p_tax*100),
+                                             'amount':p_tax
+                                             })
                 product_ids = obj_product.search(cr,uid, [])
                 for product in obj_product.browse(cr, uid, product_ids):
                     obj_product.write(cr, uid, product.id, {'taxes_id':[(6,0,[sales_tax])],'supplier_taxes_id':[(6,0,[purchase_tax])]})
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index cda3e40111b..3b78c6cb557 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -23,7 +23,10 @@ import installer
 import todo
 import gtk_contact_form
 import wizard
-
+import os
+import base64
+import random
+import tools
 from osv import fields, osv
 import netsvc
 from tools.translate import _
@@ -34,6 +37,12 @@ class base_setup_config_choice(osv.osv_memory):
     _name = 'base.setup.config'
     logger = netsvc.Logger()
 
+    def _get_image(self, cr, uid, context=None):
+        file_no = str(random.randint(1,3))
+        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
+        file_data = tools.file_open(path,'rb').read()
+        return base64.encodestring(file_data)
+
     def get_users(self, cr, uid, context={}):
         user_obj = self.pool.get('res.users')
         user_ids = user_obj.search(cr, uid, [])
@@ -42,11 +51,13 @@ class base_setup_config_choice(osv.osv_memory):
         return _('The following users have been installed on your database: \n')+ user_str
 
     _columns = {
-        'installed_users':fields.text('Installed Users', readonly=True)
+        'installed_users':fields.text('Installed Users', readonly=True),
+        'config_logo' : fields.binary('Image', readonly=True),
         }
 
     _defaults = {
-        'installed_users':get_users
+        'installed_users':get_users,
+         'config_logo' : _get_image
         }
 
     def set_default_menu(self, cr, uid, menu, context=None):
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index e06facce0e8..90d48de5eba 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -7,11 +7,11 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
       <form string="Setup">
-      <group colspan="4" col="8">
-      	<group width="150">
-      		<image name="gtk-dialog-info"/>
-      	</group>
-      	<group>
+      <group colspan="4" col="8" width="600">
+      <group>
+  		<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
+  	</group>
+      	<group colspan="6">
       		<separator string="Installation Done" colspan="8"/>
       		<label align="0.0" string="Your new database is now fully installed." colspan="8"/>
        		<field name="installed_users" nolabel= "1" colspan="8"/>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index ba6b21d1268..2b4a870236a 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -19,9 +19,7 @@ If you don't think you need any of these right now, you can easily install them
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
 	          	  <attribute name='string'></attribute>
-	      </xpath>
-	      <xpath expr='//group[@string="progress"]' position='attributes'>
-              <attribute name='string'></attribute>
+	          	  <attribute name='rowspan'>15</attribute>
 	      </xpath>
 	      <separator string="title" position="attributes">
             <attribute name="string">Install Generic Modules</attribute>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index 6c576adf971..b1d01cecb66 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -38,8 +38,10 @@ class base_gtkcontactform(osv.osv_memory):
          defaults = super(base_gtkcontactform, self)\
          .default_get(cr, uid, fields_list=fields_list, context=context)
          company_id = self.pool.get('base.setup.company').search(cr, uid, [])
-         company = self.pool.get('base.setup.company').read(cr, uid, company_id)[0]
-         defaults.update({'email':company.get('email',''),
+         company = self.pool.get('base.setup.company').read(cr, uid, company_id)
+         company = company and company[0] or False
+         if company:
+             defaults.update({'email':company.get('email',''),
                           'phone': company.get('phone','')})
          return defaults
 
@@ -73,9 +75,9 @@ class base_gtkcontactform(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
         company_data = self.pool.get('base.setup.company').read(cr, uid, company_id)
-        company_data = company_data and company_data[0]
+        company_data = company_data and company_data[0] or False
         country1 = ''
-        if company_data.get('country_id', False):
+        if company_data and company_data.get('country_id', False):
             country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'])['name']
         for res in self.read(cr, uid, ids):
             email = res.get('email','')
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index a19476e1f19..b01f538b193 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -15,7 +15,6 @@
             <attribute name="string">Select Human Resources Modules To Install</attribute>
           </separator>
            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>8</attribute>
 	          	  <attribute name='string'></attribute>
 	      		</xpath>
           <xpath expr="//label[@string='description']"
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 30ac565addb..e1da251fb9a 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -16,14 +16,14 @@
                        >Knowledge Management</attribute>
           </separator>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-      				<attribute name='rowspan'>9</attribute>
           			<attribute name='string'></attribute>
 	      		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">From this screen, you can select various OpenERP applications which will help employees store information, distribute it and share it with one another.</attribute>
           </xpath>
-          <group colspan="8">
+          <group colspan="8" position="replace">
+          <group colspan="4">
             <field name="document_ftp"/>
             <field name="document_webdav"/>
             <field name="wiki"/>
@@ -31,6 +31,7 @@
             <field name="wiki_faq"/>
             <field name="wiki_quality_manual"/>
           </group>
+          </group>
          <xpath expr="//button[@string='Install Modules']" position="attributes">
           	<attribute name="string">Configure</attribute>
          </xpath>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index d40eb453570..fe4fb6b8348 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -19,7 +19,6 @@
             <attribute name="string">After having installed the core manufacturing application, you can extend it with a few more depending on the needs of your organization</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-      			<attribute name='rowspan'>8</attribute>
       			<attribute name='string'></attribute>
   		  </xpath>
           <group colspan="8">
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index d54aaaf1e5b..f9b143e10f4 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -11,6 +11,9 @@
                 <form position="attributes">
                   <attribute name="string">Install Extra Modules</attribute>
                 </form>
+                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
+      				<attribute name='string'></attribute>
+  		  		</xpath>
                 <xpath expr="//label[@string='description']"
                        position="attributes">
                   <attribute name="string"
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 277ec90b81c..efef1dc3649 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -11,7 +11,6 @@
             <attribute name="string">Tools Modules Installation</attribute>
           </form>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-          	  <attribute name='rowspan'>10</attribute>
           	  <attribute name='string'></attribute>
           </xpath>
 
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index cbdd18ae29f..a127333544f 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -16,7 +16,6 @@
                        >Project Management</attribute>
           </separator>
            <xpath expr='//separator[@string="vsep"]' position='attributes'>
-          	  <attribute name='rowspan'>10</attribute>
           	  <attribute name='string'></attribute>
      		</xpath>
           <xpath expr="//label[@string='description']"
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 0916977e62a..b105b6ba3aa 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -12,7 +12,6 @@
 	            <attribute name="string">Purchase Modules Installation</attribute>
 	          </form>
 			  <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>6</attribute>
 	          	  <attribute name='string'></attribute>
 	      		</xpath>
 	          <separator string="title" position="attributes">
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 89d655de0b2..bcd0250fb7e 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -11,7 +11,6 @@
             <attribute name="string">Report Modules Installation</attribute>
           </form>
 		  <xpath expr='//separator[@string="vsep"]' position='attributes'>
-          	  	<attribute name='rowspan'>7</attribute>
 		  		<attribute name='string'></attribute>
 		  </xpath>
           <separator string="title" position="attributes">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3db8c67281b..5bf5967d58b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -508,7 +508,6 @@
           		</separator>
           		<xpath expr="//label[@string='description']" position="attributes">
             		<attribute name="string">Setup your sales workflow and default values.</attribute>
-            		<attribute name="width">100</attribute>
           		</xpath>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
           			<attribute name='rowspan'>6</attribute>
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index 59e0cc4f604..356282d2de5 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -12,13 +12,17 @@
                   <attribute name="string">Thunderbird Module Installation</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Configure Thunderbird Module</attribute>
+                   <attribute name="string">Thunderbird</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This module is required for the thuderbird plug-in to work properly.This allows you to select an object that you had like to add to your email and its attachments. You can select a partner, a task, a project, an analytical account, or any other object and attach selected mail as .eml file in attachment of selected record.</attribute>
               </xpath>
-              <group colspan="8">
-                  <separator string="Thunderbird" colspan="4"/>
+              <xpath expr='//separator[@string="vsep"]' position='attributes'>
+		  		<attribute name='string'></attribute>
+		  		<attribute name='rowspan'>15</attribute>
+		  	  </xpath>
+		  	  <group colspan="8" position="replace">
+              <group colspan="8" height="400" width="700">
                   <field name="thunderbird"/>
                   <field name="name" invisible="1"/>
                   <field name="pdf_name" invisible="1"/>
@@ -33,6 +37,7 @@
                   <separator string="Thunderbird plugin installation note." colspan="4"/>
                   <label colspan="8" string="Save The thunderbird plug­in Follow the following step to install thunderbird plug­in ? 1. From Menu Bar, Open Tools ­> Add ons. 2. Now click on install button and a browser window will appear. 3. Just select the (.xpi) file from thunderbird/plugin directory and click ok, a new software installation window will appear and within a short time Install Now  button will be enabled. 4. Click on Install Now and restart Thunderbird. 5. Now Thunderbird plug­in is installed."/>
               </group>
+              </group>
           </data>
       </field>
     </record>

From 30d26eedbcf21e9ef69a8788c58fa70fd460e63e Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 11 May 2010 15:26:35 +0530
Subject: [PATCH 115/146] [IMP]:set demo company only if there is demo=True

bzr revid: nch@tinyerp.com-20100511095635-eudhldu015wv58sj
---
 addons/base_setup/todo.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 811d6f21bf5..6d161d581f8 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -53,16 +53,18 @@ class base_setup_company(osv.osv_memory):
         """ get default company if any, and the various other fields
         from the company's fields
         """
+        base_mod = self.pool.get('ir.module.module').search(cr, uid, [('name','ilike','base')])
+        base_mod_rec = self.pool.get('ir.module.module').browse(cr, uid, base_mod)[0]
         defaults = super(base_setup_company, self)\
               .default_get(cr, uid, fields_list=fields_list, context=context)
-
         companies = self.pool.get('res.company')
         company_id = companies.search(cr, uid, [], limit=1, order="id")
         if not company_id or 'company_id' not in fields_list:
             return defaults
         company = companies.browse(cr, uid, company_id[0])
-
         defaults['company_id'] = company.id
+        if not base_mod_rec.demo:
+            return defaults
         defaults['currency'] = company.currency_id.id
         for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
             defaults[field] = company[field]

From 71f2ead153435bb67376d8020d54ec95f06dfdc2 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 11 May 2010 16:43:46 +0530
Subject: [PATCH 116/146] [IMP]:account configurable chart

bzr revid: nch@tinyerp.com-20100511111346-lya700ijz3argfna
---
 addons/account/installer.py | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index fd0d3836581..301e966bae0 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -352,19 +352,28 @@ class account_installer(osv.osv_memory):
                 ir_values = self.pool.get('ir.values')
                 s_tax = (res.get('sale_tax',0.0))/100
                 p_tax = (res.get('purchase_tax',0.0))/100
-                sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'(%s)'%(s_tax*100),
+                tax_val = {}
+                default_tax = []
+                if s_tax*100 > 0.0:
+                    sales_tax = obj_tax.create(cr, uid,
+                                           {'name':'%s%%'%(s_tax*100),
                                             'amount':s_tax
                                             })
-                purchase_tax = obj_tax.create(cr, uid,
-                                            {'name':'(%s)'%(p_tax*100),
+                    tax_val.update({'taxes_id':[(6,0,[sales_tax])]})
+                    default_tax.append(('taxes_id',sales_tax))
+                if p_tax*100 > 0.0:
+                    purchase_tax = obj_tax.create(cr, uid,
+                                            {'name':'%s%%'%(p_tax*100),
                                              'amount':p_tax
                                              })
-                product_ids = obj_product.search(cr,uid, [])
-                for product in obj_product.browse(cr, uid, product_ids):
-                    obj_product.write(cr, uid, product.id, {'taxes_id':[(6,0,[sales_tax])],'supplier_taxes_id':[(6,0,[purchase_tax])]})
-                for name, value in [('taxes_id',sales_tax),('supplier_taxes_id',purchase_tax)]:
-                    ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value])
+                    tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
+                    default_tax.append(('supplier_taxes_id',purchase_tax))
+                if len(tax_val):
+                    product_ids = obj_product.search(cr,uid, [])
+                    for product in obj_product.browse(cr, uid, product_ids):
+                        obj_product.write(cr, uid, product.id, tax_val)
+                    for name, value in default_tax:
+                        ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value])
 
             if 'date_start' in res and 'date_stop' in res:
                 name = code = res['date_start'][:4]

From 09f2db7238c42a9e6f94a1d9f19d4620079acdc6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 11 May 2010 17:22:25 +0530
Subject: [PATCH 117/146] [IMP]: crm: Improvement in crm installer view and
 usability

bzr revid: rpa@tinyerp.com-20100511115225-yyagcgamuux3vpxv
---
 addons/crm/crm_installer.py       | 21 ++++++++++++++++++---
 addons/crm/crm_installer_view.xml | 30 ++++++++++++++++++++----------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 953dc9f3403..d14b060cde7 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from lxml import etree
 from operator import itemgetter
 from osv import fields, osv
 import netsvc
@@ -26,7 +27,6 @@ import os
 import pooler
 import tools
 
-
 class crm_installer(osv.osv_memory):
     _name = 'crm.installer'
     _inherit = 'res.config.installer'
@@ -34,11 +34,26 @@ class crm_installer(osv.osv_memory):
     _columns = {
         'name': fields.char('Name', size=64), 
         'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 
-        'crm_fundraising': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), 
+        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."), 
         'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
         'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), 
-        'sale_crm': fields.boolean('Sale CRM Stuff', help="This module relates sale to opportunity cases in the CRM. We suggest you to install this module if you installed both the sale and the crm modules"), 
+        'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale to opportunity cases in the CRM."),
+        'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
+        'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),  
     }
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(crm_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        #Checking sale module is installed or not
+        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
+        count = cr.fetchall()
+        if count:
+            doc = etree.XML(res['arch'])
+            nodes = doc.xpath("//field[@name='sale_crm']")
+            for node in nodes:
+                node.set('invisible', '0')
+            res['arch'] = etree.tostring(doc)
+        return res
 
 crm_installer()
 
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 0bf21cb97d6..370285352d1 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -12,21 +12,31 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string"
-                       >Configure Your CRM System</attribute>
+            <attribute name="string">Configure Your CRM System</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
           </xpath>
-
-          <group colspan="8">
-            <separator string="Intall Extended modules for CRM" colspan="4"/>
-             <field name="crm_claim"/>
-             <field name="crm_helpdesk"/>
-             <field name="crm_fundraising"/>
-             <field name="crm_caldav"/>
-             <field name="sale_crm"/>
+		  <group colspan="8">
+			<group colspan="2" col="2">
+				<separator string="Synchronization" colspan="4" />
+          		<field name="crm_caldav" />
+          		<field name="fetchmail" />
+          	</group>
+          	<group colspan="2" col="2">
+				<separator string="Plugins" colspan="4" />
+          		<field name="thunderbird" />
+          		<label string="*Outlook*" />
+<!--    TODO      		<field name="outlook" />-->
+          	</group>
+			<group colspan="4" col="4" groups="base.group_extended" name="other">
+				<separator string="Additional features" colspan="4" />
+	          	<field name="crm_claim" />
+	          	<field name="crm_helpdesk" />
+	          	<field name="crm_fundraising" />
+	          	<field name="sale_crm" invisible="1"/>
+          </group>
           </group>
         </data>
       </field>

From 6dab26458a67e55e88801c97e18630a46e942c43 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Tue, 11 May 2010 17:49:50 +0530
Subject: [PATCH 118/146] [IMP]:account chart configurable

bzr revid: nch@tinyerp.com-20100511121950-rreasht5mqx0d1g6
---
 addons/account/installer.py | 79 ++++++++++++++++++++++++++++++++++---
 1 file changed, 73 insertions(+), 6 deletions(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 301e966bae0..81993908be9 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -198,6 +198,10 @@ class account_installer(osv.osv_memory):
             new_account = obj_acc.create(cr,uid,vals)
             acc_template_ref[account_template.id] = new_account
             if account_template.name == 'Bank Current Account':
+                view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Cash Journal View')])[0]
+                view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Multi-Currency Cash Journal View')])[0]
+                ref_acc_bank = obj_multi.bank_account_view_id
+
                 cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
                 cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id']
 
@@ -209,20 +213,62 @@ class account_installer(osv.osv_memory):
 
                 record = self.browse(cr, uid, ids, context=context)[0]
                 code_cnt = 1
+                vals_seq = {
+                        'name': _('Bank Journal '),
+                        'code': 'account.journal',
+                        }
+                seq_id = obj_sequence.create(cr,uid,vals_seq)
+
+                #create the bank journal
+                vals_journal = {}
+                vals_journal['name']= _('Bank Journal ')
+                vals_journal['code']= _('BNK')
+                vals_journal['sequence_id'] = seq_id
+                vals_journal['type'] = 'cash'
+                if vals.get('currency_id', False):
+                    vals_journal['view_id'] = view_id_cur
+                    vals_journal['currency'] = vals.get('currency_id', False)
+                else:
+                    vals_journal['view_id'] = view_id_cash
+                vals_journal['default_credit_account_id'] = new_account
+                vals_journal['default_debit_account_id'] = new_account
+                obj_journal.create(cr,uid,vals_journal)
+
                 for val in record.bank_accounts_id:
                     if val.account_type == 'cash':type = cash_type_id
                     elif val.account_type == 'bank':type = bank_type_id
                     else:type = check_type_id
-                    vals = {'name': val.acc_name or '',
+                    vals_bnk = {'name': val.acc_name or '',
                         'currency_id': val.currency_id.id or False,
                         'code': str(110400 + code_cnt),
                         'type': 'other',
                         'user_type': type,
                         'parent_id':new_account,
                         'company_id': company_id.id }
-                    obj_acc.create(cr, uid, vals)
+                    child_bnk_acc = obj_acc.create(cr, uid, vals_bnk)
+                    vals_seq_child = {
+                        'name': _(vals_bnk['name']),
+                        'code': 'account.journal',
+                        }
+                    seq_id = obj_sequence.create(cr, uid, vals_seq_child)
+
+                    #create the bank journal
+                    vals_journal = {}
+                    vals_journal['name']= vals_bnk['name'] + ' Journal'
+                    vals_journal['code']= _(vals_bnk['name'][:3])
+                    vals_journal['sequence_id'] = seq_id
+                    vals_journal['type'] = 'cash'
+                    if vals.get('currency_id', False):
+                        vals_journal['view_id'] = view_id_cur
+                        vals_journal['currency'] = vals_bnk.get('currency_id', False)
+                    else:
+                        vals_journal['view_id'] = view_id_cash
+                    vals_journal['default_credit_account_id'] = child_bnk_acc
+                    vals_journal['default_debit_account_id'] = child_bnk_acc
+                    obj_journal.create(cr,uid,vals_journal)
                     code_cnt += 1
 
+
         #reactivate the parent_store functionnality on account_account
         self.pool._init = False
         self.pool.get('account.account')._parent_store_compute(cr)
@@ -341,6 +387,7 @@ class account_installer(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         super(account_installer, self).execute(cr, uid, ids, context=context)
         record = self.browse(cr, uid, ids, context=context)[0]
+        company_id = self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id
         for res in self.read(cr,uid,ids):
             if record.charts == 'configurable':
                 fp = tools.file_open(opj('account','configurable_account_chart.xml'))
@@ -355,16 +402,36 @@ class account_installer(osv.osv_memory):
                 tax_val = {}
                 default_tax = []
                 if s_tax*100 > 0.0:
+                    vals_tax_code = {
+                        'name': 'VAT%s%%'%(s_tax*100),
+                        'code': 'VAT%s%%'%(s_tax*100),
+                        'company_id': company_id.id,
+                        'sign': 1,
+                        }
+                    new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals_tax_code)
                     sales_tax = obj_tax.create(cr, uid,
-                                           {'name':'%s%%'%(s_tax*100),
-                                            'amount':s_tax
+                                           {'name':'VAT%s%%'%(s_tax*100),
+                                            'description':'VAT%s%%'%(s_tax*100),
+                                            'amount':s_tax,
+                                            'base_code_id':new_tax_code,
+                                            'tax_code_id':new_tax_code
                                             })
                     tax_val.update({'taxes_id':[(6,0,[sales_tax])]})
                     default_tax.append(('taxes_id',sales_tax))
                 if p_tax*100 > 0.0:
+                    vals_tax_code = {
+                        'name': 'VAT%s%%'%(p_tax*100),
+                        'code': 'VAT%s%%'%(p_tax*100),
+                        'company_id': company_id.id,
+                        'sign': 1,
+                        }
+                    new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals_tax_code)
                     purchase_tax = obj_tax.create(cr, uid,
-                                            {'name':'%s%%'%(p_tax*100),
-                                             'amount':p_tax
+                                            {'name':'VAT%s%%'%(p_tax*100),
+                                             'description':'VAT%s%%'%(p_tax*100),
+                                             'amount':p_tax,
+                                             'base_code_id':new_tax_code,
+                                            'tax_code_id':new_tax_code
                                              })
                     tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
                     default_tax.append(('supplier_taxes_id',purchase_tax))

From 981eb1e6c3a35ff4e3fd6b6d2bf3740313acf052 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 11 May 2010 18:08:29 +0530
Subject: [PATCH 119/146] [IMP]: crm: Minor improvement in crm installer

bzr revid: rpa@tinyerp.com-20100511123829-5gsr99qpvmw0w3db
---
 addons/crm/crm_installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index d14b060cde7..1d9235feac6 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -37,7 +37,7 @@ class crm_installer(osv.osv_memory):
         'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."), 
         'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
         'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), 
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale to opportunity cases in the CRM."),
+        'sale_crm': fields.boolean('Create Quotation from Opportunity', help="This module relates sale to opportunity cases in the CRM."),
         'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
         'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."),  
     }

From 2ceb51f030f7a3f72761929ef041bbfacba931c7 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Wed, 12 May 2010 05:20:02 +0100
Subject: [PATCH 120/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100511041842-yyxyhmh2cpqvmxfz
bzr revid: codehost@crowberry-20100512042002-58kr47pbvcdsq5gw
---
 bin/addons/base/i18n/hr.po    | 4 ++--
 bin/addons/base/i18n/ja.po    | 4 ++--
 bin/addons/base/i18n/sv.po    | 4 ++--
 bin/addons/base/i18n/uk.po    | 4 ++--
 bin/addons/base/i18n/zh_CN.po | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index f7b0aedf294..6667e7ace90 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-05-10 03:56+0000\n"
+"PO-Revision-Date: 2010-05-11 05:41+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-05-10 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 49d9e44349e..daf287470bd 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-05-10 03:55+0000\n"
+"PO-Revision-Date: 2010-05-11 05:36+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-05-10 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:19+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 2cff8bb8fb9..f7c552137fc 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-05-10 03:54+0000\n"
+"PO-Revision-Date: 2010-05-11 05:58+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-05-10 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:19+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 52ab660bb1f..dbd7393dc3c 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-05-10 03:57+0000\n"
+"PO-Revision-Date: 2010-05-11 05:47+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-05-10 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po
index 28a775138c4..5fba42b4928 100644
--- a/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.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-05-10 03:56+0000\n"
+"PO-Revision-Date: 2010-05-11 06:16+0000\n"
 "Last-Translator: OpenERP Administrators <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-05-10 04:17+0000\n"
+"X-Launchpad-Export-Date: 2010-05-12 04:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

From ce10539ffb5bd18fa2578689f152c88be6966d89 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 11:04:06 +0530
Subject: [PATCH 121/146] [IMP]:document_ftp config

bzr revid: nch@tinyerp.com-20100512053406-nofnqd2j9lgfzsva
---
 addons/document_ftp/document_ftp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml
index 1ea96bab73a..d3f4c09498c 100644
--- a/addons/document_ftp/document_ftp_view.xml
+++ b/addons/document_ftp/document_ftp_view.xml
@@ -31,7 +31,7 @@
             <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-  				<attribute name='rowspan'>6</attribute>
+  				<attribute name='rowspan'>12</attribute>
       			<attribute name='string'></attribute>
 	      	</xpath>
             <group string="res_config_contents" position="replace">

From 09e68a78e5db0530bcdd48539c4d0420280493c2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 12:24:33 +0530
Subject: [PATCH 122/146] [IMP]: crm: Improvement in fwd to partner wizard

bzr revid: rpa@tinyerp.com-20100512065433-8uwgsicshe07837j
---
 addons/crm/wizard/crm_forward_to_partner.py | 53 ++++++++++++++-------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 257f4b36312..135961182df 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -37,8 +37,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         'email_from' : fields.char('From', required=True, size=128), 
         'email_to' : fields.char('To', required=True, size=128), 
         'subject' : fields.char('Subject', required=True, size=128), 
-        'message' : fields.text('Message', required=True),
-        'history': fields.selection([('whole', 'Whole'), ('latest', 'Latest')], 'Send history', required=True), 
+        'message' : fields.text('Message', required=True), 
+        'history': fields.selection([('latest', 'Latest email'), ('whole', 'Whole Story'), ('info', 'Case Information')], 'Send history', required=True), 
     }
     
     def get_whole_history(self, cr, uid, ids, context=None):
@@ -47,19 +47,19 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             whole.append(self.get_latest_history(cr, uid, hist_id, context=context))
         whole = '\n\n'.join(whole)
         return whole or ''
-    
-    def get_latest_history(self, cr, uid, id, context=None):
+
+    def get_latest_history(self, cr, uid, hist_id, context=None):
         log_pool = self.pool.get('mailgate.message')
-        hist = log_pool.browse(cr, uid, id, context=context)
+        hist = log_pool.browse(cr, uid, hist_id, context=context)
         header = '-------- Original Message --------'
         sender = 'From: %s' %(hist.email_from or '')
         to = 'To: %s' % (hist.email_to or '')
-        sentdate = 'Date: %s' % (hist.date)
+        sentdate = 'Date: %s' % (hist.date or '')
         desc = '\n%s'%(hist.description)
         original = [header, sender, to, sentdate, desc]
         original = '\n'.join(original)
         return original
-    
+
     def on_change_email(self, cr, uid, ids, user, partner):
         """
         @param self: The object pointer
@@ -83,14 +83,29 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     def on_change_history(self, cr, uid, ids, history, context=None):
         #TODO: ids and context are not comming
         res = False
-        if history == 'whole' and ids: #Remove second condition:
-            #TODO: get whole history ids for current Case object
-            msg_val = self.get_whole_history(cr, uid, ids, context=context)
-            res = {'value': {'message' : msg_val}}
-        if history == 'latest' and ids: #Remove second condition
-            #TODO: get Latest history id for current Case object
-            msg_val = self.get_latest_history(cr, uid, ids, context=context)
-            res = {'value': {'message' : msg_val}}
+        msg_val = ''
+        res_id = 2 # temp
+        model = 'crm.lead' # temp
+        model_pool = self.pool.get(model)
+
+        if history == 'info':
+            msg_val = self.get_lead_details(cr, uid, res_id, context=context)
+
+        if history == 'whole':
+            log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
+            log_ids = map(lambda x: x.id, log_ids)
+            if not log_ids:
+                raise osv.except_osv('Warning!', 'There is no history to send')
+            msg_val = self.get_whole_history(cr, uid, log_ids, context=context)
+
+        if history == 'latest':
+            log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
+            if not log_ids:
+                raise osv.except_osv('Warning!', 'There is no history to send')
+            msg_val = self.get_latest_history(cr, uid, log_ids[0].id, context=context)
+
+        if msg_val:
+            res = {'value': {'message' : '\n\n' + msg_val}}
         return res
 
     def on_change_partner(self, cr, uid, ids, partner_id):
@@ -159,9 +174,10 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         case_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ', ' + this.email_to or this.email_to})
         return {}
 
-    def get_lead_details(self, cr, uid, lead, context=None):
+    def get_lead_details(self, cr, uid, lead_id, context=None):
         message = []
         lead_proxy = self.pool.get('crm.lead')
+        lead = lead_proxy.browse(cr, uid, lead_id, context=context)
         if lead.type == 'lead':
                 field_names = [
                     'partner_name', 'title', 'function_name', 'street', 'street2', 
@@ -226,14 +242,15 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         if user.address_id and user.address_id.email:
             email_from = "%s <%s>" % (user.name, user.address_id.email)
         
-        message = self.get_lead_details(cr, uid, lead, context=context)
+        message = self.get_lead_details(cr, uid, lead.id, context=context)
 
         res = {
             'email_from' : email_from, 
             'subject' : '[%s-Forward:%06d] %s' % (lead.type.title(), lead.id, lead.name), 
             'message' : message, 
         }
-
+        if 'history' in fields:
+            res.update({'history': 'info'})
         return res
 
 crm_lead_forward_to_partner()

From eebfdc9e077788b58c811718a4d796be5f68b65e Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 12:37:15 +0530
Subject: [PATCH 123/146] [IMP]:account,sale config

bzr revid: nch@tinyerp.com-20100512070715-fxefialx7sddrpcx
---
 addons/account/account_installer.xml | 1 -
 addons/sale/sale_view.xml            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index f67946ff7a2..d3a6ce979a6 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -18,7 +18,6 @@
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
-            <attribute name="width">150</attribute>
           </xpath>
 		  <xpath expr="//button[@string='Install Modules']" position="attributes">
                 <attribute name="string">Configure</attribute>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d9edb989b1f..894ff6b2e6c 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -510,7 +510,7 @@
             		<attribute name="string">Setup your sales workflow and default values.</attribute>
           		</xpath>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
-          			<attribute name='rowspan'>6</attribute>
+          			<attribute name='rowspan'>15</attribute>
           			<attribute name='string'></attribute>
 	      		</xpath>
                 <group string="res_config_contents" position="replace">

From ceda4d163e58c128991cd7fcdd44104916e2bc21 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 12:42:17 +0530
Subject: [PATCH 124/146] [REM]: Removed Add CC wizard from crm and changes in
 crm + other modules for it

bzr revid: rpa@tinyerp.com-20100512071217-kbud9xl01sk9q6dh
---
 addons/crm/__openerp__.py                     |   1 -
 addons/crm/crm_lead_view.xml                  |   6 +-
 addons/crm/crm_opportunity_view.xml           |   8 +-
 addons/crm/crm_view.xml                       |  11 +-
 addons/crm/security/ir.model.access.csv       |   2 -
 addons/crm/wizard/__init__.py                 |   1 -
 addons/crm/wizard/crm_email_add_cc.py         | 109 ------------------
 addons/crm/wizard/crm_email_add_cc_view.xml   |  50 --------
 addons/crm_claim/crm_claim_view.xml           |   8 +-
 .../crm_fundraising/crm_fundraising_view.xml  |   8 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml     |   8 +-
 addons/hr_recruitment/hr_recruitment_view.xml |   8 +-
 addons/project_issue/project_issue_view.xml   |  27 ++---
 13 files changed, 28 insertions(+), 219 deletions(-)
 delete mode 100644 addons/crm/wizard/crm_email_add_cc.py
 delete mode 100644 addons/crm/wizard/crm_email_add_cc_view.xml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index e3c3fd8f8c8..bc1dc0a7c4e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -74,7 +74,6 @@ between mails and Open ERP.""",
 
         'wizard/crm_forward_to_partner_view.xml', 
         'wizard/crm_send_email_view.xml', 
-        'wizard/crm_email_add_cc_view.xml', 
         'crm_view.xml', 
 
         'crm_action_rule_view.xml', 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b6d8ae2ed51..c47b70afcba 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -155,14 +155,10 @@
                     <!-- TODO-->
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <button
-                                     string="Add a CC"
-                                     name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                     icon="gtk-add" type="action"/>
                             </group>
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3e7d6ac119b..d6cb7d4ddf4 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -172,15 +172,11 @@
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 85347103f5d..4e8366ae29e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -395,17 +395,12 @@
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>
-                            <!-- TODO-->
-                           <!-- <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                           <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                                <form string="Communication history">
-                                   <group col="7" colspan="4">
+                                   <group col="6" colspan="4">
                                        <field name="date"/>
                                        <field name="email_to"/>
                                        <field name="email_from"/>
-                                       <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
@@ -420,7 +415,7 @@
                                    <field name="email_to"/>
                                    <field name="date"/>
                                </tree>
-                           </field> -->
+                           </field>
                            <button colspan="4" string="Send New Email"
                                name="%(action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'crm.case'}"
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index a4650b1b866..f83a8177369 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -12,8 +12,6 @@
 "access_crm_case_categ_manager","crm.case.categ.manager","model_crm_case_categ","crm.group_crm_manager",1,1,1,1
 "access_crm_case_log_manager","crm.case.log manager","model_crm_case_log","crm.group_crm_manager",1,1,1,1
 "access_crm_case_history_manager","crm.case.history manager","model_crm_case_history","crm.group_crm_manager",1,1,1,1
-"access_crm_email_add_cc_manager","crm.email.add.cc","model_crm_email_add_cc","crm.group_crm_manager",1,1,1,1
-"access_crm_email_add_cc_user","crm.email.add.cc","model_crm_email_add_cc","crm.group_crm_user",1,0,0,0
 "access_crm_case_stage","crm.case.stage","model_crm_case_stage","crm.group_crm_user",1,0,0,0
 "access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","crm.group_crm_manager",1,1,1,1
 "access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index a9067d9fa0b..e4eb233a9b8 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -21,7 +21,6 @@
 
 import crm_send_email
 import crm_forward_to_partner
-import crm_email_add_cc
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
diff --git a/addons/crm/wizard/crm_email_add_cc.py b/addons/crm/wizard/crm_email_add_cc.py
deleted file mode 100644
index f3a10b36ef2..00000000000
--- a/addons/crm/wizard/crm_email_add_cc.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/>.
-#
-##############################################################################
-
-from osv import osv, fields
-from tools.translate import _
-import tools
-
-class crm_email_add_cc_wizard(osv.osv_memory):
-    """ Email Add CC"""
-
-    _name = "crm.email.add.cc"
-    _description = "Email Add CC"
-
-    _columns = {
-        'name': fields.selection([('user', 'User'), ('partner', 'Partner'), \
-                         ('email', 'Email Address')], 'Send to', required=True), 
-        'user_id': fields.many2one('res.users', "User"), 
-        'partner_id': fields.many2one('res.partner', "Partner"), 
-        'email': fields.char('Email', size=32), 
-        'subject': fields.char('Subject', size=32), 
-    }
-
-    def on_change_email(self, cr, uid, ids, user, partner):
-
-        """ @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of Mail’s IDs
-        """
-
-        if (not partner and not user):
-            return {'value': {'email': False}}
-        email = False
-        if partner:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
-            if addr and addr['contact']:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
-        elif user:
-            addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
-            if addr:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
-        return {'value': {'email': email}}
-
-
-    def add_cc(self, cr, uid, ids, context={}):
-        """
-        Adds CC value in case 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of create menu’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-
-        data = self.read(cr, uid, ids[0])
-        email = data['email']
-        subject = data['subject']
-
-        if not context:
-            return {}
-        history_line = self.pool.get('crm.case.history').browse(cr, uid, context['active_id'])
-        model = history_line.log_id.model_id.model
-        model_pool = self.pool.get(model)
-        case = model_pool.browse(cr, uid, history_line.log_id.res_id)
-        body = history_line.description.replace('\n', '\n> ')
-        if not case.email_from:
-            raise osv.except_osv(_('Warning!'), ('No email Address defined for this case..'))
-        if not email:
-            raise osv.except_osv(_('Warning!'), ('Please Specify email address..'))
-        flag = tools.email_send(
-            case.user_id.address_id.email, 
-            [case.email_from], 
-            subject or '[' + str(case.id) + '] ' + case.name, 
-            model_pool.format_body(body), 
-            email_cc = [email], 
-            openobject_id = str(case.id), 
-            subtype = "html"
-        )
-
-        if flag:
-            model_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ',' + email or email})
-        else:
-            raise osv.except_osv(_('Email Fail!'), ("Lastest Email is not sent successfully"))
-        return {}
-
-    def action_cancel(self, cr, uid, ids, context=None):
-        return {'type' : 'ir.actions.act_window_close'}
-
-crm_email_add_cc_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_email_add_cc_view.xml b/addons/crm/wizard/crm_email_add_cc_view.xml
deleted file mode 100644
index b017c9d9901..00000000000
--- a/addons/crm/wizard/crm_email_add_cc_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<openerp>
-    <data>
-
-        <!-- CRM Email Add CC Form View  -->
-
-        <record id="view_crm_email_add_cc_wizard" model="ir.ui.view">
-            <field name="name">Add CC</field>
-            <field name="model">crm.email.add.cc</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send mail to CC">
-                	<separator colspan="4" string="Send mail to CC" />
-                    <field name="name" width="200" />
-                    <field name="subject" colspan="4" />
-                    <separator colspan="4" string="" />
-                    <group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
-                        <field name="user_id"
-                            attrs="{ 'required' : [('name','=','user')]}"
-                            on_change="on_change_email(user_id, partner_id)" />
-                    </group>
-                    <newline />
-                    <group col="2" colspan="2"
-                        attrs="{ 'invisible' : [('name','!=','partner')]}">
-                        <field name="partner_id"
-                            attrs="{'required' : [('name','=','partner')]}"
-                            on_change="on_change_email(user_id, partner_id)" />
-                    </group>
-                    <field colspan="4" name="email" attrs="{ 'required' : [('name','=','email')]}" />
-                    <separator colspan="4" string="" />
-                    <group col="2" colspan="4">
-                        <button name="action_cancel" special="cancel" string="Cancel" icon="gtk-cancel" type="object" />
-                        <button name="add_cc" string="_Forward" type="object" icon="gtk-ok" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <!-- CRM Email Add CC Action  -->
-
-        <record id="action_view_crm_email_add_cc_wizard" model="ir.actions.act_window">
-            <field name="name">Add CC</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">crm.email.add.cc</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/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 2b9148083b3..4228096e670 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -176,15 +176,11 @@
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                               <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 963526e148f..4891636690a 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -189,15 +189,11 @@
                    </group>
                     <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                        <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 7bfb2d0a89c..e88a6dfec4c 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -120,15 +120,11 @@
                        </group>
                        <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                            <form string="Communication history">
-                               <group col="7" colspan="4">
+                               <group col="6" colspan="4">
                                    <field name="date"/>
                                    <field name="email_to"/>
                                    <field name="email_from"/>
-                                   <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+								</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index beb9467814c..396b1238572 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -148,15 +148,11 @@
                        </group>
                        <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
-                            <group col="7" colspan="4">
+                            <group col="6" colspan="4">
                                 <field name="date"/>
                                 <field name="email_to"/>
                                 <field name="email_from"/>
-                                <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
-                                   </group>
+							</group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 04168492d38..ea4bdce5b46 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -89,28 +89,29 @@
                                 <field name="active"/>
                             </group>
                             <field name="log_ids" nolabel="1" colspan="4">
-                                <form string="Actions">
-                                    <separator string="Action Information" colspan="4"/>
-                                    <field name="name" colspan="4"/>
-                                    <field name="date" />
-                                    <field name="user_id" />
-                                </form>
-                            </field>
+		                        <tree string="Logs">
+		                            <field name="name" colspan="4"/>
+		                            <field name="date"/>
+		                            <field name="user_id"/>
+		                        </tree>
+		                        <form string="Logs">
+		                            <separator string="Action Information" colspan="4"/>
+		                            <field name="name" colspan="4"/>
+		                            <field name="date"/>
+		                            <field name="user_id"/>
+		                        </form>
+		                    </field>
                         </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
                                 <field colspan="4" name="email_cc" string="CC"/>
                             </group>
-                            <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Communication history">
-                                    <group col="7" colspan="4">
+                                    <group col="6" colspan="4">
                                         <field name="date"/>
                                         <field name="email_to"/>
                                         <field name="email_from"/>
-                                        <button
-                                     string="Add a CC"
-                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
-                                               icon="gtk-add" type="action"/>
                                    </group>
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>

From e21a8d4fda5c38ce3e6cb784b70d689cf93d79f6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 13:00:22 +0530
Subject: [PATCH 125/146] [FIX,IMP]: project_issue: Fixed views, objects and
 reports accroding to changes in crm and crm reports

bzr revid: rpa@tinyerp.com-20100512073022-8q3bnxijjb8ieljw
---
 addons/project_issue/project_issue.py         |  37 ++++-
 .../report/project_issue_report.py            |  62 ++++++++-
 .../report/project_issue_report_view.xml      | 126 ++++++++++++++----
 3 files changed, 198 insertions(+), 27 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index b7218df6ad1..49bbfd60bcd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -32,11 +32,11 @@ from osv import fields,osv,orm
 from osv.orm import except_orm
 from tools.translate import _
 
-class project_issue(osv.osv):
+class project_issue(osv.osv, crm.crm_case):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, id desc"
-    _inherit = 'crm.case'
+    _inherit = 'mailgate.thread'
 
     def case_open(self, cr, uid, ids, *args):
         """
@@ -109,6 +109,39 @@ class project_issue(osv.osv):
         return res
 
     _columns = {
+        'create_date': fields.datetime('Creation Date' , readonly=True), 
+        'write_date': fields.datetime('Update Date' , readonly=True), 
+        'date_deadline': fields.date('Deadline'), 
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                        select=True, help='Sales team to which Case belongs to.\
+                             Define Responsible user and Email account for mail gateway.'), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+        'company_id': fields.many2one('res.company', 'Company'), 
+        'description': fields.text('Description'), 
+        'state': fields.selection([
+                                    ('draft', 'Draft'), 
+                                    ('open', 'Todo'), 
+                                    ('cancel', 'Cancelled'), 
+                                    ('done', 'Closed'), 
+                                    ('pending', 'Pending'),
+                                ], 'State', size=16, readonly=True, 
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \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\'.'), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+ will receive a copy of the future" \
+" communication between partner and users by email"), 
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.phonecall')]"), 
+        'date_open': fields.datetime('Opened', readonly=True),
+        # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',help="The channels represent the different communication modes available with the customer." \
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 775e4b933f0..16dc2eb6ae2 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -2,11 +2,71 @@ from osv import fields,osv
 import tools
 from crm import crm
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
+
 class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
-    _inherit = "crm.case.report"
+
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current users ID for security checks,
+            @param ids: List of case and section Datas IDs
+            @param context: A standard dictionary for contextual values """
+
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr)) * 100
+
+                res[case.id] = perc_state
+            else:
+                model_name = self._name.split('report.')
+                if len(model_name) < 2:
+                    res[case.id] = 0.0
+                else:
+                    model_name = model_name[1]
+
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
+                    logs = cr.fetchone()[0]
+
+                    avg_ans = logs / case.nbr
+                    res[case.id] = avg_ans
+
+        return res
+
     _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'nbr': fields.integer('# of Issues', readonly=True),
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 24290530be7..a9f8f016dec 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -43,20 +43,70 @@
                 </graph>
             </field>
         </record>
+
         <record id="view_project_issue_report_filter" model="ir.ui.view">
             <field name="name">project.issue.report.select</field>
             <field name="model">project.issue.report</field>
-            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-               <data>
+				<search string="Search">
+                  <group col="16" colspan="8">
+                   		<!--  <filter string="This Year" name="This Year" icon="terp-hr"
+                   			domain="[('name','=',time.localtime()[0])]"/>-->
+                   		<filter string="This Year" icon="terp-hr"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
 
-            	<xpath expr='//search[@string="Search"]/group[1]/field[@name="user_id"]' position='replace'>
-            	        <field name="user_id"  select="1" widget="selection">
+                   		<!-- <filter string="This Month" name="This Year" icon="terp-hr"
+                   			domain="[('month','=',time.strftime('%%m'))]" />-->
+                       <filter string="This Month" icon="terp-hr" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+
+                       <filter icon="gtk-media-rewind" string="7 Days" separator="1"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+
+                   		<separator orientation="vertical" />
+                        <filter icon="terp-hr"
+                    		string="Draft"
+                    		domain="[('state','=','draft')]"/>
+					   <filter icon="terp-hr"
+                    		string="Open"
+                    		domain="[('state','=','open')]"/>
+					   <filter icon="terp-hr"
+                    		string="Pending"
+                    		domain="[('state','=','pending')]"/>
+
+                   		<separator orientation="vertical" />
+                   		<field name="section_id"
+                   			default="context.get('section_id', False)"
+                   			widget="selection"
+                   			context="{'invisible_section': False}">
+
+                   			<filter icon="terp-crm"
+                   				context="{'invisible_section': False}"
+                   				domain="[('section_id.user_id','=',uid)]"
+                   				help="My section" />
+
+                   		</field>
+                   		<field name="company_id" widget="selection">
+                           <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id.company_id','=',uid)]"
+                        help="My company"/>
+                        </field>
+
+                      	<field name="user_id"  select="1" widget="selection">
 	            			<filter icon="terp-crm" string="My Project Issue" help="My Project Issue Entries" domain="[('user_id','=',uid)]" />
                			</field>
-            	</xpath>
-               	<xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Extended options..." colspan="10" col="12">
+                         <filter icon="terp-sale"
+                    		string="Done"
+                    		domain="[('state','=','done')]"/>
+
+                    	<filter icon="terp-sale"
+                    		string="Cancel"
+                    		domain="[('state','=','cancel')]"/>
                     	<group>
                     		<separator orientation="vertical"/>
                   			<field name="project_id" widget="selection" />
@@ -78,24 +128,52 @@
                             <separator orientation="vertical"/>
                             <field name="date_closed" string="Date Closed"/>
                         </group>
-				</xpath>
-				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Company"]' position='replace'>
-					<filter string="Company" icon="terp-sale" domain="[]" context="{'group_by':'company_id'}"/>
-            	</xpath>
-				<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]' position='after'>
-            		<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
-            		<separator orientation="vertical"/>
-            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
-            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
-            		<separator orientation="vertical"/>
-            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
-            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
-            		<newline/>
-            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
-            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
-            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/>
-            	</xpath>
-                </data>
+
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By..." colspan="4" col="8">
+                        <filter string="User" name="User" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'user_id'}" />
+
+                        <filter string="Company" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'company_id'}" />
+
+                        <filter string="Section" icon="terp-sale"
+                        	domain="[]"
+                        	context="{'group_by':'section_id'}" />
+
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'state'}" />
+
+                        <filter string="Category" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'categ_id'}" />
+						
+						<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
+	            		<separator orientation="vertical"/>
+	            		<filter string="Project"  icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" />
+	            		<filter string="Priority"  icon="terp-sale" domain="[]" context="{'group_by':'priority'}" />
+	            		<separator orientation="vertical"/>
+	            		<filter string="Type"  icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
+	            		<filter string="Task"  icon="terp-sale" domain="[]" context="{'group_by':'task_id'}"/>
+	            		<newline/>
+	            		<filter string="Assigned To"  icon="terp-sale" domain="[]" context="{'group_by':'assigned_to'}"/>
+	            		<filter string="Partner"  icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+	            		<filter string="Channel"  icon="terp-sale" domain="[]" context="{'group_by':'canal_id'}"/>
+            		
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'day'}"/>
+
+                        <filter string="Month" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'month'}" />
+
+                        <filter string="Year" icon="terp-sale"
+                        	domain="[]" context="{'group_by':'name'}" />
+
+                  </group>
+               </search>
             </field>
         </record>
 

From 9f6cd1c3f0a314fbeb728189165c7fa106f97fe7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Wed, 12 May 2010 10:20:30 +0200
Subject: [PATCH 126/146] [FIX] crm: Add the missing right for the
 crm.send.mail.attachment object for the crm user group

bzr revid: stephane@openerp.com-20100512082030-xlqwvckob2nbzdln
---
 addons/crm/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 12e9d2557f1..b13bc586b9f 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -40,5 +40,6 @@
 "access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1
 "access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,1,1,1
 "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1
+"access_crm_send_mail_attachment","crm.send.mail.attachment","model_crm_send_mail_attachment","crm.group_crm_user",1,1,1,1
 "access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1
 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1

From c00448168e4375de7ebc0ec1f8f0b588dd1bea58 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Wed, 12 May 2010 10:20:55 +0200
Subject: [PATCH 127/146] [FIX] crm: Add the user's signature in the
 opportunities

bzr revid: stephane@openerp.com-20100512082055-4ufpnai1c00i3rrk
---
 addons/crm/wizard/crm_send_email.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index a3a86d4b509..ca302dad597 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -216,6 +216,9 @@ class crm_send_new_email(osv.osv_memory):
                             (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
 
+            signature = '\n' + (case.user_id.signature or '')
+            original = [signature]
+
             if include_original == True and 'text' in fields:
                 header = '-------- Original Message --------'
                 sender = 'From: %s' %(hist.email_from or '')
@@ -223,13 +226,10 @@ class crm_send_new_email(osv.osv_memory):
                 sentdate = 'Date: %s' % (hist.date)
                 desc = '\n%s'%(hist.description)
 
-                signature = ''
-                if case.user_id.signature:
-                    signature = '--\n' + case.user_id.signature
-
                 original = [header, sender, to, sentdate, desc, signature]
-                original = '\n'.join(original)
-                res['text']=original
+
+            res['text']= '\n'.join(original)
+
             if 'subject' in fields:
                 res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')})
             if 'state' in fields:

From 28f47fa998a6ffe29731d3fcbf8a14ab6542537a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 14:06:32 +0530
Subject: [PATCH 128/146] [FIX,IMP]: hr_recruitment: Fixed views, objects and
 reports accroding to changes in crm and crm reports

bzr revid: rpa@tinyerp.com-20100512083632-a6mkwyrl3s58yklo
---
 addons/hr_recruitment/hr_recruitment.py       | 120 +++++++++++-------
 addons/hr_recruitment/hr_recruitment_view.xml |  27 ++--
 .../report/hr_recruitment_report.py           |  63 ++++++++-
 .../report/hr_recruitment_report_view.xml     |   2 +-
 4 files changed, 153 insertions(+), 59 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7ea4f52a392..a86d430a36f 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -19,47 +19,75 @@
 #
 ##############################################################################
 
-from osv import fields,osv,orm
+from osv import fields, osv
+from crm import crm
 
 AVAILABLE_STATES = [
-    ('draft','New'),
-    ('open','In Progress'),
-    ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending','Pending')
+    ('draft', 'New'), 
+    ('open', 'In Progress'), 
+    ('cancel', 'Refused'), 
+    ('done', 'Hired'), 
+    ('pending', 'Pending')
 ]
 
 AVAILABLE_PRIORITIES = [
-    ('5','Not Good'),
-    ('4','On Average'),
-    ('3','Good'),
-    ('2','Very Good'),
-    ('1','Excellent')
+    ('5', 'Not Good'), 
+    ('4', 'On Average'), 
+    ('3', 'Good'), 
+    ('2', 'Very Good'), 
+    ('1', 'Excellent')
 ]
 
 
-class hr_applicant(osv.osv):
+class hr_applicant(osv.osv, crm.crm_case):
     _name = "hr.applicant"
     _description = "Applicant Cases"
     _order = "id desc"
-    _inherit ='crm.case'
+    _inherit ='mailgate.thread'
+
     _columns = {
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'date': fields.datetime('Date'),
-        'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
-        'job_id': fields.many2one('hr.job', 'Applied Job'),
-        'salary_proposed': fields.float('Proposed Salary'),
-        'salary_expected': fields.float('Expected Salary'),
-        'availability': fields.integer('Availability (Days)'),
-        'partner_name': fields.char("Applicant's Name", size=64),
-        'partner_phone': fields.char('Phone', size=32),
-        'partner_mobile': fields.char('Mobile', size=32),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
-        'department_id':fields.many2one('hr.department','Department'),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
-        'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
-        'response' : fields.integer("Response"),
+        'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."), 
+        'description': fields.text('Description'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', \
+                        select=True, help='Sales team to which Case belongs to.\
+                             Define Responsible user and Email account for mail gateway.'), 
+        'email_from': fields.char('Email', size=128, help="These people will receive email."), 
+        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
+                             will receive a copy of the future" \
+                            " communication between partner and users by email"), 
+        'probability': fields.float('Probability'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
+                                 domain="[('partner_id','=',partner_id)]"), 
+        'create_date': fields.datetime('Creation Date' , readonly=True), 
+        'write_date': fields.datetime('Update Date' , readonly=True), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
+                         domain="[('section_id','=',section_id),\
+                        ('object_id.model', '=', 'crm.opportunity')]"), 
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, 
+                                  help='The state is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the state is set to \'Open\'.\
+                                  \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\'.'), 
+        'company_id': fields.many2one('res.company', 'Company'), 
+        'user_id': fields.many2one('res.users', 'Responsible'), 
+        # Applicant Columns
+        'date_closed': fields.datetime('Closed', readonly=True), 
+        'date': fields.datetime('Date'), 
+        'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'), 
+        'job_id': fields.many2one('hr.job', 'Applied Job'), 
+        'salary_proposed': fields.float('Proposed Salary'), 
+        'salary_expected': fields.float('Expected Salary'), 
+        'availability': fields.integer('Availability (Days)'), 
+        'partner_name': fields.char("Applicant's Name", size=64), 
+        'partner_phone': fields.char('Phone', size=32), 
+        'partner_mobile': fields.char('Mobile', size=32), 
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"), 
+        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"), 
+        'department_id':fields.many2one('hr.department', 'Department'), 
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 
+        'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'), 
+        'response' : fields.integer("Response"), 
     }
 
     def stage_previous(self, cr, uid, ids, context=None):
@@ -127,24 +155,24 @@ class hr_applicant(osv.osv):
                 id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
             context = {
-                'default_opportunity_id': opp.id,
-                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
-                'default_section_id': opp.section_id and opp.section_id.id or False,
-                'default_email_from': opp.email_from,
-                'default_state': 'open',
+                'default_opportunity_id': opp.id, 
+                'default_partner_id': opp.partner_id and opp.partner_id.id or False, 
+                'default_section_id': opp.section_id and opp.section_id.id or False, 
+                'default_email_from': opp.email_from, 
+                'default_state': 'open', 
                 'default_name': opp.name
             }
             value = {
-                'name': ('Meetings'),
-                'domain': "[('user_id','=',%s)]" % (uid),
-                'context': context,
-                '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': res['res_id'],
+                'name': ('Meetings'), 
+                'domain': "[('user_id','=',%s)]" % (uid), 
+                'context': context, 
+                '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': res['res_id'], 
                 'nodestroy': True
             }
         return value
@@ -164,7 +192,7 @@ class hr_applicant(osv.osv):
             context = {}
         record = self.browse(cr, uid, ids, context)
         record = record and record[0]
-        context.update({'survey_id': record.survey.id, 'response_id' : [record.response], 'response_no':0,})
+        context.update({'survey_id': record.survey.id, 'response_id' : [record.response], 'response_no':0, })
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
         return value
 hr_applicant()
@@ -173,7 +201,7 @@ class hr_job(osv.osv):
     _inherit = "hr.job"
     _name = "hr.job"
     _columns = {
-        'survey_id': fields.many2one('survey', 'Survey'),
+        'survey_id': fields.many2one('survey', 'Survey'), 
     }
 
 hr_job()
\ No newline at end of file
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 396b1238572..4fba762dedf 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -71,7 +71,7 @@
                 <group colspan="4" col="8">
                     <field name="name" string="Subject"/>
                     <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
+                    <group colspan="1" col="3">
                         <field name="stage_id" nolabel="1"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
@@ -134,19 +134,24 @@
                        <field name="id"/>
                        <field name="active"/>
                        <field name="log_ids" nolabel="1" colspan="4">
-                           <form string="Actions">
-                               <separator string="Action Information" colspan="4"/>
-                               <field name="name" colspan="4"/>
-                               <field name="date"/>
-                               <field name="user_id"/>
-                           </form>
-                       </field>
-                   </page>
+                        <tree string="Logs">
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </tree>
+                        <form string="Logs">
+                            <separator string="Action Information" colspan="4"/>
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </form>
+                    </field>
+                    </page>
                    <page string="Emails" groups="base.group_extended">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="CC"/>
                        </group>
-                       <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                       <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
                         <form string="Communication history">
                             <group col="6" colspan="4">
                                 <field name="date"/>
@@ -228,7 +233,7 @@
                        help="My Department"/>
                </field>
                <newline/>
-                <group expand="1" string="Group By..." colspan="11" col="20">
+                <group expand="0" string="Group By..." colspan="11" col="20">
                     <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Responsible" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index f59ea414fec..d2c9aa4a4ae 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -23,13 +23,74 @@ import tools
 from osv import fields,osv
 from hr_recruitment import hr_recruitment
 
+AVAILABLE_STATES = [
+    ('draft','Draft'),
+    ('open','Open'),
+    ('cancel', 'Cancelled'),
+    ('done', 'Closed'),
+    ('pending','Pending')
+]
+
 class hr_recruitment_report(osv.osv):
     _name = "hr.recruitment.report"
     _description = "Recruitments Statistics"
-    _inherit = "crm.case.report"
     _auto = False
     _rec_name = 'date'
+    
+    def _get_data(self, cr, uid, ids, field_name, arg, context={}):
+
+        """ @param cr: the current row, from the database cursor,
+            @param uid: the current user’s ID for security checks,
+            @param ids: List of case and section Data’s IDs
+            @param context: A standard dictionary for contextual values """
+
+        res = {}
+        state_perc = 0.0
+        avg_ans = 0.0
+
+        for case in self.browse(cr, uid, ids, context):
+            if field_name != 'avg_answers':
+                state = field_name[5:]
+                cr.execute("select count(*) from crm_opportunity where \
+                    section_id =%s and state='%s'"%(case.section_id.id, state))
+                state_cases = cr.fetchone()[0]
+                perc_state = (state_cases / float(case.nbr)) * 100
+
+                res[case.id] = perc_state
+            else:
+                model_name = self._name.split('report.')
+                if len(model_name) < 2:
+                    res[case.id] = 0.0
+                else:
+                    model_name = model_name[1]
+
+                    cr.execute("select count(*) from crm_case_log l, ir_model m \
+                         where l.model_id=m.id and m.model = '%s'" , model_name)
+                    logs = cr.fetchone()[0]
+
+                    avg_ans = logs / case.nbr
+                    res[case.id] = avg_ans
+
+        return res
+
     _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'user_id':fields.many2one('res.users', 'User', readonly=True),
+        'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
+        'nbr': fields.integer('# of Cases', readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
+        'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
+        'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True), 
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 83f7d2b7602..98ff0721988 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -95,7 +95,7 @@
                 </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Extended options..." colspan="10" col="12">
+                <group expand="1" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-hr"
                     		string="Hired"
                         name="done"

From aa2f468046d8810a21485782424be7b8fd12d6c8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 15:42:56 +0530
Subject: [PATCH 129/146] [IMP]: crm, mail_gateway: Moved __history from
 crm_case to mailgate.thread

bzr revid: rpa@tinyerp.com-20100512101256-rpwela63e3l76503
---
 addons/crm/crm.py                   | 51 +----------------------------
 addons/crm/crm_opportunity_view.xml |  2 +-
 addons/mail_gateway/mail_gateway.py | 50 ++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 47eb59dca3b..c42fc4b690c 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -171,55 +171,6 @@ class crm_case(object):
                     self.write(cr, uid, [case.id], {'stage_id': s[section][st]})
         return True
 
-    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param cases: a browse record list
-        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
-        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
-        @param email: Email address if any
-        @param details: Details of case history if any 
-        @param context: A standard dictionary for contextual values"""
-        if not context:
-            context = {}
-
-        # The mailgate sends the ids of the cases and not the object list
-        if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
-            cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
-
-        model_obj = self.pool.get('ir.model')
-        
-        obj = self.pool.get('mailgate.message')
-        for case in cases:
-            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
-            data = {
-                'name': keyword,
-                'user_id': uid,
-                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'model_id' : model_ids and model_ids[0] or False,
-                'res_id': case.id,
-                'section_id': case.section_id.id,
-                'message_id':message_id
-            }
-
-            if history:
-                data['description'] = details or case.description
-                data['email_to'] = email or \
-                        (case.section_id and case.section_id.reply_to) or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
-                data['email_from'] = email_from or \
-                        (case.section_id and case.section_id.reply_to) or \
-                        (case.user_id and case.user_id.address_id and \
-                            case.user_id.address_id.email) or tools.config.get('email_from', False)
-            res = obj.create(cr, uid, data, context)
-        return True
-    
-    _history = __history
-    history = __history
-    
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
         @param self: The object pointer
@@ -313,7 +264,7 @@ class crm_case(object):
         self._history(cr, uid, cases, _('Escalate'))
         self._action(cr, uid, cases, 'escalate')
         return True
-    
+
     def case_cancel(self, cr, uid, ids, *args):
         """Cancels Case
         @param self: The object pointer
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index d6cb7d4ddf4..0413e18d7b9 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -124,7 +124,7 @@
                             icon="gtk-media-pause" />
                         <button name="case_close" string="Mark Won"
                             states="open,draft,pending" type="object"
-                            icon="gtk-close" />
+                            icon="gtk-apply" />
                         <button name="case_cancel" string="Mark Lost"
                             states="draft,open,pending" type="object"
                             icon="gtk-cancel" />
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 249116881e4..81f32d12f60 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -76,6 +76,56 @@ class mailgate_thread(osv.osv):
                          multi="log_ids", relation="mailgate.message", string="Logs"),
     }
     
+    def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, context={}):
+        """
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param cases: a browse record list
+        @param keyword: Case action keyword e.g.: If case is closed "Close" keyword is used
+        @param history: Value True/False, If True it makes entry in case History otherwise in Case Log
+        @param email: Email address if any
+        @param details: Details of case history if any 
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+
+        # The mailgate sends the ids of the cases and not the object list
+        if all(isinstance(case_id, (int, long)) for case_id in cases) and context.get('model'):
+            cases = self.pool.get(context['model']).browse(cr, uid, cases, context=context)
+
+        model_obj = self.pool.get('ir.model')
+        
+        obj = self.pool.get('mailgate.message')
+        for case in cases:
+            model_ids = model_obj.search(cr, uid, [('model', '=', case._name)])
+            data = {
+                'name': keyword,
+                'user_id': uid,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'model_id' : model_ids and model_ids[0] or False,
+                'res_id': case.id,
+                'section_id': case.section_id.id,
+                'message_id':message_id
+            }
+
+            if history:
+                data['description'] = details or case.description
+                data['email_to'] = email or \
+                        (case.section_id and case.section_id.reply_to) or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
+                data['email_from'] = email_from or \
+                        (case.section_id and case.section_id.reply_to) or \
+                        (case.user_id and case.user_id.address_id and \
+                            case.user_id.address_id.email) or tools.config.get('email_from', False)
+            res = obj.create(cr, uid, data, context)
+        return True
+    
+    _history = __history
+    history = __history
+    
+
 mailgate_thread()
 
 class mailgate_message(osv.osv):

From 81ba9bf55b82509757e497989da804df9b2cf50e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 16:29:24 +0530
Subject: [PATCH 130/146] [IMP]: crm: Improvement in fwd to partner, Added
 remaining boolean to add as cc

bzr revid: rpa@tinyerp.com-20100512105924-ub1u241iodyzpb5u
---
 addons/crm/wizard/crm_forward_to_partner.py       | 6 ++++--
 addons/crm/wizard/crm_forward_to_partner_view.xml | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 135961182df..7ead9e55f93 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -38,7 +38,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         'email_to' : fields.char('To', required=True, size=128), 
         'subject' : fields.char('Subject', required=True, size=128), 
         'message' : fields.text('Message', required=True), 
-        'history': fields.selection([('latest', 'Latest email'), ('whole', 'Whole Story'), ('info', 'Case Information')], 'Send history', required=True), 
+        'history': fields.selection([('latest', 'Latest email'), ('whole', 'Whole Story'), ('info', 'Case Information')], 'Send history', required=True),
+        'add_cc': fields.boolean('Add as CC', required=False, help="Selcect if you want this user to add as cc for this case.This user will receive all future conversations"),  
     }
     
     def get_whole_history(self, cr, uid, ids, context=None):
@@ -171,7 +172,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                 this.subject, 
                 body, 
             )
-        case_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ', ' + this.email_to or this.email_to})
+        if this.add_cc:
+            case_pool.write(cr, uid, case.id, {'email_cc' : case.email_cc and case.email_cc + ', ' + this.email_to or this.email_to})
         return {}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index a4ecdb922f6..720219599dd 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -22,6 +22,8 @@
 	                    <field name="address_id" string="Contact" on_change="on_change_address(address_id)" colspan="2" />
 					</group>
 					<field colspan="4" name="email_to" attrs="{ 'required' : [('name','=','email')]}" />
+					<newline/>
+					<field name="add_cc" colspan="2" />
                     <separator string="Email" colspan="4" />
                     <field name="subject" colspan="4" />
                     <separator string="Mesage body" colspan="4" />

From c13941c346dec7c2574f40e99fce72a7e0ed1b37 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 16:37:02 +0530
Subject: [PATCH 131/146] [IMP]: crm: Removed unused data in fwd to partner
 wizard

bzr revid: rpa@tinyerp.com-20100512110702-0cop0fsa9egv07s5
---
 addons/crm/wizard/crm_forward_to_partner.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 7ead9e55f93..a9af0f2816b 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -85,10 +85,11 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         #TODO: ids and context are not comming
         res = False
         msg_val = ''
-        res_id = 2 # temp
-        model = 'crm.lead' # temp
+        res_id = False # Comes from context
+        model = None # Comes from context
         model_pool = self.pool.get(model)
-
+        if not res_id or not model:
+            return res
         if history == 'info':
             msg_val = self.get_lead_details(cr, uid, res_id, context=context)
 

From b5a61d1504ff9ec7ce4f609128f13a96e1e680ff Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 17:29:28 +0530
Subject: [PATCH 132/146] [ADD]: crm: Added php scripts to create lead from
 site

bzr revid: rpa@tinyerp.com-20100512115928-5p6zcixwvvcd8c0e
---
 addons/crm/scripts/php/countrylist.php |  103 +
 addons/crm/scripts/php/crmlead.php     |  201 ++
 addons/crm/scripts/php/xmlrpc.inc      | 3600 ++++++++++++++++++++++++
 3 files changed, 3904 insertions(+)
 create mode 100644 addons/crm/scripts/php/countrylist.php
 create mode 100644 addons/crm/scripts/php/crmlead.php
 create mode 100755 addons/crm/scripts/php/xmlrpc.inc

diff --git a/addons/crm/scripts/php/countrylist.php b/addons/crm/scripts/php/countrylist.php
new file mode 100644
index 00000000000..857bda4fa9b
--- /dev/null
+++ b/addons/crm/scripts/php/countrylist.php
@@ -0,0 +1,103 @@
+<?php
+	include("xmlrpc.inc");
+	
+	$user = "";
+	$password = "";
+	$db = "";
+	$serverUri = "";
+	
+	$client = new xmlrpc_client($serverUri.'common');
+	
+	$msg = new xmlrpcmsg('login');
+	$msg->addParam(new xmlrpcval($db, "string"));
+	$msg->addParam(new xmlrpcval($user, "string"));
+	$msg->addParam(new xmlrpcval($pass, "string"));
+
+
+	$res =  &$client->send($msg);
+
+	if(!$res->faultCode()){
+		
+		$id = $res->value()->scalarval();	
+
+		$client = new xmlrpc_client($serverUri.'object');
+
+		$key = array(new xmlrpcval(array(new xmlrpcval("id", "string"),
+					new xmlrpcval(">", "string"),
+					new xmlrpcval(0, "int")),"array"),);
+					
+		
+				
+		$msg = new xmlrpcmsg('execute');
+		$msg->addParam(new xmlrpcval($db, "string"));
+		$msg->addParam(new xmlrpcval($id, "int"));
+		$msg->addParam(new xmlrpcval($pass, "string"));
+		$msg->addParam(new xmlrpcval("res.country","string"));
+		$msg->addParam(new xmlrpcval("search", "string"));		
+		$msg->addParam(new xmlrpcval($key, "array"));
+		$msg->addParam(new xmlrpcval(0, "int"));
+		$msg->addParam(new xmlrpcval(0, "int"));
+		$msg->addParam(new xmlrpcval("id ASC", "string"));
+		
+		$res = &$client->send($msg);
+
+		if(!$res->faultCode())
+		{
+			$val = $res->value()->scalarval();
+			
+			$ides = array();
+			
+			for ($i=0 ; $i<count($val); $i++)
+			{
+				array_push($ides, new xmlrpcval($val[$i]->scalarval(), "int"));
+			}
+			
+			$client = new xmlrpc_client($serverUri.'object');
+			
+			$fields = array(new xmlrpcval("code", "string"), new xmlrpcval("name", "string"));
+			
+			$msg = new xmlrpcmsg('execute');
+			$msg->addParam(new xmlrpcval($db, "string"));
+			$msg->addParam(new xmlrpcval($id, "int"));
+			$msg->addParam(new xmlrpcval($pass, "string"));
+			$msg->addParam(new xmlrpcval("res.country","string"));
+			$msg->addParam(new xmlrpcval("read", "string"));
+			$msg->addParam(new xmlrpcval($ides, "array"));
+			$msg->addParam(new xmlrpcval($fields, "array"));
+
+			$res = &$client->send($msg);
+			
+			if (!$res->faultCode())
+			{
+				$val = $res->value()->scalarval();
+				
+				$select ='<select class="inputbox required"  name="country" id="country" >									
+							<option value="" selected="selected"> -- Select an Option -- </option>';
+
+				for ($i=0; $i<count($val);$i++)
+				{
+					$field = $val[$i]->scalarval();
+					$select .= '<option value="'.$field['code']->scalarval().'">'.$field['name']->scalarval().'</option>';
+				}
+				
+				$select .= '</select>';
+				
+				echo $select;
+			}
+			else
+			{
+				echo "Country not getting";
+			}
+		}
+		else
+		{
+			echo "Country list id empty";
+		}		
+	}
+	else
+	{
+		echo "connection not establish";
+	}
+
+	exit;
+?>
diff --git a/addons/crm/scripts/php/crmlead.php b/addons/crm/scripts/php/crmlead.php
new file mode 100644
index 00000000000..aa23e5c78ba
--- /dev/null
+++ b/addons/crm/scripts/php/crmlead.php
@@ -0,0 +1,201 @@
+<?php
+
+	include("xmlrpc.inc");		
+
+class Contact
+{
+	private $subject = '', $to = '';
+	
+	function __construct($to, $sub)
+	{
+		$this->to = $to;
+		$this->subject = $sub;
+	}
+		
+	function mailTo($post)
+	{	
+		if (!empty($post))
+		{
+				
+			if (empty($this->to))
+			{
+				$this->to = 'sales@tinyerp.com';
+			}
+			
+			if (empty($this->subject))
+			{
+				$this->subject = 'Contact form information';
+			}
+
+			$body = '<table width="90%" border="0" cellspacing="2" cellpadding="2">
+						<tr>
+								<td width="25%"></td>
+								<td width="2%"></td>
+								<td></td>
+						</tr>';
+						
+			foreach ($post as $key => $value)
+			{
+				$body .=	"<tr>
+									<td align='right'>$key</td>
+									<td align='center'><b>:</b></td>
+									<td align='left'>$value</td>
+							</tr>";
+			}
+
+			$body .= '</table>';
+			
+			$header = 'MEME-version : 1.0'."\r\n";
+			$header .= 'Content-type: text/html; charset=iso-8859-1'."\r\n";
+			$header .= 'From: '.$post['name'].' <'.$post['email'].'>'."\r\n";
+			$header .= 'Reply-To: '.$post['name'].' <'.$post['email'].'>'."\r\n";
+			$header .= 'Return-Path: '.$post['name'].' <'.$post['email'].'>'."\r\n";
+			
+			if (mail($this->to, $this->subject, $body, $header))
+			{
+				echo "<br /><h3>Thank You, Your information has been successfully submitted.</h3><br /><p><b>We will be in touch very soon.</b></p>";
+				
+			}
+			else
+			{
+				echo "<br /><h4>Sorry, Due to some problem Your information has not been submitted.</h4>";
+			}
+			
+		}
+	}
+	
+	function xmlCallTo($usr, $password, $database, $server, $post)
+	{
+		$user = $usr;
+		$pass = $password;
+		$db = $database;
+		$server_url = $server; //'http://localhost:8069/xmlrpc/'
+		
+		$client = new xmlrpc_client($server_url.'common');
+		
+		$msg = new xmlrpcmsg('login');
+		$msg->addParam(new xmlrpcval($db, "string"));
+		$msg->addParam(new xmlrpcval($user, "string"));
+		$msg->addParam(new xmlrpcval($pass, "string"));
+
+
+		$res =  &$client->send($msg);
+		
+		if(!$res->faultCode()){
+			
+			$val = $res->value();	
+			$id = $val->scalarval();
+
+			if (empty($id)){
+				
+				echo "Connection error = ";
+				exit;
+			}
+			else
+			{
+				$client2 = new xmlrpc_client($server_url.'object');
+
+				$key = array(new xmlrpcval(array(new xmlrpcval("code", "string"), new xmlrpcval("=", "string"), new xmlrpcval($post['country'], "string")),"array"),);
+				$msg = new xmlrpcmsg('execute');
+				$msg->addParam(new xmlrpcval($db, "string"));
+				$msg->addParam(new xmlrpcval($id, "int"));
+				$msg->addParam(new xmlrpcval($pass, "string"));
+				$msg->addParam(new xmlrpcval("res.country","string"));
+				$msg->addParam(new xmlrpcval("search", "string"));
+				$msg->addParam(new xmlrpcval($key, "array"));
+				$msg->addParam(new xmlrpcval(0, "int"));
+				$msg->addParam(new xmlrpcval(1, "int"));
+				
+				$res = &$client2->send($msg);
+				
+				$val = $res->value()->scalarval();
+				
+				$countryId = $val[0]->scalarval();
+				
+				$val = array ("name" => new xmlrpcval($post['company'],"string"),
+							  "title" => new xmlrpcval($post['salutation'], "string"),
+							  "email_from" => new xmlrpcval($post['email'], "string"),
+							  "phone" => new xmlrpcval($post['phone'], "string"),
+							  "partner_name" => new xmlrpcval($post['name'], "string"),
+							  "function_name" => new xmlrpcval($post["jobtitle"], "string"),
+							  "zip" => new xmlrpcval($post['zip'], "string"),
+							  "stage_id" => new xmlrpcval(6, "int"),
+							  "city" => new xmlrpcval($post['city'], "string"),
+							  "country_id" => new xmlrpcval($countryId, "int"),
+							  "state" => new xmlrpcval("draft", "string"),
+							  "user_id" => new xmlrpcval(false, "boolean"),
+							  "description" => new xmlrpcval("No.of Employees: ".$post['employees']."\nState: ".$post['state']."\nIndustry: ".$post['industry']."\nReasons: ".$post['reasons']."\nAbout: ".$post['about']."\nQuestions: ".stripslashes($post['questions'])."\nUpdate: ".$post['update'], "string")
+							);
+												
+				$msg = new xmlrpcmsg('execute');
+				$msg->addParam(new xmlrpcval($db, "string"));
+				$msg->addParam(new xmlrpcval($id, "int"));
+				$msg->addParam(new xmlrpcval($pass, "string"));
+				$msg->addParam(new xmlrpcval("crm.lead", "string"));
+				$msg->addParam(new xmlrpcval("create", "string"));
+				$msg->addParam(new xmlrpcval($val, "struct"));
+								
+				
+				$res2 = &$client2->send($msg);
+				
+				if(!$res2->faultCode())
+				{
+					$readVal = $res2->value()->scalarval();
+					
+					if (!empty($readVal))
+					{
+						$val = array ( "description" => new xmlrpcval("About: ".$post['about']."\nQuestions: ".$post['questions']),
+								"model_id" => new xmlrpcval(276, "int"),
+								"res_id" => new xmlrpcval($readVal,"int"),
+								"email_from" => new xmlrpcval($post['email'], "string"),
+								"email_to" => new xmlrpcval("sales@openerp.com", "string")
+								);
+
+						
+						$msg = new xmlrpcmsg('execute');
+						$msg->addParam(new xmlrpcval($db, "string"));
+						$msg->addParam(new xmlrpcval($id, "int"));
+						$msg->addParam(new xmlrpcval($pass, "string"));
+						$msg->addParam(new xmlrpcval("crm.case.history", "string"));
+						$msg->addParam(new xmlrpcval("create", "string"));
+						$msg->addParam(new xmlrpcval($val, "struct"));
+						
+						$res2 = &$client2->send($msg);
+
+						//echo "<br />Successfully created lead";
+						echo "<br /><h3>Thank You for your interest in openerp, we'll respond to your request shortly.</h3><br />";
+						if(strstr($post["about"],"Book")) {
+							echo '<script>window.location="http://www.openerp.com/index.php?option=com_content&amp;id=54"</script>';
+						}
+					}
+					else
+					{
+						echo "<br />Lead is not created";
+					}
+				}
+				else
+				{
+					echo "<br />Problem in message sending for create lead";
+				}
+			}			
+		}
+		else
+		{
+			echo "<br />Connection not established";
+		}
+	}
+}
+
+	$arrData = array();
+	$arrData = array_merge($arrData, (array)$_POST);
+	
+	$cnt = new Contact('sales5@openerp.com', 'Country: '.$arrData['country']. ' About: ' .$arrData['about']);
+	
+	/* This function use for sending mail on perticular mail account */
+	/*$cnt->mailTo($arrData); */
+	
+	/* This function use ceating lead in crm of opener erp database */
+	$cnt->xmlCallTo('<username>', '<password>', '<db>', '<server>', $arrData);
+	
+	exit;
+?>
diff --git a/addons/crm/scripts/php/xmlrpc.inc b/addons/crm/scripts/php/xmlrpc.inc
new file mode 100755
index 00000000000..78ac897e2ce
--- /dev/null
+++ b/addons/crm/scripts/php/xmlrpc.inc
@@ -0,0 +1,3600 @@
+<?php					// -*-c++-*-
+// by Edd Dumbill (C) 1999-2002
+// <edd@usefulinc.com>
+// $Id: xmlrpc.inc,v 1.113 2006/01/22 23:55:57 ggiunta Exp $
+
+
+// Copyright (c) 1999,2000,2002 Edd Dumbill.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//    * Redistributions of source code must retain the above copyright
+//      notice, this list of conditions and the following disclaimer.
+//
+//    * Redistributions in binary form must reproduce the above
+//      copyright notice, this list of conditions and the following
+//      disclaimer in the documentation and/or other materials provided
+//      with the distribution.
+//
+//    * Neither the name of the "XML-RPC for PHP" nor the names of its
+//      contributors may be used to endorse or promote products derived
+//      from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+	if(!function_exists('xml_parser_create'))
+	{
+		// For PHP 4 onward, XML functionality is always compiled-in on windows:
+		// no more need to dl-open it. It might have been compiled out on *nix...
+		if(strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))
+		{
+			dl('xml.so');
+		}
+	}
+
+	// Try to be backward compat with php < 4.2 (are we not being nice ?)
+	if(substr(phpversion(), 0, 3) == '4.0' || @version_compare(substr(phpversion(), 0, 3) == '4.1'))
+	{
+		// give an opportunity to user to specify where to include other files from
+		if(!defined('PHP_XMLRPC_COMPAT_DIR'))
+		{
+			define('PHP_XMLRPC_COMPAT_DIR',dirname(__FILE__).'/compat/');
+		}
+		if(substr(phpversion(), 0, 3) == '4.0')
+		{
+			include(PHP_XMLRPC_COMPAT_DIR."is_scalar.php");
+			include(PHP_XMLRPC_COMPAT_DIR."array_key_exists.php");
+			include(PHP_XMLRPC_COMPAT_DIR."version_compare.php");
+		}
+		include(PHP_XMLRPC_COMPAT_DIR."var_export.php");
+		include(PHP_XMLRPC_COMPAT_DIR."is_a.php");
+	}
+
+	// G. Giunta 2005/01/29: declare global these variables,
+	// so that xmlrpc.inc will work even if included from within a function
+	// Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.
+	$GLOBALS['xmlrpcI4']='i4';
+	$GLOBALS['xmlrpcInt']='int';
+	$GLOBALS['xmlrpcBoolean']='boolean';
+	$GLOBALS['xmlrpcDouble']='double';
+	$GLOBALS['xmlrpcString']='string';
+	$GLOBALS['xmlrpcDateTime']='dateTime.iso8601';
+	$GLOBALS['xmlrpcBase64']='base64';
+	$GLOBALS['xmlrpcArray']='array';
+	$GLOBALS['xmlrpcStruct']='struct';
+	$GLOBALS['xmlrpcValue']='undefined';
+
+	$GLOBALS['xmlrpcTypes']=array(
+		$GLOBALS['xmlrpcI4']       => 1,
+		$GLOBALS['xmlrpcInt']      => 1,
+		$GLOBALS['xmlrpcBoolean']  => 1,
+		$GLOBALS['xmlrpcString']   => 1,
+		$GLOBALS['xmlrpcDouble']   => 1,
+		$GLOBALS['xmlrpcDateTime'] => 1,
+		$GLOBALS['xmlrpcBase64']   => 1,
+		$GLOBALS['xmlrpcArray']    => 2,
+		$GLOBALS['xmlrpcStruct']   => 3
+	);
+
+	$GLOBALS['xmlrpc_valid_parents'] = array(
+		'BOOLEAN' => array('VALUE'),
+		'I4' => array('VALUE'),
+		'INT' => array('VALUE'),
+		'STRING' => array('VALUE'),
+		'DOUBLE' => array('VALUE'),
+		'DATETIME.ISO8601' => array('VALUE'),
+		'BASE64' => array('VALUE'),
+		'ARRAY' => array('VALUE'),
+		'STRUCT' => array('VALUE'),
+		'PARAM' => array('PARAMS'),
+		'METHODNAME' => array('METHODCALL'),
+		'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),
+		'MEMBER' => array('STRUCT'),
+		'NAME' => array('MEMBER'),
+		'DATA' => array('ARRAY'),
+		'FAULT' => array('METHODRESPONSE'),
+		'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),
+	);
+
+	$GLOBALS['xmlEntities']=array(
+		'amp'  => '&',
+		'quot' => '"',
+		'lt'   => '<',
+		'gt'   => '>',
+		'apos' => "'"
+	);
+
+	// tables used for transcoding different charsets into us-ascii xml
+
+	$GLOBALS['xml_iso88591_Entities']=array();
+	$GLOBALS['xml_iso88591_Entities']['in'] = array();
+	$GLOBALS['xml_iso88591_Entities']['out'] = array();
+	for ($i = 0; $i < 32; $i++)
+	{
+
+		$GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);
+		$GLOBALS['xml_iso88591_Entities']['out'][] = "&#$i;";
+	}
+	for ($i = 160; $i < 256; $i++)
+	{
+		$GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);
+		$GLOBALS['xml_iso88591_Entities']['out'][] = "&#$i;";
+	}
+
+	/// @todo add to iso table the characters from cp_1252 range, i.e. 128 to 159.
+	/// These will NOT be present in true ISO-8859-1, but will save the unwary
+	/// windows user from sending junk.
+/*
+$cp1252_to_htmlent =
+  array(
+   '\x80'=>'&#x20AC;', '\x81'=>'?', '\x82'=>'&#x201A;', '\x83'=>'&#x0192;',
+   '\x84'=>'&#x201E;', '\x85'=>'&#x2026;', '\x86'=>'&#x2020;', \x87'=>'&#x2021;',
+   '\x88'=>'&#x02C6;', '\x89'=>'&#x2030;', '\x8A'=>'&#x0160;', '\x8B'=>'&#x2039;',
+   '\x8C'=>'&#x0152;', '\x8D'=>'?', '\x8E'=>'&#x017D;', '\x8F'=>'?',
+   '\x90'=>'?', '\x91'=>'&#x2018;', '\x92'=>'&#x2019;', '\x93'=>'&#x201C;',
+   '\x94'=>'&#x201D;', '\x95'=>'&#x2022;', '\x96'=>'&#x2013;', '\x97'=>'&#x2014;',
+   '\x98'=>'&#x02DC;', '\x99'=>'&#x2122;', '\x9A'=>'&#x0161;', '\x9B'=>'&#x203A;',
+   '\x9C'=>'&#x0153;', '\x9D'=>'?', '\x9E'=>'&#x017E;', '\x9F'=>'&#x0178;'
+  );
+*/
+
+	$GLOBALS['xmlrpcerr']['unknown_method']=1;
+	$GLOBALS['xmlrpcstr']['unknown_method']='Unknown method';
+	$GLOBALS['xmlrpcerr']['invalid_return']=2;
+	$GLOBALS['xmlrpcstr']['invalid_return']='Invalid return payload: enable debugging to examine incoming payload';
+	$GLOBALS['xmlrpcerr']['incorrect_params']=3;
+	$GLOBALS['xmlrpcstr']['incorrect_params']='Incorrect parameters passed to method';
+	$GLOBALS['xmlrpcerr']['introspect_unknown']=4;
+	$GLOBALS['xmlrpcstr']['introspect_unknown']="Can't introspect: method unknown";
+	$GLOBALS['xmlrpcerr']['http_error']=5;
+	$GLOBALS['xmlrpcstr']['http_error']="Didn't receive 200 OK from remote server.";
+	$GLOBALS['xmlrpcerr']['no_data']=6;
+	$GLOBALS['xmlrpcstr']['no_data']='No data received from server.';
+	$GLOBALS['xmlrpcerr']['no_ssl']=7;
+	$GLOBALS['xmlrpcstr']['no_ssl']='No SSL support compiled in.';
+	$GLOBALS['xmlrpcerr']['curl_fail']=8;
+	$GLOBALS['xmlrpcstr']['curl_fail']='CURL error';
+	$GLOBALS['xmlrpcerr']['invalid_request']=15;
+	$GLOBALS['xmlrpcstr']['invalid_request']='Invalid request payload';
+	$GLOBALS['xmlrpcerr']['no_curl']=16;
+	$GLOBALS['xmlrpcstr']['no_curl']='No CURL support compiled in.';
+	$GLOBALS['xmlrpcerr']['server_error']=17;
+	$GLOBALS['xmlrpcstr']['server_error']='Internal server error';
+	$GLOBALS['xmlrpcerr']['multicall_error']=18;
+	$GLOBALS['xmlrpcstr']['multicall_error']='Received from server invalid multicall response';
+
+	$GLOBALS['xmlrpcerr']['multicall_notstruct'] = 9;
+	$GLOBALS['xmlrpcstr']['multicall_notstruct'] = 'system.multicall expected struct';
+	$GLOBALS['xmlrpcerr']['multicall_nomethod']  = 10;
+	$GLOBALS['xmlrpcstr']['multicall_nomethod']  = 'missing methodName';
+	$GLOBALS['xmlrpcerr']['multicall_notstring'] = 11;
+	$GLOBALS['xmlrpcstr']['multicall_notstring'] = 'methodName is not a string';
+	$GLOBALS['xmlrpcerr']['multicall_recursion'] = 12;
+	$GLOBALS['xmlrpcstr']['multicall_recursion'] = 'recursive system.multicall forbidden';
+	$GLOBALS['xmlrpcerr']['multicall_noparams']  = 13;
+	$GLOBALS['xmlrpcstr']['multicall_noparams']  = 'missing params';
+	$GLOBALS['xmlrpcerr']['multicall_notarray']  = 14;
+	$GLOBALS['xmlrpcstr']['multicall_notarray']  = 'params is not an array';
+
+	$GLOBALS['xmlrpcerr']['cannot_decompress']=103;
+	$GLOBALS['xmlrpcstr']['cannot_decompress']='Received from server compressed HTTP and cannot decompress';
+	$GLOBALS['xmlrpcerr']['decompress_fail']=104;
+	$GLOBALS['xmlrpcstr']['decompress_fail']='Received from server invalid compressed HTTP';
+	$GLOBALS['xmlrpcerr']['dechunk_fail']=105;
+	$GLOBALS['xmlrpcstr']['dechunk_fail']='Received from server invalid chunked HTTP';
+	$GLOBALS['xmlrpcerr']['server_cannot_decompress']=106;
+	$GLOBALS['xmlrpcstr']['server_cannot_decompress']='Received from client compressed HTTP request and cannot decompress';
+	$GLOBALS['xmlrpcerr']['server_decompress_fail']=107;
+	$GLOBALS['xmlrpcstr']['server_decompress_fail']='Received from client invalid compressed HTTP request';
+
+	// The charset encoding used by the server for received messages and
+	// by the client for received responses when received charset cannot be determined
+	// or is not supported
+	$GLOBALS['xmlrpc_defencoding']='UTF-8';
+	// The encoding used internally by PHP.
+	// String values received as xml will be converted to this, and php strings will be converted to xml
+
+	// as if having been coded with this
+	$GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';
+
+	$GLOBALS['xmlrpcName']='XML-RPC for PHP';
+	$GLOBALS['xmlrpcVersion']='2.0RC3';
+
+	// let user errors start at 800
+	$GLOBALS['xmlrpcerruser']=800;
+	// let XML parse errors start at 100
+	$GLOBALS['xmlrpcerrxml']=100;
+
+	// formulate backslashes for escaping regexp
+	$GLOBALS['xmlrpc_backslash']=chr(92).chr(92);
+
+	// used to store state during parsing
+	// quick explanation of components:
+	//   ac - used to accumulate values
+	//   isf - used to indicate a fault
+	//   lv - used to indicate "looking for a value": implements
+	//        the logic to allow values with no types to be strings
+	//   params - used to store parameters in method calls
+	//   method - used to store method name
+	//   stack - array with genealogy of xml elements names:
+	//           used to validate nesting of xmlrpc elements
+
+	$GLOBALS['_xh']=null;
+
+	/**
+	* Convert a string to the correct XML representation in a target charset
+	* To help correct communication of non-ascii chars inside strings, regardless
+	* of the charset used when sending requests, parsing them, sending responses
+	* and parsing responses, an option is to convert all non-ascii chars present in the message
+	* into their equivalent 'charset entity'. Charset entities enumerated this way
+	* are independent of the charset encoding used to transmit them, and all XML
+	* parsers are bound to understand them.
+	* Note that in the std case we are not sending a charset encoding mime type
+	* along with http headers, so we are bound by RFC 3023 to emit strict us-ascii.
+	*
+	* @todo do a bit of basic benchmarking (strtr vs. str_replace)
+	* @todo	make usage of iconv() or recode_string() or mb_string() where available
+	*/
+	function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')
+	{
+		if ($src_encoding == '')
+		{
+			// lame, but we know no better...
+			$src_encoding = $GLOBALS['xmlrpc_internalencoding'];
+		}
+		//if ($dest_encoding == '')
+		//{
+		//	// lame, but we know no better...
+		//	$dest_encoding = 'US-ASCII';
+		//}
+				switch(strtoupper($src_encoding.'_'.$dest_encoding))
+				{
+					case 'ISO-8859-1_':
+					case 'ISO-8859-1_US-ASCII':
+						$escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);
+						$escaped_data = str_replace($GLOBALS['xml_iso88591_Entities']['in'], $GLOBALS['xml_iso88591_Entities']['out'], $escaped_data);
+						break;
+					case 'ISO-8859-1_UTF-8':
+						$escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);
+						$escaped_data = utf8_encode($escaped_data);
+						break;
+					case 'ISO-8859-1_ISO-8859-1':
+					case 'US-ASCII_US-ASCII':
+					case 'US-ASCII_UTF-8':
+					case 'US-ASCII_':
+					case 'US-ASCII_ISO-8859-1':
+					case 'UTF-8_UTF-8':
+						$escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);
+						break;
+					case 'UTF-8_':
+					case 'UTF-8_US-ASCII':
+					case 'UTF-8_ISO-8859-1':
+	// NB: this will choke on invalid UTF-8, going most likely beyond EOF
+	$escaped_data = "";
+	// be kind to users creating string xmlrpcvals out of different php types
+	$data = (string) $data;
+	$ns = strlen ($data);
+	for ($nn = 0; $nn < $ns; $nn++)
+	{
+		$ch = $data[$nn];
+		$ii = ord($ch);
+//1 7 0bbbbbbb (127)
+		if ($ii < 128)
+		{
+			/// @todo shall we replace this with a (suuposedly) faster str_replace?
+			switch($ii){
+				case 34:
+					$escaped_data .= '&quot;';
+					break;
+				case 38:
+					$escaped_data .= '&amp;';
+				case 39:
+					$escaped_data .= '&apos;';
+					break;
+				case 60:
+					$escaped_data .= '&lt;';
+					break;
+				case 62:
+					$escaped_data .= '&gt;';
+					break;
+				default:
+					$escaped_data .= $ch;
+			} // switch
+		}
+//2 11 110bbbbb 10bbbbbb (2047)
+		else if ($ii>>5 == 6)
+		{
+			$b1 = ($ii & 31);
+			$ii = ord($data[$nn+1]);
+			$b2 = ($ii & 63);
+			$ii = ($b1 * 64) + $b2;
+			$ent = sprintf ("&#%d;", $ii);
+			$escaped_data .= $ent;
+		}
+//3 16 1110bbbb 10bbbbbb 10bbbbbb
+		else if ($ii>>4 == 14)
+		{
+			$b1 = ($ii & 31);
+			$ii = ord($data[$nn+1]);
+			$b2 = ($ii & 63);
+			$ii = ord($data[$nn+2]);
+			$b3 = ($ii & 63);
+			$ii = ((($b1 * 64) + $b2) * 64) + $b3;
+			$ent = sprintf ("&#%d;", $ii);
+			$escaped_data .= $ent;
+		}
+//4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
+		else if ($ii>>3 == 30)
+		{
+			$b1 = ($ii & 31);
+			$ii = ord($data[$nn+1]);
+			$b2 = ($ii & 63);
+			$ii = ord($data[$nn+2]);
+			$b3 = ($ii & 63);
+			$ii = ord($data[$nn+3]);
+			$b4 = ($ii & 63);
+			$ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
+			$ent = sprintf ("&#%d;", $ii);
+			$escaped_data .= $ent;
+		}
+	}
+						break;
+					default:
+						$escaped_data = '';
+						error_log("Converting from $src_encoding to $dest_encoding: not supported...");
+				}
+//		} // switch
+		return $escaped_data;
+	}
+
+	function xmlrpc_se($parser, $name, $attrs)
+	{
+		// if invalid xmlrpc already detected, skip all processing
+		if ($GLOBALS['_xh']['isf'] < 2)
+		{
+			// check for correct element nesting
+			// top level element can only be of 2 types
+			if (count($GLOBALS['_xh']['stack']) == 0)
+			{
+				if ($name != 'METHODRESPONSE' && $name != 'METHODCALL')
+				{
+					$GLOBALS['_xh']['isf'] = 2;
+					$GLOBALS['_xh']['isf_reason'] = 'missing top level xmlrpc element';
+					return;
+				}
+			}
+			else
+			{
+				// not top level element: see if parent is OK
+				$parent = end($GLOBALS['_xh']['stack']);
+				if (!array_key_exists($name, $GLOBALS['xmlrpc_valid_parents']) || !in_array($parent, $GLOBALS['xmlrpc_valid_parents'][$name]))
+				{
+					$GLOBALS['_xh']['isf'] = 2;
+					$GLOBALS['_xh']['isf_reason'] = "xmlrpc element $name cannot be child of $parent";
+					return;
+				}
+			}
+
+			switch($name)
+			{
+				case 'STRUCT':
+				case 'ARRAY':
+					// create an empty array to hold child values, and push it onto appropriate stack
+					$cur_val = array();
+					$cur_val['values'] = array();
+					$cur_val['type'] = $name;
+					// check for out-of-band information to rebuild php objs
+					// and in case it is found, save it
+					if (@isset($attrs['PHP_CLASS']))
+					{
+						$cur_val['php_class'] = $attrs['PHP_CLASS'];
+					}
+					$GLOBALS['_xh']['valuestack'][] = $cur_val;
+					break;
+				case 'DATA':
+				case 'METHODCALL':
+				case 'METHODRESPONSE':
+				case 'PARAMS':
+					// valid elements that add little to processing
+					break;
+				case 'METHODNAME':
+				case 'NAME':
+					$GLOBALS['_xh']['ac']='';
+					break;
+				case 'FAULT':
+					$GLOBALS['_xh']['isf']=1;
+					break;
+				case 'VALUE':
+					$GLOBALS['_xh']['vt']='value'; // indicator: no value found yet
+					$GLOBALS['_xh']['ac']='';
+					$GLOBALS['_xh']['lv']=1;
+					$GLOBALS['_xh']['php_class']=null;
+					break;
+				case 'I4':
+				case 'INT':
+				case 'STRING':
+				case 'BOOLEAN':
+				case 'DOUBLE':
+				case 'DATETIME.ISO8601':
+				case 'BASE64':
+					if ($GLOBALS['_xh']['vt']!='value')
+					{
+						//two data elements inside a value: an error occurred!
+						$GLOBALS['_xh']['isf'] = 2;
+						$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
+						return;
+					}
+
+					$GLOBALS['_xh']['ac']=''; // reset the accumulator
+					break;
+				case 'MEMBER':
+					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name']=''; // set member name to null, in case we do not find in the xml later on
+					//$GLOBALS['_xh']['ac']='';
+					// Drop trough intentionally
+				case 'PARAM':
+					// clear value type, so we can check later if no value has been passed for this param/member
+					$GLOBALS['_xh']['vt']=null;
+					break;
+				default:
+					/// INVALID ELEMENT: RAISE ISF so that it is later recognized!!!
+					$GLOBALS['_xh']['isf'] = 2;
+					$GLOBALS['_xh']['isf_reason'] = "found not-xmlrpc xml element $name";
+					break;
+			}
+
+			// Save current element name to stack, to validate nesting
+			$GLOBALS['_xh']['stack'][] = $name;
+
+			if($name!='VALUE')
+			{
+				$GLOBALS['_xh']['lv']=0;
+			}
+		}
+	}
+
+	function xmlrpc_ee($parser, $name, $rebuild_xmlrpcvals = true)
+	{
+		if ($GLOBALS['_xh']['isf'] < 2)
+		{
+			// push this element name from stack
+			// NB: if XML validates, correct opening/closing is guaranteed and
+			// we do not have to check for $name == $curr_elem.
+			// we also checked for proper nesting at start of elements...
+			$curr_elem = array_pop($GLOBALS['_xh']['stack']);
+
+			switch($name)
+			{
+				case 'STRUCT':
+				case 'ARRAY':
+					// fetch out of stack array of values, and promote it to current value
+					$curr_val = array_pop($GLOBALS['_xh']['valuestack']);
+					$GLOBALS['_xh']['value'] = $curr_val['values'];
+					$GLOBALS['_xh']['vt']=strtolower($name);
+					if (isset($curr_val['php_class']))
+					{
+						$GLOBALS['_xh']['php_class'] = $curr_val['php_class'];
+					}
+					break;
+				case 'NAME':
+					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = $GLOBALS['_xh']['ac'];
+					break;
+				case 'BOOLEAN':
+				case 'I4':
+				case 'INT':
+				case 'STRING':
+				case 'DOUBLE':
+				case 'DATETIME.ISO8601':
+				case 'BASE64':
+					$GLOBALS['_xh']['vt']=strtolower($name);
+					if ($name=='STRING')
+					{
+						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+					}
+					elseif ($name=='DATETIME.ISO8601')
+					{
+						/// @todo validate datetime values with a correct format mask?
+						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];
+						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+					}
+					elseif ($name=='BASE64')
+					{
+						/// @todo check for failure of base64 decoding / catch warnings
+						$GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);
+					}
+					elseif ($name=='BOOLEAN')
+					{
+						// special case here: we translate boolean 1 or 0 into PHP
+							// constants true or false
+							// NB: this simple checks helps a lot sanitizing input, ie no
+							// security problems around here
+							if ($GLOBALS['_xh']['ac']=='1')
+							{
+								$GLOBALS['_xh']['value']=true;
+							}
+							else
+							{
+								// log if receiveing something strange, even though we set the value to false anyway
+								if ($GLOBALS['_xh']['ac']!='0')
+									error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
+								$GLOBALS['_xh']['value']=false;
+							}
+					}
+					elseif ($name=='DOUBLE')
+					{
+						// we have a DOUBLE
+						// we must check that only 0123456789-.<space> are characters here
+						if (!ereg("^[+-]?[eE0123456789 \\t.]+$", $GLOBALS['_xh']['ac']))
+						{
+							/// @todo: find a better way of throwing an error
+							// than this!
+							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);
+							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
+						}
+						else
+						{
+							// it's ok, add it on
+							$GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];
+						}
+					}
+					else
+					{
+						// we have an I4/INT
+						// we must check that only 0123456789-<space> are characters here
+						if (!ereg("^[+-]?[0123456789 \\t]+$", $GLOBALS['_xh']['ac']))
+						{
+							/// @todo find a better way of throwing an error
+							// than this!
+							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);
+							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
+						}
+						else
+						{
+							// it's ok, add it on
+							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];
+						}
+					}
+					$GLOBALS['_xh']['ac']=''; // is this necessary?
+					$GLOBALS['_xh']['lv']=3; // indicate we've found a value
+					break;
+				case 'VALUE':
+					// This if() detects if no scalar was inside <VALUE></VALUE>
+					if ($GLOBALS['_xh']['vt']=='value')
+					{
+						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
+						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcString'];
+					}
+
+					if ($rebuild_xmlrpcvals)
+					{
+						// build the xmlrpc val out of the data received, and substitute it
+						$temp =& new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);
+						// in case we got info about underlying php class, save it
+						// in the object we're rebuilding
+						if (isset($GLOBALS['_xh']['php_class']))
+							$temp->_php_class = $GLOBALS['_xh']['php_class'];
+						// check if we are inside an array or struct:
+						// if value just built is inside an array, let's move it into array on the stack
+						$vscount = count($GLOBALS['_xh']['valuestack']);
+						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
+						{
+							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;
+						}
+						else
+						{
+							$GLOBALS['_xh']['value'] = $temp;
+						}
+					}
+					else
+					{
+						/// @todo this needs to treat correctly php-serialized objects,
+						/// since std deserializing is done by php_xmlrpc_decode,
+						/// which we will not be calling...
+						if (isset($GLOBALS['_xh']['php_class']))
+						{
+						}
+
+						// check if we are inside an array or struct:
+						// if value just built is inside an array, let's move it into array on the stack
+						$vscount = count($GLOBALS['_xh']['valuestack']);
+						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
+						{
+							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $GLOBALS['_xh']['value'];
+						}
+					}
+					break;
+				case 'MEMBER':
+					$GLOBALS['_xh']['ac']=''; // is this necessary?
+					// add to array in the stack the last element built,
+					// unless no VALUE was found
+					if ($GLOBALS['_xh']['vt'])
+					{
+						$vscount = count($GLOBALS['_xh']['valuestack']);
+						$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];
+					} else
+						error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+					break;
+				case 'DATA':
+					$GLOBALS['_xh']['ac']=''; // is this necessary?
+					break;
+				case 'PARAM':
+					// add to array of params the current value,
+					// unless no VALUE was found
+					if ($GLOBALS['_xh']['vt'])
+					{
+						$GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];
+						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];
+					}
+					else
+						error_log('XML-RPC: missing VALUE inside PARAM in received xml');
+					break;
+				case 'METHODNAME':
+					$GLOBALS['_xh']['method']=ereg_replace("^[\n\r\t ]+", '', $GLOBALS['_xh']['ac']);
+					break;
+				case 'PARAMS':
+				case 'FAULT':
+				case 'METHODCALL':
+				case 'METHORESPONSE':
+					break;
+				default:
+					// End of INVALID ELEMENT!
+					// shall we add an assert here for unreachable code???
+					break;
+			}
+		}
+	}
+
+	function xmlrpc_ee_fast($parser, $name)
+	{
+		xmlrpc_ee($parser, $name, false);
+	}
+
+	function xmlrpc_cd($parser, $data)
+	{
+		//if(ereg("^[\n\r \t]+$", $data)) return;
+		// print "adding [${data}]\n";
+
+		// skip processing if xml fault already detected
+		if ($GLOBALS['_xh']['isf'] < 2)
+		{
+			if($GLOBALS['_xh']['lv']!=3)
+			{
+				// "lookforvalue==3" means that we've found an entire value
+				// and should discard any further character data
+				if($GLOBALS['_xh']['lv']==1)
+				{
+					// if we've found text and we're just in a <value> then
+					// say we've found a value
+					$GLOBALS['_xh']['lv']=2;
+				}
+				if(!@isset($GLOBALS['_xh']['ac']))
+				{
+					$GLOBALS['_xh']['ac'] = '';
+				}
+				$GLOBALS['_xh']['ac'].=$data;
+			}
+		}
+	}
+
+	function xmlrpc_dh($parser, $data)
+	{
+		// skip processing if xml fault already detected
+		if ($GLOBALS['_xh']['isf'] < 2)
+		{
+			if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')
+			{
+				if($GLOBALS['_xh']['lv']==1)
+				{
+					$GLOBALS['_xh']['lv']=2;
+				}
+				$GLOBALS['_xh']['ac'].=$data;
+			}
+		}
+	}
+
+	class xmlrpc_client
+	{
+		var $path;
+		var $server;
+		var $port=0;
+		var $method='http';
+		var $errno;
+		var $errstr;
+		var $debug=0;
+		var $username='';
+		var $password='';
+		var $cert='';
+		var $certpass='';
+		var $key='';
+		var $keypass='';
+		var $verifypeer=1;
+		var $verifyhost=1;
+		var $no_multicall=false;
+		var $proxy = '';
+		var $proxyport=0;
+		var $proxy_user = '';
+		var $proxy_pass = '';
+		var $cookies=array();
+		/**
+		* List of http compression methods accepted by the client for responses.
+		* NB: PHP supports deflate, gzip compressions out of the box if compiled w. zlib
+		*
+		* NNB: you can set it to any non-empty array for HTTP11 and HTTPS, since
+		* in those cases it will be up to CURL to decide the compression methods
+		* it supports. You might check for the presence of 'zlib' in the output of
+		* curl_version() to determine wheter compression is supported or not
+		*/
+		var $accepted_compression = array();
+		/**
+		* Name of compression scheme to be used for sending requests.
+		* Either null, gzip or deflate
+		*/
+		var $request_compression = '';
+		/**
+		* CURL handle: used for keep-alive connections (PHP 4.3.8 up, see:
+		* http://curl.haxx.se/docs/faq.html#7.3)
+		*/
+		var $xmlrpc_curl_handle = null;
+		/// Wheter to use persistent connections for http 1.1 and https
+		var $keepalive = false;
+		/// Charset encodings that can be decoded without problems by the client
+		var $accepted_charset_encodings = array();
+		/// Charset encoding to be used in serializing request. NULL = use ASCII
+		var $request_charset_encoding = '';
+		/**
+		* Decides the content of xmlrpcresp objects returned by calls to send()
+		* valid strings are 'xmlrpcvals', 'phpvals' or 'xml'
+		*/
+		var $return_type = 'xmlrpcvals';
+
+		/**
+		* @param string $path either the complete server URL or the PATH part of the xmlrc server URL, e.g. /xmlrpc/server.php
+		* @param string $server the server name / ip address
+		* @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used
+		* @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed
+		*/
+		function xmlrpc_client($path, $server='', $port='', $method='')
+		{ 
+			// allow user to specify all params in $path
+			if($server == '' and $port == '' and $method == '')
+			{
+				$parts = parse_url($path);
+				$server = $parts['host'];
+				$path = $parts['path'];
+				if(isset($parts['query']))
+				{
+					$path .= '?'.$parts['query'];
+				}
+				if(isset($parts['fragment']))
+				{
+					$path .= '#'.$parts['fragment'];
+				}
+				if(isset($parts['port']))
+				{
+					$port = $parts['port'];
+				}
+				if(isset($parts['scheme']))
+				{
+					$method = $parts['scheme'];
+				}
+				if(isset($parts['user']))
+				{
+					$this->username = $parts['user'];
+				}
+				if(isset($parts['pass']))
+				{
+					$this->password = $parts['pass'];
+				}
+			}
+			if($path == '' || $path[0] != '/')
+			{
+				$this->path='/'.$path;
+			}
+			else
+			{
+				$this->path=$path;
+			}
+			$this->server=$server;
+			if($port != '')
+			{
+				$this->port=$port;
+			}
+			if($method != '')
+			{
+				$this->method=$method;
+			}
+
+			// if ZLIB is enabled, let the client by default accept compressed responses
+			if(function_exists('gzinflate') || (
+				function_exists('curl_init') && (($info = curl_version()) &&
+				((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))
+			))
+			{
+				$this->accepted_compression = array('gzip', 'deflate');
+			}
+
+			// keepalives: enabled by default ONLY for PHP >= 4.3.8
+			// (see http://curl.haxx.se/docs/faq.html#7.3)
+			if(version_compare(phpversion(), '4.3.8') >= 0)
+			{
+				$this->keepalive = true;
+			}
+
+			// by default the xml parser can support these 3 charset encodings
+			$this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');
+		}
+
+		/*
+		* Enables/disables the echoing to screen of the xmlrpc responses received
+		* @param integer $debug values 0, 1 and 2 are supported (2 = echo sent msg too, beside received response)
+		* @access public
+		*/
+		function setDebug($in)
+		{
+			$this->debug=$in;
+		}
+
+		/*
+		* Add some http BASIC AUTH credentials, used by the client to authenticate
+		* @param string $u username
+		* @param string $p password
+		* @access public
+		*/
+		function setCredentials($u, $p)
+		{
+			$this->username=$u;
+			$this->password=$p;
+		}
+
+		/*
+		* Add a client-side https certificate
+		* @param string $cert
+		* @param string $certpass
+		* @access public
+		*/
+		function setCertificate($cert, $certpass)
+		{
+			$this->cert = $cert;
+			$this->certpass = $certpass;
+		}
+
+		/*
+		* @param string $key     The name of a file containing a private SSL key
+		* @param string $keypass The secret password needed to use the private SSL key
+		* @access public
+		* NB: does not work in older php/curl installs
+		* Thanks to Daniel Convissor
+		*/
+		function setKey($key, $keypass)
+		{
+			$this->key = $key;
+			$this->keypass = $keypass;
+		}
+
+		/*
+		* @access public
+		*/
+		function setSSLVerifyPeer($i)
+		{
+			$this->verifypeer = $i;
+		}
+
+		/*
+		* @access public
+		*/
+		function setSSLVerifyHost($i)
+		{
+			$this->verifyhost = $i;
+		}
+
+		/**
+		* Set proxy info
+		*
+		* @param    string $proxyhost
+		* @param    string $proxyport Defaults to 8080 for HTTP and 443 for HTTPS
+		* @param    string $proxyusername Leave blank if proxy has public access
+		* @param    string $proxypassword Leave blank if proxy has public access
+		* @access   public
+		*/
+		function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '')
+		{
+			$this->proxy = $proxyhost;
+			$this->proxyport = $proxyport;
+			$this->proxy_user = $proxyusername;
+			$this->proxy_pass = $proxypassword;
+		}
+
+		/**
+		* Enables/disables reception of compressed xmlrpc responses.
+		* Note that enabling reception of compressed responses merely adds some standard
+		* http headers to xmlrpc requests. It is up to the xmlrpc server to return
+		* compressed responses when receiving such requests.
+		* @param string $compmethod either 'gzip', 'deflate', 'any' or ''
+		* @access   public
+		*/
+		function setAcceptedCompression($compmethod)
+		{
+			if ($compmethod == 'any')
+				$this->accepted_compression = array('gzip', 'deflate');
+			else
+				$this->accepted_compression = array($compmethod);
+		}
+
+		/**
+		* Enables/disables http compression of xmlrpc request.
+		* Take care when sending compressed requests: servers might not support them
+		* (and automatic fallback to uncompressed requests is not yet implemented)
+		* @param string $compmethod either 'gzip', 'deflate' or ''
+		* @access   public
+		*/
+		function setRequestCompression($compmethod)
+		{
+			$this->request_compression = $compmethod;
+		}
+
+		/**
+		* Adds a cookie to list of cookies that will be sent to server.
+		* NB: setting any param but name and value will turn the cookie into a 'version 1' cookie:
+		* do not do it unless you know what you are doing
+		* @param string $name
+		* @param string $value
+		* @param string $path
+		* @param string $domain
+		* @param string $port
+		* @access   public
+		*
+		* @todo check correctness of urlencoding cookie value (copied from php way of doing it...)
+		*/
+		function setCookie($name, $value='', $path='', $domain='', $port=null)
+		{
+			$this->cookies[$name]['value'] = urlencode($value);
+			if ($path || $domain || $port)
+			{
+				$this->cookies[$name]['path'] = $path;
+				$this->cookies[$name]['domain'] = $domain;
+				$this->cookies[$name]['port'] = $port;
+				$this->cookies[$name]['version'] = 1;
+			}
+			else
+			{
+				$this->cookies[$name]['version'] = 0;
+			}
+		}
+
+		/**
+		* Send an xmlrpc request
+		* @param mixed $msg The message object, or an array of messages for using multicall, or the complete xml representation of a request
+		* @param integer $timeout Connection timeout, in seconds, If unspecified, a platform specific timeout will apply
+		* @param string $method if left unspecified, the http protocol chosen during creation of the object will be used
+		*/
+		function& send($msg, $timeout=0, $method='')
+		{
+			// if user deos not specify http protocol, use native method of this client
+			// (i.e. method set during call to constructor)
+			if($method == '')
+			{
+				$method = $this->method;
+			}
+
+			if(is_array($msg))
+			{
+				// $msg is an array of xmlrpcmsg's
+				$r = $this->multicall($msg, $timeout, $method);
+				return $r;
+			}
+			elseif(is_string($msg))
+			{
+				$n =& new xmlrpcmsg('');
+				$n->payload = $msg;
+				$msg = $n;
+			}
+
+			// where msg is an xmlrpcmsg
+			$msg->debug=$this->debug;
+
+			if($method == 'https')
+			{
+				$r =& $this->sendPayloadHTTPS(
+					$msg,
+					$this->server,
+					$this->port,
+					$timeout,
+					$this->username,
+					$this->password,
+					$this->cert,
+					$this->certpass,
+					$this->proxy,
+					$this->proxyport,
+					$this->proxy_user,
+					$this->proxy_pass,
+					$this->keepalive,
+					$this->key,
+					$this->keypass
+				);
+			}
+			elseif($method == 'http11')
+			{
+				$r =& $this->sendPayloadCURL(
+					$msg,
+					$this->server,
+					$this->port,
+					$timeout,
+					$this->username,
+					$this->password,
+					null,
+					null,
+					$this->proxy,
+					$this->proxyport,
+					$this->proxy_user,
+					$this->proxy_pass,
+					'http',
+					$this->keepalive
+				);
+			}
+			else
+			{
+				$r =& $this->sendPayloadHTTP10(
+					$msg,
+					$this->server,
+					$this->port,
+					$timeout,
+					$this->username,
+					$this->password,
+					$this->proxy,
+					$this->proxyport,
+					$this->proxy_user,
+					$this->proxy_pass
+				);
+			}
+
+			return $r;
+		}
+
+		/**
+		* @access private
+		*/
+		function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,$username='', $password='',
+			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='')
+		{
+			if($port==0)
+			{
+				$port=80;
+			}
+
+			// Only create the payload if it was not created previously
+			if(empty($msg->payload))
+			{
+				$msg->createPayload($this->request_charset_encoding);
+			}
+
+			$payload = $msg->payload;
+			// Deflate request body and set appropriate request headers
+			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
+			{
+				if($this->request_compression == 'gzip')
+				{
+					$a = @gzencode($msg->payload);
+					if($a)
+					{
+						$payload = $a;
+						$encoding_hdr = "Content-Encoding: gzip\r\n";
+					}
+				}
+				else
+				{
+					$a = @gzdeflate($msg->payload);
+					if($a)
+					{
+						$payload = $a;
+						$encoding_hdr = "Content-Encoding: deflate\r\n";
+					}
+				}
+			}
+			else
+			{
+				$encoding_hdr = '';
+			}
+
+			// thanks to Grant Rauscher <grant7@firstworld.net>
+			// for this
+			$credentials='';
+			if($username!='')
+			{
+				$credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
+			}
+
+			$accepted_encoding = '';
+			if(is_array($this->accepted_compression) && count($this->accepted_compression))
+			{
+				$accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
+			}
+
+			$proxy_credentials = '';
+			if($proxyhost)
+			{
+				if($proxyport == 0)
+				{
+					$proxyport = 8080;
+				}
+				$connectserver = $proxyhost;
+				$connectport = $proxyport;
+				$uri = 'http://'.$server.':'.$port.$this->path;
+				if($proxyusername != '')
+				{
+					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";
+				}
+			}
+			else
+			{
+				$connectserver = $server;
+				$connectport = $port;
+				$uri = $this->path;
+			}
+
+			// Cookie generation, as per rfc2965 (version 1 cookies) or
+			// netscape's rules (version 0 cookies)
+			$cookieheader='';
+			foreach ($this->cookies as $name => $cookie)
+			{
+				if ($cookie['version'])
+				{
+					$cookieheader .= 'Cookie: $Version="' . $cookie['version'] . '"; ';
+					$cookieheader .= $name . '="' . $cookie['value'] . '";';
+					if ($cookie['path'])
+						$cookieheader .= ' $Path="' . $cookie['path'] . '";';
+					if ($cookie['domain'])
+						$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
+					if ($cookie['port'])
+						$cookieheader .= ' $Port="' . $cookie['domain'] . '";';
+					$cookieheader = substr($cookieheader, 0, -1) . "\r\n";
+				}
+				else
+				{
+					$cookieheader .= 'Cookie: ' . $name . '=' . $cookie['value'] . "\r\n";
+				}
+			}
+
+			$op= "POST " . $uri. " HTTP/1.0\r\n" .
+				"User-Agent: " . $GLOBALS['xmlrpcName'] . " " . $GLOBALS['xmlrpcVersion'] . "\r\n" .
+				"Host: ". $server . "\r\n" .
+				$credentials .
+				$proxy_credentials .
+				$accepted_encoding .
+				$encoding_hdr .
+				"Accept-Charset: " . implode(',', $this->accepted_charset_encodings) . "\r\n" .
+				$cookieheader .
+				"Content-Type: " . $msg->content_type . "\r\nContent-Length: " .
+				strlen($payload) . "\r\n\r\n" .
+				$payload;
+
+
+			if($this->debug > 1)
+			{
+				print "<PRE>\n---SENDING---\n" . htmlentities($op) . "\n---END---\n</PRE>";
+				// let the client see this now in case http times out...
+				flush();
+			}
+
+			if($timeout>0)
+			{
+				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);
+			}
+			else
+			{
+				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);
+			}
+			if($fp)
+			{
+				if($timeout>0 && function_exists('stream_set_timeout'))
+				{
+					stream_set_timeout($fp, $timeout);
+				}
+			}
+			else
+			{
+				$this->errstr='Connect error: '.$this->errstr;
+				$r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');
+				return $r;
+			}
+
+			if(!fputs($fp, $op, strlen($op)))
+			{
+				$this->errstr='Write error';
+				$r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);
+				return $r;
+			}
+			else
+			{
+				// reset errno and errstr on succesful socket connection
+				$this->errstr = '';
+			}
+			// G. Giunta 2005/10/24: close socket before parsing.
+			// should yeld slightly better execution times, and make easier recursive calls (e.g. to follow http redirects)
+			//$resp=&$msg->parseResponseFile($fp);
+			$ipd='';
+			while($data=fread($fp, 32768))
+			{
+				// shall we check for $data === FALSE?
+				// as per the manual, it signals an error
+				$ipd.=$data;
+			}
+			fclose($fp);
+			$r =& $msg->parseResponse($ipd, false, $this->return_type);
+			return $r;
+
+		}
+
+		/**
+		* @access private
+		*/
+		function &sendPayloadHTTPS($msg, $server, $port, $timeout=0,$username='', $password='', $cert='',$certpass='',
+			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $keepalive=false, $key='', $keypass='')
+		{
+			$r =& $this->sendPayloadCURL($msg, $server, $port, $timeout, $username, $password, $cert, $certpass,
+				$proxyhost, $proxyport, $proxyusername, $proxypassword, 'https', $keepalive, $key, $keypass);
+			return $r;
+		}
+
+		/**
+		* Contributed by Justin Miller <justin@voxel.net>
+		* Requires curl to be built into PHP
+		* NB: CURL versions before 7.11.10 cannot use proxy to talk to https servers!
+		* @access private
+		*/
+		function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='', $password='', $cert='', $certpass='',
+			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $method='https', $keepalive=false,
+			$key='', $keypass='')
+		{
+			if(!function_exists('curl_init'))
+			{
+				$this->errstr='CURL unavailable on this install';
+				$r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']);
+				return $r;
+			}
+			if($method == 'https')
+			{
+				if(($info = curl_version()) &&
+					((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))
+				{
+					$this->errstr='SSL unavailable on this install';
+					$r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);
+					return $r;
+				}
+			}
+
+			if($port == 0)
+			{
+				if($method == 'http')
+				{
+					$port = 80;
+				}
+				else
+				{
+					$port = 443;
+				}
+			}
+
+			// Only create the payload if it was not created previously
+			if(empty($msg->payload))
+			{
+				$msg->createPayload($this->request_charset_encoding);
+			}
+
+			// Deflate request body and set appropriate request headers
+			$payload = $msg->payload;
+			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
+			{
+				if($this->request_compression == 'gzip')
+				{
+					$a = @gzencode($msg->payload);
+					if($a)
+					{
+						$payload = $a;
+						$encoding_hdr = "Content-Encoding: gzip";
+					}
+				}
+				else
+				{
+					$a = @gzdeflate($msg->payload);
+					if($a)
+					{
+						$payload = $a;
+						$encoding_hdr = "Content-Encoding: deflate";
+					}
+				}
+			}
+			else
+			{
+				$encoding_hdr = '';
+			}
+
+			if($this->debug > 1)
+			{
+				print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";
+				// let the client see this now in case http times out...
+				flush();
+			}
+
+			if(!$keepalive || !$this->xmlrpc_curl_handle)
+			{
+				$curl = curl_init($method . '://' . $server . ':' . $port . $this->path);
+				if($keepalive)
+				{
+					$this->xmlrpc_curl_handle = $curl;
+				}
+			}
+			else
+			{
+				$curl = $this->xmlrpc_curl_handle;
+			}
+
+			// results into variable
+			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+
+			if($this->debug)
+			{
+				curl_setopt($curl, CURLOPT_VERBOSE, 1);
+			}
+			curl_setopt($curl, CURLOPT_USERAGENT, $GLOBALS['xmlrpcName'].' '.$GLOBALS['xmlrpcVersion']);
+			// required for XMLRPC: post the data
+			curl_setopt($curl, CURLOPT_POST, 1);
+			// the data
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $payload);
+
+			// return the header too
+			curl_setopt($curl, CURLOPT_HEADER, 1);
+
+			// will only work with PHP >= 5.0
+			// NB: if we set an empty string, CURL will add http header indicating
+			// ALL methods it is supporting. This is possibly a better option than
+			// letting the user tell what curl can / cannot do...
+			if(is_array($this->accepted_compression) && count($this->accepted_compression))
+			{
+				//curl_setopt($curl, CURLOPT_ENCODING, implode(',', $this->accepted_compression));
+				// empty string means 'any supported by CURL' (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
+				curl_setopt($curl, CURLOPT_ENCODING, '');
+			}
+			// extra headers
+			$headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
+			// if no keepalive is wanted, let the server know it in advance
+			if(!$keepalive)
+			{
+				$headers[] = 'Connection: close';
+			}
+			// request compression header
+			if($encoding_hdr)
+			{
+				$headers[] = $encoding_hdr;
+			}
+
+			curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
+			// timeout is borked
+			if($timeout)
+			{
+				curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
+			}
+
+			if($username && $password)
+			{
+				curl_setopt($curl, CURLOPT_USERPWD,"$username:$password");
+			}
+
+			if($method == 'https')
+			{
+				// set cert file
+				if($cert)
+				{
+					curl_setopt($curl, CURLOPT_SSLCERT, $cert);
+				}
+				// set cert password
+				if($certpass)
+				{
+					curl_setopt($curl, CURLOPT_SSLCERTPASSWD, $certpass);
+				}
+				// set key file (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
+				if($key)
+				{
+					curl_setopt($curl, CURLOPT_SSLKEY, $key);
+				}
+				// set key password (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
+				if($keypass)
+				{
+					curl_setopt($curl, CURLOPT_SSLKEYPASSWD, $keypass);
+				}
+				// whether to verify remote host's cert
+				curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifypeer);
+				// whether to verify cert's common name (CN); 0 for no, 1 to verify that it exists, and 2 to verify that it matches the hostname used
+				curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, $this->verifyhost);
+			}
+
+			// proxy info
+			if($proxyhost)
+			{
+				if($proxyport == 0)
+				{
+					$proxyport = 8080; // NB: even for HTTPS, local connection is on port 8080
+				}
+				curl_setopt($curl, CURLOPT_PROXY,$proxyhost.':'.$proxyport);
+				//curl_setopt($curl, CURLOPT_PROXYPORT,$proxyport);
+				if($proxyusername)
+				{
+					curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyusername.':'.$proxypassword);
+				}
+			}
+
+			// NB: should we build cookie http headers by hand rather than let CURL do it?
+			// the following code does not honour 'expires', 'path' and 'domain' cookie attributes
+			// set to clint obj the the user...
+			if (count($this->cookies))
+			{
+				$cookieheader = '';
+				foreach ($this->cookies as $name => $cookie)
+				{
+					$cookieheader .= $name . '=' . $cookie['value'] . ', ';
+				}
+				curl_setopt($curl, CURLOPT_COOKIE, substr($cookieheader, 0, -2));
+			}
+
+			$result = curl_exec($curl);
+
+			if(!$result)
+			{
+				$this->errstr='no response';
+				$resp=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));
+				if(!$keepalive)
+				{
+					curl_close($curl);
+				}
+			}
+			else
+			{
+				if(!$keepalive)
+				{
+					curl_close($curl);
+				}
+				$resp =& $msg->parseResponse($result, true, $this->return_type);
+			}
+			return $resp;
+		}
+
+		/**
+		* Send an array of request messages and return an array of responses.
+		* Unless $this->no_multicall has been set to true, it will try first
+		* to use one single xmlrpc call to server method system.multicall, and
+		* revert to sending many successive calls in case of failure.
+		* This failure is also stored in $this->no_multicall for subsequent calls.
+		* Unfortunately, there is no server error code universally used to denote
+		* the fact that multicall is unsupported, so there is no way to reliably
+		* distinguish between that and a temporary failure.
+		* If you are sure that server supports multicall and do not want to
+		* fallback to using many single calls, set the fourth parameter to FALSE.
+		*
+		* NB: trying to shoehorn extra functionality into existing syntax has resulted
+		* in pretty much convoluted code...
+		*
+		* @access public
+		* @param array $msgs an array of xmlrpcmsg objects
+		* @param integer $timeout connection timeout (in seconds)
+		* @param string $method the http protocol variant to be used
+		* @param boolen fallback When true, upon receiveing an error during multicall, multiple single calls will be attempted
+		*/
+		function multicall($msgs, $timeout=0, $method='http', $fallback=true)
+		{
+			if(!$this->no_multicall)
+			{
+				$results = $this->_try_multicall($msgs, $timeout, $method);
+				if(is_array($results))
+				{
+					// System.multicall succeeded
+					return $results;
+				}
+				else
+				{
+					// either system.multicall is unsupported by server,
+					// or call failed for some other reason.
+					if ($fallback)
+					{
+						// Don't try it next time...
+						$this->no_multicall = true;
+					}
+					else
+					{
+						if (is_a($result, 'xmlrpcresp'))
+						{
+							$result = $results;
+						}
+						else
+						{
+							$result =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']);
+						}
+					}
+				}
+			}
+			else
+			{
+				// override fallback, in case careless user tries to do two
+				// opposite things at the same time
+				$fallback = true;
+			}
+
+			$results = array();
+			if ($fallback)
+			{
+				// system.multicall is (probably) unsupported by server:
+				// emulate multicall via multiple requests
+				foreach($msgs as $msg)
+				{
+					$results[] =& $this->send($msg, $timeout, $method);
+				}
+			}
+			else
+			{
+				// user does NOT want to fallback on many single calls:
+				// since we should always return an array of responses,
+				// return an array with the same error repeated n times
+				foreach($msgs as $msg)
+				{
+					$results[] = $result;
+				}
+			}
+			return $results;
+		}
+
+		/**
+		* Attempt to boxcar $msgs via system.multicall.
+		* Returns either an array of xmlrpcreponses, an xmlrpc error response
+		* or false (when recived response does not respect valid multiccall syntax)
+		* @access private
+		*/
+		function _try_multicall($msgs, $timeout, $method)
+		{
+			// Construct multicall message
+			$calls = array();
+			foreach($msgs as $msg)
+			{
+				$call['methodName'] =& new xmlrpcval($msg->method(),'string');
+				$numParams = $msg->getNumParams();
+				$params = array();
+				for($i = 0; $i < $numParams; $i++)
+				{
+					$params[$i] = $msg->getParam($i);
+				}
+				$call['params'] =& new xmlrpcval($params, 'array');
+				$calls[] =& new xmlrpcval($call, 'struct');
+			}
+			$multicall =& new xmlrpcmsg('system.multicall');
+			$multicall->addParam(new xmlrpcval($calls, 'array'));
+
+			// Attempt RPC call
+			$result =& $this->send($multicall, $timeout, $method);
+			//if(!is_object($result))
+			//{
+			//	return ($result || 0); // transport failed
+			//}
+
+			if($result->faultCode() != 0)
+			{
+				// call to system.multicall failed
+				return $result;
+			}
+
+			// Unpack responses.
+			$rets = $result->value();
+
+			if ($this->return_type == 'xml')
+			{
+					return $rets;
+			}
+			else if ($this->return_type == 'phpvals')
+			{
+				///@todo test this code branch...
+				$rets = $result->value();
+				if(!is_array($rets))
+				{
+					return false;		// bad return type from system.multicall
+				}
+				$numRets = count($rets);
+				if($numRets != count($msgs))
+				{
+					return false;		// wrong number of return values.
+				}
+
+				$response = array();
+				for($i = 0; $i < $numRets; $i++)
+				{
+					$val = $rets[$i];
+					if (!is_array($val)) {
+						return false;
+					}
+					switch(count($val))
+					{
+						case 1:
+							if(!isset($val[0]))
+							{
+								return false;		// Bad value
+							}
+							// Normal return value
+							$response[$i] =& new xmlrpcresp($val[0], 0, '', 'phpvals');
+							break;
+						case 2:
+							///	@todo remove usage of @: it is apparently quite slow
+							$code = @$val['faultCode'];
+							if(!is_int($code))
+							{
+								return false;
+							}
+							$str = @$val['faultString'];
+							if(!is_string($str))
+							{
+								return false;
+							}
+							$response[$i] =& new xmlrpcresp(0, $code, $str);
+							break;
+						default:
+							return false;
+					}
+				}
+				return $response;
+			}
+			else // return type == 'xmlrpcvals'
+			{
+				$rets = $result->value();
+				if($rets->kindOf() != 'array')
+				{
+					return false;		// bad return type from system.multicall
+				}
+				$numRets = $rets->arraysize();
+				if($numRets != count($msgs))
+				{
+					return false;		// wrong number of return values.
+				}
+
+				$response = array();
+				for($i = 0; $i < $numRets; $i++)
+				{
+					$val = $rets->arraymem($i);
+					switch($val->kindOf())
+					{
+						case 'array':
+							if($val->arraysize() != 1)
+							{
+								return false;		// Bad value
+							}
+							// Normal return value
+							$response[$i] =& new xmlrpcresp($val->arraymem(0));
+							break;
+						case 'struct':
+							$code = $val->structmem('faultCode');
+							if($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')
+							{
+								return false;
+							}
+							$str = $val->structmem('faultString');
+							if($str->kindOf() != 'scalar' || $str->scalartyp() != 'string')
+							{
+								return false;
+							}
+							$response[$i] =& new xmlrpcresp(0, $code->scalarval(), $str->scalarval());
+							break;
+						default:
+							return false;
+					}
+				}
+				return $response;
+			}
+		}
+	} // end class xmlrpc_client
+
+	class xmlrpcresp
+	{
+		var $val = 0;
+		var $valtyp;
+		var $errno = 0;
+		var $errstr = '';
+		var $hdrs = array();
+		var $_cookies = array();
+		var $content_type = 'text/xml';
+
+		/**
+		* @param mixed  $val either an xmlrpcval obj, a php value or the xml serialization of an xmlrpcval (a string)
+		* @param integer $fcode set it to anything but 0 to create an error response
+		* @param string $fstr the error string, in case of an error response
+		* @param string $valtyp either 'xmlrpcvals', 'phpvals' or 'xml'
+		*
+		* @todo add check that $val is of correct type???
+		* NB: as of now we do not do it, since it might be either an xmlrpcval or a plain
+		* php val, or a complete xml chunk, depending on usage of xmlrpc_client::send() inside which creator is called...
+		*/
+		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')
+		{
+			if($fcode != 0)
+			{
+				// error response
+				$this->errno = $fcode;
+				$this->errstr = $fstr;
+				//$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.
+			}
+			/*elseif(!is_object($val) || !is_a($val, 'xmlrpcval'))
+			{
+				// programmer error
+				error_log("Invalid type '" . gettype($val) . "' (value: $val) passed to xmlrpcresp. Defaulting to empty value.");
+				$this->val =& new xmlrpcval();
+			}*/
+			else
+			{
+				// successful response
+				$this->val = $val;
+				if ($valtyp == '')
+				{
+					// user did not declare type of response value: try to guess it
+					if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))
+					{
+						$this->valtyp = 'xmlrpcvals';
+					}
+					else if (is_string($this->val))
+					{
+						$this->valtyp = 'xml';
+
+					}
+					else
+					{
+						$this->valtyp = 'phpvals';
+					}
+				}
+				else
+				{
+					// user declares type of resp value: believe him
+					$this->valtyp = $valtyp;
+				}
+			}
+		}
+
+		/*
+		* @return integer the error code of this response (0 for not-error responses)
+		*/
+		function faultCode()
+		{
+			return $this->errno;
+		}
+
+		/*
+		* @return string the error string of this response ('' for not-error responses)
+		*/
+		function faultString()
+		{
+			return $this->errstr;
+		}
+
+		/*
+		* @return mixed the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects
+		*/
+		function value()
+		{
+			return $this->val;
+		}
+
+		/**
+		* Returns an array with the cookies received from the server.
+		* Array has the form: $cookiename => array ('value' => $val, $attr1 => $val1, $attr2 = $val2, ...)
+		* with attributes being e.g. 'expires', 'path', domain'.
+		* NB: cookies sent as 'expired' by the server (i.e. with an expiry date in the past)
+		* are still present in the array. It is up to the user-defined code to decide
+		* how to use the received cookies, and wheter they have to be sent back with the next
+		* request to the server (using xmlrpc_client::setCookie) or not
+		* @return array array of cookies received from the server
+		* @access public
+		*/
+		function cookies()
+		{
+			return $this->_cookies;
+		}
+
+		/**
+		* Return xml representation of the response
+		* @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed
+		* @return string the xml representation of the response
+		*/
+		function serialize($charset_encoding='')
+		{
+			if ($charset_encoding != '')
+				$this->content_type = 'text/xml; charset=' . $charset_encoding;
+			else
+				$this->content_type = 'text/xml';
+			$result = "<methodResponse>\n";
+			if($this->errno)
+			{
+				// G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients
+				// by xml-encoding non ascii chars
+				$result .= "<fault>\n" .
+"<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
+"</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
+xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .
+"</struct>\n</value>\n</fault>";
+			}
+			else
+			{
+				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))
+				{
+					if (is_string($this->val) && $this->valtyp == 'xml')
+					{
+						$result .= "<params>\n<param>\n" .
+							$this->val .
+							"</param>\n</params>";
+					}
+					else
+					{
+						/// @todo try to build something serializable?
+						die('cannot serialize xmlrpcresp objects whose content is native php values');
+					}
+				}
+				else
+				{
+					$result .= "<params>\n<param>\n" .
+						$this->val->serialize($charset_encoding) .
+						"</param>\n</params>";
+				}
+			}
+			$result .= "\n</methodResponse>";
+			return $result;
+		}
+	}
+
+	class xmlrpcmsg
+	{
+		var $payload;
+		var $methodname;
+		var $params=array();
+		var $debug=0;
+		var $content_type = 'text/xml';
+
+		/*
+		* @param string $meth the name of the method to invoke
+		* @param array $pars array of parameters to be paased to the method (xmlrpcval objects)
+		*/
+		function xmlrpcmsg($meth, $pars=0)
+		{
+			$this->methodname=$meth;
+			if(is_array($pars) && sizeof($pars)>0)
+			{
+				for($i=0; $i<sizeof($pars); $i++)
+				{
+					$this->addParam($pars[$i]);
+				}
+			}
+		}
+
+		function xml_header()
+		{
+			return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
+		}
+
+		function xml_footer()
+		{
+			return "</methodCall>";
+		}
+
+		function kindOf()
+		{
+			return 'msg';
+		}
+
+		function createPayload($charset_encoding='')
+		{
+			if ($charset_encoding != '')
+				$this->content_type = 'text/xml; charset=' . $charset_encoding;
+			else
+				$this->content_type = 'text/xml';
+			$this->payload=$this->xml_header();
+			$this->payload.='<methodName>' . $this->methodname . "</methodName>\n";
+			//	if(sizeof($this->params)) {
+			$this->payload.="<params>\n";
+			for($i=0; $i<sizeof($this->params); $i++)
+			{
+				$p=$this->params[$i];
+				$this->payload.="<param>\n" . $p->serialize($charset_encoding) .
+				"</param>\n";
+			}
+			$this->payload.="</params>\n";
+			// }
+			$this->payload.=$this->xml_footer();
+			//$this->payload=str_replace("\n", "\r\n", $this->payload);
+		}
+
+		/*
+		* Gets/sets the xmlrpc method to be invoked
+		* @param string $meth the method to be set (leave empty not to set it)
+		* @return string the method that will be invoked
+		* @access public
+		*/
+		function method($meth='')
+		{
+			if($meth!='')
+			{
+				$this->methodname=$meth;
+			}
+			return $this->methodname;
+		}
+
+		/*
+		* @return string the xml representation of the message
+		*/
+		function serialize($charset_encoding='')
+		{
+			$this->createPayload($charset_encoding);
+			return $this->payload;
+		}
+
+		/*
+		* Add a parameter to the list of parameters to be used upon method invocation
+		* @param xmlrpcval $par
+		* @return boolean false on failure
+		*/
+		function addParam($par)
+		{
+			// add check: do not add to self params which are not xmlrpcvals
+			if(is_object($par) && is_a($par, 'xmlrpcval'))
+			{
+				$this->params[]=$par;
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		/*
+		* @param integer $i the index of the parameter to fetch (zero based)
+		* @return xmlrpcval the i-th parameter
+		*/
+		function getParam($i) { return $this->params[$i]; }
+
+		/*
+		* @return integer the number of parameters currently set
+		*/
+		function getNumParams() { return sizeof($this->params); }
+
+		/*
+		* @access private
+		* @todo add 2nd & 3rd param to be passed to ParseResponse() ???
+		*/
+		function &parseResponseFile($fp)
+		{
+			$ipd='';
+			while($data=fread($fp, 32768))
+			{
+				$ipd.=$data;
+			}
+			//fclose($fp);
+			$r =& $this->parseResponse($ipd);
+			return $r;
+		}
+
+		/**
+		* Parses HTTP headers and separates them from data.
+		* @access private
+		*/
+		function &parseResponseHeaders(&$data, $headers_processed=false)
+		{
+				// Strip HTTP 1.1 100 Continue header if present
+				while(ereg('^HTTP/1\.1 1[0-9]{2} ', $data))
+				{
+					$pos = strpos($data, 'HTTP', 12);
+					// server sent a Continue header without any (valid) content following...
+					// give the client a chance to know it
+					if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5
+					{
+						break;
+					}
+					$data = substr($data, $pos);
+				}
+				if(!ereg('^HTTP/[0-9.]+ 200 ', $data))
+				{
+					$errstr= substr($data, 0, strpos($data, "\n")-1);
+					error_log('XML-RPC: xmlrpcmsg::parseResponse: HTTP error, got response: ' .$errstr);
+					$r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (' . $errstr . ')');
+					return $r;
+				}
+
+				$GLOBALS['_xh']['headers'] = array();
+				$GLOBALS['_xh']['cookies'] = array();
+
+				// be tolerant to usage of \n instead of \r\n to separate headers and data
+				// (even though it is not valid http)
+				$pos = strpos($data,"\r\n\r\n");
+				if($pos || is_int($pos))
+				{
+					$bd = $pos+4;
+				}
+				else
+				{
+					$pos = strpos($data,"\n\n");
+					if($pos || is_int($pos))
+					{
+						$bd = $pos+2;
+					}
+					else
+					{
+						// No separation between response headers and body: fault?
+						$bd = 0;
+					}
+				}
+				// be tolerant to line endings, and extra empty lines
+				$ar = split("\r?\n", trim(substr($data, 0, $pos)));
+				while(list(,$line) = @each($ar))
+				{
+					// take care of multi-line headers and cookies
+					$arr = explode(':',$line,2);
+					if(count($arr) > 1)
+					{
+						$header_name = strtolower(trim($arr[0]));
+						/// @todo some other headers (the ones that allow a CSV list of values)
+						/// do allow many values to be passed using multiple header lines.
+						/// We should add content to $GLOBALS['_xh']['headers'][$header_name]
+						/// instead of replacing it for those...
+						if ($header_name == 'set-cookie' || $header_name == 'set-cookie2')
+						{
+							if ($header_name == 'set-cookie2')
+							{
+								// version 2 cookies:
+								// there could be many cookies on one line, comma separated
+								$cookies = explode(',', $arr[1]);
+							}
+							else
+							{
+								$cookies = array($arr[1]);
+							}
+							foreach ($cookies as $cookie)
+							{
+								// glue together all received cookies, using a comma to separate them
+								// (same as php does with getallheaders())
+								if (isset($GLOBALS['_xh']['headers'][$header_name]))
+									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
+								else
+									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+								// parse cookie attributes, in case user wants to coorectly honour then
+								// feature creep: only allow rfc-compliant cookie attributes?
+								$cookie = explode(';', $cookie);
+								foreach ($cookie as $pos => $val)
+								{
+									$val = explode('=', $val, 2);
+									$tag = trim($val[0]);
+									$val = trim(@$val[1]);
+									/// @todo with version 1 cookies, we should strip leading and trailing " chars
+									if ($pos == 0)
+									{
+										$cookiename = $tag;
+										$GLOBALS['_xh']['cookies'][$tag] = array();
+										$GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);
+									}
+									else
+									{
+										$GLOBALS['_xh']['cookies'][$cookiename][$tag] = $val;
+									}
+								}
+							}
+						}
+						else
+						{
+							$GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);
+						}
+					}
+					elseif(isset($header_name))
+					{
+						///	@todo version1 cookies might span multiple lines, thus breaking the parsing above
+						$GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);
+					}
+				}
+				// rebuild full cookie set
+				/*if (isset($GLOBALS['_xh']['headers']['set-cookie']))
+				{
+					$cookies = array();
+					$received = explode(';', $GLOBALS['_xh']['headers']['set-cookie']);
+					foreach($received as $cookie)
+					{
+						list($name, $value) = explode('=', $cookie);
+						$name = trim($name);
+						$value = trim($value);
+						// these values are in fact attributes
+						if ($name != 'Comment' && $name != 'Comment' && $name != 'Comment' && $name != 'Comment' && $name != 'Comment' && $name != 'Comment')
+						{
+							$cookies[$name] = $value;
+						}
+					}
+				}*/
+
+				$data = substr($data, $bd);
+
+				if($this->debug && count($GLOBALS['_xh']['headers']))
+				{
+					print '<PRE>';
+					foreach($GLOBALS['_xh']['headers'] as $header => $value)
+					{
+						print "HEADER: $header: $value\n";
+					}
+					foreach($GLOBALS['_xh']['cookies'] as $header => $value)
+					{
+						print "COOKIE: $header={$value['value']}\n";
+					}
+					print "</PRE>\n";
+				}
+
+				// if CURL was used for the call, http headers have been processed,
+				// and dechunking + reinflating have been carried out
+				if(!$headers_processed)
+				{
+					// Decode chunked encoding sent by http 1.1 servers
+					if(isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')
+					{
+						if(!$data = decode_chunked($data))
+						{
+							error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to rebuild the chunked data received from server');
+							$r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']);
+							return $r;
+						}
+					}
+
+					// Decode gzip-compressed stuff
+					// code shamelessly inspired from nusoap library by Dietrich Ayala
+					if(isset($GLOBALS['_xh']['headers']['content-encoding']))
+					{
+						if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')
+						{
+							// if decoding works, use it. else assume data wasn't gzencoded
+							if(function_exists('gzinflate'))
+							{
+								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzinflate($data))
+								{
+									$data = $degzdata;
+									if($this->debug)
+									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+								}
+								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
+								{
+									$data = $degzdata;
+									if($this->debug)
+									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+								}
+								else
+								{
+									error_log('XML-RPC: xmlrpcmsg::parseResponse: errors occurred when trying to decode the deflated data received from server');
+									$r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['decompress_fail'], $GLOBALS['xmlrpcstr']['decompress_fail']);
+									return $r;
+								}
+							}
+							else
+							{
+								error_log('XML-RPC: xmlrpcmsg::parseResponse: the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+								$r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['cannot_decompress'], $GLOBALS['xmlrpcstr']['cannot_decompress']);
+								return $r;
+							}
+						}
+					}
+				} // end of 'if needed, de-chunk, re-inflate response'
+
+				// real stupid hack to avoid PHP 4 complaining about returning NULL by ref
+				$r = null;
+				$r =& $r;
+				return $r;
+		}
+
+		/*
+		* @param string $data the xmlrpc response, eventually including http headers
+		* @param bool   $headers_processed when true prevents parsing HTTP headers for interpretation of content-encoding and conseuqent decoding
+		* @param string $return_type decides return type, i.e. content of response->value(). Either 'xmlrpcvals', 'xml' or 'phpvals'
+		* @access private
+		*/
+		function &parseResponse($data='', $headers_processed=false, $return_type='xmlrpcvals')
+		{
+			//$hdrfnd = 0;
+			if($this->debug)
+			{
+				//by maHo, replaced htmlspecialchars with htmlentities
+				print "<PRE>---GOT---\n" . htmlentities($data) . "\n---END---\n</PRE>";
+				$start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
+				if ($start)
+				{
+					$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
+					$end = strpos($data, '-->', $start);
+					$comments = substr($data, $start, $end-$start);
+					print "<PRE>---SERVER DEBUG INFO (DECODED) ---\n\t".htmlentities(str_replace("\n", "\n\t", base64_decode($comments)))."\n---END---\n</PRE>";
+				}
+			}
+
+			if($data == '')
+			{
+				error_log('XML-RPC: xmlrpcmsg::parseResponse: no response received from server.');
+				$r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_data'], $GLOBALS['xmlrpcstr']['no_data']);
+				return $r;
+			}
+
+			$GLOBALS['_xh']=array();
+
+			// parse the HTTP headers of the response, if present, and separate them from data
+			if(ereg("^HTTP",$data))
+			{
+				$r =& $this->parseResponseHeaders($data, $headers_processed);
+				if ($r)
+				{
+					return $r;
+				}
+			}
+			else
+			{
+				$GLOBALS['_xh']['headers'] = array();
+				$GLOBALS['_xh']['cookies'] = array();
+			}
+
+
+			// be tolerant of extra whitespace in response body
+			$data = trim($data);
+
+			/// @todo return an error msg if $data=='' ?
+
+			// be tolerant of junk after methodResponse (e.g. javascript ads automatically inserted by free hosts)
+			// idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib
+			$bd = false;
+			// Poor man's version of strrpos for php 4...
+			$pos = strpos($data, '</methodResponse>');
+			while($pos || is_int($pos))
+			{
+				$bd = $pos+17;
+				$pos = strpos($data, '</methodResponse>', $bd);
+			}
+			if($bd)
+			{
+				$data = substr($data, 0, $bd);
+			}
+
+			// if user wants back raw xml, give it to him
+			if ($return_type == 'xml')
+			{
+				$r =& new xmlrpcresp($data, 0, '', 'xml');
+				$r->hdrs = $GLOBALS['_xh']['headers'];
+				$r->_cookies = $GLOBALS['_xh']['cookies'];
+				return $r;
+			}
+
+			// try to 'guestimate' the character encoding of the received response
+			$resp_encoding = guess_encoding(@$GLOBALS['_xh']['headers']['content-type'], $data);
+
+			$GLOBALS['_xh']['stack'] = array();
+			$GLOBALS['_xh']['valuestack'] = array();
+			$GLOBALS['_xh']['isf']=0;
+			$GLOBALS['_xh']['isf_reason']='';
+			$GLOBALS['_xh']['ac']='';
+			$GLOBALS['_xh']['qt']='';
+
+			// if response charset encoding is not known / supported, try to use
+			// the default encoding and parse the xml anyway, but log a warning...
+			if (!in_array($resp_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
+			// the following code might be better for mb_string enabled installs, but
+			// makes the lib about 200% slower...
+			//if (!is_valid_charset($resp_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
+			{
+				error_log('XML-RPC: xmlrpcmsg::parseResponse: invalid charset encoding of received response: '.$resp_encoding);
+				$resp_encoding = $GLOBALS['xmlrpc_defencoding'];
+			}
+			$parser = xml_parser_create($resp_encoding);
+			xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
+			// G. Giunta 2005/02/13: PHP internally uses ISO-8859-1, so we have to tell
+			// the xml parser to give us back data in the expected charset
+			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);
+
+			if ($return_type == 'phpvals')
+			{
+				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
+			}
+			else
+			{
+				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
+			}
+
+			xml_set_character_data_handler($parser, 'xmlrpc_cd');
+			xml_set_default_handler($parser, 'xmlrpc_dh');
+
+			if(!xml_parse($parser, $data, sizeof($data)))
+			{
+				// thanks to Peter Kocks <peter.kocks@baygate.com>
+				if((xml_get_current_line_number($parser)) == 1)
+				{
+					$errstr = 'XML error at line 1, check URL';
+				}
+				else
+				{
+					$errstr = sprintf('XML error: %s at line %d',
+						xml_error_string(xml_get_error_code($parser)),
+						xml_get_current_line_number($parser));
+				}
+				error_log($errstr);
+				$r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'], $GLOBALS['xmlrpcstr']['invalid_return'].' ('.$errstr.')');
+				xml_parser_free($parser);
+				if($this->debug)
+				{
+					print $errstr;
+				}
+				$r->hdrs = $GLOBALS['_xh']['headers'];
+				$r->_cookies = $GLOBALS['_xh']['cookies'];
+				return $r;
+			}
+			xml_parser_free($parser);
+			if ($GLOBALS['_xh']['isf'] > 1)
+			{
+				if ($this->debug)
+				{
+					/// @todo echo something for user?
+				}
+
+				$r =& new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
+				$GLOBALS['xmlrpcstr']['invalid_return'] . ' ' . $GLOBALS['_xh']['isf_reason']);
+			}
+			elseif ($return_type == 'xmlrpcvals' && !is_object($GLOBALS['_xh']['value']))
+			{
+				// then something odd has happened
+				// and it's time to generate a client side error
+				// indicating something odd went on
+				$r=&new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
+				$GLOBALS['xmlrpcstr']['invalid_return']);
+			}
+			else
+			{
+				if ($this->debug)
+				{
+					print "<PRE>---PARSED---\n" ;
+					var_export($GLOBALS['_xh']['value']);
+					print "\n---END---</PRE>";
+				}				// note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object.
+
+				$v =& $GLOBALS['_xh']['value'];
+
+				if($GLOBALS['_xh']['isf'])
+				{
+					if ($return_type == 'xmlrpcvals')
+					{
+						$errno_v = $v->structmem('faultCode');
+						$errstr_v = $v->structmem('faultString');
+						$errno = $errno_v->scalarval();
+						$errstr = $errstr_v->scalarval();
+					}
+					else
+					{
+						$errno = $v['faultCode'];
+						$errstr = $v['faultString'];
+					}
+
+					if($errno == 0)
+					{
+						// FAULT returned, errno needs to reflect that
+						$errno = -1;
+					}
+
+					$r =& new xmlrpcresp($v, $errno, $errstr);
+				}
+				else
+				{
+					$r=&new xmlrpcresp($v, 0, '', 'phpvals');
+				}
+			}
+
+			$r->hdrs = $GLOBALS['_xh']['headers'];
+			$r->_cookies = $GLOBALS['_xh']['cookies'];
+			return $r;
+		}
+	}
+
+	class xmlrpcval
+	{
+		var $me=array();
+		var $mytype=0;
+		var $_php_class=null;
+
+		function xmlrpcval($val=-1, $type='')
+		{
+			//$this->me=array();
+			//$this->mytype=0;
+			if($val!==-1 || $type!='')
+			{
+				if($type=='')
+				{
+					$type='string';
+				}
+				if($GLOBALS['xmlrpcTypes'][$type]==1)
+				{
+					$this->addScalar($val,$type);
+				}
+				elseif($GLOBALS['xmlrpcTypes'][$type]==2)
+				{
+					$this->addArray($val);
+				}
+				elseif($GLOBALS['xmlrpcTypes'][$type]==3)
+				{
+					$this->addStruct($val);
+				}
+			}
+		}
+
+		function addScalar($val, $type='string')
+		{
+			$typeof=@$GLOBALS['xmlrpcTypes'][$type];
+			if($typeof!=1)
+			{
+				error_log("XML-RPC: xmlrpcval::addScalar: not a scalar type ($typeof)");
+				return 0;
+			}
+
+			// coerce booleans into correct values
+			// NB: shall we do it for datetimes, integers and doubles, too?
+			if($type==$GLOBALS['xmlrpcBoolean'])
+			{
+				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
+				{
+					$val=true;
+				}
+				else
+				{
+					$val=false;
+				}
+			}
+
+			switch($this->mytype)
+			{
+				case 1:
+					error_log('XML-RPC: xmlrpcval::addScalar: scalar xmlrpcval can have only one value');
+					return 0;
+				case 3:
+					error_log('XML-RPC: xmlrpcval::addScalar: cannot add anonymous scalar to struct xmlrpcval');
+					return 0;
+				case 2:
+					// we're adding a scalar value to an array here
+					//$ar=$this->me['array'];
+					//$ar[]=&new xmlrpcval($val, $type);
+					//$this->me['array']=$ar;
+					// Faster (?) avoid all the costly array-copy-by-val done here...
+					$this->me['array'][]=&new xmlrpcval($val, $type);
+					return 1;
+				default:
+					// a scalar, so set the value and remember we're scalar
+					$this->me[$type]=$val;
+					$this->mytype=$typeof;
+					return 1;
+			}
+		}
+
+		/// @todo add some checking for $vals to be an array of xmlrpcvals?
+		function addArray($vals)
+		{
+			if($this->mytype==0)
+			{
+				$this->mytype=$GLOBALS['xmlrpcTypes']['array'];
+				$this->me['array']=$vals;
+				return 1;
+			}
+			elseif($this->mytype==2)
+			{
+				// we're adding to an array here
+				$this->me['array'] = array_merge($this->me['array'], $vals);
+			}
+			else
+			{
+				error_log('XML-RPC: xmlrpcval::addArray: already initialized as a [' . $this->kindOf() . ']');
+				return 0;
+			}
+		}
+
+		/// @todo add some checking for $vals to be an array?
+		function addStruct($vals)
+		{
+			if($this->mytype==0)
+			{
+				$this->mytype=$GLOBALS['xmlrpcTypes']['struct'];
+				$this->me['struct']=$vals;
+				return 1;
+			}
+			elseif($this->mytype==3)
+			{
+				// we're adding to a struct here
+				$this->me['struct'] = array_merge($this->me['struct'], $vals);
+			}
+			else
+			{
+				error_log('XML-RPC: xmlrpcval::addStruct: already initialized as a [' . $this->kindOf() . ']');
+				return 0;
+			}
+		}
+
+		// poor man's version of print_r ???
+		// DEPRECATED!
+		function dump($ar)
+		{
+			foreach($ar as $key => $val)
+			{
+				echo "$key => $val<br />";
+				if($key == 'array')
+				{
+					while(list($key2, $val2) = each($val))
+					{
+						echo "-- $key2 => $val2<br />";
+					}
+				}
+			}
+		}
+
+		function kindOf()
+		{
+			switch($this->mytype)
+			{
+				case 3:
+					return 'struct';
+					break;
+				case 2:
+					return 'array';
+					break;
+				case 1:
+					return 'scalar';
+					break;
+				default:
+					return 'undef';
+			}
+		}
+
+		function serializedata($typ, $val, $charset_encoding='')
+		{
+			$rs='';
+			switch(@$GLOBALS['xmlrpcTypes'][$typ])
+			{
+				case 3:
+					// struct
+					if ($this->_php_class)
+					{
+						$rs.='<struct php_class="' . $this->_php_class . "\">\n";
+					}
+					else
+					{
+						$rs.="<struct>\n";
+					}
+					foreach($val as $key2 => $val2)
+					{
+						$rs.="<member><name>${key2}</name>\n";
+						//$rs.=$this->serializeval($val2);
+						$rs.=$val2->serialize();
+						$rs.="</member>\n";
+					}
+					$rs.='</struct>';
+					break;
+				case 2:
+					// array
+					$rs.="<array>\n<data>\n";
+					for($i=0; $i<sizeof($val); $i++)
+					{
+						//$rs.=$this->serializeval($val[$i]);
+						$rs.=$val[$i]->serialize();
+					}
+					$rs.="</data>\n</array>";
+					break;
+				case 1:
+					switch($typ)
+					{
+						case $GLOBALS['xmlrpcBase64']:
+							$rs.="<${typ}>" . base64_encode($val) . "</${typ}>";
+							break;
+						case $GLOBALS['xmlrpcBoolean']:
+							$rs.="<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
+							break;
+						case $GLOBALS['xmlrpcString']:
+							// G. Giunta 2005/2/13: do NOT use htmlentities, since
+							// it will produce named html entities, which are invalid xml
+							$rs.="<${typ}>" . xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding). "</${typ}>";
+							// $rs.="<${typ}>" . htmlentities($val). "</${typ}>";
+							break;
+						case $GLOBALS['xmlrpcInt']:
+						case $GLOBALS['xmlrpcI4']:
+							$rs.="<${typ}>".(int)$val."</${typ}>";
+							break;
+						case $GLOBALS['xmlrpcDouble']:
+							$rs.="<${typ}>".(double)$val."</${typ}>";
+							break;
+						default:
+							// no standard type value should arrive here, but provide a possibility
+							// for xmlrpcvals of unknown type...
+							$rs.="<${typ}>${val}</${typ}>";
+					}
+					break;
+				default:
+					break;
+			}
+			return $rs;
+		}
+
+		/**
+		* Return xml representation of the value
+		* @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed
+		*/
+		function serialize($charset_encoding='')
+		{
+			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
+			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
+			//{
+				reset($this->me);
+				list($typ, $val) = each($this->me);
+				return '<value>' . $this->serializedata($typ, $val, $charset_encoding) . "</value>\n";
+			//}
+		}
+
+		// DEPRECATED
+		function serializeval($o)
+		{
+			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
+			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
+			//{
+				$ar=$o->me;
+				reset($ar);
+				list($typ, $val) = each($ar);
+				return '<value>' . $this->serializedata($typ, $val) . "</value>\n";
+			//}
+		}
+
+		/**
+		* Checks wheter a struct member with a given name is present.
+		* Works only on xmlrpcvals of type struct.
+		* @param string $m the name of the struct member to be looked up
+		* @return boolean
+		*/
+		function structmemexists($m)
+		{
+			return array_key_exists($this->me['struct'][$m]);
+		}
+
+		/*
+		* Returns the value of a given struct member (an xmlrpcval object in itself).
+		* Will raise a php warning if struct member of given name does not exist
+		* @param string $m the name of the struct member to be looked up
+		* @return xmlrpcval
+		*/
+		function structmem($m)
+		{
+			return $this->me['struct'][$m];
+		}
+
+		function structreset()
+		{
+			reset($this->me['struct']);
+		}
+
+		function structeach()
+		{
+			return each($this->me['struct']);
+		}
+
+		// DEPRECATED! this code looks like it is very fragile and has not been fixed
+		// for a long long time. Shall we remove it for 2.0?
+		function getval()
+		{
+			// UNSTABLE
+			reset($this->me);
+			list($a,$b)=each($this->me);
+			// contributed by I Sofer, 2001-03-24
+			// add support for nested arrays to scalarval
+			// i've created a new method here, so as to
+			// preserve back compatibility
+
+			if(is_array($b))
+			{
+				@reset($b);
+				while(list($id,$cont) = @each($b))
+				{
+					$b[$id] = $cont->scalarval();
+				}
+			}
+
+			// add support for structures directly encoding php objects
+			if(is_object($b))
+			{
+				$t = get_object_vars($b);
+				@reset($t);
+				while(list($id,$cont) = @each($t))
+				{
+					$t[$id] = $cont->scalarval();
+				}
+				@reset($t);
+				while(list($id,$cont) = @each($t))
+				{
+					//@eval('$b->'.$id.' = $cont;');
+					@$b->$id = $cont;
+				}
+			}
+			// end contrib
+			return $b;
+		}
+
+		/**
+		* Returns the value of a scalar xmlrpcval
+		* @return mixed
+		*/
+		function scalarval()
+		{
+			reset($this->me);
+			list(,$b)=each($this->me);
+			return $b;
+		}
+
+		/**
+		* Returns the type of the xmlrpcval.
+		* For integers, 'int' is always returned in place of 'i4'
+		* @return string
+		*/
+		function scalartyp()
+		{
+			reset($this->me);
+			list($a,$b)=each($this->me);
+			if($a==$GLOBALS['xmlrpcI4'])
+			{
+				$a=$GLOBALS['xmlrpcInt'];
+			}
+			return $a;
+		}
+
+		/**
+		* Returns the m-th member of an xmlrpcval of struct type
+		* @param integer $m the index of the value to be retrieved (zero based)
+		* @return xmlrpcval
+		*/
+		function arraymem($m)
+		{
+			return $this->me['array'][$m];
+		}
+
+		/**
+		* Returns the number of members in an xmlrpcval of array type
+		* @return integer
+		*/
+		function arraysize()
+		{
+			return count($this->me['array']);
+		}
+
+		/**
+		* Returns the number of members in an xmlrpcval of struct type
+		* @return integer
+		*/
+		function structsize()
+		{
+			return count($this->me['struct']);
+		}
+	}
+
+
+	// date helpers
+	function iso8601_encode($timet, $utc=0)
+	{
+		// return an ISO8601 encoded string
+		// really, timezones ought to be supported
+		// but the XML-RPC spec says:
+		//
+		// "Don't assume a timezone. It should be specified by the server in its
+		// documentation what assumptions it makes about timezones."
+		//
+		// these routines always assume localtime unless
+		// $utc is set to 1, in which case UTC is assumed
+		// and an adjustment for locale is made when encoding
+		if(!$utc)
+		{
+			$t=strftime("%Y%m%dT%H:%M:%S", $timet);
+		}
+		else
+		{
+			if(function_exists('gmstrftime'))
+			{
+				// gmstrftime doesn't exist in some versions
+				// of PHP
+				$t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);
+			}
+			else
+			{
+				$t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));
+			}
+		}
+		return $t;
+	}
+
+	function iso8601_decode($idate, $utc=0)
+	{
+		// return a timet in the localtime, or UTC
+		$t=0;
+		if(ereg("([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})", $idate, $regs))
+		{
+			if($utc)
+			{
+				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+			}
+			else
+			{
+				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+			}
+		}
+		return $t;
+	}
+
+	/**
+	* Takes an xmlrpc value in PHP xmlrpcval object format
+	* and translates it into native PHP types.
+	* Works with xmlrpc message objects as input, too.
+	*
+	* @author Dan Libby (dan@libby.com)
+	*
+	* @param  xmlrpcval $xmlrpc_val
+	* @param  array     $options    if 'decode_php_objs' is set in the options array, xmlrpc structs can be decoded into php objects
+	* @return mixed
+	*/
+	function php_xmlrpc_decode($xmlrpc_val, $options=array())
+	{
+		switch($xmlrpc_val->kindOf())
+		{
+			case 'scalar':
+				return $xmlrpc_val->scalarval();
+			case 'array':
+				$size = $xmlrpc_val->arraysize();
+				$arr = array();
+				for($i = 0; $i < $size; $i++)
+				{
+					$arr[] = php_xmlrpc_decode($xmlrpc_val->arraymem($i), $options);
+				}
+				return $arr;
+			case 'struct':
+				$xmlrpc_val->structreset();
+				// If user said so, try to rebuild php objects for specific struct vals.
+				/// @todo should we raise a warning for class not found?
+				// shall we check for proper subclass of xmlrpcval instead of
+				// presence of _php_class to detect what we can do?
+				if (in_array('decode_php_objs', $options) && $xmlrpc_val->_php_class != ''
+					&& class_exists($xmlrpc_val->_php_class))
+				{
+					$obj = @new $xmlrpc_val->_php_class;
+					while(list($key,$value)=$xmlrpc_val->structeach())
+					{
+						$obj->$key = php_xmlrpc_decode($value, $options);
+					}
+					return $obj;
+				}
+				else
+				{
+					$arr = array();
+					while(list($key,$value)=$xmlrpc_val->structeach())
+					{
+						$arr[$key] = php_xmlrpc_decode($value, $options);
+					}
+					return $arr;
+				}
+			case 'msg':
+				$paramcount = $xmlrpc_val->getNumParams();
+				$arr = array();
+				for($i = 0; $i < $paramcount; $i++)
+				{
+					$arr[] = php_xmlrpc_decode($xmlrpc_val->getParam($i));
+				}
+				return $arr;
+			}
+	}
+
+	if(function_exists('xmlrpc_decode'))
+	{
+		define('XMLRPC_EPI_ENABLED','1');
+	}
+	else
+	{
+		define('XMLRPC_EPI_ENABLED','0');
+	}
+
+	/**
+	* Takes native php types and encodes them into xmlrpc PHP object format.
+	* It will not re-encode xmlrpcval objects.
+	* Feature creep -- could support more types via optional type argument
+	* (string => datetime support has been added, ??? => base64 not yet)
+	*
+	* @author Dan Libby (dan@libby.com)
+	*
+	* @param mixed $php_val the value to be converted into an xmlrpcval object
+	* @param array $options	can include 'encode_php_objs' and 'auto_dates'
+	* @return xmlrpcval
+	*/
+	function &php_xmlrpc_encode($php_val, $options=array())
+	{
+		$type = gettype($php_val);
+		$xmlrpc_val =& new xmlrpcval;
+
+		switch($type)
+		{
+			case 'array':
+				// PHP arrays can be encoded to either xmlrpc structs or arrays,
+				// depending on wheter they are hashes or plain 0..n integer indexed
+				// A shorter one-liner would be
+				// $tmp = array_diff(array_keys($php_val), range(0, count($php_val)-1));
+				// but execution time skyrockets!
+				$j = 0;
+				$arr = array();
+				$ko = false;
+				foreach($php_val as $key => $val)
+				{
+					$arr[$key] =& php_xmlrpc_encode($val, $options);
+					if(!$ko && $key !== $j)
+					{
+						$ko = true;
+					}
+					$j++;
+				}
+				if($ko)
+				{
+					$xmlrpc_val->addStruct($arr);
+				}
+				else
+				{
+					$xmlrpc_val->addArray($arr);
+				}
+				break;
+			case 'object':
+				if(is_a($php_val, 'xmlrpcval'))
+				{
+					$xmlrpc_val = $php_val;
+				}
+				else
+				{
+					$arr = array();
+					while(list($k,$v) = each($php_val))
+					{
+						$arr[$k] = php_xmlrpc_encode($v, $options);
+					}
+					$xmlrpc_val->addStruct($arr);
+					if (in_array('encode_php_objs', $options))
+					{
+						// let's save original class name into xmlrpcval:
+						// might be useful later on...
+						$xmlrpc_val->_php_class = get_class($php_val);
+					}
+				}
+				break;
+			case 'integer':
+				$xmlrpc_val->addScalar($php_val, $GLOBALS['xmlrpcInt']);
+				break;
+			case 'double':
+				$xmlrpc_val->addScalar($php_val, $GLOBALS['xmlrpcDouble']);
+				break;
+			case 'string':
+				if (in_array('auto_dates', $options) && ereg("^[0-9]{8}\T{1}[0-9]{2}\:[0-9]{2}\:[0-9]{2}$", $php_val))
+					$xmlrpc_val->addScalar($php_val, $GLOBALS['xmlrpcDateTime']);
+				else
+					$xmlrpc_val->addScalar($php_val, $GLOBALS['xmlrpcString']);
+				break;
+				// <G_Giunta_2001-02-29>
+				// Add support for encoding/decoding of booleans, since they are supported in PHP
+			case 'boolean':
+				$xmlrpc_val->addScalar($php_val, $GLOBALS['xmlrpcBoolean']);
+				break;
+				// </G_Giunta_2001-02-29>
+			// catch "resource", "NULL", "user function", "unknown type"
+			//case 'unknown type':
+			default:
+				// giancarlo pinerolo <ping@alt.it>
+				// it has to return
+				// an empty object in case (which is already
+				// at this point), not a boolean.
+				break;
+			}
+			return $xmlrpc_val;
+	}
+
+	/**
+	* decode a string that is encoded w/ "chunked" transfer encoding
+	* as defined in rfc2068 par. 19.4.6
+	* code shamelessly stolen from nusoap library by Dietrich Ayala
+	*
+	* @param   string $buffer the string to be decoded
+	* @return  string
+	*/
+	function decode_chunked($buffer)
+	{
+		// length := 0
+		$length = 0;
+		$new = '';
+
+		// read chunk-size, chunk-extension (if any) and crlf
+		// get the position of the linebreak
+		$chunkend = strpos($buffer,"\r\n") + 2;
+		$temp = substr($buffer,0,$chunkend);
+		$chunk_size = hexdec( trim($temp) );
+		$chunkstart = $chunkend;
+		// while(chunk-size > 0) {
+		while($chunk_size > 0)
+		{
+			$chunkend = strpos($buffer, "\r\n", $chunkstart + $chunk_size);
+
+			// just in case we got a broken connection
+			if($chunkend == false)
+			{
+				$chunk = substr($buffer,$chunkstart);
+				// append chunk-data to entity-body
+				$new .= $chunk;
+				$length += strlen($chunk);
+				break;
+			}
+
+			// read chunk-data and crlf
+			$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);
+			// append chunk-data to entity-body
+			$new .= $chunk;
+			// length := length + chunk-size
+			$length += strlen($chunk);
+			// read chunk-size and crlf
+			$chunkstart = $chunkend + 2;
+
+			$chunkend = strpos($buffer,"\r\n",$chunkstart)+2;
+			if($chunkend == false)
+			{
+				break; //just in case we got a broken connection
+			}
+			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);
+			$chunk_size = hexdec( trim($temp) );
+			$chunkstart = $chunkend;
+		}
+		return $new;
+	}
+
+	/**
+	* Given a string defining a php type or phpxmlrpc type (loosely defined: strings
+	* accepted come from javadoc blocks), return corresponding phpxmlrpc type.
+	* NB: for php 'resource' types returns empty string, since resources cannot be serialized;
+	* for php class names returns 'struct', since php objects can be serialized as xmlrpc structs
+	* @param string $phptype
+	* @return string
+	*/
+	function php_2_xmlrpc_type($phptype)
+	{
+		switch(strtolower($phptype))
+		{
+			case 'string':
+				return $GLOBALS['xmlrpcString'];
+			case 'integer':
+			case $GLOBALS['xmlrpcInt']: // 'int'
+			case $GLOBALS['xmlrpcI4']:
+				return $GLOBALS['xmlrpcInt'];
+			case 'double':
+				return $GLOBALS['xmlrpcDouble'];
+			case 'boolean':
+				return $GLOBALS['xmlrpcBoolean'];
+			case 'array':
+				return $GLOBALS['xmlrpcArray'];
+			case 'object':
+				return $GLOBALS['xmlrpcStruct'];
+			case $GLOBALS['xmlrpcBase64']:
+			case $GLOBALS['xmlrpcStruct']:
+				return strtolower($phptype);
+			case 'resource':
+				return '';
+			default:
+				if(class_exists($phptype))
+				{
+					return $GLOBALS['xmlrpcStruct'];
+				}
+				else
+				{
+					// unknown: might be any xmlrpc type
+					return $GLOBALS['xmlrpcValue'];
+				}
+		}
+	}
+
+	/**
+	* Given a user-defined PHP function, create a PHP 'wrapper' function that can
+	* be exposed as xmlrpc method from an xmlrpc_server object and called from remote
+	* clients.
+	*
+	* Since php is a typeless language, to infer types of input and output parameters,
+	* it relies on parsing the javadoc-style comment block associated with the given
+	* function. Usage of xmlrpc native types (such as datetime.dateTime.iso8601 and base64)
+	* in the @param tag is also allowed, if you need the php function to receive/send
+	* data in that particular format (note that base64 enncoding/decoding is transparently
+	* carried out by the lib, while datetime vals are passed around as strings)
+	*
+	* Known limitations:
+	* - requires PHP 5.0.3 +
+	* - only works for user-defined functions, not for PHP internal functions
+	*   (reflection does not support retrieving number/type of params for those)
+	* - functions returning php objects will generate special xmlrpc responses:
+	*   when the xmlrpc decoding of those responses is carried out by this same lib, using
+	*   the appropriate param in php_xmlrpc_decode, the php objects will be rebuilt.
+	*   In short: php objects can be serialized, too (except for their resource members),
+	*   using this function.
+	*   Other libs might choke on the very same xml that will be generated in this case
+	*   (i.e. it has a nonstandard attribute on struct element tags)
+	* - usage of javadoc @param tags using param names in a different order from the
+	*   function prototype is not considered valid (to be fixed?)
+	*
+	* Note that since rel. 2.0RC3 the preferred method to have the server call 'standard'
+	* php functions (ie. functions not expecting a single xmlrpcmsg obj as parameter)
+	* is by making use of the functions_parameters_type class member.
+	*
+	* @param string $funcname the name of the PHP user function to be exposed as xmlrpc method; array($obj, 'methodname') might be ok too, in the future...
+	* @return false on error, or an array containing the name of the new php function,
+	*         its signature and docs, to be used in the server dispatch map
+	*
+	* @todo decide how to deal with params passed by ref: bomb out or allow?
+	* @todo finish using javadoc info to build method sig if all params are named but out of order
+	* @done switch to some automagic object encoding scheme
+	* @todo add a check for params of 'resource' type
+	* @todo add some trigger_errors when returning false?
+	* @todo what to do when the PHP function returns NULL? we are currently returning bogus responses!!!
+	*/
+	function wrap_php_function($funcname, $newfuncname='')
+	{
+		if(version_compare(phpversion(), '5.0.3') == -1)
+		{
+			// up to php 5.0.3 some useful reflection methods were missing
+			return false;
+		}
+		if((is_array($funcname) && !method_exists($funcname[0], $funcname[1])) || !function_exists($funcname))
+		{
+			return false;
+		}
+		else
+		{
+			// determine name of new php function
+			if($newfuncname == '')
+			{
+				if(is_array($funcname))
+				{
+					$xmlrpcfuncname = "xmlrpc_".implode('_', $funcname);
+				}
+				else
+				{
+					$xmlrpcfuncname = "xmlrpc_$funcname";
+				}
+			}
+			else
+			{
+				$xmlrpcfuncname = $newfuncname;
+			}
+			while(function_exists($xmlrpcfuncname))
+			{
+				$xmlrpcfuncname .= 'x';
+			}
+			$code = "function $xmlrpcfuncname(\$msg) {\n";
+
+			// start to introspect PHP code
+			$func =& new ReflectionFunction($funcname);
+			if($func->isInternal())
+			{
+				// Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs
+				// instead of getparameters to fully reflect internal php functions ?
+				return false;
+			}
+
+			// retrieve parameter names, types and description from javadoc comments
+
+			// function description
+			$desc = '';
+			// type of return val: by default 'any'
+			$returns = $GLOBALS['xmlrpcValue'];
+			// type + name of function parameters
+			$paramDocs = array();
+
+			$docs = $func->getDocComment();
+			if($docs != '')
+			{
+				$docs = explode("\n", $docs);
+				$i = 0;
+				foreach($docs as $doc)
+				{
+					$doc = trim($doc, " \r\t/*");
+					if(strlen($doc) && strpos($doc, '@') !== 0 && !$i)
+					{
+						if($desc)
+						{
+							$desc .= "\n";
+						}
+						$desc .= $doc;
+					}
+					elseif(strpos($doc, '@param') === 0)
+					{
+						// syntax: @param type [$name] desc
+						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))
+						{
+							if(strpos($matches[1], '|'))
+							{
+								//$paramDocs[$i]['type'] = explode('|', $matches[1]);
+								$paramDocs[$i]['type'] = 'mixed';
+							}
+							else
+							{
+								$paramDocs[$i]['type'] = $matches[1];
+							}
+							$paramDocs[$i]['name'] = trim($matches[2]);
+							$paramDocs[$i]['doc'] = $matches[3];
+						}
+						$i++;
+					}
+					elseif(strpos($doc, '@return') === 0)
+					{
+						$returns = preg_split("/\s+/", $doc);
+						if(isset($returns[1]))
+						{
+							$returns = php_2_xmlrpc_type($returns[1]);
+						}
+					}
+				}
+			}
+
+			// start introspection of actual function prototype and building of PHP code
+			// to be eval'd
+			$params = $func->getParameters();
+
+			$innercode = '';
+			$i = 0;
+			$parsvariations = array();
+			$pars = array();
+			$pnum = count($params);
+			foreach($params as $param)
+			{
+				if (isset($paramDocs[$i]['name']) && $paramDocs[$i]['name'] && strtolower($paramDocs[$i]['name']) != '$'.strtolower($param->getName()))
+				{
+					// param name from phpdoc info does not match param definition!
+					$paramDocs[$i]['type'] = 'mixed';
+				}
+
+				if($param->isOptional())
+				{
+					// this particular parameter is optional. save as valid previous list of parameters
+					$innercode .= "if (\$paramcount > $i) {\n";
+					$parsvariations[] = $pars;
+				}
+				$innercode .= "\$p$i = \$msg->getParam($i);\n";
+				$innercode .= "if (\$p{$i}->kindOf() == 'scalar') \$p$i = \$p{$i}->scalarval(); else \$p$i = php_xmlrpc_decode(\$p$i);\n";
+				$pars[] = "\$p$i";
+				$i++;
+				if($param->isOptional())
+				{
+					$innercode .= "}\n";
+				}
+				if($i == $pnum)
+				{
+					// last allowed parameters combination
+					$parsvariations[] = $pars;
+				}
+			}
+
+			$sigs = array();
+			if(count($parsvariations) == 0)
+			{
+				// only known good synopsis = no parameters
+				$parsvariations[] = array();
+				$minpars = 0;
+			}
+			else
+			{
+				$minpars = count($parsvariations[0]);
+			}
+
+			if($minpars)
+			{
+				// add to code the check for min params number
+				// NB: this check needs to be done BEFORE decoding param values
+				$innercode = "\$paramcount = \$msg->getNumParams();\n" .
+				"if (\$paramcount < $minpars) return new xmlrpcresp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n" . $innercode;
+			}
+			else
+			{
+				$innercode = "\$paramcount = \$msg->getNumParams();\n" . $innercode;
+			}
+
+			$innercode .= "\$np = false;";
+			foreach($parsvariations as $pars)
+			{
+				$innercode .= "if (\$paramcount == " . count($pars) . ") \$retval = $funcname(" . implode(',', $pars) . "); else\n";
+				// build a 'generic' signature (only use an appropriate return type)
+				$sig = array($returns);
+				for($i=0; $i < count($pars); $i++)
+				{
+					if (isset($paramDocs[$i]['type']))
+					{
+						$sig[] = php_2_xmlrpc_type($paramDocs[$i]['type']);
+					}
+					else
+					{
+						$sig[] = $GLOBALS['xmlrpcValue'];
+					}
+				}
+				$sigs[] = $sig;
+			}
+			$innercode .= "\$np = true;\n";
+			$innercode .= "if (\$np) return new xmlrpcresp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}'); else\n";
+			//$innercode .= "if (\$_xmlrpcs_error_occurred) return new xmlrpcresp(0, $GLOBALS['xmlrpcerr']user, \$_xmlrpcs_error_occurred); else\n";
+			if($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64'])
+			{
+				$innercode .= "return new xmlrpcresp(new xmlrpcval(\$retval, '$returns'));";
+			}
+			else
+			{
+				$innercode .= "return new xmlrpcresp(php_xmlrpc_encode(\$retval, array('encode_php_objs')));";
+			}
+			// shall we exclude functions returning by ref?
+			// if($func->returnsReference())
+			//  return false;
+			$code = $code . $innercode . "\n}\n \$allOK=1;";
+			//print_r($code);
+			$allOK = 0;
+			eval($code);
+			// alternative
+			//$xmlrpcfuncname = create_function('$m', $innercode);
+
+			if(!$allOK)
+			{
+				return false;
+			}
+
+			/// @todo examine if $paramDocs matches $parsvariations and build array for
+			/// usage as method signature, plus put together a nice string for docs
+
+			$ret = array('function' => $xmlrpcfuncname, 'signature' => $sigs, 'docstring' => $desc);
+			return $ret;
+		}
+	}
+
+	/**
+	* Given an xmlrpc client and a method name, register a php wrapper function
+	* that will call it and return results using native php types for both
+	* params and results. The generated php function will return an xmlrpcresp
+	* oject for failed xmlrpc calls
+	*
+	* Known limitations:
+	* - server must support system.methodsignature for the wanted xmlrpc method
+	* - for methods that expose many signatures, only one can be picked (we
+	*   could in priciple check if signatures differ only by number of params
+	*   and not by type, but it would be more complication than we can spare time)
+	* - nested xmlrpc params: the caller of the generated php function has to
+	*   encode on its own the params passed to the php function if these are structs
+	*   or arrays whose (sub)members include values of type datetime or base64
+	*
+	* Notes: the connection properties of the given client will be copied
+	* and reused for the connection used during the call to the generated
+	* php function.
+	* Calling the generated php function 'might' be slow: a new xmlrpc client
+	* is created on every invocation and an xmlrpc-connection opened+closed.
+	* An extra 'debug' param is appended to param list of xmlrpc method, useful
+	* for debugging purposes.
+	*
+	* @param xmlrpc_client $client     an xmlrpc client set up correctly to communicate with target server
+	* @param string        $methodname the xmlrpc method to be mapped to a php function
+	* @param integer       $signum     the index of the method signature to use in mapping (if method exposes many sigs)
+	* @return string                   the name of the generated php function (or false)
+	*/
+	function wrap_xmlrpc_method($client, $methodname, $signum=0, $timeout=0, $protocol='', $newfuncname='')
+	{
+		$msg =& new xmlrpcmsg('system.methodSignature');
+		$msg->addparam(new xmlrpcval($methodname));
+		$response =& $client->send($msg, $timeout, $protocol);
+		if(!$response || $response->faultCode())
+		{
+			return false;
+		}
+		else
+		{
+			$desc = $response->value();
+			if($desc->kindOf() != 'array' || $desc->arraysize() <= $signum)
+			{
+				return false;
+			}
+			else
+			{
+				if($newfuncname != '')
+				{
+					$xmlrpcfuncname = $newfuncname;
+				}
+				else
+				{
+					$xmlrpcfuncname = 'xmlrpc_'.str_replace('.', '_', $methodname);
+				}
+				while(function_exists($xmlrpcfuncname))
+				{
+					$xmlrpcfuncname .= 'x';
+				}
+				$desc = $desc->arraymem($signum);
+				$code = "function $xmlrpcfuncname (";
+				$innercode = "\$client =& new xmlrpc_client('$client->path', '$client->server');\n";
+				// copy all client fields to the client that will be generated runtime
+				// (this provides for future expansion of client obj)
+				foreach($client as $fld => $val)
+				{
+					if($fld != 'debug' && $fld != 'return_type')
+					{
+						$val = var_export($val, true);
+						$innercode .= "\$client->$fld = $val;\n";
+					}
+				}
+				$innercode .= "\$client->setDebug(\$debug);\n";
+				$innercode .= "\$client->return_type = 'xmlrpcvals';\n";
+				$innercode .= "\$msg =& new xmlrpcmsg('$methodname');\n";
+
+				// param parsing
+				$plist = array();
+				$pcount = $desc->arraysize();
+				for($i = 1; $i < $pcount; $i++)
+				{
+					$plist[] = "\$p$i";
+					$ptype = $desc->arraymem($i);
+					$ptype = $ptype->scalarval();
+					if($ptype == 'dateTime.iso8601' || $ptype == 'base64')
+					{
+						$innercode .= "\$p$i =& new xmlrpcval(\$p$i, '$ptype');\n";
+					}
+					else
+					{
+						$innercode .= "\$p$i =& php_xmlrpc_encode(\$p$i);\n";
+					}
+					$innercode .= "\$msg->addparam(\$p$i);\n";
+				}
+				$plist[] = '$debug = 0';
+				$plist = implode(',', $plist);
+
+				$innercode .= "\$res =& \$client->send(\$msg, $timeout, '$protocol');\n";
+				$innercode .= "if (\$res->faultcode()) return \$res; else return php_xmlrpc_decode(\$res->value(), array('decode_php_objs'));";
+
+				$code = $code . $plist. ") {\n" . $innercode . "\n}\n\$allOK=1;";
+				//print_r($code);
+				$allOK = 0;
+				eval($code);
+				// alternative
+				//$xmlrpcfuncname = create_function('$m', $innercode);
+				if($allOK)
+				{
+					return $xmlrpcfuncname;
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+	}
+
+	/**
+	* xml charset encoding guessing helper function.
+	* Tries to determine the charset encoding of an XML chunk
+	* received over HTTP.
+
+	* NB: according to the spec (RFC 3023, if text/xml content-type is received over HTTP without a content-type,
+
+	* we SHOULD assume it is strictly US-ASCII. But we try to be more tolerant of unconforming (legacy?) clients/servers,
+
+	* which will be most probably using UTF-8 anyway...
+	*
+	* @param string $httpheaders the http Content-type header
+	* @param string $xmlchunk xml content buffer
+	* @param string $encoding_prefs comma separated list of character encodings to be used as default (when mb extension is enabled)
+	*
+	* @todo explore usage of mb_http_input(): does it detect http headers + post data? if so, use it instead of hand-detection!!!
+	*/
+	function guess_encoding($httpheader='', $xmlchunk='', $encoding_prefs=null)
+	{
+		// discussion: see http://www.yale.edu/pclt/encoding/
+		// 1 - test if encoding is specified in HTTP HEADERS
+
+		//Details:
+		// LWS:           (\13\10)?( |\t)+
+		// token:         (any char but excluded stuff)+
+		// header:        Content-type = ...; charset=value(; ...)*
+		//   where value is of type token, no LWS allowed between 'charset' and value
+		// Note: we do not check for invalid chars in VALUE:
+		//   this had better be done using pure ereg as below
+
+		/// @todo this test will pass if ANY header has charset specification, not only Content-Type. Fix it?
+		if(eregi(";((\\xD\\xA)?[ \\x9]+)*charset=", $httpheader))
+		{
+			/// @BUG if charset is received uppercase, this line will fail!
+			$in = strpos($httpheader, 'charset=')+8;
+			$out = strpos($httpheader, ';', $in) ? strpos($httpheader, ';', $in) : strlen($httpheader);
+			return strtoupper(trim(substr($httpheader, $in, $out-$in)));
+		}
+
+		// 2 - scan the first bytes of the data for a UTF-16 (or other) BOM pattern
+		//     (source: http://www.w3.org/TR/2000/REC-xml-20001006)
+		//     NOTE: actually, according to the spec, even if we find the BOM and determine
+		//     an encoding, we should check if there is an encoding specified
+		//     in the xml declaration, and verify if they match.
+		/// @todo implement check as described above?
+		/// @todo implement check for first bytes of string even without a BOM? (It sure looks harder than for cases WITH a BOM)
+		if(@ereg("^(\\x00\\x00\\xFE\\xFF|\\xFF\\xFE\\x00\\x00|\\x00\\x00\\xFF\\xFE|\\xFE\\xFF\\x00\\x00)", $xmlchunk))
+		//  if (preg_match("/^(\\x00\\x00\\xFE\\xFF|\\xFF\\xFE\\x00\\x00|\\x00\\x00\\xFF\\xFE|\\xFE\\xFF\\x00\\x00)/", $xmlchunk))
+		{
+			return 'UCS-4';
+		}
+		elseif(ereg("^(\\xFE\\xFF|\\xFF\\xFE)", $xmlchunk))
+		{
+			return 'UTF-16';
+		}
+		elseif(ereg("^(\\xEF\\xBB\\xBF)", $xmlchunk))
+		{
+			return 'UTF-8';
+		}
+
+		// 3 - test if encoding is specified in the xml declaration
+		// Details:
+		// SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
+		// EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
+		if (ereg("^<\?xml".
+			"[ \\x9\\xD\\xA]+" . "version"  . "[ \\x9\\xD\\xA]*=[ \\x9\\xD\\xA]*" . "((\"[a-zA-Z0-9_.:-]+\")|('[a-zA-Z0-9_.:-]+'))".
+			"[ \\x9\\xD\\xA]+" . "encoding" . "[ \\x9\\xD\\xA]*=[ \\x9\\xD\\xA]*" . "((\"[A-Za-z][A-Za-z0-9._-]*\")|('[A-Za-z][A-Za-z0-9._-]*'))",
+			$xmlchunk, $regs))
+		{
+			return strtoupper(substr($regs[4], 1, strlen($regs[4])-2));
+		}
+
+		// 4 - if mbstring is available, let it do the guesswork
+		// NB: we favour finding an encoding that is compatible with what we can process
+		if(extension_loaded('mbstring'))
+		{
+			if($encoding_prefs)
+			{
+				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);
+			}
+			else
+			{
+				$enc = mb_detect_encoding($xmlchunk);
+			}
+			// NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
+			// IANA also likes better US-ASCII, so go with it
+			if($enc == 'ASCII')
+			{
+				$enc = 'US-'.$enc;
+			}
+			return $enc;
+		}
+		else
+		{
+			// no encoding specified: as per HTTP1.1 assume it is iso-8859-1?
+			// Both RFC 2616 (HTTP 1.1) and 1945(http 1.0) clearly state that for text/xxx content types
+			// this should be the standard. And we should be getting text/xml as request and response.
+			// BUT we have to be backward compatible with the lib, which always used UTF-8 as default...
+			return $GLOBALS['xmlrpc_defencoding'];
+		}
+	}
+
+/**
+* Checks if a given charset encoding is present in a list of encodings or
+* if it is a valid subset of any encoding in the list
+* @param string $encoding  charset to be tested
+* @param mixed  $validlist comma separated list of valid charsets (or array of charsets)
+*/
+function is_valid_charset($encoding, $validlist)
+{
+	$charset_supersets = array(
+    'US-ASCII' => array ('ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
+                         'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8',
+                         'ISO-8859-9', 'ISO-8859-10', 'ISO-8859-11', 'ISO-8859-12',
+                         'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',
+                         'EUC-JP', 'EUC-', 'EUC-KR', 'EUC-CN')
+	);
+	if (is_string($validlist))
+		$validlist = split(',', $validlist);
+	if (@in_array(strtoupper($encoding), $validlist))
+		return true;
+	else
+	{
+		if (array_key_exists($encoding, $charset_supersets))
+			foreach ($validlist as $allowed)
+				if (in_array($allowed, $charset_supersets[$encoding]))
+					return true;
+		return false;
+	}
+}
+
+?>
\ No newline at end of file

From ac53d556dbca1adf7eff94ce678b8ae1ae1fdd3d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Wed, 12 May 2010 14:44:14 +0200
Subject: [PATCH 133/146] [FIX] crm: mailgate: Use the right fields from the
 header for the 'From' and 'To' fields

bzr revid: stephane@openerp.com-20100512124414-h76qmp00qu6obhfv
---
 addons/crm/scripts/openerp_mailgate/openerp_mailgate.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
index 5775319ee0a..a865443c1b9 100755
--- a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
@@ -315,7 +315,8 @@ class email_parser(object):
                 'res_id': id
             }
             self.rpc('ir.attachment', 'create', data_attach)
-        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), body['body'])
+
+        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), body['body'], self._decode_header(msg['From']), False, {'model' : self.model})
         return id
 
     def msg_send(self, msg, emails, priority=None):
@@ -358,7 +359,8 @@ class email_parser(object):
                 'res_id': id
             }
             self.rpc('ir.attachment', 'create', data_attach)
-        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), message['body'])
+
+        self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), message['body'], self._decode_header(msg['From']), False, {'model' : self.model})
         return id
 
     def msg_test(self, msg, case_str):

From b03b10a5598acecfa9242cf6fc7e798708a9bdb0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 18:46:01 +0530
Subject: [PATCH 134/146] [IMP]: Minor Code improvements (For tooptips) in crm
 modules

bzr revid: rpa@tinyerp.com-20100512131601-b1vkwfe2f6ker8eq
---
 addons/base_calendar/base_calendar.py         |  8 +--
 .../wizard/base_calendar_invite_attendee.py   |  2 +-
 addons/crm/crm_segmentation.py                | 41 +++++----------
 addons/crm/wizard/crm_forward_to_partner.py   | 52 +++++++++++++++----
 addons/crm_claim/crm_claim.py                 | 26 +++++-----
 addons/crm_fundraising/crm_fundraising.py     | 11 ++--
 addons/crm_helpdesk/crm_helpdesk.py           |  4 +-
 7 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index b2e57662cea..e97ee3bd547 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -580,7 +580,7 @@ class res_alarm(osv.osv):
 are both optional, but if one occurs, so MUST the other"""), 
         'repeat': fields.integer('Repeat'), 
         'active': fields.boolean('Active', help="If the active field is set to \
-                    true, it will allow you to hide the event alarm information without removing it.")
+true, it will allow you to hide the event alarm information without removing it.")
     }
     _defaults = {
         'trigger_interval': lambda *x: 'minutes', 
@@ -992,9 +992,9 @@ class calendar_event(osv.osv):
                                                 'Show as'), 
         'base_calendar_url': fields.char('Caldav URL', size=264), 
         'exdate': fields.text('Exception Date/Times', help="This property \
-                    defines the list of date/time exceptions for arecurring calendar component."), 
+defines the list of date/time exceptions for arecurring calendar component."), 
         'exrule': fields.char('Exception Rule', size=352, help="defines a \
-                    rule or repeating pattern for anexception to a recurrence set"), 
+rule or repeating pattern for an exception to a recurrence set"), 
         'rrule': fields.function(_get_rulestring, type='char', size=124, method=True, \
                                     string='Recurrent Rule', store=True, \
                                     fnct_inv=_set_rrulestring, help='Defines a\
@@ -1044,7 +1044,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
                                  'event_id', 'attendee_id', 'Attendees'),
         'allday': fields.boolean('All Day'), 
         'active': fields.boolean('Active', help="If the active field is set to \
-                    true, it will allow you to hide the event alarm information without removing it.")
+true, it will allow you to hide the event alarm information without removing it.")
     }
 
     _defaults = {
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 0e91447eebf..83cf7c8cbe0 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -44,7 +44,7 @@ class base_calendar_invite_attendee(osv.osv_memory):
         'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel',
                                   'invite_id', 'contact_id', 'Contacts'),
         'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
-                        send an Email to Invited Person')
+send an Email to Invited Person')
     }
 
     _defaults = {
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index f435f41b10d..41ec59bff2f 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -37,39 +37,26 @@ class crm_segmentation(osv.osv):
         'description': fields.text('Description'),
         'categ_id': fields.many2one('res.partner.category', 'Partner Category',\
                          required=True, help='The partner category that will be \
-                         added to partners that match the segmentation criterions after computation.'),
-        'exclusif': fields.boolean('Exclusive', help='Check if the category is \
-                        limited to partners that match the segmentation criterions.\
-                        If checked, remove the category from partners that doesn\'t \
-                        match segmentation criterions'),
+added to partners that match the segmentation criterions after computation.'),
+        'exclusif': fields.boolean('Exclusive', help='Check if the category is limited to partners that match the segmentation criterions.\
+                        \nIf checked, remove the category from partners that doesn\'t match segmentation criterions'),
         'state': fields.selection([('not running','Not Running'),\
                     ('running','Running')], 'Execution Status', readonly=True),
         'partner_id': fields.integer('Max Partner ID processed'),
         'segmentation_line': fields.one2many('crm.segmentation.line', \
                             'segmentation_id', 'Criteria', required=True),
-        'som_interval': fields.integer('Days per Periode', help="A period is the \
-                        average number of days between two cycle of sale or\
-                        purchase for this segmentation. It's mainly used to\
-                        detect if a partner has not purchased or buy for a too \
-                        long time, so we suppose that his state of mind has \
-                        decreased because he probably bought goods to another \
-                        supplier. Use this functionality for recurring businesses."),
-        'som_interval_max': fields.integer('Max Interval', help="The computation \
-                            is made on all events that occured during this \
-                            interval, the past X periods."),
-        'som_interval_decrease': fields.float('Decrease (0>1)', help="If the \
-                                     partner has not purchased (or bought) \
-                                     during a period, decrease the state of \
-                                     mind by this factor. It\'s a multiplication"),
+        'som_interval': fields.integer('Days per Periode', help="A period is the average number of days between two cycle of sale or purchase for this segmentation.\
+                 \nIt's mainly used to detect if a partner has not purchased or buy for a too long time, \
+                 \nso we suppose that his state of mind has decreased because he probably bought goods to another supplier. \
+                 \nUse this functionality for recurring businesses."),
+        'som_interval_max': fields.integer('Max Interval', help="The computation is made on all events that occured during this interval, the past X periods."),
+        'som_interval_decrease': fields.float('Decrease (0>1)', help="If the "\
+                            "partner has not purchased (or bought) during a "\
+                            "period, decrease the state of mind by this factor. It\'s a multiplication"),
         'som_interval_default': fields.float('Default (0=None)', help="Default \
-                                     state of mind for period preceeding the \
-                                     'Max Interval' computation. This is the \
-                                     starting state of mind by default if the \
-                                     partner has no event."),
-        'sales_purchase_active': fields.boolean('Use The Sales Purchase Rules',\
-                                     help='Check if you want to use this tab as\
-                                    part of the segmentation rule. If not \
-                                    checked, the criteria beneath will be ignored')
+state of mind for period preceeding the 'Max Interval' computation. \
+This is the starting state of mind by default if the partner has no event."),
+        'sales_purchase_active': fields.boolean('Use The Sales Purchase Rules', help='Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored')
     }
     _defaults = {
         'partner_id': lambda *a: 0,
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index a9af0f2816b..98d5392faa3 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -26,6 +26,7 @@ from tools.translate import _
 import tools
 
 class crm_lead_forward_to_partner(osv.osv_memory):
+    """Forwards lead history"""
     _name = 'crm.lead.forward.to.partner'
 
     _columns = {
@@ -43,6 +44,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     }
     
     def get_whole_history(self, cr, uid, ids, context=None):
+        """This function gets whole communication history and returns as top posting style 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of history IDs
+        @param context: A standard dictionary for contextual values
+        """
         whole = []
         for hist_id in ids:
             whole.append(self.get_latest_history(cr, uid, hist_id, context=context))
@@ -50,6 +58,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return whole or ''
 
     def get_latest_history(self, cr, uid, hist_id, context=None):
+        """This function gets latest communication and returns as top posting style
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param hist_id: Id of latest history
+        @param context: A standard dictionary for contextual values
+        """
         log_pool = self.pool.get('mailgate.message')
         hist = log_pool.browse(cr, uid, hist_id, context=context)
         header = '-------- Original Message --------'
@@ -61,27 +76,34 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         original = '\n'.join(original)
         return original
 
-    def on_change_email(self, cr, uid, ids, user, partner):
-        """
+    def on_change_email(self, cr, uid, ids, user):
+        """This function fills email information based on user selected
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of Mail’s IDs
+        @param user: Changed User id
+        @param partner: Changed Partner id  
         """
-        if (not partner and not user):
+        if not user:
             return {'value': {'email_to': False}}
         email = False
-        if partner:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [partner], ['contact'])
-            if addr and addr['contact']:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr['contact'] , ['email'])['email']
-        elif user:
-            addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
-            if addr:
-                email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
+        addr = self.pool.get('res.users').read(cr, uid, user, ['address_id'])['address_id']
+        if addr:
+            email = self.pool.get('res.partner.address').read(cr, uid, addr[0] , ['email'])['email']
         return {'value': {'email_to': email}}
 
     def on_change_history(self, cr, uid, ids, history, context=None):
+        """Gives message body according to type of history selected
+            * info: Forward the case information
+            * whole: Send the whole history
+            * latest: Send the latest histoy
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of history IDs
+        @param context: A standard dictionary for contextual values
+        """
         #TODO: ids and context are not comming
         res = False
         msg_val = ''
@@ -111,6 +133,14 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return res
 
     def on_change_partner(self, cr, uid, ids, partner_id):
+        """This function fills address information based on partner/user selected
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Mail’s IDs
+        @param user: Changed User id
+        @param partner: Changed Partner id  
+        """
         if not partner_id:
             return {'value' : {'email_to' : False, 'address_id': False}}
 
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 63e785978a9..a535efbdb81 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -42,17 +42,18 @@ class crm_claim(osv.osv, crm.crm_case):
         'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
         'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
         'canal_id': fields.many2one('res.partner.canal', 'Channel', \
-                     help="The channels represent the different communication\
-                      modes available with the customer." \
-                     " With each commercial opportunity, you can indicate the\
-                      canall which is this opportunity source."), 
+                     help="The channels represent the different communication"\
+                      "modes available with the customer." \
+                     " With each commercial opportunity, you can indicate the"\
+                      "canall which is this opportunity source."), 
         'planned_revenue': fields.float('Planned Revenue'), 
         'planned_cost': fields.float('Planned Costs'), 
         'som': fields.many2one('res.partner.som', 'State of Mind', \
-                        help="The minds states allow to define a value scale which represents" \
-                              "the partner mentality in relation to our services.The scale has" \
-                              "to be created with a factor for each level from 0 (Very dissatisfied) \
-                              to 10 (Extremely satisfied)."), 
+                        help="The minds states allow to define a value scale "\
+                            "which represents the partner mentality in "\
+                            "relation to our services.The scale has to be "\
+                            "created with a factor for each level from 0 "\
+                            "(Very dissatisfied) to 10 (Extremely satisfied)"), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.claim')]"), 
@@ -62,15 +63,14 @@ class crm_claim(osv.osv, crm.crm_case):
                          ('object_id.model', '=', 'crm.claim')]"), 
         'user_id': fields.many2one('res.users', 'Responsible'), 
         'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                        select=True, help='Sales team to which Case belongs to.\
-                             Define Responsible user and Email account for mail gateway.'), 
+                        select=True, help="Sales team to which Case belongs to."\
+                                "Define Responsible user and Email account for"\
+                                " mail gateway."), 
         'company_id': fields.many2one('res.company', 'Company'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
-        'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
- will receive a copy of the future" \
-" communication between partner and users by email"), 
+        'email_cc': fields.text('Watchers Emails', size=252, help="These people will receive a copy of the future communication between partner and users by email"), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."), 
         'partner_name': fields.char("Employee's Name", size=64), 
         'partner_mobile': fields.char('Mobile', size=32), 
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 98bd7446068..4650528fa72 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -39,15 +39,12 @@ class crm_fundraising(osv.osv, crm.crm_case):
             'date_deadline': fields.date('Deadline'), 
             'user_id': fields.many2one('res.users', 'Responsible'), 
             'section_id': fields.many2one('crm.case.section', 'Sales Team', \
-                            select=True, help='Sales team to which Case belongs to.\
-                                 Define Responsible user and Email account for mail gateway.'), 
+                            select=True, help='Sales team to which Case belongs to. Define Responsible user and Email account for mail gateway.'), 
             'company_id': fields.many2one('res.company', 'Company'), 
             'partner_id': fields.many2one('res.partner', 'Partner'), 
             'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
                                  domain="[('partner_id','=',partner_id)]"), 
-            'email_cc': fields.text('Watchers Emails', size=252 , help="These people\
- will receive a copy of the future" \
-" communication between partner and users by email"), 
+            'email_cc': fields.text('Watchers Emails', size=252 , help="These people will receive a copy of the future communication between partner and users by email"), 
             'email_from': fields.char('Email', size=128, help="These people will receive email."), 
             'date_closed': fields.datetime('Closed', readonly=True), 
             'date': fields.datetime('Date'), 
@@ -72,8 +69,8 @@ class crm_fundraising(osv.osv, crm.crm_case):
             'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
             'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
             'canal_id': fields.many2one('res.partner.canal', 'Channel', \
-                        help="The channels represent the different communication \
-                        modes available with the customer." \
+                        help="The channels represent the different communication "\
+                        "modes available with the customer." \
                        " With each commercial opportunity, you can indicate\
                      the canall which is this opportunity source."), 
             'som': fields.many2one('res.partner.som', 'State of Mind', \
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index ad2c6cbe858..4329ef7d73b 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -63,8 +63,8 @@ class crm_helpdesk(osv.osv, crm.crm_case):
             'som': fields.many2one('res.partner.som', 'State of Mind', \
                             help="The minds states allow to define a value scale which represents" \
                                 "the partner mentality in relation to our services.The scale has" \
-                                "to be created with a factor for each level from 0 \
-                                (Very dissatisfied) to 10 (Extremely satisfied)."), 
+                                "to be created with a factor for each level from 0" \
+                                "(Very dissatisfied) to 10 (Extremely satisfied)."), 
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"), 

From 78000800c3f7c6965a2a167cd36578c8d4bfbec3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 19:35:35 +0530
Subject: [PATCH 135/146] [IMP]: partner_infotab: Renamed partner_crm to
 partner_infotab, Made relation with timesheet lines and partner

bzr revid: rpa@tinyerp.com-20100512140535-cu62e5qzbiy1vvyp
---
 addons/hr_timesheet/hr_timesheet.py           |  3 ++-
 .../__init__.py                               |  2 +-
 .../__openerp__.py                            |  4 ++--
 .../partner_infotab.py}                       |  2 ++
 .../partner_infotab_view.xml}                 | 22 +++++++++----------
 .../security/ir.model.access.csv              |  0
 6 files changed, 18 insertions(+), 15 deletions(-)
 rename addons/{partner_crm => partner_infotab}/__init__.py (97%)
 rename addons/{partner_crm => partner_infotab}/__openerp__.py (94%)
 rename addons/{partner_crm/partner_crm.py => partner_infotab/partner_infotab.py} (91%)
 rename addons/{partner_crm/partner_crm_view.xml => partner_infotab/partner_infotab_view.xml} (61%)
 rename addons/{partner_crm => partner_infotab}/security/ir.model.access.csv (100%)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index e89d52659f4..25c61483391 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -43,7 +43,8 @@ class hr_analytic_timesheet(osv.osv):
     _inherits = {'account.analytic.line': 'line_id'}
     _order = "id desc"
     _columns = {
-        'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'),
+        'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'), 
+        'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id',relation='account.analytic.account',store=True),
     }
 
     def unlink(self, cr, uid, ids, context={}):
diff --git a/addons/partner_crm/__init__.py b/addons/partner_infotab/__init__.py
similarity index 97%
rename from addons/partner_crm/__init__.py
rename to addons/partner_infotab/__init__.py
index 4dd1f496527..a0a034ec9c5 100644
--- a/addons/partner_crm/__init__.py
+++ b/addons/partner_infotab/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import partner_crm
+import partner_infotab
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/partner_crm/__openerp__.py b/addons/partner_infotab/__openerp__.py
similarity index 94%
rename from addons/partner_crm/__openerp__.py
rename to addons/partner_infotab/__openerp__.py
index d5bc49b1e5c..db44ac70762 100644
--- a/addons/partner_crm/__openerp__.py
+++ b/addons/partner_infotab/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Detailed info on partner form', 
+    'name': 'Detailed information on partner form', 
     'version': '1.0', 
     'category': 'Generic Modules/Base', 
     'description': """
@@ -44,7 +44,7 @@ It adds the following fields on the partner form:
     'init_xml': [], 
     'update_xml': [
                    'security/ir.model.access.csv', 
-                   'partner_crm_view.xml'
+                   'partner_infotab_view.xml'
                    ], 
     'demo_xml': [], 
     'installable': True, 
diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_infotab/partner_infotab.py
similarity index 91%
rename from addons/partner_crm/partner_crm.py
rename to addons/partner_infotab/partner_infotab.py
index 2162f850115..f448919c2ea 100644
--- a/addons/partner_crm/partner_crm.py
+++ b/addons/partner_infotab/partner_infotab.py
@@ -33,6 +33,8 @@ class res_partner(osv.osv):
                 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'), 
                 'contract_ids': fields.one2many('account.analytic.account', \
                                                     'partner_id', 'Contracts'), 
+                'account_line_ids': fields.one2many('hr.analytic.timesheet', \
+                                                    'partner_id', 'Anaylitic account lines '),
                 }
 
 res_partner()
diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_infotab/partner_infotab_view.xml
similarity index 61%
rename from addons/partner_crm/partner_crm_view.xml
rename to addons/partner_infotab/partner_infotab_view.xml
index ab75f5c58ed..8aabbb242e9 100644
--- a/addons/partner_crm/partner_crm_view.xml
+++ b/addons/partner_infotab/partner_infotab_view.xml
@@ -11,19 +11,19 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                	<page string="Other Info">
-                		<group col="2" colspan="4">							
-							<field name="opportunity_ids" colspan="4" nolabel="1" />							
-							<field name="meeting_ids" colspan="4" nolabel="1" />							
+                	<page string="CRM Info">
+							<field name="opportunity_ids" colspan="4" nolabel="1" />
+							<field name="meeting_ids" colspan="4" nolabel="1" />
 							<field name="phonecall_ids" colspan="4" nolabel="1" />
-                		</group>
-                		<group col="2" colspan="4">							
-							<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
-						</group>
-						<group col="2" colspan="4">							
-							<field name="contract_ids" colspan="4" nolabel="1" />
-						</group>
 					</page>
+
+					<page string="Other Info">
+							<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
+							<field name="contract_ids" colspan="4" nolabel="1"/>
+						    <field name="account_line_ids" colspan="4" nolabel="1" context="{'group_by':'date'}"/>
+
+					</page>
+
                 </notebook>
             </field>
         </record>
diff --git a/addons/partner_crm/security/ir.model.access.csv b/addons/partner_infotab/security/ir.model.access.csv
similarity index 100%
rename from addons/partner_crm/security/ir.model.access.csv
rename to addons/partner_infotab/security/ir.model.access.csv

From f8d2111b2a0b5dde776a44c0f8c6c1402455ec5c Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Wed, 12 May 2010 19:37:19 +0530
Subject: [PATCH 136/146] [IMP]:account & installer wizards

bzr revid: nch@tinyerp.com-20100512140719-tl5gdbqa4egvbpwm
---
 addons/account/configurable_account_chart.xml |  2 +-
 addons/account/installer.py                   |  6 ++++
 addons/base_setup/base_setup_data.xml         | 36 ++++++++++---------
 addons/base_setup/base_setup_installer.xml    |  2 +-
 addons/base_setup/base_setup_todo.xml         |  2 +-
 addons/base_setup/gtk_contact_form.py         |  6 ++--
 addons/base_setup/gtk_contact_form.xml        |  6 ++--
 addons/base_setup/installer.py                |  6 ++--
 addons/hr/hr_installer.xml                    |  2 +-
 9 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index a6b271bedcb..73cb4499e20 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -154,7 +154,7 @@
         	<field name="code">1104</field>
             <field name="name">Bank Current Account</field>
             <field ref="conf_cas" name="parent_id"/>
-            <field name="type">other</field>
+            <field name="type">view</field>
             <field name="user_type" ref="conf_account_type_cash"/>
         </record>
 
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 81993908be9..1cbed3cd2a7 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -32,6 +32,11 @@ class account_installer(osv.osv_memory):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
 
+    def _get_default_accounts(self, cr, uid, context=None):
+        accounts = [{'acc_name':'Current','account_type':'cash'},
+                    {'acc_name':'Deposit','account_type':'cash'}]
+        return accounts
+
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
         ids = modules.search(cr, uid, [('category_id','=','Account Charts')])
@@ -77,6 +82,7 @@ class account_installer(osv.osv_memory):
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
         'charts':'configurable',
+        'bank_accounts_id':_get_default_accounts
         }
 
     def on_change_start_date(self, cr, uid, id, start_date):
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 90d48de5eba..024accc77ce 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -7,23 +7,25 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
       <form string="Setup">
-      <group colspan="4" col="8" width="600">
-      <group>
-  		<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
-  	</group>
-      	<group colspan="6">
-      		<separator string="Installation Done" colspan="8"/>
-      		<label align="0.0" string="Your new database is now fully installed." colspan="8"/>
-       		<field name="installed_users" nolabel= "1" colspan="8"/>
-       		<label align="0.0" colspan="8"	string="You can start configuring the system or connect directly to the database as an administrator."/>
-        </group>
-      </group>
-      <group colspan="8" col="8">
-    		<separator string="" colspan="8"/>
-    		<label string="" colspan="6"/>
-			<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
-			<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
-      </group>
+	      <group colspan="4" col="8">
+              	<group colspan="3" width="200">
+                	<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
+                	<newline/>
+                	<label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/>
+              	</group>
+              	<separator string="" position="vertical" colspan="1" rowspan="8"/>
+            	<group colspan="4" width="400">
+              		<separator string="Installation Done" colspan="4"/>
+              		<label align="0.0" string="Your new database is now fully installed." colspan="4"/>
+       				<field name="installed_users" nolabel= "1" colspan="4"/>
+            	</group>
+			</group>
+            	<group colspan="8" col="8">
+            		<separator string="" colspan="8"/>
+    				<label string="" colspan="6"/>
+					<button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
+					<button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
+           </group>
     </form>
    </field>
   </record>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 2b4a870236a..7a543f5466f 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Base Setup Modules Installation</attribute>
+            <attribute name="string">Install OpenERP Modules</attribute>
           </form>
           <xpath expr="//label[@string='description']"
                  position="attributes">
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index eb108aef229..b348b0c8a60 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,7 +11,7 @@
             <attribute name="string">Main Company Setup</attribute>
           </form>
 		  <xpath expr="//label[@string='description']" position="attributes">
-	            <attribute name="string">Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...</attribute>
+	            <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="title"]' position='attributes'>
 	          	  <attribute name='string'>Configure Your Company</attribute>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index b1d01cecb66..354080df451 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -46,10 +46,10 @@ class base_gtkcontactform(osv.osv_memory):
          return defaults
 
     _columns = {
-             'name':fields.char('Your Name', size=64, required=True),
+             'name':fields.char('Your Name', size=64),
              'job':fields.char('Job Title', size=64,),
-             'email':fields.char('E-mail', size=64, required=True),
-             'phone':fields.char('Phone', size=64, required=True),
+             'email':fields.char('E-mail', size=64),
+             'phone':fields.char('Phone', size=64),
              'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32),
              'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'),
                                           ('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'),
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index c4fe08207dd..f833f7051d6 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -31,10 +31,10 @@
 		       </group>
           		<group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}">
           		 	<separator colspan="4" string="About You"/>
-	            	<field name="name" colspan="2" required="True"/>
+	            	<field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
 	            	<field name="job" colspan="2"/>
-		            <field name="email" colspan="2"/>
-		            <field name="phone" colspan="2"/>
+		            <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
+		            <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/>
 		            <field name="total_employees" colspan="2"/>
 		            <field name="industry" colspan="2"/>
 		        </group>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 13b37c67e1f..a92d5ab4b97 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -93,9 +93,9 @@ class base_setup_installer(osv.osv_memory):
 
 
     def onchange_moduleselection(self, cr, uid, ids, *args):
-        progress = self._progress(cr, uid) - (2.5 * len(filter(lambda x: x==1, args)))
-        if progress <= 5.0:
-            progress = 5.0
+        progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args))
+        if progress <= 10.0:
+            progress = 10.0
         return {'value':{'progress':progress}}
 
     def modules_to_install(self, cr, uid, ids, context=None):
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index b01f538b193..3ce73f07b12 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -19,7 +19,7 @@
 	      		</xpath>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.</attribute>
+            <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute>
           </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>

From a15093819a441db1d85d0d7073898d3720f2cddb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 12 May 2010 19:09:20 +0200
Subject: [PATCH 137/146] merge

bzr revid: fp@tinyerp.com-20100512170920-0mgiujrnhkt5t6z7
---
 .../account/project/analytic_account_demo.xml |   9 ++
 .../board_crm/board_crm_statistical_view.xml  |   2 +-
 addons/board_crm/board_crm_view.xml           | 146 +++++++++---------
 addons/crm/crm_report_view.xml                |  42 ++---
 addons/event/event_sequence.xml               |  26 ++--
 addons/hr_holidays/hr_holidays.py             |   4 +-
 addons/sale_crm/process/sale_crm_process.xml  |  17 +-
 addons/sale_crm/sale_crm.py                   |   2 +-
 addons/sale_crm/sale_crm_view.xml             |   2 +-
 9 files changed, 123 insertions(+), 127 deletions(-)

diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index bb0738dbb65..98fcb8fa370 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -1,26 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record id="analytic_root" model="account.analytic.account">
+            <field name="name">Analytic Chart</field>
+            <field name="code">0</field>
+        </record>
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Leaves</field>
             <field name="code">1</field>
+            <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_internal" model="account.analytic.account">
             <field name="name">Internal</field>
             <field name="code">2</field>
+            <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_our_super_product" model="account.analytic.account">
             <field name="name">Our Super Product</field>
             <field name="code">100</field>
             <field name="state">open</field>
+            <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_1" model="account.analytic.account">
             <field name="name">Project 1</field>
             <field name="code">101</field>
+            <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_project_2" model="account.analytic.account">
             <field name="name">Project 2</field>
             <field name="code">102</field>
+            <field name="parent_id" ref="analytic_root"/>
         </record>
         <record id="analytic_journal_trainings" model="account.analytic.account">
             <field name="name">Training</field>
diff --git a/addons/board_crm/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml
index 9a43e4e96c2..677dd3d0138 100644
--- a/addons/board_crm/board_crm_statistical_view.xml
+++ b/addons/board_crm/board_crm_statistical_view.xml
@@ -21,7 +21,7 @@
             <field name="model">crm.opportunity.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph string="Opportunity by Sections and Categories" type="bar" orientation="horizontal">
+                <graph string="Opportunity by Sales Team and Categories" type="bar" orientation="horizontal">
                     <field name="categ_id"/>
                     <field name="nbr" operator="+"/>
                 </graph>
diff --git a/addons/board_crm/board_crm_view.xml b/addons/board_crm/board_crm_view.xml
index a0a816320df..94475a46a52 100644
--- a/addons/board_crm/board_crm_view.xml
+++ b/addons/board_crm/board_crm_view.xml
@@ -1,88 +1,88 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
-		<record model="board.note.type" id="note_crm_type">
-			<field name="name">CRM Configuration</field>
-		</record>
-		<record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
-			<field name="name">crm.opportunity.user.graph1</field>
-			<field name="model">crm.opportunity.report</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Opportunities by User and Section" type="pie">
-					<field name="state"/>
-					<field name="nbr" operator="+"/>
-				</graph>
-			</field>
-		</record>
-		<record model="ir.actions.act_window" id="act_my_leads">
-			<field name="res_model">crm.lead</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
+    <data>
+        <record model="board.note.type" id="note_crm_type">
+            <field name="name">CRM Configuration</field>
+        </record>
+        <record model="ir.ui.view" id="view_crm_opportunity_user_graph1">
+            <field name="name">crm.opportunity.user.graph1</field>
+            <field name="model">crm.opportunity.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Opportunities by User and Sales Team" type="pie">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="act_my_leads">
+            <field name="res_model">crm.lead</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
             <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
-		<record model="ir.actions.act_window" id="act_my_meetings">
-			<field name="res_model">crm.meeting</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
-		<act_window name="My Cases"
-				domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
-				res_model="crm.case"
-				view_type="form"
-				view_mode="tree,form"
-				id="act_my_cases"/>
-		<record model="ir.actions.act_window" id="act_my_leads_stage">
-			<field name="res_model">crm.lead.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_lead_stage_graph1"/>
+        </record>
+        <record model="ir.actions.act_window" id="act_my_meetings">
+            <field name="res_model">crm.meeting</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="crm.crm_case_tree_view_meet"/>
             <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
+        </record>
+        <act_window name="My Cases"
+                domain="[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]"
+                res_model="crm.case"
+                view_type="form"
+                view_mode="tree,form"
+                id="act_my_cases"/>
+        <record model="ir.actions.act_window" id="act_my_leads_stage">
+            <field name="res_model">crm.lead.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_lead_stage_graph1"/>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+        </record>
 
-		<record model="ir.actions.act_window" id="act_sales_pipeline">
-			<field name="res_model">crm.opportunity.report</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">graph,tree,form</field>
-			<field name="view_id" ref="view_crm_opportunity_user_graph1"/>
-			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
-		</record>
+        <record model="ir.actions.act_window" id="act_sales_pipeline">
+            <field name="res_model">crm.opportunity.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree,form</field>
+            <field name="view_id" ref="view_crm_opportunity_user_graph1"/>
+            <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+        </record>
 
-		<record model="ir.ui.view" id="board_crm_form">
-			<field name="name">CRM - Dashboard Form</field>
-			<field name="model">board.board</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Connecting Dashboard">
-					<hpaned>
+        <record model="ir.ui.view" id="board_crm_form">
+            <field name="name">CRM - Dashboard Form</field>
+            <field name="model">board.board</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Connecting Dashboard">
+                    <hpaned>
 
-						<child1>
+                        <child1>
 
-							<action
-								name="%(act_my_leads)d"
-								colspan="4"
-								height="150"
-								width="510"/>
+                            <action
+                                name="%(act_my_leads)d"
+                                colspan="4"
+                                height="150"
+                                width="510"/>
 
-							<action
-								string="My Meetings"
-								name="%(act_my_meetings)d"
-								height="150"
-								colspan="4"/>
+                            <action
+                                string="My Meetings"
+                                name="%(act_my_meetings)d"
+                                height="150"
+                                colspan="4"/>
 
-							<action
-								string="My Cases"
-								name="%(act_my_cases)d"
-								colspan="4"
-								height="200"/>
+                            <action
+                                string="My Cases"
+                                name="%(act_my_cases)d"
+                                colspan="4"
+                                height="200"/>
 
-						</child1>
+                        </child1>
 
-						<child2>
-							<action
+                        <child2>
+                            <action
                                 string="My Leads By Stage"
                                 name="%(act_my_leads_stage)d"
                                 colspan="4"/>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 9535992ab6a..2992959bdd0 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -9,7 +9,7 @@
         <field name="model">report.crm.case.section.categ2</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Cases by Section and Type">
+            <tree string="Cases by Team and Type">
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
@@ -31,7 +31,7 @@
         <field name="model">report.crm.case.section.categ2</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Cases by Section and Category2">
+            <form string="Cases by Team and Category2">
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
@@ -49,11 +49,11 @@
 <!--  Cases by section and category2 of case Graph View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_graph">
-        <field name="name">CRM Report - Sections and Type(Graph)</field>
+        <field name="name">CRM Report - Teams and Type(Graph)</field>
         <field name="model">report.crm.case.section.categ2</field>
         <field name="type">graph</field>
         <field name="arch" type="xml">
-            <graph string="Cases by Section and Type" type="bar" orientation="horizontal">
+            <graph string="Cases by Teams and Type" type="bar" orientation="horizontal">
                 <field name="category2_id"/>
                 <field name="amount_revenue" operator="+"/>
                 <field name="section_id" group="True"/>
@@ -64,18 +64,18 @@
 <!--  Cases by section and category2 of case Search View -->
 
     <record id="view_crm_case_section_categ_filter" model="ir.ui.view">
-            <field name="name">CRM Report - Sections and Type(Select)</field>
+            <field name="name">CRM Report - Teams and Type(Select)</field>
             <field name="model">report.crm.case.section.categ2</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Cases by Section and Type">
+                <search string="Cases by Team and Type">
                    <group col="10" colspan="4">
                            <filter string="This Year" icon="terp-hr"
                                domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Section and Type for this year" />
+                               help="Cases by Team and Type for this year" />
                            <filter string="This Month" icon="terp-hr"
                                domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Section and Type for this month" />
+                               help="Cases by Team and Type for this month" />
                            <separator orientation="vertical"/>
                            <field name="section_id"
                                select="1" widget="selection" />
@@ -99,11 +99,11 @@
 <!-- Cases by section and stage Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_stage_tree">
-        <field name="name">CRM Report - Sections and Stage(Tree)</field>
+        <field name="name">CRM Report - Teams and Stage(Tree)</field>
         <field name="model">report.crm.case.section.stage</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Cases by Section and Stage">
+            <tree string="Cases by Team and Stage">
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
@@ -120,11 +120,11 @@
 <!-- Cases by section and stage Form View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_stage_form">
-        <field name="name">CRM Report - Sections and Stage(Form)</field>
+        <field name="name">CRM Report - Teams and Stage(Form)</field>
         <field name="model">report.crm.case.section.stage</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Cases by Section and Stage">
+            <form string="Cases by Team and Stage">
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
@@ -141,11 +141,11 @@
 <!-- Cases by section and stage Graph View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_stage_graph">
-        <field name="name">CRM Report - Sections and Stage(Graph)</field>
+        <field name="name">CRM Report - Teams and Stage(Graph)</field>
         <field name="model">report.crm.case.section.stage</field>
         <field name="type">graph</field>
         <field name="arch" type="xml">
-            <graph string="Cases by Section and Stage" type="bar" orientation="horizontal">
+            <graph string="Cases by Team and Stage" type="bar" orientation="horizontal">
                 <field name="stage_id"/>
                 <field name="amount_revenue" operator="+"/>
                 <field name="section_id" group="True"/>
@@ -156,18 +156,18 @@
 <!-- Cases by section and stage Search View -->
 
     <record id="view_crm_case_section_stage_filter" model="ir.ui.view">
-            <field name="name">CRM Report - Sections and Stage(Select)</field>
+            <field name="name">CRM Report - Teams and Stage(Select)</field>
             <field name="model">report.crm.case.section.stage</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Cases by Section and Stage">
+                <search string="Cases by Team and Stage">
                    <group col="8" colspan="4">
                            <filter string="This Year" icon="terp-hr"
                                domain="[('name','=',time.localtime()[0])]"
-                               help="Cases by Section and Stage for this year" />
+                               help="Cases by Team and Stage for this year" />
                            <filter string="This Month" icon="terp-hr"
                                domain="[('month','=',time.localtime()[1])]"
-                               help="Cases by Section and Stage for this month" />
+                               help="Cases by Team and Stage for this month" />
                            <separator orientation="vertical"/>
                         <field name="section_id" select="1" widget="selection"/>
                         <field name="nbr" select="1"/>
@@ -189,11 +189,11 @@
 <!-- Cases by section, category and stage Tree View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree">
-        <field name="name">CRM Report - Section, Category and Stage(Tree)</field>
+        <field name="name">CRM Report - Team, Category and Stage(Tree)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Cases by Section, Category and Stage">
+            <tree string="Cases by Team, Category and Stage">
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
@@ -210,7 +210,7 @@
 <!-- Cases by section, category and stage Form View -->
 
     <record model="ir.ui.view" id="view_crm_case_section_categ_stage_form">
-        <field name="name">CRM Report - Section, Category and Stage(Form)</field>
+        <field name="name">CRM Report - Team, Category and Stage(Form)</field>
         <field name="model">report.crm.case.section.categ.stage</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml
index 52a41c11688..eb8d45137cf 100644
--- a/addons/event/event_sequence.xml
+++ b/addons/event/event_sequence.xml
@@ -2,20 +2,20 @@
 <openerp>
 <data>
 
-	#
-	# Sequences for crm.case.section
-	#
+    #
+    # Sequences for crm.case.section
+    #
 
-	<record model="ir.sequence.type" id="seq_section_code">
-		<field name="name">Section Code</field>
-		<field name="code">event.event</field>
-	</record>
-	<record model="ir.sequence" id="seq_section_code1">
-		<field name="name">Section Code</field>
-		<field name="code">event.event</field>
-		<field name="prefix">C/</field>
-		<field name="padding">3</field>
-	</record>
+    <record model="ir.sequence.type" id="seq_section_code">
+        <field name="name">Section Code</field>
+        <field name="code">event.event</field>
+    </record>
+    <record model="ir.sequence" id="seq_section_code1">
+        <field name="name">Section Code</field>
+        <field name="code">event.event</field>
+        <field name="prefix">C/</field>
+        <field name="padding">3</field>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index cd0d86457d9..412d4218df8 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -73,7 +73,7 @@ class hr_holidays_status(osv.osv):
         'name' : fields.char('Name', size=64, required=True, translate=True),
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
         'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
-        'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this team, the employees to take more leaves than the available ones.'),
         'active' : fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves' : fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken' : fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
@@ -200,7 +200,7 @@ class hr_holidays(osv.osv):
             if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink:
                 warning = {
                     'title': "Warning for ",
-                    'message': "You won\'t be able to cancel this leave request because the CRM Section of the leave type disallows."
+                    'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows."
                         }
         return {'warning': warning}
 
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 1b469b32d46..44f78fcdd55 100644
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -4,7 +4,6 @@
 
         <!--
             Process Node
-        -->
 
         <record id="process_node_crmquotation0" model="process.node">
             <field name="menu_id" ref="sale.menu_sale_order"/>
@@ -17,17 +16,6 @@
             <field eval="0" name="flow_start"/>
         </record>
 
-        <record id="process_node_crmopportunity0" model="process.node">
-            <field name="model_id" ref="crm.model_crm_case"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;CRM Opportunity&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The CRM Opportunity can lead to a quotation.&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="crm.process_process_contractprocess0"/>
-            <field name="process_id" ref="sale.process_process_salesprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
         <record id="process_node_contractanalytic0" model="process.node">
             <field name="menu_id" ref="account.account_analytic_def_account"/>
             <field name="model_id" ref="analytic.model_account_analytic_account"/>
@@ -49,9 +37,6 @@
         </record>
 
 
-        <!--
-            Process Transition
-        -->
 
         <record id="process_transition_crmopportunityquotation" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
@@ -90,5 +75,7 @@
             <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
+        -->
+
     </data>
 </openerp>
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index bb4c2ba18ea..613d8af7b7a 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -25,7 +25,7 @@ class sale_order(osv.osv):
     _inherit = 'sale.order'
     _description = 'Sale orders'
     _columns = {
-        'section_id': fields.many2one('crm.case.section', 'Section'),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
 
     def _get_section(self, cr, uid, context):
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index f8242c18fbb..a9b2e4b8134 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -38,7 +38,7 @@
                     <filter icon="terp-crm"
                             domain="[('section_id','=',context.get('section_id',False))]"
                             groups="base.group_extended"
-                            help="My section"/>
+                            help="My Sales Team"/>
                 </field>
             </field>
         </field>

From cf6db2b9936906bd1a82c1107a706849b0823dfc Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Thu, 13 May 2010 05:37:01 +0100
Subject: [PATCH 138/146] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100513043701-41cmj2olsqommizr
---
 addons/crm/i18n/pl.po                  |  56 +++---
 addons/hr/i18n/pl.po                   | 138 +++++++--------
 addons/hr_attendance/i18n/pl.po        | 100 +++++------
 addons/hr_holidays/i18n/pl.po          | 232 ++++++++++++-------------
 addons/hr_timesheet/i18n/pl.po         | 114 ++++++------
 addons/hr_timesheet_invoice/i18n/pl.po | 171 +++++++++---------
 addons/hr_timesheet_sheet/i18n/pl.po   | 198 ++++++++++-----------
 7 files changed, 509 insertions(+), 500 deletions(-)

diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index aa4282ecc39..33979fe06f8 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-04-12 19:39+0000\n"
-"Last-Translator: drygal <Unknown>\n"
+"PO-Revision-Date: 2010-05-12 20:13+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:02+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -307,7 +307,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exception Dates"
-msgstr ""
+msgstr "Daty wyjątków"
 
 #. module: crm
 #: selection:crm.case.rule,trg_date_type:0
@@ -365,12 +365,12 @@ msgstr "Potencjalny partner"
 #: view:crm.fundraising:0
 #: view:crm.opportunity:0
 msgid "Description Information"
-msgstr ""
+msgstr "Informacja opisowa"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Nazwa kontaktu"
 
 #. module: crm
 #: selection:crm.lead.opportunity_set,create_partner,action:0
@@ -391,12 +391,12 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: crm
 #: view:crm.job:0
 msgid "Next Interview"
-msgstr ""
+msgstr "Następna rozmowa kwalifikacyjna"
 
 #. module: crm
 #: field:crm.case.rule,regex_history:0
@@ -457,18 +457,18 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
 msgid "Dead"
-msgstr ""
+msgstr "Martwe"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm Meeting"
-msgstr ""
+msgstr "Potwierdź spotkanie"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_lead1
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Existing Customer"
-msgstr ""
+msgstr "Istniejący klient"
 
 #. module: crm
 #: model:crm.case.category2,name:crm.category_meet2
@@ -504,7 +504,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr ""
+msgstr "Prywatność"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -519,7 +519,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.opportunity:0
 msgid "Action Information"
-msgstr ""
+msgstr "Informacja o akcji"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -537,7 +537,7 @@ msgstr ""
 #. module: crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -572,12 +572,12 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Tree"
-msgstr ""
+msgstr "Drzewo spotkań"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -594,7 +594,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr ""
+msgstr "Wszystkie spotkania"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -613,7 +613,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -641,7 +641,7 @@ msgstr "Pozwól usuwać"
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor3
@@ -666,7 +666,7 @@ msgstr ""
 #. module: crm
 #: help:crm.case.section,calendar:0
 msgid "Allows to show calendar"
-msgstr ""
+msgstr "Pozwala pokazać kalendarz"
 
 #. module: crm
 #: view:crm.job:0
@@ -674,13 +674,13 @@ msgstr ""
 #: view:crm.opportunity:0
 #: view:crm.phonecall:0
 msgid "   Today   "
-msgstr ""
+msgstr "   Dzisiaj   "
 
 #. 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 "Opis rozmowy telefonicznej"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -714,7 +714,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Przypisano do"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -729,7 +729,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Praca - proces zatrudnienia"
 
 #. module: crm
 #: view:crm.case:0
@@ -745,7 +745,7 @@ msgstr ""
 #: selection:report.crm.case.section.categ2,month:0
 #: selection:report.crm.case.section.stage,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: crm
 #: view:crm.case:0
@@ -765,7 +765,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meetings Form"
-msgstr ""
+msgstr "Formularz spotkań"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_oppor5
@@ -812,7 +812,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_job5
 msgid "Contract Signed"
-msgstr ""
+msgstr "Umowę podpisano"
 
 #. module: crm
 #: wizard_view:caldav.crm.subscribe,init:0
@@ -873,7 +873,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.category2,name:crm.category_lead7
 msgid "Television"
-msgstr ""
+msgstr "Telewizja"
 
 #. module: crm
 #: view:crm.segmentation:0
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 2fd27f35df1..11884c53d2f 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -7,31 +7,31 @@ 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-11-09 17:36+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-12 20:04+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
-msgstr ""
+msgstr "Użytkownik OpenERP"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.edit_workgroup
 #: model:ir.ui.menu,name:hr.menu_edit_workgroup
 msgid "Working Time Categories"
-msgstr ""
+msgstr "Kategorie czasu pracy"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr ""
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych działów"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -42,7 +42,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:hr.module_meta_information
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "Zasoby ludzkie"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
@@ -57,7 +57,7 @@ msgstr "Nadrzędne"
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr
 #: view:hr.department:0
@@ -67,17 +67,17 @@ msgstr "Dział"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Contact  of employee"
-msgstr ""
+msgstr "Kontakt do pracownika"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work Email"
-msgstr ""
+msgstr "Służbowy e-mail"
 
 #. module: hr
 #: field:hr.timesheet.group,name:0
 msgid "Group name"
-msgstr ""
+msgstr "Nazwa grupy"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -93,7 +93,7 @@ msgstr "Piątek"
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "Dział nadrzędny"
 
 #. module: hr
 #: view:hr.department:0
@@ -105,22 +105,22 @@ msgstr "Uwagi"
 #. module: hr
 #: field:hr.timesheet,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Pracuje od"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "Hierarchia pracowników"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr "Ustawienia"
+msgstr "Konfiguracja"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Unmaried"
-msgstr ""
+msgstr "Wolny(a)"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -130,13 +130,13 @@ msgstr "Kobieta"
 #. module: hr
 #: view:hr.timesheet.group:0
 msgid "Working Time Category"
-msgstr ""
+msgstr "Kategoria czasu pracy"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
-msgstr ""
+msgstr "Struktura pracowników"
 
 #. module: hr
 #: view:hr.employee:0
@@ -151,12 +151,12 @@ msgstr "Telefon do pracy"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Kategorie podrzędne"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "Położenia biura"
 
 #. module: hr
 #: view:hr.employee:0
@@ -169,12 +169,12 @@ msgstr "Pracownik"
 #. module: hr
 #: field:hr.timesheet.group,manager:0
 msgid "Workgroup manager"
-msgstr ""
+msgstr "Kierownik grupy"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "Podlegli"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -194,7 +194,7 @@ msgstr ""
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
 msgid "Fill up contact information"
-msgstr ""
+msgstr "Wypełnij informacje o kontakcie"
 
 #. module: hr
 #: constraint:ir.ui.view:0
@@ -209,7 +209,7 @@ msgstr "Rozwiedziony"
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Kategoria nadrzędna"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
@@ -222,17 +222,17 @@ msgstr "Działy"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "Kontakt do pracownika"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Maried"
-msgstr ""
+msgstr "Żonaty (Zamężna)"
 
 #. module: hr
 #: field:hr.timesheet,tgroup_id:0
 msgid "Employee's timesheet group"
-msgstr ""
+msgstr "Grupa kart czasu pracy pracowników"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -242,18 +242,18 @@ msgstr "Mężczyzna"
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
 msgid "Create openerp user"
-msgstr ""
+msgstr "Utwórz użytkownika OpenERP"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "Kategoria pracownika"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Wtorek"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -269,63 +269,63 @@ msgstr ""
 #: field:hr.employee,category_id:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "Kategoria"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notatka"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "Informacje kontaktowe"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr ""
+msgstr "Stan"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Monday"
-msgstr ""
+msgstr "Poniedziałek"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr ""
+msgstr "Struktura kategorii"
 
 #. module: hr
 #: field:hr.timesheet,dayofweek:0
 msgid "Day of week"
-msgstr ""
+msgstr "Dzień tygodnia"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Birthday"
-msgstr ""
+msgstr "Data urodzenia"
 
 #. module: hr
 #: field:hr.employee,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktywny"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Błąd ! Nie mozesz tworzyć rekurencyjnych hierarchii pracowników"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract Process"
-msgstr ""
+msgstr "Proces umowy pracownika"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Create OpenERP User"
-msgstr ""
+msgstr "Utwórz użytkownika OpenERP"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
@@ -335,23 +335,23 @@ msgstr ""
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr ""
+msgstr "Firmy"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Środa"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr ""
+msgstr "Kategorie pracowników"
 
 #. module: hr
 #: field:hr.timesheet,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Data rozpoczęcia"
 
 #. module: hr
 #: field:res.users,parent_id:0
@@ -361,22 +361,22 @@ msgstr "Użytkownik nadrzędny"
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr ""
+msgstr "Adres do pracy"
 
 #. module: hr
 #: field:hr.employee,marital:0
 msgid "Marital Status"
-msgstr ""
+msgstr "Stan cywilny"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Pozycja karty czasu pracy"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr ""
+msgstr "Informacje osobiste"
 
 #. module: hr
 #: constraint:ir.model:0
@@ -391,42 +391,42 @@ msgstr ""
 #: field:hr.timesheet.group,timesheet_id:0
 #: model:ir.model,name:hr.model_hr_timesheet_group
 msgid "Working Time"
-msgstr ""
+msgstr "Czas pracy"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Thursday"
-msgstr ""
+msgstr "Czwartek"
 
 #. module: hr
 #: field:hr.timesheet,hour_to:0
 msgid "Work to"
-msgstr ""
+msgstr "Pracuje do"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Other"
-msgstr ""
+msgstr "Inny"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr ""
+msgstr "Kategorie pracowników"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Adres domowy"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr ""
+msgstr "dział"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Narodowość"
 
 #. module: hr
 #: field:hr.employee,otherid:0
@@ -436,59 +436,59 @@ msgstr ""
 #. module: hr
 #: field:hr.timesheet,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr ""
+msgstr "Płeć"
 
 #. module: hr
 #: view:hr.employee:0
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list
 msgid "Employees"
-msgstr ""
+msgstr "Pracownicy"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr ""
+msgstr "Nazwa departamentu"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "Działy podrzędne"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr ""
+msgstr "Informacja o pracy"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Fill up employee's contact information"
-msgstr ""
+msgstr "Wypełnij informacje kontaktowe pracownika"
 
 #. module: hr
 #: field:hr.department,manager_id:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Menedżer"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 msgid "All Employees"
-msgstr ""
+msgstr "Wszyscy pracownicy"
 
 #. module: hr
 #: selection:hr.timesheet,dayofweek:0
 msgid "Saturday"
-msgstr ""
+msgstr "Sobota"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_new
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_new
 msgid "New Employee"
-msgstr ""
+msgstr "Nowy pracownik"
diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po
index 70e11c4a599..9ff8dade21b 100644
--- a/addons/hr_attendance/i18n/pl.po
+++ b/addons/hr_attendance/i18n/pl.po
@@ -7,20 +7,20 @@ 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 15:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-12 19:58+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr "Frekwencja"
+msgstr "Obecności"
 
 #. module: hr_attendance
 #: constraint:ir.model:0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendances"
-msgstr ""
+msgstr "Obecności pracownika"
 
 #. module: hr_attendance
 #: constraint:ir.ui.view:0
@@ -77,28 +77,28 @@ msgstr "Opóźnienie"
 #: wizard_field:hr.si_so,si_ask_so,name:0
 #: wizard_field:hr.si_so,so_ask_si,name:0
 msgid "Employee's name"
-msgstr ""
+msgstr "Nazwisko pracownika"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,print:0
 #: wizard_button:hr.attendance.print_week,init,print:0
 msgid "Print Timesheet"
-msgstr ""
+msgstr "Drukuj kartę czasu pracy"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error
 msgid "Print Attendance Error Report"
-msgstr ""
+msgstr "Drukuj raport błędów obecności"
 
 #. module: hr_attendance
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_week
 msgid "Print Timesheet by week"
-msgstr ""
+msgstr "Drukuj kartę czasu pracy wg tygodni"
 
 #. module: hr_attendance
 #: field:hr.attendance,employee_id:0
@@ -109,12 +109,12 @@ msgstr "Pracownik"
 #: wizard_view:hr.attendance.print_week,init:0
 #: wizard_view:hr.attendance.report,init:0
 msgid "Select a time span"
-msgstr ""
+msgstr "Wybierz odstęp czasu"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Recorded"
-msgstr ""
+msgstr "Data zapisu"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -131,22 +131,22 @@ msgstr ""
 #: field:hr.attendance,action_desc:0
 #: model:ir.model,name:hr_attendance.model_hr_action_reason
 msgid "Action reason"
-msgstr ""
+msgstr "Powód akcji"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzec"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,so_ask_si,last_time:0
@@ -156,12 +156,12 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 #. module: hr_attendance
 #: model:ir.actions.wizard,name:hr_attendance.print_month
 msgid "Print Timesheet by month"
-msgstr ""
+msgstr "Drukuj kartę czasu pracy wg miesięcy"
 
 #. module: hr_attendance
 #: selection:hr.attendance,action:0
@@ -172,7 +172,7 @@ msgstr "Wyloguj się"
 #. module: hr_attendance
 #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information
 msgid "Attendances Of Employees"
-msgstr ""
+msgstr "Obecności pracowników"
 
 #. module: hr_attendance
 #: field:hr.action.reason,name:0
@@ -187,17 +187,17 @@ msgstr ""
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Date Signed"
-msgstr ""
+msgstr "Data podpisu"
 
 #. module: hr_attendance
 #: field:hr.attendance,name:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,si_ask_so:0
@@ -209,33 +209,33 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr ""
+msgstr "Powody obecności"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_week,init,init_date:0
 #: wizard_field:hr.attendance.report,init,init_date:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data rozpoczęcia"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Present"
-msgstr ""
+msgstr "Obecny(a)"
 
 #. module: hr_attendance
 #: selection:hr.employee,state:0
 msgid "Absent"
-msgstr ""
+msgstr "Nieobecny(a)"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: hr_attendance
 #: wizard_field:hr.si_so,si_ask_so,last_time:0
@@ -250,19 +250,19 @@ msgstr ""
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
 msgid "Action's type"
-msgstr ""
+msgstr "Typ akcji"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr ""
+msgstr "Definiuj powody obecności"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
 #: wizard_button:hr.si_so,init,si_test:0
 #: wizard_button:hr.si_so,si_ask_so,si:0
 msgid "Sign in"
-msgstr ""
+msgstr "Zaloguj się"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
@@ -272,29 +272,29 @@ msgstr ""
 #. module: hr_attendance
 #: wizard_field:hr.si_so,init,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Bieżący stan"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
 msgid "Attendances"
-msgstr ""
+msgstr "Obecności"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Attendance Errors"
-msgstr ""
+msgstr "Błąd obecności"
 
 #. module: hr_attendance
 #: field:hr.attendance,action:0
@@ -305,18 +305,18 @@ msgstr "Akcja"
 #. module: hr_attendance
 #: wizard_button:hr.attendance.report,init,print:0
 msgid "Print Attendance Report"
-msgstr ""
+msgstr "Drukuj raport obecności"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
 msgid "Attendance Reasons"
-msgstr ""
+msgstr "Powód obecności"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.report,init:0
@@ -331,13 +331,13 @@ msgstr ""
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_week,init:0
 msgid "Select a starting and a end date"
-msgstr ""
+msgstr "Wybierz datę rozpoczęcia i zakończenia"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_week,init,end_date:0
 #: wizard_field:hr.attendance.report,init,end_date:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data końcowa"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,so_ask_si:0
@@ -349,32 +349,32 @@ msgstr ""
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "Employee attendance"
-msgstr ""
+msgstr "Obecności pracownika"
 
 #. module: hr_attendance
 #: wizard_view:hr.attendance.print_month,init:0
 msgid "Select a month"
-msgstr ""
+msgstr "Wybierz miesiąc"
 
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,month:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: hr_attendance
 #: model:ir.module.module,description:hr_attendance.module_meta_information
 msgid "This module aims to manage employee's attendances."
-msgstr ""
+msgstr "Ten moduł służy do kontroli obecności"
 
 #. module: hr_attendance
 #: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
@@ -384,7 +384,7 @@ msgstr ""
 #. module: hr_attendance
 #: wizard_field:hr.attendance.print_month,init,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: hr_attendance
 #: wizard_button:hr.attendance.print_month,init,end:0
@@ -394,9 +394,9 @@ msgstr ""
 #: wizard_button:hr.si_so,si_ask_so,end:0
 #: wizard_button:hr.si_so,so_ask_si,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
 msgid "Operation"
-msgstr ""
+msgstr "Operacja"
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index 19df489b338..792a2db7db6 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -7,71 +7,71 @@ 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: 2009-11-09 13:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-12 20:13+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "New Holidays Request"
-msgstr ""
+msgstr "Nowy wniosek o urlop"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
 msgid "All Holidays Requests"
-msgstr ""
+msgstr "Wszystkie wnioski o urlop"
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr ""
+msgstr "Pozostało dni wolnych"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
 msgid "Requests Awaiting for Validation"
-msgstr ""
+msgstr "Wnioski oczekujące na zatwierdzenie"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Blue"
-msgstr ""
+msgstr "Jasnoniebieski"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr ""
+msgstr "Brązowy"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "of the"
-msgstr ""
+msgstr "z"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Off-Days' Summary"
-msgstr ""
+msgstr "Suma dni wolnych"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
 msgid "Employee Holidays"
-msgstr ""
+msgstr "Urlopy pracownika"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Ustaw na projekt"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
@@ -79,54 +79,54 @@ msgstr ""
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidays0
 msgid "Holidays"
-msgstr ""
+msgstr "Dni wolne od pracy"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "to"
-msgstr ""
+msgstr "do"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
-msgstr ""
+msgstr "Jasnoseledynowy"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Green"
-msgstr ""
+msgstr "Jasnozielony"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
 msgid "Employee Declaration"
-msgstr ""
+msgstr "Deklaracja pracownika"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 #: model:process.transition.action,name:hr_holidays.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "Zatwierdź"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
 msgid "Refused Request"
-msgstr ""
+msgstr "Wniosek odrzucony"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_approved0
 msgid "Approved"
-msgstr "Zatwierdzone"
+msgstr "Zaaprobowane"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Both"
-msgstr ""
+msgstr "Oba"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
-msgstr ""
+msgstr "Odmów"
 
 #. module: hr_holidays
 #: wizard_button:hr.holidays.summary,notify,end:0
@@ -137,65 +137,65 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
 msgid "My Holidays Requests"
-msgstr ""
+msgstr "Moje wnioski o urlop"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
 #: field:hr.holidays.per.user,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Uwagi"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status:0
 #: field:hr.holidays.log,holiday_status:0
 #: field:hr.holidays.per.user,holiday_status:0
 msgid "Holiday's Status"
-msgstr ""
+msgstr "Stan dni wolnych"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
 msgid "Request is refused."
-msgstr ""
+msgstr "Wniosek został odrzucony"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Holidays Management"
-msgstr ""
+msgstr "Urlopy"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "Analyze from"
-msgstr ""
+msgstr "Analizuj od"
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Holidays"
-msgstr ""
+msgstr "Podsumowanie urlopów"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_calendar0
 msgid "The holiday is set in the calendar"
-msgstr ""
+msgstr "Urlop został ustawiony w kalendarzu"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Holiday status"
-msgstr ""
+msgstr "Stan urlopu"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Holidays Status"
-msgstr ""
+msgstr "Stany urlopów"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "Vacation end day"
-msgstr ""
+msgstr "Ostatni dzień urlopu"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "Holidays Allowed"
-msgstr ""
+msgstr "Dozwolone urlopy"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_legaldeclaration0
@@ -205,29 +205,29 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Magenta"
-msgstr ""
+msgstr "Purpurowy"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
 msgid "Holidays Per User"
-msgstr ""
+msgstr "Urlopy na użytkownika"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Define holiday status"
-msgstr ""
+msgstr "Zdefiniuj stan urlopu"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potwierdzone"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,date_from:0
 #: wizard_field:hr.holidays.summary.employee,init,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -239,7 +239,7 @@ msgstr "Potwierdź"
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
 msgid "My Awaiting Confirmation Holidays Requests"
-msgstr ""
+msgstr "Moje wnioski o urlop oczekujące na potwierdzenie"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -249,24 +249,24 @@ msgstr ""
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
 msgid "Encoding of annual available holidays."
-msgstr ""
+msgstr "Wprowadzanie urlopów przysługujących w roku"
 
 #. module: hr_holidays
 #: field:hr.holidays,employee_id:0
 #: field:hr.holidays.log,employee_id:0
 #: field:hr.holidays.per.user,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Pracownik"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Validation"
-msgstr ""
+msgstr "Oczekujące na zatwierdzenie"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
 msgid "Employee get holidays"
-msgstr ""
+msgstr "Pracownik dostaje urlop"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -276,36 +276,36 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr ""
+msgstr "Pszenny"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,nb_holidays:0
 msgid "Number of Holidays Requested"
-msgstr ""
+msgstr "Liczba wnioskowanych dni urlopu"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 msgid "My Holiday Requests"
-msgstr ""
+msgstr "Moje wnioski o urlop"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: view:hr.holidays.per.user:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Liczba dni"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,name:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Holiday Status"
-msgstr ""
+msgstr "Stan urlopu"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,init:0
 #: wizard_view:hr.holidays.summary.employee,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Opcje raportu"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
@@ -315,7 +315,7 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_approved0
 msgid "His manager approves the request"
-msgstr ""
+msgstr "Jego zwierzchnik zaaprobował wniosek"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
@@ -325,7 +325,7 @@ msgstr ""
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "You have to select at least 1 Employee. Try again."
-msgstr ""
+msgstr "Musisz wybrać co najmniej jednego pracownika. Spróbuj ponownie."
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
@@ -335,24 +335,24 @@ msgstr ""
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary.employee,init,emp:0
 msgid "Employee(s)"
-msgstr ""
+msgstr "Pracowników"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days:0
 msgid "Number of Days in this Holiday Request"
-msgstr ""
+msgstr "Liczba wnioskowanych dni urlopu"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
 #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
 msgid "Holidays Per Employee"
-msgstr ""
+msgstr "Urlopy wg pracowników"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to override Limit"
-msgstr ""
+msgstr "Pozwól przekroczyć limit"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_user_id:0
@@ -362,7 +362,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
-msgstr ""
+msgstr "Lawendowy"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_log
@@ -372,17 +372,17 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
 msgid "Print Summary of Employee's Holidays"
-msgstr ""
+msgstr "Drukuj podsumowanie urlopów"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_calendar0
 msgid "Calendar"
-msgstr ""
+msgstr "Kalendarz"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Vacation start day"
-msgstr ""
+msgstr "Dzień rozpoczęcia urlopu"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -425,88 +425,88 @@ msgstr ""
 #: wizard_view:hr.holidays.summary,notify:0
 #: wizard_view:hr.holidays.summary.employee,notify:0
 msgid "Notification"
-msgstr ""
+msgstr "Powiadomienie"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidaysrequest0
 msgid "Employee fills in a request for holidays"
-msgstr ""
+msgstr "Pracownik wypełnia wniosek o urlop"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_setholiday0
 msgid "Holiday is set in the calendar."
-msgstr ""
+msgstr "Urlop został ustawiony w kalendarzu"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
-msgstr ""
+msgstr "Jasny koralowy"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
 msgid "My Available Holidays"
-msgstr ""
+msgstr "Moje przysługujące urlopy"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Black"
-msgstr ""
+msgstr "Czarny"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
 msgid "My Refused Holidays Requests"
-msgstr ""
+msgstr "Moje odrzucone wnioski o urlop"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_setholiday0
 msgid "Set Holiday"
-msgstr ""
+msgstr "Ustaw urlop"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
 msgid "My Draft Holidays Requests"
-msgstr ""
+msgstr "Moje projekty wniosków urlopowych"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,max_leaves:0
 msgid "Maximum Leaves Allowed"
-msgstr ""
+msgstr "Maksymalna liczba dni urlopowych"
 
 #. module: hr_holidays
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stan"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Ivory"
-msgstr ""
+msgstr "Kość słoniowa"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
 msgid "My Holidays Request"
-msgstr ""
+msgstr "Moje wnioski urlopowe"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color of the status"
-msgstr ""
+msgstr "Kolor stanu"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary,init,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr ""
+msgstr "Zarówno potwierdzone jak i zatwierdzone"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr ""
+msgstr "Wykorzystane nieobecności"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "holidays."
-msgstr ""
+msgstr "urlopy."
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -516,68 +516,68 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.per.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
 msgid "Document for employee"
-msgstr ""
+msgstr "Dokument dla pracownika"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_holidays
 #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
 msgid "Reufse"
-msgstr ""
+msgstr "Odmów"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Sekcja"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "Holiday manager"
-msgstr ""
+msgstr "Menedżer urlopów"
 
 #. module: hr_holidays
 #: field:hr.holidays.per.user,active:0
 #: field:hr.holidays.status,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktywny"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
 msgid "My Holidays Request Draft"
-msgstr ""
+msgstr "Moje projekty wniosków urlopowych"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
 msgid "Approved Request"
-msgstr ""
+msgstr "Zaaprobowane wnioski."
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysrequest0
 msgid "Holidays Request"
-msgstr ""
+msgstr "Wnioski urlopowe."
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
 msgid "Holidays Requests Awaiting for Validation"
-msgstr ""
+msgstr "Wnioski urlopowe oczekujące na zatwierdzenie"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "General"
-msgstr ""
+msgstr "Ogólne"
 
 #. module: hr_holidays
 #: view:hr.holidays.per.user:0
 msgid "General Information"
-msgstr ""
+msgstr "Informacje ogólne"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -585,7 +585,7 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,end:0
 #: wizard_button:hr.holidays.summary.employee,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: hr_holidays
 #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
@@ -596,12 +596,12 @@ msgstr ""
 #: selection:hr.holidays.summary,init,holiday_type:0
 #: selection:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Validated"
-msgstr ""
+msgstr "Zatwierdzony"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
 msgid "My Holidays Request Refused"
-msgstr ""
+msgstr "Moje odrzucone wnioski o urlop"
 
 #. module: hr_holidays
 #: constraint:ir.model:0
@@ -615,60 +615,60 @@ msgstr ""
 #: wizard_button:hr.holidays.summary,init,checkdept:0
 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0
 msgid "Print"
-msgstr ""
+msgstr "Drukuj"
 
 #. module: hr_holidays
 #: model:ir.actions.wizard,name:hr_holidays.holidays_summary
 #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
 msgid "Print Summary of Holidays"
-msgstr ""
+msgstr "Drukuj podsumowanie urlopów"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,depts:0
 msgid "Department(s)"
-msgstr ""
+msgstr "Dział(y)"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 #: model:process.node,name:hr_holidays.process_node_refused0
 msgid "Refused"
-msgstr ""
+msgstr "Odrzucone"
 
 #. module: hr_holidays
 #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
 msgid "Request is approved."
-msgstr ""
+msgstr "Wniosek aprobowano."
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
 msgid "Holidays Definition"
-msgstr ""
+msgstr "Definicje urlopów"
 
 #. module: hr_holidays
 #: wizard_field:hr.holidays.summary,init,holiday_type:0
 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
 msgid "Select Holiday Type"
-msgstr ""
+msgstr "Wybierz typ urlopu"
 
 #. module: hr_holidays
 #: field:hr.holidays,case_id:0
 msgid "Case"
-msgstr ""
+msgstr "Przypadek"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_user_id:0
 msgid "Holiday per user"
-msgstr ""
+msgstr "Urlopy na użytkownika"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_holidays0
 msgid "Encode number of available holidays"
-msgstr ""
+msgstr "Wprowadź liczbę przysługujących dni urlopu"
 
 #. module: hr_holidays
 #: model:process.node,name:hr_holidays.process_node_legaldeclaration0
@@ -678,49 +678,49 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Violet"
-msgstr ""
+msgstr "Fioletowy"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Red"
-msgstr ""
+msgstr "Czerwony"
 
 #. module: hr_holidays
 #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
 msgid "Human Resources: Holidays management"
-msgstr ""
+msgstr "Zasoby ludzkie: zarządzanie urlopami"
 
 #. module: hr_holidays
 #: model:process.process,name:hr_holidays.process_process_holidaysprocess0
 msgid "Holidays Process"
-msgstr ""
+msgstr "Proces urlopów"
 
 #. module: hr_holidays
 #: wizard_view:hr.holidays.summary,notify:0
 msgid "You have to select at least 1 Department. Try again."
-msgstr ""
+msgstr "Musisz wybrac co najmniej jeden dział. Spróbuj ponownie."
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
 msgid "My Holidays Request Validated"
-msgstr ""
+msgstr "Moje zatwierdzone wnioski urlopowe"
 
 #. module: hr_holidays
 #: field:hr.holidays.log,holiday_req_id:0
 msgid "Holiday Request ID"
-msgstr ""
+msgstr "ID wniosku urlopowego"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Yellow"
-msgstr ""
+msgstr "Jasnożółty"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Pink"
-msgstr ""
+msgstr "Jasnoróżowy"
 
 #. module: hr_holidays
 #: model:process.node,note:hr_holidays.process_node_refused0
 msgid "His manager refuses the request"
-msgstr ""
+msgstr "Jego (Jej) zwierzchnik odrzucił wniosek"
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index 25e13552267..8cec04074d3 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-12 20:02+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet,init:0
 #: wizard_view:hr.analytical.timesheet.my,init:0
 msgid "Choose your month"
-msgstr ""
+msgstr "Wybierz miesiąc"
 
 #. module: hr_timesheet
 #: constraint:ir.model:0
@@ -33,7 +33,7 @@ msgstr ""
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr ""
+msgstr "Karta czasu pracy pracownika"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.si_so
@@ -44,18 +44,18 @@ msgstr ""
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0
 msgid "Stop Working"
-msgstr ""
+msgstr "Skończ pracę"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "(Keep empty for current_time)"
-msgstr ""
+msgstr "(Zostaw puste dla bieżącego czasu)"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
@@ -65,24 +65,24 @@ msgstr ""
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(Pozostaw puste dla bieżącego czasu)"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_out,server_date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Bieżąca data"
 
 #. module: hr_timesheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,report:0
 #: wizard_button:hr.analytical.timesheet.my,init,report:0
 #: wizard_button:hr.analytical.timesheet_users,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Drukuj"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0
@@ -92,18 +92,18 @@ msgstr ""
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,server_date:0
 msgid "Current Server Date"
-msgstr ""
+msgstr "Bieżąca data na serwerze"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date_start:0
 #: wizard_field:hr_timesheet.si_so,sign_out,date:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data rozpoczęcia"
 
 #. module: hr_timesheet
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -115,18 +115,18 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Dziennik analityczny"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Godzina"
 
 #. module: hr_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet
 msgid "Employee Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy pracownika"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -138,17 +138,17 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form
 msgid "Working Hours"
-msgstr ""
+msgstr "Godziny pracy"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Pozycje karty czasu pracy"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr ""
+msgstr "Całkowity czas"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -162,7 +162,7 @@ msgstr ""
 #: xsl:hr.analytical.timesheet_users:0
 #: model:ir.ui.menu,name:hr_timesheet.next_id_48
 msgid "Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -188,7 +188,7 @@ msgstr ""
 #: wizard_field:hr.analytical.timesheet,init,user_id:0
 #: wizard_field:hr.analytical.timesheet.my,init,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -199,27 +199,27 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form
 msgid "Working Hours of The Day"
-msgstr ""
+msgstr "Godziny robocze dnia"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
 msgid "(local time on the server side)"
-msgstr ""
+msgstr "(czas lokalny na serwerze)"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total cost"
-msgstr ""
+msgstr "Suma kasztów"
 
 #. module: hr_timesheet
 #: model:product.uom,name:hr_timesheet.uom_day
 msgid "Day"
-msgstr ""
+msgstr "Dzień"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,date:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Data zamknięcia"
 
 #. module: hr_timesheet
 #: constraint:ir.ui.view:0
@@ -236,17 +236,17 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic line"
-msgstr ""
+msgstr "Pozycja analityczna"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Błąd: JS musi być innej kategorii niż JM."
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet_users,init:0
 msgid "Choose Users"
-msgstr ""
+msgstr "Wybierz użytkowników"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -263,18 +263,18 @@ msgstr ""
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "Praca wykonana w ostatnim okresie"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr ""
+msgstr "Kluczowe daty"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,state:0
 #: wizard_field:hr_timesheet.si_so,sign_out,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Bieżący stan"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -298,13 +298,13 @@ msgstr ""
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,info:0
 msgid "Work Description"
-msgstr ""
+msgstr "Opis pracy"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,name:0
 #: wizard_field:hr_timesheet.si_so,sign_out,name:0
 msgid "Employee's name"
-msgstr ""
+msgstr "Nazwisko pracownika"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
@@ -315,23 +315,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form
 msgid "My Working Hours"
-msgstr ""
+msgstr "Moje godziny robocze"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet line"
-msgstr ""
+msgstr "Pozycja karty czasu pracy"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
 msgid "Sum"
-msgstr ""
+msgstr "Suma"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my
 #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my
 msgid "My Working Hours of The Day"
-msgstr ""
+msgstr "Moje godziny robocze w dniu"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
@@ -349,7 +349,7 @@ msgstr ""
 #: xsl:hr.analytical.timesheet:0
 #: xsl:hr.analytical.timesheet_users:0
 msgid "Total"
-msgstr ""
+msgstr "Suma"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -361,12 +361,12 @@ msgstr ""
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0
 msgid "Start Working"
-msgstr ""
+msgstr "Rozpocznij pracę"
 
 #. module: hr_timesheet
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
 msgid "Change Work"
-msgstr ""
+msgstr "Zmień pracę"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -386,27 +386,27 @@ msgstr ""
 #: wizard_field:hr.analytical.timesheet.my,init,month:0
 #: wizard_field:hr.analytical.timesheet_users,init,month:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: hr_timesheet
 #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analityczne"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_in:0
 msgid "General Information"
-msgstr ""
+msgstr "Informacje ogólne"
 
 #. module: hr_timesheet
 #: model:process.process,name:hr_timesheet.process_process_timesheetprocess0
 msgid "Timesheet Process"
-msgstr ""
+msgstr "Proces karty czasu pracy"
 
 #. module: hr_timesheet
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Błąd: Niedozwolony kod EAN"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -416,19 +416,19 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Pozycja karty czasu pracy"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis summary"
-msgstr ""
+msgstr "Podsumowanie analizy"
 
 #. module: hr_timesheet
 #: wizard_field:hr.analytical.timesheet,init,year:0
 #: wizard_field:hr.analytical.timesheet.my,init,year:0
 #: wizard_field:hr.analytical.timesheet_users,init,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: hr_timesheet
 #: wizard_button:hr.analytical.timesheet,init,end:0
@@ -437,30 +437,30 @@ msgstr ""
 #: wizard_button:hr_timesheet.si_so,sign_in,end:0
 #: wizard_button:hr_timesheet.si_so,sign_out,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 #: wizard_field:hr.analytical.timesheet_users,init,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
 
 #. module: hr_timesheet
 #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Czas pracy"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "To be invoiced"
-msgstr ""
+msgstr "Do zafakturowania"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr ""
+msgstr "Karty czasu pracy pracowników"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet,init,month:0
@@ -472,4 +472,4 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Karty czasu pracy"
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 03cc490b8ca..3d50077a2ef 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -7,49 +7,49 @@ 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-08 16:18+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-12 20:08+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Type of invoicing"
-msgstr ""
+msgstr "Typ fakturowania"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Profit"
-msgstr ""
+msgstr "Zysk"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Force to use a specific product"
-msgstr ""
+msgstr "Wymuś stosowanie konkretnego produktu"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Income"
-msgstr ""
+msgstr "Przychód"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Visible name"
-msgstr ""
+msgstr "Nazwa widoczna"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "Początek okresu"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,price:0
@@ -57,33 +57,35 @@ msgid ""
 "The cost of each work done will be displayed on the invoice. You probably "
 "don't want to check this."
 msgstr ""
+"Koszt każdej wykonanej pracy będzie widoczny na fakturze. Prawdopodobnie nie "
+"chcesz tego zaznaczyć."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
 msgid "Invoice analytic lines"
-msgstr ""
+msgstr "Analityczne pozycje faktury"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,time:0
 msgid "Display time in the history of works"
-msgstr ""
+msgstr "Wyświetlaj czas w historii prac"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_draft_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts
 msgid "Draft Analytic Accounts"
-msgstr ""
+msgstr "Projekt kont analitycznych"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,time:0
 #: wizard_field:hr.timesheet.invoice.create,init,time:0
 msgid "Time spent"
-msgstr ""
+msgstr "Spędzony czas"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Kwota zafakturowana"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
@@ -92,106 +94,109 @@ msgid ""
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
 msgstr ""
+"Zaznacz to pole, jeśli planujesz automatyczną generację faktur na podstawie "
+"kosztów z konta analitycznego: kart czasu pracy, wydatków,,,. Możesz "
+"skonfigurować współczynnik automatycznych faktur wg kont analitycznych."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,name:0
 msgid "The detail of each work done will be displayed on the invoice"
-msgstr ""
+msgstr "Szczegóły każdej wykonanej pracy będą widoczne w fakturze"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Wybierz okres"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period to enddate"
-msgstr ""
+msgstr "Okres do daty końcowej"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:hr.timesheet.invoice.create,init,create:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Utwórz faktury"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Period from startdate"
-msgstr ""
+msgstr "Okres od daty rozpoczęcia"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,time:0
 msgid "The time of each work done will be displayed on the invoice"
-msgstr ""
+msgstr "Czas każdej wykonanej pracy będzie widoczny w fakturze"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,balance_product:0
 msgid "Balance product"
-msgstr ""
+msgstr "Saldo produktu"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_final_invoice_create
 msgid "Final Invoice"
-msgstr ""
+msgstr "Faktura końcowa"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.final.invoice.create,init:0
 msgid "Do you want details for each line of the invoices ?"
-msgstr ""
+msgstr "Czy chcesz szczegóły dla każdej pozycji faktury?"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Data lub kod"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
 msgid "Entries to invoice"
-msgstr ""
+msgstr "Zapisy do zafakturowania"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:account.analytic.profit,init:0
 msgid "Choose"
-msgstr ""
+msgstr "Wybierz"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Debit"
-msgstr ""
+msgstr "Winien"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:account.analytic.profit,init,report:0
 #: wizard_button:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Drukuj"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_analytic_accounts
 msgid "Open Analytic Accounts"
-msgstr ""
+msgstr "Otwórz konta analityczne"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Filter on Accounts"
-msgstr ""
+msgstr "Filtruj wg kont"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_profit
 #: model:ir.ui.menu,name:hr_timesheet_invoice.print_account_analytic_profit
 msgid "Timesheet Profit"
-msgstr ""
+msgstr "Zysk karty czasu pracy"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "Cennik sprzedaży"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,name:0
 msgid "Display detail of work in the invoice line."
-msgstr ""
+msgstr "Wyświetl szczegóły pracy w pozycjach faktury."
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -201,7 +206,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Data druku"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.ui.view:0
@@ -212,34 +217,34 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
 #: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
 msgid "Types of Invoicing"
-msgstr ""
+msgstr "Typy fakturowań"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Theorical"
-msgstr ""
+msgstr "Teoretyczny"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my
 msgid "My Uninvoiced Entries"
-msgstr ""
+msgstr "Moje niezafakturowane zapisy"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,name:0
 #: wizard_field:hr.timesheet.invoice.create,init,name:0
 msgid "Name of entry"
-msgstr ""
+msgstr "Nazwa zapisu"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Employee or Journal Name"
-msgstr ""
+msgstr "Pracownik lub nazwa dziennika"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Currency"
-msgstr ""
+msgstr "Waluta"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,product:0
@@ -247,75 +252,77 @@ msgid ""
 "Complete this field only if you want to force to use a specific product. "
 "Keep empty to use the real product that comes from the cost."
 msgstr ""
+"Wypełnij to pole, jeśli chcesz wymusić stosowanie konkretnego produktu. "
+"Pozostaw puste, by stosować pierwotny produkt pochodzący z kosztu."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced
 msgid "Uninvoiced Entries"
-msgstr ""
+msgstr "Niezafakturowane zapisy."
 
 #. module: hr_timesheet_invoice
 #: wizard_button:hr.timesheet.final.invoice.create,init,create:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Utwórz faktury"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.final.invoice.create,init:0
 msgid "Invoice Balance amount"
-msgstr ""
+msgstr "Kwota salda faktury"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Invoice rate by user"
-msgstr ""
+msgstr "Kurs faktury wg użytkownika"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
 msgid "Total invoiced"
-msgstr ""
+msgstr "Suma zafakturowana"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Stan"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Okres do"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,balance_product:0
 msgid "The product that will be used to invoice the remaining amount."
-msgstr ""
+msgstr "Produkt, który będzie zastosowany do fakturowania pozostałej kwoty."
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Rejestr kosztów"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,date:0
 msgid "Display date in the history of works"
-msgstr ""
+msgstr "Wyświetl daty w historii prac"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.final.invoice.create,init,date:0
 #: wizard_field:hr.timesheet.invoice.create,init,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,factor:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Upust (%)"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -325,62 +332,62 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,accounts:0
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Konta analityczne"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Total:"
-msgstr ""
+msgstr "Suma:"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Credit"
-msgstr ""
+msgstr "Ma"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0
 msgid "End of period"
-msgstr ""
+msgstr "Koniec okresu"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,to_invoice:0
 msgid "Reinvoice Costs"
-msgstr ""
+msgstr "Refakturuj koszty"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Totals:"
-msgstr ""
+msgstr "Sumy:"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,date_to:0
 msgid "To"
-msgstr ""
+msgstr "Do"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Do you want to show details of work in invoice ?"
-msgstr ""
+msgstr "Czy chcesz pokazać szczegóły pracy w fakturze ?"
 
 #. module: hr_timesheet_invoice
 #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Okres od"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,amount_max:0
 msgid "Max. Invoice Price"
-msgstr ""
+msgstr "Maks. cena faktury"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: hr_timesheet_invoice
 #: wizard_button:account.analytic.profit,init,end:0
@@ -388,7 +395,7 @@ msgstr ""
 #: wizard_button:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,end:0
 #: wizard_button:hr.timesheet.invoice.create,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.model:0
@@ -401,27 +408,27 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,employee_ids:0
 msgid "Employee"
-msgstr ""
+msgstr "Pracownik"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,date:0
 msgid "The real date of each work will be displayed on the invoice"
-msgstr ""
+msgstr "Rzeczywista data każdej pracy będzie widoczna w fakturze"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.final.invoice.create,init,price:0
 msgid "Display cost of the item you reinvoice"
-msgstr ""
+msgstr "Wyświetl koszt elementu, który refakturujesz"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Choose accounts you want to invoice"
-msgstr ""
+msgstr "Wybierz konta do fakturowania"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:hr.timesheet.invoice.create,init,product:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -431,17 +438,17 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,name:0
 msgid "Internal name"
-msgstr ""
+msgstr "Nazwa wewnętrzna"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,journal_ids:0
 msgid "Journal"
-msgstr ""
+msgstr "Dziennik"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 msgid "Units"
-msgstr ""
+msgstr "Jednostki"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@@ -452,38 +459,38 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_pending_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_pending_analytic_accounts
 msgid "Pending Analytic Accounts"
-msgstr ""
+msgstr "Oczekujące konta analityczne"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 #: wizard_view:hr.timesheet.invoice.create,init:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dane fakturowane"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
 msgid "Invoice rate"
-msgstr ""
+msgstr "Współczynnik fakturowania"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Types of invoicing"
-msgstr ""
+msgstr "Typy fakturowań"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturowanie"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
 #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_invoice_analytic_accounts
 msgid "Unclosed Invoiceable Accounts"
-msgstr ""
+msgstr "Nie zamknięte konta fakturowalne"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
 #: wizard_field:hr.timesheet.final.invoice.create,init,price:0
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
-msgstr ""
+msgstr "Koszt"
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 8df3f40f7de..794f74a1fa4 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.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: 2009-09-16 16:02+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-05-12 20:09+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-04-17 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -27,6 +27,8 @@ msgid ""
 "You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Nie możesz mieć dwóch kart czasu pracy nachodzących na siebie !\n"
+"Stosuj menu 'Moje bieżące karty czasu pracy', żeby nie mieć tego problemu."
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -34,40 +36,40 @@ msgstr ""
 #: field:hr_timesheet_sheet.sheet.account,sheet_id:0
 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0
 msgid "Sheet"
-msgstr ""
+msgstr "Karta"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendance"
-msgstr ""
+msgstr "Suma obecności"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm
 msgid "My timesheets to confirm"
-msgstr ""
+msgstr "Moje karty czasu pracy do zatwierdzenia"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timeshet range"
-msgstr ""
+msgstr "Zakres karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Today"
-msgstr ""
+msgstr "Dziś"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
 msgid "Confirm timesheet sheet"
-msgstr ""
+msgstr "Potwierdź kartę czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -75,12 +77,12 @@ msgstr ""
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Ustaw na projekt"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
@@ -90,28 +92,28 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet sheet"
-msgstr ""
+msgstr "Projekt zestawień kart czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "Moja bieżąca karta czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
 msgid "Validate"
-msgstr ""
+msgstr "Zatwierdź"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Day"
-msgstr ""
+msgstr "Dzień"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr ""
+msgstr "Obecny(a)"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -122,17 +124,17 @@ msgstr "Odmów"
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated Timesheet"
-msgstr ""
+msgstr "Zatwierdzona karta czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date wich is in the timesheet dates !"
-msgstr ""
+msgstr "Musisz wybrac datę bieżącą, która jest w karcie czasu pracy !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr ""
+msgstr "Suma różnic"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
@@ -142,12 +144,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Day"
-msgstr ""
+msgstr "Karta czasu pracy wg dni"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Defines the task work entry into timesheet line"
-msgstr ""
+msgstr "Definiuje pracę zadania do pozycji karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -159,49 +161,49 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Timesheet by Days"
-msgstr ""
+msgstr "Karta czasu pracy wg dni"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "timesheet is confirmed at the end of the week / month"
-msgstr ""
+msgstr "karta czasu pracy jest zatwierdzana na koniec tygodnia / miesiąca"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Konto analityczne"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Project Timesheet"
-msgstr ""
+msgstr "karta czasu pracy projektu"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "Data od"
 
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet Process"
-msgstr ""
+msgstr "Proces karty czasu pracy Zas. Ludz."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
 msgid "Analytic cost"
-msgstr ""
+msgstr "Koszt analityczny"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potwierdzone"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance"
-msgstr ""
+msgstr "Obecności"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -212,67 +214,67 @@ msgstr "Potwierdź"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr ""
+msgstr "Pozycje karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
 msgid "Encode your timesheet line"
-msgstr ""
+msgstr "Wporwadź twoją pozycje karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirm Timesheet"
-msgstr ""
+msgstr "Zatwierdź kartę czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Control by the project manager"
-msgstr ""
+msgstr "Sprawdzane przez menedżera projektu"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "New"
-msgstr ""
+msgstr "Nowa"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
 msgid "Timesheet sheet confirm at the end of the period"
-msgstr ""
+msgstr "Zestawienie kart czasu pracy zatwierdzane na koniec okresu"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr ""
+msgstr "Czas całkowity"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Pozycje karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
 msgid "Confirm timesheet at the end of the period"
-msgstr ""
+msgstr "Zatwierdź kartę czasu pracy na koniec okresu"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "No employee defined"
-msgstr ""
+msgstr "Nie zdefiniowano pracownika"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "Confirmed Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy zatwierdzona"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
 msgid "Configuration"
-msgstr "Ustawienia"
+msgstr "Konfiguracja"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Week"
-msgstr ""
+msgstr "Tydzień"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.ui.view:0
@@ -282,56 +284,56 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily View"
-msgstr ""
+msgstr "Widok dniowy"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by period"
-msgstr ""
+msgstr "Karty czasu pracy wg okresu"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign In"
-msgstr ""
+msgstr "Zaloguj się"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current
 msgid "My Department's Timesheet"
-msgstr ""
+msgstr "Karta czasu pracy mojego działu"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Go to:"
-msgstr ""
+msgstr "Idź do:"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0
 msgid "Phone call"
-msgstr ""
+msgstr "Rozmowa telefoniczna"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
 #: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Timesheet"
-msgstr ""
+msgstr "Suma karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0
 msgid "Review of work"
-msgstr ""
+msgstr "Przegląd pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr ""
+msgstr "Faktura za pracę"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
@@ -342,12 +344,12 @@ msgstr ""
 #: model:process.node,name:hr_timesheet_sheet.process_node_review0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0
 msgid "Review"
-msgstr ""
+msgstr "Przegląd"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Projekt"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -357,58 +359,58 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60
 #: view:res.company:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm
 msgid "Timesheets To Confirm"
-msgstr ""
+msgstr "Karty czasu pracy do zatwierdzenia"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stan"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "Data do"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Current Status"
-msgstr ""
+msgstr "Bieżący stan"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Invoice on timesheet"
-msgstr ""
+msgstr "Faktura z karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice based on timesheet"
-msgstr ""
+msgstr "Faktura oparta o kartę czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Account"
-msgstr ""
+msgstr "Karta czasu pracy wg kont"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Creates invoice based on timesheet"
-msgstr ""
+msgstr "Tworzy fakturę w oparciu o kartę czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid
@@ -419,38 +421,38 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference"
-msgstr ""
+msgstr "Dozowolone różnice  w karcie czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,period_ids:0
 msgid "Period"
-msgstr ""
+msgstr "Okres"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Done"
-msgstr ""
+msgstr "Wykonano"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Attendance entry moves into the timesheet"
-msgstr ""
+msgstr "Przenoszenie zapisów obecności do karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0
 msgid "Creates your analytic cost accoording to quantity"
-msgstr ""
+msgstr "Tworzy twoje koszty analityczne według ilości"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Pozycja karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr ""
+msgstr "Karta czasu pracy wg kont"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.model:0
@@ -463,57 +465,57 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Timesheet is validate by project manager."
-msgstr ""
+msgstr "Karta czasu pracy została zatwierdzona przez menedżera."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
 msgid "Whatever time u spent for phone call"
-msgstr ""
+msgstr "Czas spędzony na rozmowach telefonicznych"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validate Timesheet"
-msgstr ""
+msgstr "Zatwierdź kartę czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm
 msgid "My Department's Timesheet to Confirm"
-msgstr ""
+msgstr "Karta czasu pracy mojego działu do zatwierdzenia"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,attendances_ids:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
 msgid "Attendances"
-msgstr ""
+msgstr "Obecności"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0
 msgid "Create Analytic cost"
-msgstr ""
+msgstr "Utwórz koszt analityczny"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
-msgstr ""
+msgstr "Wyloguj się"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "By Day"
-msgstr ""
+msgstr "Wg dni"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_difference:0
 #: field:hr_timesheet_sheet.sheet,total_difference_day:0
 #: field:hr_timesheet_sheet.sheet.day,total_difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Różnica"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
@@ -523,58 +525,58 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr ""
+msgstr "Nieobecny(a)"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "At the end of the period (week/month)"
-msgstr ""
+msgstr "Na koniec okresu (tygodnia/miesiąca)"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "timesheet entry is into draft state."
-msgstr ""
+msgstr "zapis karty czasu pracy jest w stanie projekt."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0
 msgid "Analytic cost is created"
-msgstr ""
+msgstr "Utworzono koszt analityczny"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr ""
+msgstr "Współczynnik fakturowania"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
 msgid "Encode how much time u spent on phone call"
-msgstr ""
+msgstr "Wprowadź ile czasu spędziłaś(eś) na rozmowach telefonicznych"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
 msgid "Review of your work at the end of the day"
-msgstr ""
+msgstr "Przejrzyj swoją pracę na koniec dnia"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
 msgid "Analytic accounts"
-msgstr ""
+msgstr "Konta analityczne"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my
 msgid "My timesheets"
-msgstr ""
+msgstr "Moje karty czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Accept"
-msgstr ""
+msgstr "Akceptuj"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
 msgid "Current date"
-msgstr ""
+msgstr "Bieżąca data"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
@@ -585,15 +587,15 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
-msgstr ""
+msgstr "Suma"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
 msgid "My Department's Timesheet to Validate"
-msgstr ""
+msgstr "Karty czasu pracy mojego działu do zatwierdzenia"

From e2f6088ea705d2ba61da0f3628af90bc438c178f Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 13 May 2010 12:33:39 +0530
Subject: [PATCH 139/146] [IMP]:configurable acc & tax chart

bzr revid: nch@tinyerp.com-20100513070339-6l3dds3jpmvo4wu9
---
 addons/account/configurable_account_chart.xml |  2 +-
 addons/account/installer.py                   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index 73cb4499e20..658cf2907af 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -162,7 +162,7 @@
             <field name="code">1105</field>
             <field name="name">Cash</field>
             <field ref="conf_cas" name="parent_id"/>
-            <field name="type">other</field>
+            <field name="type">view</field>
             <field name="user_type" ref="conf_account_type_cash"/>
         </record>
 
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 1cbed3cd2a7..de557cd51a0 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -396,6 +396,7 @@ class account_installer(osv.osv_memory):
         company_id = self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id
         for res in self.read(cr,uid,ids):
             if record.charts == 'configurable':
+                mod_obj = self.pool.get('ir.model.data')
                 fp = tools.file_open(opj('account','configurable_account_chart.xml'))
                 tools.convert_xml_import(cr, 'account', fp, {}, 'init',True, None)
                 fp.close()
@@ -407,12 +408,20 @@ class account_installer(osv.osv_memory):
                 p_tax = (res.get('purchase_tax',0.0))/100
                 tax_val = {}
                 default_tax = []
+
+                pur_tax_parent = mod_obj._get_id(cr, uid, 'account', 'vat_code_base_purchases')
+                pur_tax_parent_id = mod_obj.read(cr, uid, [pur_tax_parent], ['res_id'])[0]['res_id']
+
+                sal_tax_parent = mod_obj._get_id(cr, uid, 'account', 'vat_code_base_sales')
+                sal_tax_parent_id = mod_obj.read(cr, uid, [sal_tax_parent], ['res_id'])[0]['res_id']
+
                 if s_tax*100 > 0.0:
                     vals_tax_code = {
                         'name': 'VAT%s%%'%(s_tax*100),
                         'code': 'VAT%s%%'%(s_tax*100),
                         'company_id': company_id.id,
                         'sign': 1,
+                        'parent_id':sal_tax_parent_id
                         }
                     new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals_tax_code)
                     sales_tax = obj_tax.create(cr, uid,
@@ -420,7 +429,8 @@ class account_installer(osv.osv_memory):
                                             'description':'VAT%s%%'%(s_tax*100),
                                             'amount':s_tax,
                                             'base_code_id':new_tax_code,
-                                            'tax_code_id':new_tax_code
+                                            'tax_code_id':new_tax_code,
+                                            'type_tax_use':'sale'
                                             })
                     tax_val.update({'taxes_id':[(6,0,[sales_tax])]})
                     default_tax.append(('taxes_id',sales_tax))
@@ -430,6 +440,7 @@ class account_installer(osv.osv_memory):
                         'code': 'VAT%s%%'%(p_tax*100),
                         'company_id': company_id.id,
                         'sign': 1,
+                        'parent_id':pur_tax_parent_id
                         }
                     new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals_tax_code)
                     purchase_tax = obj_tax.create(cr, uid,
@@ -437,7 +448,8 @@ class account_installer(osv.osv_memory):
                                              'description':'VAT%s%%'%(p_tax*100),
                                              'amount':p_tax,
                                              'base_code_id':new_tax_code,
-                                            'tax_code_id':new_tax_code
+                                            'tax_code_id':new_tax_code,
+                                            'type_tax_use':'purchase'
                                              })
                     tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]})
                     default_tax.append(('supplier_taxes_id',purchase_tax))

From 2a88600617427d7a82eec2808b80a7905ac39a3d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 13 May 2010 14:09:35 +0530
Subject: [PATCH 140/146] [IMP]: crm, fundraising, helpdesk: Improvement in
 views

bzr revid: rpa@tinyerp.com-20100513083935-i7yob99esgudx1vv
---
 .../wizard/crm_forward_to_partner_view.xml    |   6 +-
 .../crm_fundraising/crm_fundraising_view.xml  | 541 +++++++++---------
 addons/crm_helpdesk/crm_helpdesk_view.xml     | 451 ++++++++-------
 3 files changed, 506 insertions(+), 492 deletions(-)

diff --git a/addons/crm/wizard/crm_forward_to_partner_view.xml b/addons/crm/wizard/crm_forward_to_partner_view.xml
index 720219599dd..1e8c6fc8583 100644
--- a/addons/crm/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm/wizard/crm_forward_to_partner_view.xml
@@ -15,7 +15,7 @@
 					<group col="2" colspan="2" attrs="{ 'invisible' : [('name','!=','user')]}">
                         <field name="user_id"
                             attrs="{ 'required' : [('name','=','user')]}"
-                            on_change="on_change_email(user_id, partner_id)" />
+                            on_change="on_change_email(user_id)" />
                     </group>
                     <group col="4" colspan="4" attrs="{'invisible' : [('name','!=','partner')]}">
 	                    <field name="partner_id" attrs="{'required' : [('name','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
@@ -23,7 +23,9 @@
 					</group>
 					<field colspan="4" name="email_to" attrs="{ 'required' : [('name','=','email')]}" />
 					<newline/>
-					<field name="add_cc" colspan="2" />
+				    <group colspan="2" col="2">
+				        <field name="add_cc" colspan="2"/>
+				    </group>
                     <separator string="Email" colspan="4" />
                     <field name="subject" colspan="4" />
                     <separator string="Mesage body" colspan="4" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 4891636690a..9a2b3b4c524 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -1,32 +1,31 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-<!-- Fund Raising Categories Form View -->
+        <!-- Fund Raising Categories Form View -->
 
-    <record id="crm_fund_categ_action" model="ir.actions.act_window">
-        <field name="name">Fundraising Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-        <field name="context">{'object_id':'crm.fundraising'}</field>
-    </record>
+        <record id="crm_fund_categ_action" model="ir.actions.act_window">
+            <field name="name">Fundraising Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+            <field name="context">{'object_id':'crm.fundraising'}</field>
+        </record>
 
-    <menuitem action="crm_fund_categ_action"
-        id="menu_crm_case_fundraising-act"
-        groups="base.group_extended"
-        parent="crm.menu_crm_case_categ" />
+        <menuitem action="crm_fund_categ_action"
+            id="menu_crm_case_fundraising-act" groups="base.group_extended"
+            parent="crm.menu_crm_case_categ" />
 
-<!-- Fund Stage Form View -->
+        <!-- Fund Stage Form View -->
 
         <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
             <field name="name">Fundraising Stages</field>
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-               <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-               <field name="context">{'object_id':'crm.fundraising'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+            <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
         <menuitem action="crm_fundraising_stage_act"
@@ -34,15 +33,15 @@
             id="menu_crm_fundraising_stage_act"
             parent="crm.menu_crm_case_stage" />
 
-<!-- Fund  Resource Type Form View -->
+        <!-- Fund Resource Type Form View -->
 
         <record id="crm_fundraising_resource_act" model="ir.actions.act_window">
             <field name="name">Fundraising Resource Type</field>
             <field name="res_model">crm.case.resource.type</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-               <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-               <field name="context">{'object_id':'crm.fundraising'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+            <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
         <menuitem action="crm_fundraising_resource_act"
@@ -51,260 +50,262 @@
             parent="crm.menu_crm_case_resource_type" />
 
 
-<!-- Fund Raising Tree View -->
+        <!-- Fund Raising Tree View -->
 
-    <record model="ir.ui.view" id="crm_case_tree_view_fund">
-        <field name="name">CRM - Funds Tree</field>
-        <field name="model">crm.fundraising</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Funds Tree"
-                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="name" string="Fund Description" />
-                <field name="categ_id" />
-                <field name="type_id" string="Payment Mode" />
-                <field name="planned_cost" string="Amount" />
-                <field name="probability" />
-                <field name="user_id" />
-                <field name="state" />
-                <field name="partner_id" invisible="1"/>
-                <button name="case_close" string="Done"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-close" />
-                <button name="case_open" string="Open"
-                    states="draft,pending" type="object"
-                    icon="gtk-go-forward" />
-                <button name="case_cancel" string="Cancel"
-                    states="draft,open,pending" type="object"
-                    icon="gtk-cancel" />
-                <button name="case_pending" string="Pending"
-                    states="draft,open" type="object" icon="gtk-media-pause" />
-                <button name="case_escalate" string="Escalate"
-                    states="open,draft,pending" type="object"
-                    groups="base.group_extended"
-                    icon="gtk-go-up" />
-                <button name="case_reset" string="Reset to Draft"
-                    states="done,cancel" type="object" icon="gtk-convert" />
-            </tree>
-        </field>
-    </record>
-
-<!-- Fund Raising Form View -->
-
-    <record model="ir.ui.view" id="crm_case_form_view_fund">
-        <field name="name">CRM - Funds Form</field>
-        <field name="model">crm.fundraising</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Funds Form">
-                <group colspan="4" col="4">
-                    <field name="name" select="1" string="Name"/>
-                    <field name="type_id" string="Payment Mode" select="1" widget="selection"
-                            domain="[('object_id.model', '=', 'crm.fundraising')]" />
-                </group>
-                <notebook colspan="4">
-                <page string="Funds">
-                    <separator colspan="4" string="Communication"/>
-                    <group colspan="4" col="4">
-                        <field name="partner_id" select="1"
-                            on_change="onchange_partner_id(partner_id, email_from)"
-                            colspan="2" />
-                        <field name="partner_address_id"
-                            string="Contact"
-                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                            colspan="1" />
-                        <field name="email_from" colspan="2"/>
-                    </group>
-                    <separator colspan="4" string="Estimates"/>
-                    <field name="planned_cost"/>
-                    <field name="planned_revenue"/>
-                    <field name="probability"/>
-                    <separator colspan="4" string="Categorization"/>
-                    <group colspan="4" col="6">
-                        <field name="user_id" string="Responsible"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
-                        <field name="categ_id" select="1"
-                            widget="selection"
-                            domain="[('object_id.model', '=', 'crm.fundraising')]" />
-                        <field name="date"/>
-                        <field name="duration"/>
-                    </group>
-                    <separator colspan="4" string="Notes"/>
-                        <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state"/>
-                        <button name="case_close" string="Done"
-                            states="open,draft,pending" type="object"
-                            icon="gtk-close" />
-                        <button name="case_open" string="Open"
-                            states="draft,pending" type="object"
-                            icon="gtk-go-forward" />
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
-                        <button name="case_pending" string="Pending"
-                            states="draft,open" type="object"
-                            icon="gtk-media-pause" />
-                        <button name="case_escalate" string="Escalate"
-                            states="open,draft,pending" type="object"
-                            groups="base.group_extended"
-                            icon="gtk-go-up" />
-                        <button name="case_reset"
-                            string="Reset to Draft" states="done,cancel"
-                            type="object" icon="gtk-convert" />
-                    </group>
-                </page>
-                <page string="History" groups="base.group_extended">
-                    <field name="id" select="1"/>
-                    <field name="active"/>
-                    <field name="priority" string="Priority"/>
-                    <newline/>
-                    <field name="canal_id"/>
-                    <field name="som"/>
-                    <separator colspan="4" string="Dates"/>
-                    <field name="create_date"/>
-                    <field name="date_closed"/>
-                    <separator colspan="4" string="References"/>
-                    <field name="ref" colspan="4"/>
-                    <field name="ref2" colspan="4"/>
-
-                    <field name="log_ids" nolabel="1" colspan="4">
-                        <tree string="Logs">
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </tree>
-                        <form string="Logs">
-                            <separator string="Action Information" colspan="4"/>
-                            <field name="name" colspan="4"/>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                        </form>
-                    </field>
-                </page>
-                 <page string="Emails" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="CC"/>
-                   </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                       <form string="Communication history">
-                            <group col="6" colspan="4">
-                                <field name="date"/>
-                                <field name="email_to"/>
-                                <field name="email_from"/>
-							</group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(crm.action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.fundraising'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.fundraising'}"
-                               icon="gtk-go-forward" type="action" />
-                 </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
-
-<!-- Fund Raising Calendar View -->
-
-    <record model="ir.ui.view" id="crm_case_calendar_view_fund">
-        <field name="name">CRM - Funds Calendar</field>
-        <field name="model">crm.fundraising</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
-            </calendar>
-        </field>
-    </record>
-
-<!-- Fund Raising Graph View -->
-
-    <record model="ir.ui.view" id="crm_case_graph_view_fund">
-        <field name="name">CRM - Funds Graph</field>
-        <field name="model">crm.fundraising</field>
-        <field name="type">graph</field>
-        <field name="arch" type="xml">
-            <graph string="Funds by Categories" type="bar" orientation="horizontal">
-                <field name="categ_id"/>
-                <field name="planned_cost" operator="+"/>
-                <field name="state" group="True"/>
-            </graph>
-        </field>
-    </record>
-
-<!-- Fund Raising Search View -->
-
-    <record id="view_crm_case_fund_filter" model="ir.ui.view">
-            <field name="name">CRM - Funds Search</field>
+        <record model="ir.ui.view" id="crm_case_tree_view_fund">
+            <field name="name">CRM - Funds Tree</field>
             <field name="model">crm.fundraising</field>
-            <field name="type">search</field>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <search string="Search Funds">
-                   <group col='6' colspan='4'>
-                       <filter icon="gtk-new" string="Current"
-                           domain="[('state','in',('draft', 'open'))]" name="current"
-                           help="Current Funds" />
-                       <filter icon="gtk-yes" string="Open"
-                           domain="[('state','=','open')]"
-                           help="Open Funds" />
-                       <filter icon="gtk-media-pause"
-                           string="Pending"
-                           domain="[('state','=','pending')]"
-                           help="Pending Funds" />
-                       <separator orientation="vertical" />
-                       <filter icon="terp-partner" string="My Funds"
-                           default="1" domain="[('user_id','=',uid)]"
-                           separator="1"
-                           help="Funds Related to Current User"
-                           />
-                       <separator orientation="vertical" />
-                       <field name="state" select="1" />
-                       <field name="name" select='1'
-                           string="Fund Description" />
-                       <field name="user_id" select="1"
-                           widget="selection">
-                           <filter icon="terp-partner"
-                               domain="[('user_id','=', False)]"
-                               help="Unassigned" />
-                       </field>
-                       <field name="section_id" select="1" widget="selection" string="Sales Team">
-                           <filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section" />
-                       </field>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By..." colspan="10" col="20">
-                       <filter string="Partner" icon="terp-partner"
-                           domain="[]"
-                           context="{'group_by':'partner_id'}" />
-                       <filter string="Responsible" icon="terp-crm"
-                           domain="[]"
-                           context="{'group_by':'user_id'}" />
-                       <separator orientation="vertical" />
-                       <filter string="Type" icon="terp-project"
-                           domain="[]"
-                           context="{'group_by':'type_id'}" />
-                   </group>
-               </search>
+                <tree string="Funds Tree"
+                    colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    <field name="name" string="Fund Description" />
+                    <field name="categ_id" />
+                    <field name="type_id" string="Payment Mode" />
+                    <field name="planned_cost" string="Amount" />
+                    <field name="probability" />
+                    <field name="user_id" />
+                    <field name="state" />
+                    <field name="partner_id" invisible="1"/>
+                    <button name="case_close" string="Done"
+                        states="open,draft,pending" type="object"
+                        icon="gtk-close" />
+                    <button name="case_open" string="Open"
+                        states="draft,pending" type="object"
+                        icon="gtk-go-forward" />
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
+                    <button name="case_pending" string="Pending"
+                        states="draft,open" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" string="Escalate"
+                        states="open,draft,pending" type="object"
+                        groups="base.group_extended"
+                        icon="gtk-go-up" />
+                    <button name="case_reset" string="Reset to Draft"
+                        states="done,cancel" type="object" icon="gtk-convert" />
+                </tree>
             </field>
         </record>
 
-</data>
+        <!-- Fund Raising Form View -->
+
+        <record model="ir.ui.view" id="crm_case_form_view_fund">
+            <field name="name">CRM - Funds Form</field>
+            <field name="model">crm.fundraising</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Funds Form">
+                    <group colspan="4" col="6">
+                        <field name="name" select="1" string="Name"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="user_id" string="Responsible"/>
+                        <field name="date"/>
+                        <field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                        <field name="type_id" string="Payment Mode" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Funds">
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Communication"/>
+                                <field name="partner_id" select="1"
+                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    colspan="2" />
+                                <field name="partner_address_id"
+                                    string="Contact"
+                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                    colspan="1" />
+                                <field name="email_from" colspan="2"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Estimates"/>
+                                <field name="planned_cost"/>
+                                <field name="planned_revenue"/>
+                                <field name="probability"/>
+                            </group>
+                            <separator colspan="4" string="Notes"/>
+                                <field name="description" nolabel="1" colspan="4"/>
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state"/>
+                                <button name="case_close" string="Done"
+                                    states="open,draft,pending" type="object"
+                                    icon="gtk-close" />
+                                <button name="case_open" string="Open"
+                                    states="draft,pending" type="object"
+                                    icon="gtk-go-forward" />
+                                <button name="case_cancel" string="Cancel"
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-cancel" />
+                                <button name="case_pending" string="Pending"
+                                    states="draft,open" type="object"
+                                    icon="gtk-media-pause" />
+                                <button name="case_escalate" string="Escalate"
+                                    states="open,draft,pending" type="object"
+                                    groups="base.group_extended"
+                                    icon="gtk-go-up" />
+                                <button name="case_reset"
+                                    string="Reset to Draft" states="done,cancel"
+                                    type="object" icon="gtk-convert" />
+                            </group>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                            <group col="2" colspan="2">
+                                <separator colspan="4" string="Misc"/>
+                                <field name="active"/>
+                                <field name="id" select="1"/>
+                                <field name="priority" string="Priority"/>
+                                <field name="canal_id"/>
+                                <field name="som"/>
+                            </group>
+                            <group col="2" colspan="2">
+                                <separator colspan="4" string="Dates"/>
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                                <field name="duration"/>
+                            </group>
+                            <newline/>
+                            <group colspan="4" col="2">
+                                <separator colspan="4" string="References"/>
+                                <field colspan="4" name="ref"/>
+                                <field colspan="4" name="ref2"/>
+                            </group>
+                            <field name="log_ids" nolabel="1" colspan="4">
+                                <tree string="Logs">
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </tree>
+                                <form string="Logs">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Emails" groups="base.group_extended">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="CC"/>
+                            </group>
+                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                                <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <newline/>
+                                    <field name="description" colspan="4" nolabel="1"/>
+                                    <button colspan="4"
+                                        string="Reply to Last Email"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.fundraising'}"
+                                        icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="description"/>
+                                    <field name="email_to"/>
+                                    <field name="date"/>
+                                </tree>
+                            </field>
+                            <button colspan="4" string="Send New Email"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'new', 'model': 'crm.fundraising'}"
+                                icon="gtk-go-forward" type="action" />
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <!-- Fund Raising Calendar View -->
+
+        <record model="ir.ui.view" id="crm_case_calendar_view_fund">
+            <field name="name">CRM - Funds Calendar</field>
+            <field name="model">crm.fundraising</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                </calendar>
+            </field>
+        </record>
+
+        <!-- Fund Raising Graph View -->
+
+        <record model="ir.ui.view" id="crm_case_graph_view_fund">
+            <field name="name">CRM - Funds Graph</field>
+            <field name="model">crm.fundraising</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Funds by Categories" type="bar" orientation="horizontal">
+                    <field name="categ_id"/>
+                    <field name="planned_cost" operator="+"/>
+                    <field name="state" group="True"/>
+                </graph>
+            </field>
+        </record>
+
+<!-- Fund Raising Search View -->
+
+        <record id="view_crm_case_fund_filter" model="ir.ui.view">
+                <field name="name">CRM - Funds Search</field>
+                <field name="model">crm.fundraising</field>
+                <field name="type">search</field>
+                <field name="arch" type="xml">
+                    <search string="Search Funds">
+                        <group col='6' colspan='4'>
+                            <filter icon="gtk-new" string="Current"
+                                domain="[('state','in',('draft', 'open'))]" name="current"
+                                help="Current Funds" />
+                            <filter icon="gtk-yes" string="Open"
+                                domain="[('state','=','open')]"
+                                help="Open Funds" />
+                            <filter icon="gtk-media-pause"
+                                string="Pending"
+                                domain="[('state','=','pending')]"
+                                help="Pending Funds" />
+                            <separator orientation="vertical" />
+                            <filter icon="terp-partner" string="My Funds"
+                                default="1" domain="[('user_id','=',uid)]"
+                                separator="1"
+                                help="Funds Related to Current User"
+                                />
+                            <separator orientation="vertical" />
+                            <field name="state" select="1" />
+                            <field name="name" select='1'
+                                string="Fund Description" />
+                            <field name="user_id" select="1"
+                                widget="selection">
+                                <filter icon="terp-partner"
+                                    domain="[('user_id','=', False)]"
+                                    help="Unassigned" />
+                            </field>
+                            <field name="section_id" select="1" widget="selection" string="Sales Team">
+                                <filter icon="terp-crm"
+                                    domain="[('section_id','=',context.get('section_id',False))]"
+                                    help="My section" />
+                            </field>
+                        </group>
+                        <newline/>
+                        <group expand="0" string="Group By..." colspan="10" col="20">
+                            <filter string="Partner" icon="terp-partner"
+                                domain="[]"
+                                context="{'group_by':'partner_id'}" />
+                            <filter string="Responsible" icon="terp-crm"
+                                domain="[]"
+                                context="{'group_by':'user_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Type" icon="terp-project"
+                                domain="[]"
+                                context="{'group_by':'type_id'}" />
+                        </group>
+                    </search>
+                </field>
+            </record>
+
+    </data>
 </openerp>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index e88a6dfec4c..93311395510 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -1,252 +1,263 @@
 <?xml version="1.0"?>
 <openerp>
-<data>
+    <data>
 
-<!-- Helpdesk Support Categories Form View -->
+        <!-- Helpdesk Support Categories Form View -->
 
-    <record id="crm_helpdesk_categ_action" model="ir.actions.act_window">
-        <field name="name">Helpdesk Categories</field>
-        <field name="res_model">crm.case.categ</field>
-        <field name="view_type">form</field>
-         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-        <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
-        <field name="context">{'object_id':'crm.helpdesk'}</field>
-    </record>
+        <record id="crm_helpdesk_categ_action" model="ir.actions.act_window">
+            <field name="name">Helpdesk Categories</field>
+            <field name="res_model">crm.case.categ</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+            <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
+            <field name="context">{'object_id':'crm.helpdesk'}</field>
+        </record>
 
-    <menuitem action="crm_helpdesk_categ_action"
-        id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
+        <menuitem action="crm_helpdesk_categ_action"
+            id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
 
-<!--  Helpdesk Support Form View -->
+        <!--  Helpdesk Support Form View -->
 
-    <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
-        <field name="name">CRM - Helpdesk Support Form</field>
-        <field name="model">crm.helpdesk</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Helpdesk Support">
-                <group colspan="4" col="4">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="date" select="1"/>
-                    <field name="date_deadline"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="General">
-                        <separator colspan="4" string="Communication"/>
-                        <group col="7" colspan="4">
-                            <field name="partner_id"
-                                on_change="onchange_partner_id(partner_id, email_from)"
-                                select="1" />
-                            <field name="partner_address_id"
-                                on_change="onchange_partner_address_id(partner_address_id, email_from)"
+        <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
+            <field name="name">CRM - Helpdesk Support Form</field>
+            <field name="model">crm.helpdesk</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Helpdesk Support">
+                    <group colspan="4" col="7">
+                        <field name="name" select="1"/>
+                        <field name="section_id" widget="selection"/>
+                        <field name="user_id" select="1"/>
+                        <button name="remind_user"
+                            states="open,pending"
+                            string="Send Reminder" type="object"
+                            icon="gtk-go-forward" />
+                        <field name="som"/>
+                        <field name="date" select="1"/>
+                        <field name="date_deadline"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="General">
+                            <group col="3" colspan="2">
+                                <separator colspan="4" string="Communication"/>
+                                <field name="partner_id" colspan="2"
+                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    select="1" />
+                                <field name="partner_address_id" colspan="2"
+                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
                                 />
+                                <newline/>
+                                <field name="email_from" colspan="2"/>
+                                <button name="remind_partner"
+                                    states="open,pending"
+                                    string="Send Reminder" type="object"
+                                    icon="gtk-go-forward" />
+                            </group>
 
-                            <field name="email_from" />
-                            <button name="remind_partner"
-                                states="open,pending"
-                                string="Send Reminder" type="object"
-                                icon="gtk-go-forward" />
+                            <group col="2" colspan="2">
+                                <separator colspan="4" string="Categorization"/>
+                                <field name="priority"/>
+                                <field name="categ_id"/>
+                                <field name="canal_id"/>
+                            </group>
 
-                        </group>
-                        <separator colspan="4" string="Categorization"/>
-                        <group col="7" colspan="4">
-                            <field name="priority"/>
-                            <field name="section_id" widget="selection"/>
-                            <field name="user_id" select="1"/>
-                            <button name="remind_user"
-                                states="open,pending"
-                                string="Send Reminder" type="object"
-                                icon="gtk-go-forward" />
-                        </group>
-
-                        <separator colspan="4" string="Notes"/>
-                        <field name="description" colspan="4"
+                            <separator colspan="4" string="Notes"/>
+                            <field name="description" colspan="4"
                                 nolabel="1" widget="text_tag" readonly="1" />
-                        <separator colspan="4"/>
-                        <group col="8" colspan="4">
-                            <field name="state" select="1"/>
-                            <button name="case_close"
+                            <separator colspan="4"/>
+                            <group col="8" colspan="4">
+                                <field name="state" select="1"/>
+                                <button name="case_close"
                                 states="open,draft,pending" string="Close"
                                 type="object" icon="gtk-close" />
-                            <button name="case_open"
+                                <button name="case_open"
                                 states="draft,pending" string="Open"
                                 type="object" icon="gtk-go-forward" />
-                            <button name="case_cancel"
+                                <button name="case_cancel"
                                 states="draft,open,pending" string="Cancel"
                                 type="object" icon="gtk-cancel" />
-                            <button name="case_pending"
+                                <button name="case_pending"
                                 states="draft,open" string="Pending"
                                 type="object" icon="gtk-media-pause" />
-                            <button name="case_escalate"
+                                <button name="case_escalate"
                                 states="open,draft,pending"
                                 string="Escalate" type="object"
                                 icon="gtk-go-up" />
-                            <button name="case_reset"
+                                <button name="case_reset"
                                 states="done,cancel"
                                 string="Reset to Draft" type="object"
                                 icon="gtk-convert" />
-                        </group>
-                    </page>
-                    <page string="History" groups="base.group_extended">
-                        <field name="id" select="1"/>
-                        <field name="active"/>
-                        <field name="categ_id"/>
-                        <field name="canal_id"/>
-                        <field name="som"/>
-                        <separator colspan="4" string="Dates"/>
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                        <separator colspan="4" string="Estimates"/>
-                        <field name="planned_cost"/>
-                        <separator colspan="4" string="References"/>
-                        <field colspan="4" name="ref"/>
-                        <field colspan="4" name="ref2"/>
-                        <field colspan="4" name="log_ids" nolabel="1">
-                            <tree string="Logs">
-	                            <field name="name" colspan="4"/>
-	                            <field name="date"/>
-	                            <field name="user_id"/>
-	                        </tree>
-	                        <form string="Logs">
-	                            <separator string="Action Information" colspan="4"/>
-	                            <field name="name" colspan="4"/>
-	                            <field name="date"/>
-	                            <field name="user_id"/>
-	                        </form>
-                        </field>
-                    </page>
-                    <page string="Emails" groups="base.group_extended">
-                       <group colspan="4">
-                           <field colspan="4" name="email_cc" string="CC"/>
-                       </group>
-                       <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
-                           <form string="Communication history">
-                               <group col="6" colspan="4">
-                                   <field name="date"/>
-                                   <field name="email_to"/>
-                                   <field name="email_from"/>
-								</group>
-                                   <newline/>
-                                   <field name="description" colspan="4" nolabel="1"/>
-                                   <button colspan="4"
-                                       string="Reply to Last Email"
-                                       name="%(crm.action_crm_send_mail)d"
-                                       context="{'mail':'reply', 'model': 'crm.helpdesk'}"
-                                       icon="gtk-undo" type="action" />
-                               </form>
-                               <tree string="Communication history">
-                                   <field name="description"/>
-                                   <field name="email_to"/>
-                                   <field name="date"/>
-                               </tree>
-                           </field>
-                           <button colspan="4" string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                               icon="gtk-go-forward" type="action" />
-                    </page>
-                </notebook>
-            </form>
-        </field>
-    </record>
+                            </group>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Dates"/>
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Misc"/>
+                                <field name="id" select="1"/>
+                                <field name="active"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="4" string="Estimates"/>
+                                <field name="planned_cost"/>
+                            </group>
+                            <newline/>
+                            <group colspan="4" col="2">
+                                <separator colspan="4" string="References"/>
+                                <field colspan="4" name="ref"/>
+                                <field colspan="4" name="ref2"/>
+                            </group>
+                            <field colspan="4" name="log_ids" nolabel="1">
+                                <tree string="Logs">
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </tree>
+                                <form string="Logs">
+                                    <separator string="Action Information" colspan="4"/>
+                                    <field name="name" colspan="4"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Emails" groups="base.group_extended">
+                            <group colspan="4">
+                                <field colspan="4" name="email_cc" string="CC"/>
+                            </group>
+                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
+                                <form string="Communication history">
+                                    <group col="6" colspan="4">
+                                        <field name="date"/>
+                                        <field name="email_to"/>
+                                        <field name="email_from"/>
+                                    </group>
+                                    <newline/>
+                                    <field name="description" colspan="4" nolabel="1"/>
+                                    <button colspan="4"
+                                        string="Reply to Last Email"
+                                        name="%(crm.action_crm_send_mail)d"
+                                        context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+                                        icon="gtk-undo" type="action" />
+                                </form>
+                                <tree string="Communication history">
+                                    <field name="description"/>
+                                    <field name="email_to"/>
+                                    <field name="date"/>
+                                </tree>
+                            </field>
+                            <button colspan="4" string="Send New Email"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'new', 'model': 'crm.helpdesk'}"
+                                icon="gtk-go-forward" type="action" />
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
-<!-- Helpdesk Support Tree View  -->
+        <!-- Helpdesk Support Tree View  -->
 
-    <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
-        <field name="name">CRM - Helpdesk Support Tree</field>
-        <field name="model">crm.helpdesk</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Helpdesk Support Tree"
-                colors="black:state=='open';blue:state=='pending';grey:state in ('cancel','close')">
-                <field name="id"/>
-                <field name="name" string="Query Description" />
-                <field name="partner_id" string="Partner"/>
-                <field name="date" string="Date"/>
-                <field name="date_deadline"/>
-                <field name="user_id"/>
-                <field name="section_id"/>
-                <field name="priority"/>
-                <field name="state"/>
-                <button name="case_close" string="Done"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-close" />
-                <button name="case_open" string="Open"
-                    states="draft,pending" type="object"
-                    icon="gtk-go-forward" />
-                <button name="case_cancel" string="Cancel"
-                    states="draft,open,pending" type="object"
-                    icon="gtk-cancel" />
-                <button name="case_pending" string="Pending"
-                    states="draft,open" type="object"
-                    icon="gtk-media-pause" />
-                <button name="case_escalate" string="Escalate"
-                    groups="base.group_extended"
-                    states="open,draft,pending" type="object"
-                    icon="gtk-go-up" />
-                <button name="case_reset" string="Reset to Draft"
-                    states="done,cancel" type="object" icon="gtk-convert" />
-            </tree>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
+            <field name="name">CRM - Helpdesk Support Tree</field>
+            <field name="model">crm.helpdesk</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Helpdesk Support Tree"
+                    colors="black:state=='open';blue:state=='pending';grey:state in ('cancel','close')">
+                    <field name="id"/>
+                    <field name="name" string="Query Description" />
+                    <field name="partner_id" string="Partner"/>
+                    <field name="date" string="Date"/>
+                    <field name="date_deadline"/>
+                    <field name="user_id"/>
+                    <field name="section_id"/>
+                    <field name="priority"/>
+                    <field name="state"/>
+                    <button name="case_close" string="Done"
+                        states="open,draft,pending" type="object"
+                        icon="gtk-close" />
+                    <button name="case_open" string="Open"
+                        states="draft,pending" type="object"
+                        icon="gtk-go-forward" />
+                    <button name="case_cancel" string="Cancel"
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
+                    <button name="case_pending" string="Pending"
+                        states="draft,open" type="object"
+                        icon="gtk-media-pause" />
+                    <button name="case_escalate" string="Escalate"
+                        groups="base.group_extended"
+                        states="open,draft,pending" type="object"
+                        icon="gtk-go-up" />
+                    <button name="case_reset" string="Reset to Draft"
+                        states="done,cancel" type="object" icon="gtk-convert" />
+                </tree>
+            </field>
+        </record>
 
-<!--  Helpdesk Support Calendar View -->
+        <!--  Helpdesk Support Calendar View -->
 
-    <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
-        <field name="name">CRM - Helpdesk Support Calendar</field>
-        <field name="model">crm.helpdesk</field>
-        <field name="type">calendar</field>
-        <field name="priority" eval="2"/>
-        <field name="arch" type="xml">
-            <calendar string="Helpdesk Supports" date_start="date" color="user_id" date_delay="duration">
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="categ_id"/>
-            </calendar>
-        </field>
-    </record>
+        <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
+            <field name="name">CRM - Helpdesk Support Calendar</field>
+            <field name="model">crm.helpdesk</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Helpdesk Supports" date_start="date" color="user_id" date_delay="duration">
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="categ_id"/>
+                </calendar>
+            </field>
+        </record>
 
-<!-- Helpdesk Support Search View  -->
+        <!-- Helpdesk Support Search View  -->
 
-    <record id="view_crm_case_helpdesk_filter" model="ir.ui.view">
-        <field name="name">CRM - Helpdesk Search</field>
-        <field name="model">crm.helpdesk</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Helpdesk">
-                <filter icon="gtk-home" string="Today"
-                    separator="1"
-                    domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                    help="Todays's Helpdesk Requests"
-                    />
-                <filter icon="gtk-media-rewind"
-                    string="7 Days" separator="1"
-                    help="Helpdesk requests during last 7 days"
-                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                    />
-                <separator orientation="vertical"/>
-                <field name="name" select='1' string="Query"/>
-                <field name="partner_id" />
-                <field name="user_id" select="1" widget="selection">
-                    <filter icon="terp-partner"
-                        domain="[('user_id','=',uid)]"
-                        help="My Helpdesk Requests" default="1" />
-                </field>
-                <field name="section_id" select="1" widget="selection" string="Sales Team">
-                    <filter icon="terp-crm"
-                        domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My section" />
-                </field>
-                <newline/>
-                <group expand="0" string="Group By..." colspan="12" col="20">
-                    <filter string="Customer" icon="terp-crm"
-                        domain="[]" context="{'group_by':'partner_id'}" />
-                    <filter string="State" icon="terp-crm" domain="[]"
-                        context="{'group_by':'state'}" />
-                    <filter string="Priority" icon="terp-crm"
-                        domain="[]" context="{'group_by':'priority'}" />
-                </group>
-            </search>
-        </field>
-    </record>
-</data>
+        <record id="view_crm_case_helpdesk_filter" model="ir.ui.view">
+            <field name="name">CRM - Helpdesk Search</field>
+            <field name="model">crm.helpdesk</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Helpdesk">
+                    <filter icon="gtk-home" string="Today"
+                        separator="1"
+                        domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                        help="Todays's Helpdesk Requests"
+                        />
+                    <filter icon="gtk-media-rewind"
+                        string="7 Days" separator="1"
+                        help="Helpdesk requests during last 7 days"
+                        domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        />
+                    <separator orientation="vertical"/>
+                    <field name="name" select='1' string="Query"/>
+                    <field name="partner_id" />
+                    <field name="user_id" select="1" widget="selection">
+                        <filter icon="terp-partner"
+                            domain="[('user_id','=',uid)]"
+                            help="My Helpdesk Requests" default="1" />
+                    </field>
+                    <field name="section_id" select="1" widget="selection" string="Sales Team">
+                        <filter icon="terp-crm"
+                            domain="[('section_id','=',context.get('section_id',False))]"
+                            help="My section" />
+                    </field>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="12" col="20">
+                        <filter string="Customer" icon="terp-crm"
+                            domain="[]" context="{'group_by':'partner_id'}" />
+                        <filter string="State" icon="terp-crm" domain="[]"
+                            context="{'group_by':'state'}" />
+                        <filter string="Priority" icon="terp-crm"
+                            domain="[]" context="{'group_by':'priority'}" />
+                    </group>
+                </search>
+            </field>
+        </record>
+
+    </data>
 </openerp>

From b09173f3cedf81a0f4b1665ed1d058e999200d98 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 13 May 2010 14:42:47 +0530
Subject: [PATCH 141/146] [IMP]: fetchmail: Minor improvement in names

bzr revid: rpa@tinyerp.com-20100513091247-58tmofwfxntnor2j
---
 addons/fetchmail/fetchmail.py       | 2 +-
 addons/fetchmail/fetchmail_view.xml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index d8ae92654e3..6419cc8a18d 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -126,7 +126,7 @@ class email_server(osv.osv):
         'name':fields.char('Name', size=256, required=True, readonly=False),
         'active':fields.boolean('Active', required=False),
         'state':fields.selection([
-            ('draft','Not Confirme'),
+            ('draft','Not Confirmed'),
             ('wating','Waiting for Verification'),
             ('done','Confirmed'),
         ],'State', select=True, readonly=True),
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index ea08706b62d..ced787408b3 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -145,7 +145,7 @@
             res_model="mail.server.history" src_model="email.server"/>
             
         <record model="ir.actions.act_window" id="action_email_server_history_tree">
-            <field name="name">Receive Email History</field>
+            <field name="name">Received Email History</field>
             <field name="res_model">mail.server.history</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -160,7 +160,7 @@
             action="action_email_server_history_tree"/>
             
         <record model="ir.actions.act_window" id="action_email_server_history_tree_pop">
-            <field name="name">Receive Email History</field>
+            <field name="name">Received Email History</field>
             <field name="res_model">mail.server.history</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -173,5 +173,6 @@
             parent="menu_action_email_server_tree" 
             id="menu_action_email_server_history_tree_pop" 
             action="action_email_server_history_tree_pop"/>
+
     </data>
 </openerp>

From a47b0f9d596429775e0ecb56ce173b8c023fe08a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 13 May 2010 15:54:08 +0530
Subject: [PATCH 142/146] [IMP]: crm: Improvement in meetings view

bzr revid: rpa@tinyerp.com-20100513102408-uicj6cdx92c2mfbd
---
 addons/crm/crm_meeting_view.xml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 14693086e4a..3286936b8a0 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,18 +24,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Meetings">
-                <group col="6" colspan="4">
-                	<group col="6" colspan="6">
-	                    <field name="name" select="1" string="Summary"
-	                        colspan="2" />
-	                    <field name="categ_id" widget="selection"
-	                        string="Meeting Type"
-	                        groups="base.group_extended"
-	                        domain="[('object_id.model', '=', 'crm.meeting')]" />
-                        <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
-	                </group>
-                    <newline/>
-                    <field name="date" string="Start Date" required="1"
+               	<group col="6" colspan="4">
+                    <field name="name" select="1" string="Summary"
+                        colspan="2" />
+                    <field name="categ_id" widget="selection"
+                        string="Meeting Type"
+                        groups="base.group_extended"
+                        domain="[('object_id.model', '=', 'crm.meeting')]" />
+					<field name="allday" colspan="2" on_change="onchange_allday(allday)" />
+					<field name="date" string="Start Date" required="1"
                         on_change="onchange_dates(date,duration,False)" />
                     <field name="duration" widget="float_time"
                         on_change="onchange_dates(date,duration,False)" />
@@ -56,7 +53,7 @@
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-                    <separator string="Select data for Custom Rule" colspan="8"/>
+                    <separator string="Data for Custom Rule" colspan="8"/>
                     <group col="8" colspan="4">
                         <field name="freq" />
                         <field name="interval" />

From 2331abec581a06108daf81b60377d439149f4ba7 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 13 May 2010 17:07:59 +0530
Subject: [PATCH 143/146] [IMP]: base_calenadr: Improvement in views, Added
 search view , Fixed problem of delegate event invitation

bzr revid: rpa@tinyerp.com-20100513113759-zxot0r0sqrg1jd4h
---
 addons/base_calendar/base_calendar.py         | 18 +++---
 addons/base_calendar/base_calendar_view.xml   | 55 ++++++++++++++++---
 .../wizard/base_calendar_invite_attendee.py   | 21 +++----
 3 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index e97ee3bd547..fd1d60914d1 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -243,22 +243,22 @@ class calendar_attendee(osv.osv):
                                         attdata.sent_by_uid.address_id.email)
             if name == 'cn':
                 if attdata.user_id:
-                    result[id][name] = self._get_address(attdata.user_id.name, attdata.email)
+                    result[id][name] = attdata.user_id.name
                 elif attdata.partner_address_id:
-                    result[id][name] = self._get_address(attdata.partner_id.name, attdata.email)
+                    result[id][name] = attdata.partner_address_id.name or attdata.partner_id.name
                 else:
-                    result[id][name] = self._get_address(None, attdata.email)
+                    result[id][name] = attdata.email or ''
             if name == 'delegated_to':
                 todata = []
-                for parent in attdata.parent_ids:
-                    if parent.email:
-                        todata.append('MAILTO:' + parent.email)
+                for child in attdata.child_ids:
+                    if child.email:
+                        todata.append('MAILTO:' + child.email)
                 result[id][name] = ', '.join(todata)
             if name == 'delegated_from':
                 fromdata = []
-                for child in attdata.child_ids:
-                    if child.email:
-                        fromdata.append('MAILTO:' + child.email)
+                for parent in attdata.parent_ids:
+                    if parent.email:
+                        fromdata.append('MAILTO:' + parent.email)
                 result[id][name] = ', '.join(fromdata)
             if name == 'event_date':
                 if attdata.ref:
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d9acae67a9e..0c8a52260ef 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -8,8 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invitation details">
-                    <field name="email" string="Invitation To"/>
-                    <field name="sent_by_uid" string="Invitation From" />
+                	<group col="6" colspan="4">
+	                    <field name="email" string="Invitation To"/>
+	                    <field name="cutype" string="Invitation type" />
+                        <field name="rsvp" />
+                        <field name="role" string="Role" />
+	                    <field name="sent_by_uid" string="Invitation From" />
+                    </group>
                     <notebook colspan="4">
                         <page string="Invitation">
                             <separator string="Invitation Detail" colspan="4" />
@@ -20,9 +25,6 @@
                                     string="Partner Contact" />
                                 <field name="partner_id"
                                     string="Partner" readonly="1" />
-                                <field name="role" string="Role" />
-                                <field name="cutype" string="Invitation type" />
-                                <field name="rsvp" />
                             </group>
                             <separator string="Event Detail" colspan="4" />
                             <group colspan="4" col="4">
@@ -181,7 +183,7 @@
 	        <field name="model">calendar.event</field>
 	        <field name="type">form</field>
 	        <field name="arch" type="xml">
-	            <form string="Meetings">
+	            <form string="Events">
 	                <group col="6" colspan="4">
 	                    <field name="name" select="1" string="Summary"
 	                        colspan="4" />
@@ -257,7 +259,6 @@
 	                         <field name="user_id" string="Responsible User" />
 	                         <field name="show_as" string="Show time as"/>
 	                         <field name="class" string="Privacy"/>
-	                         <field name="rrule" groups="base.group_extended" />
 	                         <field name="recurrent_id" invisible="1" />
 	                         <field name="recurrent_uid" invisible="1" />
 	                    </group>
@@ -333,6 +334,7 @@
 	            	<field name="location" />
 	            	<field name="show_as" />
 	            	<field name="class" string="Privacy" />
+	            	<field name="user_id" invisible="1"/>
 	            </tree>
 	        </field>
 	    </record>
@@ -353,6 +355,44 @@
 	        </field>
 	    </record>
 	    
+		<!--	 Event Search View-->
+	    
+	    <record id="view_calendar_event_filter" model="ir.ui.view">
+	        <field name="name">Calendar Events Search</field>
+	        <field name="model">calendar.event</field>
+	        <field name="type">search</field>
+	        <field name="arch" type="xml">
+                <search string="Search Events">
+                       <group col="12" colspan="4">
+                           <filter icon="terp-partner" string="My Events"
+                               domain="[('user_id','=',uid)]"
+                               help="My Events" />
+                           <separator orientation="vertical"/>
+                           <field name="name" select="1" string="Summary"/>
+                           <field name="location" select="1" string="Location"/>
+                           <separator orientation="vertical"/>
+                           <field name="user_id" select="1" widget="selection"/>
+                           <separator orientation="vertical"/>
+                           <field name="show_as" select="1"/>
+                           <field name="class" select="1"/>
+                       </group>
+                       <newline/>
+						<group expand="0" string="Group By..." colspan="16">
+							<filter string="Date" icon="terp-project"
+						        domain="[]" context="{'group_by':'date'}" />
+						    <filter string="Availability" icon="terp-project"
+						        domain="[]" context="{'group_by':'show_as'}" />
+						    <filter string="Privacy" icon="terp-crm"
+						        domain="[]" context="{'group_by':'class'}" />
+						    <separator orientation="vertical" />
+						    <filter string="Responsible" icon="terp-crm" domain="[]"
+						        context="{'group_by':'user_id'}" />
+						</group>
+                </search>
+            </field>
+		</record>
+
+
 	    <!-- Event action  -->
 	    
 		<record id="action_view_event" model="ir.actions.act_window">
@@ -361,6 +401,7 @@
 	            <field name="res_model">calendar.event</field>
 	            <field name="view_type">form</field>
 	            <field name="view_mode">tree,form,calendar</field>
+	            <field name="search_view_id" ref="view_calendar_event_filter"/>
 	        </record>
 		
 		<!-- Event menu  -->
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 83cf7c8cbe0..cb3e4d2e62a 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -66,20 +66,19 @@ send an Email to Invited Person')
 
         model = False
         model_field = False
-
         context_id = context and context.get('active_id', False) or False
         if not context or not context.get('model'):
             return {}
         else:
             model = context.get('model')
+
         model_field = context.get('attendee_field', False)
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context_id)
+        att_obj = self.pool.get('calendar.attendee')
 
         for datas in self.read(cr, uid, ids, context=context):
-
-            obj = self.pool.get(model)
-            res_obj = obj.browse(cr, uid, context_id)
             type = datas.get('type')
-            att_obj = self.pool.get('calendar.attendee')
             vals = []
             mail_to = []
             attendees = []
@@ -123,15 +122,13 @@ send an Email to Invited Person')
                     if contact.email:
                         mail_to.append(contact.email)
 
-            att = att_obj.browse(cr, uid, context_id)
-
             for att_val in vals:
                 if model == 'calendar.attendee':
-                    if ref:
-                        att_val.update({
-                            'parent_ids': [(4, att.id)],
-                            'ref': att.ref._name + ',' +str(att.ref.id)
-                            })
+                    att = att_obj.browse(cr, uid, context_id)
+                    att_val.update({
+                        'parent_ids': [(4, att.id)],
+                        'ref': att.ref._name + ',' +str(att.ref.id)
+                        })
                 attendees.append(att_obj.create(cr, uid, att_val))
             if model_field:
                 for attendee in attendees:

From aa96aaa12592dabaf6b0d5d51461e2814fa34d29 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 13 May 2010 13:45:29 +0200
Subject: [PATCH 144/146] [IMP] Section -> Sales Team

bzr revid: fp@tinyerp.com-20100513114529-0hhx6o1wtr5n8jif
---
 addons/crm/crm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index fd629edc745..bca7ed1a9af 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -743,7 +743,7 @@ class crm_case_log(osv.osv):
     _columns = {
         'name': fields.char('Status', size=64), 
         'date': fields.datetime('Date'), 
-        'section_id': fields.many2one('crm.case.section', 'Section'), 
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'), 
         'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 
         'model_id': fields.many2one('ir.model', "Model"), 
         'res_id': fields.integer('Resource ID'), 

From d7c1fcbf7b7e33eb09c1bfd2bae0a8359d3b23df Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 13 May 2010 17:20:52 +0530
Subject: [PATCH 145/146] [IMP]:configuration wizards

bzr revid: nch@tinyerp.com-20100513115052-vwsyu8s8tutpxprx
---
 addons/account/account_installer.xml   | 20 ++++++++++----------
 addons/account/installer.py            |  7 +++++--
 addons/base_setup/base_setup_todo.xml  | 23 ++++++++++++-----------
 addons/base_setup/gtk_contact_form.py  |  3 ++-
 addons/base_setup/gtk_contact_form.xml |  6 ++++--
 addons/base_setup/todo.py              |  8 ++++++--
 6 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index d3a6ce979a6..4c6faae9e19 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -29,30 +29,30 @@
 	      <group colspan="8">
 	      <group colspan="4" height="450" width="600">
             <field name="charts"/>
-            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-            	<field name="sale_tax" colspan="2"/>
-            	<field name="purchase_tax" colspan="2"/>
+             <group colspan="4">
+            	<separator col="4" colspan="4" string="Configure Fiscal Year"/>
+                <field name="date_start" on_change="on_change_start_date(date_start)"/>
+                <field name="date_stop"/>
+                <field name="period" colspan="4"/>
             </group>
              <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
             	<separator col="4" colspan="4" string="Bank and Cost Account"/>
             	 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-            	 	<form string="Bank Information">
+            	 	<form string="">
                       <field name="acc_name"/>
                       <field name="account_type"/>
                       <field name="currency_id" widget="selection"/>
                     </form>
-                    <tree editable="bottom" string="Bank Information">
+                    <tree editable="bottom" string="">
                       <field name="acc_name"/>
                       <field name="account_type"/>
                       <field name="currency_id" widget="selection"/>
                     </tree>
                   </field>
             </group>
-            <group colspan="4">
-            	<separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                <field name="date_start" on_change="on_change_start_date(date_start)"/>
-                <field name="date_stop"/>
-                <field name="period" colspan="4"/>
+            <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
+            	<field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
+            	<field name="purchase_tax" colspan="2" />
             </group>
             <group colspan="4" groups="base.group_extended">
             	<separator col="4" colspan="4" string="Install Extra Account Module"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index de557cd51a0..44eb081d7be 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -44,7 +44,7 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids)),
                    key=itemgetter(1)))
-        charts.insert(0,('configurable','Configurable Chart of Account'))
+        charts.insert(0,('configurable','Generic Chart Of Account'))
         return charts
 
     _columns = {
@@ -81,10 +81,13 @@ class account_installer(osv.osv_memory):
         'period':lambda *a:'month',
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
-        'charts':'configurable',
+        #'charts':'configurable',
         'bank_accounts_id':_get_default_accounts
         }
 
+    def on_change_tax(self, cr, uid, id, tax):
+        return{'value':{'purchase_tax':tax}}
+
     def on_change_start_date(self, cr, uid, id, start_date):
         if start_date:
             start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d")
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index b348b0c8a60..97c9ea0d301 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -17,33 +17,34 @@
 	          	  <attribute name='string'>Configure Your Company</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>23</attribute>
+	          	  <attribute name='rowspan'>25</attribute>
 	          	  <attribute name='string'></attribute>
 	      </xpath>
           <group string="res_config_contents" position="replace">
           	<group colspan="5">
           		<group colspan="2">
 	            	<field name="company_id" invisible="1"/>
-		            <field name="name" colspan="4" required="True"/>
-		            <newline/>
-		            <field name="street"/>
-		            <field name="street2"/>
+		            <field name="name" required="True"/><field name="account_no"/>
+		            <field name="currency" widget="selection"/><field name="street"/>
 		            <field name="zip"/>
+		            <field name="street2"/>
 		            <field name="city"/>
 		            <field name="country_id"/>
 		            <field name="state_id"/>
 		            <field name="email"/>
 		            <field name="phone"/>
-		            <field name="currency" widget="selection"/>
-
+		            <field name="website"/>
+				</group>
+				<newline/>
+				<group colspan="2" groups="base.group_extended">
 		            <separator string="Report Information" colspan="4"/>
-		            <field name="rml_header1" colspan="4"/>
-		            <field name="rml_footer1" colspan="4"/>
-		            <field name="rml_footer2" colspan="4"/>
+		            <field name="rml_header1" colspan="5"/>
+		            <field name="rml_footer1" colspan="5"/>
+		            <field name="rml_footer2" colspan="5"/>
 
 		            <separator colspan="4"
 		                       string="Your Logo - Use a size of about 450x150 pixels."/>
-		            <field colspan="4" name="logo" widget="image"
+		            <field colspan="5" name="logo" widget="image"
 		                   nolabel="1"/>
 		          </group>
 	        </group>
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index 354080df451..c13ae39aee3 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -70,7 +70,8 @@ class base_gtkcontactform(osv.osv_memory):
              'training':fields.boolean('OpenERP Training Program'),
              'other':fields.boolean('Other'),
              'ebook':fields.boolean('ebook'),
-             'updates':fields.boolean('updates'),
+             'updates':fields.boolean('Updates'),
+             'contact_me':fields.boolean('Contact Me'),
              }
     def execute(self, cr, uid, ids, context=None):
         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index f833f7051d6..c5578f9bc9a 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -14,7 +14,7 @@
 	            <attribute name="string">Information about you and the company you are related too. The Basic information related to the company has already been collected and some more information required by you to fill.</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="title"]' position='attributes'>
-	          	  <attribute name='string'>Do You Need Them ?</attribute>
+	          	  <attribute name='string'>Would you like more information or documentation ?</attribute>
 	          	  <attribute name='colspan'>4</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
@@ -24,6 +24,8 @@
           <group string="res_config_contents" position="replace">
           	<group colspan="4" height="450" width="600">
           	 	<group colspan="4">
+          	 	 	<field name="contact_me" nolabel="1"/>
+		            <label align="0.0" string="I accept to be contacted by OpenERP." colspan="3"/>
 		            <field name="ebook" nolabel="1"/>
 		            <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/>
 		            <field name="updates" nolabel="1"/>
@@ -71,7 +73,7 @@
     <record id="base_setup_contact_todo" model="ir.actions.todo">
         <field name="action_id" ref="action_base_contact"/>
         <field name="sequence">1</field>
-        <field name="restart">onskip</field>
+        <field name="restart">never</field>
     </record>
   </data>
 </openerp>
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 6d161d581f8..c072891179a 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -86,8 +86,8 @@ class base_setup_company(osv.osv_memory):
         'street2':fields.char('Street 2', size=128),
         'zip':fields.char('Zip Code', size=24),
         'city':fields.char('City', size=128),
-        'state_id':fields.selection(_get_all_states, 'States'),
-        'country_id':fields.selection(_get_all_countries, 'Countries'),
+        'state_id':fields.selection(_get_all_states, 'State'),
+        'country_id':fields.selection(_get_all_countries, 'Country'),
         'email':fields.char('E-mail', size=64),
         'phone':fields.char('Phone', size=64),
         'currency':fields.many2one('res.currency', 'Currency', required=True),
@@ -104,6 +104,8 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''')
 We suggest you to put bank information here:
 IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
         'logo':fields.binary('Logo'),
+        'account_no':fields.char('Account No', size=64),
+        'website': fields.char('Web', size=64),
     }
 
     def execute(self, cr, uid, ids, context=None):
@@ -120,10 +122,12 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''),
             'rml_footer2':payload.rml_footer2,
             'logo':payload.logo,
             'currency_id':payload.currency.id,
+            'account_no':payload.account_no,
         })
 
         company.partner_id.write({
             'name':payload.name,
+            'website':payload.website,
         })
 
         address_data = {

From 479d3c7cc740b90b49505535c7aa19e3f177d137 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 14 May 2010 12:01:57 +0530
Subject: [PATCH 146/146] [FIX]: crm: Fixed problem of wrong model in yml test

bzr revid: rpa@tinyerp.com-20100514063157-00rhglityqqj288f
---
 addons/crm/test/test_crm_phonecall.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index 47021843348..f2020659aed 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -49,8 +49,8 @@
   !python {model:  crm.phonecall}: | 
     xid= ref('crm_phonecall_interviewcall0')
     obj_phonecall = self.browse(cr, uid, xid)
-    ids = self.pool.get('crm.opportunity').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
-    obj_opp = self.pool.get('crm.opportunity').browse(cr, uid, ids)[0]
+    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
+    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
     assert obj_phonecall.partner_id == obj_opp.partner_id
   
 - |